diff --git a/CHANGELOG.md b/CHANGELOG.md index e7079c9ac..ebd96d7d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## master +- Derivation paths now caters for > `MAX_SAFE_INTEGER` unsigned values - Sync with upstream Substrate ss58 registry diff --git a/packages/keyring/src/index.spec.ts b/packages/keyring/src/index.spec.ts index f4cd5557a..e5da9129b 100644 --- a/packages/keyring/src/index.spec.ts +++ b/packages/keyring/src/index.spec.ts @@ -121,6 +121,18 @@ describe('keypair', (): void => { ).toEqual('5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY'); }); + it('creates with integer derivations', (): void => { + // MAX_SAFE_INTEGER + expect( + keyring.createFromUri('//9007199254740991').address + ).toEqual('5CDsyNZyqxLpHnTvknr68anUcYoBFjZbFKiEJJf4prB75Uog'); + + // MAX_SAFE_INTEGER + extra digits + expect( + keyring.createFromUri('//900719925474099999').address + ).toEqual('5GHj2D7RG2m2DXYwGSDpXwuuxn53G987i7p2EQVDqP4NYu4q'); + }); + it('creates via dev seed (2-byte encoding)', (): void => { keyring.setSS58Format(252); diff --git a/packages/util-crypto/src/key/DeriveJunction.ts b/packages/util-crypto/src/key/DeriveJunction.ts index 9634f0604..6382c5888 100644 --- a/packages/util-crypto/src/key/DeriveJunction.ts +++ b/packages/util-crypto/src/key/DeriveJunction.ts @@ -3,7 +3,7 @@ import type { HexString } from '@polkadot/util/types'; -import { BN, bnToHex, compactAddLength, hexToU8a, isBigInt, isBn, isHex, isNumber, isString, stringToU8a } from '@polkadot/util'; +import { BN, bnToU8a, compactAddLength, hexToU8a, isBigInt, isBn, isHex, isNumber, isString, stringToU8a } from '@polkadot/util'; import { blake2AsU8a } from '../blake2/asU8a'; @@ -28,7 +28,7 @@ export class DeriveJunction { result.soft( RE_NUMBER.test(code) - ? parseInt(code, 10) + ? new BN(code, 10) : code ); @@ -61,7 +61,7 @@ export class DeriveJunction { public soft (value: HexString | number | string | bigint | BN | Uint8Array): DeriveJunction { if (isNumber(value) || isBn(value) || isBigInt(value)) { - return this.soft(bnToHex(value, BN_OPTIONS)); + return this.soft(bnToU8a(value, BN_OPTIONS)); } else if (isHex(value)) { return this.soft(hexToU8a(value)); } else if (isString(value)) {