[CI Skip] release/stable 7.2.1

skip-checks: true

.123trigger

@@ -14,3 +14,7 @@
 6.0.3
 6.0.4
 6.0.5
+
+7.0.2
+7.0.3
+7.1.2

.yarnrc.yml

@@ -10,4 +10,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
     spec: "@yarnpkg/plugin-version"
 
-yarnPath: .yarn/releases/yarn-3.0.0-rc.2.cjs
+yarnPath: .yarn/releases/yarn-3.0.1.cjs

CHANGELOG.md

@@ -1,5 +1,93 @@
 # CHANGELOG
 
+## 7.2.1 Aug 15, 2021
+
+Contributed:
+
+- Always use `bigint` type to indicate instance (Thanks to https://github.com/ntduan)
+
+Changes:
+
+- Added `u8aEmpty` helper check, all 0 or no length
+- Cleanup additional circular dependencies detected by rollup
+
+
+## 7.1.2 Aug 11, 2021
+
+Changes:
+
+- Ensure `@polkadot/util-crypto` doesn't re-export `packageInfo` from `@polkadot/networks`
+- Minor TS style cleanups in `@polkadot/x-bundle`
+
+
+## 7.1.1 Aug 2, 2021
+
+Contributed:
+
+- Add keyring encrypt/decrypt functionality (Thanks to https://github.com/RoyTimes)
+
+Changes:
+
+- Bump Ledger libraries to latest versions
+
+
+## 7.0.3 Jul 26, 2021
+
+Changes:
+
+- Sync with upstream Substrate ss58 registry
+- Bump Ledger libraries to latest versions
+
+
+## 7.0.2 Jul 19, 2021
+
+Changes:
+
+- Added `isCompact` utility for check on compact-like types
+- Sync with upstream Substrate ss58 registry
+
+
+## 7.0.1 Jul 11, 2021
+
+- **Breaking change** The `@polkadot/x-rxjs` package has been removed. In `rxjs` 7.2.0 the compatibility issues at the base layer has been solved.
+- **Breaking change** The named exports in `@polkadot/networks` has been changed
+
+Contributed:
+
+- Add Ledger config for Centrifuge (Thanks to https://github.com/mikiquantum)
+
+Changes:
+
+- Adjust `@polkadot/networks` to fully-descriptive exports
+- Remove `@polkadot/x-rxjs`, direct import from `rxjs >= 7.2.0` required
+- Allow building as a completely stand-alone browser bundle (experimental)
+- Sync with upstream Substrate ss58 registry
+
+
+## 6.11.1 Jul 5, 2021
+
+Changes:
+
+- Cleanup unneeded dependencies for `@polkadot/x-global`
+- Sync with upstream Substrate ss58 registry
+- Bump Zondax dependencies (Statemine slip44 fix)
+
+
+## 6.10.1 Jun 26, 2021
+
+Contributed:
+
+- Add Karura genesisHash (Thanks to https://github.com/ntduan)
+
+Changes:
+
+- `isHex(value)` will now check for only `string` types (No `String` classes)
+- Added `arrayShuffle(array)` to shuffle an array into a new output
+- Added Statemine Ledger app information
+- Simplify tests to use `{describe|it}.each` where applicable
+- Sync with upstream Substrate ss58 registry
+
+
 ## 6.9.1 Jun 19, 2021
 
 Changes:

package.json

@@ -7,11 +7,12 @@
     "packages/*"
   ],
   "resolutions": {
-    "typescript": "^4.3.2"
+    "typescript": "^4.3.5"
   },
   "scripts": {
     "build": "polkadot-dev-build-ts",
     "build:release": "polkadot-ci-ghact-build",
+    "build:rollup": "polkadot-exec-rollup --config",
     "lint": "polkadot-dev-run-lint",
     "clean": "polkadot-dev-clean-build",
     "networks:crosscheck": "polkadot-dev-run-test packages/networks/src/crosscheck",
@@ -19,13 +20,15 @@
     "postinstall": "polkadot-dev-yarn-only",
     "test": "polkadot-dev-run-test --coverage --runInBand --testPathIgnorePatterns crosscheck --testPathIgnorePatterns toMiniSecretCmp",
     "test:mnemonicCmp": "polkadot-dev-run-test packages/util-crypto/src/mnemonic/toMiniSecretCmp.spec.ts",
-    "test:one": "polkadot-dev-run-test"
+    "test:one": "polkadot-dev-run-test --runInBand"
   },
   "devDependencies": {
-    "@babel/core": "^7.14.5",
-    "@polkadot/dev": "^0.62.42",
-    "@polkadot/ts": "^0.3.90",
-    "@types/jest": "^26.0.23"
+    "@babel/core": "^7.15.0",
+    "@polkadot/dev": "^0.62.59",
+    "@polkadot/ts": "^0.4.4",
+    "@types/ed2curve": "^0.2.2",
+    "@types/jest": "^26.0.24"
   },
-  "version": "6.9.1"
+  "version": "7.2.1",
+  "packageManager": "yarn@3.0.1"
 }

packages/hw-ledger-transports/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/hw-ledger-transports",
-  "version": "6.9.1",
+  "version": "7.2.1",
   "type": "module",
   "repository": "github:polkadot-js/common",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -15,15 +15,12 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.5",
-    "@ledgerhq/hw-transport-webhid": "^5.51.1",
-    "@ledgerhq/hw-transport-webusb": "^5.53.1"
-  },
-  "devDependencies": {
-    "@types/ledgerhq__hw-transport-node-hid": "^4.22.2",
-    "@types/ledgerhq__hw-transport-webusb": "^4.70.1"
+    "@babel/runtime": "^7.15.3",
+    "@ledgerhq/hw-transport": "^6.3.0",
+    "@ledgerhq/hw-transport-webhid": "^6.4.1",
+    "@ledgerhq/hw-transport-webusb": "^6.3.0"
   },
   "optionalDependencies": {
-    "@ledgerhq/hw-transport-node-hid-singleton": "^5.51.1"
+    "@ledgerhq/hw-transport-node-hid-singleton": "^6.3.0"
   }
 }

packages/hw-ledger-transports/src/ledgerhq-node.d.ts

@@ -1,15 +0,0 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-declare module '@ledgerhq/hw-transport-node-hid-noevents' {
-  import Transport from '@ledgerhq/hw-transport';
-
-  export default class TransportNodeHidNoEvents extends Transport {}
-  export function getDevices(): Array<unknown>
-}
-
-declare module '@ledgerhq/hw-transport-node-hid-singleton' {
-  import TransportNodeHidNoEvents from '@ledgerhq/hw-transport-node-hid-noevents';
-
-  export default class TransportNodeHid extends TransportNodeHidNoEvents { }
-}

packages/hw-ledger-transports/src/ledgerhq-web.d.ts

@@ -1,8 +0,0 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-declare module '@ledgerhq/hw-transport-webhid' {
-  import Transport from '@ledgerhq/hw-transport';
-
-  export default class TransportWebHid extends Transport {}
-}

packages/hw-ledger-transports/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/hw-ledger-transports', version: '6.9.1' };
+export const packageInfo = { name: '@polkadot/hw-ledger-transports', version: '7.2.1' };

packages/hw-ledger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/hw-ledger",
-  "version": "6.9.1",
+  "version": "7.2.1",
   "type": "module",
   "repository": "github:polkadot-js/common",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -16,9 +16,9 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.5",
-    "@polkadot/hw-ledger-transports": "6.9.1",
-    "@polkadot/util": "^6.9.1",
-    "@zondax/ledger-polkadot": "^0.14.0"
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/hw-ledger-transports": "7.2.1",
+    "@polkadot/util": "7.2.1",
+    "@zondax/ledger-substrate": "^0.17.3"
   }
 }

packages/hw-ledger/src/bundle.ts

@@ -0,0 +1,103 @@
+// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { ResponseBase, SubstrateApp } from '@zondax/ledger-substrate';
+import type { AccountOptions, LedgerAddress, LedgerSignature, LedgerTypes, LedgerVersion } from './types';
+
+import { transports } from '@polkadot/hw-ledger-transports';
+import { assert, u8aToBuffer } from '@polkadot/util';
+
+import { LEDGER_DEFAULT_ACCOUNT, LEDGER_DEFAULT_CHANGE, LEDGER_DEFAULT_INDEX, LEDGER_SUCCESS_CODE } from './constants';
+import { ledgerApps } from './defaults';
+
+export { packageInfo } from './packageInfo';
+
+type Chain = keyof typeof ledgerApps;
+
+// A very basic wrapper for a ledger app -
+//  - it connects automatically, creating an app as required
+//  - Promises return errors (instead of wrapper errors)
+export class Ledger {
+  #app: SubstrateApp | null = null;
+
+  #chain: Chain;
+
+  #transport: LedgerTypes;
+
+  constructor (transport: LedgerTypes, chain: Chain) {
+    // u2f is deprecated
+    assert(['hid', 'webusb'].includes(transport), () => `Unsupported transport ${transport}`);
+    assert(Object.keys(ledgerApps).includes(chain), () => `Unsupported chain ${chain}`);
+
+    this.#chain = chain;
+    this.#transport = transport;
+  }
+
+  public async getAddress (confirm = false, accountOffset = 0, addressOffset = 0, { account = LEDGER_DEFAULT_ACCOUNT, addressIndex = LEDGER_DEFAULT_INDEX, change = LEDGER_DEFAULT_CHANGE }: Partial<AccountOptions> = {}): Promise<LedgerAddress> {
+    return this.#withApp(async (app: SubstrateApp): Promise<LedgerAddress> => {
+      const { address, pubKey } = await this.#wrapError(app.getAddress(account + accountOffset, change, addressIndex + addressOffset, confirm));
+
+      return {
+        address,
+        publicKey: `0x${pubKey}`
+      };
+    });
+  }
+
+  public async getVersion (): Promise<LedgerVersion> {
+    return this.#withApp(async (app: SubstrateApp): Promise<LedgerVersion> => {
+      const { device_locked: isLocked, major, minor, patch, test_mode: isTestMode } = await this.#wrapError(app.getVersion());
+
+      return {
+        isLocked,
+        isTestMode,
+        version: [major, minor, patch]
+      };
+    });
+  }
+
+  public async sign (message: Uint8Array, accountOffset = 0, addressOffset = 0, { account = LEDGER_DEFAULT_ACCOUNT, addressIndex = LEDGER_DEFAULT_INDEX, change = LEDGER_DEFAULT_CHANGE }: Partial<AccountOptions> = {}): Promise<LedgerSignature> {
+    return this.#withApp(async (app: SubstrateApp): Promise<LedgerSignature> => {
+      const buffer = u8aToBuffer(message);
+      const { signature } = await this.#wrapError(app.sign(account + accountOffset, change, addressIndex + addressOffset, buffer));
+
+      return {
+        signature: `0x${signature.toString('hex')}`
+      };
+    });
+  }
+
+  #getApp = async (): Promise<SubstrateApp> => {
+    if (!this.#app) {
+      const def = transports.find(({ type }) => type === this.#transport);
+
+      assert(def, () => `Unable to find a transport for ${this.#transport}`);
+
+      const transport = await def.create();
+
+      this.#app = ledgerApps[this.#chain](transport);
+    }
+
+    return this.#app;
+  };
+
+  #withApp = async <T> (fn: (app: SubstrateApp) => Promise<T>): Promise<T> => {
+    try {
+      const app = await this.#getApp();
+
+      return await fn(app);
+    } catch (error) {
+      this.#app = null;
+
+      throw error;
+    }
+  };
+
+  #wrapError = async <T extends ResponseBase> (promise: Promise<T>): Promise<T> => {
+    const result = await promise;
+
+    assert(result.return_code === LEDGER_SUCCESS_CODE, () => result.error_message);
+
+    return result;
+  };
+}

packages/hw-ledger/src/defaults.ts

@@ -2,18 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type Transport from '@ledgerhq/hw-transport';
-import type { SubstrateApp } from '@zondax/ledger-polkadot';
+import type { SubstrateApp } from '@zondax/ledger-substrate';
 
-import { newDockApp, newEdgewareApp, newEquilibriumApp, newKusamaApp, newPolkadotApp, newPolymeshApp } from '@zondax/ledger-polkadot';
+import { newCentrifugeApp, newDockApp, newEdgewareApp, newEquilibriumApp, newKusamaApp, newPolkadotApp, newPolymeshApp, newStatemineApp } from '@zondax/ledger-substrate';
 
