@metamask/keyring-sdk 1.2.0 → 2.0.0

package/CHANGELOG.md

@@ -7,6 +7,21 @@ 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
@@ -30,7 +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.2.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/index.cjs

@@ -15,5 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./account-id.cjs"), exports);
-__exportStar(require("./eth-keyring-wrapper.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,mDAA6B;AAC7B,4DAAsC","sourcesContent":["export * from './account-id';\nexport * 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,3 +1,2 @@
 export * from "./account-id.cjs";
-export * from "./eth-keyring-wrapper.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,iCAA6B;AAC7B,0CAAsC"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,iCAA6B"}

package/dist/eth/index.d.mts

@@ -1,3 +1,2 @@
 export * from "./account-id.mjs";
-export * from "./eth-keyring-wrapper.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,iCAA6B;AAC7B,0CAAsC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/eth/index.ts"],"names":[],"mappings":"AAAA,iCAA6B"}

package/dist/eth/index.mjs

@@ -1,3 +1,2 @@
 export * from "./account-id.mjs";
-export * from "./eth-keyring-wrapper.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,iCAA6B;AAC7B,0CAAsC","sourcesContent":["export * from './account-id';\nexport * 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/{eth → v2/eth}/eth-keyring-wrapper.cjs

@@ -6,7 +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("./account-id.cjs");
+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.
@@ -20,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

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

@@ -21,7 +21,7 @@ export declare enum EthKeyringMethod {
  */
 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

package/dist/v2/eth/eth-keyring-wrapper.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"eth-keyring-wrapper.d.cts","sourceRoot":"","sources":["../../../src/v2/eth/eth-keyring-wrapper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,8BAA8B;AAa5E,OAAO,KAAK,EAAE,UAAU,EAAE,gCAAgC;AAE1D,OAAO,EAAS,KAAK,GAAG,EAAE,KAAK,IAAI,EAAE,wBAAwB;AAG7D,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,+BAA2B;AAEhF;;;GAGG;AACH,oBAAY,gBAAgB;IAC1B,OAAO,gBAAgB;IACvB,sBAAsB,+BAA+B;IACrD,gBAAgB,yBAAyB;IACzC,wBAAwB,iCAAiC;CAC1D;AAED;;;;;;GAMG;AACH,MAAM,MAAM,wBAAwB,CAAC,YAAY,SAAS,UAAU,IAAI,IAAI,CAC1E,qBAAqB,CAAC,YAAY,CAAC,EACnC,iBAAiB,CAClB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,8BAAsB,iBAAiB,CACrC,YAAY,SAAS,UAAU,EAC/B,kBAAkB,SAAS,cAAc,GAAG,cAAc,CAC1D,SAAQ,cAAc,CAAC,YAAY,EAAE,kBAAkB,CAAC;gBAC5C,OAAO,EAAE,wBAAwB,CAAC,YAAY,CAAC;IAS3D;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG;IAI5C;;;;;;;;OAQG;IACG,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmI5D"}

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

@@ -21,7 +21,7 @@ export declare enum EthKeyringMethod {
  */
 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

package/dist/v2/eth/eth-keyring-wrapper.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"eth-keyring-wrapper.d.mts","sourceRoot":"","sources":["../../../src/v2/eth/eth-keyring-wrapper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,8BAA8B;AAa5E,OAAO,KAAK,EAAE,UAAU,EAAE,gCAAgC;AAE1D,OAAO,EAAS,KAAK,GAAG,EAAE,KAAK,IAAI,EAAE,wBAAwB;AAG7D,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,+BAA2B;AAEhF;;;GAGG;AACH,oBAAY,gBAAgB;IAC1B,OAAO,gBAAgB;IACvB,sBAAsB,+BAA+B;IACrD,gBAAgB,yBAAyB;IACzC,wBAAwB,iCAAiC;CAC1D;AAED;;;;;;GAMG;AACH,MAAM,MAAM,wBAAwB,CAAC,YAAY,SAAS,UAAU,IAAI,IAAI,CAC1E,qBAAqB,CAAC,YAAY,CAAC,EACnC,iBAAiB,CAClB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,8BAAsB,iBAAiB,CACrC,YAAY,SAAS,UAAU,EAC/B,kBAAkB,SAAS,cAAc,GAAG,cAAc,CAC1D,SAAQ,cAAc,CAAC,YAAY,EAAE,kBAAkB,CAAC;gBAC5C,OAAO,EAAE,wBAAwB,CAAC,YAAY,CAAC;IAS3D;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG;IAI5C;;;;;;;;OAQG;IACG,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmI5D"}

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

@@ -3,7 +3,7 @@ import { SignTypedDataVersion } from "@metamask/eth-sig-util";
 import { EthDecryptParamsStruct, EthGetAppKeyAddressParamsStruct, EthGetEncryptionPublicKeyParamsStruct, EthPersonalSignParamsStruct, EthSignEip7702AuthorizationParamsStruct, EthSignParamsStruct, EthSignTransactionParamsStruct, EthSignTypedDataParamsStruct, EthSignTypedDataV1ParamsStruct, EthMethod } from "@metamask/keyring-api";
 import { assert } from "@metamask/superstruct";
 import { add0x } from "@metamask/utils";
-import { generateEthAccountId } from "./account-id.mjs";
+import { generateEthAccountId } from "../../eth/account-id.mjs";
 import { KeyringWrapper } from "../keyring-wrapper.mjs";
 /**
  * Additional Ethereum methods supported by Eth keyrings that are not in the standard EthMethod enum.
@@ -17,7 +17,7 @@ export var EthKeyringMethod;
     EthKeyringMethod["SignEip7702Authorization"] = "eth_signEip7702Authorization";
 })(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

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

@@ -0,0 +1 @@
+{"version":3,"file":"eth-keyring-wrapper.mjs","sourceRoot":"","sources":["../../../src/v2/eth/eth-keyring-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAoB,uBAAuB;AAEtE,OAAO,EAAE,oBAAoB,EAAE,+BAA+B;AAE9D,OAAO,EACL,sBAAsB,EACtB,+BAA+B,EAC/B,qCAAqC,EACrC,2BAA2B,EAC3B,uCAAuC,EACvC,mBAAmB,EACnB,8BAA8B,EAC9B,4BAA4B,EAC5B,8BAA8B,EAC9B,SAAS,EACV,8BAA8B;AAE/B,OAAO,EAAE,MAAM,EAAE,8BAA8B;AAC/C,OAAO,EAAE,KAAK,EAAuB,wBAAwB;AAE7D,OAAO,EAAE,oBAAoB,EAAE,iCAA6B;AAC5D,OAAO,EAAE,cAAc,EAA8B,+BAA2B;AAEhF;;;GAGG;AACH,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,2CAAuB,CAAA;IACvB,yEAAqD,CAAA;IACrD,6DAAyC,CAAA;IACzC,6EAAyD,CAAA;AAC3D,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B;AAcD;;;;;;;;;;;;GAYG;AACH,MAAM,OAAgB,iBAGpB,SAAQ,cAAgD;IACxD,YAAY,OAA+C;QACzD,KAAK,CAAC;YACJ,GAAG,OAAO;YACV,qFAAqF;YACrF,wBAAwB;YACxB,eAAe,EAAE,EAAE,UAAU,EAAE,oBAAoB,EAAE;SACtD,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;OAOG;IACO,YAAY,CAAC,OAAe;QACpC,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,aAAa,CAAC,OAAuB;QACzC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;QAE3C,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpE,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAE9C,yCAAyC;QACzC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CACb,WAAW,OAAO,CAAC,OAAO,0BAA0B,MAAM,EAAE,CAC7D,CAAC;QACJ,CAAC;QAED,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;oBAChC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;gBAC9D,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,8BAA8B,CAAC,CAAC;gBAC/C,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;gBACxB,yDAAyD;gBACzD,4DAA4D;gBAC5D,MAAM,EAAE,GAAG,kBAAkB,CAAC,UAAU,CAAC,MAAqB,CAAC,CAAC;gBAChE,uDAAuD;gBACvD,OAAO,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CACtC,UAAU,EACV,EAAE,CACH,CAAoB,CAAC,CAAC,wCAAwC;YACjE,CAAC;YAED,KAAK,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;oBAC5B,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;gBAC1D,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;gBACpC,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC;gBACxB,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YAClD,CAAC;YAED,KAAK,GAAG,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;gBACjC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC;oBACpC,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;gBAClE,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;gBAC5C,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;gBACtB,OAAO,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,EAAE,IAAW,CAAC,CAAC;YACjE,CAAC;YAED,KAAK,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBAC5D,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,8BAA8B,CAAC,CAAC;gBAC/C,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC;gBACxB,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,IAAI,EAAE;oBAChD,OAAO,EAAE,oBAAoB,CAAC,EAAE;iBACjC,CAAC,CAAC;YACL,CAAC;YAED,KAAK,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBAC5D,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;gBAC7C,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC;gBACxB,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAC7B,UAAU;gBACV,2DAA2D;gBAC3D,IAAkC,EAClC;oBACE,OAAO,EAAE,oBAAoB,CAAC,EAAE;iBACjC,CACF,CAAC;YACJ,CAAC;YAED,KAAK,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC;gBACpC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;gBAC5D,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;gBAC7C,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC;gBACxB,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,CAC7B,UAAU;gBACV,2DAA2D;gBAC3D,IAAkC,EAClC;oBACE,OAAO,EAAE,oBAAoB,CAAC,EAAE;iBACjC,CACF,CAAC;YACJ,CAAC;YAED,KAAK,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;gBACnC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC;oBAC/B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;gBAC7D,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;gBACvC,MAAM,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;gBAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;YAC9D,CAAC;YAED,KAAK,GAAG,gBAAgB,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC;gBAClD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,EAAE,CAAC;oBACvC,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;gBACrE,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,qCAAqC,CAAC,CAAC;gBACtD,MAAM,CAAC,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC;gBAC3B,OAAO,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAChE,CAAC;YAED,KAAK,GAAG,gBAAgB,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;gBAC5C,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;oBACjC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBAC/D,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAC;gBAChD,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;gBACxB,OAAO,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YACzD,CAAC;YAED,KAAK,GAAG,gBAAgB,CAAC,wBAAwB,EAAE,CAAC,CAAC,CAAC;gBACpD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,wBAAwB,EAAE,CAAC;oBACzC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;gBACvE,CAAC;gBACD,MAAM,CAAC,MAAM,EAAE,uCAAuC,CAAC,CAAC;gBACxD,MAAM,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC;gBAC/B,OAAO,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;YACxE,CAAC;YAED;gBACE,MAAM,IAAI,KAAK,CAAC,6CAA6C,MAAM,EAAE,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;CACF","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/v2/eth/index.cjs

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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);
+//# sourceMappingURL=index.cjs.map

package/dist/v2/eth/index.cjs.map

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

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

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

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

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

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

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

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

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

package/dist/v2/eth/index.mjs

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

package/dist/v2/eth/index.mjs.map

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

package/dist/v2/index.cjs

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./eth/index.cjs"), exports);
+//# sourceMappingURL=index.cjs.map

package/dist/v2/index.cjs.map

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

package/dist/v2/index.d.cts

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

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

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

package/dist/v2/index.d.mts

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

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

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

package/dist/v2/index.mjs

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

package/dist/v2/index.mjs.map

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

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

@@ -14,10 +14,10 @@ var _KeyringWrapper_capabilities, _KeyringWrapper_lock;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeyringWrapper = void 0;
 const async_mutex_1 = require("async-mutex");
-const keyring_account_registry_1 = require("./keyring-account-registry.cjs");
+const keyring_account_registry_1 = require("../keyring-account-registry.cjs");
 /**
  * Generic adapter that turns an existing {@link Keyring} implementation into a
- * {@link KeyringV2} instance.
+ * {@link Keyring} instance.
  *
  * Consumers are expected to provide concrete mappings between high-level V2
  * operations and the underlying keyring methods (for example BIP-44 account

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

@@ -0,0 +1 @@
+{"version":3,"file":"keyring-wrapper.cjs","sourceRoot":"","sources":["../../src/v2/keyring-wrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAcA,6CAAoC;AAEpC,8EAGqC;AA2BrC;;;;;;;;;GASG;AACH,MAAsB,cAAc;IA0BlC,YAAY,OAA4C;QAnB/C,+CAAmC;QAI5C;;;WAGG;QACM,+BAAQ,IAAI,mBAAK,EAAE,EAAC;QAY3B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9B,uBAAA,IAAI,gCAAiB,OAAO,CAAC,YAAY,MAAA,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,iDAAsB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACtE,CAAC;IAED;;;;;;;OAOG;IACH,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,oCAAc,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;;OAYG;IACO,KAAK,CAAC,QAAQ,CACtB,QAA+B;QAE/B,OAAO,uBAAA,IAAI,4BAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;IAChC,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,WAAW,CAAC,KAAW;QAC3B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,wCAAwC;YACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAEtB,iCAAiC;YACjC,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEpC,iDAAiD;YACjD,yEAAyE;YACzE,8DAA8D;YAC9D,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAgBD;;;;;;;;;OASG;IACH,KAAK,CAAC,UAAU,CAAC,SAAoB;QACnC,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,4CAA4C;QAC5C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,mCAAmC;QACnC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CA+CF;AA3LD,wCA2LC","sourcesContent":["import type { KeyringAccount, KeyringRequest } from '@metamask/keyring-api';\nimport type {\n  CreateAccountOptions,\n  ExportAccountOptions,\n  ExportedAccount,\n  Keyring,\n  KeyringCapabilities,\n  KeyringType,\n} from '@metamask/keyring-api/v2';\nimport type {\n  Keyring as LegacyKeyring,\n  AccountId,\n} from '@metamask/keyring-utils';\nimport type { Json } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\n\nimport {\n  KeyringAccountRegistry,\n  type KeyringAccountRegistryOptions,\n} from '../keyring-account-registry';\n\n/**\n * Basic options for constructing a {@link KeyringWrapper}.\n */\nexport type KeyringWrapperOptions<InnerKeyring extends LegacyKeyring> = {\n  /**\n   * The underlying \"old\" keyring instance that this wrapper adapts.\n   */\n  inner: InnerKeyring;\n\n  /**\n   * The concrete keyring type exposed through the V2 interface.\n   */\n  type: KeyringType;\n\n  /**\n   * Capabilities of the underlying keyring.\n   */\n  capabilities: KeyringCapabilities;\n\n  /**\n   * Options forwarded to the {@link KeyringAccountRegistry} constructor.\n   */\n  registryOptions?: KeyringAccountRegistryOptions;\n};\n\n/**\n * Generic adapter that turns an existing {@link Keyring} implementation into a\n * {@link Keyring} instance.\n *\n * Consumers are expected to provide concrete mappings between high-level V2\n * operations and the underlying keyring methods (for example BIP-44 account\n * creation, private-key import, and request handling). This class focuses on\n * the common mechanics required by all adapters: state serialization,\n * account-ID/address mapping and basic account management.\n */\nexport abstract class KeyringWrapper<\n  InnerKeyring extends LegacyKeyring,\n  KeyringAccountType extends KeyringAccount = KeyringAccount,\n> implements Keyring\n{\n  readonly type: `${KeyringType}`;\n\n  readonly #capabilities: KeyringCapabilities;\n\n  protected readonly inner: InnerKeyring;\n\n  /**\n   * Mutex to ensure exclusive access to the inner keyring during\n   * operations that mutate its state.\n   */\n  readonly #lock = new Mutex();\n\n  /**\n   * Registry for KeyringAccount objects.\n   * Provides O(1) lookups by AccountId or address.\n   *\n   * Subclasses should use this registry when creating accounts and\n   * clear/update it when deleting accounts or deserializing state.\n   */\n  protected readonly registry: KeyringAccountRegistry<KeyringAccountType>;\n\n  constructor(options: KeyringWrapperOptions<InnerKeyring>) {\n    this.inner = options.inner;\n    this.type = `${options.type}`;\n    this.#capabilities = options.capabilities;\n    this.registry = new KeyringAccountRegistry(options.registryOptions);\n  }\n\n  /**\n   * Get the capabilities of this keyring.\n   *\n   * Subclasses can override this getter to return capabilities dynamically\n   * based on runtime state.\n   *\n   * @returns The keyring's capabilities.\n   */\n  get capabilities(): KeyringCapabilities {\n    return this.#capabilities;\n  }\n\n  /**\n   * Execute an operation with exclusive access to the inner keyring.\n   *\n   * This method ensures thread-safety for operations that read or mutate\n   * the inner keyring state. All operations that modify the keyring\n   * (createAccounts, deleteAccount, deserialize) should use this method\n   * to prevent race conditions.\n   *\n   * Within the callback, use `this.inner` to access the inner keyring.\n   *\n   * @param callback - A function that performs the operation.\n   * @returns The result of the callback.\n   */\n  protected async withLock<Result>(\n    callback: () => Promise<Result>,\n  ): Promise<Result> {\n    return this.#lock.runExclusive(callback);\n  }\n\n  /**\n   * Serialize the underlying keyring state to a JSON-serializable object.\n   *\n   * This simply delegates to the legacy keyring's {@link Keyring.serialize}\n   * implementation.\n   *\n   * @returns The serialized keyring state.\n   */\n  async serialize(): Promise<Json> {\n    return this.inner.serialize();\n  }\n\n  /**\n   * Hydrate the underlying keyring from a previously serialized state.\n   *\n   * This clears the registry, delegates to the legacy keyring's\n   * {@link Keyring.deserialize} implementation, and rebuilds the registry\n   * by calling {@link getAccounts}.\n   *\n   * @param state - The serialized keyring state.\n   */\n  async deserialize(state: Json): Promise<void> {\n    await this.withLock(async () => {\n      // Clear the registry when deserializing\n      this.registry.clear();\n\n      // Deserialize the legacy keyring\n      await this.inner.deserialize(state);\n\n      // Rebuild the registry by calling getAccounts().\n      // Subclass implementations of getAccounts() should populate the registry\n      // as a side effect (see the abstract method's documentation).\n      await this.getAccounts();\n    });\n  }\n\n  /**\n   * Return all accounts managed by this keyring.\n   *\n   * Concrete adapters are responsible for mapping the underlying keyring's\n   * notion of accounts (typically addresses returned by\n   * {@link Keyring.getAccounts}) into {@link KeyringAccount} objects.\n   * Implementations should use the configured {@link KeyringAccountRegistry}\n   * to establish the account ID/address mapping so that\n   * {@link getAccount} works as expected.\n   *\n   * @returns The list of managed accounts.\n   */\n  abstract getAccounts(): Promise<KeyringAccount[]>;\n\n  /**\n   * Look up a single account by its {@link AccountId}.\n   *\n   * This method first checks the registry for O(1) lookup.\n   * If not found, it falls back to calling {@link getAccounts} which\n   * should populate the registry as a side effect.\n   *\n   * @param accountId - The AccountId to look up.\n   * @returns The matching KeyringAccount.\n   */\n  async getAccount(accountId: AccountId): Promise<KeyringAccount> {\n    let cached = this.registry.get(accountId);\n    if (cached) {\n      return cached;\n    }\n\n    // Prime the registry by calling getAccounts\n    await this.getAccounts();\n\n    // Try registry again after priming\n    cached = this.registry.get(accountId);\n    if (!cached) {\n      throw new Error(`Account not found for id: ${accountId}`);\n    }\n\n    return cached;\n  }\n\n  /**\n   * Create one or more new accounts managed by this keyring.\n   *\n   * Implementations are responsible for interpreting the\n   * {@link CreateAccountOptions} (for example BIP-44 derivation or\n   * private-key import) and returning the resulting {@link KeyringAccount}\n   * objects. Implementors should also ensure that the registry is updated so\n   * that {@link getAccount} works for newly created accounts.\n   */\n  abstract createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<KeyringAccount[]>;\n\n  /**\n   * Remove the account associated with the given {@link AccountId} from this\n   * keyring.\n   *\n   * Implementations are expected to translate the ID to an underlying\n   * address (typically via the registry) and then invoke the appropriate\n   * removal mechanism on the legacy keyring.\n   */\n  abstract deleteAccount(accountId: AccountId): Promise<void>;\n\n  /**\n   * Export the secrets associated with the given account in a format\n   * described by {@link ExportAccountOptions}.\n   *\n   * This method is optional, and concrete adapters should only\n   * implement it if the underlying keyring supports exporting\n   * accounts.\n   */\n  exportAccount?(\n    accountId: AccountId,\n    options?: ExportAccountOptions,\n  ): Promise<ExportedAccount>;\n\n  /**\n   * Handle a high-level {@link KeyringRequest} on behalf of this keyring.\n   *\n   * Concrete adapters are responsible for routing the request's method and\n   * parameters to the appropriate legacy keyring APIs (for example signing\n   * transactions or decrypting messages) and returning a JSON-serializable\n   * result.\n   */\n  abstract submitRequest(request: KeyringRequest): Promise<Json>;\n}\n"]}

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

@@ -1,11 +1,12 @@
-import type { CreateAccountOptions, ExportAccountOptions, ExportedAccount, KeyringAccount, KeyringRequest, KeyringV2, KeyringCapabilities, KeyringType } from "@metamask/keyring-api";
-import type { Keyring, AccountId } from "@metamask/keyring-utils";
+import type { KeyringAccount, KeyringRequest } from "@metamask/keyring-api";
+import type { CreateAccountOptions, ExportAccountOptions, ExportedAccount, Keyring, KeyringCapabilities, KeyringType } from "@metamask/keyring-api/v2";
+import type { Keyring as LegacyKeyring, AccountId } from "@metamask/keyring-utils";
 import type { Json } from "@metamask/utils";
-import { KeyringAccountRegistry, type KeyringAccountRegistryOptions } from "./keyring-account-registry.cjs";
+import { KeyringAccountRegistry, type KeyringAccountRegistryOptions } from "../keyring-account-registry.cjs";
 /**
  * Basic options for constructing a {@link KeyringWrapper}.
  */
-export type KeyringWrapperOptions<InnerKeyring extends Keyring> = {
+export type KeyringWrapperOptions<InnerKeyring extends LegacyKeyring> = {
     /**
      * The underlying "old" keyring instance that this wrapper adapts.
      */
@@ -25,7 +26,7 @@ export type KeyringWrapperOptions<InnerKeyring extends Keyring> = {
 };
 /**
  * Generic adapter that turns an existing {@link Keyring} implementation into a
- * {@link KeyringV2} instance.
+ * {@link Keyring} instance.
  *
  * Consumers are expected to provide concrete mappings between high-level V2
  * operations and the underlying keyring methods (for example BIP-44 account
@@ -33,7 +34,7 @@ export type KeyringWrapperOptions<InnerKeyring extends Keyring> = {
  * the common mechanics required by all adapters: state serialization,
  * account-ID/address mapping and basic account management.
  */
-export declare abstract class KeyringWrapper<InnerKeyring extends Keyring, KeyringAccountType extends KeyringAccount = KeyringAccount> implements KeyringV2 {
+export declare abstract class KeyringWrapper<InnerKeyring extends LegacyKeyring, KeyringAccountType extends KeyringAccount = KeyringAccount> implements Keyring {
     #private;
     readonly type: `${KeyringType}`;
     protected readonly inner: InnerKeyring;

package/dist/v2/keyring-wrapper.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyring-wrapper.d.cts","sourceRoot":"","sources":["../../src/v2/keyring-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,8BAA8B;AAC5E,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EACf,OAAO,EACP,mBAAmB,EACnB,WAAW,EACZ,iCAAiC;AAClC,OAAO,KAAK,EACV,OAAO,IAAI,aAAa,EACxB,SAAS,EACV,gCAAgC;AACjC,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAG5C,OAAO,EACL,sBAAsB,EACtB,KAAK,6BAA6B,EACnC,wCAAoC;AAErC;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,YAAY,SAAS,aAAa,IAAI;IACtE;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IAEpB;;OAEG;IACH,IAAI,EAAE,WAAW,CAAC;IAElB;;OAEG;IACH,YAAY,EAAE,mBAAmB,CAAC;IAElC;;OAEG;IACH,eAAe,CAAC,EAAE,6BAA6B,CAAC;CACjD,CAAC;AAEF;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAClC,YAAY,SAAS,aAAa,EAClC,kBAAkB,SAAS,cAAc,GAAG,cAAc,CAC1D,YAAW,OAAO;;IAElB,QAAQ,CAAC,IAAI,EAAE,GAAG,WAAW,EAAE,CAAC;IAIhC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAQvC;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;gBAE5D,OAAO,EAAE,qBAAqB,CAAC,YAAY,CAAC;IAOxD;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,mBAAmB,CAEtC;IAED;;;;;;;;;;;;OAYG;cACa,QAAQ,CAAC,MAAM,EAC7B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC;IAIlB;;;;;;;OAOG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhC;;;;;;;;OAQG;IACG,WAAW,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7C;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAEjD;;;;;;;;;OASG;IACG,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAkB/D;;;;;;;;OAQG;IACH,QAAQ,CAAC,cAAc,CACrB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,cAAc,EAAE,CAAC;IAE5B;;;;;;;OAOG;IACH,QAAQ,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;;;;;;OAOG;IACH,aAAa,CAAC,CACZ,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;OAOG;IACH,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAC/D"}

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

@@ -1,11 +1,12 @@
-import type { CreateAccountOptions, ExportAccountOptions, ExportedAccount, KeyringAccount, KeyringRequest, KeyringV2, KeyringCapabilities, KeyringType } from "@metamask/keyring-api";
-import type { Keyring, AccountId } from "@metamask/keyring-utils";
+import type { KeyringAccount, KeyringRequest } from "@metamask/keyring-api";
+import type { CreateAccountOptions, ExportAccountOptions, ExportedAccount, Keyring, KeyringCapabilities, KeyringType } from "@metamask/keyring-api/v2";
+import type { Keyring as LegacyKeyring, AccountId } from "@metamask/keyring-utils";
 import type { Json } from "@metamask/utils";
-import { KeyringAccountRegistry, type KeyringAccountRegistryOptions } from "./keyring-account-registry.mjs";
+import { KeyringAccountRegistry, type KeyringAccountRegistryOptions } from "../keyring-account-registry.mjs";
 /**
  * Basic options for constructing a {@link KeyringWrapper}.
  */
-export type KeyringWrapperOptions<InnerKeyring extends Keyring> = {
+export type KeyringWrapperOptions<InnerKeyring extends LegacyKeyring> = {
     /**
      * The underlying "old" keyring instance that this wrapper adapts.
      */
@@ -25,7 +26,7 @@ export type KeyringWrapperOptions<InnerKeyring extends Keyring> = {
 };
 /**
  * Generic adapter that turns an existing {@link Keyring} implementation into a
- * {@link KeyringV2} instance.
+ * {@link Keyring} instance.
  *
  * Consumers are expected to provide concrete mappings between high-level V2
  * operations and the underlying keyring methods (for example BIP-44 account
@@ -33,7 +34,7 @@ export type KeyringWrapperOptions<InnerKeyring extends Keyring> = {
  * the common mechanics required by all adapters: state serialization,
  * account-ID/address mapping and basic account management.
  */
-export declare abstract class KeyringWrapper<InnerKeyring extends Keyring, KeyringAccountType extends KeyringAccount = KeyringAccount> implements KeyringV2 {
+export declare abstract class KeyringWrapper<InnerKeyring extends LegacyKeyring, KeyringAccountType extends KeyringAccount = KeyringAccount> implements Keyring {
     #private;
     readonly type: `${KeyringType}`;
     protected readonly inner: InnerKeyring;

package/dist/v2/keyring-wrapper.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyring-wrapper.d.mts","sourceRoot":"","sources":["../../src/v2/keyring-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,8BAA8B;AAC5E,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EACf,OAAO,EACP,mBAAmB,EACnB,WAAW,EACZ,iCAAiC;AAClC,OAAO,KAAK,EACV,OAAO,IAAI,aAAa,EACxB,SAAS,EACV,gCAAgC;AACjC,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAG5C,OAAO,EACL,sBAAsB,EACtB,KAAK,6BAA6B,EACnC,wCAAoC;AAErC;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,YAAY,SAAS,aAAa,IAAI;IACtE;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IAEpB;;OAEG;IACH,IAAI,EAAE,WAAW,CAAC;IAElB;;OAEG;IACH,YAAY,EAAE,mBAAmB,CAAC;IAElC;;OAEG;IACH,eAAe,CAAC,EAAE,6BAA6B,CAAC;CACjD,CAAC;AAEF;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAClC,YAAY,SAAS,aAAa,EAClC,kBAAkB,SAAS,cAAc,GAAG,cAAc,CAC1D,YAAW,OAAO;;IAElB,QAAQ,CAAC,IAAI,EAAE,GAAG,WAAW,EAAE,CAAC;IAIhC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAQvC;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;gBAE5D,OAAO,EAAE,qBAAqB,CAAC,YAAY,CAAC;IAOxD;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,mBAAmB,CAEtC;IAED;;;;;;;;;;;;OAYG;cACa,QAAQ,CAAC,MAAM,EAC7B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC;IAIlB;;;;;;;OAOG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhC;;;;;;;;OAQG;IACG,WAAW,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7C;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAEjD;;;;;;;;;OASG;IACG,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAkB/D;;;;;;;;OAQG;IACH,QAAQ,CAAC,cAAc,CACrB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,cAAc,EAAE,CAAC;IAE5B;;;;;;;OAOG;IACH,QAAQ,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;;;;;;OAOG;IACH,aAAa,CAAC,CACZ,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;OAOG;IACH,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAC/D"}

package/dist/{keyring-wrapper.mjs → v2/keyring-wrapper.mjs}

@@ -11,10 +11,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _KeyringWrapper_capabilities, _KeyringWrapper_lock;
 import { Mutex } from "async-mutex";
-import { KeyringAccountRegistry } from "./keyring-account-registry.mjs";
+import { KeyringAccountRegistry } from "../keyring-account-registry.mjs";
 /**
  * Generic adapter that turns an existing {@link Keyring} implementation into a
- * {@link KeyringV2} instance.
+ * {@link Keyring} instance.
  *
  * Consumers are expected to provide concrete mappings between high-level V2
  * operations and the underlying keyring methods (for example BIP-44 account

package/dist/v2/keyring-wrapper.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"keyring-wrapper.mjs","sourceRoot":"","sources":["../../src/v2/keyring-wrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAcA,OAAO,EAAE,KAAK,EAAE,oBAAoB;AAEpC,OAAO,EACL,sBAAsB,EAEvB,wCAAoC;AA2BrC;;;;;;;;;GASG;AACH,MAAM,OAAgB,cAAc;IA0BlC,YAAY,OAA4C;QAnB/C,+CAAmC;QAI5C;;;WAGG;QACM,+BAAQ,IAAI,KAAK,EAAE,EAAC;QAY3B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9B,uBAAA,IAAI,gCAAiB,OAAO,CAAC,YAAY,MAAA,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,sBAAsB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACtE,CAAC;IAED;;;;;;;OAOG;IACH,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,oCAAc,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;;OAYG;IACO,KAAK,CAAC,QAAQ,CACtB,QAA+B;QAE/B,OAAO,uBAAA,IAAI,4BAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;IAChC,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,WAAW,CAAC,KAAW;QAC3B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,wCAAwC;YACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAEtB,iCAAiC;YACjC,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEpC,iDAAiD;YACjD,yEAAyE;YACzE,8DAA8D;YAC9D,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAgBD;;;;;;;;;OASG;IACH,KAAK,CAAC,UAAU,CAAC,SAAoB;QACnC,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,4CAA4C;QAC5C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,mCAAmC;QACnC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CA+CF","sourcesContent":["import type { KeyringAccount, KeyringRequest } from '@metamask/keyring-api';\nimport type {\n  CreateAccountOptions,\n  ExportAccountOptions,\n  ExportedAccount,\n  Keyring,\n  KeyringCapabilities,\n  KeyringType,\n} from '@metamask/keyring-api/v2';\nimport type {\n  Keyring as LegacyKeyring,\n  AccountId,\n} from '@metamask/keyring-utils';\nimport type { Json } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\n\nimport {\n  KeyringAccountRegistry,\n  type KeyringAccountRegistryOptions,\n} from '../keyring-account-registry';\n\n/**\n * Basic options for constructing a {@link KeyringWrapper}.\n */\nexport type KeyringWrapperOptions<InnerKeyring extends LegacyKeyring> = {\n  /**\n   * The underlying \"old\" keyring instance that this wrapper adapts.\n   */\n  inner: InnerKeyring;\n\n  /**\n   * The concrete keyring type exposed through the V2 interface.\n   */\n  type: KeyringType;\n\n  /**\n   * Capabilities of the underlying keyring.\n   */\n  capabilities: KeyringCapabilities;\n\n  /**\n   * Options forwarded to the {@link KeyringAccountRegistry} constructor.\n   */\n  registryOptions?: KeyringAccountRegistryOptions;\n};\n\n/**\n * Generic adapter that turns an existing {@link Keyring} implementation into a\n * {@link Keyring} instance.\n *\n * Consumers are expected to provide concrete mappings between high-level V2\n * operations and the underlying keyring methods (for example BIP-44 account\n * creation, private-key import, and request handling). This class focuses on\n * the common mechanics required by all adapters: state serialization,\n * account-ID/address mapping and basic account management.\n */\nexport abstract class KeyringWrapper<\n  InnerKeyring extends LegacyKeyring,\n  KeyringAccountType extends KeyringAccount = KeyringAccount,\n> implements Keyring\n{\n  readonly type: `${KeyringType}`;\n\n  readonly #capabilities: KeyringCapabilities;\n\n  protected readonly inner: InnerKeyring;\n\n  /**\n   * Mutex to ensure exclusive access to the inner keyring during\n   * operations that mutate its state.\n   */\n  readonly #lock = new Mutex();\n\n  /**\n   * Registry for KeyringAccount objects.\n   * Provides O(1) lookups by AccountId or address.\n   *\n   * Subclasses should use this registry when creating accounts and\n   * clear/update it when deleting accounts or deserializing state.\n   */\n  protected readonly registry: KeyringAccountRegistry<KeyringAccountType>;\n\n  constructor(options: KeyringWrapperOptions<InnerKeyring>) {\n    this.inner = options.inner;\n    this.type = `${options.type}`;\n    this.#capabilities = options.capabilities;\n    this.registry = new KeyringAccountRegistry(options.registryOptions);\n  }\n\n  /**\n   * Get the capabilities of this keyring.\n   *\n   * Subclasses can override this getter to return capabilities dynamically\n   * based on runtime state.\n   *\n   * @returns The keyring's capabilities.\n   */\n  get capabilities(): KeyringCapabilities {\n    return this.#capabilities;\n  }\n\n  /**\n   * Execute an operation with exclusive access to the inner keyring.\n   *\n   * This method ensures thread-safety for operations that read or mutate\n   * the inner keyring state. All operations that modify the keyring\n   * (createAccounts, deleteAccount, deserialize) should use this method\n   * to prevent race conditions.\n   *\n   * Within the callback, use `this.inner` to access the inner keyring.\n   *\n   * @param callback - A function that performs the operation.\n   * @returns The result of the callback.\n   */\n  protected async withLock<Result>(\n    callback: () => Promise<Result>,\n  ): Promise<Result> {\n    return this.#lock.runExclusive(callback);\n  }\n\n  /**\n   * Serialize the underlying keyring state to a JSON-serializable object.\n   *\n   * This simply delegates to the legacy keyring's {@link Keyring.serialize}\n   * implementation.\n   *\n   * @returns The serialized keyring state.\n   */\n  async serialize(): Promise<Json> {\n    return this.inner.serialize();\n  }\n\n  /**\n   * Hydrate the underlying keyring from a previously serialized state.\n   *\n   * This clears the registry, delegates to the legacy keyring's\n   * {@link Keyring.deserialize} implementation, and rebuilds the registry\n   * by calling {@link getAccounts}.\n   *\n   * @param state - The serialized keyring state.\n   */\n  async deserialize(state: Json): Promise<void> {\n    await this.withLock(async () => {\n      // Clear the registry when deserializing\n      this.registry.clear();\n\n      // Deserialize the legacy keyring\n      await this.inner.deserialize(state);\n\n      // Rebuild the registry by calling getAccounts().\n      // Subclass implementations of getAccounts() should populate the registry\n      // as a side effect (see the abstract method's documentation).\n      await this.getAccounts();\n    });\n  }\n\n  /**\n   * Return all accounts managed by this keyring.\n   *\n   * Concrete adapters are responsible for mapping the underlying keyring's\n   * notion of accounts (typically addresses returned by\n   * {@link Keyring.getAccounts}) into {@link KeyringAccount} objects.\n   * Implementations should use the configured {@link KeyringAccountRegistry}\n   * to establish the account ID/address mapping so that\n   * {@link getAccount} works as expected.\n   *\n   * @returns The list of managed accounts.\n   */\n  abstract getAccounts(): Promise<KeyringAccount[]>;\n\n  /**\n   * Look up a single account by its {@link AccountId}.\n   *\n   * This method first checks the registry for O(1) lookup.\n   * If not found, it falls back to calling {@link getAccounts} which\n   * should populate the registry as a side effect.\n   *\n   * @param accountId - The AccountId to look up.\n   * @returns The matching KeyringAccount.\n   */\n  async getAccount(accountId: AccountId): Promise<KeyringAccount> {\n    let cached = this.registry.get(accountId);\n    if (cached) {\n      return cached;\n    }\n\n    // Prime the registry by calling getAccounts\n    await this.getAccounts();\n\n    // Try registry again after priming\n    cached = this.registry.get(accountId);\n    if (!cached) {\n      throw new Error(`Account not found for id: ${accountId}`);\n    }\n\n    return cached;\n  }\n\n  /**\n   * Create one or more new accounts managed by this keyring.\n   *\n   * Implementations are responsible for interpreting the\n   * {@link CreateAccountOptions} (for example BIP-44 derivation or\n   * private-key import) and returning the resulting {@link KeyringAccount}\n   * objects. Implementors should also ensure that the registry is updated so\n   * that {@link getAccount} works for newly created accounts.\n   */\n  abstract createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<KeyringAccount[]>;\n\n  /**\n   * Remove the account associated with the given {@link AccountId} from this\n   * keyring.\n   *\n   * Implementations are expected to translate the ID to an underlying\n   * address (typically via the registry) and then invoke the appropriate\n   * removal mechanism on the legacy keyring.\n   */\n  abstract deleteAccount(accountId: AccountId): Promise<void>;\n\n  /**\n   * Export the secrets associated with the given account in a format\n   * described by {@link ExportAccountOptions}.\n   *\n   * This method is optional, and concrete adapters should only\n   * implement it if the underlying keyring supports exporting\n   * accounts.\n   */\n  exportAccount?(\n    accountId: AccountId,\n    options?: ExportAccountOptions,\n  ): Promise<ExportedAccount>;\n\n  /**\n   * Handle a high-level {@link KeyringRequest} on behalf of this keyring.\n   *\n   * Concrete adapters are responsible for routing the request's method and\n   * parameters to the appropriate legacy keyring APIs (for example signing\n   * transactions or decrypting messages) and returning a JSON-serializable\n   * result.\n   */\n  abstract submitRequest(request: KeyringRequest): Promise<Json>;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/keyring-sdk",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "description": "MetaMask Keyring SDK",
   "keywords": [
     "metamask",
@@ -14,6 +14,8 @@
     "type": "git",
     "url": "https://github.com/MetaMask/accounts.git"
   },
+  "license": "MIT",
+  "sideEffects": false,
   "exports": {
     ".": {
       "import": {
@@ -24,7 +26,18 @@
         "types": "./dist/index.d.cts",
         "default": "./dist/index.cjs"
       }
-    }
+    },
+    "./v2": {
+      "import": {
+        "types": "./dist/v2/index.d.mts",
+        "default": "./dist/v2/index.mjs"
+      },
+      "require": {
+        "types": "./dist/v2/index.d.cts",
+        "default": "./dist/v2/index.cjs"
+      }
+    },
+    "./package.json": "./package.json"
   },
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.cts",
@@ -32,28 +45,31 @@
     "dist/"
   ],
   "scripts": {
-    "build": "ts-bridge --project tsconfig.build.json --no-references",
+    "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
+    "build:all": "ts-bridge --project tsconfig.build.json --verbose --clean",
     "build:clean": "yarn build --clean",
     "build:docs": "typedoc",
     "changelog:update": "../../scripts/update-changelog.sh @metamask/keyring-sdk",
     "changelog:validate": "../../scripts/validate-changelog.sh @metamask/keyring-sdk",
     "publish:preview": "yarn npm publish --tag preview",
+    "since-latest-release": "../../scripts/since-latest-release.sh",
     "test": "yarn test:source && yarn test:types",
-    "test:clean": "jest --clearCache",
-    "test:source": "jest && jest-it-up",
+    "test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
+    "test:source": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
     "test:types": "../../scripts/tsd-test.sh ./src",
-    "test:watch": "jest --watch"
+    "test:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
   },
   "dependencies": {
     "@ethereumjs/tx": "^5.4.0",
     "@metamask/eth-sig-util": "^8.2.0",
-    "@metamask/keyring-api": "^22.0.0",
+    "@metamask/keyring-api": "^23.0.0",
     "@metamask/keyring-utils": "^3.2.0",
     "@metamask/scure-bip39": "^2.1.1",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/utils": "^11.10.0",
+    "@metamask/utils": "^11.11.0",
     "async-mutex": "^0.5.0",
-    "ethereum-cryptography": "^2.1.2",
+    "ethereum-cryptography": "^2.2.1",
     "uuid": "^9.0.1"
   },
   "devDependencies": {

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

@@ -1 +0,0 @@
-{"version":3,"file":"eth-keyring-wrapper.cjs","sourceRoot":"","sources":["../../src/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 './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 KeyringV2.\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/eth-keyring-wrapper.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"eth-keyring-wrapper.d.cts","sourceRoot":"","sources":["../../src/eth/eth-keyring-wrapper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,8BAA8B;AAa5E,OAAO,KAAK,EAAE,UAAU,EAAE,gCAAgC;AAE1D,OAAO,EAAS,KAAK,GAAG,EAAE,KAAK,IAAI,EAAE,wBAAwB;AAG7D,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,+BAA2B;AAEhF;;;GAGG;AACH,oBAAY,gBAAgB;IAC1B,OAAO,gBAAgB;IACvB,sBAAsB,+BAA+B;IACrD,gBAAgB,yBAAyB;IACzC,wBAAwB,iCAAiC;CAC1D;AAED;;;;;;GAMG;AACH,MAAM,MAAM,wBAAwB,CAAC,YAAY,SAAS,UAAU,IAAI,IAAI,CAC1E,qBAAqB,CAAC,YAAY,CAAC,EACnC,iBAAiB,CAClB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,8BAAsB,iBAAiB,CACrC,YAAY,SAAS,UAAU,EAC/B,kBAAkB,SAAS,cAAc,GAAG,cAAc,CAC1D,SAAQ,cAAc,CAAC,YAAY,EAAE,kBAAkB,CAAC;gBAC5C,OAAO,EAAE,wBAAwB,CAAC,YAAY,CAAC;IAS3D;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG;IAI5C;;;;;;;;OAQG;IACG,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmI5D"}

package/dist/eth/eth-keyring-wrapper.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"eth-keyring-wrapper.d.mts","sourceRoot":"","sources":["../../src/eth/eth-keyring-wrapper.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,8BAA8B;AAa5E,OAAO,KAAK,EAAE,UAAU,EAAE,gCAAgC;AAE1D,OAAO,EAAS,KAAK,GAAG,EAAE,KAAK,IAAI,EAAE,wBAAwB;AAG7D,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,+BAA2B;AAEhF;;;GAGG;AACH,oBAAY,gBAAgB;IAC1B,OAAO,gBAAgB;IACvB,sBAAsB,+BAA+B;IACrD,gBAAgB,yBAAyB;IACzC,wBAAwB,iCAAiC;CAC1D;AAED;;;;;;GAMG;AACH,MAAM,MAAM,wBAAwB,CAAC,YAAY,SAAS,UAAU,IAAI,IAAI,CAC1E,qBAAqB,CAAC,YAAY,CAAC,EACnC,iBAAiB,CAClB,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,8BAAsB,iBAAiB,CACrC,YAAY,SAAS,UAAU,EAC/B,kBAAkB,SAAS,cAAc,GAAG,cAAc,CAC1D,SAAQ,cAAc,CAAC,YAAY,EAAE,kBAAkB,CAAC;gBAC5C,OAAO,EAAE,wBAAwB,CAAC,YAAY,CAAC;IAS3D;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG;IAI5C;;;;;;;;OAQG;IACG,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAmI5D"}

package/dist/eth/eth-keyring-wrapper.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"eth-keyring-wrapper.mjs","sourceRoot":"","sources":["../../src/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 './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 KeyringV2.\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/keyring-wrapper.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"keyring-wrapper.cjs","sourceRoot":"","sources":["../src/keyring-wrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAYA,6CAAoC;AAEpC,6EAGoC;AA2BpC;;;;;;;;;GASG;AACH,MAAsB,cAAc;IA0BlC,YAAY,OAA4C;QAnB/C,+CAAmC;QAI5C;;;WAGG;QACM,+BAAQ,IAAI,mBAAK,EAAE,EAAC;QAY3B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9B,uBAAA,IAAI,gCAAiB,OAAO,CAAC,YAAY,MAAA,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,iDAAsB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACtE,CAAC;IAED;;;;;;;OAOG;IACH,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,oCAAc,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;;OAYG;IACO,KAAK,CAAC,QAAQ,CACtB,QAA+B;QAE/B,OAAO,uBAAA,IAAI,4BAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;IAChC,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,WAAW,CAAC,KAAW;QAC3B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,wCAAwC;YACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAEtB,iCAAiC;YACjC,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEpC,iDAAiD;YACjD,yEAAyE;YACzE,8DAA8D;YAC9D,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAgBD;;;;;;;;;OASG;IACH,KAAK,CAAC,UAAU,CAAC,SAAoB;QACnC,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,4CAA4C;QAC5C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,mCAAmC;QACnC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CA+CF;AA3LD,wCA2LC","sourcesContent":["import type {\n  CreateAccountOptions,\n  ExportAccountOptions,\n  ExportedAccount,\n  KeyringAccount,\n  KeyringRequest,\n  KeyringV2,\n  KeyringCapabilities,\n  KeyringType,\n} from '@metamask/keyring-api';\nimport type { Keyring, AccountId } from '@metamask/keyring-utils';\nimport type { Json } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\n\nimport {\n  KeyringAccountRegistry,\n  type KeyringAccountRegistryOptions,\n} from './keyring-account-registry';\n\n/**\n * Basic options for constructing a {@link KeyringWrapper}.\n */\nexport type KeyringWrapperOptions<InnerKeyring extends Keyring> = {\n  /**\n   * The underlying \"old\" keyring instance that this wrapper adapts.\n   */\n  inner: InnerKeyring;\n\n  /**\n   * The concrete keyring type exposed through the V2 interface.\n   */\n  type: KeyringType;\n\n  /**\n   * Capabilities of the underlying keyring.\n   */\n  capabilities: KeyringCapabilities;\n\n  /**\n   * Options forwarded to the {@link KeyringAccountRegistry} constructor.\n   */\n  registryOptions?: KeyringAccountRegistryOptions;\n};\n\n/**\n * Generic adapter that turns an existing {@link Keyring} implementation into a\n * {@link KeyringV2} instance.\n *\n * Consumers are expected to provide concrete mappings between high-level V2\n * operations and the underlying keyring methods (for example BIP-44 account\n * creation, private-key import, and request handling). This class focuses on\n * the common mechanics required by all adapters: state serialization,\n * account-ID/address mapping and basic account management.\n */\nexport abstract class KeyringWrapper<\n  InnerKeyring extends Keyring,\n  KeyringAccountType extends KeyringAccount = KeyringAccount,\n> implements KeyringV2\n{\n  readonly type: `${KeyringType}`;\n\n  readonly #capabilities: KeyringCapabilities;\n\n  protected readonly inner: InnerKeyring;\n\n  /**\n   * Mutex to ensure exclusive access to the inner keyring during\n   * operations that mutate its state.\n   */\n  readonly #lock = new Mutex();\n\n  /**\n   * Registry for KeyringAccount objects.\n   * Provides O(1) lookups by AccountId or address.\n   *\n   * Subclasses should use this registry when creating accounts and\n   * clear/update it when deleting accounts or deserializing state.\n   */\n  protected readonly registry: KeyringAccountRegistry<KeyringAccountType>;\n\n  constructor(options: KeyringWrapperOptions<InnerKeyring>) {\n    this.inner = options.inner;\n    this.type = `${options.type}`;\n    this.#capabilities = options.capabilities;\n    this.registry = new KeyringAccountRegistry(options.registryOptions);\n  }\n\n  /**\n   * Get the capabilities of this keyring.\n   *\n   * Subclasses can override this getter to return capabilities dynamically\n   * based on runtime state.\n   *\n   * @returns The keyring's capabilities.\n   */\n  get capabilities(): KeyringCapabilities {\n    return this.#capabilities;\n  }\n\n  /**\n   * Execute an operation with exclusive access to the inner keyring.\n   *\n   * This method ensures thread-safety for operations that read or mutate\n   * the inner keyring state. All operations that modify the keyring\n   * (createAccounts, deleteAccount, deserialize) should use this method\n   * to prevent race conditions.\n   *\n   * Within the callback, use `this.inner` to access the inner keyring.\n   *\n   * @param callback - A function that performs the operation.\n   * @returns The result of the callback.\n   */\n  protected async withLock<Result>(\n    callback: () => Promise<Result>,\n  ): Promise<Result> {\n    return this.#lock.runExclusive(callback);\n  }\n\n  /**\n   * Serialize the underlying keyring state to a JSON-serializable object.\n   *\n   * This simply delegates to the legacy keyring's {@link Keyring.serialize}\n   * implementation.\n   *\n   * @returns The serialized keyring state.\n   */\n  async serialize(): Promise<Json> {\n    return this.inner.serialize();\n  }\n\n  /**\n   * Hydrate the underlying keyring from a previously serialized state.\n   *\n   * This clears the registry, delegates to the legacy keyring's\n   * {@link Keyring.deserialize} implementation, and rebuilds the registry\n   * by calling {@link getAccounts}.\n   *\n   * @param state - The serialized keyring state.\n   */\n  async deserialize(state: Json): Promise<void> {\n    await this.withLock(async () => {\n      // Clear the registry when deserializing\n      this.registry.clear();\n\n      // Deserialize the legacy keyring\n      await this.inner.deserialize(state);\n\n      // Rebuild the registry by calling getAccounts().\n      // Subclass implementations of getAccounts() should populate the registry\n      // as a side effect (see the abstract method's documentation).\n      await this.getAccounts();\n    });\n  }\n\n  /**\n   * Return all accounts managed by this keyring.\n   *\n   * Concrete adapters are responsible for mapping the underlying keyring's\n   * notion of accounts (typically addresses returned by\n   * {@link Keyring.getAccounts}) into {@link KeyringAccount} objects.\n   * Implementations should use the configured {@link KeyringAccountRegistry}\n   * to establish the account ID/address mapping so that\n   * {@link getAccount} works as expected.\n   *\n   * @returns The list of managed accounts.\n   */\n  abstract getAccounts(): Promise<KeyringAccount[]>;\n\n  /**\n   * Look up a single account by its {@link AccountId}.\n   *\n   * This method first checks the registry for O(1) lookup.\n   * If not found, it falls back to calling {@link getAccounts} which\n   * should populate the registry as a side effect.\n   *\n   * @param accountId - The AccountId to look up.\n   * @returns The matching KeyringAccount.\n   */\n  async getAccount(accountId: AccountId): Promise<KeyringAccount> {\n    let cached = this.registry.get(accountId);\n    if (cached) {\n      return cached;\n    }\n\n    // Prime the registry by calling getAccounts\n    await this.getAccounts();\n\n    // Try registry again after priming\n    cached = this.registry.get(accountId);\n    if (!cached) {\n      throw new Error(`Account not found for id: ${accountId}`);\n    }\n\n    return cached;\n  }\n\n  /**\n   * Create one or more new accounts managed by this keyring.\n   *\n   * Implementations are responsible for interpreting the\n   * {@link CreateAccountOptions} (for example BIP-44 derivation or\n   * private-key import) and returning the resulting {@link KeyringAccount}\n   * objects. Implementors should also ensure that the registry is updated so\n   * that {@link getAccount} works for newly created accounts.\n   */\n  abstract createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<KeyringAccount[]>;\n\n  /**\n   * Remove the account associated with the given {@link AccountId} from this\n   * keyring.\n   *\n   * Implementations are expected to translate the ID to an underlying\n   * address (typically via the registry) and then invoke the appropriate\n   * removal mechanism on the legacy keyring.\n   */\n  abstract deleteAccount(accountId: AccountId): Promise<void>;\n\n  /**\n   * Export the secrets associated with the given account in a format\n   * described by {@link ExportAccountOptions}.\n   *\n   * This method is optional, and concrete adapters should only\n   * implement it if the underlying keyring supports exporting\n   * accounts.\n   */\n  exportAccount?(\n    accountId: AccountId,\n    options?: ExportAccountOptions,\n  ): Promise<ExportedAccount>;\n\n  /**\n   * Handle a high-level {@link KeyringRequest} on behalf of this keyring.\n   *\n   * Concrete adapters are responsible for routing the request's method and\n   * parameters to the appropriate legacy keyring APIs (for example signing\n   * transactions or decrypting messages) and returning a JSON-serializable\n   * result.\n   */\n  abstract submitRequest(request: KeyringRequest): Promise<Json>;\n}\n"]}

package/dist/keyring-wrapper.d.cts.map

@@ -1 +0,0 @@
-{"version":3,"file":"keyring-wrapper.d.cts","sourceRoot":"","sources":["../src/keyring-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EACf,cAAc,EACd,cAAc,EACd,SAAS,EACT,mBAAmB,EACnB,WAAW,EACZ,8BAA8B;AAC/B,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,gCAAgC;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAG5C,OAAO,EACL,sBAAsB,EACtB,KAAK,6BAA6B,EACnC,uCAAmC;AAEpC;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,YAAY,SAAS,OAAO,IAAI;IAChE;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IAEpB;;OAEG;IACH,IAAI,EAAE,WAAW,CAAC;IAElB;;OAEG;IACH,YAAY,EAAE,mBAAmB,CAAC;IAElC;;OAEG;IACH,eAAe,CAAC,EAAE,6BAA6B,CAAC;CACjD,CAAC;AAEF;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAClC,YAAY,SAAS,OAAO,EAC5B,kBAAkB,SAAS,cAAc,GAAG,cAAc,CAC1D,YAAW,SAAS;;IAEpB,QAAQ,CAAC,IAAI,EAAE,GAAG,WAAW,EAAE,CAAC;IAIhC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAQvC;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;gBAE5D,OAAO,EAAE,qBAAqB,CAAC,YAAY,CAAC;IAOxD;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,mBAAmB,CAEtC;IAED;;;;;;;;;;;;OAYG;cACa,QAAQ,CAAC,MAAM,EAC7B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC;IAIlB;;;;;;;OAOG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhC;;;;;;;;OAQG;IACG,WAAW,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7C;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAEjD;;;;;;;;;OASG;IACG,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAkB/D;;;;;;;;OAQG;IACH,QAAQ,CAAC,cAAc,CACrB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,cAAc,EAAE,CAAC;IAE5B;;;;;;;OAOG;IACH,QAAQ,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;;;;;;OAOG;IACH,aAAa,CAAC,CACZ,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;OAOG;IACH,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAC/D"}

package/dist/keyring-wrapper.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"keyring-wrapper.d.mts","sourceRoot":"","sources":["../src/keyring-wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EACf,cAAc,EACd,cAAc,EACd,SAAS,EACT,mBAAmB,EACnB,WAAW,EACZ,8BAA8B;AAC/B,OAAO,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,gCAAgC;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,wBAAwB;AAG5C,OAAO,EACL,sBAAsB,EACtB,KAAK,6BAA6B,EACnC,uCAAmC;AAEpC;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,YAAY,SAAS,OAAO,IAAI;IAChE;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IAEpB;;OAEG;IACH,IAAI,EAAE,WAAW,CAAC;IAElB;;OAEG;IACH,YAAY,EAAE,mBAAmB,CAAC;IAElC;;OAEG;IACH,eAAe,CAAC,EAAE,6BAA6B,CAAC;CACjD,CAAC;AAEF;;;;;;;;;GASG;AACH,8BAAsB,cAAc,CAClC,YAAY,SAAS,OAAO,EAC5B,kBAAkB,SAAS,cAAc,GAAG,cAAc,CAC1D,YAAW,SAAS;;IAEpB,QAAQ,CAAC,IAAI,EAAE,GAAG,WAAW,EAAE,CAAC;IAIhC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAQvC;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAC,kBAAkB,CAAC,CAAC;gBAE5D,OAAO,EAAE,qBAAqB,CAAC,YAAY,CAAC;IAOxD;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,mBAAmB,CAEtC;IAED;;;;;;;;;;;;OAYG;cACa,QAAQ,CAAC,MAAM,EAC7B,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC;IAIlB;;;;;;;OAOG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAIhC;;;;;;;;OAQG;IACG,WAAW,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7C;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;IAEjD;;;;;;;;;OASG;IACG,UAAU,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAkB/D;;;;;;;;OAQG;IACH,QAAQ,CAAC,cAAc,CACrB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,cAAc,EAAE,CAAC;IAE5B;;;;;;;OAOG;IACH,QAAQ,CAAC,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAE3D;;;;;;;OAOG;IACH,aAAa,CAAC,CACZ,SAAS,EAAE,SAAS,EACpB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;OAOG;IACH,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAC/D"}

package/dist/keyring-wrapper.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"keyring-wrapper.mjs","sourceRoot":"","sources":["../src/keyring-wrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;AAYA,OAAO,EAAE,KAAK,EAAE,oBAAoB;AAEpC,OAAO,EACL,sBAAsB,EAEvB,uCAAmC;AA2BpC;;;;;;;;;GASG;AACH,MAAM,OAAgB,cAAc;IA0BlC,YAAY,OAA4C;QAnB/C,+CAAmC;QAI5C;;;WAGG;QACM,+BAAQ,IAAI,KAAK,EAAE,EAAC;QAY3B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9B,uBAAA,IAAI,gCAAiB,OAAO,CAAC,YAAY,MAAA,CAAC;QAC1C,IAAI,CAAC,QAAQ,GAAG,IAAI,sBAAsB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACtE,CAAC;IAED;;;;;;;OAOG;IACH,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,oCAAc,CAAC;IAC5B,CAAC;IAED;;;;;;;;;;;;OAYG;IACO,KAAK,CAAC,QAAQ,CACtB,QAA+B;QAE/B,OAAO,uBAAA,IAAI,4BAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,CAAC,SAAS;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;IAChC,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,WAAW,CAAC,KAAW;QAC3B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,wCAAwC;YACxC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAEtB,iCAAiC;YACjC,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEpC,iDAAiD;YACjD,yEAAyE;YACzE,8DAA8D;YAC9D,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;IACL,CAAC;IAgBD;;;;;;;;;OASG;IACH,KAAK,CAAC,UAAU,CAAC,SAAoB;QACnC,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,4CAA4C;QAC5C,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,mCAAmC;QACnC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,6BAA6B,SAAS,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CA+CF","sourcesContent":["import type {\n  CreateAccountOptions,\n  ExportAccountOptions,\n  ExportedAccount,\n  KeyringAccount,\n  KeyringRequest,\n  KeyringV2,\n  KeyringCapabilities,\n  KeyringType,\n} from '@metamask/keyring-api';\nimport type { Keyring, AccountId } from '@metamask/keyring-utils';\nimport type { Json } from '@metamask/utils';\nimport { Mutex } from 'async-mutex';\n\nimport {\n  KeyringAccountRegistry,\n  type KeyringAccountRegistryOptions,\n} from './keyring-account-registry';\n\n/**\n * Basic options for constructing a {@link KeyringWrapper}.\n */\nexport type KeyringWrapperOptions<InnerKeyring extends Keyring> = {\n  /**\n   * The underlying \"old\" keyring instance that this wrapper adapts.\n   */\n  inner: InnerKeyring;\n\n  /**\n   * The concrete keyring type exposed through the V2 interface.\n   */\n  type: KeyringType;\n\n  /**\n   * Capabilities of the underlying keyring.\n   */\n  capabilities: KeyringCapabilities;\n\n  /**\n   * Options forwarded to the {@link KeyringAccountRegistry} constructor.\n   */\n  registryOptions?: KeyringAccountRegistryOptions;\n};\n\n/**\n * Generic adapter that turns an existing {@link Keyring} implementation into a\n * {@link KeyringV2} instance.\n *\n * Consumers are expected to provide concrete mappings between high-level V2\n * operations and the underlying keyring methods (for example BIP-44 account\n * creation, private-key import, and request handling). This class focuses on\n * the common mechanics required by all adapters: state serialization,\n * account-ID/address mapping and basic account management.\n */\nexport abstract class KeyringWrapper<\n  InnerKeyring extends Keyring,\n  KeyringAccountType extends KeyringAccount = KeyringAccount,\n> implements KeyringV2\n{\n  readonly type: `${KeyringType}`;\n\n  readonly #capabilities: KeyringCapabilities;\n\n  protected readonly inner: InnerKeyring;\n\n  /**\n   * Mutex to ensure exclusive access to the inner keyring during\n   * operations that mutate its state.\n   */\n  readonly #lock = new Mutex();\n\n  /**\n   * Registry for KeyringAccount objects.\n   * Provides O(1) lookups by AccountId or address.\n   *\n   * Subclasses should use this registry when creating accounts and\n   * clear/update it when deleting accounts or deserializing state.\n   */\n  protected readonly registry: KeyringAccountRegistry<KeyringAccountType>;\n\n  constructor(options: KeyringWrapperOptions<InnerKeyring>) {\n    this.inner = options.inner;\n    this.type = `${options.type}`;\n    this.#capabilities = options.capabilities;\n    this.registry = new KeyringAccountRegistry(options.registryOptions);\n  }\n\n  /**\n   * Get the capabilities of this keyring.\n   *\n   * Subclasses can override this getter to return capabilities dynamically\n   * based on runtime state.\n   *\n   * @returns The keyring's capabilities.\n   */\n  get capabilities(): KeyringCapabilities {\n    return this.#capabilities;\n  }\n\n  /**\n   * Execute an operation with exclusive access to the inner keyring.\n   *\n   * This method ensures thread-safety for operations that read or mutate\n   * the inner keyring state. All operations that modify the keyring\n   * (createAccounts, deleteAccount, deserialize) should use this method\n   * to prevent race conditions.\n   *\n   * Within the callback, use `this.inner` to access the inner keyring.\n   *\n   * @param callback - A function that performs the operation.\n   * @returns The result of the callback.\n   */\n  protected async withLock<Result>(\n    callback: () => Promise<Result>,\n  ): Promise<Result> {\n    return this.#lock.runExclusive(callback);\n  }\n\n  /**\n   * Serialize the underlying keyring state to a JSON-serializable object.\n   *\n   * This simply delegates to the legacy keyring's {@link Keyring.serialize}\n   * implementation.\n   *\n   * @returns The serialized keyring state.\n   */\n  async serialize(): Promise<Json> {\n    return this.inner.serialize();\n  }\n\n  /**\n   * Hydrate the underlying keyring from a previously serialized state.\n   *\n   * This clears the registry, delegates to the legacy keyring's\n   * {@link Keyring.deserialize} implementation, and rebuilds the registry\n   * by calling {@link getAccounts}.\n   *\n   * @param state - The serialized keyring state.\n   */\n  async deserialize(state: Json): Promise<void> {\n    await this.withLock(async () => {\n      // Clear the registry when deserializing\n      this.registry.clear();\n\n      // Deserialize the legacy keyring\n      await this.inner.deserialize(state);\n\n      // Rebuild the registry by calling getAccounts().\n      // Subclass implementations of getAccounts() should populate the registry\n      // as a side effect (see the abstract method's documentation).\n      await this.getAccounts();\n    });\n  }\n\n  /**\n   * Return all accounts managed by this keyring.\n   *\n   * Concrete adapters are responsible for mapping the underlying keyring's\n   * notion of accounts (typically addresses returned by\n   * {@link Keyring.getAccounts}) into {@link KeyringAccount} objects.\n   * Implementations should use the configured {@link KeyringAccountRegistry}\n   * to establish the account ID/address mapping so that\n   * {@link getAccount} works as expected.\n   *\n   * @returns The list of managed accounts.\n   */\n  abstract getAccounts(): Promise<KeyringAccount[]>;\n\n  /**\n   * Look up a single account by its {@link AccountId}.\n   *\n   * This method first checks the registry for O(1) lookup.\n   * If not found, it falls back to calling {@link getAccounts} which\n   * should populate the registry as a side effect.\n   *\n   * @param accountId - The AccountId to look up.\n   * @returns The matching KeyringAccount.\n   */\n  async getAccount(accountId: AccountId): Promise<KeyringAccount> {\n    let cached = this.registry.get(accountId);\n    if (cached) {\n      return cached;\n    }\n\n    // Prime the registry by calling getAccounts\n    await this.getAccounts();\n\n    // Try registry again after priming\n    cached = this.registry.get(accountId);\n    if (!cached) {\n      throw new Error(`Account not found for id: ${accountId}`);\n    }\n\n    return cached;\n  }\n\n  /**\n   * Create one or more new accounts managed by this keyring.\n   *\n   * Implementations are responsible for interpreting the\n   * {@link CreateAccountOptions} (for example BIP-44 derivation or\n   * private-key import) and returning the resulting {@link KeyringAccount}\n   * objects. Implementors should also ensure that the registry is updated so\n   * that {@link getAccount} works for newly created accounts.\n   */\n  abstract createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<KeyringAccount[]>;\n\n  /**\n   * Remove the account associated with the given {@link AccountId} from this\n   * keyring.\n   *\n   * Implementations are expected to translate the ID to an underlying\n   * address (typically via the registry) and then invoke the appropriate\n   * removal mechanism on the legacy keyring.\n   */\n  abstract deleteAccount(accountId: AccountId): Promise<void>;\n\n  /**\n   * Export the secrets associated with the given account in a format\n   * described by {@link ExportAccountOptions}.\n   *\n   * This method is optional, and concrete adapters should only\n   * implement it if the underlying keyring supports exporting\n   * accounts.\n   */\n  exportAccount?(\n    accountId: AccountId,\n    options?: ExportAccountOptions,\n  ): Promise<ExportedAccount>;\n\n  /**\n   * Handle a high-level {@link KeyringRequest} on behalf of this keyring.\n   *\n   * Concrete adapters are responsible for routing the request's method and\n   * parameters to the appropriate legacy keyring APIs (for example signing\n   * transactions or decrypting messages) and returning a JSON-serializable\n   * result.\n   */\n  abstract submitRequest(request: KeyringRequest): Promise<Json>;\n}\n"]}