@metamask/keyring-sdk 1.1.0 → 2.0.0

package/CHANGELOG.md

@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0]
+
+### Added
+
+- Add `./v2` subpath export for keyring v2 building blocks ([#513](https://github.com/MetaMask/accounts/pull/513))
+  - `KeyringWrapper`, `EthKeyringWrapper`, `EthKeyringMethod`, and `EthKeyringWrapperOptions` are now available from `@metamask/keyring-sdk/v2`.
+
+### Changed
+
+- **BREAKING:** Move `KeyringWrapper` and `EthKeyringWrapper` (and related types) to the new `./v2` subpath export ([#513](https://github.com/MetaMask/accounts/pull/513))
+  - Use `import { KeyringWrapper, EthKeyringWrapper, EthKeyringMethod } from '@metamask/keyring-sdk/v2'` instead.
+  - `KeyringAccountRegistry`, `encodeMnemonic`, and `generateEthAccountId` remain available from the main entry point.
+- Bump `@metamask/utils` from `^11.10.0` to `^11.11.0` ([#483](https://github.com/MetaMask/accounts/pull/483))
+- Bump `@metamask/keyring-api` from `^22.0.0` to `^23.0.0` ([#515](https://github.com/MetaMask/accounts/pull/515))
+
+## [1.2.0]
+
+### Added
+
+- Add `generateId` option to `KeyringAccountRegistry` ([#503](https://github.com/MetaMask/accounts/pull/503))
+- Add `generateEthAccountId` to generate deterministic account IDs for EVM addresses, and use it by default in `EthKeyringWrapper` ([#504](https://github.com/MetaMask/accounts/pull/504))
+
 ## [1.1.0]
 
 ### Added
@@ -23,6 +45,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release, extracted from `@metamask/keyring-api` ([#478](https://github.com/MetaMask/accounts/pull/478)), ([#482](https://github.com/MetaMask/accounts/pull/482))
 
-[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-sdk@1.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-sdk@2.0.0...HEAD
+[2.0.0]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-sdk@1.2.0...@metamask/keyring-sdk@2.0.0
+[1.2.0]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-sdk@1.1.0...@metamask/keyring-sdk@1.2.0
 [1.1.0]: https://github.com/MetaMask/accounts/compare/@metamask/keyring-sdk@1.0.0...@metamask/keyring-sdk@1.1.0
 [1.0.0]: https://github.com/MetaMask/accounts/releases/tag/@metamask/keyring-sdk@1.0.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 MetaMask
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/eth/account-id.cjs

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateEthAccountId = generateEthAccountId;
+const eth_sig_util_1 = require("@metamask/eth-sig-util");
+const utils_1 = require("@metamask/utils");
+const sha256_1 = require("ethereum-cryptography/sha256");
+const uuid_1 = require("uuid");
+/**
+ * Generates a deterministic account ID for a given Ethereum address.
+ *
+ * The address is first normalized (lowercased, `0x`-prefixed) so that
+ * checksum-cased and lowercase variants of the same address produce the
+ * same ID. The ID is then a UUID v4 derived by seeding the UUID generator
+ * with the first 16 bytes of the SHA-256 hash of the normalized address
+ * bytes.
+ *
+ * @param address - The Ethereum address (hex string) to generate the account
+ * ID from.
+ * @returns A deterministic UUID v4 string to use as the account ID.
+ */
+function generateEthAccountId(address) {
+    const normalized = (0, eth_sig_util_1.normalize)(address);
+    return (0, uuid_1.v4)({
+        random: (0, sha256_1.sha256)((0, utils_1.hexToBytes)(normalized)).slice(0, 16),
+    });
+}
+//# sourceMappingURL=account-id.cjs.map

package/dist/eth/account-id.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-id.cjs","sourceRoot":"","sources":["../../src/eth/account-id.ts"],"names":[],"mappings":";;AAmBA,oDAKC;AAxBD,yDAAmD;AAEnD,2CAA6C;AAC7C,yDAAsD;AACtD,+BAAoC;AAEpC;;;;;;;;;;;;GAYG;AACH,SAAgB,oBAAoB,CAAC,OAAe;IAClD,MAAM,UAAU,GAAG,IAAA,wBAAS,EAAC,OAAO,CAAW,CAAC;IAChD,OAAO,IAAA,SAAM,EAAC;QACZ,MAAM,EAAE,IAAA,eAAM,EAAC,IAAA,kBAAU,EAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;KACpD,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { normalize } from '@metamask/eth-sig-util';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { hexToBytes } from '@metamask/utils';\nimport { sha256 } from 'ethereum-cryptography/sha256';\nimport { v4 as uuidv4 } from 'uuid';\n\n/**\n * Generates a deterministic account ID for a given Ethereum address.\n *\n * The address is first normalized (lowercased, `0x`-prefixed) so that\n * checksum-cased and lowercase variants of the same address produce the\n * same ID. The ID is then a UUID v4 derived by seeding the UUID generator\n * with the first 16 bytes of the SHA-256 hash of the normalized address\n * bytes.\n *\n * @param address - The Ethereum address (hex string) to generate the account\n * ID from.\n * @returns A deterministic UUID v4 string to use as the account ID.\n */\nexport function generateEthAccountId(address: string): AccountId {\n  const normalized = normalize(address) as string;\n  return uuidv4({\n    random: sha256(hexToBytes(normalized)).slice(0, 16),\n  });\n}\n"]}

package/dist/eth/account-id.d.cts

@@ -0,0 +1,16 @@
+import type { AccountId } from "@metamask/keyring-utils";
+/**
+ * Generates a deterministic account ID for a given Ethereum address.
+ *
+ * The address is first normalized (lowercased, `0x`-prefixed) so that
+ * checksum-cased and lowercase variants of the same address produce the
+ * same ID. The ID is then a UUID v4 derived by seeding the UUID generator
+ * with the first 16 bytes of the SHA-256 hash of the normalized address
+ * bytes.
+ *
+ * @param address - The Ethereum address (hex string) to generate the account
+ * ID from.
+ * @returns A deterministic UUID v4 string to use as the account ID.
+ */
+export declare function generateEthAccountId(address: string): AccountId;
+//# sourceMappingURL=account-id.d.cts.map

package/dist/eth/account-id.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-id.d.cts","sourceRoot":"","sources":["../../src/eth/account-id.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAKzD;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAK/D"}

package/dist/eth/account-id.d.mts

@@ -0,0 +1,16 @@
+import type { AccountId } from "@metamask/keyring-utils";
+/**
+ * Generates a deterministic account ID for a given Ethereum address.
+ *
+ * The address is first normalized (lowercased, `0x`-prefixed) so that
+ * checksum-cased and lowercase variants of the same address produce the
+ * same ID. The ID is then a UUID v4 derived by seeding the UUID generator
+ * with the first 16 bytes of the SHA-256 hash of the normalized address
+ * bytes.
+ *
+ * @param address - The Ethereum address (hex string) to generate the account
+ * ID from.
+ * @returns A deterministic UUID v4 string to use as the account ID.
+ */
+export declare function generateEthAccountId(address: string): AccountId;
+//# sourceMappingURL=account-id.d.mts.map

package/dist/eth/account-id.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-id.d.mts","sourceRoot":"","sources":["../../src/eth/account-id.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAKzD;;;;;;;;;;;;GAYG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAK/D"}

package/dist/eth/account-id.mjs

@@ -0,0 +1,24 @@
+import { normalize } from "@metamask/eth-sig-util";
+import { hexToBytes } from "@metamask/utils";
+import { sha256 } from "ethereum-cryptography/sha256";
+import { v4 as uuidv4 } from "uuid";
+/**
+ * Generates a deterministic account ID for a given Ethereum address.
+ *
+ * The address is first normalized (lowercased, `0x`-prefixed) so that
+ * checksum-cased and lowercase variants of the same address produce the
+ * same ID. The ID is then a UUID v4 derived by seeding the UUID generator
+ * with the first 16 bytes of the SHA-256 hash of the normalized address
+ * bytes.
+ *
+ * @param address - The Ethereum address (hex string) to generate the account
+ * ID from.
+ * @returns A deterministic UUID v4 string to use as the account ID.
+ */
+export function generateEthAccountId(address) {
+    const normalized = normalize(address);
+    return uuidv4({
+        random: sha256(hexToBytes(normalized)).slice(0, 16),
+    });
+}
+//# sourceMappingURL=account-id.mjs.map

package/dist/eth/account-id.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"account-id.mjs","sourceRoot":"","sources":["../../src/eth/account-id.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,+BAA+B;AAEnD,OAAO,EAAE,UAAU,EAAE,wBAAwB;AAC7C,OAAO,EAAE,MAAM,EAAE,qCAAqC;AACtD,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,aAAa;AAEpC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAW,CAAC;IAChD,OAAO,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC;KACpD,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { normalize } from '@metamask/eth-sig-util';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { hexToBytes } from '@metamask/utils';\nimport { sha256 } from 'ethereum-cryptography/sha256';\nimport { v4 as uuidv4 } from 'uuid';\n\n/**\n * Generates a deterministic account ID for a given Ethereum address.\n *\n * The address is first normalized (lowercased, `0x`-prefixed) so that\n * checksum-cased and lowercase variants of the same address produce the\n * same ID. The ID is then a UUID v4 derived by seeding the UUID generator\n * with the first 16 bytes of the SHA-256 hash of the normalized address\n * bytes.\n *\n * @param address - The Ethereum address (hex string) to generate the account\n * ID from.\n * @returns A deterministic UUID v4 string to use as the account ID.\n */\nexport function generateEthAccountId(address: string): AccountId {\n  const normalized = normalize(address) as string;\n  return uuidv4({\n    random: sha256(hexToBytes(normalized)).slice(0, 16),\n  });\n}\n"]}

package/dist/eth/index.cjs

@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./eth-keyring-wrapper.cjs"), exports);
+__exportStar(require("./account-id.cjs"), exports);
 //# sourceMappingURL=index.cjs.map

package/dist/eth/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4DAAsC","sourcesContent":["export * from './eth-keyring-wrapper';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAA6B","sourcesContent":["export * from './account-id';\n"]}

package/dist/eth/index.d.cts

@@ -1,2 +1,2 @@
-export * from "./eth-keyring-wrapper.cjs";
+export * from "./account-id.cjs";
 //# sourceMappingURL=index.d.cts.map

package/dist/eth/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,0CAAsC"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,iCAA6B"}

package/dist/eth/index.d.mts

@@ -1,2 +1,2 @@
-export * from "./eth-keyring-wrapper.mjs";
+export * from "./account-id.mjs";
 //# sourceMappingURL=index.d.mts.map

package/dist/eth/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,0CAAsC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,iCAA6B"}

package/dist/eth/index.mjs

@@ -1,2 +1,2 @@
-export * from "./eth-keyring-wrapper.mjs";
+export * from "./account-id.mjs";
 //# sourceMappingURL=index.mjs.map

package/dist/eth/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,0CAAsC","sourcesContent":["export * from './eth-keyring-wrapper';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,iCAA6B","sourcesContent":["export * from './account-id';\n"]}

package/dist/index.cjs

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./keyring-wrapper.cjs"), exports);
 __exportStar(require("./keyring-account-registry.cjs"), exports);
 __exportStar(require("./mnemonic.cjs"), exports);
 __exportStar(require("./eth/index.cjs"), exports);

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAkC;AAClC,iEAA2C;AAC3C,iDAA2B;AAC3B,kDAAsB","sourcesContent":["export * from './keyring-wrapper';\nexport * from './keyring-account-registry';\nexport * from './mnemonic';\nexport * from './eth';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA2C;AAC3C,iDAA2B;AAC3B,kDAAsB","sourcesContent":["export * from './keyring-account-registry';\nexport * from './mnemonic';\nexport * from './eth';\n"]}

package/dist/index.d.cts

@@ -1,4 +1,3 @@
-export * from "./keyring-wrapper.cjs";
 export * from "./keyring-account-registry.cjs";
 export * from "./mnemonic.cjs";
 export * from "./eth/index.cjs";

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,sCAAkC;AAClC,+CAA2C;AAC3C,+BAA2B;AAC3B,gCAAsB"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+CAA2C;AAC3C,+BAA2B;AAC3B,gCAAsB"}

package/dist/index.d.mts

@@ -1,4 +1,3 @@
-export * from "./keyring-wrapper.mjs";
 export * from "./keyring-account-registry.mjs";
 export * from "./mnemonic.mjs";
 export * from "./eth/index.mjs";

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,sCAAkC;AAClC,+CAA2C;AAC3C,+BAA2B;AAC3B,gCAAsB"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+CAA2C;AAC3C,+BAA2B;AAC3B,gCAAsB"}

package/dist/index.mjs

@@ -1,4 +1,3 @@
-export * from "./keyring-wrapper.mjs";
 export * from "./keyring-account-registry.mjs";
 export * from "./mnemonic.mjs";
 export * from "./eth/index.mjs";

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,sCAAkC;AAClC,+CAA2C;AAC3C,+BAA2B;AAC3B,gCAAsB","sourcesContent":["export * from './keyring-wrapper';\nexport * from './keyring-account-registry';\nexport * from './mnemonic';\nexport * from './eth';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+CAA2C;AAC3C,+BAA2B;AAC3B,gCAAsB","sourcesContent":["export * from './keyring-account-registry';\nexport * from './mnemonic';\nexport * from './eth';\n"]}

package/dist/keyring-account-registry.cjs

@@ -1,10 +1,16 @@
 "use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _KeyringAccountRegistry_accountById, _KeyringAccountRegistry_idByAddress;
+var _KeyringAccountRegistry_accountById, _KeyringAccountRegistry_idByAddress, _KeyringAccountRegistry_generateId;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeyringAccountRegistry = void 0;
 const uuid_1 = require("uuid");
@@ -15,9 +21,17 @@ const uuid_1 = require("uuid");
  * KeyringAccount objects for efficient retrieval.
  */
 class KeyringAccountRegistry {
-    constructor() {
+    /**
+     * Create a new KeyringAccountRegistry.
+     *
+     * @param options - Optional configuration.
+     * @param options.generateId - Custom ID generator. Defaults to `uuidv4`.
+     */
+    constructor(options) {
         _KeyringAccountRegistry_accountById.set(this, new Map());
         _KeyringAccountRegistry_idByAddress.set(this, new Map());
+        _KeyringAccountRegistry_generateId.set(this, void 0);
+        __classPrivateFieldSet(this, _KeyringAccountRegistry_generateId, options?.generateId ?? (() => (0, uuid_1.v4)()), "f");
     }
     /**
      * Get an account by its account ID.
@@ -58,7 +72,7 @@ class KeyringAccountRegistry {
         if (existing) {
             return existing;
         }
-        const id = (0, uuid_1.v4)();
+        const id = __classPrivateFieldGet(this, _KeyringAccountRegistry_generateId, "f").call(this, address);
         __classPrivateFieldGet(this, _KeyringAccountRegistry_idByAddress, "f").set(address, id);
         return id;
     }
@@ -131,5 +145,5 @@ class KeyringAccountRegistry {
     }
 }
 exports.KeyringAccountRegistry = KeyringAccountRegistry;
-_KeyringAccountRegistry_accountById = new WeakMap(), _KeyringAccountRegistry_idByAddress = new WeakMap();
+_KeyringAccountRegistry_accountById = new WeakMap(), _KeyringAccountRegistry_idByAddress = new WeakMap(), _KeyringAccountRegistry_generateId = new WeakMap();
 //# sourceMappingURL=keyring-account-registry.cjs.map

package/dist/keyring-account-registry.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"keyring-account-registry.cjs","sourceRoot":"","sources":["../src/keyring-account-registry.ts"],"names":[],"mappings":";;;;;;;;;AAEA,+BAAoC;AAEpC;;;;;GAKG;AACH,MAAa,sBAAsB;IAAnC;QAGW,8CAAe,IAAI,GAAG,EAAiC,EAAC;QAExD,8CAAe,IAAI,GAAG,EAAqB,EAAC;IA0HvD,CAAC;IAxHC;;;;;OAKG;IACH,GAAG,CAAC,SAAoB;QACtB,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAC,SAAoB;QAC7B,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IACnD,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,OAAe;QAC1B,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,OAAe;QACtB,MAAM,QAAQ,GAAG,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,GAAG,IAAA,SAAM,GAAE,CAAC;QACpB,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;;;;;;OAUG;IACH,GAAG,CAAC,OAA2B;QAC7B,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC3C,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAoB;QACzB,MAAM,OAAO,GAAG,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE,CAAC;YACZ,uBAAA,IAAI,2CAAa,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC1C,uBAAA,IAAI,2CAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK;QACH,uBAAA,IAAI,2CAAa,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,IAAI,2CAAa,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACH,MAAM;QACJ,OAAO,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,2CAAa,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACH,IAAI;QACF,OAAO,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,2CAAa,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAC,SAAoB;QACtB,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACH,IAAI,IAAI;QACN,OAAO,uBAAA,IAAI,2CAAa,CAAC,IAAI,CAAC;IAChC,CAAC;CACF;AA/HD,wDA+HC","sourcesContent":["import type { KeyringAccount } from '@metamask/keyring-api';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { v4 as uuidv4 } from 'uuid';\n\n/**\n * In-memory registry for KeyringAccount objects.\n *\n * Provides O(1) lookups by account ID or address, and stores the full\n * KeyringAccount objects for efficient retrieval.\n */\nexport class KeyringAccountRegistry<\n  KeyringAccountType extends KeyringAccount = KeyringAccount,\n> {\n  readonly #accountById = new Map<AccountId, KeyringAccountType>();\n\n  readonly #idByAddress = new Map<string, AccountId>();\n\n  /**\n   * Get an account by its account ID.\n   *\n   * @param accountId - The account ID to look up.\n   * @returns The KeyringAccount, or undefined if not found.\n   */\n  get(accountId: AccountId): KeyringAccountType | undefined {\n    return this.#accountById.get(accountId);\n  }\n\n  /**\n   * Get an account's address by its account ID.\n   *\n   * @param accountId - The account ID to look up.\n   * @returns The address, or undefined if not found.\n   */\n  getAddress(accountId: AccountId): string | undefined {\n    return this.#accountById.get(accountId)?.address;\n  }\n\n  /**\n   * Get an account ID by the underlying address.\n   *\n   * @param address - The address to look up.\n   * @returns The account ID, or undefined if not found.\n   */\n  getAccountId(address: string): AccountId | undefined {\n    return this.#idByAddress.get(address);\n  }\n\n  /**\n   * Register a new address and generate an account ID for it.\n   * If the address is already registered, returns the existing account ID.\n   *\n   * @param address - The address to register.\n   * @returns The account ID for this address.\n   */\n  register(address: string): AccountId {\n    const existing = this.#idByAddress.get(address);\n    if (existing) {\n      return existing;\n    }\n    const id = uuidv4();\n    this.#idByAddress.set(address, id);\n    return id;\n  }\n\n  /**\n   * Add an account to the registry.\n   * Also registers the address → account ID mapping.\n   *\n   * ⚠️ If an address was previously registered via `register()` with a\n   * different account ID, calling `set()` with an account that has a new ID for\n   * the same address will overwrite the address → ID mapping. The old ID\n   * becomes \"dangling\" (i.e., `get(oldId)` will return undefined).\n   *\n   * @param account - The KeyringAccount to cache.\n   */\n  set(account: KeyringAccountType): void {\n    this.#accountById.set(account.id, account);\n    this.#idByAddress.set(account.address, account.id);\n  }\n\n  /**\n   * Remove an account from the registry.\n   *\n   * @param accountId - The account ID to remove.\n   */\n  delete(accountId: AccountId): void {\n    const account = this.#accountById.get(accountId);\n    if (account) {\n      this.#idByAddress.delete(account.address);\n      this.#accountById.delete(accountId);\n    }\n  }\n\n  /**\n   * Clear all accounts from the registry.\n   */\n  clear(): void {\n    this.#accountById.clear();\n    this.#idByAddress.clear();\n  }\n\n  /**\n   * Get all cached accounts as an array.\n   *\n   * @returns Array of all KeyringAccountType objects in the registry.\n   */\n  values(): KeyringAccountType[] {\n    return Array.from(this.#accountById.values());\n  }\n\n  /**\n   * Get all account IDs in the registry.\n   *\n   * @returns Array of all account IDs.\n   */\n  keys(): AccountId[] {\n    return Array.from(this.#accountById.keys());\n  }\n\n  /**\n   * Check if an account exists in the registry.\n   *\n   * @param accountId - The account ID to check.\n   * @returns True if the account exists.\n   */\n  has(accountId: AccountId): boolean {\n    return this.#accountById.has(accountId);\n  }\n\n  /**\n   * Get the number of accounts in the registry.\n   *\n   * @returns The number of accounts.\n   */\n  get size(): number {\n    return this.#accountById.size;\n  }\n}\n"]}
+{"version":3,"file":"keyring-account-registry.cjs","sourceRoot":"","sources":["../src/keyring-account-registry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,+BAAoC;AAepC;;;;;GAKG;AACH,MAAa,sBAAsB;IASjC;;;;;OAKG;IACH,YAAY,OAAuC;QAZ1C,8CAAe,IAAI,GAAG,EAAiC,EAAC;QAExD,8CAAe,IAAI,GAAG,EAAqB,EAAC;QAE5C,qDAA4C;QASnD,uBAAA,IAAI,sCAAe,OAAO,EAAE,UAAU,IAAI,CAAC,GAAc,EAAE,CAAC,IAAA,SAAM,GAAE,CAAC,MAAA,CAAC;IACxE,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAC,SAAoB;QACtB,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAC,SAAoB;QAC7B,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IACnD,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,OAAe;QAC1B,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,OAAe;QACtB,MAAM,QAAQ,GAAG,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,GAAG,uBAAA,IAAI,0CAAY,MAAhB,IAAI,EAAa,OAAO,CAAC,CAAC;QACrC,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;;;;;;OAUG;IACH,GAAG,CAAC,OAA2B;QAC7B,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC3C,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAoB;QACzB,MAAM,OAAO,GAAG,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE,CAAC;YACZ,uBAAA,IAAI,2CAAa,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC1C,uBAAA,IAAI,2CAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK;QACH,uBAAA,IAAI,2CAAa,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,IAAI,2CAAa,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACH,MAAM;QACJ,OAAO,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,2CAAa,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACH,IAAI;QACF,OAAO,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,2CAAa,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAC,SAAoB;QACtB,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACH,IAAI,IAAI;QACN,OAAO,uBAAA,IAAI,2CAAa,CAAC,IAAI,CAAC;IAChC,CAAC;CACF;AA3ID,wDA2IC","sourcesContent":["import type { KeyringAccount } from '@metamask/keyring-api';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { v4 as uuidv4 } from 'uuid';\n\nexport type KeyringAccountRegistryOptions = {\n  /**\n   * Custom ID generator invoked when registering a new address.\n   *\n   * Receives the address being registered and must return a unique account ID.\n   * Defaults to a random UUID v4 when not provided.\n   *\n   * @param address - The address for which to generate an account ID.\n   * @returns A unique account ID string.\n   */\n  generateId?: (address: string) => AccountId;\n};\n\n/**\n * In-memory registry for KeyringAccount objects.\n *\n * Provides O(1) lookups by account ID or address, and stores the full\n * KeyringAccount objects for efficient retrieval.\n */\nexport class KeyringAccountRegistry<\n  KeyringAccountType extends KeyringAccount = KeyringAccount,\n> {\n  readonly #accountById = new Map<AccountId, KeyringAccountType>();\n\n  readonly #idByAddress = new Map<string, AccountId>();\n\n  readonly #generateId: (address: string) => AccountId;\n\n  /**\n   * Create a new KeyringAccountRegistry.\n   *\n   * @param options - Optional configuration.\n   * @param options.generateId - Custom ID generator. Defaults to `uuidv4`.\n   */\n  constructor(options?: KeyringAccountRegistryOptions) {\n    this.#generateId = options?.generateId ?? ((): AccountId => uuidv4());\n  }\n\n  /**\n   * Get an account by its account ID.\n   *\n   * @param accountId - The account ID to look up.\n   * @returns The KeyringAccount, or undefined if not found.\n   */\n  get(accountId: AccountId): KeyringAccountType | undefined {\n    return this.#accountById.get(accountId);\n  }\n\n  /**\n   * Get an account's address by its account ID.\n   *\n   * @param accountId - The account ID to look up.\n   * @returns The address, or undefined if not found.\n   */\n  getAddress(accountId: AccountId): string | undefined {\n    return this.#accountById.get(accountId)?.address;\n  }\n\n  /**\n   * Get an account ID by the underlying address.\n   *\n   * @param address - The address to look up.\n   * @returns The account ID, or undefined if not found.\n   */\n  getAccountId(address: string): AccountId | undefined {\n    return this.#idByAddress.get(address);\n  }\n\n  /**\n   * Register a new address and generate an account ID for it.\n   * If the address is already registered, returns the existing account ID.\n   *\n   * @param address - The address to register.\n   * @returns The account ID for this address.\n   */\n  register(address: string): AccountId {\n    const existing = this.#idByAddress.get(address);\n    if (existing) {\n      return existing;\n    }\n    const id = this.#generateId(address);\n    this.#idByAddress.set(address, id);\n    return id;\n  }\n\n  /**\n   * Add an account to the registry.\n   * Also registers the address → account ID mapping.\n   *\n   * ⚠️ If an address was previously registered via `register()` with a\n   * different account ID, calling `set()` with an account that has a new ID for\n   * the same address will overwrite the address → ID mapping. The old ID\n   * becomes \"dangling\" (i.e., `get(oldId)` will return undefined).\n   *\n   * @param account - The KeyringAccount to cache.\n   */\n  set(account: KeyringAccountType): void {\n    this.#accountById.set(account.id, account);\n    this.#idByAddress.set(account.address, account.id);\n  }\n\n  /**\n   * Remove an account from the registry.\n   *\n   * @param accountId - The account ID to remove.\n   */\n  delete(accountId: AccountId): void {\n    const account = this.#accountById.get(accountId);\n    if (account) {\n      this.#idByAddress.delete(account.address);\n      this.#accountById.delete(accountId);\n    }\n  }\n\n  /**\n   * Clear all accounts from the registry.\n   */\n  clear(): void {\n    this.#accountById.clear();\n    this.#idByAddress.clear();\n  }\n\n  /**\n   * Get all cached accounts as an array.\n   *\n   * @returns Array of all KeyringAccountType objects in the registry.\n   */\n  values(): KeyringAccountType[] {\n    return Array.from(this.#accountById.values());\n  }\n\n  /**\n   * Get all account IDs in the registry.\n   *\n   * @returns Array of all account IDs.\n   */\n  keys(): AccountId[] {\n    return Array.from(this.#accountById.keys());\n  }\n\n  /**\n   * Check if an account exists in the registry.\n   *\n   * @param accountId - The account ID to check.\n   * @returns True if the account exists.\n   */\n  has(accountId: AccountId): boolean {\n    return this.#accountById.has(accountId);\n  }\n\n  /**\n   * Get the number of accounts in the registry.\n   *\n   * @returns The number of accounts.\n   */\n  get size(): number {\n    return this.#accountById.size;\n  }\n}\n"]}

package/dist/keyring-account-registry.d.cts

@@ -1,5 +1,17 @@
 import type { KeyringAccount } from "@metamask/keyring-api";
 import type { AccountId } from "@metamask/keyring-utils";
+export type KeyringAccountRegistryOptions = {
+    /**
+     * Custom ID generator invoked when registering a new address.
+     *
+     * Receives the address being registered and must return a unique account ID.
+     * Defaults to a random UUID v4 when not provided.
+     *
+     * @param address - The address for which to generate an account ID.
+     * @returns A unique account ID string.
+     */
+    generateId?: (address: string) => AccountId;
+};
 /**
  * In-memory registry for KeyringAccount objects.
  *
@@ -8,6 +20,13 @@ import type { AccountId } from "@metamask/keyring-utils";
  */
 export declare class KeyringAccountRegistry<KeyringAccountType extends KeyringAccount = KeyringAccount> {
     #private;
+    /**
+     * Create a new KeyringAccountRegistry.
+     *
+     * @param options - Optional configuration.
+     * @param options.generateId - Custom ID generator. Defaults to `uuidv4`.
+     */
+    constructor(options?: KeyringAccountRegistryOptions);
     /**
      * Get an account by its account ID.
      *

package/dist/keyring-account-registry.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"keyring-account-registry.d.cts","sourceRoot":"","sources":["../src/keyring-account-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAGzD;;;;;GAKG;AACH,qBAAa,sBAAsB,CACjC,kBAAkB,SAAS,cAAc,GAAG,cAAc;;IAM1D;;;;;OAKG;IACH,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB,GAAG,SAAS;IAIzD;;;;;OAKG;IACH,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAIpD;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAIpD;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IAUpC;;;;;;;;;;OAUG;IACH,GAAG,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAKtC;;;;OAIG;IACH,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAQlC;;OAEG;IACH,KAAK,IAAI,IAAI;IAKb;;;;OAIG;IACH,MAAM,IAAI,kBAAkB,EAAE;IAI9B;;;;OAIG;IACH,IAAI,IAAI,SAAS,EAAE;IAInB;;;;;OAKG;IACH,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO;IAIlC;;;;OAIG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}
+{"version":3,"file":"keyring-account-registry.d.cts","sourceRoot":"","sources":["../src/keyring-account-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAGzD,MAAM,MAAM,6BAA6B,GAAG;IAC1C;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS,CAAC;CAC7C,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,sBAAsB,CACjC,kBAAkB,SAAS,cAAc,GAAG,cAAc;;IAQ1D;;;;;OAKG;gBACS,OAAO,CAAC,EAAE,6BAA6B;IAInD;;;;;OAKG;IACH,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB,GAAG,SAAS;IAIzD;;;;;OAKG;IACH,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAIpD;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAIpD;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IAUpC;;;;;;;;;;OAUG;IACH,GAAG,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAKtC;;;;OAIG;IACH,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAQlC;;OAEG;IACH,KAAK,IAAI,IAAI;IAKb;;;;OAIG;IACH,MAAM,IAAI,kBAAkB,EAAE;IAI9B;;;;OAIG;IACH,IAAI,IAAI,SAAS,EAAE;IAInB;;;;;OAKG;IACH,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO;IAIlC;;;;OAIG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}

package/dist/keyring-account-registry.d.mts

@@ -1,5 +1,17 @@
 import type { KeyringAccount } from "@metamask/keyring-api";
 import type { AccountId } from "@metamask/keyring-utils";
+export type KeyringAccountRegistryOptions = {
+    /**
+     * Custom ID generator invoked when registering a new address.
+     *
+     * Receives the address being registered and must return a unique account ID.
+     * Defaults to a random UUID v4 when not provided.
+     *
+     * @param address - The address for which to generate an account ID.
+     * @returns A unique account ID string.
+     */
+    generateId?: (address: string) => AccountId;
+};
 /**
  * In-memory registry for KeyringAccount objects.
  *
@@ -8,6 +20,13 @@ import type { AccountId } from "@metamask/keyring-utils";
  */
 export declare class KeyringAccountRegistry<KeyringAccountType extends KeyringAccount = KeyringAccount> {
     #private;
+    /**
+     * Create a new KeyringAccountRegistry.
+     *
+     * @param options - Optional configuration.
+     * @param options.generateId - Custom ID generator. Defaults to `uuidv4`.
+     */
+    constructor(options?: KeyringAccountRegistryOptions);
     /**
      * Get an account by its account ID.
      *

package/dist/keyring-account-registry.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"keyring-account-registry.d.mts","sourceRoot":"","sources":["../src/keyring-account-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAGzD;;;;;GAKG;AACH,qBAAa,sBAAsB,CACjC,kBAAkB,SAAS,cAAc,GAAG,cAAc;;IAM1D;;;;;OAKG;IACH,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB,GAAG,SAAS;IAIzD;;;;;OAKG;IACH,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAIpD;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAIpD;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IAUpC;;;;;;;;;;OAUG;IACH,GAAG,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAKtC;;;;OAIG;IACH,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAQlC;;OAEG;IACH,KAAK,IAAI,IAAI;IAKb;;;;OAIG;IACH,MAAM,IAAI,kBAAkB,EAAE;IAI9B;;;;OAIG;IACH,IAAI,IAAI,SAAS,EAAE;IAInB;;;;;OAKG;IACH,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO;IAIlC;;;;OAIG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}
+{"version":3,"file":"keyring-account-registry.d.mts","sourceRoot":"","sources":["../src/keyring-account-registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,8BAA8B;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,gCAAgC;AAGzD,MAAM,MAAM,6BAA6B,GAAG;IAC1C;;;;;;;;OAQG;IACH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,SAAS,CAAC;CAC7C,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,sBAAsB,CACjC,kBAAkB,SAAS,cAAc,GAAG,cAAc;;IAQ1D;;;;;OAKG;gBACS,OAAO,CAAC,EAAE,6BAA6B;IAInD;;;;;OAKG;IACH,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,kBAAkB,GAAG,SAAS;IAIzD;;;;;OAKG;IACH,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAIpD;;;;;OAKG;IACH,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAIpD;;;;;;OAMG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS;IAUpC;;;;;;;;;;OAUG;IACH,GAAG,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAKtC;;;;OAIG;IACH,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAQlC;;OAEG;IACH,KAAK,IAAI,IAAI;IAKb;;;;OAIG;IACH,MAAM,IAAI,kBAAkB,EAAE;IAI9B;;;;OAIG;IACH,IAAI,IAAI,SAAS,EAAE;IAInB;;;;;OAKG;IACH,GAAG,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO;IAIlC;;;;OAIG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}

package/dist/keyring-account-registry.mjs

@@ -1,9 +1,15 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _KeyringAccountRegistry_accountById, _KeyringAccountRegistry_idByAddress;
+var _KeyringAccountRegistry_accountById, _KeyringAccountRegistry_idByAddress, _KeyringAccountRegistry_generateId;
 import { v4 as uuidv4 } from "uuid";
 /**
  * In-memory registry for KeyringAccount objects.
@@ -12,9 +18,17 @@ import { v4 as uuidv4 } from "uuid";
  * KeyringAccount objects for efficient retrieval.
  */
 export class KeyringAccountRegistry {
-    constructor() {
+    /**
+     * Create a new KeyringAccountRegistry.
+     *
+     * @param options - Optional configuration.
+     * @param options.generateId - Custom ID generator. Defaults to `uuidv4`.
+     */
+    constructor(options) {
         _KeyringAccountRegistry_accountById.set(this, new Map());
         _KeyringAccountRegistry_idByAddress.set(this, new Map());
+        _KeyringAccountRegistry_generateId.set(this, void 0);
+        __classPrivateFieldSet(this, _KeyringAccountRegistry_generateId, options?.generateId ?? (() => uuidv4()), "f");
     }
     /**
      * Get an account by its account ID.
@@ -55,7 +69,7 @@ export class KeyringAccountRegistry {
         if (existing) {
             return existing;
         }
-        const id = uuidv4();
+        const id = __classPrivateFieldGet(this, _KeyringAccountRegistry_generateId, "f").call(this, address);
         __classPrivateFieldGet(this, _KeyringAccountRegistry_idByAddress, "f").set(address, id);
         return id;
     }
@@ -127,5 +141,5 @@ export class KeyringAccountRegistry {
         return __classPrivateFieldGet(this, _KeyringAccountRegistry_accountById, "f").size;
     }
 }
-_KeyringAccountRegistry_accountById = new WeakMap(), _KeyringAccountRegistry_idByAddress = new WeakMap();
+_KeyringAccountRegistry_accountById = new WeakMap(), _KeyringAccountRegistry_idByAddress = new WeakMap(), _KeyringAccountRegistry_generateId = new WeakMap();
 //# sourceMappingURL=keyring-account-registry.mjs.map

package/dist/keyring-account-registry.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"keyring-account-registry.mjs","sourceRoot":"","sources":["../src/keyring-account-registry.ts"],"names":[],"mappings":";;;;;;AAEA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,aAAa;AAEpC;;;;;GAKG;AACH,MAAM,OAAO,sBAAsB;IAAnC;QAGW,8CAAe,IAAI,GAAG,EAAiC,EAAC;QAExD,8CAAe,IAAI,GAAG,EAAqB,EAAC;IA0HvD,CAAC;IAxHC;;;;;OAKG;IACH,GAAG,CAAC,SAAoB;QACtB,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAC,SAAoB;QAC7B,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IACnD,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,OAAe;QAC1B,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,OAAe;QACtB,MAAM,QAAQ,GAAG,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;QACpB,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;;;;;;OAUG;IACH,GAAG,CAAC,OAA2B;QAC7B,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC3C,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAoB;QACzB,MAAM,OAAO,GAAG,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE,CAAC;YACZ,uBAAA,IAAI,2CAAa,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC1C,uBAAA,IAAI,2CAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK;QACH,uBAAA,IAAI,2CAAa,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,IAAI,2CAAa,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACH,MAAM;QACJ,OAAO,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,2CAAa,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACH,IAAI;QACF,OAAO,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,2CAAa,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAC,SAAoB;QACtB,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACH,IAAI,IAAI;QACN,OAAO,uBAAA,IAAI,2CAAa,CAAC,IAAI,CAAC;IAChC,CAAC;CACF","sourcesContent":["import type { KeyringAccount } from '@metamask/keyring-api';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { v4 as uuidv4 } from 'uuid';\n\n/**\n * In-memory registry for KeyringAccount objects.\n *\n * Provides O(1) lookups by account ID or address, and stores the full\n * KeyringAccount objects for efficient retrieval.\n */\nexport class KeyringAccountRegistry<\n  KeyringAccountType extends KeyringAccount = KeyringAccount,\n> {\n  readonly #accountById = new Map<AccountId, KeyringAccountType>();\n\n  readonly #idByAddress = new Map<string, AccountId>();\n\n  /**\n   * Get an account by its account ID.\n   *\n   * @param accountId - The account ID to look up.\n   * @returns The KeyringAccount, or undefined if not found.\n   */\n  get(accountId: AccountId): KeyringAccountType | undefined {\n    return this.#accountById.get(accountId);\n  }\n\n  /**\n   * Get an account's address by its account ID.\n   *\n   * @param accountId - The account ID to look up.\n   * @returns The address, or undefined if not found.\n   */\n  getAddress(accountId: AccountId): string | undefined {\n    return this.#accountById.get(accountId)?.address;\n  }\n\n  /**\n   * Get an account ID by the underlying address.\n   *\n   * @param address - The address to look up.\n   * @returns The account ID, or undefined if not found.\n   */\n  getAccountId(address: string): AccountId | undefined {\n    return this.#idByAddress.get(address);\n  }\n\n  /**\n   * Register a new address and generate an account ID for it.\n   * If the address is already registered, returns the existing account ID.\n   *\n   * @param address - The address to register.\n   * @returns The account ID for this address.\n   */\n  register(address: string): AccountId {\n    const existing = this.#idByAddress.get(address);\n    if (existing) {\n      return existing;\n    }\n    const id = uuidv4();\n    this.#idByAddress.set(address, id);\n    return id;\n  }\n\n  /**\n   * Add an account to the registry.\n   * Also registers the address → account ID mapping.\n   *\n   * ⚠️ If an address was previously registered via `register()` with a\n   * different account ID, calling `set()` with an account that has a new ID for\n   * the same address will overwrite the address → ID mapping. The old ID\n   * becomes \"dangling\" (i.e., `get(oldId)` will return undefined).\n   *\n   * @param account - The KeyringAccount to cache.\n   */\n  set(account: KeyringAccountType): void {\n    this.#accountById.set(account.id, account);\n    this.#idByAddress.set(account.address, account.id);\n  }\n\n  /**\n   * Remove an account from the registry.\n   *\n   * @param accountId - The account ID to remove.\n   */\n  delete(accountId: AccountId): void {\n    const account = this.#accountById.get(accountId);\n    if (account) {\n      this.#idByAddress.delete(account.address);\n      this.#accountById.delete(accountId);\n    }\n  }\n\n  /**\n   * Clear all accounts from the registry.\n   */\n  clear(): void {\n    this.#accountById.clear();\n    this.#idByAddress.clear();\n  }\n\n  /**\n   * Get all cached accounts as an array.\n   *\n   * @returns Array of all KeyringAccountType objects in the registry.\n   */\n  values(): KeyringAccountType[] {\n    return Array.from(this.#accountById.values());\n  }\n\n  /**\n   * Get all account IDs in the registry.\n   *\n   * @returns Array of all account IDs.\n   */\n  keys(): AccountId[] {\n    return Array.from(this.#accountById.keys());\n  }\n\n  /**\n   * Check if an account exists in the registry.\n   *\n   * @param accountId - The account ID to check.\n   * @returns True if the account exists.\n   */\n  has(accountId: AccountId): boolean {\n    return this.#accountById.has(accountId);\n  }\n\n  /**\n   * Get the number of accounts in the registry.\n   *\n   * @returns The number of accounts.\n   */\n  get size(): number {\n    return this.#accountById.size;\n  }\n}\n"]}
+{"version":3,"file":"keyring-account-registry.mjs","sourceRoot":"","sources":["../src/keyring-account-registry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,aAAa;AAepC;;;;;GAKG;AACH,MAAM,OAAO,sBAAsB;IASjC;;;;;OAKG;IACH,YAAY,OAAuC;QAZ1C,8CAAe,IAAI,GAAG,EAAiC,EAAC;QAExD,8CAAe,IAAI,GAAG,EAAqB,EAAC;QAE5C,qDAA4C;QASnD,uBAAA,IAAI,sCAAe,OAAO,EAAE,UAAU,IAAI,CAAC,GAAc,EAAE,CAAC,MAAM,EAAE,CAAC,MAAA,CAAC;IACxE,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAC,SAAoB;QACtB,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACH,UAAU,CAAC,SAAoB;QAC7B,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IACnD,CAAC;IAED;;;;;OAKG;IACH,YAAY,CAAC,OAAe;QAC1B,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED;;;;;;OAMG;IACH,QAAQ,CAAC,OAAe;QACtB,MAAM,QAAQ,GAAG,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,EAAE,GAAG,uBAAA,IAAI,0CAAY,MAAhB,IAAI,EAAa,OAAO,CAAC,CAAC;QACrC,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACnC,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;;;;;;;;;OAUG;IACH,GAAG,CAAC,OAA2B;QAC7B,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC3C,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAoB;QACzB,MAAM,OAAO,GAAG,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACjD,IAAI,OAAO,EAAE,CAAC;YACZ,uBAAA,IAAI,2CAAa,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC1C,uBAAA,IAAI,2CAAa,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK;QACH,uBAAA,IAAI,2CAAa,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,IAAI,2CAAa,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED;;;;OAIG;IACH,MAAM;QACJ,OAAO,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,2CAAa,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACH,IAAI;QACF,OAAO,KAAK,CAAC,IAAI,CAAC,uBAAA,IAAI,2CAAa,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED;;;;;OAKG;IACH,GAAG,CAAC,SAAoB;QACtB,OAAO,uBAAA,IAAI,2CAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED;;;;OAIG;IACH,IAAI,IAAI;QACN,OAAO,uBAAA,IAAI,2CAAa,CAAC,IAAI,CAAC;IAChC,CAAC;CACF","sourcesContent":["import type { KeyringAccount } from '@metamask/keyring-api';\nimport type { AccountId } from '@metamask/keyring-utils';\nimport { v4 as uuidv4 } from 'uuid';\n\nexport type KeyringAccountRegistryOptions = {\n  /**\n   * Custom ID generator invoked when registering a new address.\n   *\n   * Receives the address being registered and must return a unique account ID.\n   * Defaults to a random UUID v4 when not provided.\n   *\n   * @param address - The address for which to generate an account ID.\n   * @returns A unique account ID string.\n   */\n  generateId?: (address: string) => AccountId;\n};\n\n/**\n * In-memory registry for KeyringAccount objects.\n *\n * Provides O(1) lookups by account ID or address, and stores the full\n * KeyringAccount objects for efficient retrieval.\n */\nexport class KeyringAccountRegistry<\n  KeyringAccountType extends KeyringAccount = KeyringAccount,\n> {\n  readonly #accountById = new Map<AccountId, KeyringAccountType>();\n\n  readonly #idByAddress = new Map<string, AccountId>();\n\n  readonly #generateId: (address: string) => AccountId;\n\n  /**\n   * Create a new KeyringAccountRegistry.\n   *\n   * @param options - Optional configuration.\n   * @param options.generateId - Custom ID generator. Defaults to `uuidv4`.\n   */\n  constructor(options?: KeyringAccountRegistryOptions) {\n    this.#generateId = options?.generateId ?? ((): AccountId => uuidv4());\n  }\n\n  /**\n   * Get an account by its account ID.\n   *\n   * @param accountId - The account ID to look up.\n   * @returns The KeyringAccount, or undefined if not found.\n   */\n  get(accountId: AccountId): KeyringAccountType | undefined {\n    return this.#accountById.get(accountId);\n  }\n\n  /**\n   * Get an account's address by its account ID.\n   *\n   * @param accountId - The account ID to look up.\n   * @returns The address, or undefined if not found.\n   */\n  getAddress(accountId: AccountId): string | undefined {\n    return this.#accountById.get(accountId)?.address;\n  }\n\n  /**\n   * Get an account ID by the underlying address.\n   *\n   * @param address - The address to look up.\n   * @returns The account ID, or undefined if not found.\n   */\n  getAccountId(address: string): AccountId | undefined {\n    return this.#idByAddress.get(address);\n  }\n\n  /**\n   * Register a new address and generate an account ID for it.\n   * If the address is already registered, returns the existing account ID.\n   *\n   * @param address - The address to register.\n   * @returns The account ID for this address.\n   */\n  register(address: string): AccountId {\n    const existing = this.#idByAddress.get(address);\n    if (existing) {\n      return existing;\n    }\n    const id = this.#generateId(address);\n    this.#idByAddress.set(address, id);\n    return id;\n  }\n\n  /**\n   * Add an account to the registry.\n   * Also registers the address → account ID mapping.\n   *\n   * ⚠️ If an address was previously registered via `register()` with a\n   * different account ID, calling `set()` with an account that has a new ID for\n   * the same address will overwrite the address → ID mapping. The old ID\n   * becomes \"dangling\" (i.e., `get(oldId)` will return undefined).\n   *\n   * @param account - The KeyringAccount to cache.\n   */\n  set(account: KeyringAccountType): void {\n    this.#accountById.set(account.id, account);\n    this.#idByAddress.set(account.address, account.id);\n  }\n\n  /**\n   * Remove an account from the registry.\n   *\n   * @param accountId - The account ID to remove.\n   */\n  delete(accountId: AccountId): void {\n    const account = this.#accountById.get(accountId);\n    if (account) {\n      this.#idByAddress.delete(account.address);\n      this.#accountById.delete(accountId);\n    }\n  }\n\n  /**\n   * Clear all accounts from the registry.\n   */\n  clear(): void {\n    this.#accountById.clear();\n    this.#idByAddress.clear();\n  }\n\n  /**\n   * Get all cached accounts as an array.\n   *\n   * @returns Array of all KeyringAccountType objects in the registry.\n   */\n  values(): KeyringAccountType[] {\n    return Array.from(this.#accountById.values());\n  }\n\n  /**\n   * Get all account IDs in the registry.\n   *\n   * @returns Array of all account IDs.\n   */\n  keys(): AccountId[] {\n    return Array.from(this.#accountById.keys());\n  }\n\n  /**\n   * Check if an account exists in the registry.\n   *\n   * @param accountId - The account ID to check.\n   * @returns True if the account exists.\n   */\n  has(accountId: AccountId): boolean {\n    return this.#accountById.has(accountId);\n  }\n\n  /**\n   * Get the number of accounts in the registry.\n   *\n   * @returns The number of accounts.\n   */\n  get size(): number {\n    return this.#accountById.size;\n  }\n}\n"]}

package/dist/{eth → v2/eth}/eth-keyring-wrapper.cjs

@@ -6,6 +6,7 @@ const eth_sig_util_1 = require("@metamask/eth-sig-util");
 const keyring_api_1 = require("@metamask/keyring-api");
 const superstruct_1 = require("@metamask/superstruct");
 const utils_1 = require("@metamask/utils");
+const account_id_1 = require("../../eth/account-id.cjs");
 const keyring_wrapper_1 = require("../keyring-wrapper.cjs");
 /**
  * Additional Ethereum methods supported by Eth keyrings that are not in the standard EthMethod enum.
@@ -19,7 +20,7 @@ var EthKeyringMethod;
     EthKeyringMethod["SignEip7702Authorization"] = "eth_signEip7702Authorization";
 })(EthKeyringMethod || (exports.EthKeyringMethod = EthKeyringMethod = {}));
 /**
- * Abstract wrapper for Ethereum-based keyrings that extends KeyringWrapper, that itself implements KeyringV2.
+ * Abstract wrapper for Ethereum-based keyrings that extends KeyringWrapper, that itself implements Keyring.
  *
  * This class provides common functionality for all Ethereum keyrings including:
  * - Request handling for standard Ethereum signing methods
@@ -32,6 +33,14 @@ var EthKeyringMethod;
  * - `exportAccount()` (optional): Export private key in specified format
  */
 class EthKeyringWrapper extends keyring_wrapper_1.KeyringWrapper {
+    constructor(options) {
+        super({
+            ...options,
+            // We use a custom ID generator to ensure that account IDs are deterministic based on
+            // the Ethereum address.
+            registryOptions: { generateId: account_id_1.generateEthAccountId },
+        });
+    }
     /**
      * Helper method to safely cast a KeyringAccount address to Hex type.
      * The KeyringAccount.address is typed as string, but for Ethereum accounts

package/dist/v2/eth/eth-keyring-wrapper.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"eth-keyring-wrapper.cjs","sourceRoot":"","sources":["../../../src/v2/eth/eth-keyring-wrapper.ts"],"names":[],"mappings":"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","sourcesContent":["import { TransactionFactory, type TypedTxData } from '@ethereumjs/tx';\nimport type { MessageTypes, TypedMessage } from '@metamask/eth-sig-util';\nimport { SignTypedDataVersion } from '@metamask/eth-sig-util';\nimport type { KeyringAccount, KeyringRequest } from '@metamask/keyring-api';\nimport {\n  EthDecryptParamsStruct,\n  EthGetAppKeyAddressParamsStruct,\n  EthGetEncryptionPublicKeyParamsStruct,\n  EthPersonalSignParamsStruct,\n  EthSignEip7702AuthorizationParamsStruct,\n  EthSignParamsStruct,\n  EthSignTransactionParamsStruct,\n  EthSignTypedDataParamsStruct,\n  EthSignTypedDataV1ParamsStruct,\n  EthMethod,\n} from '@metamask/keyring-api';\nimport type { EthKeyring } from '@metamask/keyring-utils';\nimport { assert } from '@metamask/superstruct';\nimport { add0x, type Hex, type Json } from '@metamask/utils';\n\nimport { generateEthAccountId } from '../../eth/account-id';\nimport { KeyringWrapper, type KeyringWrapperOptions } from '../keyring-wrapper';\n\n/**\n * Additional Ethereum methods supported by Eth keyrings that are not in the standard EthMethod enum.\n * These are primarily encryption and utility methods.\n */\nexport enum EthKeyringMethod {\n  Decrypt = 'eth_decrypt',\n  GetEncryptionPublicKey = 'eth_getEncryptionPublicKey',\n  GetAppKeyAddress = 'eth_getAppKeyAddress',\n  SignEip7702Authorization = 'eth_signEip7702Authorization',\n}\n\n/**\n * Options for constructing an {@link EthKeyringWrapper}.\n *\n * `registryOptions` is intentionally omitted: the registry is always\n * configured with {@link generateEthAccountId} to produce deterministic\n * account IDs for Ethereum addresses.\n */\nexport type EthKeyringWrapperOptions<InnerKeyring extends EthKeyring> = Omit<\n  KeyringWrapperOptions<InnerKeyring>,\n  'registryOptions'\n>;\n\n/**\n * Abstract wrapper for Ethereum-based keyrings that extends KeyringWrapper, that itself implements Keyring.\n *\n * This class provides common functionality for all Ethereum keyrings including:\n * - Request handling for standard Ethereum signing methods\n * - Helper methods for Hex address conversion\n *\n * Subclasses must implement:\n * - `getAccounts()`: Return all managed accounts\n * - `createAccounts()`: Create new accounts based on options\n * - `deleteAccount()`: Remove an account from the keyring\n * - `exportAccount()` (optional): Export private key in specified format\n */\nexport abstract class EthKeyringWrapper<\n  InnerKeyring extends EthKeyring,\n  KeyringAccountType extends KeyringAccount = KeyringAccount,\n> extends KeyringWrapper<InnerKeyring, KeyringAccountType> {\n  constructor(options: EthKeyringWrapperOptions<InnerKeyring>) {\n    super({\n      ...options,\n      // We use a custom ID generator to ensure that account IDs are deterministic based on\n      // the Ethereum address.\n      registryOptions: { generateId: generateEthAccountId },\n    });\n  }\n\n  /**\n   * Helper method to safely cast a KeyringAccount address to Hex type.\n   * The KeyringAccount.address is typed as string, but for Ethereum accounts\n   * it should always be a valid Hex address.\n   *\n   * @param address - The address from a KeyringAccount.\n   * @returns The address as Hex type.\n   */\n  protected toHexAddress(address: string): Hex {\n    return add0x(address);\n  }\n\n  /**\n   * Handle an Ethereum signing request.\n   *\n   * Routes the request to the appropriate legacy keyring method based on\n   * the RPC method name.\n   *\n   * @param request - The keyring request containing method and params.\n   * @returns The result of the signing operation.\n   */\n  async submitRequest(request: KeyringRequest): Promise<Json> {\n    const { method, params } = request.request;\n\n    const { address, methods } = await this.getAccount(request.account);\n    const hexAddress = this.toHexAddress(address);\n\n    // Validate account can handle the method\n    if (!methods.includes(method)) {\n      throw new Error(\n        `Account ${request.account} cannot handle method: ${method}`,\n      );\n    }\n\n    switch (method) {\n      case `${EthMethod.SignTransaction}`: {\n        if (!this.inner.signTransaction) {\n          throw new Error('Keyring does not support signTransaction');\n        }\n        assert(params, EthSignTransactionParamsStruct);\n        const [txData] = params;\n        // Convert validated transaction data to TypedTransaction\n        // TODO: Improve typing to ensure txData matches TypedTxData\n        const tx = TransactionFactory.fromTxData(txData as TypedTxData);\n        // Note: Bigints are not directly representable in JSON\n        return (await this.inner.signTransaction(\n          hexAddress,\n          tx,\n        )) as unknown as Json; // FIXME: Should return type be unknown?\n      }\n\n      case `${EthMethod.Sign}`: {\n        if (!this.inner.signMessage) {\n          throw new Error('Keyring does not support signMessage');\n        }\n        assert(params, EthSignParamsStruct);\n        const [, data] = params;\n        return this.inner.signMessage(hexAddress, data);\n      }\n\n      case `${EthMethod.PersonalSign}`: {\n        if (!this.inner.signPersonalMessage) {\n          throw new Error('Keyring does not support signPersonalMessage');\n        }\n        assert(params, EthPersonalSignParamsStruct);\n        const [data] = params;\n        return this.inner.signPersonalMessage(hexAddress, data as Hex);\n      }\n\n      case `${EthMethod.SignTypedDataV1}`: {\n        if (!this.inner.signTypedData) {\n          throw new Error('Keyring does not support signTypedData');\n        }\n        assert(params, EthSignTypedDataV1ParamsStruct);\n        const [, data] = params;\n        return this.inner.signTypedData(hexAddress, data, {\n          version: SignTypedDataVersion.V1,\n        });\n      }\n\n      case `${EthMethod.SignTypedDataV3}`: {\n        if (!this.inner.signTypedData) {\n          throw new Error('Keyring does not support signTypedData');\n        }\n        assert(params, EthSignTypedDataParamsStruct);\n        const [, data] = params;\n        return this.inner.signTypedData(\n          hexAddress,\n          // TODO: Improve typing to ensure data matches MessageTypes\n          data as TypedMessage<MessageTypes>,\n          {\n            version: SignTypedDataVersion.V3,\n          },\n        );\n      }\n\n      case `${EthMethod.SignTypedDataV4}`: {\n        if (!this.inner.signTypedData) {\n          throw new Error('Keyring does not support signTypedData');\n        }\n        assert(params, EthSignTypedDataParamsStruct);\n        const [, data] = params;\n        return this.inner.signTypedData(\n          hexAddress,\n          // TODO: Improve typing to ensure data matches MessageTypes\n          data as TypedMessage<MessageTypes>,\n          {\n            version: SignTypedDataVersion.V4,\n          },\n        );\n      }\n\n      case `${EthKeyringMethod.Decrypt}`: {\n        if (!this.inner.decryptMessage) {\n          throw new Error('Keyring does not support decryptMessage');\n        }\n        assert(params, EthDecryptParamsStruct);\n        const [encryptedData] = params;\n        return this.inner.decryptMessage(hexAddress, encryptedData);\n      }\n\n      case `${EthKeyringMethod.GetEncryptionPublicKey}`: {\n        if (!this.inner.getEncryptionPublicKey) {\n          throw new Error('Keyring does not support getEncryptionPublicKey');\n        }\n        assert(params, EthGetEncryptionPublicKeyParamsStruct);\n        const [, options] = params;\n        return this.inner.getEncryptionPublicKey(hexAddress, options);\n      }\n\n      case `${EthKeyringMethod.GetAppKeyAddress}`: {\n        if (!this.inner.getAppKeyAddress) {\n          throw new Error('Keyring does not support getAppKeyAddress');\n        }\n        assert(params, EthGetAppKeyAddressParamsStruct);\n        const [origin] = params;\n        return this.inner.getAppKeyAddress(hexAddress, origin);\n      }\n\n      case `${EthKeyringMethod.SignEip7702Authorization}`: {\n        if (!this.inner.signEip7702Authorization) {\n          throw new Error('Keyring does not support signEip7702Authorization');\n        }\n        assert(params, EthSignEip7702AuthorizationParamsStruct);\n        const [authorization] = params;\n        return this.inner.signEip7702Authorization(hexAddress, authorization);\n      }\n\n      default:\n        throw new Error(`Unsupported method for EthKeyringWrapper: ${method}`);\n    }\n  }\n}\n"]}

package/dist/{eth → v2/eth}/eth-keyring-wrapper.d.cts

@@ -13,11 +13,15 @@ export declare enum EthKeyringMethod {
     SignEip7702Authorization = "eth_signEip7702Authorization"
 }
 /**
- * Options for constructing an EthKeyringWrapper.
+ * Options for constructing an {@link EthKeyringWrapper}.
+ *
+ * `registryOptions` is intentionally omitted: the registry is always
+ * configured with {@link generateEthAccountId} to produce deterministic
+ * account IDs for Ethereum addresses.
  */
-export type EthKeyringWrapperOptions<InnerKeyring extends EthKeyring> = KeyringWrapperOptions<InnerKeyring>;
+export type EthKeyringWrapperOptions<InnerKeyring extends EthKeyring> = Omit<KeyringWrapperOptions<InnerKeyring>, 'registryOptions'>;
 /**
- * Abstract wrapper for Ethereum-based keyrings that extends KeyringWrapper, that itself implements KeyringV2.
+ * Abstract wrapper for Ethereum-based keyrings that extends KeyringWrapper, that itself implements Keyring.
  *
  * This class provides common functionality for all Ethereum keyrings including:
  * - Request handling for standard Ethereum signing methods
@@ -30,6 +34,7 @@ export type EthKeyringWrapperOptions<InnerKeyring extends EthKeyring> = KeyringW
  * - `exportAccount()` (optional): Export private key in specified format
  */
 export declare abstract class EthKeyringWrapper<InnerKeyring extends EthKeyring, KeyringAccountType extends KeyringAccount = KeyringAccount> extends KeyringWrapper<InnerKeyring, KeyringAccountType> {
+    constructor(options: EthKeyringWrapperOptions<InnerKeyring>);
     /**
      * Helper method to safely cast a KeyringAccount address to Hex type.
      * The KeyringAccount.address is typed as string, but for Ethereum accounts