-// These match up with the network keys in the @polkadot/networks package
-// (which is turn aligns with the substrate/ss58-registry.json as the single
-// source of truth)
+// These match up with the keys of the knownLedger object in the @polkadot/networks/defaults.ts
 export const ledgerApps: Record<string, (transport: Transport) => SubstrateApp> = {
+  centrifuge: newCentrifugeApp,
   'dock-mainnet': newDockApp,
   edgeware: newEdgewareApp,
   equilibrium: newEquilibriumApp,
   kusama: newKusamaApp,
   polkadot: newPolkadotApp,
-  polymesh: newPolymeshApp
+  polymesh: newPolymeshApp,
+  statemine: newStatemineApp
 };

packages/hw-ledger/src/index.ts

@@ -3,103 +3,4 @@
 
 import './detectPackage';
 
-import type { ResponseBase, SubstrateApp } from '@zondax/ledger-polkadot';
-import type { AccountOptions, LedgerAddress, LedgerSignature, LedgerTypes, LedgerVersion } from './types';
-
-import { transports } from '@polkadot/hw-ledger-transports';
-import { assert, u8aToBuffer } from '@polkadot/util';
-
-import { LEDGER_DEFAULT_ACCOUNT, LEDGER_DEFAULT_CHANGE, LEDGER_DEFAULT_INDEX, LEDGER_SUCCESS_CODE } from './constants';
-import { ledgerApps } from './defaults';
-
-export { packageInfo } from './packageInfo';
-
-type Chain = keyof typeof ledgerApps;
-
-// A very basic wrapper for a ledger app -
-//  - it connects automatically, creating an app as required
-//  - Promises return errors (instead of wrapper errors)
-export class Ledger {
-  #app: SubstrateApp | null = null;
-
-  #chain: Chain;
-
-  #transport: LedgerTypes;
-
-  constructor (transport: LedgerTypes, chain: Chain) {
-    // u2f is deprecated
-    assert(['hid', 'webusb'].includes(transport), () => `Unsupported transport ${transport}`);
-    assert(Object.keys(ledgerApps).includes(chain), () => `Unsupported chain ${chain}`);
-
-    this.#chain = chain;
-    this.#transport = transport;
-  }
-
-  public async getAddress (confirm = false, accountOffset = 0, addressOffset = 0, { account = LEDGER_DEFAULT_ACCOUNT, addressIndex = LEDGER_DEFAULT_INDEX, change = LEDGER_DEFAULT_CHANGE }: Partial<AccountOptions> = {}): Promise<LedgerAddress> {
-    return this.#withApp(async (app: SubstrateApp): Promise<LedgerAddress> => {
-      const { address, pubKey } = await this.#wrapError(app.getAddress(account + accountOffset, change, addressIndex + addressOffset, confirm));
-
-      return {
-        address,
-        publicKey: `0x${pubKey}`
-      };
-    });
-  }
-
-  public async getVersion (): Promise<LedgerVersion> {
-    return this.#withApp(async (app: SubstrateApp): Promise<LedgerVersion> => {
-      const { device_locked: isLocked, major, minor, patch, test_mode: isTestMode } = await this.#wrapError(app.getVersion());
-
-      return {
-        isLocked,
-        isTestMode,
-        version: [major, minor, patch]
-      };
-    });
-  }
-
-  public async sign (message: Uint8Array, accountOffset = 0, addressOffset = 0, { account = LEDGER_DEFAULT_ACCOUNT, addressIndex = LEDGER_DEFAULT_INDEX, change = LEDGER_DEFAULT_CHANGE }: Partial<AccountOptions> = {}): Promise<LedgerSignature> {
-    return this.#withApp(async (app: SubstrateApp): Promise<LedgerSignature> => {
-      const buffer = u8aToBuffer(message);
-      const { signature } = await this.#wrapError(app.sign(account + accountOffset, change, addressIndex + addressOffset, buffer));
-
-      return {
-        signature: `0x${signature.toString('hex')}`
-      };
-    });
-  }
-
-  #getApp = async (): Promise<SubstrateApp> => {
-    if (!this.#app) {
-      const def = transports.find(({ type }) => type === this.#transport);
-
-      assert(def, () => `Unable to find a transport for ${this.#transport}`);
-
-      const transport = await def.create();
-
-      this.#app = ledgerApps[this.#chain](transport);
-    }
-
-    return this.#app;
-  };
-
-  #withApp = async <T> (fn: (app: SubstrateApp) => Promise<T>): Promise<T> => {
-    try {
-      const app = await this.#getApp();
-
-      return await fn(app);
-    } catch (error) {
-      this.#app = null;
-
-      throw error;
-    }
-  };
-
-  #wrapError = async <T extends ResponseBase> (promise: Promise<T>): Promise<T> => {
-    const result = await promise;
-
-    assert(result.return_code === LEDGER_SUCCESS_CODE, () => result.error_message);
-
-    return result;
-  };
-}
+export * from './bundle';

packages/hw-ledger/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/hw-ledger', version: '6.9.1' };
+export const packageInfo = { name: '@polkadot/hw-ledger', version: '7.2.1' };

packages/keyring/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/keyring",
-  "version": "6.9.1",
+  "version": "7.2.1",
   "type": "module",
   "description": "Keyring management",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -19,12 +19,12 @@
   "bugs": "https://github.com/polkadot-js/common/issues",
   "homepage": "https://github.com/polkadot-js/common/tree/master/packages/keyring#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.5",
-    "@polkadot/util": "6.9.1",
-    "@polkadot/util-crypto": "6.9.1"
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/util": "7.2.1",
+    "@polkadot/util-crypto": "7.2.1"
   },
   "peerDependencies": {
-    "@polkadot/util": "6.9.1",
-    "@polkadot/util-crypto": "6.9.1"
+    "@polkadot/util": "7.2.1",
+    "@polkadot/util-crypto": "7.2.1"
   }
 }

packages/keyring/src/bundle.ts

@@ -0,0 +1,14 @@
+// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { Keyring } from './keyring';
+
+export { decodeAddress, encodeAddress, setSS58Format } from '@polkadot/util-crypto';
+
+export * from './defaults';
+export { createPair } from './pair';
+export { packageInfo } from './packageInfo';
+export { createTestKeyring } from './testing';
+export { createTestPairs } from './testingPairs';
+
+export { Keyring };

packages/keyring/src/index.ts

@@ -3,12 +3,8 @@
 
 import './detectPackage';
 
-import { Keyring } from './keyring';
+import { Keyring } from './bundle';
 
-export { decodeAddress, encodeAddress, setSS58Format } from '@polkadot/util-crypto';
-
-export { packageInfo } from './packageInfo';
+export * from './bundle';
 
 export default Keyring;
-
-export { Keyring };

packages/keyring/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/keyring', version: '6.9.1' };
+export const packageInfo = { name: '@polkadot/keyring', version: '7.2.1' };

packages/keyring/src/pair/index.spec.ts

@@ -18,6 +18,10 @@ describe('pair', (): void => {
   });
 
   const SIGNATURE = new Uint8Array([80, 191, 198, 147, 225, 207, 75, 88, 126, 39, 129, 109, 191, 38, 72, 181, 75, 254, 81, 143, 244, 79, 237, 38, 236, 141, 28, 252, 134, 26, 169, 234, 79, 33, 153, 158, 151, 34, 175, 188, 235, 20, 35, 135, 83, 120, 139, 211, 233, 130, 1, 208, 201, 215, 73, 80, 56, 98, 185, 196, 11, 8, 193, 14]);
+  const ENCRYPTED = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 132, 59, 53, 85, 227, 40, 107, 48, 234, 198, 238, 157, 238, 224, 235, 179, 75, 153, 241, 142, 254]);
+
+  // the last byte is changed from 254 -> 253
+  const ENCRYPTED_CHANGED = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 132, 59, 53, 85, 227, 40, 107, 48, 234, 198, 238, 157, 238, 224, 235, 179, 75, 153, 241, 142, 253]);
 
   it('has a publicKey', (): void => {
     expect(
@@ -53,7 +57,7 @@ describe('pair', (): void => {
   it('fails a correctly signed message (signer changed)', (): void => {
     expect(
       keyring.alice.verify(
-        new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]),
+        new Uint8Array([0x61, 0x62, 0x63, 0x64]),
         SIGNATURE,
         keyring.bob.publicKey
       )
@@ -94,6 +98,93 @@ describe('pair', (): void => {
     ).toBe(false);
   });
 
+  it('allows encrypting', (): void => {
+    const message = new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]);
+
+    expect(
+      keyring.alice.encryptMessage(
+        message,
+        keyring.bob.publicKey,
+        new Uint8Array(24)
+      )
+    ).toEqual(ENCRYPTED);
+  });
+
+  it('validates a correctly encrypted message', (): void => {
+    const message = new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]);
+
+    expect(
+      keyring.bob.decryptMessage(
+        ENCRYPTED,
+        keyring.alice.publicKey
+      )
+    ).toEqual(message);
+  });
+
+  it('fails a correctly encrypted message (message changed)', (): void => {
+    expect(
+      keyring.bob.decryptMessage(
+        ENCRYPTED_CHANGED,
+        keyring.alice.publicKey
+      )
+    ).toEqual(null);
+  });
+
+  it('fails a correctly encrypted message (sender changed)', (): void => {
+    expect(
+      keyring.bob.decryptMessage(
+        ENCRYPTED,
+        keyring.charlie.publicKey
+      )
+    ).toEqual(null);
+  });
+
+  it('fails a correctly encrypted message (receiver changed)', (): void => {
+    expect(
+      keyring.charlie.decryptMessage(
+        ENCRYPTED,
+        keyring.alice.publicKey
+      )
+    ).toEqual(null);
+  });
+
+  it('validates encryption between ed25519 & sr25519 key pairs', (): void => {
+    const PASS = 'testing';
+    const encodedA = keyring.alice.encodePkcs8(PASS);
+    const encodedB = keyring.bob.encodePkcs8(PASS);
+
+    const pairA = createPair({ toSS58, type: 'sr25519' }, { publicKey: keyring.alice.publicKey });
+    const pairB = createPair({ toSS58, type: 'sr25519' }, { publicKey: keyring.bob.publicKey });
+
+    pairA.decodePkcs8(PASS, encodedA);
+    pairB.decodePkcs8(PASS, encodedB);
+    const message = new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]);
+
+    // alice-sr25519 -> bob-ed25519
+    const encrypted1 = pairA.encryptMessage(message, keyring.bob.publicKey);
+
+    // alice-sr25519 -> bob-sr25519
+    const encrypted2 = pairA.encryptMessage(message, pairB.publicKey);
+
+    // alice-ed25519 -> bob-sr25519
+    const encrypted3 = keyring.alice.encryptMessage(message, pairB.publicKey);
+
+    // decrypt: Bob-ed25519 - use alice-ed25519 pubkey
+    expect(
+      keyring.bob.decryptMessage(encrypted3, keyring.alice.publicKey)
+    ).toEqual(message);
+
+    // decrypt: Bob-ed25519 - use alice-sr25519 pubkey
+    expect(
+      keyring.bob.decryptMessage(encrypted1, pairA.publicKey)
+    ).toEqual(message);
+
+    // decrypt: Bob-sr25519 - use alice-sr25519 pubkey
+    expect(
+      pairB.decryptMessage(encrypted2, pairA.publicKey)
+    ).toEqual(message);
+  });
+
   it('allows setting/getting of meta', (): void => {
     keyring.bob.setMeta({ foo: 'bar', something: 'else' });
 
@@ -183,5 +274,22 @@ describe('pair', (): void => {
       });
       expect(json.address).toEqual(u8aToHex(PUBLICDERIVED));
     });
+
+    it('denies access to encryptMessage/decryptMessage API', (): void => {
+      const PASS = 'testing';
+      const encoded = keyring.alice.encodePkcs8(PASS);
+
+      const pair = createPair({ toSS58, type: 'ethereum' }, { publicKey: keyring.alice.publicKey });
+
+      pair.decodePkcs8(PASS, encoded);
+
+      expect(
+        () => pair.encryptMessage(
+          new Uint8Array(4), // null message
+          keyring.bob.publicKey,
+          new Uint8Array(24)
+        )
+      ).toThrow('Secp256k1 not supported yet');
+    });
   });
 });

