npm - @metamask/eth-hd-keyring - Versions diffs - 12.0.0 → 13.0.0 - Mend

@metamask/eth-hd-keyring 12.0.0 → 13.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
+## [13.0.0]
+### Added
+- Export types `SerializedHDKeyringState` and `DeserializableHDKeyringState` ([#255](https://github.com/MetaMask/accounts/pull/255))
+### Changed
+- **BREAKING:** The method signature for `signTypedData` has been changed ([#224](https://github.com/MetaMask/accounts/pull/224))
+  - The method now accepts a `TypedDataV1` object when `SignTypedDataVersion.V1` is passed in the options, and `TypedMessage<Types>` when other versions are requested.
+- **BREAKING:** The `HdKeyring` class now extends `Keyring` from `@metamask/keyring-utils` ([#255](https://github.com/MetaMask/accounts/pull/255))
+  - The `deserialize` method does not accept `Buffer` mnemonic anymore
+  - The options argument to `deserialize` is no longer optional
+  - `getAccounts` is now `async`
+- Switched to using a `Map` for wallet storage ([#374](https://github.com/metamask/accounts/pull/374))
+  - Improves performance of account lookup and removal to constant time
+- Cache derived account addresses ([#373](https://github.com/metamask/accounts/pull/373))
+  - Avoids recomputing addresses from public keys on every `getAccounts()` call
+### Removed
+- **BREAKING:** `HDKeyringState` type is no longer exported ([#255](https://github.com/MetaMask/accounts/pull/255))
+  - This has effectively been replaced with `SerializedHDKeyringState` and `DeserializableHDKeyringState`
+## [12.1.0]
+### Added
+- Store mnemonic seed in `HdKeyring.seed` ([#244](https://github.com/MetaMask/accounts/pull/244))
 ## [12.0.0]
 ### Changed
@@ -191,7 +221,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Deserialize method (and `HdKeyring` constructor by extension) can no longer be passed an options object containing a value for `numberOfAccounts` if it is not also containing a value for `mnemonic`.
 - Package name changed from `eth-hd-keyring` to `@metamask/eth-hd-keyring`.
-[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@12.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@13.0.0...HEAD
+[13.0.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@12.1.0...@metamask/eth-hd-keyring@13.0.0
+[12.1.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@12.0.0...@metamask/eth-hd-keyring@12.1.0
 [12.0.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@11.0.0...@metamask/eth-hd-keyring@12.0.0
 [11.0.0]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@10.0.1...@metamask/eth-hd-keyring@11.0.0
 [10.0.1]: https://github.com/MetaMask/accounts/compare/@metamask/eth-hd-keyring@10.0.0...@metamask/eth-hd-keyring@10.0.1

package/dist/hd-keyring.cjs CHANGED Viewed

@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _HdKeyring_instances, _HdKeyring_wallets, _HdKeyring_cryptographicFunctions, _HdKeyring_uint8ArrayToString, _HdKeyring_stringToUint8Array, _HdKeyring_mnemonicToUint8Array, _HdKeyring_getPrivateKeyFor, _HdKeyring_getWalletForAccount, _HdKeyring_initFromMnemonic, _HdKeyring_addressfromPublicKey, _HdKeyring_normalizeAddress;
+var _HdKeyring_instances, _HdKeyring_walletMap, _HdKeyring_cryptographicFunctions, _HdKeyring_uint8ArrayToString, _HdKeyring_stringToUint8Array, _HdKeyring_mnemonicToUint8Array, _HdKeyring_getPrivateKeyFor, _HdKeyring_getWalletForAccount, _HdKeyring_initFromMnemonic, _HdKeyring_addressFromPublicKey, _HdKeyring_normalizeAddress;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HdKeyring = void 0;
 const util_1 = require("@ethereumjs/util");
@@ -44,7 +44,7 @@ class HdKeyring {
         _HdKeyring_instances.add(this);
         this.type = type;
         this.hdPath = hdPathString;
-        _HdKeyring_wallets.set(this, []);
+        _HdKeyring_walletMap.set(this, new Map());
         _HdKeyring_cryptographicFunctions.set(this, void 0);
         // Cryptographic functions to be used by `@metamask/key-tree`. It will use built-in implementations if not provided here.
         __classPrivateFieldSet(this, _HdKeyring_cryptographicFunctions, opts.cryptographicFunctions, "f");
@@ -70,7 +70,7 @@ class HdKeyring {
         }
         return {
             mnemonic,
-            numberOfAccounts: __classPrivateFieldGet(this, _HdKeyring_wallets, "f").length,
+            numberOfAccounts: __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").size,
             hdPath: this.hdPath,
         };
     }
@@ -80,24 +80,24 @@ class HdKeyring {
      * @param opts - The serialized state of the keyring.
      * @returns An empty array.
      */
-    async deserialize(opts = {}) {
+    async deserialize(opts) {
         if (opts.numberOfAccounts && !opts.mnemonic) {
             throw new Error('Eth-Hd-Keyring: Deserialize method cannot be called with an opts value for numberOfAccounts and no menmonic');
         }
         if (this.root) {
             throw new Error('Eth-Hd-Keyring: Secret recovery phrase already provided');
         }
-        __classPrivateFieldSet(this, _HdKeyring_wallets, [], "f");
+        __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").clear();
         this.mnemonic = null;
+        this.seed = null;
         this.root = null;
         this.hdPath = opts.hdPath ?? hdPathString;
         if (opts.mnemonic) {
             await __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_initFromMnemonic).call(this, opts.mnemonic);
         }
         if (opts.numberOfAccounts) {
-            return this.addAccounts(opts.numberOfAccounts);
+            await this.addAccounts(opts.numberOfAccounts);
         }
-        return [];
     }
     /**
      * Add new accounts to the keyring. The accounts will be derived
@@ -110,29 +110,28 @@ class HdKeyring {
         if (!this.root) {
             throw new Error('Eth-Hd-Keyring: No secret recovery phrase provided');
         }
-        const oldLen = __classPrivateFieldGet(this, _HdKeyring_wallets, "f").length;
-        const newWallets = [];
+        const oldLen = __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").size;
+        const newAddresses = [];
         for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {
-            const wallet = this.root.deriveChild(i);
-            newWallets.push(wallet);
-            __classPrivateFieldGet(this, _HdKeyring_wallets, "f").push(wallet);
+            const hdKey = this.root.deriveChild(i);
+            (0, utils_1.assert)(hdKey.publicKey, 'Expected public key to be set');
+            const address = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressFromPublicKey).call(this, hdKey.publicKey);
+            const walletData = {
+                hdKey,
+                address,
+            };
+            __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").set(address, walletData);
+            newAddresses.push(address);
         }
-        const hexWallets = newWallets.map((wallet) => {
-            (0, utils_1.assert)(wallet.publicKey, 'Expected public key to be set');
-            return __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressfromPublicKey).call(this, wallet.publicKey);
-        });
-        return Promise.resolve(hexWallets);
+        return Promise.resolve(newAddresses);
     }
     /**
      * Get the addresses of all accounts in the keyring.
      *
      * @returns The addresses of all accounts in the keyring.
      */
-    getAccounts() {
-        return __classPrivateFieldGet(this, _HdKeyring_wallets, "f").map((wallet) => {
-            (0, utils_1.assert)(wallet.publicKey, 'Expected public key to be set');
-            return __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressfromPublicKey).call(this, wallet.publicKey);
-        });
+    async getAccounts() {
+        return Array.from(__classPrivateFieldGet(this, _HdKeyring_walletMap, "f").keys());
     }
     /**
      * Get the public address of the account for the given app key origin.
@@ -233,20 +232,21 @@ class HdKeyring {
      * Sign a typed message using the private key of the specified account.
      * This method is compatible with the `eth_signTypedData` RPC method.
      *
-     * @param withAccount - The address of the account.
-     * @param typedData - The typed data to sign.
-     * @param opts - The options for signing the message.
+     * @param address - The address of the account.
+     * @param data - The typed data to sign.
+     * @param options - The options for signing the message.
      * @returns The signature of the message.
      */
-    async signTypedData(withAccount, typedData, opts = { version: eth_sig_util_1.SignTypedDataVersion.V1 }) {
+    async signTypedData(address, data, options) {
+        let { version } = options ?? { version: eth_sig_util_1.SignTypedDataVersion.V1 };
         // Treat invalid versions as "V1"
-        const version = Object.keys(eth_sig_util_1.SignTypedDataVersion).includes(opts.version)
-            ? opts.version
-            : eth_sig_util_1.SignTypedDataVersion.V1;
-        const privateKey = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_getPrivateKeyFor).call(this, withAccount, opts);
+        if (!version || !Object.keys(eth_sig_util_1.SignTypedDataVersion).includes(version)) {
+            version = eth_sig_util_1.SignTypedDataVersion.V1;
+        }
+        const privateKey = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_getPrivateKeyFor).call(this, address, options);
         return (0, eth_sig_util_1.signTypedData)({
             privateKey: Buffer.from(privateKey),
-            data: typedData,
+            data,
             version,
         });
     }
@@ -273,12 +273,10 @@ class HdKeyring {
      */
     removeAccount(account) {
         const address = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_normalizeAddress).call(this, account);
-        if (!__classPrivateFieldGet(this, _HdKeyring_wallets, "f")
-            .map(({ publicKey }) => publicKey && __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressfromPublicKey).call(this, publicKey))
-            .includes(address)) {
+        if (!__classPrivateFieldGet(this, _HdKeyring_walletMap, "f").has(address)) {
             throw new Error(`Address ${address} not found in this keyring`);
         }
-        __classPrivateFieldSet(this, _HdKeyring_wallets, __classPrivateFieldGet(this, _HdKeyring_wallets, "f").filter(({ publicKey }) => publicKey && __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressfromPublicKey).call(this, publicKey) !== address), "f");
+        __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").delete(address);
     }
     /**
      * Get the public key of the account to be used for encryption.
@@ -294,7 +292,7 @@ class HdKeyring {
     }
 }
 exports.HdKeyring = HdKeyring;
-_HdKeyring_wallets = new WeakMap(), _HdKeyring_cryptographicFunctions = new WeakMap(), _HdKeyring_instances = new WeakSet(), _HdKeyring_uint8ArrayToString = function _HdKeyring_uint8ArrayToString(mnemonic) {
+_HdKeyring_walletMap = new WeakMap(), _HdKeyring_cryptographicFunctions = new WeakMap(), _HdKeyring_instances = new WeakSet(), _HdKeyring_uint8ArrayToString = function _HdKeyring_uint8ArrayToString(mnemonic) {
     const recoveredIndices = Array.from(new Uint16Array(new Uint8Array(mnemonic).buffer));
     return recoveredIndices.map((i) => english_1.wordlist[i]).join(' ');
 }, _HdKeyring_stringToUint8Array = function _HdKeyring_stringToUint8Array(mnemonic) {
@@ -340,14 +338,12 @@ _HdKeyring_wallets = new WeakMap(), _HdKeyring_cryptographicFunctions = new Weak
     return wallet.privateKey;
 }, _HdKeyring_getWalletForAccount = function _HdKeyring_getWalletForAccount(account, { withAppKeyOrigin } = {}) {
     const address = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_normalizeAddress).call(this, account);
-    const wallet = __classPrivateFieldGet(this, _HdKeyring_wallets, "f").find(({ publicKey }) => {
-        return publicKey && __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressfromPublicKey).call(this, publicKey) === address;
-    });
-    if (!wallet) {
+    const walletData = __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").get(address);
+    if (!walletData) {
         throw new Error('HD Keyring - Unable to find matching address.');
     }
     if (withAppKeyOrigin) {
-        const { privateKey } = wallet;
+        const { privateKey } = walletData.hdKey;
         (0, utils_1.assert)(privateKey, 'Expected private key to be set');
         const appKeyOriginBuffer = Buffer.from(withAppKeyOrigin, 'utf8');
         const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);
@@ -355,7 +351,7 @@ _HdKeyring_wallets = new WeakMap(), _HdKeyring_cryptographicFunctions = new Weak
         const appKeyPublicKey = Buffer.from((0, util_1.privateToPublic)(appKeyPrivateKey));
         return { privateKey: appKeyPrivateKey, publicKey: appKeyPublicKey };
     }
-    return wallet;
+    return walletData.hdKey;
 }, _HdKeyring_initFromMnemonic =
 /**
  * Sets appropriate properties for the keyring based on the given
@@ -370,11 +366,11 @@ async function _HdKeyring_initFromMnemonic(mnemonic) {
         throw new Error('Eth-Hd-Keyring: Secret recovery phrase already provided');
     }
     this.mnemonic = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_mnemonicToUint8Array).call(this, mnemonic);
-    const seed = await (0, key_tree_1.mnemonicToSeed)(this.mnemonic, '', // No passphrase
+    this.seed = await (0, key_tree_1.mnemonicToSeed)(this.mnemonic, '', // No passphrase
     __classPrivateFieldGet(this, _HdKeyring_cryptographicFunctions, "f"));
-    this.hdWallet = hdkey_1.HDKey.fromMasterSeed(seed);
+    this.hdWallet = hdkey_1.HDKey.fromMasterSeed(this.seed);
     this.root = this.hdWallet.derive(this.hdPath);
-}, _HdKeyring_addressfromPublicKey = function _HdKeyring_addressfromPublicKey(publicKey) {
+}, _HdKeyring_addressFromPublicKey = function _HdKeyring_addressFromPublicKey(publicKey) {
     return (0, utils_1.add0x)((0, utils_1.bytesToHex)((0, util_1.publicToAddress)(Buffer.from(publicKey), true)).toLowerCase());
 }, _HdKeyring_normalizeAddress = function _HdKeyring_normalizeAddress(address) {
     const normalized = (0, eth_sig_util_1.normalize)(address);

package/dist/hd-keyring.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hd-keyring.cjs","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TypedTransaction } from '@ethereumjs/tx';\nimport { privateToPublic, publicToAddress, ecsign } from '@ethereumjs/util';\nimport {\n concatSig,\n decrypt,\n type EIP7702Authorization,\n type EthEncryptedData,\n getEncryptionPublicKey,\n type MessageTypes,\n normalize,\n personalSign,\n signEIP7702Authorization,\n signTypedData,\n SignTypedDataVersion,\n type TypedDataV1,\n type TypedMessage,\n} from '@metamask/eth-sig-util';\nimport {\n type CryptographicFunctions,\n mnemonicToSeed,\n} from '@metamask/key-tree';\nimport { generateMnemonic } from '@metamask/scure-bip39';\nimport { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\nimport {\n add0x,\n assert,\n assertIsHexString,\n bigIntToBytes,\n bytesToHex,\n type Hex,\n remove0x,\n} from '@metamask/utils';\nimport { HDKey } from 'ethereum-cryptography/hdkey';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\n\n// Options:\nconst hdPathString = `m/44'/60'/0'/0`;\nconst type = 'HD Key Tree';\n\nexport type HDKeyringOptions = {\n cryptographicFunctions?: CryptographicFunctions;\n};\n\n/*\n The serialized state of an `HDKeyring` instance.\n \n @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n /\nexport type HDKeyringState = {\n mnemonic: number[] \| Uint8Array \| Buffer \| string;\n numberOfAccounts: number;\n hdPath: string;\n};\n\n/\n Options for selecting an account from an `HDKeyring` instance.\n \n @property withAppKeyOrigin - The origin of the app requesting the account.\n /\nexport type HDKeyringAccountSelectionOptions = {\n withAppKeyOrigin?: string;\n};\n\ntype SerializedBuffer = ReturnType<Buffer['toJSON']>;\n\n/\n Checks if the given value is a valid serialized Buffer compatible with\n * the return type of `Buffer.toJSON`.\n \n @param value - The value to check.\n * @returns `true` if the value is a valid serialized buffer, `false` otherwise.\n /\nfunction isSerializedBuffer(value: unknown): value is SerializedBuffer {\n return (\n typeof value === 'object' &&\n value !== null &&\n 'type' in value &&\n value.type === 'Buffer' &&\n 'data' in value &&\n Array.isArray(value.data)\n );\n}\n\nexport class HdKeyring {\n static type: string = type;\n\n type: string = type;\n\n mnemonic?: Uint8Array \| null;\n\n root?: HDKey \| null;\n\n hdWallet?: HDKey;\n\n hdPath: string = hdPathString;\n\n #wallets: HDKey[] = [];\n\n readonly #cryptographicFunctions?: CryptographicFunctions;\n\n constructor(opts: HDKeyringOptions = {}) {\n // Cryptographic functions to be used by `@metamask/key-tree`. It will use built-in implementations if not provided here.\n this.#cryptographicFunctions = opts.cryptographicFunctions;\n }\n\n /\n Initialize the keyring with a random mnemonic.\n \n @returns A promise that resolves when the process is complete.\n /\n async generateRandomMnemonic(): Promise<void> {\n await this.#initFromMnemonic(generateMnemonic(wordlist));\n }\n\n /\n Return the serialized state of the keyring.\n \n @returns The serialized state of the keyring.\n /\n async serialize(): Promise<HDKeyringState> {\n let mnemonic: number[] = [];\n\n if (this.mnemonic) {\n const mnemonicAsString = this.#uint8ArrayToString(this.mnemonic);\n mnemonic = Array.from(new TextEncoder().encode(mnemonicAsString));\n }\n\n return {\n mnemonic,\n numberOfAccounts: this.#wallets.length,\n hdPath: this.hdPath,\n };\n }\n\n /\n Initialize the keyring with the given serialized state.\n \n @param opts - The serialized state of the keyring.\n * @returns An empty array.\n /\n async deserialize(opts: Partial<HDKeyringState> = {}): Promise<string[]> {\n if (opts.numberOfAccounts && !opts.mnemonic) {\n throw new Error(\n 'Eth-Hd-Keyring: Deserialize method cannot be called with an opts value for numberOfAccounts and no menmonic',\n );\n }\n\n if (this.root) {\n throw new Error(\n 'Eth-Hd-Keyring: Secret recovery phrase already provided',\n );\n }\n this.#wallets = [];\n this.mnemonic = null;\n this.root = null;\n this.hdPath = opts.hdPath ?? hdPathString;\n\n if (opts.mnemonic) {\n await this.#initFromMnemonic(opts.mnemonic);\n }\n\n if (opts.numberOfAccounts) {\n return this.addAccounts(opts.numberOfAccounts);\n }\n\n return [];\n }\n\n /\n Add new accounts to the keyring. The accounts will be derived\n * sequentially from the root HD wallet, using increasing indices.\n \n @param numberOfAccounts - The number of accounts to add.\n * @returns The addresses of the new accounts.\n /\n async addAccounts(numberOfAccounts = 1): Promise<Hex[]> {\n if (!this.root) {\n throw new Error('Eth-Hd-Keyring: No secret recovery phrase provided');\n }\n\n const oldLen = this.#wallets.length;\n const newWallets: HDKey[] = [];\n for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {\n const wallet = this.root.deriveChild(i);\n newWallets.push(wallet);\n this.#wallets.push(wallet);\n }\n const hexWallets = newWallets.map((wallet) => {\n assert(wallet.publicKey, 'Expected public key to be set');\n return this.#addressfromPublicKey(wallet.publicKey);\n });\n return Promise.resolve(hexWallets);\n }\n\n /\n Get the addresses of all accounts in the keyring.\n \n @returns The addresses of all accounts in the keyring.\n /\n getAccounts(): Hex[] {\n return this.#wallets.map((wallet) => {\n assert(wallet.publicKey, 'Expected public key to be set');\n return this.#addressfromPublicKey(wallet.publicKey);\n });\n }\n\n /\n Get the public address of the account for the given app key origin.\n \n @param address - The address of the account.\n * @param origin - The origin of the app requesting the account.\n * @returns The public address of the account.\n /\n async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n if (!origin \|\| typeof origin !== 'string') {\n throw new Error(`'origin' must be a non-empty string`);\n }\n const wallet = this.#getWalletForAccount(address, {\n withAppKeyOrigin: origin,\n });\n assert(wallet.publicKey, 'Expected public key to be set');\n const appKeyAddress = this.#normalizeAddress(\n bytesToHex(publicToAddress(wallet.publicKey)),\n );\n return appKeyAddress;\n }\n\n /\n Export the private key for a specific account.\n \n @param address - The address of the account.\n * @param opts - The options for exporting the account.\n * @param opts.withAppKeyOrigin - An optional string to export the account\n * for a specific app origin.\n * @returns The private key of the account.\n /\n async exportAccount(\n address: Hex,\n opts?: { withAppKeyOrigin: string },\n ): Promise<string> {\n const wallet = opts\n ? this.#getWalletForAccount(address, opts)\n : this.#getWalletForAccount(address);\n const { privateKey } = wallet;\n assert(\n privateKey instanceof Uint8Array,\n 'Expected private key to be of type Uint8Array',\n );\n return remove0x(bytesToHex(privateKey));\n }\n\n /\n Sign a transaction using the private key of the specified account.\n \n @param address - The address of the account.\n * @param tx - The transaction to sign.\n * @param opts - The options for signing the transaction.\n * @returns The signed transaction.\n /\n async signTransaction(\n address: Hex,\n tx: TypedTransaction,\n opts = {},\n ): Promise<TypedTransaction> {\n const privKey = this.#getPrivateKeyFor(address, opts);\n const signedTx = tx.sign(Buffer.from(privKey));\n // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n return signedTx ?? tx;\n }\n\n /\n Sign a message using the private key of the specified account.\n \n @param address - The address of the account.\n * @param data - The data to sign.\n * @param opts - The options for signing the message.\n * @returns The signature of the message.\n /\n async signMessage(\n address: Hex,\n data: string,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n assertIsHexString(data);\n const message = remove0x(data);\n const privKey = this.#getPrivateKeyFor(address, opts);\n const msgSig = ecsign(Buffer.from(message, 'hex'), Buffer.from(privKey));\n const rawMsgSig = concatSig(\n Buffer.from(bigIntToBytes(msgSig.v)),\n Buffer.from(msgSig.r),\n Buffer.from(msgSig.s),\n );\n return rawMsgSig;\n }\n\n /\n Sign a personal message using the private key of the specified account.\n * This method is compatible with the `personal_sign` RPC method.\n \n @param address - The address of the account.\n * @param msgHex - The message to sign.\n * @param opts - The options for signing the message.\n * @returns The signature of the message.\n /\n async signPersonalMessage(\n address: Hex,\n msgHex: string,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n const privKey = this.#getPrivateKeyFor(address, opts);\n const privateKey = Buffer.from(privKey);\n return personalSign({ privateKey, data: msgHex });\n }\n\n /\n Decrypt an encrypted message using the private key of the specified account.\n * The message must be encrypted using the public key of the account.\n * This method is compatible with the `eth_decryptMessage` RPC method\n \n @param withAccount - The address of the account.\n * @param encryptedData - The encrypted data.\n * @returns The decrypted message.\n /\n async decryptMessage(\n withAccount: Hex,\n encryptedData: EthEncryptedData,\n ): Promise<string> {\n const wallet = this.#getWalletForAccount(withAccount);\n const { privateKey: privateKeyAsUint8Array } = wallet;\n assert(privateKeyAsUint8Array, 'Expected private key to be set');\n const privateKeyAsHex = Buffer.from(privateKeyAsUint8Array).toString('hex');\n return decrypt({ privateKey: privateKeyAsHex, encryptedData });\n }\n\n /\n Sign a typed message using the private key of the specified account.\n * This method is compatible with the `eth_signTypedData` RPC method.\n \n @param withAccount - The address of the account.\n * @param typedData - The typed data to sign.\n * @param opts - The options for signing the message.\n * @returns The signature of the message.\n /\n async signTypedData<Types extends MessageTypes>(\n withAccount: Hex,\n typedData: TypedDataV1 \| TypedMessage<Types>,\n opts: HDKeyringAccountSelectionOptions & {\n version: SignTypedDataVersion;\n } = { version: SignTypedDataVersion.V1 },\n ): Promise<string> {\n // Treat invalid versions as \"V1\"\n const version = Object.keys(SignTypedDataVersion).includes(opts.version)\n ? opts.version\n : SignTypedDataVersion.V1;\n\n const privateKey = this.#getPrivateKeyFor(withAccount, opts);\n return signTypedData({\n privateKey: Buffer.from(privateKey),\n data: typedData,\n version,\n });\n }\n\n /\n Sign an EIP-7702 authorization using the private key of the specified account.\n * This method is compatible with the EIP-7702 standard for enabling smart contract code for EOAs.\n \n @param withAccount - The address of the account.\n * @param authorization - The EIP-7702 authorization to sign.\n * @param opts - The options for selecting the account.\n * @returns The signature of the authorization.\n /\n async signEip7702Authorization(\n withAccount: Hex,\n authorization: EIP7702Authorization,\n opts?: HDKeyringAccountSelectionOptions,\n ): Promise<string> {\n const privateKey = this.#getPrivateKeyFor(withAccount, opts);\n return signEIP7702Authorization({\n privateKey: Buffer.from(privateKey),\n authorization,\n });\n }\n\n /\n Remove an account from the keyring.\n \n @param account - The address of the account to remove.\n /\n removeAccount(account: Hex): void {\n const address = this.#normalizeAddress(account);\n if (\n !this.#wallets\n .map(\n ({ publicKey }) => publicKey && this.#addressfromPublicKey(publicKey),\n )\n .includes(address)\n ) {\n throw new Error(`Address ${address} not found in this keyring`);\n }\n\n this.#wallets = this.#wallets.filter(\n ({ publicKey }) =>\n publicKey && this.#addressfromPublicKey(publicKey) !== address,\n );\n }\n\n /\n Get the public key of the account to be used for encryption.\n \n @param withAccount - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns The public key of the account.\n /\n async getEncryptionPublicKey(\n withAccount: Hex,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n const privKey = this.#getPrivateKeyFor(withAccount, opts);\n const publicKey = getEncryptionPublicKey(remove0x(bytesToHex(privKey)));\n return publicKey;\n }\n\n /\n Convert a Uint8Array mnemonic to a secret recovery phrase,\n * using the english wordlist.\n \n @param mnemonic - The Uint8Array mnemonic.\n * @returns The string mnemonic.\n /\n #uint8ArrayToString(mnemonic: Uint8Array): string {\n const recoveredIndices = Array.from(\n new Uint16Array(new Uint8Array(mnemonic).buffer),\n );\n return recoveredIndices.map((i) => wordlist[i]).join(' ');\n }\n\n /\n Convert a secret recovery phrase to a Uint8Array mnemonic,\n * using the english wordlist.\n \n @param mnemonic - The string mnemonic.\n * @returns The Uint8Array mnemonic.\n /\n #stringToUint8Array(mnemonic: string): Uint8Array {\n const indices = mnemonic.split(' ').map((word) => wordlist.indexOf(word));\n return new Uint8Array(new Uint16Array(indices).buffer);\n }\n\n /\n Convert a mnemonic to a Uint8Array mnemonic.\n \n @param mnemonic - The mnemonic seed phrase.\n * @returns The Uint8Array mnemonic.\n /\n #mnemonicToUint8Array(\n mnemonic: Buffer \| SerializedBuffer \| string \| Uint8Array \| number[],\n ): Uint8Array {\n let mnemonicData: unknown = mnemonic;\n // When using `Buffer.toJSON()`, the Buffer is serialized into an object\n // with the structure `{ type: 'Buffer', data: [...] }`\n if (isSerializedBuffer(mnemonic)) {\n mnemonicData = mnemonic.data;\n }\n\n if (\n // this block is for backwards compatibility with vaults that were previously stored as buffers, number arrays or plain text strings\n typeof mnemonicData === 'string' \|\|\n Buffer.isBuffer(mnemonicData) \|\|\n Array.isArray(mnemonicData)\n ) {\n let mnemonicAsString: string;\n if (Array.isArray(mnemonicData)) {\n mnemonicAsString = Buffer.from(mnemonicData).toString();\n } else if (Buffer.isBuffer(mnemonicData)) {\n mnemonicAsString = mnemonicData.toString();\n } else {\n mnemonicAsString = mnemonicData;\n }\n return this.#stringToUint8Array(mnemonicAsString);\n } else if (\n mnemonicData instanceof Object &&\n !(mnemonicData instanceof Uint8Array)\n ) {\n // when encrypted/decrypted the Uint8Array becomes a js object we need to cast back to a Uint8Array\n return Uint8Array.from(Object.values(mnemonicData));\n }\n\n assert(mnemonicData instanceof Uint8Array, 'Expected Uint8Array mnemonic');\n return mnemonicData;\n }\n\n /\n Get the private key for the specified account.\n \n @param address - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns The private key of the account.\n /\n #getPrivateKeyFor(\n address: Hex,\n opts?: HDKeyringAccountSelectionOptions,\n ): Uint8Array \| Buffer {\n if (!address) {\n throw new Error('Must specify address.');\n }\n const wallet = this.#getWalletForAccount(address, opts);\n assert(wallet.privateKey, 'Missing private key');\n return wallet.privateKey;\n }\n\n /\n Get the wallet for the specified account.\n \n @param account - The address of the account.\n * @returns The wallet for the account as HDKey.\n /\n #getWalletForAccount(account: Hex): HDKey;\n\n /\n Get the wallet for the specified account and app origin.\n \n @param account - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns A key pair representing the wallet.\n /\n #getWalletForAccount(\n accounts: Hex,\n opts: { withAppKeyOrigin: string },\n ): { privateKey: Buffer; publicKey: Buffer };\n\n /\n Get the wallet for the specified account with optional\n * additional options.\n \n @param account - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns A key pair representing the wallet.\n /\n #getWalletForAccount(\n account: Hex,\n opts?: HDKeyringAccountSelectionOptions,\n ): HDKey \| { privateKey: Buffer; publicKey: Buffer };\n\n #getWalletForAccount(\n account: Hex,\n { withAppKeyOrigin }: HDKeyringAccountSelectionOptions = {},\n ): HDKey \| { privateKey: Buffer; publicKey: Buffer } {\n const address = this.#normalizeAddress(account);\n const wallet = this.#wallets.find(({ publicKey }) => {\n return publicKey && this.#addressfromPublicKey(publicKey) === address;\n });\n if (!wallet) {\n throw new Error('HD Keyring - Unable to find matching address.');\n }\n\n if (withAppKeyOrigin) {\n const { privateKey } = wallet;\n assert(privateKey, 'Expected private key to be set');\n const appKeyOriginBuffer = Buffer.from(withAppKeyOrigin, 'utf8');\n const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n const appKeyPrivateKey = Buffer.from(keccak256(appKeyBuffer));\n const appKeyPublicKey = Buffer.from(privateToPublic(appKeyPrivateKey));\n return { privateKey: appKeyPrivateKey, publicKey: appKeyPublicKey };\n }\n\n return wallet;\n }\n\n /\n Sets appropriate properties for the keyring based on the given\n * BIP39-compliant mnemonic.\n \n @param mnemonic - A seed phrase represented\n * as a string, an array of UTF-8 bytes, or a Buffer. Mnemonic input\n * passed as type buffer or array of UTF-8 bytes must be NFKD normalized.\n /\n async #initFromMnemonic(\n mnemonic: string \| number[] \| Buffer \| Uint8Array,\n ): Promise<void> {\n if (this.root) {\n throw new Error(\n 'Eth-Hd-Keyring: Secret recovery phrase already provided',\n );\n }\n\n this.mnemonic = this.#mnemonicToUint8Array(mnemonic);\n\n const seed = await mnemonicToSeed(\n this.mnemonic,\n '', // No passphrase\n this.#cryptographicFunctions,\n );\n this.hdWallet = HDKey.fromMasterSeed(seed);\n this.root = this.hdWallet.derive(this.hdPath);\n }\n\n /\n Get the address of the account from the public key.\n \n @param publicKey - The public key of the account.\n * @returns The address of the account.\n /\n #addressfromPublicKey(publicKey: Uint8Array): Hex {\n return add0x(\n bytesToHex(publicToAddress(Buffer.from(publicKey), true)).toLowerCase(),\n );\n }\n\n /\n Normalize an address to a lower-cased '0x'-prefixed hex string.\n \n @param address - The address to normalize.\n * @returns The normalized address.\n */\n #normalizeAddress(address: string): Hex {\n const normalized = normalize(address);\n assert(normalized, 'Expected address to be set');\n return add0x(normalized);\n }\n}\n"]}
1	+ {"version":3,"file":"hd-keyring.cjs","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TypedTransaction } from '@ethereumjs/tx';\nimport { privateToPublic, publicToAddress, ecsign } from '@ethereumjs/util';\nimport {\n concatSig,\n decrypt,\n type EIP7702Authorization,\n type EthEncryptedData,\n getEncryptionPublicKey,\n type MessageTypes,\n normalize,\n personalSign,\n signEIP7702Authorization,\n signTypedData,\n SignTypedDataVersion,\n type TypedDataV1,\n type TypedMessage,\n} from '@metamask/eth-sig-util';\nimport {\n type CryptographicFunctions,\n mnemonicToSeed,\n} from '@metamask/key-tree';\nimport type { Keyring } from '@metamask/keyring-utils';\nimport { generateMnemonic } from '@metamask/scure-bip39';\nimport { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\nimport {\n add0x,\n assert,\n assertIsHexString,\n bigIntToBytes,\n bytesToHex,\n type Hex,\n remove0x,\n} from '@metamask/utils';\nimport { HDKey } from 'ethereum-cryptography/hdkey';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\n\n// Options:\nconst hdPathString = `m/44'/60'/0'/0`;\nconst type = 'HD Key Tree';\n\nexport type HDKeyringOptions = {\n cryptographicFunctions?: CryptographicFunctions;\n};\n\n/*\n The serialized state of an `HDKeyring` instance.\n \n @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n /\nexport type SerializedHDKeyringState = {\n mnemonic: number[];\n numberOfAccounts: number;\n hdPath: string;\n};\n\n/\n An object that can be passed to the Keyring.deserialize method to initialize\n * an `HDKeyring` instance.\n \n @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n /\nexport type DeserializableHDKeyringState = Omit<\n SerializedHDKeyringState,\n 'mnemonic'\n> & {\n mnemonic: number[] \| SerializedBuffer \| string;\n};\n\n/\n Options for selecting an account from an `HDKeyring` instance.\n \n @property withAppKeyOrigin - The origin of the app requesting the account.\n /\nexport type HDKeyringAccountSelectionOptions = {\n withAppKeyOrigin?: string;\n};\n\ntype SerializedBuffer = ReturnType<Buffer['toJSON']>;\n\n/\n Wallet storage object that contains both the HDKey and pre-computed address.\n /\ntype WalletData = {\n hdKey: HDKey;\n address: Hex;\n};\n\n/\n Checks if the given value is a valid serialized Buffer compatible with\n * the return type of `Buffer.toJSON`.\n \n @param value - The value to check.\n * @returns `true` if the value is a valid serialized buffer, `false` otherwise.\n /\nfunction isSerializedBuffer(value: unknown): value is SerializedBuffer {\n return (\n typeof value === 'object' &&\n value !== null &&\n 'type' in value &&\n value.type === 'Buffer' &&\n 'data' in value &&\n Array.isArray(value.data)\n );\n}\n\nexport class HdKeyring implements Keyring {\n static type: string = type;\n\n type: string = type;\n\n mnemonic?: Uint8Array \| null;\n\n seed?: Uint8Array \| null;\n\n root?: HDKey \| null;\n\n hdWallet?: HDKey;\n\n hdPath: string = hdPathString;\n\n readonly #walletMap = new Map<Hex, WalletData>();\n\n readonly #cryptographicFunctions?: CryptographicFunctions;\n\n constructor(opts: HDKeyringOptions = {}) {\n // Cryptographic functions to be used by `@metamask/key-tree`. It will use built-in implementations if not provided here.\n this.#cryptographicFunctions = opts.cryptographicFunctions;\n }\n\n /\n Initialize the keyring with a random mnemonic.\n \n @returns A promise that resolves when the process is complete.\n /\n async generateRandomMnemonic(): Promise<void> {\n await this.#initFromMnemonic(generateMnemonic(wordlist));\n }\n\n /\n Return the serialized state of the keyring.\n \n @returns The serialized state of the keyring.\n /\n async serialize(): Promise<SerializedHDKeyringState> {\n let mnemonic: number[] = [];\n\n if (this.mnemonic) {\n const mnemonicAsString = this.#uint8ArrayToString(this.mnemonic);\n mnemonic = Array.from(new TextEncoder().encode(mnemonicAsString));\n }\n\n return {\n mnemonic,\n numberOfAccounts: this.#walletMap.size,\n hdPath: this.hdPath,\n };\n }\n\n /\n Initialize the keyring with the given serialized state.\n \n @param opts - The serialized state of the keyring.\n * @returns An empty array.\n /\n async deserialize(\n opts: Partial<DeserializableHDKeyringState>,\n ): Promise<void> {\n if (opts.numberOfAccounts && !opts.mnemonic) {\n throw new Error(\n 'Eth-Hd-Keyring: Deserialize method cannot be called with an opts value for numberOfAccounts and no menmonic',\n );\n }\n\n if (this.root) {\n throw new Error(\n 'Eth-Hd-Keyring: Secret recovery phrase already provided',\n );\n }\n\n this.#walletMap.clear();\n this.mnemonic = null;\n this.seed = null;\n this.root = null;\n this.hdPath = opts.hdPath ?? hdPathString;\n\n if (opts.mnemonic) {\n await this.#initFromMnemonic(opts.mnemonic);\n }\n\n if (opts.numberOfAccounts) {\n await this.addAccounts(opts.numberOfAccounts);\n }\n }\n\n /\n Add new accounts to the keyring. The accounts will be derived\n * sequentially from the root HD wallet, using increasing indices.\n \n @param numberOfAccounts - The number of accounts to add.\n * @returns The addresses of the new accounts.\n /\n async addAccounts(numberOfAccounts = 1): Promise<Hex[]> {\n if (!this.root) {\n throw new Error('Eth-Hd-Keyring: No secret recovery phrase provided');\n }\n\n const oldLen = this.#walletMap.size;\n const newAddresses: Hex[] = [];\n for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {\n const hdKey = this.root.deriveChild(i);\n assert(hdKey.publicKey, 'Expected public key to be set');\n\n const address = this.#addressFromPublicKey(hdKey.publicKey);\n const walletData: WalletData = {\n hdKey,\n address,\n };\n\n this.#walletMap.set(address, walletData);\n newAddresses.push(address);\n }\n\n return Promise.resolve(newAddresses);\n }\n\n /\n Get the addresses of all accounts in the keyring.\n \n @returns The addresses of all accounts in the keyring.\n /\n async getAccounts(): Promise<Hex[]> {\n return Array.from(this.#walletMap.keys());\n }\n\n /\n Get the public address of the account for the given app key origin.\n \n @param address - The address of the account.\n * @param origin - The origin of the app requesting the account.\n * @returns The public address of the account.\n /\n async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n if (!origin \|\| typeof origin !== 'string') {\n throw new Error(`'origin' must be a non-empty string`);\n }\n const wallet = this.#getWalletForAccount(address, {\n withAppKeyOrigin: origin,\n });\n assert(wallet.publicKey, 'Expected public key to be set');\n const appKeyAddress = this.#normalizeAddress(\n bytesToHex(publicToAddress(wallet.publicKey)),\n );\n return appKeyAddress;\n }\n\n /\n Export the private key for a specific account.\n \n @param address - The address of the account.\n * @param opts - The options for exporting the account.\n * @param opts.withAppKeyOrigin - An optional string to export the account\n * for a specific app origin.\n * @returns The private key of the account.\n /\n async exportAccount(\n address: Hex,\n opts?: { withAppKeyOrigin: string },\n ): Promise<string> {\n const wallet = opts\n ? this.#getWalletForAccount(address, opts)\n : this.#getWalletForAccount(address);\n const { privateKey } = wallet;\n assert(\n privateKey instanceof Uint8Array,\n 'Expected private key to be of type Uint8Array',\n );\n return remove0x(bytesToHex(privateKey));\n }\n\n /\n Sign a transaction using the private key of the specified account.\n \n @param address - The address of the account.\n * @param tx - The transaction to sign.\n * @param opts - The options for signing the transaction.\n * @returns The signed transaction.\n /\n async signTransaction(\n address: Hex,\n tx: TypedTransaction,\n opts = {},\n ): Promise<TypedTransaction> {\n const privKey = this.#getPrivateKeyFor(address, opts);\n const signedTx = tx.sign(Buffer.from(privKey));\n // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n return signedTx ?? tx;\n }\n\n /\n Sign a message using the private key of the specified account.\n \n @param address - The address of the account.\n * @param data - The data to sign.\n * @param opts - The options for signing the message.\n * @returns The signature of the message.\n /\n async signMessage(\n address: Hex,\n data: string,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n assertIsHexString(data);\n const message = remove0x(data);\n const privKey = this.#getPrivateKeyFor(address, opts);\n const msgSig = ecsign(Buffer.from(message, 'hex'), Buffer.from(privKey));\n const rawMsgSig = concatSig(\n Buffer.from(bigIntToBytes(msgSig.v)),\n Buffer.from(msgSig.r),\n Buffer.from(msgSig.s),\n );\n return rawMsgSig;\n }\n\n /\n Sign a personal message using the private key of the specified account.\n * This method is compatible with the `personal_sign` RPC method.\n \n @param address - The address of the account.\n * @param msgHex - The message to sign.\n * @param opts - The options for signing the message.\n * @returns The signature of the message.\n /\n async signPersonalMessage(\n address: Hex,\n msgHex: string,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n const privKey = this.#getPrivateKeyFor(address, opts);\n const privateKey = Buffer.from(privKey);\n return personalSign({ privateKey, data: msgHex });\n }\n\n /\n Decrypt an encrypted message using the private key of the specified account.\n * The message must be encrypted using the public key of the account.\n * This method is compatible with the `eth_decryptMessage` RPC method\n \n @param withAccount - The address of the account.\n * @param encryptedData - The encrypted data.\n * @returns The decrypted message.\n /\n async decryptMessage(\n withAccount: Hex,\n encryptedData: EthEncryptedData,\n ): Promise<string> {\n const wallet = this.#getWalletForAccount(withAccount);\n const { privateKey: privateKeyAsUint8Array } = wallet;\n assert(privateKeyAsUint8Array, 'Expected private key to be set');\n const privateKeyAsHex = Buffer.from(privateKeyAsUint8Array).toString('hex');\n return decrypt({ privateKey: privateKeyAsHex, encryptedData });\n }\n\n /\n Sign a typed message using the private key of the specified account.\n * This method is compatible with the `eth_signTypedData` RPC method.\n \n @param address - The address of the account.\n * @param data - The typed data to sign.\n * @param options - The options for signing the message.\n * @returns The signature of the message.\n /\n async signTypedData<\n Version extends SignTypedDataVersion,\n Types extends MessageTypes,\n Options extends { version?: Version },\n >(\n address: Hex,\n data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>,\n options?: HDKeyringAccountSelectionOptions & Options,\n ): Promise<string> {\n let { version } = options ?? { version: SignTypedDataVersion.V1 };\n\n // Treat invalid versions as \"V1\"\n if (!version \|\| !Object.keys(SignTypedDataVersion).includes(version)) {\n version = SignTypedDataVersion.V1;\n }\n\n const privateKey = this.#getPrivateKeyFor(address, options);\n return signTypedData({\n privateKey: Buffer.from(privateKey),\n data,\n version,\n });\n }\n\n /\n Sign an EIP-7702 authorization using the private key of the specified account.\n * This method is compatible with the EIP-7702 standard for enabling smart contract code for EOAs.\n \n @param withAccount - The address of the account.\n * @param authorization - The EIP-7702 authorization to sign.\n * @param opts - The options for selecting the account.\n * @returns The signature of the authorization.\n /\n async signEip7702Authorization(\n withAccount: Hex,\n authorization: EIP7702Authorization,\n opts?: HDKeyringAccountSelectionOptions,\n ): Promise<string> {\n const privateKey = this.#getPrivateKeyFor(withAccount, opts);\n return signEIP7702Authorization({\n privateKey: Buffer.from(privateKey),\n authorization,\n });\n }\n\n /\n Remove an account from the keyring.\n \n @param account - The address of the account to remove.\n /\n removeAccount(account: Hex): void {\n const address = this.#normalizeAddress(account);\n\n if (!this.#walletMap.has(address)) {\n throw new Error(`Address ${address} not found in this keyring`);\n }\n\n this.#walletMap.delete(address);\n }\n\n /\n Get the public key of the account to be used for encryption.\n \n @param withAccount - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns The public key of the account.\n /\n async getEncryptionPublicKey(\n withAccount: Hex,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n const privKey = this.#getPrivateKeyFor(withAccount, opts);\n const publicKey = getEncryptionPublicKey(remove0x(bytesToHex(privKey)));\n return publicKey;\n }\n\n /\n Convert a Uint8Array mnemonic to a secret recovery phrase,\n * using the english wordlist.\n \n @param mnemonic - The Uint8Array mnemonic.\n * @returns The string mnemonic.\n /\n #uint8ArrayToString(mnemonic: Uint8Array): string {\n const recoveredIndices = Array.from(\n new Uint16Array(new Uint8Array(mnemonic).buffer),\n );\n return recoveredIndices.map((i) => wordlist[i]).join(' ');\n }\n\n /\n Convert a secret recovery phrase to a Uint8Array mnemonic,\n * using the english wordlist.\n \n @param mnemonic - The string mnemonic.\n * @returns The Uint8Array mnemonic.\n /\n #stringToUint8Array(mnemonic: string): Uint8Array {\n const indices = mnemonic.split(' ').map((word) => wordlist.indexOf(word));\n return new Uint8Array(new Uint16Array(indices).buffer);\n }\n\n /\n Convert a mnemonic to a Uint8Array mnemonic.\n \n @param mnemonic - The mnemonic seed phrase.\n * @returns The Uint8Array mnemonic.\n /\n #mnemonicToUint8Array(\n mnemonic: Buffer \| SerializedBuffer \| string \| Uint8Array \| number[],\n ): Uint8Array {\n let mnemonicData: unknown = mnemonic;\n // When using `Buffer.toJSON()`, the Buffer is serialized into an object\n // with the structure `{ type: 'Buffer', data: [...] }`\n if (isSerializedBuffer(mnemonic)) {\n mnemonicData = mnemonic.data;\n }\n\n if (\n // this block is for backwards compatibility with vaults that were previously stored as buffers, number arrays or plain text strings\n typeof mnemonicData === 'string' \|\|\n Buffer.isBuffer(mnemonicData) \|\|\n Array.isArray(mnemonicData)\n ) {\n let mnemonicAsString: string;\n if (Array.isArray(mnemonicData)) {\n mnemonicAsString = Buffer.from(mnemonicData).toString();\n } else if (Buffer.isBuffer(mnemonicData)) {\n mnemonicAsString = mnemonicData.toString();\n } else {\n mnemonicAsString = mnemonicData;\n }\n return this.#stringToUint8Array(mnemonicAsString);\n } else if (\n mnemonicData instanceof Object &&\n !(mnemonicData instanceof Uint8Array)\n ) {\n // when encrypted/decrypted the Uint8Array becomes a js object we need to cast back to a Uint8Array\n return Uint8Array.from(Object.values(mnemonicData));\n }\n\n assert(mnemonicData instanceof Uint8Array, 'Expected Uint8Array mnemonic');\n return mnemonicData;\n }\n\n /\n Get the private key for the specified account.\n \n @param address - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns The private key of the account.\n /\n #getPrivateKeyFor(\n address: Hex,\n opts?: HDKeyringAccountSelectionOptions,\n ): Uint8Array \| Buffer {\n if (!address) {\n throw new Error('Must specify address.');\n }\n const wallet = this.#getWalletForAccount(address, opts);\n assert(wallet.privateKey, 'Missing private key');\n return wallet.privateKey;\n }\n\n /\n Get the wallet for the specified account.\n \n @param account - The address of the account.\n * @returns The wallet for the account as HDKey.\n /\n #getWalletForAccount(account: Hex): HDKey;\n\n /\n Get the wallet for the specified account and app origin.\n \n @param account - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns A key pair representing the wallet.\n /\n #getWalletForAccount(\n accounts: Hex,\n opts: { withAppKeyOrigin: string },\n ): { privateKey: Buffer; publicKey: Buffer };\n\n /\n Get the wallet for the specified account with optional\n * additional options.\n \n @param account - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns A key pair representing the wallet.\n /\n #getWalletForAccount(\n account: Hex,\n opts?: HDKeyringAccountSelectionOptions,\n ): HDKey \| { privateKey: Buffer; publicKey: Buffer };\n\n #getWalletForAccount(\n account: Hex,\n { withAppKeyOrigin }: HDKeyringAccountSelectionOptions = {},\n ): HDKey \| { privateKey: Buffer; publicKey: Buffer } {\n const address = this.#normalizeAddress(account);\n const walletData = this.#walletMap.get(address);\n if (!walletData) {\n throw new Error('HD Keyring - Unable to find matching address.');\n }\n\n if (withAppKeyOrigin) {\n const { privateKey } = walletData.hdKey;\n assert(privateKey, 'Expected private key to be set');\n const appKeyOriginBuffer = Buffer.from(withAppKeyOrigin, 'utf8');\n const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n const appKeyPrivateKey = Buffer.from(keccak256(appKeyBuffer));\n const appKeyPublicKey = Buffer.from(privateToPublic(appKeyPrivateKey));\n return { privateKey: appKeyPrivateKey, publicKey: appKeyPublicKey };\n }\n\n return walletData.hdKey;\n }\n\n /\n Sets appropriate properties for the keyring based on the given\n * BIP39-compliant mnemonic.\n \n @param mnemonic - A seed phrase represented\n * as a string, an array of UTF-8 bytes, or a Buffer. Mnemonic input\n * passed as type buffer or array of UTF-8 bytes must be NFKD normalized.\n /\n async #initFromMnemonic(\n mnemonic: string \| number[] \| SerializedBuffer \| Buffer \| Uint8Array,\n ): Promise<void> {\n if (this.root) {\n throw new Error(\n 'Eth-Hd-Keyring: Secret recovery phrase already provided',\n );\n }\n\n this.mnemonic = this.#mnemonicToUint8Array(mnemonic);\n\n this.seed = await mnemonicToSeed(\n this.mnemonic,\n '', // No passphrase\n this.#cryptographicFunctions,\n );\n this.hdWallet = HDKey.fromMasterSeed(this.seed);\n this.root = this.hdWallet.derive(this.hdPath);\n }\n\n /\n Get the address of the account from the public key.\n \n @param publicKey - The public key of the account.\n * @returns The address of the account.\n /\n #addressFromPublicKey(publicKey: Uint8Array): Hex {\n return add0x(\n bytesToHex(publicToAddress(Buffer.from(publicKey), true)).toLowerCase(),\n );\n }\n\n /\n Normalize an address to a lower-cased '0x'-prefixed hex string.\n \n @param address - The address to normalize.\n * @returns The normalized address.\n */\n #normalizeAddress(address: string): Hex {\n const normalized = normalize(address);\n assert(normalized, 'Expected address to be set');\n return add0x(normalized);\n }\n}\n"]}

package/dist/hd-keyring.d.cts CHANGED Viewed

@@ -1,6 +1,7 @@
 import type { TypedTransaction } from "@ethereumjs/tx";
 import { type EIP7702Authorization, type EthEncryptedData, type MessageTypes, SignTypedDataVersion, type TypedDataV1, type TypedMessage } from "@metamask/eth-sig-util";
 import { type CryptographicFunctions } from "@metamask/key-tree";
+import type { Keyring } from "@metamask/keyring-utils";
 import { type Hex } from "@metamask/utils";
 import { HDKey } from "ethereum-cryptography/hdkey";
 export type HDKeyringOptions = {
@@ -13,11 +14,22 @@ export type HDKeyringOptions = {
  * @property numberOfAccounts - The number of accounts in the keyring.
  * @property hdPath - The HD path used to derive accounts.
  */
-export type HDKeyringState = {
-    mnemonic: number[] | Uint8Array | Buffer | string;
+export type SerializedHDKeyringState = {
+    mnemonic: number[];
     numberOfAccounts: number;
     hdPath: string;
 };
+/**
+ * An object that can be passed to the Keyring.deserialize method to initialize
+ * an `HDKeyring` instance.
+ *
+ * @property mnemonic - The mnemonic seed phrase as an array of numbers.
+ * @property numberOfAccounts - The number of accounts in the keyring.
+ * @property hdPath - The HD path used to derive accounts.
+ */
+export type DeserializableHDKeyringState = Omit<SerializedHDKeyringState, 'mnemonic'> & {
+    mnemonic: number[] | SerializedBuffer | string;
+};
 /**
  * Options for selecting an account from an `HDKeyring` instance.
  *
@@ -26,11 +38,13 @@ export type HDKeyringState = {
 export type HDKeyringAccountSelectionOptions = {
     withAppKeyOrigin?: string;
 };
-export declare class HdKeyring {
+type SerializedBuffer = ReturnType<Buffer['toJSON']>;
+export declare class HdKeyring implements Keyring {
     #private;
     static type: string;
     type: string;
     mnemonic?: Uint8Array | null;
+    seed?: Uint8Array | null;
     root?: HDKey | null;
     hdWallet?: HDKey;
     hdPath: string;
@@ -46,14 +60,14 @@ export declare class HdKeyring {
      *
      * @returns The serialized state of the keyring.
      */
-    serialize(): Promise<HDKeyringState>;
+    serialize(): Promise<SerializedHDKeyringState>;
     /**
      * Initialize the keyring with the given serialized state.
      *
      * @param opts - The serialized state of the keyring.
      * @returns An empty array.
      */
-    deserialize(opts?: Partial<HDKeyringState>): Promise<string[]>;
+    deserialize(opts: Partial<DeserializableHDKeyringState>): Promise<void>;
     /**
      * Add new accounts to the keyring. The accounts will be derived
      * sequentially from the root HD wallet, using increasing indices.
@@ -67,7 +81,7 @@ export declare class HdKeyring {
      *
      * @returns The addresses of all accounts in the keyring.
      */
-    getAccounts(): Hex[];
+    getAccounts(): Promise<Hex[]>;
     /**
      * Get the public address of the account for the given app key origin.
      *
@@ -130,14 +144,14 @@ export declare class HdKeyring {
      * Sign a typed message using the private key of the specified account.
      * This method is compatible with the `eth_signTypedData` RPC method.
      *
-     * @param withAccount - The address of the account.
-     * @param typedData - The typed data to sign.
-     * @param opts - The options for signing the message.
+     * @param address - The address of the account.
+     * @param data - The typed data to sign.
+     * @param options - The options for signing the message.
      * @returns The signature of the message.
      */
-    signTypedData<Types extends MessageTypes>(withAccount: Hex, typedData: TypedDataV1 | TypedMessage<Types>, opts?: HDKeyringAccountSelectionOptions & {
-        version: SignTypedDataVersion;
-    }): Promise<string>;
+    signTypedData<Version extends SignTypedDataVersion, Types extends MessageTypes, Options extends {
+        version?: Version;
+    }>(address: Hex, data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>, options?: HDKeyringAccountSelectionOptions & Options): Promise<string>;
     /**
      * Sign an EIP-7702 authorization using the private key of the specified account.
      * This method is compatible with the EIP-7702 standard for enabling smart contract code for EOAs.
@@ -163,4 +177,5 @@ export declare class HdKeyring {
      */
     getEncryptionPublicKey(withAccount: Hex, opts?: HDKeyringAccountSelectionOptions): Promise<string>;
 }
+export {};
 //# sourceMappingURL=hd-keyring.d.cts.map

package/dist/hd-keyring.d.cts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hd-keyring.d.cts","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,uBAAuB;AAEvD,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EAErB,KAAK,YAAY,EAKjB,oBAAoB,EACpB,KAAK,WAAW,EAChB,KAAK,YAAY,EAClB,+BAA+B;AAChC,OAAO,EACL,KAAK,sBAAsB,EAE5B,2BAA2B;~~AAG5B~~,OAAO,EAML,KAAK,GAAG,EAET,wBAAwB;AACzB,OAAO,EAAE,KAAK,EAAE,oCAAoC;AAOpD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,~~cAAc~~,GAAG;~~IAC3B~~,QAAQ,EAAE,MAAM,EAAE,~~GAAG~~,~~UAAU~~,~~GAAG~~,MAAM,~~GAAG~~,MAAM,CAAC;~~IAClD~~,~~gBAAgB~~,~~EAAE~~,MAAM,~~CAAC~~;~~IACzB~~,MAAM,EAAE,MAAM,CAAC;~~CAChB~~,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,gCAAgC,GAAG;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;~~AAsBF~~,qBAAa,~~SAAS~~;;~~IACpB~~,MAAM,CAAC,IAAI,EAAE,MAAM,CAAQ;IAE3B,IAAI,EAAE,MAAM,CAAQ;IAEpB,QAAQ,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAE7B,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAEpB,QAAQ,CAAC,EAAE,KAAK,CAAC;IAEjB,MAAM,EAAE,MAAM,CAAgB;gBAMlB,IAAI,GAAE,gBAAqB;IAKvC;;;;OAIG;IACG,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,~~cAAc~~,CAAC;~~IAe1C~~;;;;;OAKG;IACG,WAAW,~~CAAC~~,IAAI,~~GAAE~~,OAAO,CAAC,~~cAAc~~,~~CAAM~~,~~GAAG~~,OAAO,CAAC,~~MAAM~~,~~EAAE,~~CAAC;~~IA4BxE~~;;;;;;OAMG;IACG,WAAW,CAAC,gBAAgB,SAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;~~IAmBvD~~;;;;OAIG;~~IACH~~,WAAW,IAAI,GAAG,EAAE;~~IAOpB~~;;;;;;OAMG;IACG,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAclE;;;;;;;;OAQG;IACG,aAAa,CACjB,OAAO,EAAE,GAAG,EACZ,IAAI,CAAC,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,GAClC,OAAO,CAAC,MAAM,CAAC;IAYlB;;;;;;;OAOG;IACG,eAAe,CACnB,OAAO,EAAE,GAAG,EACZ,EAAE,EAAE,gBAAgB,EACpB,IAAI,KAAK,GACR,OAAO,CAAC,gBAAgB,CAAC;IAO5B;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,gCAAqC,GAC1C,OAAO,CAAC,MAAM,CAAC;IAalB;;;;;;;;OAQG;IACG,mBAAmB,CACvB,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,gCAAqC,GAC1C,OAAO,CAAC,MAAM,CAAC;IAMlB;;;;;;;;OAQG;IACG,cAAc,CAClB,WAAW,EAAE,GAAG,EAChB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAAC,MAAM,CAAC;IAQlB;;;;;;;;OAQG;IACG,aAAa,~~CAAC~~,KAAK,SAAS,YAAY,~~EAC5C~~,~~WAAW~~,EAAE,GAAG,~~EAChB~~,~~SAAS~~,EAAE,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,~~EAC5C~~,~~IAAI~~,~~GAAE~~,gCAAgC,GAAG~~;QACvC~~,OAAO,~~EAAE~~,~~oBAAoB,CAAC;KACQ,GACvC,~~OAAO,CAAC,MAAM,CAAC;~~IAclB~~;;;;;;;;OAQG;IACG,wBAAwB,CAC5B,WAAW,EAAE,GAAG,EAChB,aAAa,EAAE,oBAAoB,EACnC,IAAI,CAAC,EAAE,gCAAgC,GACtC,OAAO,CAAC,MAAM,CAAC;IAQlB;;;;OAIG;IACH,aAAa,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI;~~IAkBjC~~;;;;;;OAMG;IACG,sBAAsB,CAC1B,WAAW,EAAE,GAAG,EAChB,IAAI,GAAE,gCAAqC,GAC1C,OAAO,CAAC,MAAM,CAAC;~~CA2MnB~~"}
1	+ {"version":3,"file":"hd-keyring.d.cts","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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"}

package/dist/hd-keyring.d.mts CHANGED Viewed

@@ -1,6 +1,7 @@
 import type { TypedTransaction } from "@ethereumjs/tx";
 import { type EIP7702Authorization, type EthEncryptedData, type MessageTypes, SignTypedDataVersion, type TypedDataV1, type TypedMessage } from "@metamask/eth-sig-util";
 import { type CryptographicFunctions } from "@metamask/key-tree";
+import type { Keyring } from "@metamask/keyring-utils";
 import { type Hex } from "@metamask/utils";
 import { HDKey } from "ethereum-cryptography/hdkey";
 export type HDKeyringOptions = {
@@ -13,11 +14,22 @@ export type HDKeyringOptions = {
  * @property numberOfAccounts - The number of accounts in the keyring.
  * @property hdPath - The HD path used to derive accounts.
  */
-export type HDKeyringState = {
-    mnemonic: number[] | Uint8Array | Buffer | string;
+export type SerializedHDKeyringState = {
+    mnemonic: number[];
     numberOfAccounts: number;
     hdPath: string;
 };
+/**
+ * An object that can be passed to the Keyring.deserialize method to initialize
+ * an `HDKeyring` instance.
+ *
+ * @property mnemonic - The mnemonic seed phrase as an array of numbers.
+ * @property numberOfAccounts - The number of accounts in the keyring.
+ * @property hdPath - The HD path used to derive accounts.
+ */
+export type DeserializableHDKeyringState = Omit<SerializedHDKeyringState, 'mnemonic'> & {
+    mnemonic: number[] | SerializedBuffer | string;
+};
 /**
  * Options for selecting an account from an `HDKeyring` instance.
  *
@@ -26,11 +38,13 @@ export type HDKeyringState = {
 export type HDKeyringAccountSelectionOptions = {
     withAppKeyOrigin?: string;
 };
-export declare class HdKeyring {
+type SerializedBuffer = ReturnType<Buffer['toJSON']>;
+export declare class HdKeyring implements Keyring {
     #private;
     static type: string;
     type: string;
     mnemonic?: Uint8Array | null;
+    seed?: Uint8Array | null;
     root?: HDKey | null;
     hdWallet?: HDKey;
     hdPath: string;
@@ -46,14 +60,14 @@ export declare class HdKeyring {
      *
      * @returns The serialized state of the keyring.
      */
-    serialize(): Promise<HDKeyringState>;
+    serialize(): Promise<SerializedHDKeyringState>;
     /**
      * Initialize the keyring with the given serialized state.
      *
      * @param opts - The serialized state of the keyring.
      * @returns An empty array.
      */
-    deserialize(opts?: Partial<HDKeyringState>): Promise<string[]>;
+    deserialize(opts: Partial<DeserializableHDKeyringState>): Promise<void>;
     /**
      * Add new accounts to the keyring. The accounts will be derived
      * sequentially from the root HD wallet, using increasing indices.
@@ -67,7 +81,7 @@ export declare class HdKeyring {
      *
      * @returns The addresses of all accounts in the keyring.
      */
-    getAccounts(): Hex[];
+    getAccounts(): Promise<Hex[]>;
     /**
      * Get the public address of the account for the given app key origin.
      *
@@ -130,14 +144,14 @@ export declare class HdKeyring {
      * Sign a typed message using the private key of the specified account.
      * This method is compatible with the `eth_signTypedData` RPC method.
      *
-     * @param withAccount - The address of the account.
-     * @param typedData - The typed data to sign.
-     * @param opts - The options for signing the message.
+     * @param address - The address of the account.
+     * @param data - The typed data to sign.
+     * @param options - The options for signing the message.
      * @returns The signature of the message.
      */
-    signTypedData<Types extends MessageTypes>(withAccount: Hex, typedData: TypedDataV1 | TypedMessage<Types>, opts?: HDKeyringAccountSelectionOptions & {
-        version: SignTypedDataVersion;
-    }): Promise<string>;
+    signTypedData<Version extends SignTypedDataVersion, Types extends MessageTypes, Options extends {
+        version?: Version;
+    }>(address: Hex, data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>, options?: HDKeyringAccountSelectionOptions & Options): Promise<string>;
     /**
      * Sign an EIP-7702 authorization using the private key of the specified account.
      * This method is compatible with the EIP-7702 standard for enabling smart contract code for EOAs.
@@ -163,4 +177,5 @@ export declare class HdKeyring {
      */
     getEncryptionPublicKey(withAccount: Hex, opts?: HDKeyringAccountSelectionOptions): Promise<string>;
 }
+export {};
 //# sourceMappingURL=hd-keyring.d.mts.map

package/dist/hd-keyring.d.mts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hd-keyring.d.mts","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,uBAAuB;AAEvD,OAAO,EAGL,KAAK,oBAAoB,EACzB,KAAK,gBAAgB,EAErB,KAAK,YAAY,EAKjB,oBAAoB,EACpB,KAAK,WAAW,EAChB,KAAK,YAAY,EAClB,+BAA+B;AAChC,OAAO,EACL,KAAK,sBAAsB,EAE5B,2BAA2B;~~AAG5B~~,OAAO,EAML,KAAK,GAAG,EAET,wBAAwB;AACzB,OAAO,EAAE,KAAK,EAAE,oCAAoC;AAOpD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,~~cAAc~~,GAAG;~~IAC3B~~,QAAQ,EAAE,MAAM,EAAE,~~GAAG~~,~~UAAU~~,~~GAAG~~,MAAM,~~GAAG~~,MAAM,CAAC;~~IAClD~~,~~gBAAgB~~,~~EAAE~~,MAAM,~~CAAC~~;~~IACzB~~,MAAM,EAAE,MAAM,CAAC;~~CAChB~~,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,gCAAgC,GAAG;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;~~AAsBF~~,qBAAa,~~SAAS~~;;~~IACpB~~,MAAM,CAAC,IAAI,EAAE,MAAM,CAAQ;IAE3B,IAAI,EAAE,MAAM,CAAQ;IAEpB,QAAQ,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IAE7B,IAAI,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IAEpB,QAAQ,CAAC,EAAE,KAAK,CAAC;IAEjB,MAAM,EAAE,MAAM,CAAgB;gBAMlB,IAAI,GAAE,gBAAqB;IAKvC;;;;OAIG;IACG,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,~~cAAc~~,CAAC;~~IAe1C~~;;;;;OAKG;IACG,WAAW,~~CAAC~~,IAAI,~~GAAE~~,OAAO,CAAC,~~cAAc~~,~~CAAM~~,~~GAAG~~,OAAO,CAAC,~~MAAM~~,~~EAAE,~~CAAC;~~IA4BxE~~;;;;;;OAMG;IACG,WAAW,CAAC,gBAAgB,SAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;~~IAmBvD~~;;;;OAIG;~~IACH~~,WAAW,IAAI,GAAG,EAAE;~~IAOpB~~;;;;;;OAMG;IACG,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAclE;;;;;;;;OAQG;IACG,aAAa,CACjB,OAAO,EAAE,GAAG,EACZ,IAAI,CAAC,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,GAClC,OAAO,CAAC,MAAM,CAAC;IAYlB;;;;;;;OAOG;IACG,eAAe,CACnB,OAAO,EAAE,GAAG,EACZ,EAAE,EAAE,gBAAgB,EACpB,IAAI,KAAK,GACR,OAAO,CAAC,gBAAgB,CAAC;IAO5B;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,gCAAqC,GAC1C,OAAO,CAAC,MAAM,CAAC;IAalB;;;;;;;;OAQG;IACG,mBAAmB,CACvB,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,MAAM,EACd,IAAI,GAAE,gCAAqC,GAC1C,OAAO,CAAC,MAAM,CAAC;IAMlB;;;;;;;;OAQG;IACG,cAAc,CAClB,WAAW,EAAE,GAAG,EAChB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAAC,MAAM,CAAC;IAQlB;;;;;;;;OAQG;IACG,aAAa,~~CAAC~~,KAAK,SAAS,YAAY,~~EAC5C~~,~~WAAW~~,EAAE,GAAG,~~EAChB~~,~~SAAS~~,EAAE,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC,~~EAC5C~~,~~IAAI~~,~~GAAE~~,gCAAgC,GAAG~~;QACvC~~,OAAO,~~EAAE~~,~~oBAAoB,CAAC;KACQ,GACvC,~~OAAO,CAAC,MAAM,CAAC;~~IAclB~~;;;;;;;;OAQG;IACG,wBAAwB,CAC5B,WAAW,EAAE,GAAG,EAChB,aAAa,EAAE,oBAAoB,EACnC,IAAI,CAAC,EAAE,gCAAgC,GACtC,OAAO,CAAC,MAAM,CAAC;IAQlB;;;;OAIG;IACH,aAAa,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI;~~IAkBjC~~;;;;;;OAMG;IACG,sBAAsB,CAC1B,WAAW,EAAE,GAAG,EAChB,IAAI,GAAE,gCAAqC,GAC1C,OAAO,CAAC,MAAM,CAAC;~~CA2MnB~~"}
1	+ {"version":3,"file":"hd-keyring.d.mts","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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"}

package/dist/hd-keyring.mjs CHANGED Viewed

@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _HdKeyring_instances, _HdKeyring_wallets, _HdKeyring_cryptographicFunctions, _HdKeyring_uint8ArrayToString, _HdKeyring_stringToUint8Array, _HdKeyring_mnemonicToUint8Array, _HdKeyring_getPrivateKeyFor, _HdKeyring_getWalletForAccount, _HdKeyring_initFromMnemonic, _HdKeyring_addressfromPublicKey, _HdKeyring_normalizeAddress;
+var _HdKeyring_instances, _HdKeyring_walletMap, _HdKeyring_cryptographicFunctions, _HdKeyring_uint8ArrayToString, _HdKeyring_stringToUint8Array, _HdKeyring_mnemonicToUint8Array, _HdKeyring_getPrivateKeyFor, _HdKeyring_getWalletForAccount, _HdKeyring_initFromMnemonic, _HdKeyring_addressFromPublicKey, _HdKeyring_normalizeAddress;
 import { privateToPublic, publicToAddress, ecsign } from "@ethereumjs/util";
 import { concatSig, decrypt, getEncryptionPublicKey, normalize, personalSign, signEIP7702Authorization, signTypedData, SignTypedDataVersion } from "@metamask/eth-sig-util";
 import { mnemonicToSeed } from "@metamask/key-tree";
@@ -41,7 +41,7 @@ export class HdKeyring {
         _HdKeyring_instances.add(this);
         this.type = type;
         this.hdPath = hdPathString;
-        _HdKeyring_wallets.set(this, []);
+        _HdKeyring_walletMap.set(this, new Map());
         _HdKeyring_cryptographicFunctions.set(this, void 0);
         // Cryptographic functions to be used by `@metamask/key-tree`. It will use built-in implementations if not provided here.
         __classPrivateFieldSet(this, _HdKeyring_cryptographicFunctions, opts.cryptographicFunctions, "f");
@@ -67,7 +67,7 @@ export class HdKeyring {
         }
         return {
             mnemonic,
-            numberOfAccounts: __classPrivateFieldGet(this, _HdKeyring_wallets, "f").length,
+            numberOfAccounts: __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").size,
             hdPath: this.hdPath,
         };
     }
@@ -77,24 +77,24 @@ export class HdKeyring {
      * @param opts - The serialized state of the keyring.
      * @returns An empty array.
      */
-    async deserialize(opts = {}) {
+    async deserialize(opts) {
         if (opts.numberOfAccounts && !opts.mnemonic) {
             throw new Error('Eth-Hd-Keyring: Deserialize method cannot be called with an opts value for numberOfAccounts and no menmonic');
         }
         if (this.root) {
             throw new Error('Eth-Hd-Keyring: Secret recovery phrase already provided');
         }
-        __classPrivateFieldSet(this, _HdKeyring_wallets, [], "f");
+        __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").clear();
         this.mnemonic = null;
+        this.seed = null;
         this.root = null;
         this.hdPath = opts.hdPath ?? hdPathString;
         if (opts.mnemonic) {
             await __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_initFromMnemonic).call(this, opts.mnemonic);
         }
         if (opts.numberOfAccounts) {
-            return this.addAccounts(opts.numberOfAccounts);
+            await this.addAccounts(opts.numberOfAccounts);
         }
-        return [];
     }
     /**
      * Add new accounts to the keyring. The accounts will be derived
@@ -107,29 +107,28 @@ export class HdKeyring {
         if (!this.root) {
             throw new Error('Eth-Hd-Keyring: No secret recovery phrase provided');
         }
-        const oldLen = __classPrivateFieldGet(this, _HdKeyring_wallets, "f").length;
-        const newWallets = [];
+        const oldLen = __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").size;
+        const newAddresses = [];
         for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {
-            const wallet = this.root.deriveChild(i);
-            newWallets.push(wallet);
-            __classPrivateFieldGet(this, _HdKeyring_wallets, "f").push(wallet);
+            const hdKey = this.root.deriveChild(i);
+            assert(hdKey.publicKey, 'Expected public key to be set');
+            const address = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressFromPublicKey).call(this, hdKey.publicKey);
+            const walletData = {
+                hdKey,
+                address,
+            };
+            __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").set(address, walletData);
+            newAddresses.push(address);
         }
-        const hexWallets = newWallets.map((wallet) => {
-            assert(wallet.publicKey, 'Expected public key to be set');
-            return __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressfromPublicKey).call(this, wallet.publicKey);
-        });
-        return Promise.resolve(hexWallets);
+        return Promise.resolve(newAddresses);
     }
     /**
      * Get the addresses of all accounts in the keyring.
      *
      * @returns The addresses of all accounts in the keyring.
      */
-    getAccounts() {
-        return __classPrivateFieldGet(this, _HdKeyring_wallets, "f").map((wallet) => {
-            assert(wallet.publicKey, 'Expected public key to be set');
-            return __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressfromPublicKey).call(this, wallet.publicKey);
-        });
+    async getAccounts() {
+        return Array.from(__classPrivateFieldGet(this, _HdKeyring_walletMap, "f").keys());
     }
     /**
      * Get the public address of the account for the given app key origin.
@@ -230,20 +229,21 @@ export class HdKeyring {
      * Sign a typed message using the private key of the specified account.
      * This method is compatible with the `eth_signTypedData` RPC method.
      *
-     * @param withAccount - The address of the account.
-     * @param typedData - The typed data to sign.
-     * @param opts - The options for signing the message.
+     * @param address - The address of the account.
+     * @param data - The typed data to sign.
+     * @param options - The options for signing the message.
      * @returns The signature of the message.
      */
-    async signTypedData(withAccount, typedData, opts = { version: SignTypedDataVersion.V1 }) {
+    async signTypedData(address, data, options) {
+        let { version } = options ?? { version: SignTypedDataVersion.V1 };
         // Treat invalid versions as "V1"
-        const version = Object.keys(SignTypedDataVersion).includes(opts.version)
-            ? opts.version
-            : SignTypedDataVersion.V1;
-        const privateKey = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_getPrivateKeyFor).call(this, withAccount, opts);
+        if (!version || !Object.keys(SignTypedDataVersion).includes(version)) {
+            version = SignTypedDataVersion.V1;
+        }
+        const privateKey = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_getPrivateKeyFor).call(this, address, options);
         return signTypedData({
             privateKey: Buffer.from(privateKey),
-            data: typedData,
+            data,
             version,
         });
     }
@@ -270,12 +270,10 @@ export class HdKeyring {
      */
     removeAccount(account) {
         const address = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_normalizeAddress).call(this, account);
-        if (!__classPrivateFieldGet(this, _HdKeyring_wallets, "f")
-            .map(({ publicKey }) => publicKey && __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressfromPublicKey).call(this, publicKey))
-            .includes(address)) {
+        if (!__classPrivateFieldGet(this, _HdKeyring_walletMap, "f").has(address)) {
             throw new Error(`Address ${address} not found in this keyring`);
         }
-        __classPrivateFieldSet(this, _HdKeyring_wallets, __classPrivateFieldGet(this, _HdKeyring_wallets, "f").filter(({ publicKey }) => publicKey && __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressfromPublicKey).call(this, publicKey) !== address), "f");
+        __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").delete(address);
     }
     /**
      * Get the public key of the account to be used for encryption.
@@ -290,7 +288,7 @@ export class HdKeyring {
         return publicKey;
     }
 }
-_HdKeyring_wallets = new WeakMap(), _HdKeyring_cryptographicFunctions = new WeakMap(), _HdKeyring_instances = new WeakSet(), _HdKeyring_uint8ArrayToString = function _HdKeyring_uint8ArrayToString(mnemonic) {
+_HdKeyring_walletMap = new WeakMap(), _HdKeyring_cryptographicFunctions = new WeakMap(), _HdKeyring_instances = new WeakSet(), _HdKeyring_uint8ArrayToString = function _HdKeyring_uint8ArrayToString(mnemonic) {
     const recoveredIndices = Array.from(new Uint16Array(new Uint8Array(mnemonic).buffer));
     return recoveredIndices.map((i) => wordlist[i]).join(' ');
 }, _HdKeyring_stringToUint8Array = function _HdKeyring_stringToUint8Array(mnemonic) {
@@ -336,14 +334,12 @@ _HdKeyring_wallets = new WeakMap(), _HdKeyring_cryptographicFunctions = new Weak
     return wallet.privateKey;
 }, _HdKeyring_getWalletForAccount = function _HdKeyring_getWalletForAccount(account, { withAppKeyOrigin } = {}) {
     const address = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_normalizeAddress).call(this, account);
-    const wallet = __classPrivateFieldGet(this, _HdKeyring_wallets, "f").find(({ publicKey }) => {
-        return publicKey && __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_addressfromPublicKey).call(this, publicKey) === address;
-    });
-    if (!wallet) {
+    const walletData = __classPrivateFieldGet(this, _HdKeyring_walletMap, "f").get(address);
+    if (!walletData) {
         throw new Error('HD Keyring - Unable to find matching address.');
     }
     if (withAppKeyOrigin) {
-        const { privateKey } = wallet;
+        const { privateKey } = walletData.hdKey;
         assert(privateKey, 'Expected private key to be set');
         const appKeyOriginBuffer = Buffer.from(withAppKeyOrigin, 'utf8');
         const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);
@@ -351,7 +347,7 @@ _HdKeyring_wallets = new WeakMap(), _HdKeyring_cryptographicFunctions = new Weak
         const appKeyPublicKey = Buffer.from(privateToPublic(appKeyPrivateKey));
         return { privateKey: appKeyPrivateKey, publicKey: appKeyPublicKey };
     }
-    return wallet;
+    return walletData.hdKey;
 }, _HdKeyring_initFromMnemonic =
 /**
  * Sets appropriate properties for the keyring based on the given
@@ -366,11 +362,11 @@ async function _HdKeyring_initFromMnemonic(mnemonic) {
         throw new Error('Eth-Hd-Keyring: Secret recovery phrase already provided');
     }
     this.mnemonic = __classPrivateFieldGet(this, _HdKeyring_instances, "m", _HdKeyring_mnemonicToUint8Array).call(this, mnemonic);
-    const seed = await mnemonicToSeed(this.mnemonic, '', // No passphrase
+    this.seed = await mnemonicToSeed(this.mnemonic, '', // No passphrase
     __classPrivateFieldGet(this, _HdKeyring_cryptographicFunctions, "f"));
-    this.hdWallet = HDKey.fromMasterSeed(seed);
+    this.hdWallet = HDKey.fromMasterSeed(this.seed);
     this.root = this.hdWallet.derive(this.hdPath);
-}, _HdKeyring_addressfromPublicKey = function _HdKeyring_addressfromPublicKey(publicKey) {
+}, _HdKeyring_addressFromPublicKey = function _HdKeyring_addressFromPublicKey(publicKey) {
     return add0x(bytesToHex(publicToAddress(Buffer.from(publicKey), true)).toLowerCase());
 }, _HdKeyring_normalizeAddress = function _HdKeyring_normalizeAddress(address) {
     const normalized = normalize(address);

package/dist/hd-keyring.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"hd-keyring.mjs","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TypedTransaction } from '@ethereumjs/tx';\nimport { privateToPublic, publicToAddress, ecsign } from '@ethereumjs/util';\nimport {\n concatSig,\n decrypt,\n type EIP7702Authorization,\n type EthEncryptedData,\n getEncryptionPublicKey,\n type MessageTypes,\n normalize,\n personalSign,\n signEIP7702Authorization,\n signTypedData,\n SignTypedDataVersion,\n type TypedDataV1,\n type TypedMessage,\n} from '@metamask/eth-sig-util';\nimport {\n type CryptographicFunctions,\n mnemonicToSeed,\n} from '@metamask/key-tree';\nimport { generateMnemonic } from '@metamask/scure-bip39';\nimport { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\nimport {\n add0x,\n assert,\n assertIsHexString,\n bigIntToBytes,\n bytesToHex,\n type Hex,\n remove0x,\n} from '@metamask/utils';\nimport { HDKey } from 'ethereum-cryptography/hdkey';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\n\n// Options:\nconst hdPathString = `m/44'/60'/0'/0`;\nconst type = 'HD Key Tree';\n\nexport type HDKeyringOptions = {\n cryptographicFunctions?: CryptographicFunctions;\n};\n\n/*\n The serialized state of an `HDKeyring` instance.\n \n @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n /\nexport type HDKeyringState = {\n mnemonic: number[] \| Uint8Array \| Buffer \| string;\n numberOfAccounts: number;\n hdPath: string;\n};\n\n/\n Options for selecting an account from an `HDKeyring` instance.\n \n @property withAppKeyOrigin - The origin of the app requesting the account.\n /\nexport type HDKeyringAccountSelectionOptions = {\n withAppKeyOrigin?: string;\n};\n\ntype SerializedBuffer = ReturnType<Buffer['toJSON']>;\n\n/\n Checks if the given value is a valid serialized Buffer compatible with\n * the return type of `Buffer.toJSON`.\n \n @param value - The value to check.\n * @returns `true` if the value is a valid serialized buffer, `false` otherwise.\n /\nfunction isSerializedBuffer(value: unknown): value is SerializedBuffer {\n return (\n typeof value === 'object' &&\n value !== null &&\n 'type' in value &&\n value.type === 'Buffer' &&\n 'data' in value &&\n Array.isArray(value.data)\n );\n}\n\nexport class HdKeyring {\n static type: string = type;\n\n type: string = type;\n\n mnemonic?: Uint8Array \| null;\n\n root?: HDKey \| null;\n\n hdWallet?: HDKey;\n\n hdPath: string = hdPathString;\n\n #wallets: HDKey[] = [];\n\n readonly #cryptographicFunctions?: CryptographicFunctions;\n\n constructor(opts: HDKeyringOptions = {}) {\n // Cryptographic functions to be used by `@metamask/key-tree`. It will use built-in implementations if not provided here.\n this.#cryptographicFunctions = opts.cryptographicFunctions;\n }\n\n /\n Initialize the keyring with a random mnemonic.\n \n @returns A promise that resolves when the process is complete.\n /\n async generateRandomMnemonic(): Promise<void> {\n await this.#initFromMnemonic(generateMnemonic(wordlist));\n }\n\n /\n Return the serialized state of the keyring.\n \n @returns The serialized state of the keyring.\n /\n async serialize(): Promise<HDKeyringState> {\n let mnemonic: number[] = [];\n\n if (this.mnemonic) {\n const mnemonicAsString = this.#uint8ArrayToString(this.mnemonic);\n mnemonic = Array.from(new TextEncoder().encode(mnemonicAsString));\n }\n\n return {\n mnemonic,\n numberOfAccounts: this.#wallets.length,\n hdPath: this.hdPath,\n };\n }\n\n /\n Initialize the keyring with the given serialized state.\n \n @param opts - The serialized state of the keyring.\n * @returns An empty array.\n /\n async deserialize(opts: Partial<HDKeyringState> = {}): Promise<string[]> {\n if (opts.numberOfAccounts && !opts.mnemonic) {\n throw new Error(\n 'Eth-Hd-Keyring: Deserialize method cannot be called with an opts value for numberOfAccounts and no menmonic',\n );\n }\n\n if (this.root) {\n throw new Error(\n 'Eth-Hd-Keyring: Secret recovery phrase already provided',\n );\n }\n this.#wallets = [];\n this.mnemonic = null;\n this.root = null;\n this.hdPath = opts.hdPath ?? hdPathString;\n\n if (opts.mnemonic) {\n await this.#initFromMnemonic(opts.mnemonic);\n }\n\n if (opts.numberOfAccounts) {\n return this.addAccounts(opts.numberOfAccounts);\n }\n\n return [];\n }\n\n /\n Add new accounts to the keyring. The accounts will be derived\n * sequentially from the root HD wallet, using increasing indices.\n \n @param numberOfAccounts - The number of accounts to add.\n * @returns The addresses of the new accounts.\n /\n async addAccounts(numberOfAccounts = 1): Promise<Hex[]> {\n if (!this.root) {\n throw new Error('Eth-Hd-Keyring: No secret recovery phrase provided');\n }\n\n const oldLen = this.#wallets.length;\n const newWallets: HDKey[] = [];\n for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {\n const wallet = this.root.deriveChild(i);\n newWallets.push(wallet);\n this.#wallets.push(wallet);\n }\n const hexWallets = newWallets.map((wallet) => {\n assert(wallet.publicKey, 'Expected public key to be set');\n return this.#addressfromPublicKey(wallet.publicKey);\n });\n return Promise.resolve(hexWallets);\n }\n\n /\n Get the addresses of all accounts in the keyring.\n \n @returns The addresses of all accounts in the keyring.\n /\n getAccounts(): Hex[] {\n return this.#wallets.map((wallet) => {\n assert(wallet.publicKey, 'Expected public key to be set');\n return this.#addressfromPublicKey(wallet.publicKey);\n });\n }\n\n /\n Get the public address of the account for the given app key origin.\n \n @param address - The address of the account.\n * @param origin - The origin of the app requesting the account.\n * @returns The public address of the account.\n /\n async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n if (!origin \|\| typeof origin !== 'string') {\n throw new Error(`'origin' must be a non-empty string`);\n }\n const wallet = this.#getWalletForAccount(address, {\n withAppKeyOrigin: origin,\n });\n assert(wallet.publicKey, 'Expected public key to be set');\n const appKeyAddress = this.#normalizeAddress(\n bytesToHex(publicToAddress(wallet.publicKey)),\n );\n return appKeyAddress;\n }\n\n /\n Export the private key for a specific account.\n \n @param address - The address of the account.\n * @param opts - The options for exporting the account.\n * @param opts.withAppKeyOrigin - An optional string to export the account\n * for a specific app origin.\n * @returns The private key of the account.\n /\n async exportAccount(\n address: Hex,\n opts?: { withAppKeyOrigin: string },\n ): Promise<string> {\n const wallet = opts\n ? this.#getWalletForAccount(address, opts)\n : this.#getWalletForAccount(address);\n const { privateKey } = wallet;\n assert(\n privateKey instanceof Uint8Array,\n 'Expected private key to be of type Uint8Array',\n );\n return remove0x(bytesToHex(privateKey));\n }\n\n /\n Sign a transaction using the private key of the specified account.\n \n @param address - The address of the account.\n * @param tx - The transaction to sign.\n * @param opts - The options for signing the transaction.\n * @returns The signed transaction.\n /\n async signTransaction(\n address: Hex,\n tx: TypedTransaction,\n opts = {},\n ): Promise<TypedTransaction> {\n const privKey = this.#getPrivateKeyFor(address, opts);\n const signedTx = tx.sign(Buffer.from(privKey));\n // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n return signedTx ?? tx;\n }\n\n /\n Sign a message using the private key of the specified account.\n \n @param address - The address of the account.\n * @param data - The data to sign.\n * @param opts - The options for signing the message.\n * @returns The signature of the message.\n /\n async signMessage(\n address: Hex,\n data: string,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n assertIsHexString(data);\n const message = remove0x(data);\n const privKey = this.#getPrivateKeyFor(address, opts);\n const msgSig = ecsign(Buffer.from(message, 'hex'), Buffer.from(privKey));\n const rawMsgSig = concatSig(\n Buffer.from(bigIntToBytes(msgSig.v)),\n Buffer.from(msgSig.r),\n Buffer.from(msgSig.s),\n );\n return rawMsgSig;\n }\n\n /\n Sign a personal message using the private key of the specified account.\n * This method is compatible with the `personal_sign` RPC method.\n \n @param address - The address of the account.\n * @param msgHex - The message to sign.\n * @param opts - The options for signing the message.\n * @returns The signature of the message.\n /\n async signPersonalMessage(\n address: Hex,\n msgHex: string,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n const privKey = this.#getPrivateKeyFor(address, opts);\n const privateKey = Buffer.from(privKey);\n return personalSign({ privateKey, data: msgHex });\n }\n\n /\n Decrypt an encrypted message using the private key of the specified account.\n * The message must be encrypted using the public key of the account.\n * This method is compatible with the `eth_decryptMessage` RPC method\n \n @param withAccount - The address of the account.\n * @param encryptedData - The encrypted data.\n * @returns The decrypted message.\n /\n async decryptMessage(\n withAccount: Hex,\n encryptedData: EthEncryptedData,\n ): Promise<string> {\n const wallet = this.#getWalletForAccount(withAccount);\n const { privateKey: privateKeyAsUint8Array } = wallet;\n assert(privateKeyAsUint8Array, 'Expected private key to be set');\n const privateKeyAsHex = Buffer.from(privateKeyAsUint8Array).toString('hex');\n return decrypt({ privateKey: privateKeyAsHex, encryptedData });\n }\n\n /\n Sign a typed message using the private key of the specified account.\n * This method is compatible with the `eth_signTypedData` RPC method.\n \n @param withAccount - The address of the account.\n * @param typedData - The typed data to sign.\n * @param opts - The options for signing the message.\n * @returns The signature of the message.\n /\n async signTypedData<Types extends MessageTypes>(\n withAccount: Hex,\n typedData: TypedDataV1 \| TypedMessage<Types>,\n opts: HDKeyringAccountSelectionOptions & {\n version: SignTypedDataVersion;\n } = { version: SignTypedDataVersion.V1 },\n ): Promise<string> {\n // Treat invalid versions as \"V1\"\n const version = Object.keys(SignTypedDataVersion).includes(opts.version)\n ? opts.version\n : SignTypedDataVersion.V1;\n\n const privateKey = this.#getPrivateKeyFor(withAccount, opts);\n return signTypedData({\n privateKey: Buffer.from(privateKey),\n data: typedData,\n version,\n });\n }\n\n /\n Sign an EIP-7702 authorization using the private key of the specified account.\n * This method is compatible with the EIP-7702 standard for enabling smart contract code for EOAs.\n \n @param withAccount - The address of the account.\n * @param authorization - The EIP-7702 authorization to sign.\n * @param opts - The options for selecting the account.\n * @returns The signature of the authorization.\n /\n async signEip7702Authorization(\n withAccount: Hex,\n authorization: EIP7702Authorization,\n opts?: HDKeyringAccountSelectionOptions,\n ): Promise<string> {\n const privateKey = this.#getPrivateKeyFor(withAccount, opts);\n return signEIP7702Authorization({\n privateKey: Buffer.from(privateKey),\n authorization,\n });\n }\n\n /\n Remove an account from the keyring.\n \n @param account - The address of the account to remove.\n /\n removeAccount(account: Hex): void {\n const address = this.#normalizeAddress(account);\n if (\n !this.#wallets\n .map(\n ({ publicKey }) => publicKey && this.#addressfromPublicKey(publicKey),\n )\n .includes(address)\n ) {\n throw new Error(`Address ${address} not found in this keyring`);\n }\n\n this.#wallets = this.#wallets.filter(\n ({ publicKey }) =>\n publicKey && this.#addressfromPublicKey(publicKey) !== address,\n );\n }\n\n /\n Get the public key of the account to be used for encryption.\n \n @param withAccount - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns The public key of the account.\n /\n async getEncryptionPublicKey(\n withAccount: Hex,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n const privKey = this.#getPrivateKeyFor(withAccount, opts);\n const publicKey = getEncryptionPublicKey(remove0x(bytesToHex(privKey)));\n return publicKey;\n }\n\n /\n Convert a Uint8Array mnemonic to a secret recovery phrase,\n * using the english wordlist.\n \n @param mnemonic - The Uint8Array mnemonic.\n * @returns The string mnemonic.\n /\n #uint8ArrayToString(mnemonic: Uint8Array): string {\n const recoveredIndices = Array.from(\n new Uint16Array(new Uint8Array(mnemonic).buffer),\n );\n return recoveredIndices.map((i) => wordlist[i]).join(' ');\n }\n\n /\n Convert a secret recovery phrase to a Uint8Array mnemonic,\n * using the english wordlist.\n \n @param mnemonic - The string mnemonic.\n * @returns The Uint8Array mnemonic.\n /\n #stringToUint8Array(mnemonic: string): Uint8Array {\n const indices = mnemonic.split(' ').map((word) => wordlist.indexOf(word));\n return new Uint8Array(new Uint16Array(indices).buffer);\n }\n\n /\n Convert a mnemonic to a Uint8Array mnemonic.\n \n @param mnemonic - The mnemonic seed phrase.\n * @returns The Uint8Array mnemonic.\n /\n #mnemonicToUint8Array(\n mnemonic: Buffer \| SerializedBuffer \| string \| Uint8Array \| number[],\n ): Uint8Array {\n let mnemonicData: unknown = mnemonic;\n // When using `Buffer.toJSON()`, the Buffer is serialized into an object\n // with the structure `{ type: 'Buffer', data: [...] }`\n if (isSerializedBuffer(mnemonic)) {\n mnemonicData = mnemonic.data;\n }\n\n if (\n // this block is for backwards compatibility with vaults that were previously stored as buffers, number arrays or plain text strings\n typeof mnemonicData === 'string' \|\|\n Buffer.isBuffer(mnemonicData) \|\|\n Array.isArray(mnemonicData)\n ) {\n let mnemonicAsString: string;\n if (Array.isArray(mnemonicData)) {\n mnemonicAsString = Buffer.from(mnemonicData).toString();\n } else if (Buffer.isBuffer(mnemonicData)) {\n mnemonicAsString = mnemonicData.toString();\n } else {\n mnemonicAsString = mnemonicData;\n }\n return this.#stringToUint8Array(mnemonicAsString);\n } else if (\n mnemonicData instanceof Object &&\n !(mnemonicData instanceof Uint8Array)\n ) {\n // when encrypted/decrypted the Uint8Array becomes a js object we need to cast back to a Uint8Array\n return Uint8Array.from(Object.values(mnemonicData));\n }\n\n assert(mnemonicData instanceof Uint8Array, 'Expected Uint8Array mnemonic');\n return mnemonicData;\n }\n\n /\n Get the private key for the specified account.\n \n @param address - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns The private key of the account.\n /\n #getPrivateKeyFor(\n address: Hex,\n opts?: HDKeyringAccountSelectionOptions,\n ): Uint8Array \| Buffer {\n if (!address) {\n throw new Error('Must specify address.');\n }\n const wallet = this.#getWalletForAccount(address, opts);\n assert(wallet.privateKey, 'Missing private key');\n return wallet.privateKey;\n }\n\n /\n Get the wallet for the specified account.\n \n @param account - The address of the account.\n * @returns The wallet for the account as HDKey.\n /\n #getWalletForAccount(account: Hex): HDKey;\n\n /\n Get the wallet for the specified account and app origin.\n \n @param account - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns A key pair representing the wallet.\n /\n #getWalletForAccount(\n accounts: Hex,\n opts: { withAppKeyOrigin: string },\n ): { privateKey: Buffer; publicKey: Buffer };\n\n /\n Get the wallet for the specified account with optional\n * additional options.\n \n @param account - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns A key pair representing the wallet.\n /\n #getWalletForAccount(\n account: Hex,\n opts?: HDKeyringAccountSelectionOptions,\n ): HDKey \| { privateKey: Buffer; publicKey: Buffer };\n\n #getWalletForAccount(\n account: Hex,\n { withAppKeyOrigin }: HDKeyringAccountSelectionOptions = {},\n ): HDKey \| { privateKey: Buffer; publicKey: Buffer } {\n const address = this.#normalizeAddress(account);\n const wallet = this.#wallets.find(({ publicKey }) => {\n return publicKey && this.#addressfromPublicKey(publicKey) === address;\n });\n if (!wallet) {\n throw new Error('HD Keyring - Unable to find matching address.');\n }\n\n if (withAppKeyOrigin) {\n const { privateKey } = wallet;\n assert(privateKey, 'Expected private key to be set');\n const appKeyOriginBuffer = Buffer.from(withAppKeyOrigin, 'utf8');\n const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n const appKeyPrivateKey = Buffer.from(keccak256(appKeyBuffer));\n const appKeyPublicKey = Buffer.from(privateToPublic(appKeyPrivateKey));\n return { privateKey: appKeyPrivateKey, publicKey: appKeyPublicKey };\n }\n\n return wallet;\n }\n\n /\n Sets appropriate properties for the keyring based on the given\n * BIP39-compliant mnemonic.\n \n @param mnemonic - A seed phrase represented\n * as a string, an array of UTF-8 bytes, or a Buffer. Mnemonic input\n * passed as type buffer or array of UTF-8 bytes must be NFKD normalized.\n /\n async #initFromMnemonic(\n mnemonic: string \| number[] \| Buffer \| Uint8Array,\n ): Promise<void> {\n if (this.root) {\n throw new Error(\n 'Eth-Hd-Keyring: Secret recovery phrase already provided',\n );\n }\n\n this.mnemonic = this.#mnemonicToUint8Array(mnemonic);\n\n const seed = await mnemonicToSeed(\n this.mnemonic,\n '', // No passphrase\n this.#cryptographicFunctions,\n );\n this.hdWallet = HDKey.fromMasterSeed(seed);\n this.root = this.hdWallet.derive(this.hdPath);\n }\n\n /\n Get the address of the account from the public key.\n \n @param publicKey - The public key of the account.\n * @returns The address of the account.\n /\n #addressfromPublicKey(publicKey: Uint8Array): Hex {\n return add0x(\n bytesToHex(publicToAddress(Buffer.from(publicKey), true)).toLowerCase(),\n );\n }\n\n /\n Normalize an address to a lower-cased '0x'-prefixed hex string.\n \n @param address - The address to normalize.\n * @returns The normalized address.\n */\n #normalizeAddress(address: string): Hex {\n const normalized = normalize(address);\n assert(normalized, 'Expected address to be set');\n return add0x(normalized);\n }\n}\n"]}
1	+ {"version":3,"file":"hd-keyring.mjs","sourceRoot":"","sources":["../src/hd-keyring.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TypedTransaction } from '@ethereumjs/tx';\nimport { privateToPublic, publicToAddress, ecsign } from '@ethereumjs/util';\nimport {\n concatSig,\n decrypt,\n type EIP7702Authorization,\n type EthEncryptedData,\n getEncryptionPublicKey,\n type MessageTypes,\n normalize,\n personalSign,\n signEIP7702Authorization,\n signTypedData,\n SignTypedDataVersion,\n type TypedDataV1,\n type TypedMessage,\n} from '@metamask/eth-sig-util';\nimport {\n type CryptographicFunctions,\n mnemonicToSeed,\n} from '@metamask/key-tree';\nimport type { Keyring } from '@metamask/keyring-utils';\nimport { generateMnemonic } from '@metamask/scure-bip39';\nimport { wordlist } from '@metamask/scure-bip39/dist/wordlists/english';\nimport {\n add0x,\n assert,\n assertIsHexString,\n bigIntToBytes,\n bytesToHex,\n type Hex,\n remove0x,\n} from '@metamask/utils';\nimport { HDKey } from 'ethereum-cryptography/hdkey';\nimport { keccak256 } from 'ethereum-cryptography/keccak';\n\n// Options:\nconst hdPathString = `m/44'/60'/0'/0`;\nconst type = 'HD Key Tree';\n\nexport type HDKeyringOptions = {\n cryptographicFunctions?: CryptographicFunctions;\n};\n\n/*\n The serialized state of an `HDKeyring` instance.\n \n @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n /\nexport type SerializedHDKeyringState = {\n mnemonic: number[];\n numberOfAccounts: number;\n hdPath: string;\n};\n\n/\n An object that can be passed to the Keyring.deserialize method to initialize\n * an `HDKeyring` instance.\n \n @property mnemonic - The mnemonic seed phrase as an array of numbers.\n * @property numberOfAccounts - The number of accounts in the keyring.\n * @property hdPath - The HD path used to derive accounts.\n /\nexport type DeserializableHDKeyringState = Omit<\n SerializedHDKeyringState,\n 'mnemonic'\n> & {\n mnemonic: number[] \| SerializedBuffer \| string;\n};\n\n/\n Options for selecting an account from an `HDKeyring` instance.\n \n @property withAppKeyOrigin - The origin of the app requesting the account.\n /\nexport type HDKeyringAccountSelectionOptions = {\n withAppKeyOrigin?: string;\n};\n\ntype SerializedBuffer = ReturnType<Buffer['toJSON']>;\n\n/\n Wallet storage object that contains both the HDKey and pre-computed address.\n /\ntype WalletData = {\n hdKey: HDKey;\n address: Hex;\n};\n\n/\n Checks if the given value is a valid serialized Buffer compatible with\n * the return type of `Buffer.toJSON`.\n \n @param value - The value to check.\n * @returns `true` if the value is a valid serialized buffer, `false` otherwise.\n /\nfunction isSerializedBuffer(value: unknown): value is SerializedBuffer {\n return (\n typeof value === 'object' &&\n value !== null &&\n 'type' in value &&\n value.type === 'Buffer' &&\n 'data' in value &&\n Array.isArray(value.data)\n );\n}\n\nexport class HdKeyring implements Keyring {\n static type: string = type;\n\n type: string = type;\n\n mnemonic?: Uint8Array \| null;\n\n seed?: Uint8Array \| null;\n\n root?: HDKey \| null;\n\n hdWallet?: HDKey;\n\n hdPath: string = hdPathString;\n\n readonly #walletMap = new Map<Hex, WalletData>();\n\n readonly #cryptographicFunctions?: CryptographicFunctions;\n\n constructor(opts: HDKeyringOptions = {}) {\n // Cryptographic functions to be used by `@metamask/key-tree`. It will use built-in implementations if not provided here.\n this.#cryptographicFunctions = opts.cryptographicFunctions;\n }\n\n /\n Initialize the keyring with a random mnemonic.\n \n @returns A promise that resolves when the process is complete.\n /\n async generateRandomMnemonic(): Promise<void> {\n await this.#initFromMnemonic(generateMnemonic(wordlist));\n }\n\n /\n Return the serialized state of the keyring.\n \n @returns The serialized state of the keyring.\n /\n async serialize(): Promise<SerializedHDKeyringState> {\n let mnemonic: number[] = [];\n\n if (this.mnemonic) {\n const mnemonicAsString = this.#uint8ArrayToString(this.mnemonic);\n mnemonic = Array.from(new TextEncoder().encode(mnemonicAsString));\n }\n\n return {\n mnemonic,\n numberOfAccounts: this.#walletMap.size,\n hdPath: this.hdPath,\n };\n }\n\n /\n Initialize the keyring with the given serialized state.\n \n @param opts - The serialized state of the keyring.\n * @returns An empty array.\n /\n async deserialize(\n opts: Partial<DeserializableHDKeyringState>,\n ): Promise<void> {\n if (opts.numberOfAccounts && !opts.mnemonic) {\n throw new Error(\n 'Eth-Hd-Keyring: Deserialize method cannot be called with an opts value for numberOfAccounts and no menmonic',\n );\n }\n\n if (this.root) {\n throw new Error(\n 'Eth-Hd-Keyring: Secret recovery phrase already provided',\n );\n }\n\n this.#walletMap.clear();\n this.mnemonic = null;\n this.seed = null;\n this.root = null;\n this.hdPath = opts.hdPath ?? hdPathString;\n\n if (opts.mnemonic) {\n await this.#initFromMnemonic(opts.mnemonic);\n }\n\n if (opts.numberOfAccounts) {\n await this.addAccounts(opts.numberOfAccounts);\n }\n }\n\n /\n Add new accounts to the keyring. The accounts will be derived\n * sequentially from the root HD wallet, using increasing indices.\n \n @param numberOfAccounts - The number of accounts to add.\n * @returns The addresses of the new accounts.\n /\n async addAccounts(numberOfAccounts = 1): Promise<Hex[]> {\n if (!this.root) {\n throw new Error('Eth-Hd-Keyring: No secret recovery phrase provided');\n }\n\n const oldLen = this.#walletMap.size;\n const newAddresses: Hex[] = [];\n for (let i = oldLen; i < numberOfAccounts + oldLen; i++) {\n const hdKey = this.root.deriveChild(i);\n assert(hdKey.publicKey, 'Expected public key to be set');\n\n const address = this.#addressFromPublicKey(hdKey.publicKey);\n const walletData: WalletData = {\n hdKey,\n address,\n };\n\n this.#walletMap.set(address, walletData);\n newAddresses.push(address);\n }\n\n return Promise.resolve(newAddresses);\n }\n\n /\n Get the addresses of all accounts in the keyring.\n \n @returns The addresses of all accounts in the keyring.\n /\n async getAccounts(): Promise<Hex[]> {\n return Array.from(this.#walletMap.keys());\n }\n\n /\n Get the public address of the account for the given app key origin.\n \n @param address - The address of the account.\n * @param origin - The origin of the app requesting the account.\n * @returns The public address of the account.\n /\n async getAppKeyAddress(address: Hex, origin: string): Promise<Hex> {\n if (!origin \|\| typeof origin !== 'string') {\n throw new Error(`'origin' must be a non-empty string`);\n }\n const wallet = this.#getWalletForAccount(address, {\n withAppKeyOrigin: origin,\n });\n assert(wallet.publicKey, 'Expected public key to be set');\n const appKeyAddress = this.#normalizeAddress(\n bytesToHex(publicToAddress(wallet.publicKey)),\n );\n return appKeyAddress;\n }\n\n /\n Export the private key for a specific account.\n \n @param address - The address of the account.\n * @param opts - The options for exporting the account.\n * @param opts.withAppKeyOrigin - An optional string to export the account\n * for a specific app origin.\n * @returns The private key of the account.\n /\n async exportAccount(\n address: Hex,\n opts?: { withAppKeyOrigin: string },\n ): Promise<string> {\n const wallet = opts\n ? this.#getWalletForAccount(address, opts)\n : this.#getWalletForAccount(address);\n const { privateKey } = wallet;\n assert(\n privateKey instanceof Uint8Array,\n 'Expected private key to be of type Uint8Array',\n );\n return remove0x(bytesToHex(privateKey));\n }\n\n /\n Sign a transaction using the private key of the specified account.\n \n @param address - The address of the account.\n * @param tx - The transaction to sign.\n * @param opts - The options for signing the transaction.\n * @returns The signed transaction.\n /\n async signTransaction(\n address: Hex,\n tx: TypedTransaction,\n opts = {},\n ): Promise<TypedTransaction> {\n const privKey = this.#getPrivateKeyFor(address, opts);\n const signedTx = tx.sign(Buffer.from(privKey));\n // Newer versions of Ethereumjs-tx are immutable and return a new tx object\n return signedTx ?? tx;\n }\n\n /\n Sign a message using the private key of the specified account.\n \n @param address - The address of the account.\n * @param data - The data to sign.\n * @param opts - The options for signing the message.\n * @returns The signature of the message.\n /\n async signMessage(\n address: Hex,\n data: string,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n assertIsHexString(data);\n const message = remove0x(data);\n const privKey = this.#getPrivateKeyFor(address, opts);\n const msgSig = ecsign(Buffer.from(message, 'hex'), Buffer.from(privKey));\n const rawMsgSig = concatSig(\n Buffer.from(bigIntToBytes(msgSig.v)),\n Buffer.from(msgSig.r),\n Buffer.from(msgSig.s),\n );\n return rawMsgSig;\n }\n\n /\n Sign a personal message using the private key of the specified account.\n * This method is compatible with the `personal_sign` RPC method.\n \n @param address - The address of the account.\n * @param msgHex - The message to sign.\n * @param opts - The options for signing the message.\n * @returns The signature of the message.\n /\n async signPersonalMessage(\n address: Hex,\n msgHex: string,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n const privKey = this.#getPrivateKeyFor(address, opts);\n const privateKey = Buffer.from(privKey);\n return personalSign({ privateKey, data: msgHex });\n }\n\n /\n Decrypt an encrypted message using the private key of the specified account.\n * The message must be encrypted using the public key of the account.\n * This method is compatible with the `eth_decryptMessage` RPC method\n \n @param withAccount - The address of the account.\n * @param encryptedData - The encrypted data.\n * @returns The decrypted message.\n /\n async decryptMessage(\n withAccount: Hex,\n encryptedData: EthEncryptedData,\n ): Promise<string> {\n const wallet = this.#getWalletForAccount(withAccount);\n const { privateKey: privateKeyAsUint8Array } = wallet;\n assert(privateKeyAsUint8Array, 'Expected private key to be set');\n const privateKeyAsHex = Buffer.from(privateKeyAsUint8Array).toString('hex');\n return decrypt({ privateKey: privateKeyAsHex, encryptedData });\n }\n\n /\n Sign a typed message using the private key of the specified account.\n * This method is compatible with the `eth_signTypedData` RPC method.\n \n @param address - The address of the account.\n * @param data - The typed data to sign.\n * @param options - The options for signing the message.\n * @returns The signature of the message.\n /\n async signTypedData<\n Version extends SignTypedDataVersion,\n Types extends MessageTypes,\n Options extends { version?: Version },\n >(\n address: Hex,\n data: Version extends 'V1' ? TypedDataV1 : TypedMessage<Types>,\n options?: HDKeyringAccountSelectionOptions & Options,\n ): Promise<string> {\n let { version } = options ?? { version: SignTypedDataVersion.V1 };\n\n // Treat invalid versions as \"V1\"\n if (!version \|\| !Object.keys(SignTypedDataVersion).includes(version)) {\n version = SignTypedDataVersion.V1;\n }\n\n const privateKey = this.#getPrivateKeyFor(address, options);\n return signTypedData({\n privateKey: Buffer.from(privateKey),\n data,\n version,\n });\n }\n\n /\n Sign an EIP-7702 authorization using the private key of the specified account.\n * This method is compatible with the EIP-7702 standard for enabling smart contract code for EOAs.\n \n @param withAccount - The address of the account.\n * @param authorization - The EIP-7702 authorization to sign.\n * @param opts - The options for selecting the account.\n * @returns The signature of the authorization.\n /\n async signEip7702Authorization(\n withAccount: Hex,\n authorization: EIP7702Authorization,\n opts?: HDKeyringAccountSelectionOptions,\n ): Promise<string> {\n const privateKey = this.#getPrivateKeyFor(withAccount, opts);\n return signEIP7702Authorization({\n privateKey: Buffer.from(privateKey),\n authorization,\n });\n }\n\n /\n Remove an account from the keyring.\n \n @param account - The address of the account to remove.\n /\n removeAccount(account: Hex): void {\n const address = this.#normalizeAddress(account);\n\n if (!this.#walletMap.has(address)) {\n throw new Error(`Address ${address} not found in this keyring`);\n }\n\n this.#walletMap.delete(address);\n }\n\n /\n Get the public key of the account to be used for encryption.\n \n @param withAccount - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns The public key of the account.\n /\n async getEncryptionPublicKey(\n withAccount: Hex,\n opts: HDKeyringAccountSelectionOptions = {},\n ): Promise<string> {\n const privKey = this.#getPrivateKeyFor(withAccount, opts);\n const publicKey = getEncryptionPublicKey(remove0x(bytesToHex(privKey)));\n return publicKey;\n }\n\n /\n Convert a Uint8Array mnemonic to a secret recovery phrase,\n * using the english wordlist.\n \n @param mnemonic - The Uint8Array mnemonic.\n * @returns The string mnemonic.\n /\n #uint8ArrayToString(mnemonic: Uint8Array): string {\n const recoveredIndices = Array.from(\n new Uint16Array(new Uint8Array(mnemonic).buffer),\n );\n return recoveredIndices.map((i) => wordlist[i]).join(' ');\n }\n\n /\n Convert a secret recovery phrase to a Uint8Array mnemonic,\n * using the english wordlist.\n \n @param mnemonic - The string mnemonic.\n * @returns The Uint8Array mnemonic.\n /\n #stringToUint8Array(mnemonic: string): Uint8Array {\n const indices = mnemonic.split(' ').map((word) => wordlist.indexOf(word));\n return new Uint8Array(new Uint16Array(indices).buffer);\n }\n\n /\n Convert a mnemonic to a Uint8Array mnemonic.\n \n @param mnemonic - The mnemonic seed phrase.\n * @returns The Uint8Array mnemonic.\n /\n #mnemonicToUint8Array(\n mnemonic: Buffer \| SerializedBuffer \| string \| Uint8Array \| number[],\n ): Uint8Array {\n let mnemonicData: unknown = mnemonic;\n // When using `Buffer.toJSON()`, the Buffer is serialized into an object\n // with the structure `{ type: 'Buffer', data: [...] }`\n if (isSerializedBuffer(mnemonic)) {\n mnemonicData = mnemonic.data;\n }\n\n if (\n // this block is for backwards compatibility with vaults that were previously stored as buffers, number arrays or plain text strings\n typeof mnemonicData === 'string' \|\|\n Buffer.isBuffer(mnemonicData) \|\|\n Array.isArray(mnemonicData)\n ) {\n let mnemonicAsString: string;\n if (Array.isArray(mnemonicData)) {\n mnemonicAsString = Buffer.from(mnemonicData).toString();\n } else if (Buffer.isBuffer(mnemonicData)) {\n mnemonicAsString = mnemonicData.toString();\n } else {\n mnemonicAsString = mnemonicData;\n }\n return this.#stringToUint8Array(mnemonicAsString);\n } else if (\n mnemonicData instanceof Object &&\n !(mnemonicData instanceof Uint8Array)\n ) {\n // when encrypted/decrypted the Uint8Array becomes a js object we need to cast back to a Uint8Array\n return Uint8Array.from(Object.values(mnemonicData));\n }\n\n assert(mnemonicData instanceof Uint8Array, 'Expected Uint8Array mnemonic');\n return mnemonicData;\n }\n\n /\n Get the private key for the specified account.\n \n @param address - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns The private key of the account.\n /\n #getPrivateKeyFor(\n address: Hex,\n opts?: HDKeyringAccountSelectionOptions,\n ): Uint8Array \| Buffer {\n if (!address) {\n throw new Error('Must specify address.');\n }\n const wallet = this.#getWalletForAccount(address, opts);\n assert(wallet.privateKey, 'Missing private key');\n return wallet.privateKey;\n }\n\n /\n Get the wallet for the specified account.\n \n @param account - The address of the account.\n * @returns The wallet for the account as HDKey.\n /\n #getWalletForAccount(account: Hex): HDKey;\n\n /\n Get the wallet for the specified account and app origin.\n \n @param account - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns A key pair representing the wallet.\n /\n #getWalletForAccount(\n accounts: Hex,\n opts: { withAppKeyOrigin: string },\n ): { privateKey: Buffer; publicKey: Buffer };\n\n /\n Get the wallet for the specified account with optional\n * additional options.\n \n @param account - The address of the account.\n * @param opts - The options for selecting the account.\n * @returns A key pair representing the wallet.\n /\n #getWalletForAccount(\n account: Hex,\n opts?: HDKeyringAccountSelectionOptions,\n ): HDKey \| { privateKey: Buffer; publicKey: Buffer };\n\n #getWalletForAccount(\n account: Hex,\n { withAppKeyOrigin }: HDKeyringAccountSelectionOptions = {},\n ): HDKey \| { privateKey: Buffer; publicKey: Buffer } {\n const address = this.#normalizeAddress(account);\n const walletData = this.#walletMap.get(address);\n if (!walletData) {\n throw new Error('HD Keyring - Unable to find matching address.');\n }\n\n if (withAppKeyOrigin) {\n const { privateKey } = walletData.hdKey;\n assert(privateKey, 'Expected private key to be set');\n const appKeyOriginBuffer = Buffer.from(withAppKeyOrigin, 'utf8');\n const appKeyBuffer = Buffer.concat([privateKey, appKeyOriginBuffer]);\n const appKeyPrivateKey = Buffer.from(keccak256(appKeyBuffer));\n const appKeyPublicKey = Buffer.from(privateToPublic(appKeyPrivateKey));\n return { privateKey: appKeyPrivateKey, publicKey: appKeyPublicKey };\n }\n\n return walletData.hdKey;\n }\n\n /\n Sets appropriate properties for the keyring based on the given\n * BIP39-compliant mnemonic.\n \n @param mnemonic - A seed phrase represented\n * as a string, an array of UTF-8 bytes, or a Buffer. Mnemonic input\n * passed as type buffer or array of UTF-8 bytes must be NFKD normalized.\n /\n async #initFromMnemonic(\n mnemonic: string \| number[] \| SerializedBuffer \| Buffer \| Uint8Array,\n ): Promise<void> {\n if (this.root) {\n throw new Error(\n 'Eth-Hd-Keyring: Secret recovery phrase already provided',\n );\n }\n\n this.mnemonic = this.#mnemonicToUint8Array(mnemonic);\n\n this.seed = await mnemonicToSeed(\n this.mnemonic,\n '', // No passphrase\n this.#cryptographicFunctions,\n );\n this.hdWallet = HDKey.fromMasterSeed(this.seed);\n this.root = this.hdWallet.derive(this.hdPath);\n }\n\n /\n Get the address of the account from the public key.\n \n @param publicKey - The public key of the account.\n * @returns The address of the account.\n /\n #addressFromPublicKey(publicKey: Uint8Array): Hex {\n return add0x(\n bytesToHex(publicToAddress(Buffer.from(publicKey), true)).toLowerCase(),\n );\n }\n\n /\n Normalize an address to a lower-cased '0x'-prefixed hex string.\n \n @param address - The address to normalize.\n * @returns The normalized address.\n */\n #normalizeAddress(address: string): Hex {\n const normalized = normalize(address);\n assert(normalized, 'Expected address to be set');\n return add0x(normalized);\n }\n}\n"]}

package/dist/index.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAAhC,uGAAA,SAAS,OAAA","sourcesContent":["export { HdKeyring } from './hd-keyring';\nexport type {\n ~~HDKeyringState~~,\n HDKeyringOptions,\n HDKeyringAccountSelectionOptions,\n} from './hd-keyring';\n"]}
1	+ {"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAAhC,uGAAA,SAAS,OAAA","sourcesContent":["export { HdKeyring } from './hd-keyring';\nexport type {\n SerializedHDKeyringState,\n DeserializableHDKeyringState,\n HDKeyringOptions,\n HDKeyringAccountSelectionOptions,\n} from './hd-keyring';\n"]}

package/dist/index.d.cts CHANGED Viewed

@@ -1,3 +1,3 @@
 export { HdKeyring } from "./hd-keyring.cjs";
-export type { HDKeyringState, HDKeyringOptions, HDKeyringAccountSelectionOptions, } from "./hd-keyring.cjs";
+export type { SerializedHDKeyringState, DeserializableHDKeyringState, HDKeyringOptions, HDKeyringAccountSelectionOptions, } from "./hd-keyring.cjs";
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB;AACzC,YAAY,EACV,~~cAAc~~,~~EACd~~,gBAAgB,EAChB,gCAAgC,GACjC,yBAAqB"}
1	+ {"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB;AACzC,YAAY,EACV,wBAAwB,EACxB,4BAA4B,EAC5B,gBAAgB,EAChB,gCAAgC,GACjC,yBAAqB"}

package/dist/index.d.mts CHANGED Viewed

@@ -1,3 +1,3 @@
 export { HdKeyring } from "./hd-keyring.mjs";
-export type { HDKeyringState, HDKeyringOptions, HDKeyringAccountSelectionOptions, } from "./hd-keyring.mjs";
+export type { SerializedHDKeyringState, DeserializableHDKeyringState, HDKeyringOptions, HDKeyringAccountSelectionOptions, } from "./hd-keyring.mjs";
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB;AACzC,YAAY,EACV,~~cAAc~~,~~EACd~~,gBAAgB,EAChB,gCAAgC,GACjC,yBAAqB"}
1	+ {"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB;AACzC,YAAY,EACV,wBAAwB,EACxB,4BAA4B,EAC5B,gBAAgB,EAChB,gCAAgC,GACjC,yBAAqB"}

package/dist/index.mjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB","sourcesContent":["export { HdKeyring } from './hd-keyring';\nexport type {\n ~~HDKeyringState~~,\n HDKeyringOptions,\n HDKeyringAccountSelectionOptions,\n} from './hd-keyring';\n"]}
1	+ {"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,yBAAqB","sourcesContent":["export { HdKeyring } from './hd-keyring';\nexport type {\n SerializedHDKeyringState,\n DeserializableHDKeyringState,\n HDKeyringOptions,\n HDKeyringAccountSelectionOptions,\n} from './hd-keyring';\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/eth-hd-keyring",
-  "version": "12.0.0",
+  "version": "13.0.0",
   "description": "A simple standard interface for a seed phrase generated set of Ethereum accounts.",
   "keywords": [
     "ethereum",
@@ -46,6 +46,7 @@
     "@ethereumjs/util": "^9.1.0",
     "@metamask/eth-sig-util": "^8.2.0",
     "@metamask/key-tree": "^10.0.2",
+    "@metamask/keyring-utils": "^3.1.0",
     "@metamask/scure-bip39": "^2.1.1",
     "@metamask/utils": "^11.1.0",
     "ethereum-cryptography": "^2.1.2"