Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: dynamically bind gensisHash to accountId #480

Merged
merged 21 commits into from
Dec 2, 2019
Merged

feat: dynamically bind gensisHash to accountId #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c88a02f
update network constant
hanwencheng Nov 28, 2019
2b182d7
change test naming
hanwencheng Nov 28, 2019
51f1950
update with cc3 genesisHash
hanwencheng Nov 30, 2019
fdbeb40
decouple genesisHash with identities schema
hanwencheng Nov 30, 2019
9c5ab73
fix account display error and migration code
hanwencheng Dec 1, 2019
a8e92bb
update test
hanwencheng Dec 1, 2019
cc24b01
fix null errors
hanwencheng Dec 1, 2019
1cf904d
move existed cc2 to unknown network
hanwencheng Dec 1, 2019
7ce6963
fix bugs
hanwencheng Dec 1, 2019
dc0fe9a
Merge branch 'master' into hanwen-kusama-update
hanwencheng Dec 1, 2019
71acb50
fix navigation actions
hanwencheng Dec 1, 2019
2edd9db
fix bugs
hanwencheng Dec 1, 2019
680edc2
move migration code before agree to privacy policies
hanwencheng Dec 1, 2019
9dd1447
small fix
hanwencheng Dec 1, 2019
ffbb2e7
refactor accountDetails
hanwencheng Dec 1, 2019
350554c
backward compatble with legacy substrate accounts
hanwencheng Dec 2, 2019
3ab2053
fix network list when create identity
hanwencheng Dec 2, 2019
7081723
fix: expected address
pmespresso Dec 2, 2019
f9b62b7
Merge branch 'master' into hanwen-kusama-update
hanwencheng Dec 2, 2019
9c448cf
correct migration
hanwencheng Dec 2, 2019
423959d
remove logs
hanwencheng Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions e2e/identityManipulation.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const testSetUpDefaultPath = async () => {
testIDs.AccountNetworkChooser.chooserScreen
);
await testUnlockPin(pinCode);
await testExist(PathsList.pathCard + '//kusama_CC2//default');
await testExist(PathsList.pathCard + '//kusama//default');
};