packages/keyring/src/pair/index.ts

@@ -7,7 +7,7 @@ import type { KeyringPair, KeyringPair$Json, KeyringPair$Meta, SignOptions } fro
 import type { PairInfo } from './types';
 
 import { assert, u8aConcat, u8aEq, u8aToHex, u8aToU8a } from '@polkadot/util';
-import { blake2AsU8a, ethereumEncode, keccakAsU8a, keyExtractPath, keyFromPath, naclKeypairFromSeed as naclFromSeed, naclSign, schnorrkelKeypairFromSeed as schnorrkelFromSeed, schnorrkelSign, schnorrkelVrfSign, schnorrkelVrfVerify, secp256k1Compress, secp256k1Expand, secp256k1KeypairFromSeed as secp256k1FromSeed, secp256k1Sign, signatureVerify } from '@polkadot/util-crypto';
+import { blake2AsU8a, convertPublicKeyToCurve25519, convertSecretKeyToCurve25519, ethereumEncode, keccakAsU8a, keyExtractPath, keyFromPath, naclKeypairFromSeed as naclFromSeed, naclOpen, naclSeal, naclSign, schnorrkelKeypairFromSeed as schnorrkelFromSeed, schnorrkelSign, schnorrkelVrfSign, schnorrkelVrfVerify, secp256k1Compress, secp256k1Expand, secp256k1KeypairFromSeed as secp256k1FromSeed, secp256k1Sign, signatureVerify } from '@polkadot/util-crypto';
 
 import { decodePair } from './decode';
 import { encodePair } from './encode';
@@ -145,6 +145,17 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
     },
     // eslint-disable-next-line sort-keys
     decodePkcs8,
