neptune/ghost-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix signing tests and unskip them (#565)

Browse Source 
* init with warning on wrong password

* switching between requests

* switching between requests

* all passing

* stray logs

* cleanup

* Signing Test with decodeding (#591)

* decode error

* as unknown

* with decoding :)

* lint

* stray comment/logs

Co-authored-by: Github Actions <action@github.com>
This commit is contained in:
Thibaut Sardan 2020-12-17 13:36:57 +01:00 committed by GitHub
parent 217450c08b
commit ba7cf362ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 224 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/extension-chains/src/index.ts
View File

@ -6,6 +6,7 @@ import type { Chain } from './types';
import { Metadata } from '@polkadot/metadata';
import { TypeRegistry } from '@polkadot/types';
import { base64Decode } from '@polkadot/util-crypto';
// imports chain details, generally metadata. For the generation of these,
// inside the api, run `yarn chain:info --ws <url>`
@ -42,7 +43,8 @@ export function metadataExpand (definition: MetadataDef, isPartial = false): Cha
if (metaCalls && !isPartial) {
hasMetadata = true;
registry.setMetadata(new Metadata(registry, Buffer.from(metaCalls, 'base64')));
registry.setMetadata(new Metadata(registry, base64Decode(metaCalls)));
}
const result = {

14
packages/extension-ui/src/MetadataCache.ts Normal file
View File

@ -0,0 +1,14 @@
// Copyright 2019-2020 @polkadot/extension-ui authors & contributors
// SPDX-License-Identifier: Apache-2.0
import { MetadataDef } from '@polkadot/extension-inject/types';
const metadataGets = new Map<string, Promise<MetadataDef | null>>();
export function getSavedMeta (genesisHash: string): Promise<MetadataDef | null> | undefined {
return metadataGets.get(genesisHash);
}
export function setSavedMeta (genesisHash: string, def: Promise<MetadataDef | null>): Map<string, Promise<MetadataDef | null>> {
return metadataGets.set(genesisHash, def);
}

1
packages/extension-ui/src/Popup/Signing/Extrinsic.tsx
View File

@ -111,7 +111,6 @@ function Extrinsic ({ className, payload: { era, nonce, tip }, request: { blockN
const { t } = useTranslation();
const chain = useMetadata(genesisHash);
const specVersion = useRef(bnToBn(hexSpec)).current;
const decoded = useMemo(
() => chain && chain.hasMetadata
? decodeMethod(method, chain, specVersion)

266
packages/extension-ui/src/Popup/Signing/Signing.test.tsx
View File

@ -14,8 +14,10 @@ import { ThemeProvider } from 'styled-components';
import { ActionContext, Address, Button, Input, SigningReqContext, themes } from '../../components';
import * as messaging from '../../messaging';
import * as MetadataCache from '../../MetadataCache';
import { flushAllPromises } from '../../testHelpers';
import Extrinsic from './Extrinsic';
import { westendMetadata } from './metadataMock';
import Qr from './Qr';
import Request from './Request';
import TransactionIndex from './TransactionIndex';
@ -24,7 +26,7 @@ import Signing from '.';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-call
configure({ adapter: new Adapter() });
describe.skip('Signing requests', () => {
describe('Signing requests', () => {
let wrapper: ReactWrapper;
let onActionStub: jest.Mock;
let signRequests: SigningRequest[] = [];
@ -56,58 +58,91 @@ describe.skip('Signing requests', () => {
wrapper.update();
};
const check = (input: ReactWrapper): unknown => input.simulate('change', { target: { checked: true } });
beforeEach(async () => {
jest.spyOn(messaging, 'cancelSignRequest').mockResolvedValue(true);
jest.spyOn(messaging, 'approveSignPassword').mockResolvedValue(true);
signRequests = [{ // 0.031415926500000 DOT -> 5D4bqjQRPgdMBK8bNvhX4tSuCtSGZS7rZjD5XH5SoKcFeKn5
account: {
address: '5D4bqjQRPgdMBK8bNvhX4tSuCtSGZS7rZjD5XH5SoKcFeKn5',
name: 'acc1'
},
id: '1574174715509.78',
request: {
payload: {
jest.spyOn(messaging, 'isSignLocked').mockResolvedValue({ isLocked: true, remainingTime: 0 });
jest.spyOn(MetadataCache, 'getSavedMeta').mockResolvedValue(westendMetadata);
signRequests = [
{
account: {
address: '5D4bqjQRPgdMBK8bNvhX4tSuCtSGZS7rZjD5XH5SoKcFeKn5',
blockHash: '0xc288fbc472dab27d13ce58212eeb1243f460c5b0f9a65e9de97cbbf9bc761cb0',
blockNumber: '0x00000000003d8c4a',
era: '0xa500',
genesisHash: '0xdcd1346701ca8396496e52aa2785b1748deb6db09551b72159dcb3e08991025b',
method: '0x0300ff2c27fb3518d84bfad60f39b2cb5502947746ca5921fd66dccc861bad5c9a65220ba0aa2397921c',
nonce: '0x0000000000000000',
signedExtensions: [],
specVersion: '0x00000070',
tip: '0x00000000000000000000000000000000',
transactionVersion: '0x00000000',
version: 1
genesisHash: null,
isHidden: false,
name: 'acc1',
parentAddress: '5Ggap6soAPaP5UeNaiJsgqQwdVhhNnm6ez7Ba1w9jJ62LM2Q',
suri: '//0',
whenCreated: 1602001346486
},
sign: jest.fn()
},
url: 'polkadot.js'
}, { // 10000000000 nDOT -> 5D1ss3KFnzNtLzRDfUhqLivzVvt5BDrBnK21dMf1si2twPuj
account: {
address: '5E9nq1yGJJFiP8C75ryD9J2R62q2cesz6NumLnuXRgmuN5DG',
name: 'acc2'
},
id: '1574174306604.76',
request: {
payload: {
address: '5E9nq1yGJJFiP8C75ryD9J2R62q2cesz6NumLnuXRgmuN5DG',
blockHash: '0xf3b92cf71c84762ba1cb59dc4fd192f1824171a96b43bce44ceb0671b378d15a',
blockNumber: '0x00000000003d8e9d',
era: '0xd501',
genesisHash: '0xdcd1346701ca8396496e52aa2785b1748deb6db09551b72159dcb3e08991025b',
method: '0x0300ff2a142e8c67a1ddcf6241f4fabf55a0bb0ee41d8a681ab3b3662a75037025967c0700e40b5402',
nonce: '0x0000000000000000',
signedExtensions: [],
specVersion: '0x00000070',
tip: '0x00000000000000000000000000000000',
transactionVersion: '0x00000000',
version: 1
id: '1607347015530.2',
request: {
payload: {
address: '5D4bqjQRPgdMBK8bNvhX4tSuCtSGZS7rZjD5XH5SoKcFeKn5',
blockHash: '0x661f57d206d4fecda0408943427d4d25436518acbff543735e7569da9db6bdd7',
blockNumber: '0x0033fa6b',
era: '0xb502',
genesisHash: '0xe143f23803ac50e8f6f8e62695d1ce9e4e1d68aa36c1cd2cfd15340213f3423e',
method: '0x0403c6111b239376e5e8b983dc2d2459cbb6caed64cc1d21723973d061ae0861ef690b00b04e2bde6f',
nonce: '0x00000003',
signedExtensions: [
'CheckSpecVersion',
'CheckTxVersion',
'CheckGenesis',
'CheckMortality',
'CheckNonce',
'CheckWeight',
'ChargeTransactionPayment'
],
specVersion: '0x0000002d',
tip: '0x00000000000000000000000000000000',
transactionVersion: '0x00000003',
version: 4
},
sign: jest.fn()
},
sign: jest.fn()
url: 'https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwestend-rpc.polkadot.io#/accounts'
},
url: 'polkadot.js'
}];
{
account: {
address: '5Ggap6soAPaP5UeNaiJsgqQwdVhhNnm6ez7Ba1w9jJ62LM2Q',
genesisHash: null,
isHidden: false,
name: 'acc 2',
suri: '//0',
whenCreated: 1602001346486
},
id: '1607356155395.3',
request: {
payload: {
address: '5Ggap6soAPaP5UeNaiJsgqQwdVhhNnm6ez7Ba1w9jJ62LM2Q',
blockHash: '0xcf69b7935b785f90b22d2b36f2227132ef9c5dd33db1dbac9ecdafac05bf9476',
blockNumber: '0x0036269a',
era: '0xa501',
genesisHash: '0xe143f23803ac50e8f6f8e62695d1ce9e4e1d68aa36c1cd2cfd15340213f3423e',
method: '0x0400cc4e0e2848c488896dd0a24f153070e85e3c83f6199cfc942ab6de29c56c2d7b0700d0ed902e',
nonce: '0x00000003',
signedExtensions: [
'CheckSpecVersion',
'CheckTxVersion',
'CheckGenesis',
'CheckMortality',
'CheckNonce',
'CheckWeight',
'ChargeTransactionPayment'
],
specVersion: '0x0000002d',
tip: '0x00000000000000000000000000000000',
transactionVersion: '0x00000003',
version: 4
},
sign: jest.fn()
},
url: 'https://polkadot.js.org/apps'
}
];
onActionStub = jest.fn();
await mountComponent();
});
@ -118,29 +153,31 @@ describe.skip('Signing requests', () => {
expect(wrapper.find(Request).prop('signId')).toBe(signRequests[0].id);
});
it('only ArrowRight should be active on first screen', () => {
expect(wrapper.find('ArrowLeft').prop('isActive')).toBe(false);
expect(wrapper.find('ArrowRight').prop('isActive')).toBe(true);
wrapper.find('ArrowLeft').simulate('click');
it('only the right arrow should be active on first screen', () => {
expect(wrapper.find('FontAwesomeIcon.arrowLeft')).toHaveLength(1);
expect(wrapper.find('FontAwesomeIcon.arrowLeft.active')).toHaveLength(0);
expect(wrapper.find('FontAwesomeIcon.arrowRight.active')).toHaveLength(1);
wrapper.find('FontAwesomeIcon.arrowLeft').simulate('click');
expect(wrapper.find(TransactionIndex).text()).toBe('1/2');
});
it('should display second request after clicking right arrow', () => {
wrapper.find('ArrowRight').simulate('click');
wrapper.find('FontAwesomeIcon.arrowRight').simulate('click');
expect(wrapper.find(TransactionIndex).text()).toBe('2/2');
expect(wrapper.find(Request).prop('signId')).toBe(signRequests[1].id);
});
it('only ArrowLeft should be active on second screen', () => {
wrapper.find('ArrowRight').simulate('click');
expect(wrapper.find('ArrowLeft').prop('isActive')).toBe(true);
expect(wrapper.find('ArrowRight').prop('isActive')).toBe(false);
it('only the left should be active on second screen', () => {
wrapper.find('FontAwesomeIcon.arrowRight').simulate('click');
expect(wrapper.find('FontAwesomeIcon.arrowLeft.active')).toHaveLength(1);
expect(wrapper.find('FontAwesomeIcon.arrowRight')).toHaveLength(1);
expect(wrapper.find('FontAwesomeIcon.arrowRight.active')).toHaveLength(0);
expect(wrapper.find(TransactionIndex).text()).toBe('2/2');
});
it('should display previous request after ArrowLeft has been clicked', () => {
wrapper.find('ArrowRight').simulate('click');
wrapper.find('ArrowLeft').simulate('click');
it('should display previous request after the left arrow has been clicked', () => {
wrapper.find('FontAwesomeIcon.arrowRight').simulate('click');
wrapper.find('FontAwesomeIcon.arrowLeft').simulate('click');
expect(wrapper.find(TransactionIndex).text()).toBe('1/2');
expect(wrapper.find(Request).prop('signId')).toBe(signRequests[0].id);
});
@ -151,28 +188,39 @@ describe.skip('Signing requests', () => {
signRequests = [{
account: {
address: '5Cf1CGZas62RWwce3d2EPqUvSoi1txaXKd9M5w9bEFSsQtRe',
genesisHash: null,
isExternal: true,
name: 'external'
isHidden: false,
name: 'Dave account on Signer ',
whenCreated: 1602085704296
},
id: '1574174306604.76',
id: '1607357806151.5',
request: {
payload: {
address: '5Cf1CGZas62RWwce3d2EPqUvSoi1txaXKd9M5w9bEFSsQtRe',
blockHash: '0xf3b92cf71c84762ba1cb59dc4fd192f1824171a96b43bce44ceb0671b378d15a',
blockNumber: '0x00000000003d8e9d',
era: '0xd501',
genesisHash: '0xdcd1346701ca8396496e52aa2785b1748deb6db09551b72159dcb3e08991025b',
method: '0x0300ff2a142e8c67a1ddcf6241f4fabf55a0bb0ee41d8a681ab3b3662a75037025967c0700e40b5402',
nonce: '0x0000000000000000',
signedExtensions: [],
specVersion: '0x00000070',
blockHash: '0xd2f2dfb56c16af1d0faf5b454153d3199aeb6647537f4161c26a34541c591ec8',
blockNumber: '0x00340171',
era: '0x1503',
genesisHash: '0xe143f23803ac50e8f6f8e62695d1ce9e4e1d68aa36c1cd2cfd15340213f3423e',
method: '0x0403c6111b239376e5e8b983dc2d2459cbb6caed64cc1d21723973d061ae0861ef690b00b04e2bde6f',
nonce: '0x00000000',
signedExtensions: [
'CheckSpecVersion',
'CheckTxVersion',
'CheckGenesis',
'CheckMortality',
'CheckNonce',
'CheckWeight',
'ChargeTransactionPayment'
],
specVersion: '0x0000002d',
tip: '0x00000000000000000000000000000000',
transactionVersion: '0x00000000',
version: 1
transactionVersion: '0x00000003',
version: 4
},
sign: jest.fn()
},
url: 'polkadot.js'
url: 'https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwestend-rpc.polkadot.io#/accounts'
}];
await mountComponent();
expect(wrapper.find(Extrinsic)).toHaveLength(0);
@ -182,46 +230,78 @@ describe.skip('Signing requests', () => {
describe('Request rendering', () => {
it('correctly displays request 1', () => {
expect(wrapper.find(Address).find('FullAddress').text()).toBe('5D4bqjQRPgdMBK8bNvhX4tSuCtSGZS7rZjD5XH5SoKcFeKn5');
expect(wrapper.find(Address).find('.fullAddress').text()).toBe(signRequests[0].account.address);
expect(wrapper.find(Extrinsic).find('td.data').map((el): string => el.text())).toEqual([
'polkadot.js',
'Alexander',
'112',
'0',
'balances.transfer',
`{
"dest": "5D4bqjQRPgdMBK8bNvhX4tSuCtSGZS7rZjD5XH5SoKcFeKn5",
"value": 31415926500000
}`,
' Transfer some liquid free balance to another account. `transfer` will set the `FreeBalance` of the sender and receiver. It will decrease the total issuance of the system by the `TransferFee`. If the sender\'s account is below the existential deposit as a result of the transfer, the account will be reaped. The dispatch origin for this call must be `Signed` by the transactor.',
'mortal, valid from #4,033,610 to #4,033,674'
'https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fwestend-rpc.polkadot.io#/accounts',
'Westend',
'45',
'3',
`balances.transferKeepAlive(dest, value)[
"5GYQRJj3NUznYDzCduENRcocMsyxmb6tjb5xW87ZMErBe9R7",
"123.0000 WND"
]`,
'Same as the [`transfer`] call, but with a check that the transfer will not kill the origin account.',
'mortal, valid from {{birth}} to {{death}}'
]);
});
it('correctly displays request 2', () => {
wrapper.find('ArrowRight').simulate('click');
expect(wrapper.find(Address).find('FullAddress').text()).toBe('5E9nq1yGJJFiP8C75ryD9J2R62q2cesz6NumLnuXRgmuN5DG');
expect(wrapper.find(Extrinsic).find('td.data').at(5).text()).toBe(`{
"dest": "5D1ss3KFnzNtLzRDfUhqLivzVvt5BDrBnK21dMf1si2twPuj",
"value": 10000000000
}`);
wrapper.find('FontAwesomeIcon.arrowRight').simulate('click');
expect(wrapper.find(Address).find('.fullAddress').text()).toBe(signRequests[1].account.address);
expect(wrapper.find(Extrinsic).find('td.data').map((el): string => el.text())).toEqual([
'https://polkadot.js.org/apps',
'Westend',
'45',
'3',
`balances.transfer(dest, value)[
"5Ggap6soAPaP5UeNaiJsgqQwdVhhNnm6ez7Ba1w9jJ62LM2Q",
"200.0000 mWND"
]`,
'Transfer some liquid free balance to another account.',
'mortal, valid from {{birth}} to {{death}}'
]);
});
});
describe('Submitting', () => {
it('passes request id to cancel call', () => {
wrapper.find('CancelButton').find('a').simulate('click');
wrapper.find('.cancelButton').find('a').simulate('click');
expect(messaging.cancelSignRequest).toBeCalledWith(signRequests[0].id);
});
it('passes request id and password to approve call', () => {
it('passes request id and password to approve call', async () => {
wrapper.find(Input).simulate('change', { target: { value: 'hunter1' } });
wrapper.find(Button).find('button').simulate('click');
expect(messaging.approveSignPassword).toBeCalledWith(signRequests[0].id, 'hunter1');
await act(flushAllPromises);
wrapper.update();
expect(messaging.approveSignPassword).toBeCalledWith(signRequests[0].id, false, 'hunter1');
});
it('asks the background to cache the password when the relevant checkbox is checked', async () => {
check(wrapper.find('input[type="checkbox"]'));
wrapper.find(Input).simulate('change', { target: { value: 'hunter1' } });
wrapper.find(Button).find('button').simulate('click');
await act(flushAllPromises);
wrapper.update();
expect(messaging.approveSignPassword).toBeCalledWith(signRequests[0].id, true, 'hunter1');
});
it('shows an error when the password is wrong', async () => {
// eslint-disable-next-line @typescript-eslint/require-await
jest.spyOn(messaging, 'approveSignPassword').mockImplementation(async () => {
throw new Error('Unable to decode using the supplied passphrase');
});
await act(flushAllPromises);
wrapper.update();
wrapper.find(Input).simulate('change', { target: { value: 'anything' } });
wrapper.find(Button).find('button').simulate('click');
await act(flushAllPromises);
wrapper.update();
expect(wrapper.find('.warning-message').first().text()).toBe('Unable to decode using the supplied passphrase');
});
it('when last request has been removed/cancelled, shows the previous one', () => {
wrapper.find('ArrowRight').simulate('click');
wrapper.find('FontAwesomeIcon.arrowRight').simulate('click');
act(() => {
emitter.emit('request', [signRequests[0]]);
});

30
packages/extension-ui/src/Popup/Signing/metadataMock.ts Normal file
View File

File diff suppressed because one or more lines are too long

8
packages/extension-ui/src/messaging.ts
View File

@ -4,7 +4,6 @@
import type { AccountJson, AllowedPath, AuthorizeRequest, MessageTypes, MessageTypesWithNoSubscriptions, MessageTypesWithNullRequest, MessageTypesWithSubscriptions, MetadataRequest, RequestTypes, ResponseDeriveValidate, ResponseJsonGetAccountInfo, ResponseSigningIsLocked, ResponseTypes, SeedLengths, SigningRequest, SubscriptionMessageTypes } from '@polkadot/extension-base/background/types';
import type { Message } from '@polkadot/extension-base/types';
import type { Chain } from '@polkadot/extension-chains/types';
import type { MetadataDef } from '@polkadot/extension-inject/types';
import type { KeyringPair$Json } from '@polkadot/keyring/types';
import type { KeypairType } from '@polkadot/util-crypto/types';
@ -13,6 +12,8 @@ import { metadataExpand } from '@polkadot/extension-chains';
import allChains from '@polkadot/extension-chains/chains';
import chrome from '@polkadot/extension-inject/chrome';
import { getSavedMeta, setSavedMeta } from './MetadataCache';
interface Handler {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
resolve: (data: any) => void;
@ -23,7 +24,6 @@ interface Handler {
type Handlers = Record<string, Handler>;
const metadataGets = new Map<string, Promise<MetadataDef | null>>();
const port = chrome.runtime.connect({ name: PORT_EXTENSION });
const handlers: Handlers = {};
let idCounter = 0;
@ -130,11 +130,11 @@ export async function getMetadata (genesisHash?: string | null, isPartial = fals
return null;
}
let request = metadataGets.get(genesisHash);
let request = getSavedMeta(genesisHash);
if (!request) {
request = sendMessage('pri(metadata.get)', genesisHash || null);
metadataGets.set(genesisHash, request);
setSavedMeta(genesisHash, request);
}
const def = await request;