diff --git a/packages/keyring/src/pair/nobody.ts b/packages/keyring/src/pair/nobody.ts index b6c29c362..1301becd8 100644 --- a/packages/keyring/src/pair/nobody.ts +++ b/packages/keyring/src/pair/nobody.ts @@ -7,10 +7,12 @@ import { encodeAddress } from '@polkadot/util-crypto'; const publicKey = new Uint8Array(32); const address = encodeAddress(publicKey); + const meta = { isTesting: true, name: 'nobody' }; + const json: KeyringPair$Json = { address, encoded: '', @@ -22,54 +24,54 @@ const json: KeyringPair$Json = { meta }; -export function nobody (): KeyringPair { - const pair: KeyringPair = { - address, - addressRaw: publicKey, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - 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 - }, - meta, - publicKey, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - setMeta: (meta: KeyringPair$Meta): void => - undefined, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - sign: (message: Uint8Array): Uint8Array => - new Uint8Array(64), - // eslint-disable-next-line @typescript-eslint/no-unused-vars - toJson: (passphrase?: string): KeyringPair$Json => - json, - type: 'ed25519', - // eslint-disable-next-line @typescript-eslint/no-unused-vars - unlock: (passphrase?: string): void => - undefined, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - verify: (message: Uint8Array, signature: Uint8Array): boolean => - false, - // eslint-disable-next-line @typescript-eslint/no-unused-vars - vrfSign: (message: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): Uint8Array => - new Uint8Array(96), - // eslint-disable-next-line @typescript-eslint/no-unused-vars - vrfVerify: (message: Uint8Array, vrfResult: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): boolean => - false - }; +const pair: KeyringPair = { + address, + addressRaw: publicKey, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + 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 + }, + meta, + publicKey, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + setMeta: (meta: KeyringPair$Meta): void => + undefined, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + sign: (message: Uint8Array): Uint8Array => + new Uint8Array(64), + // eslint-disable-next-line @typescript-eslint/no-unused-vars + toJson: (passphrase?: string): KeyringPair$Json => + json, + type: 'ed25519', + // eslint-disable-next-line @typescript-eslint/no-unused-vars + unlock: (passphrase?: string): void => + undefined, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + verify: (message: Uint8Array, signature: Uint8Array): boolean => + false, + // eslint-disable-next-line @typescript-eslint/no-unused-vars + vrfSign: (message: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): Uint8Array => + new Uint8Array(96), + // eslint-disable-next-line @typescript-eslint/no-unused-vars + vrfVerify: (message: Uint8Array, vrfResult: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): boolean => + false +}; +export function nobody (): KeyringPair { return pair; } diff --git a/packages/util-crypto/src/hmac/sha.ts b/packages/util-crypto/src/hmac/sha.ts new file mode 100644 index 000000000..e2b96d07c --- /dev/null +++ b/packages/util-crypto/src/hmac/sha.ts @@ -0,0 +1,14 @@ +// Copyright 2017-2021 @polkadot/util-crypto authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import hash from 'hash.js'; + +export function hmacSha (key: Uint8Array | string, data: Uint8Array, is512: boolean): Uint8Array { + return Uint8Array.from( + hash + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + .hmac(is512 ? hash.sha512 : hash.sha256, key) + .update(data) + .digest()); +} diff --git a/packages/util-crypto/src/hmac/sha256.ts b/packages/util-crypto/src/hmac/sha256.ts index 005219373..b637112f7 100644 --- a/packages/util-crypto/src/hmac/sha256.ts +++ b/packages/util-crypto/src/hmac/sha256.ts @@ -1,14 +1,8 @@ // Copyright 2017-2021 @polkadot/util-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -import hash from 'hash.js'; +import { hmacSha } from './sha'; export function hmacSha256 (key: Uint8Array | string, data: Uint8Array): Uint8Array { - return Uint8Array.from( - hash - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - .hmac(hash.sha256, key) - .update(data) - .digest()); + return hmacSha(key, data, false); } diff --git a/packages/util-crypto/src/hmac/sha512.ts b/packages/util-crypto/src/hmac/sha512.ts index 7b796e7ef..e9c44d17e 100644 --- a/packages/util-crypto/src/hmac/sha512.ts +++ b/packages/util-crypto/src/hmac/sha512.ts @@ -1,14 +1,8 @@ // Copyright 2017-2021 @polkadot/util-crypto authors & contributors // SPDX-License-Identifier: Apache-2.0 -import hash from 'hash.js'; +import { hmacSha } from './sha'; export function hmacSha512 (key: Uint8Array | string, data: Uint8Array): Uint8Array { - return Uint8Array.from( - hash - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore - .hmac(hash.sha512, key) - .update(data) - .digest()); + return hmacSha(key, data, true); } diff --git a/packages/util-crypto/src/mnemonic/toLegacySeed.ts b/packages/util-crypto/src/mnemonic/toLegacySeed.ts index d59850f30..47414d127 100644 --- a/packages/util-crypto/src/mnemonic/toLegacySeed.ts +++ b/packages/util-crypto/src/mnemonic/toLegacySeed.ts @@ -8,7 +8,7 @@ import { mnemonicToSeedSync } from './bip39'; import { mnemonicValidate } from './validate'; /** - * @name toSeed + * @name mnemonicToLegacySeed * @summary Creates a valid Ethereum/Bitcoin-compatible seed from a mnemonic input * @example *
@@ -28,13 +28,13 @@ export function mnemonicToLegacySeed (mnemonic: string, password = '', onlyJs = assert(mnemonicValidate(mnemonic), 'Invalid bip39 mnemonic specified'); assert([32, 64].includes(byteLength), () => `Invalid seed length ${byteLength}, expected 32 or 64`); - if (byteLength && byteLength === 32) { + if (byteLength === 32) { return isReady() && !onlyJs ? bip39ToSeed(mnemonic, password) : mnemonicToSeedSync(mnemonic, password).subarray(0, 32); } else if (byteLength === 64) { return mnemonicToSeedSync(mnemonic, password); - } else { - return new Uint8Array(); } + + return new Uint8Array(); } diff --git a/packages/util-crypto/src/schnorrkel/derive.ts b/packages/util-crypto/src/schnorrkel/derive.ts new file mode 100644 index 000000000..42c8c05c9 --- /dev/null +++ b/packages/util-crypto/src/schnorrkel/derive.ts @@ -0,0 +1,23 @@ +// Copyright 2017-2021 @polkadot/util-crypto authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { HexString } from '@polkadot/util/types'; +import type { Keypair } from '../types'; + +import { u8aToU8a } from '@polkadot/util'; +import { sr25519DeriveKeypairHard, sr25519DeriveKeypairSoft } from '@polkadot/wasm-crypto'; + +import { schnorrkelKeypairFromU8a } from './keypair/fromU8a'; +import { schnorrkelKeypairToU8a } from './keypair/toU8a'; + +export function schnorrkelDerive (keypair: Keypair, chainCode: HexString | Uint8Array | string, isHard: boolean): Keypair { + return schnorrkelKeypairFromU8a( + (isHard + ? sr25519DeriveKeypairHard + : sr25519DeriveKeypairSoft + )( + schnorrkelKeypairToU8a(keypair), + u8aToU8a(chainCode) + ) + ); +} diff --git a/packages/util-crypto/src/schnorrkel/deriveHard.ts b/packages/util-crypto/src/schnorrkel/deriveHard.ts index 0fbc0838a..a52836452 100644 --- a/packages/util-crypto/src/schnorrkel/deriveHard.ts +++ b/packages/util-crypto/src/schnorrkel/deriveHard.ts @@ -4,14 +4,8 @@ import type { HexString } from '@polkadot/util/types'; import type { Keypair } from '../types'; -import { u8aToU8a } from '@polkadot/util'; -import { sr25519DeriveKeypairHard } from '@polkadot/wasm-crypto'; - -import { schnorrkelKeypairFromU8a } from './keypair/fromU8a'; -import { schnorrkelKeypairToU8a } from './keypair/toU8a'; +import { schnorrkelDerive } from './derive'; export function schnorrkelDeriveHard (keypair: Keypair, chainCode: HexString | Uint8Array | string): Keypair { - return schnorrkelKeypairFromU8a( - sr25519DeriveKeypairHard(schnorrkelKeypairToU8a(keypair), u8aToU8a(chainCode)) - ); + return schnorrkelDerive(keypair, chainCode, true); } diff --git a/packages/util-crypto/src/schnorrkel/deriveSoft.ts b/packages/util-crypto/src/schnorrkel/deriveSoft.ts index 7be473853..ef8880aa2 100644 --- a/packages/util-crypto/src/schnorrkel/deriveSoft.ts +++ b/packages/util-crypto/src/schnorrkel/deriveSoft.ts @@ -4,14 +4,8 @@ import type { HexString } from '@polkadot/util/types'; import type { Keypair } from '../types'; -import { u8aToU8a } from '@polkadot/util'; -import { sr25519DeriveKeypairSoft } from '@polkadot/wasm-crypto'; - -import { schnorrkelKeypairFromU8a } from './keypair/fromU8a'; -import { schnorrkelKeypairToU8a } from './keypair/toU8a'; +import { schnorrkelDerive } from './derive'; export function schnorrkelDeriveSoft (keypair: Keypair, chainCode: HexString | Uint8Array | string): Keypair { - return schnorrkelKeypairFromU8a( - sr25519DeriveKeypairSoft(schnorrkelKeypairToU8a(keypair), u8aToU8a(chainCode)) - ); + return schnorrkelDerive(keypair, chainCode, false); }