+    decryptMessage: (encryptedMessageWithNonce: string | Uint8Array, senderPublicKey: string | Uint8Array): Uint8Array | null => {
+      assert(!isLocked(secretKey), 'Cannot encrypt with a locked key pair');
+      assert(!['ecdsa', 'ethereum'].includes(type), 'Secp256k1 not supported yet');
+
+      return naclOpen(
+        u8aToU8a(encryptedMessageWithNonce.slice(24, encryptedMessageWithNonce.length)),
+        u8aToU8a(encryptedMessageWithNonce.slice(0, 24)),
+        convertPublicKeyToCurve25519(u8aToU8a(senderPublicKey)),
+        convertSecretKeyToCurve25519(secretKey)
+      );
+    },
     derive: (suri: string, meta?: KeyringPair$Meta): KeyringPair => {
       assert(type !== 'ethereum', 'Unable to derive on this keypair');
       assert(!isLocked(secretKey), 'Cannot derive on a locked keypair');
@@ -157,6 +168,14 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
     encodePkcs8: (passphrase?: string): Uint8Array => {
       return recode(passphrase);
     },
+    encryptMessage: (message: string | Uint8Array, recipientPublicKey: string | Uint8Array, _nonce?: Uint8Array): Uint8Array => {
+      assert(!isLocked(secretKey), 'Cannot encrypt with a locked key pair');
+      assert(!['ecdsa', 'ethereum'].includes(type), 'Secp256k1 not supported yet');
+
+      const { nonce, sealed } = naclSeal(u8aToU8a(message), convertSecretKeyToCurve25519(secretKey), convertPublicKeyToCurve25519(u8aToU8a(recipientPublicKey)), _nonce);
+
+      return u8aConcat(nonce, sealed);
+    },
     lock: (): void => {
       secretKey = new Uint8Array();
     },
@@ -176,8 +195,11 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
     toJson: (passphrase?: string): KeyringPair$Json => {
       // NOTE: For ecdsa and ethereum, the publicKey cannot be extracted from the address. For these
       // pass the hex-encoded publicKey through to the address portion of the JSON (before decoding)
+      // unless the publicKey is already an address
       const address = ['ecdsa', 'ethereum'].includes(type)
-        ? u8aToHex(secp256k1Compress(publicKey))
+        ? publicKey.length === 20
+          ? u8aToHex(publicKey)
+          : u8aToHex(secp256k1Compress(publicKey))
         : encodeAddress();
 
       return pairToJson(type, { address, meta }, recode(passphrase), !!passphrase);

packages/keyring/src/pair/nobody.ts

@@ -30,11 +30,17 @@ export function nobody (): KeyringPair {
     decodePkcs8: (passphrase?: string, encoded?: Uint8Array): void =>
       undefined,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    decryptMessage: (encryptedMessageWithNonce: string | Uint8Array, senderPublicKey: string | Uint8Array): Uint8Array | null =>
+      null,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     derive: (suri: string, meta?: KeyringPair$Meta): KeyringPair =>
       pair,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     encodePkcs8: (passphrase?: string): Uint8Array =>
       new Uint8Array(0),
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    encryptMessage: (message: string | Uint8Array, recipientPublicKey: string | Uint8Array, _nonce?: Uint8Array): Uint8Array =>
+      new Uint8Array(),
     isLocked: true,
     lock: (): void => {
       // no locking, it is always locked

packages/keyring/src/testing.ts

@@ -6,8 +6,8 @@ import type { KeyringInstance, KeyringOptions } from './types';
 import { hexToU8a } from '@polkadot/util';
 import { KeypairType } from '@polkadot/util-crypto/types';
 
+import { Keyring } from './keyring';
 import { createPair } from './pair';
-import Keyring from '.';
 
 interface PairDef {
   name?: string;

packages/keyring/src/types.ts

@@ -37,6 +37,8 @@ export interface KeyringPair {
   sign (message: string | Uint8Array, options?: SignOptions): Uint8Array;
   toJson (passphrase?: string): KeyringPair$Json;
   unlock (passphrase?: string): void;
+  encryptMessage (message: string | Uint8Array, recipientPublicKey: string | Uint8Array, nonce?: Uint8Array): Uint8Array;
+  decryptMessage (encryptedMessageWithNonce: string | Uint8Array, senderPublicKey: string | Uint8Array): Uint8Array | null;
   verify (message: string | Uint8Array, signature: Uint8Array, signerPublic: string | Uint8Array): boolean;
   vrfSign (message: string | Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): Uint8Array;
   vrfVerify (message: string | Uint8Array, vrfResult: Uint8Array, signerPublic: Uint8Array | string, context?: string | Uint8Array, extra?: string | Uint8Array): boolean;

packages/networks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/networks",
-  "version": "6.9.1",
+  "version": "7.2.1",
   "type": "module",
   "description": "A list of all available Substrate networks and their applicable prefixes",
   "main": "index.js",
@@ -16,10 +16,10 @@
   "bugs": "https://github.com/polkadot-js/common/issues",
   "homepage": "https://github.com/polkadot-js/common/tree/master/packages/networks#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.5"
+    "@babel/runtime": "^7.15.3"
   },
   "devDependencies": {
-    "@polkadot/util": "6.9.1",
-    "@polkadot/x-fetch": "6.9.1"
+    "@polkadot/util": "7.2.1",
+    "@polkadot/x-fetch": "7.2.1"
   }
 }

packages/networks/src/crosscheck.spec.ts

@@ -8,7 +8,7 @@ import fs from 'fs';
 import { stringify } from '@polkadot/util';
 import { fetch } from '@polkadot/x-fetch';
 
-import { all } from './';
+import { allNetworks } from './';
 
 const OUTPUT = './.github/ss58-check.md';
 const SUBSTRATE_REGISTRY = 'https://raw.githubusercontent.com/paritytech/substrate/master/ss58-registry.json';
@@ -32,19 +32,19 @@ describe('check latest Substrate ss58 registry', (): void => {
   });
 
   it('has the same number as the original', (): void => {
-    assertAndLog(all.length === original.registry.length, `Number of entries mismatched:: Expected ${original.registry.length} found ${all.length}`);
+    assertAndLog(allNetworks.length === original.registry.length, `Number of entries mismatched:: Expected ${original.registry.length} found ${allNetworks.length}`);
   });
 
   it('has no missing any entries', (): void => {
     const missing = original.registry
-      .filter(({ prefix }) => !all.some((n) => n.prefix === prefix))
+      .filter(({ prefix }) => !allNetworks.some((n) => n.prefix === prefix))
       .map(({ displayName, prefix }) => `${displayName} (${prefix})`);
 
     assertAndLog(!missing.length, `Missing entries found: ${stringify(missing, 2)}`);
   });
 
   it('has no extra entries', (): void => {
-    const missing = all
+    const missing = allNetworks
       .filter(({ prefix }) => !original.registry.some((n) => n.prefix === prefix))
       .map(({ displayName, prefix }) => `${displayName} (${prefix})`);
 
@@ -55,7 +55,7 @@ describe('check latest Substrate ss58 registry', (): void => {
     const fields = Object.keys(original.schema) as (keyof KnownSubstrate)[];
     const errors = original.registry
       .map((n): [string, string[]] => {
-        const other = all.find(({ prefix }) => prefix === n.prefix);
+        const other = allNetworks.find(({ prefix }) => prefix === n.prefix);
 
         return [
           `${n.displayName} (${n.prefix})`,

packages/networks/src/defaults.ts

@@ -8,6 +8,9 @@ import type { KnownGenesis, KnownIcon, KnownLedger, KnownTestnet } from './types
 // last. This make lookups for the current a simple genesisHash[0]
 // (See Kusama as an example)
 export const knownGenesis: KnownGenesis = {
+  centrifuge: [
+    '0x67dddf2673b69e5f875f6f25277495834398eafd67f492e09f3f3345e003d1b5'
+  ],
   'dock-mainnet': [
     '0xf73467c6544aa68df2ee546b135f955c46b90fa627e9b5d7935f41061bb8a5a9'
   ],
@@ -23,6 +26,9 @@ export const knownGenesis: KnownGenesis = {
     '0x3d75507dd46301767e601265791da1d9cb47b6ebc94e87347b635e5bf58bd047', // Snakenet Gen2
     '0x0ed32bfcab4a83517fac88f2aa7cbc2f88d3ab93be9a12b6188a036bf8a943c2' // Snakenet Gen1
   ],
+  karura: [
+    '0xbaf5aabe40646d11f0ee8abbdc64f4a4b7674925cba08e4a05ff9ebed6e2126b'
+  ],
   kulupu: [
     '0xf7a99d3cb92853d00d5275c971c132c074636256583fee53b3bbe60d7b8769ba'
   ],
@@ -40,6 +46,9 @@ export const knownGenesis: KnownGenesis = {
   polymesh: [
     '0x9deeb940c92ae02111c3bd5baca89970384f4c9849f02a1b2e53e66414d30f9f'
   ],
+  statemine: [
+    '0x48239ef607d7928874027a43a67689209727dfb3d3dc5e5b03a39bdc2eda771a'
+  ],
   subsocial: [
     '0x0bd72c1c305172e1275278aaeb3f161e02eccb7a819e63f62d47bd53a28189f8'
   ]
@@ -47,18 +56,26 @@ export const knownGenesis: KnownGenesis = {
 
 // these are icon overrides
 export const knownIcon: KnownIcon = {
+  centrifuge: 'polkadot',
   kusama: 'polkadot',
-  polkadot: 'polkadot'
+  polkadot: 'polkadot',
+  statemine: 'polkadot',
+  statemint: 'polkadot',
+  westmint: 'polkadot'
 };
 
-// support for ledger
+// These match up with the keys of the ledgerApps object in the @polkadot/hw-ledger/defaults.ts
+// and maps to the known slip44 (minus the `0x8` hard derivation flag)
+// NOTE: Any network here needs to have a genesisHash attached in the config above
 export const knownLedger: KnownLedger = {
+  centrifuge: 0x000002eb,
   'dock-mainnet': 0x00000252,
   edgeware: 0x0000020b,
   equilibrium: 0x05f5e0fd,
   kusama: 0x000001b2,
   polkadot: 0x00000162,
-  polymesh: 0x00000253
+  polymesh: 0x00000253,
+  statemine: 0x000001b2 // common-good on Kusama, shares derivation
 };
 
 // testnets should not allow selection

packages/networks/src/index.spec.ts

@@ -4,25 +4,25 @@
 import type { SubstrateNetwork } from './types';
 
 import { knownGenesis, knownIcon, knownLedger, knownTestnet } from './defaults';
-import filtered, { all, available } from '.';
+import { allNetworks, availableNetworks, selectableNetworks } from '.';
 
-describe('filtered', (): void => {
+describe('selectableNetworks', (): void => {
   it('has the correct starting order', (): void => {
-    expect(filtered.slice(0, 3).map(({ prefix }) => prefix)).toEqual([0, 2, 42]);
+    expect(selectableNetworks.slice(0, 3).map(({ prefix }) => prefix)).toEqual([0, 2, 42]);
   });
 
   it('has no ignored networks', (): void => {
-    expect(available.some(({ isIgnored }) => isIgnored)).toEqual(false);
+    expect(availableNetworks.some(({ isIgnored }) => isIgnored)).toEqual(false);
   });
 
   it('has no reserved networks', (): void => {
-    expect(available.some(({ prefix }) => prefix === 47)).toEqual(false);
+    expect(availableNetworks.some(({ prefix }) => prefix === 47)).toEqual(false);
   });
 
-  it('has all genesis information', (): void => {
+  it('has allNetworks genesis information', (): void => {
     expect(
       Object.entries(knownGenesis).filter(([network, genesisHash]) =>
-        available.some((a) =>
+        availableNetworks.some((a) =>
           a.network === network &&
           genesisHash.some((g, index) => a.genesisHash[index] !== g)
         )
@@ -30,10 +30,10 @@ describe('filtered', (): void => {
     ).toEqual([]);
   });
 
-  it('has all ledger details', (): void => {
+  it('has allNetworks ledger details', (): void => {
     expect(
       Object.entries(knownLedger).filter(([network, slip44]) =>
-        available.some((a) =>
+        availableNetworks.some((a) =>
           a.network === network && (
             a.slip44 !== slip44 ||
             !a.hasLedgerSupport ||
@@ -47,16 +47,16 @@ describe('filtered', (): void => {
   it('has no testnets exposed', (): void => {
     expect(
       Object.keys(knownTestnet).filter((network) =>
-        available.some((a) =>
+        availableNetworks.some((a) =>
           a.network === network
         )
       )
     ).toEqual([]);
   });
 
-  it('has all icons, except for overrides', (): void => {
+  it('has allNetworks icons, except for overrides', (): void => {
     expect(
-      available.filter(({ icon, network }) =>
+      availableNetworks.filter(({ icon, network }) =>
         icon !== 'substrate' &&
         knownIcon[network] !== icon
       )
@@ -67,7 +67,7 @@ describe('filtered', (): void => {
     const dupes: SubstrateNetwork[] = [];
     const uniques: SubstrateNetwork[] = [];
 
-    all.forEach((a): void => {
+    allNetworks.forEach((a): void => {
       if (uniques.some((u) => u.prefix === a.prefix)) {
         dupes.push(a);
       } else {

packages/networks/src/index.ts

@@ -1,46 +1,5 @@
 // Copyright 2017-2021 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Network, SubstrateNetwork } from './types';
-
-import { knownGenesis, knownIcon, knownLedger, knownTestnet } from './defaults';
-import { knownSubstrate } from './substrate';
-
+export * from './interfaces';
 export { packageInfo } from './packageInfo';
-
-// These are known prefixes that are not sorted
-const UNSORTED = [0, 2, 42];
-
-export const all = knownSubstrate.map((o): SubstrateNetwork => {
-  const network = o.network || '';
-  const n = o as SubstrateNetwork;
-
-  n.slip44 = knownLedger[network];
-  n.hasLedgerSupport = !!n.slip44;
-
-  n.genesisHash = knownGenesis[network] || [];
-  n.icon = knownIcon[network] || 'substrate';
-  n.isIgnored = !network || !!knownTestnet[network] || network.startsWith('reserved');
-
-  return n;
-});
-
-// The list of available/claimed prefixes
-//   - no testnets
-//   - we only include those where we have a standardAccount
-//   - when no icon has been specified, default to substrate
-//   - sort by name, however we keep 0, 2, 42 first in the list
-export const available = all
-  .filter((n): n is Network => !n.isIgnored && !!n.network)
-  .sort((a, b) =>
-    UNSORTED.includes(a.prefix) === UNSORTED.includes(b.prefix)
-      ? 0
-      : UNSORTED.includes(a.prefix)
-        ? -1
-        : UNSORTED.includes(b.prefix)
-          ? 1
-          : a.displayName.localeCompare(b.displayName)
-  );
-
-// A filtered list of those chains we have details about (genesisHashes)
-export default available.filter((n) => n.genesisHash.length || n.prefix === 42);

packages/networks/src/interfaces.ts

@@ -0,0 +1,43 @@
+// Copyright 2017-2021 @polkadot/networks authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Network, SubstrateNetwork } from './types';
+
+import { knownGenesis, knownIcon, knownLedger, knownTestnet } from './defaults';
+import { knownSubstrate } from './substrate';
+
+// These are known prefixes that are not sorted
+const UNSORTED = [0, 2, 42];
+
+export const allNetworks = knownSubstrate.map((o): SubstrateNetwork => {
+  const network = o.network || '';
+  const n = o as SubstrateNetwork;
+
+  n.slip44 = knownLedger[network];
+  n.hasLedgerSupport = !!n.slip44;
+
+  n.genesisHash = knownGenesis[network] || [];
+  n.icon = knownIcon[network] || 'substrate';
+  n.isIgnored = !network || !!knownTestnet[network] || network.startsWith('reserved');
+
+  return n;
+});
+
+// The list of available/claimed prefixes
+//   - no testnets
+//   - we only include those where we have a standardAccount
+//   - sort by name, however we keep 0, 2, 42 first in the list
+export const availableNetworks = allNetworks
+  .filter((n): n is Network => !n.isIgnored && !!n.network)
+  .sort((a, b) =>
+    UNSORTED.includes(a.prefix) === UNSORTED.includes(b.prefix)
+      ? 0
+      : UNSORTED.includes(a.prefix)
+        ? -1
+        : UNSORTED.includes(b.prefix)
+          ? 1
+          : a.displayName.localeCompare(b.displayName)
+  );
+
+// A filtered list of those chains we have details about (genesisHashes)
+export const selectableNetworks = availableNetworks.filter((n) => n.genesisHash.length || n.prefix === 42);

packages/networks/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/networks', version: '6.9.1' };
+export const packageInfo = { name: '@polkadot/networks', version: '7.2.1' };

packages/networks/src/substrate.ts

@@ -332,7 +332,7 @@ export const knownSubstrate: KnownSubstrate[] = [
     network: 'centrifuge',
     prefix: 36,
     standardAccount: '*25519',
-    symbols: ['RAD'],
+    symbols: ['CFG'],
     website: 'https://centrifuge.io/'
   },
   {
@@ -488,6 +488,15 @@ export const knownSubstrate: KnownSubstrate[] = [
     symbols: ['XOR'],
     website: 'https://sora.org'
   },
+  {
+    decimals: [10],
+    displayName: 'Zeitgeist',
+    network: 'zeitgeist',
+    prefix: 73,
+    standardAccount: '*25519',
+    symbols: ['ZTG'],
+    website: 'https://zeitgeist.pm'
+  },
   {
     decimals: [12],
     displayName: 'Manta network',
@@ -506,6 +515,60 @@ export const knownSubstrate: KnownSubstrate[] = [
     symbols: ['KMA'],
     website: 'https://manta.network'
   },
+  {
+    decimals: [18],
+    displayName: 'PolkaSmith Canary Network',
+    network: 'polkasmith',
+    prefix: 98,
+    standardAccount: '*25519',
+    symbols: ['PKS'],
+    website: 'https://polkafoundry.com'
+  },
+  {
+    decimals: [18],
+    displayName: 'PolkaFoundry Network',
+    network: 'polkafoundry',
+    prefix: 99,
+    standardAccount: '*25519',
+    symbols: ['PKF'],
+    website: 'https://polkafoundry.com'
+  },
+  {
+    decimals: [18],
+    displayName: 'OriginTrail Parachain',
+    network: 'origintrail-parachain',
+    prefix: 101,
+    standardAccount: 'secp256k1',
+    symbols: ['TRAC'],
+    website: 'https://origintrail.io'
+  },
+  {
+    decimals: [12],
+    displayName: 'Heiko',
+    network: 'heiko',
+    prefix: 110,
+    standardAccount: '*25519',
+    symbols: ['HKO'],
+    website: 'https://parallel.fi/'
+  },
+  {
+    decimals: [18],
+    displayName: 'Altair',
+    network: 'altair',
+    prefix: 136,
+    standardAccount: '*25519',
+    symbols: ['AIR'],
+    website: 'https://centrifuge.io/'
+  },
+  {
+    decimals: [12],
+    displayName: 'Parallel',
+    network: 'parallel',
+    prefix: 172,
+    standardAccount: '*25519',
+    symbols: ['PARA'],
+    website: 'https://parallel.fi/'
+  },
   {
     decimals: [18],
     displayName: 'Social Network',
@@ -520,7 +583,7 @@ export const knownSubstrate: KnownSubstrate[] = [
     displayName: 'Moonbeam',
     network: 'moonbeam',
     prefix: 1284,
-    standardAccount: '*25519',
+    standardAccount: 'secp256k1',
     symbols: ['GLMR'],
     website: 'https://moonbeam.network'
   },
@@ -529,7 +592,7 @@ export const knownSubstrate: KnownSubstrate[] = [
     displayName: 'Moonriver',
     network: 'moonriver',
     prefix: 1285,
-    standardAccount: '*25519',
+    standardAccount: 'secp256k1',
     symbols: ['MOVR'],
     website: 'https://moonbeam.network'
   },

packages/networks/src/types.ts

@@ -8,7 +8,7 @@ export interface KnownSubstrate {
   displayName: string;
   network: string | null;
   prefix: number;
-  standardAccount: '*25519' | null;
+  standardAccount: '*25519' | 'secp256k1' | null;
   symbols: string[] | null;
   website: string | null;
 }

packages/util-crypto/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@polkadot/util-crypto",
-  "version": "6.9.1",
+  "version": "7.2.1",
   "type": "module",
   "description": "A collection of useful crypto utilities for @polkadot",
   "main": "index.js",
   "sideEffects": [
+    "./cryptoInit.js",
+    "./cryptoInit.cjs",
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
@@ -19,16 +21,17 @@
   "bugs": "https://github.com/polkadot-js/common/issues",
   "homepage": "https://github.com/polkadot-js/common/tree/master/packages/util-crypto#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.5",
-    "@polkadot/networks": "6.9.1",
-    "@polkadot/util": "6.9.1",
-    "@polkadot/wasm-crypto": "^4.0.2",
-    "@polkadot/x-randomvalues": "6.9.1",
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/networks": "7.2.1",
+    "@polkadot/util": "7.2.1",
+    "@polkadot/wasm-crypto": "^4.1.2",
+    "@polkadot/x-randomvalues": "7.2.1",
     "base-x": "^3.0.8",
     "base64-js": "^1.5.1",
-    "blakejs": "^1.1.0",
+    "blakejs": "^1.1.1",
     "bn.js": "^4.11.9",
     "create-hash": "^1.2.0",
+    "ed2curve": "^0.3.0",
     "elliptic": "^6.5.4",
     "hash.js": "^1.1.7",
     "js-sha3": "^0.8.0",
@@ -39,11 +42,11 @@
   "devDependencies": {
     "@types/bn.js": "^4.11.6",
     "@types/create-hash": "^1.2.2",
-    "@types/elliptic": "^6.4.12",
+    "@types/elliptic": "^6.4.13",
     "@types/scryptsy": "^2.0.0",
     "@types/xxhashjs": "^0.2.2"
   },
   "peerDependencies": {
-    "@polkadot/util": "6.9.1"
+    "@polkadot/util": "7.2.1"
   }
 }

packages/util-crypto/src/address/defaults.ts

@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { available } from '@polkadot/networks';
+import { availableNetworks } from '../networks';
 
 export const defaults = {
   allowedDecodedLengths: [1, 2, 4, 8, 32, 33],
   // publicKey has prefix + 2 checksum bytes, short only prefix + 1 checksum byte
   allowedEncodedLengths: [3, 4, 6, 10, 35, 36, 37, 38],
-  allowedPrefix: available.map(({ prefix }) => prefix),
+  allowedPrefix: availableNetworks.map(({ prefix }) => prefix),
   prefix: 42
 };

packages/util-crypto/src/address/encodeDerived.ts

@@ -14,6 +14,6 @@ import { createKeyDerived } from './keyDerived';
  * @description
  * Creates a Substrate derived address based on the input address/publicKey and the index supplied.
  */
-export function encodeDerivedAddress (who: Uint8Array | string, index: BigInt | BN | number, ss58Format?: Prefix): string {
+export function encodeDerivedAddress (who: Uint8Array | string, index: bigint | BN | number, ss58Format?: Prefix): string {
   return encodeAddress(createKeyDerived(decodeAddress(who), index), ss58Format);
 }

packages/util-crypto/src/address/encodeMulti.ts

@@ -13,6 +13,6 @@ import { createKeyMulti } from './keyMulti';
  * @description
  * Creates a Substrate multisig address based on the input address and the required threshold.
  */
-export function encodeMultiAddress (who: (Uint8Array | string)[], threshold: BigInt | BN | number, ss58Format?: Prefix): string {
+export function encodeMultiAddress (who: (Uint8Array | string)[], threshold: bigint | BN | number, ss58Format?: Prefix): string {
   return encodeAddress(createKeyMulti(who, threshold), ss58Format);
 }

packages/util-crypto/src/address/keyDerived.ts

@@ -10,7 +10,7 @@ import { decodeAddress } from './decode';
 
 const PREFIX = stringToU8a('modlpy/utilisuba');
 
-export function createKeyDerived (who: Uint8Array | string, index: BigInt | BN | number): Uint8Array {
+export function createKeyDerived (who: Uint8Array | string, index: bigint | BN | number): Uint8Array {
   return blake2AsU8a(
     u8aConcat(
       PREFIX,

packages/util-crypto/src/address/keyMulti.ts

@@ -10,7 +10,7 @@ import { decodeAddress } from './decode';
 
 const PREFIX = stringToU8a('modlpy/utilisuba');
 
-export function createKeyMulti (who: (Uint8Array | string)[], threshold: BigInt | BN | number): Uint8Array {
+export function createKeyMulti (who: (Uint8Array | string)[], threshold: bigint | BN | number): Uint8Array {
   return blake2AsU8a(
     u8aConcat(
       PREFIX,

packages/util-crypto/src/base58/validate.ts

@@ -13,8 +13,8 @@ interface CheckConfig {
 
 const BASE_CONFIG = { alphabet: BASE58_ALPHABET, ipfsChar: 'z', type: 'base58' };
 
-export function validateChars ({ alphabet, ipfsChar, type }: CheckConfig, value?: string | null, ipfsCompat?: boolean): true {
-  assert(value, () => `Expected non-null, non-empty ${type} input`);
+export function validateChars ({ alphabet, ipfsChar, type }: CheckConfig, value?: unknown, ipfsCompat?: boolean): true {
+  assert(value && typeof value === 'string', () => `Expected non-null, non-empty ${type} string input`);
   assert(!ipfsCompat || value[0] === ipfsChar, () => `Expected ${type} to start with '${ipfsChar}'`);
 
   for (let i = (ipfsCompat ? 1 : 0); i < value.length; i++) {

packages/util-crypto/src/base64/validate.ts

@@ -10,7 +10,7 @@ import { assert } from '@polkadot/util';
  * Validates that the supplied value is valid base64
  */
 export function base64Validate (value?: string | null): value is string {
-  assert(value, 'Expected non-null, non-empty base64 input');
+  assert(value && typeof value === 'string', 'Expected non-null, non-empty base64 string input');
   assert(/^(?:[A-Za-z0-9+/]{2}[A-Za-z0-9+/]{2})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(value), 'Invalid base64 encoding');
 
   return true;

packages/util-crypto/src/blake2/asHex.spec.ts

@@ -11,35 +11,43 @@ describe('blake2AsHex', (): void => {
     await waitReady();
   });
 
-  it('returns a 64-bit value (specified)', (): void => {
-    expect(
-      blake2AsHex('abc', 64)
-    ).toEqual('0xd8bb14d833d59559');
-  });
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('returns a 64-bit value (specified)', (): void => {
+      expect(
+        blake2AsHex('abc', 64, null, onlyJs)
+      ).toEqual('0xd8bb14d833d59559');
+    });
 
-  it('returns a 128-bit value (as specified)', (): void => {
-    expect(
-      blake2AsHex('abc', 128)
-    ).toEqual('0xcf4ab791c62b8d2b2109c90275287816');
-  });
+    it('returns a 128-bit value (as specified)', (): void => {
+      expect(
+        blake2AsHex('abc', 128, null, onlyJs)
+      ).toEqual('0xcf4ab791c62b8d2b2109c90275287816');
+    });
 
-  it('returns a 256-bit value (default)', (): void => {
-    expect(
-      blake2AsHex('abc')
-    ).toEqual('0xbddd813c634239723171ef3fee98579b94964e3bb1cb3e427262c8c068d52319');
-  });
+    it('returns a 128-bit value (as specified, with key)', (): void => {
+      expect(
+        blake2AsHex('abc', 128, new Uint8Array([1, 2]), onlyJs)
+      ).toEqual('0x36f3d08cda72a00ddf2be103eb5770d9');
+    });
 
-  it('returns a 512-bit value (as specified)', (): void => {
-    expect(
-      blake2AsHex('abc', 512)
-    ).toEqual('0xba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923');
-  });
+    it('returns a 256-bit value (default)', (): void => {
+      expect(
+        blake2AsHex('abc', undefined, null, onlyJs)
+      ).toEqual('0xbddd813c634239723171ef3fee98579b94964e3bb1cb3e427262c8c068d52319');
+    });
 
-  it('matches with the Rust implementation', (): void => {
-    expect(
-      blake2AsHex(
-        hexToU8a('0x454545454545454545454545454545454545454545454545454545454545454501000000000000002481853da20b9f4322f34650fea5f240dcbfb266d02db94bfa0153c31f4a29dbdbf025dd4a69a6f4ee6e1577b251b655097e298b692cb34c18d3182cac3de0dc00000000'), 256
-      )
-    ).toEqual('0x1025e5db74fdaf4d2818822dccf0e1604ae9ccc62f26cecfde23448ff0248abf');
+    it('returns a 512-bit value (as specified)', (): void => {
+      expect(
+        blake2AsHex('abc', 512, null, onlyJs)
+      ).toEqual('0xba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923');
+    });
+
+    it('matches with the Rust implementation', (): void => {
+      expect(
+        blake2AsHex(
+          hexToU8a('0x454545454545454545454545454545454545454545454545454545454545454501000000000000002481853da20b9f4322f34650fea5f240dcbfb266d02db94bfa0153c31f4a29dbdbf025dd4a69a6f4ee6e1577b251b655097e298b692cb34c18d3182cac3de0dc00000000'), 256, undefined, onlyJs
+        )
+      ).toEqual('0x1025e5db74fdaf4d2818822dccf0e1604ae9ccc62f26cecfde23448ff0248abf');
+    });
   });
 });

packages/util-crypto/src/blake2/asHex.ts

@@ -19,8 +19,8 @@ import { blake2AsU8a } from './asU8a';
  * blake2AsHex('abc'); // => 0xba80a53f981c4d0d
  * ```
  */
-export function blake2AsHex (data: Uint8Array | string, bitLength = 256): string {
+export function blake2AsHex (data: Uint8Array | string, bitLength = 256, key?: Uint8Array | null, onlyJs = false): string {
   return u8aToHex(
-    blake2AsU8a(data, bitLength)
+    blake2AsU8a(data, bitLength, key, onlyJs)
   );
 }

packages/util-crypto/src/blake2/asU8a.spec.ts

@@ -11,38 +11,32 @@ describe('blake2AsU8a', (): void => {
     await waitReady();
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 64-bit value by default (onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('returns a 64-bit value by default', (): void => {
       expect(
         blake2AsU8a('abc', undefined, undefined, onlyJs)
       ).toEqual(
         new Uint8Array([189, 221, 129, 60, 99, 66, 57, 114, 49, 113, 239, 63, 238, 152, 87, 155, 148, 150, 78, 59, 177, 203, 62, 66, 114, 98, 200, 192, 104, 213, 35, 25])
       );
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 128-bit value (as specified, onlyJs=${onlyJs.toString()})`, (): void => {
+    it('returns a 128-bit value (as specified,)', (): void => {
       expect(
         blake2AsU8a('abc', 128, undefined, onlyJs)
       ).toEqual(
         new Uint8Array([207, 74, 183, 145, 198, 43, 141, 43, 33, 9, 201, 2, 117, 40, 120, 22])
       );
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 256-bit value (as specified, onlyJs=${onlyJs.toString()})`, (): void => {
+    it('returns a 256-bit value (as specified)', (): void => {
       expect(
         blake2AsU8a('abc', 256, undefined, onlyJs)
       ).toEqual(
         new Uint8Array([189, 221, 129, 60, 99, 66, 57, 114, 49, 113, 239, 63, 238, 152, 87, 155, 148, 150, 78, 59, 177, 203, 62, 66, 114, 98, 200, 192, 104, 213, 35, 25])
       );
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 512-bit value (as specified, onlyJs=${onlyJs.toString()})`, (): void => {
+    it('returns a 512-bit value (as specified)', (): void => {
       expect(
         blake2AsU8a('abc', 512, undefined, onlyJs)
       ).toEqual(

packages/util-crypto/src/blake2/asU8a.ts

@@ -20,10 +20,10 @@ import { blake2b, isReady } from '@polkadot/wasm-crypto';
  * blake2AsU8a('abc'); // => [0xba, 0x80, 0xa53, 0xf98, 0x1c, 0x4d, 0x0d]
  * ```
  */
-export function blake2AsU8a (data: Uint8Array | string, bitLength = 256, key: Uint8Array | null = null, onlyJs = false): Uint8Array {
+export function blake2AsU8a (data: Uint8Array | string, bitLength = 256, key?: Uint8Array | null, onlyJs = false): Uint8Array {
   const byteLength = Math.ceil(bitLength / 8);
 
   return isReady() && !onlyJs
     ? blake2b(u8aToU8a(data), u8aToU8a(key), byteLength)
-    : js.blake2b(u8aToU8a(data), key, byteLength);
+    : js.blake2b(u8aToU8a(data), key || undefined, byteLength);
 }

packages/util-crypto/src/bundle.ts

@@ -0,0 +1,31 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import './cryptoInit';
+
+export { packageInfo } from './packageInfo';
+
+// all internal exports
+export * from './address';
+export * from './base32';
+export * from './base58';
+export * from './base64';
+export * from './blake2';
+export * from './crypto';
+export * from './ethereum';
+export * from './hd';
+export * from './hmac';
+export * from './json';
+export * from './keccak';
+export * from './key';
+export * from './mnemonic';
+export * from './networks';
+export * from './nacl';
+export * from './pbkdf2';
+export * from './random';
+export * from './schnorrkel';
+export * from './scrypt';
+export * from './secp256k1';
+export * from './sha512';
+export * from './signature';
+export * from './xxhash';

packages/util-crypto/src/ethereum/isAddress.ts

@@ -8,9 +8,7 @@ import { isEthereumChecksum } from './isChecksum';
 export function isEthereumAddress (address?: string): boolean {
   if (!address || address.length !== 42 || !isHex(address)) {
     return false;
-  }
-
-  if (/^(0x)?[0-9a-f]{40}$/.test(address) || /^(0x)?[0-9A-F]{40}$/.test(address)) {
+  } else if (/^(0x)?[0-9a-f]{40}$/.test(address) || /^(0x)?[0-9A-F]{40}$/.test(address)) {
     return true;
   }
 

packages/util-crypto/src/ethereum/isChecksum.ts

@@ -6,7 +6,11 @@ import { u8aToHex } from '@polkadot/util';
 import { keccakAsU8a } from '../keccak';
 
 function isInvalidChar (char: string, byte: number): boolean {
-  return (byte > 7 && char !== char.toUpperCase()) || (byte <= 7 && char !== char.toLowerCase());
+  return char !== (
+    byte > 7
+      ? char.toUpperCase()
+      : char.toLowerCase()
+  );
 }
 
 export function isEthereumChecksum (_address: string): boolean {

packages/util-crypto/src/index.ts

@@ -1,31 +1,6 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import './cryptoInit';
 import './detectPackage';
 
-export { packageInfo } from './packageInfo';
-
-// all internal exports
-export * from './address';
-export * from './base32';
-export * from './base58';
-export * from './base64';
-export * from './blake2';
-export * from './crypto';
-export * from './ethereum';
-export * from './hd';
-export * from './hmac';
-export * from './json';
-export * from './keccak';
-export * from './key';
-export * from './mnemonic';
-export * from './nacl';
-export * from './pbkdf2';
-export * from './random';
-export * from './schnorrkel';
-export * from './scrypt';
-export * from './secp256k1';
-export * from './sha512';
-export * from './signature';
-export * from './xxhash';
+export * from './bundle';

packages/util-crypto/src/keccak/asU8a.spec.ts

@@ -6,8 +6,6 @@ import { waitReady } from '@polkadot/wasm-crypto';
 
 import { keccakAsU8a } from '.';
 
-const BITS: (256 | 512)[] = [256, 512];
-
 describe('keccakAsU8a', (): void => {
   beforeEach(async (): Promise<void> => {
     await waitReady();
@@ -23,29 +21,21 @@ describe('keccakAsU8a', (): void => {
     )
   };
 
-  BITS.forEach((bitLength): void => {
-    [false, true].forEach((onlyJs): void => {
-      it(`returns an hex representation (string, bitLength=${bitLength}, onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    describe.each([256, 512] as (256 | 512)[])('bitLength=$p', (bitLength): void => {
+      it('returns an hex representation (string)', (): void => {
         expect(
           keccakAsU8a(input, bitLength, onlyJs)
         ).toEqual(output[bitLength]);
       });
-    });
-  });
 
-  BITS.forEach((bitLength): void => {
-    [false, true].forEach((onlyJs): void => {
-      it(`returns an hex representation (Buffer, bitLength=${bitLength}, onlyJs=${onlyJs.toString()})`, (): void => {
+      it('returns an hex representation (Buffer)', (): void => {
         expect(
           keccakAsU8a(Buffer.from(input), bitLength, onlyJs)
         ).toEqual(output[bitLength]);
       });
-    });
-  });
 
-  BITS.forEach((bitLength): void => {
-    [false, true].forEach((onlyJs): void => {
-      it(`returns an hex representation (Uint8Array, bitLength=${bitLength}, onlyJs=${onlyJs.toString()})`, (): void => {
+      it('returns an hex representation (Uint8Array)', (): void => {
         expect(
           keccakAsU8a(stringToU8a(input), bitLength, onlyJs)
         ).toEqual(output[bitLength]);

packages/util-crypto/src/key/DeriveJunction.ts

@@ -47,7 +47,7 @@ export class DeriveJunction {
     return !this.#isHard;
   }
 
-  public hard (value: number | string | BigInt | BN | Uint8Array): DeriveJunction {
+  public hard (value: number | string | bigint | BN | Uint8Array): DeriveJunction {
     return this.soft(value).harden();
   }
 
@@ -57,16 +57,14 @@ export class DeriveJunction {
     return this;
   }
 
-  public soft (value: number | string | BigInt | BN | Uint8Array): DeriveJunction {
+  public soft (value: number | string | bigint | BN | Uint8Array): DeriveJunction {
     if (isNumber(value) || isBn(value) || isBigInt(value)) {
       return this.soft(bnToHex(value, BN_OPTIONS));
+    } else if (isHex(value)) {
+      return this.soft(hexToU8a(value));
     } else if (isString(value)) {
-      return isHex(value)
-        ? this.soft(hexToU8a(value))
-        : this.soft(compactAddLength(stringToU8a(value)));
-    }
-
-    if (value.length > JUNCTION_ID_LEN) {
+      return this.soft(compactAddLength(stringToU8a(value)));
+    } else if (value.length > JUNCTION_ID_LEN) {
       return this.soft(blake2AsU8a(value));
     }
 

packages/util-crypto/src/mnemonic/generate.spec.ts

@@ -16,20 +16,16 @@ describe('mnemonicGenerate', (): void => {
     ).toEqual(true);
   });
 
-  [false, true].forEach((onlyJs): void => {
-    ([12, 15, 18, 21, 24] as WordCount[]).forEach((num: WordCount): void => {
-      it(`generates a valid mnemonic (${num} words, onlyJs=${onlyJs.toString()})`, (): void => {
-        const mnemonic = mnemonicGenerate(num, onlyJs);
-        const isValid = mnemonicValidate(mnemonic);
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it.each([12, 15, 18, 21, 24] as WordCount[])('generates a valid mnemonic (%p words)', (num): void => {
+      const mnemonic = mnemonicGenerate(num, onlyJs);
+      const isValid = mnemonicValidate(mnemonic);
 
-        expect(mnemonic.split(' ')).toHaveLength(num);
-        expect(isValid).toEqual(true);
-      });
+      expect(mnemonic.split(' ')).toHaveLength(num);
+      expect(isValid).toEqual(true);
     });
-  });
 
-  [true, false].forEach((onlyJs): void => {
-    it(`generates not deterministic (onlyJs=${onlyJs.toString()})`, (): void => {
+    it('generates not deterministic', (): void => {
       const m1 = mnemonicGenerate(24, onlyJs);
       const m2 = mnemonicGenerate(24, onlyJs);
 

packages/util-crypto/src/mnemonic/toEntropy.spec.ts

@@ -12,9 +12,9 @@ describe('mnemonicToEntropy', (): void => {
     await cryptoWaitReady();
   });
 
-  tests.forEach(([mnemonic, entropy], index): void => {
-    [false, true].forEach((onlyJs): void => {
-      it(`Created correct entropy for ${index} (onlyJs = ${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    tests.forEach(([mnemonic, entropy], index): void => {
+      it(`Created correct entropy for ${index}`, (): void => {
         expect(u8aToHex(mnemonicToEntropy(mnemonic, onlyJs))).toEqual(entropy);
       });
     });

packages/util-crypto/src/mnemonic/toLegacySeed.spec.ts

@@ -15,35 +15,29 @@ describe('mnemonicToLegacySeed', (): void => {
     await waitReady();
   });
 
-  [undefined, 'foo', 'bar'].forEach((password): void => {
-    it(`generates Wasm & Js equivalents (password = ${password || 'undefined'})`, (): void => {
-      expect(
-        u8aEq(
-          mnemonicToLegacySeed(MNEMONIC, password, true),
-          mnemonicToLegacySeed(MNEMONIC, password, false)
-        )
-      ).toEqual(true);
-    });
+  it.each([undefined, 'foo', 'bar'])('generates Wasm & Js equivalents (password = %p', (password): void => {
+    expect(
+      u8aEq(
+        mnemonicToLegacySeed(MNEMONIC, password, true),
+        mnemonicToLegacySeed(MNEMONIC, password, false)
+      )
+    ).toEqual(true);
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`generates a valid 64bytes seed (onlyJs = ${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('generates a valid 64bytes seed', (): void => {
       expect(
         u8aToHex(mnemonicToLegacySeed(MNEMONIC, undefined, onlyJs, 64))
       ).toEqual(SEED_64);
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`generates a valid 32bytes seed (onlyJs = ${onlyJs.toString()})`, (): void => {
+    it('generates a valid 32bytes seed', (): void => {
       expect(
         u8aToHex(mnemonicToLegacySeed(MNEMONIC, undefined, onlyJs))
       ).toEqual(SEED_32);
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`fails with non-mnemonics (onlyJs = ${onlyJs.toString()})`, (): void => {
+    it('fails with non-mnemonics', (): void => {
       expect(
         () => mnemonicToLegacySeed('foo bar baz', undefined, onlyJs)
       ).toThrow(/mnemonic specified/);

packages/util-crypto/src/mnemonic/toLegacySeed.ts

@@ -14,13 +14,13 @@ import { mnemonicValidate } from './validate';
  * <BR>
  *
  * ```javascript
- * import { mnemonicGenerate, mnemonicToBip39, mnemonicValidate } from '@polkadot/util-crypto';
+ * import { mnemonicGenerate, mnemonicToLegacySeed, mnemonicValidate } from '@polkadot/util-crypto';
  *
  * const mnemonic = mnemonicGenerate(); // => string
  * const isValidMnemonic = mnemonicValidate(mnemonic); // => boolean
  *
  * if (isValidMnemonic) {
- *   console.log(`Seed generated from mnemonic: ${mnemonicToBip39(mnemonic)}`); => u8a
+ *   console.log(`Seed generated from mnemonic: ${mnemonicToLegacySeed(mnemonic)}`); => u8a
  * }
  * ```
  */

packages/util-crypto/src/mnemonic/toMiniSecret.spec.ts

@@ -15,28 +15,30 @@ describe('mnemonicToMiniSecret', (): void => {
     await cryptoWaitReady();
   });
 
-  [undefined, 'foo', 'bar'].forEach((password): void => {
-    it(`generates Wasm & Js equivalents (password = ${password || 'undefined'})`, (): void => {
-      expect(
-        u8aEq(
-          mnemonicToMiniSecret(MNEMONIC, password, true),
-          mnemonicToMiniSecret(MNEMONIC, password, false)
-        )
-      ).toEqual(true);
-    });
+  it.each([undefined, 'foo', 'bar'])('generates Wasm & Js equivalents for password = %p', (password): void => {
+    expect(
+      u8aEq(
+        mnemonicToMiniSecret(MNEMONIC, password, true),
+        mnemonicToMiniSecret(MNEMONIC, password, false)
+      )
+    ).toEqual(true);
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`generates a valid seed (onlyJs = ${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('generates a valid seed', (): void => {
       expect(
         u8aToHex(mnemonicToMiniSecret(MNEMONIC, undefined, onlyJs))
       ).toEqual(SEED);
     });
-  });
 
-  tests.forEach(([mnemonic, , seed], index): void => {
-    [false, true].forEach((onlyJs): void => {
-      it(`Created correct seed for ${index} (onlyJs = ${onlyJs.toString()})`, (): void => {
+    it('fails with non-mnemonics', (): void => {
+      expect(
+        () => mnemonicToMiniSecret('foo bar baz', undefined, onlyJs)
+      ).toThrow(/mnemonic specified/);
+    });
+
+    tests.forEach(([mnemonic, , seed], index): void => {
+      it(`Created correct seed for ${index}`, (): void => {
         expect(
           u8aToHex(mnemonicToMiniSecret(mnemonic, 'Substrate', onlyJs))
         ).toEqual(
@@ -46,12 +48,4 @@ describe('mnemonicToMiniSecret', (): void => {
       });
     });
   });
-
-  [false, true].forEach((onlyJs): void => {
-    it(`fails with non-mnemonics (onlyJs = ${onlyJs.toString()})`, (): void => {
-      expect(
-        () => mnemonicToMiniSecret('foo bar baz', undefined, onlyJs)
-      ).toThrow(/mnemonic specified/);
-    });
-  });
 });

packages/util-crypto/src/nacl/convertKey.ts

@@ -0,0 +1,12 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import ed2curve from 'ed2curve';
+
+export function convertSecretKeyToCurve25519 (secretKey: Uint8Array): Uint8Array {
+  return ed2curve.convertSecretKey(secretKey);
+}
+
+export function convertPublicKeyToCurve25519 (publicKey: Uint8Array): Uint8Array {
+  return ed2curve.convertPublicKey(publicKey) as Uint8Array;
+}

packages/util-crypto/src/nacl/index.ts

@@ -15,3 +15,4 @@ export { naclVerify } from './verify';
 export { naclBoxKeypairFromSecret } from './box/fromSecret';
 export { naclOpen } from './open';
 export { naclSeal } from './seal';
+export { convertSecretKeyToCurve25519, convertPublicKeyToCurve25519 } from './convertKey';

packages/util-crypto/src/nacl/sign.spec.ts

@@ -11,8 +11,8 @@ describe('naclSign', (): void => {
     await waitReady();
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a valid signature for the message (onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('returns a valid signature for the message', (): void => {
       expect(
         naclSign(
           new Uint8Array([0x61, 0x62, 0x63, 0x64]),

packages/util-crypto/src/nacl/verify.spec.ts

@@ -19,8 +19,8 @@ describe('naclVerify', (): void => {
     signature = new Uint8Array([28, 58, 206, 239, 249, 70, 59, 191, 166, 40, 219, 218, 235, 170, 25, 79, 10, 94, 9, 197, 34, 126, 1, 150, 246, 68, 28, 238, 36, 26, 172, 163, 168, 90, 202, 211, 126, 246, 57, 212, 43, 24, 88, 197, 240, 113, 118, 76, 37, 81, 91, 110, 236, 50, 144, 134, 100, 223, 220, 238, 34, 185, 211, 7]);
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`validates a correctly signed message (onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('validates a correctly signed message', (): void => {
       expect(
         naclVerify(
           new Uint8Array([0x61, 0x62, 0x63, 0x64]),
@@ -30,47 +30,51 @@ describe('naclVerify', (): void => {
         )
       ).toEqual(true);
     });
-  });
 
-  it('fails a correctly signed message (message changed)', (): void => {
-    expect(
-      naclVerify(
-        new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]),
-        signature,
-        publicKey
-      )
-    ).toEqual(false);
-  });
+    it('fails a correctly signed message (message changed)', (): void => {
+      expect(
+        naclVerify(
+          new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]),
+          signature,
+          publicKey,
+          onlyJs
+        )
+      ).toEqual(false);
+    });
 
-  it('fails a correctly signed message (signature changed)', (): void => {
-    signature[0] = 0xff;
+    it('fails a correctly signed message (signature changed)', (): void => {
+      signature[0] = 0xff;
 
-    expect(
-      naclVerify(
-        new Uint8Array([0x61, 0x62, 0x63, 0x64]),
-        signature,
-        publicKey
-      )
-    ).toEqual(false);
-  });
+      expect(
+        naclVerify(
+          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
+          signature,
+          publicKey,
+          onlyJs
+        )
+      ).toEqual(false);
+    });
 
-  it('throws error when publicKey lengths do not match', (): void => {
-    expect(
-      () => naclVerify(
-        new Uint8Array([0x61, 0x62, 0x63, 0x64]),
-        signature,
-        new Uint8Array([1, 2])
-      )
-    ).toThrow(/Invalid publicKey/);
-  });
+    it('throws error when publicKey lengths do not match', (): void => {
+      expect(
+        () => naclVerify(
+          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
+          signature,
+          new Uint8Array([1, 2]),
+          onlyJs
+        )
+      ).toThrow(/Invalid publicKey/);
+    });
 
-  it('throws error when signature lengths do not match', (): void => {
-    expect(
-      () => naclVerify(
-        new Uint8Array([0x61, 0x62, 0x63, 0x64]),
-        new Uint8Array([1, 2]),
-        publicKey
-      )
-    ).toThrow(/Invalid signature/);
+    it('throws error when signature lengths do not match', (): void => {
+      expect(
+        () => naclVerify(
+          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
+          new Uint8Array([1, 2]),
+          publicKey,
+          onlyJs
+        )
+      ).toThrow(/Invalid signature/);
+    });
   });
 });

packages/util-crypto/src/networks.ts

@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export * from '@polkadot/networks/interfaces';

packages/util-crypto/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/util-crypto', version: '6.9.1' };
+export const packageInfo = { name: '@polkadot/util-crypto', version: '7.2.1' };

packages/util-crypto/src/pbkdf2/encode.spec.ts

@@ -15,21 +15,19 @@ describe('pbkdf2Encode', (): void => {
     await waitReady();
   });
 
-  [256, 1024, 2048].forEach((rounds): void => {
-    it(`has equivalent Wasm & JS results (${rounds} rounds)`, (): void => {
-      const salt = randomAsU8a();
+  it.each([256, 1024, 2048])('has equivalent Wasm & JS results (%p rounds)', (rounds): void => {
+    const salt = randomAsU8a();
 
-      expect(
-        u8aEq(
-          pbkdf2Encode(TEST_PASSWORD, salt, rounds, false).password,
-          pbkdf2Encode(TEST_PASSWORD, salt, rounds, true).password
-        )
-      ).toBe(true);
-    });
+    expect(
+      u8aEq(
+        pbkdf2Encode(TEST_PASSWORD, salt, rounds, false).password,
+        pbkdf2Encode(TEST_PASSWORD, salt, rounds, true).password
+      )
+    ).toBe(true);
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`creates known iterations (onlyJs = ${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('creates known iterations', (): void => {
       expect(
         u8aToHex(pbkdf2Encode(TEST_PASSWORD, KNOWN_SALT, 2048, onlyJs).password)
       ).toEqual(

packages/util-crypto/src/sha512/asU8a.spec.ts

@@ -10,8 +10,8 @@ describe('sha512AsU8a', (): void => {
     await waitReady();
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`creates a sha-512 hash (onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('creates a sha-512 hash', (): void => {
       expect(
         sha512AsU8a(Uint8Array.from([0x61, 0x62, 0x63, 0x64]), onlyJs)
       ).toEqual(

packages/util-crypto/src/xxhash/asU8a.spec.ts

@@ -11,28 +11,24 @@ describe('xxhashAsU8a', (): void => {
     await waitReady();
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 64-bit value by default (onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('returns a 64-bit value by default', (): void => {
       expect(
         xxhashAsU8a('abc', undefined, onlyJs)
       ).toEqual(
         hexToU8a('0x990977adf52cbc44')
       );
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 128-bit value (as specified, onlyJs=${onlyJs.toString()})`, (): void => {
+    it('returns a 128-bit value (as specified', (): void => {
       expect(
         xxhashAsU8a('abc', 128, onlyJs)
       ).toEqual(
         hexToU8a('0x990977adf52cbc440889329981caa9be')
       );
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 256-bit value (as specified, onlyJs=${onlyJs.toString()})`, (): void => {
+    it('returns a 256-bit value (as specified)', (): void => {
       expect(
         xxhashAsU8a('abc', 256, onlyJs)
       ).toEqual(

packages/util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/util",
-  "version": "6.9.1",
+  "version": "7.2.1",
   "type": "module",
   "description": "A collection of useful utilities for @polkadot",
   "main": "index.js",
@@ -19,9 +19,9 @@
   "bugs": "https://github.com/polkadot-js/common/issues",
   "homepage": "https://github.com/polkadot-js/common/tree/master/packages/util#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.5",
-    "@polkadot/x-textdecoder": "6.9.1",
-    "@polkadot/x-textencoder": "6.9.1",
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/x-textdecoder": "7.2.1",
+    "@polkadot/x-textencoder": "7.2.1",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^4.11.9",
     "camelcase": "^5.3.1",

packages/util/src/array/index.ts

@@ -9,3 +9,4 @@ export { arrayChunk } from './chunk';
 export { arrayFilter } from './filter';
 export { arrayFlatten } from './flatten';
 export { arrayRange } from './range';
+export { arrayShuffle } from './shuffle';

packages/util/src/array/shuffle.spec.ts

@@ -0,0 +1,31 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { arrayRange, arrayShuffle } from '.';
+
+describe('arrayShuffle', (): void => {
+  it('returns an empty array as-is', (): void => {
+    expect(
+      arrayShuffle([])
+    ).toEqual([]);
+  });
+
+  it('returns a single array as-is', (): void => {
+    expect(
+      arrayShuffle([100])
+    ).toEqual([100]);
+  });
+
+  it('shuffles an array', (): void => {
+    const inp = arrayRange(100);
+    const out = arrayShuffle(inp);
+
+    expect(inp).toHaveLength(out.length);
+    expect(
+      inp.filter((v) => !out.includes(v))
+    ).toEqual([]);
+    expect(
+      JSON.stringify(inp)
+    ).not.toEqual(JSON.stringify(out));
+  });
+});

packages/util/src/array/shuffle.ts

@@ -0,0 +1,21 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export function arrayShuffle <T> (input: T[]): T[] {
+  const result = [...input];
+  let curr = result.length;
+
+  if (curr === 1) {
+    return result;
+  }
+
+  while (curr !== 0) {
+    const rand = Math.floor(Math.random() * curr);
+
+    curr--;
+
+    [result[curr], result[rand]] = [result[rand], result[curr]];
+  }
+
+  return result;
+}

packages/util/src/bn/sqrt.spec.ts

@@ -3,7 +3,7 @@
 
 import { BN, bnSqrt } from '.';
 
-const TESTS: [string | number | BN | BigInt, string | number][] = [
+const TESTS: [string | number | BN | bigint, string | number][] = [
   [0, 0],
   [1, 1],
   [4, 2],

packages/util/src/bn/sqrt.ts

@@ -23,7 +23,7 @@ const SQRT_MAX_SAFE_INTEGER = new BN(94906265);
  * bnSqrt(new BN(16)).toString(); // => '4'
  * ```
  */
-export function bnSqrt <ExtToBn extends ToBn> (value: ExtToBn | BN | BigInt | string | number | null): BN {
+export function bnSqrt <ExtToBn extends ToBn> (value: ExtToBn | BN | bigint | string | number | null): BN {
   const n = bnToBn(value);
 
   assert(n.gte(BN_ZERO), 'square root of negative numbers is not supported');

packages/util/src/bn/toBn.ts

@@ -11,7 +11,7 @@ import { BN } from './bn';
 
 /**
  * @name bnToBn
- * @summary Creates a BN value from a BN, BigInt, string (base 10 or hex) or number input.
+ * @summary Creates a BN value from a BN, bigint, string (base 10 or hex) or number input.
  * @description
  * `null` inputs returns a `0x0` result, BN values returns the value, numbers returns a BN representation.
  * @example
@@ -25,7 +25,7 @@ import { BN } from './bn';
  * bnToBn(new BN(0x1234)); // => BN(0x1234)
  * ```
  */
-export function bnToBn <ExtToBn extends ToBn> (value?: ExtToBn | BN | BigInt | string | number | null): BN {
+export function bnToBn <ExtToBn extends ToBn> (value?: ExtToBn | BN | bigint | string | number | null): BN {
   if (!value) {
     return new BN(0);
   } else if (isHex(value)) {

packages/util/src/bn/toHex.ts

@@ -29,9 +29,9 @@ interface Options extends ToBnOptions {
  * bnToHex(new BN(0x123456)); // => '0x123456'
  * ```
  */
-function bnToHex <ExtToBn extends ToBn> (value?: ExtToBn | BN | BigInt | number | null, options?: Options): string;
-function bnToHex <ExtToBn extends ToBn> (value?: ExtToBn | BN | BigInt | number | null, bitLength?: number, isLe?: boolean): string;
-function bnToHex <ExtToBn extends ToBn> (value?: ExtToBn | BN | BigInt | number | null, arg1: number | Options = { bitLength: -1, isLe: false, isNegative: false }, arg2?: boolean): string {
+function bnToHex <ExtToBn extends ToBn> (value?: ExtToBn | BN | bigint | number | null, options?: Options): string;
+function bnToHex <ExtToBn extends ToBn> (value?: ExtToBn | BN | bigint | number | null, bitLength?: number, isLe?: boolean): string;
+function bnToHex <ExtToBn extends ToBn> (value?: ExtToBn | BN | bigint | number | null, arg1: number | Options = { bitLength: -1, isLe: false, isNegative: false }, arg2?: boolean): string {
   if (!value) {
     return ZERO_STR;
   }

packages/util/src/bn/toU8a.ts

@@ -40,9 +40,9 @@ function createValue (valueBn: BN, byteLength: number, { isLe, isNegative }: Opt
  * bnToU8a(new BN(0x1234)); // => [0x12, 0x34]
  * ```
  */
-function bnToU8a <ExtToBn extends ToBn> (value?: ExtToBn | BN | BigInt | number | null, options?: Options): Uint8Array;
-function bnToU8a <ExtToBn extends ToBn> (value?: ExtToBn | BN | BigInt | number | null, bitLength?: number, isLe?: boolean): Uint8Array;
-function bnToU8a <ExtToBn extends ToBn> (value?: ExtToBn | BN | BigInt | number | null, arg1: number | Options = { bitLength: -1, isLe: true, isNegative: false }, arg2?: boolean): Uint8Array {
+function bnToU8a <ExtToBn extends ToBn> (value?: ExtToBn | BN | bigint | number | null, options?: Options): Uint8Array;
+function bnToU8a <ExtToBn extends ToBn> (value?: ExtToBn | BN | bigint | number | null, bitLength?: number, isLe?: boolean): Uint8Array;
+function bnToU8a <ExtToBn extends ToBn> (value?: ExtToBn | BN | bigint | number | null, arg1: number | Options = { bitLength: -1, isLe: true, isNegative: false }, arg2?: boolean): Uint8Array {
   const options: Options = {
     bitLength: -1,
     isLe: true,

packages/util/src/bundle.ts

@@ -0,0 +1,25 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * @summary Utility methods for this package are split into groups
+ */
+export { packageInfo } from './packageInfo';
+
+export * from './array';
+export * from './assert';
+export * from './bn';
+export * from './buffer';
+export * from './compact';
+export * from './extractTime';
+export * from './format';
+export * from './hex';
+export * from './is';
+export * from './logger';
+export * from './memoize';
+export * from './number';
+export * from './promisify';
+export * from './string';
+export * from './stringify';
+export * from './u8a';
+export * from './versionDetect';

packages/util/src/compact/toU8a.ts

@@ -21,7 +21,7 @@ const MAX_U32 = new BN(2).pow(new BN(32 - 2)).subn(1);
  * console.log(compactToU8a(511, 32)); // Uint8Array([0b11111101, 0b00000111])
  * ```
  */
-export function compactToU8a (_value: BN | BigInt | number): Uint8Array {
+export function compactToU8a (_value: BN | bigint | number): Uint8Array {
   const value = bnToBn(_value);
 
   if (value.lte(MAX_U8)) {

packages/util/src/format/formatBalance.ts

@@ -29,7 +29,7 @@ interface Options {
 }
 
 interface BalanceFormatter {
-  <ExtToBn extends ToBn> (input?: number | string | BN | BigInt | ExtToBn, options?: Options, decimals?: number): string;
+  <ExtToBn extends ToBn> (input?: number | string | BN | bigint | ExtToBn, options?: Options, decimals?: number): string;
   calcSi (text: string, decimals?: number): SiDef;
   findSi (type: string): SiDef;
   getDefaults (): Defaults;
@@ -44,7 +44,7 @@ let defaultDecimals = DEFAULT_DECIMALS;
 let defaultUnit = DEFAULT_UNIT;
 
 // Formats a string/number with <prefix>.<postfix><type> notation
-function _formatBalance <ExtToBn extends ToBn> (input?: number | string | BN | BigInt | ExtToBn, options: Options | boolean = true, optDecimals: number = defaultDecimals): string {
+function _formatBalance <ExtToBn extends ToBn> (input?: number | string | BN | bigint | ExtToBn, options: Options | boolean = true, optDecimals: number = defaultDecimals): string {
   let text = bnToBn(input).toString();
 
   if (text.length === 0 || text === '0') {

packages/util/src/format/formatElapsed.ts

@@ -18,7 +18,7 @@ function formatValue (elapsed: number): string {
   return `${elapsed / 3600 | 0}h`;
 }
 
-export function formatElapsed <ExtToBn extends ToBn> (now?: Date | null, value?: BigInt | BN | ExtToBn | Date | number | null): string {
+export function formatElapsed <ExtToBn extends ToBn> (now?: Date | null, value?: bigint | BN | ExtToBn | Date | number | null): string {
   const tsNow = (now && now.getTime()) || 0;
   const tsValue = value instanceof Date
     ? value.getTime()

packages/util/src/format/formatNumber.ts

@@ -7,6 +7,6 @@ import type { ToBn } from '../types';
 import { bnToBn } from '../bn/toBn';
 import { formatDecimal } from './formatDecimal';
 
-export function formatNumber <ExtToBn extends ToBn> (value?: ExtToBn | BN | BigInt | number | null): string {
+export function formatNumber <ExtToBn extends ToBn> (value?: ExtToBn | BN | bigint | number | null): string {
   return formatDecimal(bnToBn(value).toString());
 }

packages/util/src/index.ts

@@ -3,25 +3,4 @@
 
 import './detectPackage';
 
-/**
- * @summary Utility methods for this package are split into groups
- */
-export { packageInfo } from './packageInfo';
-
-export * from './array';
-export * from './assert';
-export * from './bn';
-export * from './buffer';
-export * from './compact';
-export * from './extractTime';
-export * from './format';
-export * from './hex';
-export * from './is';
-export * from './logger';
-export * from './memoize';
-export * from './number';
-export * from './promisify';
-export * from './string';
-export * from './stringify';
-export * from './u8a';
-export * from './versionDetect';
+export * from './bundle';

packages/util/src/is/bigInt.ts

@@ -15,6 +15,6 @@
  * console.log('isBigInt', isBigInt(123_456n)); // => true
  * ```
  */
-export function isBigInt (value: unknown): value is BigInt {
+export function isBigInt (value: unknown): value is bigint {
   return typeof value === 'bigint';
 }

packages/util/src/is/buffer.ts

@@ -16,5 +16,5 @@
  * ```
  */
 export function isBuffer (value: unknown): value is Buffer {
-  return Buffer.isBuffer(value);
+  return typeof Buffer !== 'undefined' && Buffer.isBuffer(value);
 }

packages/util/src/is/compact.ts

@@ -0,0 +1,21 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { BN } from '../bn/bn';
+
+import { isFunction } from './function';
+
+interface Compact<T> {
+  toBigInt (): bigint;
+  toBn (): BN;
+  toNumber (): number;
+  unwrap (): T;
+}
+
+/**
+ * @name isCompact
+ * @summary Tests for SCALE-Compact-like object instance.
+ */
+export function isCompact <T> (value: unknown): value is Compact<T> {
+  return isFunction((value as Compact<T>).toBigInt) && isFunction((value as Compact<T>).toBn) && isFunction((value as Compact<T>).toNumber) && isFunction((value as Compact<T>).unwrap);
+}

packages/util/src/is/hex.ts

@@ -1,8 +1,6 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { isString } from './string';
-
 const HEX_REGEX = /^0x[a-fA-F0-9]+$/;
 
 /**
@@ -20,13 +18,10 @@ const HEX_REGEX = /^0x[a-fA-F0-9]+$/;
  * isHex('0x1234', 8); // => false
  * ```
  */
-// eslint-disable-next-line @typescript-eslint/ban-types
-export function isHex (value: unknown, bitLength = -1, ignoreLength = false): value is string | String {
-  const isValidHex = value === '0x' || (isString(value) && HEX_REGEX.test(value.toString()));
-
-  if (isValidHex && bitLength !== -1) {
-    return (value as string).length === (2 + Math.ceil(bitLength / 4));
-  }
-
-  return isValidHex && (ignoreLength || ((value as string).length % 2 === 0));
+export function isHex (value: unknown, bitLength = -1, ignoreLength = false): value is string {
+  return (typeof value === 'string' && (value === '0x' || HEX_REGEX.test(value)))
+    ? bitLength === -1
+      ? ((value.length % 2 === 0) || ignoreLength)
+      : (value.length === (2 + Math.ceil(bitLength / 4)))
+    : false;
 }

packages/util/src/is/index.ts

@@ -10,6 +10,7 @@ export { isBn } from './bn';
 export { isBuffer } from './buffer';
 export { isBoolean } from './boolean';
 export { isChildClass } from './childClass';
+export { isCompact } from './compact';
 export { isError } from './error';
 export { isFunction } from './function';
 export { isHex } from './hex';

packages/util/src/is/u8a.spec.ts

@@ -3,7 +3,7 @@
 
 import { isU8a } from '.';
 
-describe('isUint8Array', (): void => {
+describe('isU8a', (): void => {
   it('returns false on undefined values', (): void => {
     expect(
       isU8a()

packages/util/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/util', version: '6.9.1' };
+export const packageInfo = { name: '@polkadot/util', version: '7.2.1' };

packages/util/src/u8a/empty.spec.ts

@@ -0,0 +1,24 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { u8aEmpty } from '.';
+
+describe('u8aEmpty', (): void => {
+  it('returns true on zero length', (): void => {
+    expect(
+      u8aEmpty(new Uint8Array())
+    ).toEqual(true);
+  });
+
+  it('returns true on all zero values', (): void => {
+    expect(
+      u8aEmpty(new Uint8Array([0, 0, 0, 0, 0, 0]))
+    ).toEqual(true);
+  });
+
+  it('returns false when value is found', (): void => {
+    expect(
+      u8aEmpty(new Uint8Array([0, 0, 0, 0, 0, 1]))
+    ).toEqual(false);
+  });
+});

packages/util/src/u8a/empty.ts

@@ -0,0 +1,12 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * @name u8aEmpty
+ * @summary Tests for a `Uint8Array` for emptyness
+ * @description
+ * Checks to see if the input `Uint8Array` has zero length or contains all 0 values.
+ */
+export function u8aEmpty (value: Uint8Array): boolean {
+  return value.length === 0 || value.every((v) => !v);
+}

packages/util/src/u8a/index.ts

@@ -7,6 +7,7 @@
 
 export { u8aCmp } from './cmp';
 export { u8aConcat } from './concat';
+export { u8aEmpty } from './empty';
 export { u8aEq } from './eq';
 export { u8aFixLength } from './fixLength';
 export { u8aSorted } from './sorted';

packages/util/src/u8a/toU8a.ts

@@ -27,10 +27,10 @@ import { stringToU8a } from '../string/toU8a';
 export function u8aToU8a (value?: number[] | Buffer | Uint8Array | string | null): Uint8Array {
   if (!value) {
     return new Uint8Array();
+  } else if (isHex(value)) {
+    return hexToU8a(value);
   } else if (isString(value)) {
-    return isHex(value)
-      ? hexToU8a(value)
-      : stringToU8a(value);
+    return stringToU8a(value);
   } else if (Array.isArray(value) || isBuffer(value)) {
     return new Uint8Array(value);
   }

packages/x-bundle/README.md

@@ -0,0 +1,3 @@
+# @polkadot/x-bundle
+
+A rollup-only package to allow for bundling of builtin dependencies

packages/x-bundle/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "@polkadot/x-rxjs",
-  "version": "6.9.1",
+  "name": "@polkadot/x-bundle",
+  "version": "7.2.1",
   "type": "module",
-  "description": "A pass-through interface for RxJs (allowing node + mjs usage)",
+  "description": "A bundler helper",
   "main": "index.js",
   "sideEffects": false,
   "engines": {
@@ -14,9 +14,10 @@
   "license": "Apache-2.0",
   "repository": "github:polkadot-js/common",
   "bugs": "https://github.com/polkadot-js/common/issues",
-  "homepage": "https://github.com/polkadot-js/common/tree/master/packages/x-rxjs#readme",
+  "homepage": "https://github.com/polkadot-js/common/tree/master/packages/x-bundle#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.5",
-    "rxjs": "^6.6.7"
+    "@babel/runtime": "^7.15.3",
+    "@polkadot/util": "7.2.1",
+    "buffer-es6": "^4.9.3"
   }
 }

packages/x-bundle/src/bn.cjs

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/x-bundle authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const { BN } = require('@polkadot/util');
+
+module.exports = BN;

packages/x-bundle/src/buffer-es6.d.ts

@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/x-bundle authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+declare module 'buffer-es6';

packages/x-bundle/src/buffer.ts

@@ -0,0 +1,7 @@
+// Copyright 2017-2021 @polkadot/x-bundle authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { Buffer } from 'buffer-es6';
+
+export default Buffer;
+export { Buffer };

packages/x-bundle/src/crypto.ts

@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/x-bundle authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export default {};

packages/x-bundle/src/empty.ts

@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/x-bundle authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export default {};

packages/x-bundle/src/index.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/x-bundle authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { packageInfo } from './packageInfo';
+
+console.error('@polkadot/x-bundle is not meant to be used directly');

packages/x-bundle/src/inherits.ts

@@ -0,0 +1,20 @@
+// Copyright 2017-2021 @polkadot/x-bundle authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Adapted from https://github.com/isaacs/inherits/blob/dbade4c47c548aa7259017eca8874d61c8aaad2b/inherits_browser.js
+// The ISC License
+// Copyright (c) Isaac Z. Schlueter
+
+export default function inherits (ctor: Record<string, unknown>, superCtor: Record<string, unknown>): void {
+  if (superCtor) {
+    ctor.super_ = superCtor;
+    ctor.prototype = Object.create(superCtor.prototype as null, {
+      constructor: {
+        configurable: true,
+        enumerable: false,
+        value: ctor,
+        writable: true
+      }
+    });
+  }
+}