describe('Load test', async () => {
Expand Down Expand Up @@ -107,18 +107,18 @@ describe('Load test', async () => {
await testInput(PathDerivation.pathInput, fundingPath);
await testTap(PathDerivation.deriveButton);
await testUnlockPin(pinCode);
await testExist(PathsList.pathCard + `//kusama_CC2${fundingPath}`);
await testExist(PathsList.pathCard + `//kusama${fundingPath}`);
});

it('delete a path', async () => {
await tapBack();
await testTap(AccountNetworkChooser.networkButton + '0');
await testTap(PathsList.pathCard + `//kusama_CC2${fundingPath}`);
await testTap(PathsList.pathCard + `//kusama${fundingPath}`);
await testTap(PathDetail.popupMenuButton);
await testTap(PathDetail.deleteButton);
await element(by.text('Delete')).tap();
await testUnlockPin(pinCode);
await testNotExist(PathsList.pathCard + `//kusama_CC2${fundingPath}`);
await testNotExist(PathsList.pathCard + `//kusama${fundingPath}`);
});

it('should sign the transaction', async () => {
Expand Down
2 changes: 1 addition & 1 deletion e2e/mock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { NETWORK_LIST, SubstrateNetworkKeys } from '../src/constants';
export const signingTestIdentityPath = `//${NETWORK_LIST[SubstrateNetworkKeys.KUSAMA].pathID}//default`;

const setRemarkExtrinsicKusama =
'47900000100005301023c36776005aec2f32a34c109dc791a82edef980eec3be80da938ac9bcc68217220170000010c11111165030000fa030000e3777fa922cafbff200cadeaea1a76bd7898ad5b89f7848999058b50e715f636dbb5aefb451e26bd64faf476301f980437d87c0d88dec1a8c7a3eb3cc82e9bbb0ec';
'47900000100005301021e169bcc4cdb062f1c85f971be770b6aea1bd32ac1bf7877aa54ccd73309014a20180000010c11111145030000fe030000b0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafeaf2df518f7017e0442a1d01b0f175e0fa5d427470014c1c3ab2131e6250072a70ec';

export const createMockSignRequest = () => ({
bounds: {
Expand Down
52 changes: 26 additions & 26 deletions specs/util/identitiesUtils.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import {
deserializeIdentities,
getAvailableNetworkKeys,
getExistedNetworkKeys,
getPathName,
groupPaths,
serializeIdentities
Expand All @@ -29,13 +29,13 @@ import {
UnknownNetworkKeys
} from '../../src/constants';

const accountIdFunding1 = 'address1',
accountIdFunding2 = 'address2',
accountIdSoft = 'address3',
accountIdPolkadot = 'address5',
accountIdStaking = 'address4',
accountIdEthereum = 'address6',
accountIdDefault = 'addressDefault',
const addressFunding1 = 'address1',
addressFunding2 = 'address2',
addressSoft = 'address3',
addressPolkadot = 'address5',
addressStaking = 'address4',
addressEthereum = 'address6',
addressDefault = 'addressDefault',
paths = [
'//kusama//default',
'//kusama//funding/1',
Expand All @@ -46,55 +46,55 @@ const accountIdFunding1 = 'address1',
'1'
],
metaDefault = {
accountId: accountIdDefault,
address: addressDefault,
createdAt: 1571068850409,
name: '',
updatedAt: 1571078850509
},
metaFunding1 = {
accountId: accountIdFunding1,
address: addressFunding1,
createdAt: 1571068850409,
name: 'funding account1',
updatedAt: 1571078850509
},
metaFunding2 = {
accountId: accountIdFunding2,
address: addressFunding2,
createdAt: 1571068850409,
name: '',
updatedAt: 1571078850509
},
metaStaking = {
accountId: accountIdStaking,
address: addressStaking,
createdAt: 1571068850409,
name: '',
updatedAt: 1571078850509
},
metaPolkadot = {
accountId: accountIdPolkadot,
address: addressPolkadot,
createdAt: 1573142786972,
name: 'PolkadotFirst',
updatedAt: 1573142786972
},
metaEthereum = {
accountId: accountIdEthereum,
address: addressEthereum,
createdAt: 1573142786972,
name: 'Eth account',
updatedAt: 1573142786972
},
metaSoftKey = {
accountId: accountIdSoft,
address: addressSoft,
createdAt: 1573142786972,
name: '',
updatedAt: 1573142786972
};
const accountIdsMap = new Map([
[accountIdDefault, paths[0]],
[accountIdFunding1, paths[1]],
[accountIdSoft, paths[2]],
[accountIdFunding2, paths[3]],
[accountIdStaking, paths[4]],
[accountIdPolkadot, paths[5]],
[accountIdEthereum, paths[6]]
const addressesMap = new Map([
[addressDefault, paths[0]],
[addressFunding1, paths[1]],
[addressSoft, paths[2]],
[addressFunding2, paths[3]],
[addressStaking, paths[4]],
[addressPolkadot, paths[5]],
[addressEthereum, paths[6]]
]);
const metaMap = new Map([
[paths[0], metaDefault],
Expand All @@ -107,14 +107,14 @@ const metaMap = new Map([
]);
const testIdentities = [
{
accountIds: accountIdsMap,
addresses: addressesMap,
derivationPassword: '',
encryptedSeed: 'yyyy',
meta: metaMap,
name: 'identity1'
},
{
accountIds: accountIdsMap,
addresses: addressesMap,
derivationPassword: '',
encryptedSeed: 'xxxx',
meta: metaMap,
Expand Down Expand Up @@ -169,7 +169,7 @@ describe('IdentitiesUtils', () => {
});

it('get the correspond networkKeys', () => {
const networkKeys = getAvailableNetworkKeys(testIdentities[0]);
const networkKeys = getExistedNetworkKeys(testIdentities[0]);
expect(networkKeys).toEqual([
EthereumNetworkKeys.FRONTIER,
SubstrateNetworkKeys.KUSAMA,
Expand Down
Loading