@metamask-previews/eip-7702-internal-rpc-middleware 0.0.0-preview-8504447

package/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+
+- Initial release of @metamask/eip-7702-internal-rpc-middleware ([#6789](https://github.com/MetaMask/core/pull/6789))
+- `wallet_upgradeAccount` JSON-RPC method for upgrading EOA accounts to smart accounts using EIP-7702 ([#6789](https://github.com/MetaMask/core/pull/6789))
+- `wallet_getAccountUpgradeStatus` JSON-RPC method for checking account upgrade status ([#6789](https://github.com/MetaMask/core/pull/6789))
+- Hook-based architecture with `upgradeAccount` and `getAccountUpgradeStatus` hooks ([#6789](https://github.com/MetaMask/core/pull/6789))
+- Comprehensive TypeScript type definitions ([#6789](https://github.com/MetaMask/core/pull/6789))
+- Full test coverage with Jest ([#6789](https://github.com/MetaMask/core/pull/6789))
+- Documentation and examples ([#6789](https://github.com/MetaMask/core/pull/6789))
+
+[Unreleased]: https://github.com/MetaMask/core/

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 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/README.md

@@ -0,0 +1,98 @@
+# `@metamask/eip-7702-internal-rpc-middleware`
+
+Implements internal JSON-RPC methods that support EIP-7702 account upgrade functionality. These methods are internal to MetaMask and not defined in [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702), but provide the necessary infrastructure for EIP-7702 account upgrades.
+
+## Installation
+
+`yarn add @metamask/eip-7702-internal-rpc-middleware`
+
+or
+
+`npm install @metamask/eip-7702-internal-rpc-middleware`
+
+## JSON-RPC Methods
+
+### wallet_upgradeAccount
+
+Upgrades an EOA account to a smart account using EIP-7702.
+
+**Parameters:**
+
+- `account` (string): Address of the EOA to upgrade
+- `chainId` (string, optional): Chain ID for the upgrade (defaults to current)
+
+**Returns:**
+
+- `transactionHash` (string): Hash of the EIP-7702 authorization transaction
+- `upgradedAccount` (string): Address of the upgraded account (same as input)
+- `delegatedTo` (string): Address of the contract delegated to
+
+**Example:**
+
+```json
+{
+  "method": "wallet_upgradeAccount",
+  "params": [
+    {
+      "account": "0x1234567890123456789012345678901234567890",
+      "chainId": "0x1"
+    }
+  ]
+}
+```
+
+### wallet_getAccountUpgradeStatus
+
+Checks if an account has been upgraded using EIP-7702.
+
+**Parameters:**
+
+- `account` (string): Address of the account to check
+- `chainId` (string, optional): Chain ID for the check (defaults to current)
+
+**Returns:**
+
+- `account` (string): Address of the checked account
+- `isUpgraded` (boolean): Whether the account is upgraded
+- `upgradedAddress` (string | null): Address to which the account is upgraded (null if not upgraded)
+- `chainId` (string): Chain ID where the check was performed
+
+**Example:**
+
+```json
+{
+  "method": "wallet_getAccountUpgradeStatus",
+  "params": [
+    {
+      "account": "0x1234567890123456789012345678901234567890",
+      "chainId": "0x1"
+    }
+  ]
+}
+```
+
+**Example Response (Upgraded Account):**
+
+```json
+{
+  "account": "0x1234567890123456789012345678901234567890",
+  "isUpgraded": true,
+  "upgradedAddress": "0xabcdef1234567890abcdef1234567890abcdef12",
+  "chainId": "0x1"
+}
+```
+
+**Example Response (Non-Upgraded Account):**
+
+```json
+{
+  "account": "0x1234567890123456789012345678901234567890",
+  "isUpgraded": false,
+  "upgradedAddress": null,
+  "chainId": "0x1"
+}
+```
+
+## Contributing
+
+This package is part of a monorepo. Instructions for contributing can be found in the [monorepo README](https://github.com/MetaMask/core#readme).

package/dist/constants.cjs

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DELEGATION_INDICATOR_PREFIX = exports.METHOD_NAMES = void 0;
+// Method names
+exports.METHOD_NAMES = {
+    UPGRADE_ACCOUNT: 'wallet_upgradeAccount',
+    GET_ACCOUNT_UPGRADE_STATUS: 'wallet_getAccountUpgradeStatus',
+};
+exports.DELEGATION_INDICATOR_PREFIX = '0xef0100';
+//# sourceMappingURL=constants.cjs.map

package/dist/constants.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.cjs","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAA,eAAe;AACF,QAAA,YAAY,GAAG;IAC1B,eAAe,EAAE,uBAAuB;IACxC,0BAA0B,EAAE,gCAAgC;CACpD,CAAC;AAEE,QAAA,2BAA2B,GAAG,UAAU,CAAC","sourcesContent":["// Method names\nexport const METHOD_NAMES = {\n  UPGRADE_ACCOUNT: 'wallet_upgradeAccount',\n  GET_ACCOUNT_UPGRADE_STATUS: 'wallet_getAccountUpgradeStatus',\n} as const;\n\nexport const DELEGATION_INDICATOR_PREFIX = '0xef0100';\n"]}

package/dist/constants.d.cts

@@ -0,0 +1,6 @@
+export declare const METHOD_NAMES: {
+    readonly UPGRADE_ACCOUNT: "wallet_upgradeAccount";
+    readonly GET_ACCOUNT_UPGRADE_STATUS: "wallet_getAccountUpgradeStatus";
+};
+export declare const DELEGATION_INDICATOR_PREFIX = "0xef0100";
+//# sourceMappingURL=constants.d.cts.map

package/dist/constants.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.cts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,YAAY;;;CAGf,CAAC;AAEX,eAAO,MAAM,2BAA2B,aAAa,CAAC"}

package/dist/constants.d.mts

@@ -0,0 +1,6 @@
+export declare const METHOD_NAMES: {
+    readonly UPGRADE_ACCOUNT: "wallet_upgradeAccount";
+    readonly GET_ACCOUNT_UPGRADE_STATUS: "wallet_getAccountUpgradeStatus";
+};
+export declare const DELEGATION_INDICATOR_PREFIX = "0xef0100";
+//# sourceMappingURL=constants.d.mts.map

package/dist/constants.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.mts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,YAAY;;;CAGf,CAAC;AAEX,eAAO,MAAM,2BAA2B,aAAa,CAAC"}

package/dist/constants.mjs

@@ -0,0 +1,7 @@
+// Method names
+export const METHOD_NAMES = {
+    UPGRADE_ACCOUNT: 'wallet_upgradeAccount',
+    GET_ACCOUNT_UPGRADE_STATUS: 'wallet_getAccountUpgradeStatus',
+};
+export const DELEGATION_INDICATOR_PREFIX = '0xef0100';
+//# sourceMappingURL=constants.mjs.map

package/dist/constants.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.mjs","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAe;AACf,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,eAAe,EAAE,uBAAuB;IACxC,0BAA0B,EAAE,gCAAgC;CACpD,CAAC;AAEX,MAAM,CAAC,MAAM,2BAA2B,GAAG,UAAU,CAAC","sourcesContent":["// Method names\nexport const METHOD_NAMES = {\n  UPGRADE_ACCOUNT: 'wallet_upgradeAccount',\n  GET_ACCOUNT_UPGRADE_STATUS: 'wallet_getAccountUpgradeStatus',\n} as const;\n\nexport const DELEGATION_INDICATOR_PREFIX = '0xef0100';\n"]}

package/dist/index.cjs

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.METHOD_NAMES = exports.validateAndNormalizeAddress = exports.validateParams = exports.walletGetAccountUpgradeStatus = exports.walletUpgradeAccount = void 0;
+// Method handlers
+var wallet_upgradeAccount_1 = require("./wallet_upgradeAccount.cjs");
+Object.defineProperty(exports, "walletUpgradeAccount", { enumerable: true, get: function () { return wallet_upgradeAccount_1.walletUpgradeAccount; } });
+var wallet_getAccountUpgradeStatus_1 = require("./wallet_getAccountUpgradeStatus.cjs");
+Object.defineProperty(exports, "walletGetAccountUpgradeStatus", { enumerable: true, get: function () { return wallet_getAccountUpgradeStatus_1.walletGetAccountUpgradeStatus; } });
+// Utilities
+var utils_1 = require("./utils.cjs");
+Object.defineProperty(exports, "validateParams", { enumerable: true, get: function () { return utils_1.validateParams; } });
+Object.defineProperty(exports, "validateAndNormalizeAddress", { enumerable: true, get: function () { return utils_1.validateAndNormalizeAddress; } });
+// Constants
+var constants_1 = require("./constants.cjs");
+Object.defineProperty(exports, "METHOD_NAMES", { enumerable: true, get: function () { return constants_1.METHOD_NAMES; } });
+//# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,kBAAkB;AAClB,qEAA+D;AAAtD,6HAAA,oBAAoB,OAAA;AAC7B,uFAAiF;AAAxE,+IAAA,6BAA6B,OAAA;AAEtC,YAAY;AACZ,qCAAsE;AAA7D,uGAAA,cAAc,OAAA;AAAE,oHAAA,2BAA2B,OAAA;AAEpD,YAAY;AACZ,6CAA2C;AAAlC,yGAAA,YAAY,OAAA","sourcesContent":["// Method handlers\nexport { walletUpgradeAccount } from './wallet_upgradeAccount';\nexport { walletGetAccountUpgradeStatus } from './wallet_getAccountUpgradeStatus';\n\n// Utilities\nexport { validateParams, validateAndNormalizeAddress } from './utils';\n\n// Constants\nexport { METHOD_NAMES } from './constants';\n\n// Types\nexport type {\n  UpgradeAccountParams,\n  UpgradeAccountResult,\n  GetAccountUpgradeStatusParams,\n  GetAccountUpgradeStatusResult,\n} from './types';\n"]}

package/dist/index.d.cts

@@ -0,0 +1,6 @@
+export { walletUpgradeAccount } from "./wallet_upgradeAccount.cjs";
+export { walletGetAccountUpgradeStatus } from "./wallet_getAccountUpgradeStatus.cjs";
+export { validateParams, validateAndNormalizeAddress } from "./utils.cjs";
+export { METHOD_NAMES } from "./constants.cjs";
+export type { UpgradeAccountParams, UpgradeAccountResult, GetAccountUpgradeStatusParams, GetAccountUpgradeStatusResult, } from "./types.cjs";
+//# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,oCAAgC;AAC/D,OAAO,EAAE,6BAA6B,EAAE,6CAAyC;AAGjF,OAAO,EAAE,cAAc,EAAE,2BAA2B,EAAE,oBAAgB;AAGtE,OAAO,EAAE,YAAY,EAAE,wBAAoB;AAG3C,YAAY,EACV,oBAAoB,EACpB,oBAAoB,EACpB,6BAA6B,EAC7B,6BAA6B,GAC9B,oBAAgB"}

package/dist/index.d.mts

@@ -0,0 +1,6 @@
+export { walletUpgradeAccount } from "./wallet_upgradeAccount.mjs";
+export { walletGetAccountUpgradeStatus } from "./wallet_getAccountUpgradeStatus.mjs";
+export { validateParams, validateAndNormalizeAddress } from "./utils.mjs";
+export { METHOD_NAMES } from "./constants.mjs";
+export type { UpgradeAccountParams, UpgradeAccountResult, GetAccountUpgradeStatusParams, GetAccountUpgradeStatusResult, } from "./types.mjs";
+//# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,oCAAgC;AAC/D,OAAO,EAAE,6BAA6B,EAAE,6CAAyC;AAGjF,OAAO,EAAE,cAAc,EAAE,2BAA2B,EAAE,oBAAgB;AAGtE,OAAO,EAAE,YAAY,EAAE,wBAAoB;AAG3C,YAAY,EACV,oBAAoB,EACpB,oBAAoB,EACpB,6BAA6B,EAC7B,6BAA6B,GAC9B,oBAAgB"}

package/dist/index.mjs

@@ -0,0 +1,8 @@
+// Method handlers
+export { walletUpgradeAccount } from "./wallet_upgradeAccount.mjs";
+export { walletGetAccountUpgradeStatus } from "./wallet_getAccountUpgradeStatus.mjs";
+// Utilities
+export { validateParams, validateAndNormalizeAddress } from "./utils.mjs";
+// Constants
+export { METHOD_NAMES } from "./constants.mjs";
+//# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,kBAAkB;AAClB,OAAO,EAAE,oBAAoB,EAAE,oCAAgC;AAC/D,OAAO,EAAE,6BAA6B,EAAE,6CAAyC;AAEjF,YAAY;AACZ,OAAO,EAAE,cAAc,EAAE,2BAA2B,EAAE,oBAAgB;AAEtE,YAAY;AACZ,OAAO,EAAE,YAAY,EAAE,wBAAoB","sourcesContent":["// Method handlers\nexport { walletUpgradeAccount } from './wallet_upgradeAccount';\nexport { walletGetAccountUpgradeStatus } from './wallet_getAccountUpgradeStatus';\n\n// Utilities\nexport { validateParams, validateAndNormalizeAddress } from './utils';\n\n// Constants\nexport { METHOD_NAMES } from './constants';\n\n// Types\nexport type {\n  UpgradeAccountParams,\n  UpgradeAccountResult,\n  GetAccountUpgradeStatusParams,\n  GetAccountUpgradeStatusResult,\n} from './types';\n"]}

package/dist/types.cjs

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetAccountUpgradeStatusParamsStruct = exports.UpgradeAccountParamsStruct = void 0;
+const superstruct_1 = require("@metamask/superstruct");
+const utils_1 = require("@metamask/utils");
+// Superstruct validation schemas
+exports.UpgradeAccountParamsStruct = (0, superstruct_1.object)({
+    account: utils_1.HexChecksumAddressStruct,
+    chainId: (0, superstruct_1.optional)(utils_1.StrictHexStruct),
+});
+exports.GetAccountUpgradeStatusParamsStruct = (0, superstruct_1.object)({
+    account: utils_1.HexChecksumAddressStruct,
+    chainId: (0, superstruct_1.optional)(utils_1.StrictHexStruct),
+});
+//# sourceMappingURL=types.cjs.map

package/dist/types.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AACA,uDAAyD;AAEzD,2CAA4E;AAE5E,iCAAiC;AACpB,QAAA,0BAA0B,GAAG,IAAA,oBAAM,EAAC;IAC/C,OAAO,EAAE,gCAAwB;IACjC,OAAO,EAAE,IAAA,sBAAQ,EAAC,uBAAe,CAAC;CACnC,CAAC,CAAC;AAEU,QAAA,mCAAmC,GAAG,IAAA,oBAAM,EAAC;IACxD,OAAO,EAAE,gCAAwB;IACjC,OAAO,EAAE,IAAA,sBAAQ,EAAC,uBAAe,CAAC;CACnC,CAAC,CAAC","sourcesContent":["import type { Infer } from '@metamask/superstruct';\nimport { object, optional } from '@metamask/superstruct';\nimport type { Hex } from '@metamask/utils';\nimport { HexChecksumAddressStruct, StrictHexStruct } from '@metamask/utils';\n\n// Superstruct validation schemas\nexport const UpgradeAccountParamsStruct = object({\n  account: HexChecksumAddressStruct,\n  chainId: optional(StrictHexStruct),\n});\n\nexport const GetAccountUpgradeStatusParamsStruct = object({\n  account: HexChecksumAddressStruct,\n  chainId: optional(StrictHexStruct),\n});\n\n// Type definitions derived from schemas\nexport type UpgradeAccountParams = Infer<typeof UpgradeAccountParamsStruct>;\n\nexport type UpgradeAccountResult = {\n  transactionHash: Hex; // Hash of the EIP-7702 authorization transaction\n  upgradedAccount: Hex; // Address of the upgraded account (same as input)\n  delegatedTo: Hex; // Address of the contract delegated to (determined by wallet)\n};\n\nexport type GetAccountUpgradeStatusParams = Infer<\n  typeof GetAccountUpgradeStatusParamsStruct\n>;\n\nexport type GetAccountUpgradeStatusResult = {\n  account: Hex; // Address of the checked account\n  chainId: Hex; // Chain ID where the check was performed\n  isSupported: boolean; // Whether upgrade to smart account is supported on the chain\n  isUpgraded: boolean; // Whether the account is upgraded\n  upgradedAddress: Hex | null; // Address to which the account is upgraded\n};\n"]}

package/dist/types.d.cts

@@ -0,0 +1,31 @@
+import type { Infer } from "@metamask/superstruct";
+import type { Hex } from "@metamask/utils";
+export declare const UpgradeAccountParamsStruct: import("@metamask/superstruct").Struct<{
+    account: `0x${string}`;
+    chainId?: `0x${string}` | undefined;
+}, {
+    account: import("@metamask/superstruct").Struct<`0x${string}`, null>;
+    chainId: import("@metamask/superstruct").Struct<`0x${string}` | undefined, null>;
+}>;
+export declare const GetAccountUpgradeStatusParamsStruct: import("@metamask/superstruct").Struct<{
+    account: `0x${string}`;
+    chainId?: `0x${string}` | undefined;
+}, {
+    account: import("@metamask/superstruct").Struct<`0x${string}`, null>;
+    chainId: import("@metamask/superstruct").Struct<`0x${string}` | undefined, null>;
+}>;
+export type UpgradeAccountParams = Infer<typeof UpgradeAccountParamsStruct>;
+export type UpgradeAccountResult = {
+    transactionHash: Hex;
+    upgradedAccount: Hex;
+    delegatedTo: Hex;
+};
+export type GetAccountUpgradeStatusParams = Infer<typeof GetAccountUpgradeStatusParamsStruct>;
+export type GetAccountUpgradeStatusResult = {
+    account: Hex;
+    chainId: Hex;
+    isSupported: boolean;
+    isUpgraded: boolean;
+    upgradedAddress: Hex | null;
+};
+//# sourceMappingURL=types.d.cts.map

package/dist/types.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAEnD,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAI3C,eAAO,MAAM,0BAA0B;;;;;;EAGrC,CAAC;AAEH,eAAO,MAAM,mCAAmC;;;;;;EAG9C,CAAC;AAGH,MAAM,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE5E,MAAM,MAAM,oBAAoB,GAAG;IACjC,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,GAAG,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,KAAK,CAC/C,OAAO,mCAAmC,CAC3C,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,GAAG,GAAG,IAAI,CAAC;CAC7B,CAAC"}

package/dist/types.d.mts

@@ -0,0 +1,31 @@
+import type { Infer } from "@metamask/superstruct";
+import type { Hex } from "@metamask/utils";
+export declare const UpgradeAccountParamsStruct: import("@metamask/superstruct").Struct<{
+    account: `0x${string}`;
+    chainId?: `0x${string}` | undefined;
+}, {
+    account: import("@metamask/superstruct").Struct<`0x${string}`, null>;
+    chainId: import("@metamask/superstruct").Struct<`0x${string}` | undefined, null>;
+}>;
+export declare const GetAccountUpgradeStatusParamsStruct: import("@metamask/superstruct").Struct<{
+    account: `0x${string}`;
+    chainId?: `0x${string}` | undefined;
+}, {
+    account: import("@metamask/superstruct").Struct<`0x${string}`, null>;
+    chainId: import("@metamask/superstruct").Struct<`0x${string}` | undefined, null>;
+}>;
+export type UpgradeAccountParams = Infer<typeof UpgradeAccountParamsStruct>;
+export type UpgradeAccountResult = {
+    transactionHash: Hex;
+    upgradedAccount: Hex;
+    delegatedTo: Hex;
+};
+export type GetAccountUpgradeStatusParams = Infer<typeof GetAccountUpgradeStatusParamsStruct>;
+export type GetAccountUpgradeStatusResult = {
+    account: Hex;
+    chainId: Hex;
+    isSupported: boolean;
+    isUpgraded: boolean;
+    upgradedAddress: Hex | null;
+};
+//# sourceMappingURL=types.d.mts.map

package/dist/types.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,8BAA8B;AAEnD,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAI3C,eAAO,MAAM,0BAA0B;;;;;;EAGrC,CAAC;AAEH,eAAO,MAAM,mCAAmC;;;;;;EAG9C,CAAC;AAGH,MAAM,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE5E,MAAM,MAAM,oBAAoB,GAAG;IACjC,eAAe,EAAE,GAAG,CAAC;IACrB,eAAe,EAAE,GAAG,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG,KAAK,CAC/C,OAAO,mCAAmC,CAC3C,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,OAAO,EAAE,GAAG,CAAC;IACb,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,GAAG,GAAG,IAAI,CAAC;CAC7B,CAAC"}

package/dist/types.mjs

@@ -0,0 +1,12 @@
+import { object, optional } from "@metamask/superstruct";
+import { HexChecksumAddressStruct, StrictHexStruct } from "@metamask/utils";
+// Superstruct validation schemas
+export const UpgradeAccountParamsStruct = object({
+    account: HexChecksumAddressStruct,
+    chainId: optional(StrictHexStruct),
+});
+export const GetAccountUpgradeStatusParamsStruct = object({
+    account: HexChecksumAddressStruct,
+    chainId: optional(StrictHexStruct),
+});
+//# sourceMappingURL=types.mjs.map

package/dist/types.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,8BAA8B;AAEzD,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,wBAAwB;AAE5E,iCAAiC;AACjC,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC;IAC/C,OAAO,EAAE,wBAAwB;IACjC,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC;CACnC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC;IACxD,OAAO,EAAE,wBAAwB;IACjC,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC;CACnC,CAAC,CAAC","sourcesContent":["import type { Infer } from '@metamask/superstruct';\nimport { object, optional } from '@metamask/superstruct';\nimport type { Hex } from '@metamask/utils';\nimport { HexChecksumAddressStruct, StrictHexStruct } from '@metamask/utils';\n\n// Superstruct validation schemas\nexport const UpgradeAccountParamsStruct = object({\n  account: HexChecksumAddressStruct,\n  chainId: optional(StrictHexStruct),\n});\n\nexport const GetAccountUpgradeStatusParamsStruct = object({\n  account: HexChecksumAddressStruct,\n  chainId: optional(StrictHexStruct),\n});\n\n// Type definitions derived from schemas\nexport type UpgradeAccountParams = Infer<typeof UpgradeAccountParamsStruct>;\n\nexport type UpgradeAccountResult = {\n  transactionHash: Hex; // Hash of the EIP-7702 authorization transaction\n  upgradedAccount: Hex; // Address of the upgraded account (same as input)\n  delegatedTo: Hex; // Address of the contract delegated to (determined by wallet)\n};\n\nexport type GetAccountUpgradeStatusParams = Infer<\n  typeof GetAccountUpgradeStatusParamsStruct\n>;\n\nexport type GetAccountUpgradeStatusResult = {\n  account: Hex; // Address of the checked account\n  chainId: Hex; // Chain ID where the check was performed\n  isSupported: boolean; // Whether upgrade to smart account is supported on the chain\n  isUpgraded: boolean; // Whether the account is upgraded\n  upgradedAddress: Hex | null; // Address to which the account is upgraded\n};\n"]}

package/dist/utils.cjs

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateParams = exports.validateAndNormalizeAddress = void 0;
+const rpc_errors_1 = require("@metamask/rpc-errors");
+const superstruct_1 = require("@metamask/superstruct");
+const utils_1 = require("@metamask/utils");
+/**
+ * Validates address format, checks user eth_accounts permissions.
+ *
+ * @param address - The Ethereum address to validate and normalize.
+ * @param origin - The origin string for permission checking.
+ * @param getPermittedAccountsForOrigin - Function to retrieve permitted accounts for the origin.
+ * @returns A normalized (lowercase) hex address if valid and authorized.
+ * @throws JsonRpcError with unauthorized error if the requester doesn't have permission to access the address.
+ * @throws JsonRpcError with invalid params if the address format is invalid.
+ */
+async function validateAndNormalizeAddress(address, origin, getPermittedAccountsForOrigin) {
+    if (typeof address !== 'string' ||
+        address.length === 0 ||
+        !(0, utils_1.isHexAddress)(address)) {
+        throw rpc_errors_1.rpcErrors.invalidParams({
+            message: `Invalid parameters: must provide an EVM address.`,
+        });
+    }
+    // Ensure that an "unauthorized" error is thrown if the requester
+    // does not have the `eth_accounts` permission.
+    const accounts = await getPermittedAccountsForOrigin(origin);
+    // Validate and convert each account address to normalized Hex
+    const normalizedAccounts = accounts.map((accountAddress) => accountAddress.toLowerCase());
+    if (!normalizedAccounts.includes(address.toLowerCase())) {
+        throw rpc_errors_1.providerErrors.unauthorized();
+    }
+    return address;
+}
+exports.validateAndNormalizeAddress = validateAndNormalizeAddress;
+/**
+ * Validates parameters against a Superstruct schema and throws an error if validation fails.
+ *
+ * @param value - The value to validate against the struct schema.
+ * @param struct - The Superstruct schema to validate against.
+ * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.
+ */
+function validateParams(value, struct) {
+    const [error] = (0, superstruct_1.validate)(value, struct);
+    if (error) {
+        throw rpc_errors_1.rpcErrors.invalidParams(formatValidationError(error, 'Invalid parameters'));
+    }
+}
+exports.validateParams = validateParams;
+/**
+ * Formats a Superstruct validation error into a human-readable string.
+ *
+ * @param error - The Superstruct validation error to format.
+ * @param message - The base error message to prepend to the formatted details.
+ * @returns A formatted error message string with validation failure details.
+ */
+function formatValidationError(error, message) {
+    return `${message}\n\n${error
+        .failures()
+        .map((f) => `${f.path.join(' > ')}${f.path.length ? ' - ' : ''}${f.message}`)
+        .join('\n')}`;
+}
+//# sourceMappingURL=utils.cjs.map

package/dist/utils.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.cjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,qDAAiE;AAEjE,uDAAiD;AAEjD,2CAA+C;AAE/C;;;;;;;;;GASG;AACI,KAAK,UAAU,2BAA2B,CAC/C,OAAY,EACZ,MAAc,EACd,6BAAoE;IAEpE,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,CAAC,MAAM,KAAK,CAAC;QACpB,CAAC,IAAA,oBAAY,EAAC,OAAO,CAAC,EACtB;QACA,MAAM,sBAAS,CAAC,aAAa,CAAC;YAC5B,OAAO,EAAE,kDAAkD;SAC5D,CAAC,CAAC;KACJ;IAED,iEAAiE;IACjE,+CAA+C;IAC/C,MAAM,QAAQ,GAAG,MAAM,6BAA6B,CAAC,MAAM,CAAC,CAAC;IAE7D,8DAA8D;IAC9D,MAAM,kBAAkB,GAAa,QAAQ,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CACnE,cAAc,CAAC,WAAW,EAAE,CAC7B,CAAC;IAEF,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE;QACvD,MAAM,2BAAc,CAAC,YAAY,EAAE,CAAC;KACrC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AA7BD,kEA6BC;AAED;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,KAA2B,EAC3B,MAA0B;IAE1B,MAAM,CAAC,KAAK,CAAC,GAAG,IAAA,sBAAQ,EAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAExC,IAAI,KAAK,EAAE;QACT,MAAM,sBAAS,CAAC,aAAa,CAC3B,qBAAqB,CAAC,KAAK,EAAE,oBAAoB,CAAC,CACnD,CAAC;KACH;AACH,CAAC;AAXD,wCAWC;AAED;;;;;;GAMG;AACH,SAAS,qBAAqB,CAAC,KAAkB,EAAE,OAAe;IAChE,OAAO,GAAG,OAAO,OAAO,KAAK;SAC1B,QAAQ,EAAE;SACV,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CACxE;SACA,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAClB,CAAC","sourcesContent":["import { providerErrors, rpcErrors } from '@metamask/rpc-errors';\nimport type { Struct, StructError } from '@metamask/superstruct';\nimport { validate } from '@metamask/superstruct';\nimport type { Hex } from '@metamask/utils';\nimport { isHexAddress } from '@metamask/utils';\n\n/**\n * Validates address format, checks user eth_accounts permissions.\n *\n * @param address - The Ethereum address to validate and normalize.\n * @param origin - The origin string for permission checking.\n * @param getPermittedAccountsForOrigin - Function to retrieve permitted accounts for the origin.\n * @returns A normalized (lowercase) hex address if valid and authorized.\n * @throws JsonRpcError with unauthorized error if the requester doesn't have permission to access the address.\n * @throws JsonRpcError with invalid params if the address format is invalid.\n */\nexport async function validateAndNormalizeAddress(\n  address: Hex,\n  origin: string,\n  getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>,\n): Promise<Hex> {\n  if (\n    typeof address !== 'string' ||\n    address.length === 0 ||\n    !isHexAddress(address)\n  ) {\n    throw rpcErrors.invalidParams({\n      message: `Invalid parameters: must provide an EVM address.`,\n    });\n  }\n\n  // Ensure that an \"unauthorized\" error is thrown if the requester\n  // does not have the `eth_accounts` permission.\n  const accounts = await getPermittedAccountsForOrigin(origin);\n\n  // Validate and convert each account address to normalized Hex\n  const normalizedAccounts: string[] = accounts.map((accountAddress) =>\n    accountAddress.toLowerCase(),\n  );\n\n  if (!normalizedAccounts.includes(address.toLowerCase())) {\n    throw providerErrors.unauthorized();\n  }\n\n  return address;\n}\n\n/**\n * Validates parameters against a Superstruct schema and throws an error if validation fails.\n *\n * @param value - The value to validate against the struct schema.\n * @param struct - The Superstruct schema to validate against.\n * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.\n */\nexport function validateParams<ParamsType>(\n  value: unknown | ParamsType,\n  struct: Struct<ParamsType>,\n): asserts value is ParamsType {\n  const [error] = validate(value, struct);\n\n  if (error) {\n    throw rpcErrors.invalidParams(\n      formatValidationError(error, 'Invalid parameters'),\n    );\n  }\n}\n\n/**\n * Formats a Superstruct validation error into a human-readable string.\n *\n * @param error - The Superstruct validation error to format.\n * @param message - The base error message to prepend to the formatted details.\n * @returns A formatted error message string with validation failure details.\n */\nfunction formatValidationError(error: StructError, message: string): string {\n  return `${message}\\n\\n${error\n    .failures()\n    .map(\n      (f) => `${f.path.join(' > ')}${f.path.length ? ' - ' : ''}${f.message}`,\n    )\n    .join('\\n')}`;\n}\n"]}

package/dist/utils.d.cts

@@ -0,0 +1,22 @@
+import type { Struct } from "@metamask/superstruct";
+import type { Hex } from "@metamask/utils";
+/**
+ * Validates address format, checks user eth_accounts permissions.
+ *
+ * @param address - The Ethereum address to validate and normalize.
+ * @param origin - The origin string for permission checking.
+ * @param getPermittedAccountsForOrigin - Function to retrieve permitted accounts for the origin.
+ * @returns A normalized (lowercase) hex address if valid and authorized.
+ * @throws JsonRpcError with unauthorized error if the requester doesn't have permission to access the address.
+ * @throws JsonRpcError with invalid params if the address format is invalid.
+ */
+export declare function validateAndNormalizeAddress(address: Hex, origin: string, getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>): Promise<Hex>;
+/**
+ * Validates parameters against a Superstruct schema and throws an error if validation fails.
+ *
+ * @param value - The value to validate against the struct schema.
+ * @param struct - The Superstruct schema to validate against.
+ * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.
+ */
+export declare function validateParams<ParamsType>(value: unknown | ParamsType, struct: Struct<ParamsType>): asserts value is ParamsType;
+//# sourceMappingURL=utils.d.cts.map

package/dist/utils.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.cts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAe,8BAA8B;AAEjE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C;;;;;;;;;GASG;AACH,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,MAAM,EACd,6BAA6B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,GACnE,OAAO,CAAC,GAAG,CAAC,CAyBd;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EACvC,KAAK,EAAE,OAAO,GAAG,UAAU,EAC3B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GACzB,OAAO,CAAC,KAAK,IAAI,UAAU,CAQ7B"}

package/dist/utils.d.mts

@@ -0,0 +1,22 @@
+import type { Struct } from "@metamask/superstruct";
+import type { Hex } from "@metamask/utils";
+/**
+ * Validates address format, checks user eth_accounts permissions.
+ *
+ * @param address - The Ethereum address to validate and normalize.
+ * @param origin - The origin string for permission checking.
+ * @param getPermittedAccountsForOrigin - Function to retrieve permitted accounts for the origin.
+ * @returns A normalized (lowercase) hex address if valid and authorized.
+ * @throws JsonRpcError with unauthorized error if the requester doesn't have permission to access the address.
+ * @throws JsonRpcError with invalid params if the address format is invalid.
+ */
+export declare function validateAndNormalizeAddress(address: Hex, origin: string, getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>): Promise<Hex>;
+/**
+ * Validates parameters against a Superstruct schema and throws an error if validation fails.
+ *
+ * @param value - The value to validate against the struct schema.
+ * @param struct - The Superstruct schema to validate against.
+ * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.
+ */
+export declare function validateParams<ParamsType>(value: unknown | ParamsType, struct: Struct<ParamsType>): asserts value is ParamsType;
+//# sourceMappingURL=utils.d.mts.map

package/dist/utils.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.mts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAe,8BAA8B;AAEjE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C;;;;;;;;;GASG;AACH,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,GAAG,EACZ,MAAM,EAAE,MAAM,EACd,6BAA6B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,GACnE,OAAO,CAAC,GAAG,CAAC,CAyBd;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,UAAU,EACvC,KAAK,EAAE,OAAO,GAAG,UAAU,EAC3B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GACzB,OAAO,CAAC,KAAK,IAAI,UAAU,CAQ7B"}

package/dist/utils.mjs

@@ -0,0 +1,58 @@
+import { providerErrors, rpcErrors } from "@metamask/rpc-errors";
+import { validate } from "@metamask/superstruct";
+import { isHexAddress } from "@metamask/utils";
+/**
+ * Validates address format, checks user eth_accounts permissions.
+ *
+ * @param address - The Ethereum address to validate and normalize.
+ * @param origin - The origin string for permission checking.
+ * @param getPermittedAccountsForOrigin - Function to retrieve permitted accounts for the origin.
+ * @returns A normalized (lowercase) hex address if valid and authorized.
+ * @throws JsonRpcError with unauthorized error if the requester doesn't have permission to access the address.
+ * @throws JsonRpcError with invalid params if the address format is invalid.
+ */
+export async function validateAndNormalizeAddress(address, origin, getPermittedAccountsForOrigin) {
+    if (typeof address !== 'string' ||
+        address.length === 0 ||
+        !isHexAddress(address)) {
+        throw rpcErrors.invalidParams({
+            message: `Invalid parameters: must provide an EVM address.`,
+        });
+    }
+    // Ensure that an "unauthorized" error is thrown if the requester
+    // does not have the `eth_accounts` permission.
+    const accounts = await getPermittedAccountsForOrigin(origin);
+    // Validate and convert each account address to normalized Hex
+    const normalizedAccounts = accounts.map((accountAddress) => accountAddress.toLowerCase());
+    if (!normalizedAccounts.includes(address.toLowerCase())) {
+        throw providerErrors.unauthorized();
+    }
+    return address;
+}
+/**
+ * Validates parameters against a Superstruct schema and throws an error if validation fails.
+ *
+ * @param value - The value to validate against the struct schema.
+ * @param struct - The Superstruct schema to validate against.
+ * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.
+ */
+export function validateParams(value, struct) {
+    const [error] = validate(value, struct);
+    if (error) {
+        throw rpcErrors.invalidParams(formatValidationError(error, 'Invalid parameters'));
+    }
+}
+/**
+ * Formats a Superstruct validation error into a human-readable string.
+ *
+ * @param error - The Superstruct validation error to format.
+ * @param message - The base error message to prepend to the formatted details.
+ * @returns A formatted error message string with validation failure details.
+ */
+function formatValidationError(error, message) {
+    return `${message}\n\n${error
+        .failures()
+        .map((f) => `${f.path.join(' > ')}${f.path.length ? ' - ' : ''}${f.message}`)
+        .join('\n')}`;
+}
+//# sourceMappingURL=utils.mjs.map

package/dist/utils.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.mjs","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,6BAA6B;AAEjE,OAAO,EAAE,QAAQ,EAAE,8BAA8B;AAEjD,OAAO,EAAE,YAAY,EAAE,wBAAwB;AAE/C;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,OAAY,EACZ,MAAc,EACd,6BAAoE;IAEpE,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,CAAC,MAAM,KAAK,CAAC;QACpB,CAAC,YAAY,CAAC,OAAO,CAAC,EACtB;QACA,MAAM,SAAS,CAAC,aAAa,CAAC;YAC5B,OAAO,EAAE,kDAAkD;SAC5D,CAAC,CAAC;KACJ;IAED,iEAAiE;IACjE,+CAA+C;IAC/C,MAAM,QAAQ,GAAG,MAAM,6BAA6B,CAAC,MAAM,CAAC,CAAC;IAE7D,8DAA8D;IAC9D,MAAM,kBAAkB,GAAa,QAAQ,CAAC,GAAG,CAAC,CAAC,cAAc,EAAE,EAAE,CACnE,cAAc,CAAC,WAAW,EAAE,CAC7B,CAAC;IAEF,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE;QACvD,MAAM,cAAc,CAAC,YAAY,EAAE,CAAC;KACrC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,KAA2B,EAC3B,MAA0B;IAE1B,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAExC,IAAI,KAAK,EAAE;QACT,MAAM,SAAS,CAAC,aAAa,CAC3B,qBAAqB,CAAC,KAAK,EAAE,oBAAoB,CAAC,CACnD,CAAC;KACH;AACH,CAAC;AAED;;;;;;GAMG;AACH,SAAS,qBAAqB,CAAC,KAAkB,EAAE,OAAe;IAChE,OAAO,GAAG,OAAO,OAAO,KAAK;SAC1B,QAAQ,EAAE;SACV,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,CACxE;SACA,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AAClB,CAAC","sourcesContent":["import { providerErrors, rpcErrors } from '@metamask/rpc-errors';\nimport type { Struct, StructError } from '@metamask/superstruct';\nimport { validate } from '@metamask/superstruct';\nimport type { Hex } from '@metamask/utils';\nimport { isHexAddress } from '@metamask/utils';\n\n/**\n * Validates address format, checks user eth_accounts permissions.\n *\n * @param address - The Ethereum address to validate and normalize.\n * @param origin - The origin string for permission checking.\n * @param getPermittedAccountsForOrigin - Function to retrieve permitted accounts for the origin.\n * @returns A normalized (lowercase) hex address if valid and authorized.\n * @throws JsonRpcError with unauthorized error if the requester doesn't have permission to access the address.\n * @throws JsonRpcError with invalid params if the address format is invalid.\n */\nexport async function validateAndNormalizeAddress(\n  address: Hex,\n  origin: string,\n  getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>,\n): Promise<Hex> {\n  if (\n    typeof address !== 'string' ||\n    address.length === 0 ||\n    !isHexAddress(address)\n  ) {\n    throw rpcErrors.invalidParams({\n      message: `Invalid parameters: must provide an EVM address.`,\n    });\n  }\n\n  // Ensure that an \"unauthorized\" error is thrown if the requester\n  // does not have the `eth_accounts` permission.\n  const accounts = await getPermittedAccountsForOrigin(origin);\n\n  // Validate and convert each account address to normalized Hex\n  const normalizedAccounts: string[] = accounts.map((accountAddress) =>\n    accountAddress.toLowerCase(),\n  );\n\n  if (!normalizedAccounts.includes(address.toLowerCase())) {\n    throw providerErrors.unauthorized();\n  }\n\n  return address;\n}\n\n/**\n * Validates parameters against a Superstruct schema and throws an error if validation fails.\n *\n * @param value - The value to validate against the struct schema.\n * @param struct - The Superstruct schema to validate against.\n * @throws JsonRpcError with invalid params if the value doesn't match the struct schema.\n */\nexport function validateParams<ParamsType>(\n  value: unknown | ParamsType,\n  struct: Struct<ParamsType>,\n): asserts value is ParamsType {\n  const [error] = validate(value, struct);\n\n  if (error) {\n    throw rpcErrors.invalidParams(\n      formatValidationError(error, 'Invalid parameters'),\n    );\n  }\n}\n\n/**\n * Formats a Superstruct validation error into a human-readable string.\n *\n * @param error - The Superstruct validation error to format.\n * @param message - The base error message to prepend to the formatted details.\n * @returns A formatted error message string with validation failure details.\n */\nfunction formatValidationError(error: StructError, message: string): string {\n  return `${message}\\n\\n${error\n    .failures()\n    .map(\n      (f) => `${f.path.join(' > ')}${f.path.length ? ' - ' : ''}${f.message}`,\n    )\n    .join('\\n')}`;\n}\n"]}

package/dist/wallet_getAccountUpgradeStatus.cjs

@@ -0,0 +1,97 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.walletGetAccountUpgradeStatus = void 0;
+const rpc_errors_1 = require("@metamask/rpc-errors");
+const utils_1 = require("@metamask/utils");
+const constants_1 = require("./constants.cjs");
+const types_1 = require("./types.cjs");
+const utils_2 = require("./utils.cjs");
+const isAccountUpgraded = async (address, networkClientId, getCode) => {
+    const code = await getCode(address, networkClientId);
+    if (!code || code === '0x' || code.length <= 2) {
+        return { isUpgraded: false, upgradedAddress: null };
+    }
+    if (!code.startsWith(constants_1.DELEGATION_INDICATOR_PREFIX)) {
+        return { isUpgraded: false, upgradedAddress: null };
+    }
+    const expectedLength = constants_1.DELEGATION_INDICATOR_PREFIX.length + 40; // 0xef0100 + 40 hex chars
+    if (code.length !== expectedLength) {
+        return { isUpgraded: false, upgradedAddress: null };
+    }
+    // Extract the 20-byte address (40 hex characters after the prefix)
+    const upgradedAddress = `0x${code.slice(8, 48)}`;
+    return { isUpgraded: true, upgradedAddress };
+};
+/**
+ * The RPC method handler middleware for `wallet_getAccountUpgradeStatus`
+ *
+ * @param req - The JSON RPC request's end callback.
+ * @param res - The JSON RPC request's pending response object.
+ * @param hooks - The hooks required for account upgrade status checking.
+ */
+async function walletGetAccountUpgradeStatus(req, res, hooks) {
+    const { params, origin } = req;
+    // Validate parameters using Superstruct
+    (0, utils_2.validateParams)(params, types_1.GetAccountUpgradeStatusParamsStruct);
+    const { account, chainId } = params;
+    // Validate and normalize the account address with authorization check
+    const normalizedAccount = await (0, utils_2.validateAndNormalizeAddress)(account, origin, hooks.getPermittedAccountsForOrigin);
+    // Use current chain ID if not provided
+    let targetChainId;
+    if (chainId !== undefined) {
+        targetChainId = chainId;
+    }
+    else {
+        const currentChainIdForDomain = hooks.getCurrentChainIdForDomain(origin);
+        if (!currentChainIdForDomain) {
+            throw rpc_errors_1.rpcErrors.invalidParams({
+                message: `Could not determine current chain ID for origin: ${origin}`,
+            });
+        }
+        targetChainId = currentChainIdForDomain;
+    }
+    const { isSupported } = await hooks.isEip7702Supported({
+        address: normalizedAccount,
+        chainId: targetChainId,
+    });
+    if (!isSupported) {
+        res.result = {
+            isSupported,
+            account: normalizedAccount,
+            isUpgraded: false,
+            upgradedAddress: null,
+            chainId: targetChainId,
+        };
+        return;
+    }
+    try {
+        // Get the network configuration for the target chain
+        const hexChainId = targetChainId;
+        const networkClientId = hooks.getSelectedNetworkClientIdForChain(hexChainId);
+        if (!networkClientId) {
+            throw rpc_errors_1.rpcErrors.invalidParams({
+                message: `Network client ID not found for chain ID ${targetChainId}`,
+            });
+        }
+        // Check if the account is upgraded using the EIP7702 utils
+        const { isUpgraded, upgradedAddress } = await isAccountUpgraded(normalizedAccount, networkClientId, hooks.getCode);
+        res.result = {
+            isSupported,
+            account: normalizedAccount,
+            isUpgraded,
+            upgradedAddress,
+            chainId: targetChainId,
+        };
+    }
+    catch (error) {
+        // Re-throw RPC errors as-is
+        if (error instanceof rpc_errors_1.JsonRpcError) {
+            throw error;
+        }
+        throw rpc_errors_1.rpcErrors.internal({
+            message: `Failed to get account upgrade status: ${(0, utils_1.getErrorMessage)(error)}`,
+        });
+    }
+}
+exports.walletGetAccountUpgradeStatus = walletGetAccountUpgradeStatus;
+//# sourceMappingURL=wallet_getAccountUpgradeStatus.cjs.map

package/dist/wallet_getAccountUpgradeStatus.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet_getAccountUpgradeStatus.cjs","sourceRoot":"","sources":["../src/wallet_getAccountUpgradeStatus.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport {\n  type JsonRpcRequest,\n  type PendingJsonRpcResponse,\n  type Hex,\n  getErrorMessage,\n} from '@metamask/utils';\n\nimport { DELEGATION_INDICATOR_PREFIX } from './constants';\nimport type { GetAccountUpgradeStatusParams } from './types';\nimport { GetAccountUpgradeStatusParamsStruct } from './types';\nimport { validateParams, validateAndNormalizeAddress } from './utils';\n\nexport type WalletGetAccountUpgradeStatusHooks = {\n  getCurrentChainIdForDomain: (origin: string) => Hex | null;\n  getCode: (address: string, networkClientId: string) => Promise<string | null>;\n  getSelectedNetworkClientIdForChain: (chainId: string) => string | null;\n  getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>;\n  isEip7702Supported: (request: { address: string; chainId: Hex }) => Promise<{\n    isSupported: boolean;\n    upgradeContractAddress?: string;\n  }>;\n};\n\nconst isAccountUpgraded = async (\n  address: string,\n  networkClientId: string,\n  getCode: (address: string, networkClientId: string) => Promise<string | null>,\n): Promise<{ isUpgraded: boolean; upgradedAddress: Hex | null }> => {\n  const code = await getCode(address, networkClientId);\n  if (!code || code === '0x' || code.length <= 2) {\n    return { isUpgraded: false, upgradedAddress: null };\n  }\n\n  if (!code.startsWith(DELEGATION_INDICATOR_PREFIX)) {\n    return { isUpgraded: false, upgradedAddress: null };\n  }\n\n  const expectedLength = DELEGATION_INDICATOR_PREFIX.length + 40; // 0xef0100 + 40 hex chars\n  if (code.length !== expectedLength) {\n    return { isUpgraded: false, upgradedAddress: null };\n  }\n\n  // Extract the 20-byte address (40 hex characters after the prefix)\n  const upgradedAddress = `0x${code.slice(8, 48)}` as Hex;\n\n  return { isUpgraded: true, upgradedAddress };\n};\n\n/**\n * The RPC method handler middleware for `wallet_getAccountUpgradeStatus`\n *\n * @param req - The JSON RPC request's end callback.\n * @param res - The JSON RPC request's pending response object.\n * @param hooks - The hooks required for account upgrade status checking.\n */\nexport async function walletGetAccountUpgradeStatus(\n  req: JsonRpcRequest<GetAccountUpgradeStatusParams> & { origin: string },\n  res: PendingJsonRpcResponse,\n  hooks: WalletGetAccountUpgradeStatusHooks,\n): Promise<void> {\n  const { params, origin } = req;\n\n  // Validate parameters using Superstruct\n  validateParams(params, GetAccountUpgradeStatusParamsStruct);\n\n  const { account, chainId } = params;\n\n  // Validate and normalize the account address with authorization check\n  const normalizedAccount = await validateAndNormalizeAddress(\n    account,\n    origin,\n    hooks.getPermittedAccountsForOrigin,\n  );\n\n  // Use current chain ID if not provided\n  let targetChainId: Hex;\n  if (chainId !== undefined) {\n    targetChainId = chainId;\n  } else {\n    const currentChainIdForDomain = hooks.getCurrentChainIdForDomain(origin);\n    if (!currentChainIdForDomain) {\n      throw rpcErrors.invalidParams({\n        message: `Could not determine current chain ID for origin: ${origin}`,\n      });\n    }\n    targetChainId = currentChainIdForDomain;\n  }\n\n  const { isSupported } = await hooks.isEip7702Supported({\n    address: normalizedAccount,\n    chainId: targetChainId,\n  });\n\n  if (!isSupported) {\n    res.result = {\n      isSupported,\n      account: normalizedAccount,\n      isUpgraded: false,\n      upgradedAddress: null,\n      chainId: targetChainId,\n    };\n    return;\n  }\n\n  try {\n    // Get the network configuration for the target chain\n    const hexChainId = targetChainId;\n    const networkClientId =\n      hooks.getSelectedNetworkClientIdForChain(hexChainId);\n\n    if (!networkClientId) {\n      throw rpcErrors.invalidParams({\n        message: `Network client ID not found for chain ID ${targetChainId}`,\n      });\n    }\n\n    // Check if the account is upgraded using the EIP7702 utils\n    const { isUpgraded, upgradedAddress } = await isAccountUpgraded(\n      normalizedAccount,\n      networkClientId,\n      hooks.getCode,\n    );\n\n    res.result = {\n      isSupported,\n      account: normalizedAccount,\n      isUpgraded,\n      upgradedAddress,\n      chainId: targetChainId,\n    };\n  } catch (error) {\n    // Re-throw RPC errors as-is\n    if (error instanceof JsonRpcError) {\n      throw error;\n    }\n    throw rpcErrors.internal({\n      message: `Failed to get account upgrade status: ${getErrorMessage(error)}`,\n    });\n  }\n}\n"]}

package/dist/wallet_getAccountUpgradeStatus.d.cts

@@ -0,0 +1,26 @@
+import { type JsonRpcRequest, type PendingJsonRpcResponse, type Hex } from "@metamask/utils";
+import type { GetAccountUpgradeStatusParams } from "./types.cjs";
+export type WalletGetAccountUpgradeStatusHooks = {
+    getCurrentChainIdForDomain: (origin: string) => Hex | null;
+    getCode: (address: string, networkClientId: string) => Promise<string | null>;
+    getSelectedNetworkClientIdForChain: (chainId: string) => string | null;
+    getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>;
+    isEip7702Supported: (request: {
+        address: string;
+        chainId: Hex;
+    }) => Promise<{
+        isSupported: boolean;
+        upgradeContractAddress?: string;
+    }>;
+};
+/**
+ * The RPC method handler middleware for `wallet_getAccountUpgradeStatus`
+ *
+ * @param req - The JSON RPC request's end callback.
+ * @param res - The JSON RPC request's pending response object.
+ * @param hooks - The hooks required for account upgrade status checking.
+ */
+export declare function walletGetAccountUpgradeStatus(req: JsonRpcRequest<GetAccountUpgradeStatusParams> & {
+    origin: string;
+}, res: PendingJsonRpcResponse, hooks: WalletGetAccountUpgradeStatusHooks): Promise<void>;
+//# sourceMappingURL=wallet_getAccountUpgradeStatus.d.cts.map

package/dist/wallet_getAccountUpgradeStatus.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet_getAccountUpgradeStatus.d.cts","sourceRoot":"","sources":["../src/wallet_getAccountUpgradeStatus.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,GAAG,EAET,wBAAwB;AAGzB,OAAO,KAAK,EAAE,6BAA6B,EAAE,oBAAgB;AAI7D,MAAM,MAAM,kCAAkC,GAAG;IAC/C,0BAA0B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,GAAG,GAAG,IAAI,CAAC;IAC3D,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC9E,kCAAkC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IACvE,6BAA6B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrE,kBAAkB,EAAE,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC;QAC1E,WAAW,EAAE,OAAO,CAAC;QACrB,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC,CAAC;CACJ,CAAC;AA2BF;;;;;;GAMG;AACH,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,cAAc,CAAC,6BAA6B,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EACvE,GAAG,EAAE,sBAAsB,EAC3B,KAAK,EAAE,kCAAkC,GACxC,OAAO,CAAC,IAAI,CAAC,CAgFf"}

package/dist/wallet_getAccountUpgradeStatus.d.mts

@@ -0,0 +1,26 @@
+import { type JsonRpcRequest, type PendingJsonRpcResponse, type Hex } from "@metamask/utils";
+import type { GetAccountUpgradeStatusParams } from "./types.mjs";
+export type WalletGetAccountUpgradeStatusHooks = {
+    getCurrentChainIdForDomain: (origin: string) => Hex | null;
+    getCode: (address: string, networkClientId: string) => Promise<string | null>;
+    getSelectedNetworkClientIdForChain: (chainId: string) => string | null;
+    getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>;
+    isEip7702Supported: (request: {
+        address: string;
+        chainId: Hex;
+    }) => Promise<{
+        isSupported: boolean;
+        upgradeContractAddress?: string;
+    }>;
+};
+/**
+ * The RPC method handler middleware for `wallet_getAccountUpgradeStatus`
+ *
+ * @param req - The JSON RPC request's end callback.
+ * @param res - The JSON RPC request's pending response object.
+ * @param hooks - The hooks required for account upgrade status checking.
+ */
+export declare function walletGetAccountUpgradeStatus(req: JsonRpcRequest<GetAccountUpgradeStatusParams> & {
+    origin: string;
+}, res: PendingJsonRpcResponse, hooks: WalletGetAccountUpgradeStatusHooks): Promise<void>;
+//# sourceMappingURL=wallet_getAccountUpgradeStatus.d.mts.map

package/dist/wallet_getAccountUpgradeStatus.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet_getAccountUpgradeStatus.d.mts","sourceRoot":"","sources":["../src/wallet_getAccountUpgradeStatus.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,GAAG,EAET,wBAAwB;AAGzB,OAAO,KAAK,EAAE,6BAA6B,EAAE,oBAAgB;AAI7D,MAAM,MAAM,kCAAkC,GAAG;IAC/C,0BAA0B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,GAAG,GAAG,IAAI,CAAC;IAC3D,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC9E,kCAAkC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IACvE,6BAA6B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACrE,kBAAkB,EAAE,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC;QAC1E,WAAW,EAAE,OAAO,CAAC;QACrB,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC,CAAC;CACJ,CAAC;AA2BF;;;;;;GAMG;AACH,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,cAAc,CAAC,6BAA6B,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EACvE,GAAG,EAAE,sBAAsB,EAC3B,KAAK,EAAE,kCAAkC,GACxC,OAAO,CAAC,IAAI,CAAC,CAgFf"}

package/dist/wallet_getAccountUpgradeStatus.mjs

@@ -0,0 +1,93 @@
+import { JsonRpcError, rpcErrors } from "@metamask/rpc-errors";
+import { getErrorMessage } from "@metamask/utils";
+import { DELEGATION_INDICATOR_PREFIX } from "./constants.mjs";
+import { GetAccountUpgradeStatusParamsStruct } from "./types.mjs";
+import { validateParams, validateAndNormalizeAddress } from "./utils.mjs";
+const isAccountUpgraded = async (address, networkClientId, getCode) => {
+    const code = await getCode(address, networkClientId);
+    if (!code || code === '0x' || code.length <= 2) {
+        return { isUpgraded: false, upgradedAddress: null };
+    }
+    if (!code.startsWith(DELEGATION_INDICATOR_PREFIX)) {
+        return { isUpgraded: false, upgradedAddress: null };
+    }
+    const expectedLength = DELEGATION_INDICATOR_PREFIX.length + 40; // 0xef0100 + 40 hex chars
+    if (code.length !== expectedLength) {
+        return { isUpgraded: false, upgradedAddress: null };
+    }
+    // Extract the 20-byte address (40 hex characters after the prefix)
+    const upgradedAddress = `0x${code.slice(8, 48)}`;
+    return { isUpgraded: true, upgradedAddress };
+};
+/**
+ * The RPC method handler middleware for `wallet_getAccountUpgradeStatus`
+ *
+ * @param req - The JSON RPC request's end callback.
+ * @param res - The JSON RPC request's pending response object.
+ * @param hooks - The hooks required for account upgrade status checking.
+ */
+export async function walletGetAccountUpgradeStatus(req, res, hooks) {
+    const { params, origin } = req;
+    // Validate parameters using Superstruct
+    validateParams(params, GetAccountUpgradeStatusParamsStruct);
+    const { account, chainId } = params;
+    // Validate and normalize the account address with authorization check
+    const normalizedAccount = await validateAndNormalizeAddress(account, origin, hooks.getPermittedAccountsForOrigin);
+    // Use current chain ID if not provided
+    let targetChainId;
+    if (chainId !== undefined) {
+        targetChainId = chainId;
+    }
+    else {
+        const currentChainIdForDomain = hooks.getCurrentChainIdForDomain(origin);
+        if (!currentChainIdForDomain) {
+            throw rpcErrors.invalidParams({
+                message: `Could not determine current chain ID for origin: ${origin}`,
+            });
+        }
+        targetChainId = currentChainIdForDomain;
+    }
+    const { isSupported } = await hooks.isEip7702Supported({
+        address: normalizedAccount,
+        chainId: targetChainId,
+    });
+    if (!isSupported) {
+        res.result = {
+            isSupported,
+            account: normalizedAccount,
+            isUpgraded: false,
+            upgradedAddress: null,
+            chainId: targetChainId,
+        };
+        return;
+    }
+    try {
+        // Get the network configuration for the target chain
+        const hexChainId = targetChainId;
+        const networkClientId = hooks.getSelectedNetworkClientIdForChain(hexChainId);
+        if (!networkClientId) {
+            throw rpcErrors.invalidParams({
+                message: `Network client ID not found for chain ID ${targetChainId}`,
+            });
+        }
+        // Check if the account is upgraded using the EIP7702 utils
+        const { isUpgraded, upgradedAddress } = await isAccountUpgraded(normalizedAccount, networkClientId, hooks.getCode);
+        res.result = {
+            isSupported,
+            account: normalizedAccount,
+            isUpgraded,
+            upgradedAddress,
+            chainId: targetChainId,
+        };
+    }
+    catch (error) {
+        // Re-throw RPC errors as-is
+        if (error instanceof JsonRpcError) {
+            throw error;
+        }
+        throw rpcErrors.internal({
+            message: `Failed to get account upgrade status: ${getErrorMessage(error)}`,
+        });
+    }
+}
+//# sourceMappingURL=wallet_getAccountUpgradeStatus.mjs.map

package/dist/wallet_getAccountUpgradeStatus.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet_getAccountUpgradeStatus.mjs","sourceRoot":"","sources":["../src/wallet_getAccountUpgradeStatus.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport {\n  type JsonRpcRequest,\n  type PendingJsonRpcResponse,\n  type Hex,\n  getErrorMessage,\n} from '@metamask/utils';\n\nimport { DELEGATION_INDICATOR_PREFIX } from './constants';\nimport type { GetAccountUpgradeStatusParams } from './types';\nimport { GetAccountUpgradeStatusParamsStruct } from './types';\nimport { validateParams, validateAndNormalizeAddress } from './utils';\n\nexport type WalletGetAccountUpgradeStatusHooks = {\n  getCurrentChainIdForDomain: (origin: string) => Hex | null;\n  getCode: (address: string, networkClientId: string) => Promise<string | null>;\n  getSelectedNetworkClientIdForChain: (chainId: string) => string | null;\n  getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>;\n  isEip7702Supported: (request: { address: string; chainId: Hex }) => Promise<{\n    isSupported: boolean;\n    upgradeContractAddress?: string;\n  }>;\n};\n\nconst isAccountUpgraded = async (\n  address: string,\n  networkClientId: string,\n  getCode: (address: string, networkClientId: string) => Promise<string | null>,\n): Promise<{ isUpgraded: boolean; upgradedAddress: Hex | null }> => {\n  const code = await getCode(address, networkClientId);\n  if (!code || code === '0x' || code.length <= 2) {\n    return { isUpgraded: false, upgradedAddress: null };\n  }\n\n  if (!code.startsWith(DELEGATION_INDICATOR_PREFIX)) {\n    return { isUpgraded: false, upgradedAddress: null };\n  }\n\n  const expectedLength = DELEGATION_INDICATOR_PREFIX.length + 40; // 0xef0100 + 40 hex chars\n  if (code.length !== expectedLength) {\n    return { isUpgraded: false, upgradedAddress: null };\n  }\n\n  // Extract the 20-byte address (40 hex characters after the prefix)\n  const upgradedAddress = `0x${code.slice(8, 48)}` as Hex;\n\n  return { isUpgraded: true, upgradedAddress };\n};\n\n/**\n * The RPC method handler middleware for `wallet_getAccountUpgradeStatus`\n *\n * @param req - The JSON RPC request's end callback.\n * @param res - The JSON RPC request's pending response object.\n * @param hooks - The hooks required for account upgrade status checking.\n */\nexport async function walletGetAccountUpgradeStatus(\n  req: JsonRpcRequest<GetAccountUpgradeStatusParams> & { origin: string },\n  res: PendingJsonRpcResponse,\n  hooks: WalletGetAccountUpgradeStatusHooks,\n): Promise<void> {\n  const { params, origin } = req;\n\n  // Validate parameters using Superstruct\n  validateParams(params, GetAccountUpgradeStatusParamsStruct);\n\n  const { account, chainId } = params;\n\n  // Validate and normalize the account address with authorization check\n  const normalizedAccount = await validateAndNormalizeAddress(\n    account,\n    origin,\n    hooks.getPermittedAccountsForOrigin,\n  );\n\n  // Use current chain ID if not provided\n  let targetChainId: Hex;\n  if (chainId !== undefined) {\n    targetChainId = chainId;\n  } else {\n    const currentChainIdForDomain = hooks.getCurrentChainIdForDomain(origin);\n    if (!currentChainIdForDomain) {\n      throw rpcErrors.invalidParams({\n        message: `Could not determine current chain ID for origin: ${origin}`,\n      });\n    }\n    targetChainId = currentChainIdForDomain;\n  }\n\n  const { isSupported } = await hooks.isEip7702Supported({\n    address: normalizedAccount,\n    chainId: targetChainId,\n  });\n\n  if (!isSupported) {\n    res.result = {\n      isSupported,\n      account: normalizedAccount,\n      isUpgraded: false,\n      upgradedAddress: null,\n      chainId: targetChainId,\n    };\n    return;\n  }\n\n  try {\n    // Get the network configuration for the target chain\n    const hexChainId = targetChainId;\n    const networkClientId =\n      hooks.getSelectedNetworkClientIdForChain(hexChainId);\n\n    if (!networkClientId) {\n      throw rpcErrors.invalidParams({\n        message: `Network client ID not found for chain ID ${targetChainId}`,\n      });\n    }\n\n    // Check if the account is upgraded using the EIP7702 utils\n    const { isUpgraded, upgradedAddress } = await isAccountUpgraded(\n      normalizedAccount,\n      networkClientId,\n      hooks.getCode,\n    );\n\n    res.result = {\n      isSupported,\n      account: normalizedAccount,\n      isUpgraded,\n      upgradedAddress,\n      chainId: targetChainId,\n    };\n  } catch (error) {\n    // Re-throw RPC errors as-is\n    if (error instanceof JsonRpcError) {\n      throw error;\n    }\n    throw rpcErrors.internal({\n      message: `Failed to get account upgrade status: ${getErrorMessage(error)}`,\n    });\n  }\n}\n"]}

package/dist/wallet_upgradeAccount.cjs

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.walletUpgradeAccount = void 0;
+const rpc_errors_1 = require("@metamask/rpc-errors");
+const types_1 = require("./types.cjs");
+const utils_1 = require("./utils.cjs");
+/**
+ * The RPC method handler middleware for `wallet_upgradeAccount`
+ *
+ * @param req - The JSON RPC request's end callback.
+ * @param res - The JSON RPC request's pending response object.
+ * @param hooks - The hooks required for account upgrade functionality.
+ */
+async function walletUpgradeAccount(req, res, hooks) {
+    const { params, origin } = req;
+    // Validate parameters using Superstruct
+    (0, utils_1.validateParams)(params, types_1.UpgradeAccountParamsStruct);
+    const { account, chainId } = params;
+    // Validate and normalize the account address with authorization check
+    const normalizedAccount = await (0, utils_1.validateAndNormalizeAddress)(account, origin, hooks.getPermittedAccountsForOrigin);
+    // Use current app selected chain ID if not passed as a param
+    let targetChainId;
+    if (chainId !== undefined) {
+        targetChainId = chainId;
+    }
+    else {
+        const currentChainIdForDomain = hooks.getCurrentChainIdForDomain(origin);
+        if (!currentChainIdForDomain) {
+            throw rpc_errors_1.rpcErrors.invalidParams({
+                message: `No network configuration found for origin: ${origin}`,
+            });
+        }
+        targetChainId = currentChainIdForDomain;
+    }
+    try {
+        // Get the EIP7702 network configuration for the target chain
+        const hexChainId = targetChainId;
+        const { isSupported, upgradeContractAddress } = await hooks.isEip7702Supported({
+            address: normalizedAccount,
+            chainId: hexChainId,
+        });
+        if (!isSupported) {
+            throw rpc_errors_1.rpcErrors.invalidParams({
+                message: `Account upgrade not supported on chain ID ${targetChainId}`,
+            });
+        }
+        if (!upgradeContractAddress) {
+            throw rpc_errors_1.rpcErrors.invalidParams({
+                message: `No upgrade contract address available for chain ID ${targetChainId}`,
+            });
+        }
+        // Perform the upgrade using existing EIP-7702 functionality
+        const result = await hooks.upgradeAccount(normalizedAccount, upgradeContractAddress, targetChainId);
+        res.result = {
+            transactionHash: result.transactionHash,
+            upgradedAccount: normalizedAccount,
+            delegatedTo: result.delegatedTo,
+        };
+    }
+    catch (error) {
+        // Re-throw RPC errors as-is
+        if (error instanceof rpc_errors_1.JsonRpcError) {
+            throw error;
+        }
+        throw rpc_errors_1.rpcErrors.internal({
+            message: `Failed to upgrade account: ${error instanceof Error ? error.message : String(error)}`,
+        });
+    }
+}
+exports.walletUpgradeAccount = walletUpgradeAccount;
+//# sourceMappingURL=wallet_upgradeAccount.cjs.map

package/dist/wallet_upgradeAccount.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet_upgradeAccount.cjs","sourceRoot":"","sources":["../src/wallet_upgradeAccount.ts"],"names":[],"mappings":";;;AAAA,qDAA+D;AAQ/D,uCAAqD;AACrD,uCAAsE;AAgBtE;;;;;;GAMG;AACI,KAAK,UAAU,oBAAoB,CACxC,GAA8D,EAC9D,GAA2B,EAC3B,KAAgC;IAEhC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IAE/B,wCAAwC;IACxC,IAAA,sBAAc,EAAC,MAAM,EAAE,kCAA0B,CAAC,CAAC;IAEnD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAEpC,sEAAsE;IACtE,MAAM,iBAAiB,GAAG,MAAM,IAAA,mCAA2B,EACzD,OAAO,EACP,MAAM,EACN,KAAK,CAAC,6BAA6B,CACpC,CAAC;IAEF,6DAA6D;IAC7D,IAAI,aAAkB,CAAC;IACvB,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,aAAa,GAAG,OAAO,CAAC;KACzB;SAAM;QACL,MAAM,uBAAuB,GAAG,KAAK,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QACzE,IAAI,CAAC,uBAAuB,EAAE;YAC5B,MAAM,sBAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,8CAA8C,MAAM,EAAE;aAChE,CAAC,CAAC;SACJ;QACD,aAAa,GAAG,uBAAuB,CAAC;KACzC;IAED,IAAI;QACF,6DAA6D;QAC7D,MAAM,UAAU,GAAG,aAAa,CAAC;QACjC,MAAM,EAAE,WAAW,EAAE,sBAAsB,EAAE,GAC3C,MAAM,KAAK,CAAC,kBAAkB,CAAC;YAC7B,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,UAAU;SACpB,CAAC,CAAC;QAEL,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,sBAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,6CAA6C,aAAa,EAAE;aACtE,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,sBAAsB,EAAE;YAC3B,MAAM,sBAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,sDAAsD,aAAa,EAAE;aAC/E,CAAC,CAAC;SACJ;QAED,4DAA4D;QAC5D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,cAAc,CACvC,iBAAiB,EACjB,sBAAsB,EACtB,aAAa,CACd,CAAC;QAEF,GAAG,CAAC,MAAM,GAAG;YACX,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,eAAe,EAAE,iBAAiB;YAClC,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC;KACH;IAAC,OAAO,KAAK,EAAE;QACd,4BAA4B;QAC5B,IAAI,KAAK,YAAY,yBAAY,EAAE;YACjC,MAAM,KAAK,CAAC;SACb;QACD,MAAM,sBAAS,CAAC,QAAQ,CAAC;YACvB,OAAO,EAAE,8BAA8B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;SAChG,CAAC,CAAC;KACJ;AACH,CAAC;AA3ED,oDA2EC","sourcesContent":["import { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n  Hex,\n} from '@metamask/utils';\n\nimport type { UpgradeAccountParams } from './types';\nimport { UpgradeAccountParamsStruct } from './types';\nimport { validateParams, validateAndNormalizeAddress } from './utils';\n\nexport type WalletUpgradeAccountHooks = {\n  upgradeAccount: (\n    address: string,\n    upgradeContractAddress: string,\n    chainId?: Hex,\n  ) => Promise<{ transactionHash: string; delegatedTo: string }>;\n  getCurrentChainIdForDomain: (origin: string) => Hex | null;\n  isEip7702Supported: (request: { address: string; chainId: Hex }) => Promise<{\n    isSupported: boolean;\n    upgradeContractAddress?: string;\n  }>;\n  getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>;\n};\n\n/**\n * The RPC method handler middleware for `wallet_upgradeAccount`\n *\n * @param req - The JSON RPC request's end callback.\n * @param res - The JSON RPC request's pending response object.\n * @param hooks - The hooks required for account upgrade functionality.\n */\nexport async function walletUpgradeAccount(\n  req: JsonRpcRequest<UpgradeAccountParams> & { origin: string },\n  res: PendingJsonRpcResponse,\n  hooks: WalletUpgradeAccountHooks,\n): Promise<void> {\n  const { params, origin } = req;\n\n  // Validate parameters using Superstruct\n  validateParams(params, UpgradeAccountParamsStruct);\n\n  const { account, chainId } = params;\n\n  // Validate and normalize the account address with authorization check\n  const normalizedAccount = await validateAndNormalizeAddress(\n    account,\n    origin,\n    hooks.getPermittedAccountsForOrigin,\n  );\n\n  // Use current app selected chain ID if not passed as a param\n  let targetChainId: Hex;\n  if (chainId !== undefined) {\n    targetChainId = chainId;\n  } else {\n    const currentChainIdForDomain = hooks.getCurrentChainIdForDomain(origin);\n    if (!currentChainIdForDomain) {\n      throw rpcErrors.invalidParams({\n        message: `No network configuration found for origin: ${origin}`,\n      });\n    }\n    targetChainId = currentChainIdForDomain;\n  }\n\n  try {\n    // Get the EIP7702 network configuration for the target chain\n    const hexChainId = targetChainId;\n    const { isSupported, upgradeContractAddress } =\n      await hooks.isEip7702Supported({\n        address: normalizedAccount,\n        chainId: hexChainId,\n      });\n\n    if (!isSupported) {\n      throw rpcErrors.invalidParams({\n        message: `Account upgrade not supported on chain ID ${targetChainId}`,\n      });\n    }\n\n    if (!upgradeContractAddress) {\n      throw rpcErrors.invalidParams({\n        message: `No upgrade contract address available for chain ID ${targetChainId}`,\n      });\n    }\n\n    // Perform the upgrade using existing EIP-7702 functionality\n    const result = await hooks.upgradeAccount(\n      normalizedAccount,\n      upgradeContractAddress,\n      targetChainId,\n    );\n\n    res.result = {\n      transactionHash: result.transactionHash,\n      upgradedAccount: normalizedAccount,\n      delegatedTo: result.delegatedTo,\n    };\n  } catch (error) {\n    // Re-throw RPC errors as-is\n    if (error instanceof JsonRpcError) {\n      throw error;\n    }\n    throw rpcErrors.internal({\n      message: `Failed to upgrade account: ${error instanceof Error ? error.message : String(error)}`,\n    });\n  }\n}\n"]}

package/dist/wallet_upgradeAccount.d.cts

@@ -0,0 +1,28 @@
+import type { JsonRpcRequest, PendingJsonRpcResponse, Hex } from "@metamask/utils";
+import type { UpgradeAccountParams } from "./types.cjs";
+export type WalletUpgradeAccountHooks = {
+    upgradeAccount: (address: string, upgradeContractAddress: string, chainId?: Hex) => Promise<{
+        transactionHash: string;
+        delegatedTo: string;
+    }>;
+    getCurrentChainIdForDomain: (origin: string) => Hex | null;
+    isEip7702Supported: (request: {
+        address: string;
+        chainId: Hex;
+    }) => Promise<{
+        isSupported: boolean;
+        upgradeContractAddress?: string;
+    }>;
+    getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>;
+};
+/**
+ * The RPC method handler middleware for `wallet_upgradeAccount`
+ *
+ * @param req - The JSON RPC request's end callback.
+ * @param res - The JSON RPC request's pending response object.
+ * @param hooks - The hooks required for account upgrade functionality.
+ */
+export declare function walletUpgradeAccount(req: JsonRpcRequest<UpgradeAccountParams> & {
+    origin: string;
+}, res: PendingJsonRpcResponse, hooks: WalletUpgradeAccountHooks): Promise<void>;
+//# sourceMappingURL=wallet_upgradeAccount.d.cts.map

package/dist/wallet_upgradeAccount.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet_upgradeAccount.d.cts","sourceRoot":"","sources":["../src/wallet_upgradeAccount.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,GAAG,EACJ,wBAAwB;AAEzB,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAgB;AAIpD,MAAM,MAAM,yBAAyB,GAAG;IACtC,cAAc,EAAE,CACd,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAC9B,OAAO,CAAC,EAAE,GAAG,KACV,OAAO,CAAC;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/D,0BAA0B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,GAAG,GAAG,IAAI,CAAC;IAC3D,kBAAkB,EAAE,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC;QAC1E,WAAW,EAAE,OAAO,CAAC;QACrB,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC,CAAC;IACH,6BAA6B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACtE,CAAC;AAEF;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,cAAc,CAAC,oBAAoB,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC9D,GAAG,EAAE,sBAAsB,EAC3B,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAuEf"}

package/dist/wallet_upgradeAccount.d.mts

@@ -0,0 +1,28 @@
+import type { JsonRpcRequest, PendingJsonRpcResponse, Hex } from "@metamask/utils";
+import type { UpgradeAccountParams } from "./types.mjs";
+export type WalletUpgradeAccountHooks = {
+    upgradeAccount: (address: string, upgradeContractAddress: string, chainId?: Hex) => Promise<{
+        transactionHash: string;
+        delegatedTo: string;
+    }>;
+    getCurrentChainIdForDomain: (origin: string) => Hex | null;
+    isEip7702Supported: (request: {
+        address: string;
+        chainId: Hex;
+    }) => Promise<{
+        isSupported: boolean;
+        upgradeContractAddress?: string;
+    }>;
+    getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>;
+};
+/**
+ * The RPC method handler middleware for `wallet_upgradeAccount`
+ *
+ * @param req - The JSON RPC request's end callback.
+ * @param res - The JSON RPC request's pending response object.
+ * @param hooks - The hooks required for account upgrade functionality.
+ */
+export declare function walletUpgradeAccount(req: JsonRpcRequest<UpgradeAccountParams> & {
+    origin: string;
+}, res: PendingJsonRpcResponse, hooks: WalletUpgradeAccountHooks): Promise<void>;
+//# sourceMappingURL=wallet_upgradeAccount.d.mts.map

package/dist/wallet_upgradeAccount.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet_upgradeAccount.d.mts","sourceRoot":"","sources":["../src/wallet_upgradeAccount.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EACd,sBAAsB,EACtB,GAAG,EACJ,wBAAwB;AAEzB,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAgB;AAIpD,MAAM,MAAM,yBAAyB,GAAG;IACtC,cAAc,EAAE,CACd,OAAO,EAAE,MAAM,EACf,sBAAsB,EAAE,MAAM,EAC9B,OAAO,CAAC,EAAE,GAAG,KACV,OAAO,CAAC;QAAE,eAAe,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/D,0BAA0B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,GAAG,GAAG,IAAI,CAAC;IAC3D,kBAAkB,EAAE,CAAC,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,GAAG,CAAA;KAAE,KAAK,OAAO,CAAC;QAC1E,WAAW,EAAE,OAAO,CAAC;QACrB,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC,CAAC;IACH,6BAA6B,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACtE,CAAC;AAEF;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,GAAG,EAAE,cAAc,CAAC,oBAAoB,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAC9D,GAAG,EAAE,sBAAsB,EAC3B,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,IAAI,CAAC,CAuEf"}

package/dist/wallet_upgradeAccount.mjs

@@ -0,0 +1,67 @@
+import { JsonRpcError, rpcErrors } from "@metamask/rpc-errors";
+import { UpgradeAccountParamsStruct } from "./types.mjs";
+import { validateParams, validateAndNormalizeAddress } from "./utils.mjs";
+/**
+ * The RPC method handler middleware for `wallet_upgradeAccount`
+ *
+ * @param req - The JSON RPC request's end callback.
+ * @param res - The JSON RPC request's pending response object.
+ * @param hooks - The hooks required for account upgrade functionality.
+ */
+export async function walletUpgradeAccount(req, res, hooks) {
+    const { params, origin } = req;
+    // Validate parameters using Superstruct
+    validateParams(params, UpgradeAccountParamsStruct);
+    const { account, chainId } = params;
+    // Validate and normalize the account address with authorization check
+    const normalizedAccount = await validateAndNormalizeAddress(account, origin, hooks.getPermittedAccountsForOrigin);
+    // Use current app selected chain ID if not passed as a param
+    let targetChainId;
+    if (chainId !== undefined) {
+        targetChainId = chainId;
+    }
+    else {
+        const currentChainIdForDomain = hooks.getCurrentChainIdForDomain(origin);
+        if (!currentChainIdForDomain) {
+            throw rpcErrors.invalidParams({
+                message: `No network configuration found for origin: ${origin}`,
+            });
+        }
+        targetChainId = currentChainIdForDomain;
+    }
+    try {
+        // Get the EIP7702 network configuration for the target chain
+        const hexChainId = targetChainId;
+        const { isSupported, upgradeContractAddress } = await hooks.isEip7702Supported({
+            address: normalizedAccount,
+            chainId: hexChainId,
+        });
+        if (!isSupported) {
+            throw rpcErrors.invalidParams({
+                message: `Account upgrade not supported on chain ID ${targetChainId}`,
+            });
+        }
+        if (!upgradeContractAddress) {
+            throw rpcErrors.invalidParams({
+                message: `No upgrade contract address available for chain ID ${targetChainId}`,
+            });
+        }
+        // Perform the upgrade using existing EIP-7702 functionality
+        const result = await hooks.upgradeAccount(normalizedAccount, upgradeContractAddress, targetChainId);
+        res.result = {
+            transactionHash: result.transactionHash,
+            upgradedAccount: normalizedAccount,
+            delegatedTo: result.delegatedTo,
+        };
+    }
+    catch (error) {
+        // Re-throw RPC errors as-is
+        if (error instanceof JsonRpcError) {
+            throw error;
+        }
+        throw rpcErrors.internal({
+            message: `Failed to upgrade account: ${error instanceof Error ? error.message : String(error)}`,
+        });
+    }
+}
+//# sourceMappingURL=wallet_upgradeAccount.mjs.map

package/dist/wallet_upgradeAccount.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet_upgradeAccount.mjs","sourceRoot":"","sources":["../src/wallet_upgradeAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,6BAA6B;AAQ/D,OAAO,EAAE,0BAA0B,EAAE,oBAAgB;AACrD,OAAO,EAAE,cAAc,EAAE,2BAA2B,EAAE,oBAAgB;AAgBtE;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,GAA8D,EAC9D,GAA2B,EAC3B,KAAgC;IAEhC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IAE/B,wCAAwC;IACxC,cAAc,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IAEnD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAEpC,sEAAsE;IACtE,MAAM,iBAAiB,GAAG,MAAM,2BAA2B,CACzD,OAAO,EACP,MAAM,EACN,KAAK,CAAC,6BAA6B,CACpC,CAAC;IAEF,6DAA6D;IAC7D,IAAI,aAAkB,CAAC;IACvB,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,aAAa,GAAG,OAAO,CAAC;KACzB;SAAM;QACL,MAAM,uBAAuB,GAAG,KAAK,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC;QACzE,IAAI,CAAC,uBAAuB,EAAE;YAC5B,MAAM,SAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,8CAA8C,MAAM,EAAE;aAChE,CAAC,CAAC;SACJ;QACD,aAAa,GAAG,uBAAuB,CAAC;KACzC;IAED,IAAI;QACF,6DAA6D;QAC7D,MAAM,UAAU,GAAG,aAAa,CAAC;QACjC,MAAM,EAAE,WAAW,EAAE,sBAAsB,EAAE,GAC3C,MAAM,KAAK,CAAC,kBAAkB,CAAC;YAC7B,OAAO,EAAE,iBAAiB;YAC1B,OAAO,EAAE,UAAU;SACpB,CAAC,CAAC;QAEL,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,SAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,6CAA6C,aAAa,EAAE;aACtE,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,sBAAsB,EAAE;YAC3B,MAAM,SAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,sDAAsD,aAAa,EAAE;aAC/E,CAAC,CAAC;SACJ;QAED,4DAA4D;QAC5D,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,cAAc,CACvC,iBAAiB,EACjB,sBAAsB,EACtB,aAAa,CACd,CAAC;QAEF,GAAG,CAAC,MAAM,GAAG;YACX,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,eAAe,EAAE,iBAAiB;YAClC,WAAW,EAAE,MAAM,CAAC,WAAW;SAChC,CAAC;KACH;IAAC,OAAO,KAAK,EAAE;QACd,4BAA4B;QAC5B,IAAI,KAAK,YAAY,YAAY,EAAE;YACjC,MAAM,KAAK,CAAC;SACb;QACD,MAAM,SAAS,CAAC,QAAQ,CAAC;YACvB,OAAO,EAAE,8BAA8B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;SAChG,CAAC,CAAC;KACJ;AACH,CAAC","sourcesContent":["import { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport type {\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n  Hex,\n} from '@metamask/utils';\n\nimport type { UpgradeAccountParams } from './types';\nimport { UpgradeAccountParamsStruct } from './types';\nimport { validateParams, validateAndNormalizeAddress } from './utils';\n\nexport type WalletUpgradeAccountHooks = {\n  upgradeAccount: (\n    address: string,\n    upgradeContractAddress: string,\n    chainId?: Hex,\n  ) => Promise<{ transactionHash: string; delegatedTo: string }>;\n  getCurrentChainIdForDomain: (origin: string) => Hex | null;\n  isEip7702Supported: (request: { address: string; chainId: Hex }) => Promise<{\n    isSupported: boolean;\n    upgradeContractAddress?: string;\n  }>;\n  getPermittedAccountsForOrigin: (origin: string) => Promise<string[]>;\n};\n\n/**\n * The RPC method handler middleware for `wallet_upgradeAccount`\n *\n * @param req - The JSON RPC request's end callback.\n * @param res - The JSON RPC request's pending response object.\n * @param hooks - The hooks required for account upgrade functionality.\n */\nexport async function walletUpgradeAccount(\n  req: JsonRpcRequest<UpgradeAccountParams> & { origin: string },\n  res: PendingJsonRpcResponse,\n  hooks: WalletUpgradeAccountHooks,\n): Promise<void> {\n  const { params, origin } = req;\n\n  // Validate parameters using Superstruct\n  validateParams(params, UpgradeAccountParamsStruct);\n\n  const { account, chainId } = params;\n\n  // Validate and normalize the account address with authorization check\n  const normalizedAccount = await validateAndNormalizeAddress(\n    account,\n    origin,\n    hooks.getPermittedAccountsForOrigin,\n  );\n\n  // Use current app selected chain ID if not passed as a param\n  let targetChainId: Hex;\n  if (chainId !== undefined) {\n    targetChainId = chainId;\n  } else {\n    const currentChainIdForDomain = hooks.getCurrentChainIdForDomain(origin);\n    if (!currentChainIdForDomain) {\n      throw rpcErrors.invalidParams({\n        message: `No network configuration found for origin: ${origin}`,\n      });\n    }\n    targetChainId = currentChainIdForDomain;\n  }\n\n  try {\n    // Get the EIP7702 network configuration for the target chain\n    const hexChainId = targetChainId;\n    const { isSupported, upgradeContractAddress } =\n      await hooks.isEip7702Supported({\n        address: normalizedAccount,\n        chainId: hexChainId,\n      });\n\n    if (!isSupported) {\n      throw rpcErrors.invalidParams({\n        message: `Account upgrade not supported on chain ID ${targetChainId}`,\n      });\n    }\n\n    if (!upgradeContractAddress) {\n      throw rpcErrors.invalidParams({\n        message: `No upgrade contract address available for chain ID ${targetChainId}`,\n      });\n    }\n\n    // Perform the upgrade using existing EIP-7702 functionality\n    const result = await hooks.upgradeAccount(\n      normalizedAccount,\n      upgradeContractAddress,\n      targetChainId,\n    );\n\n    res.result = {\n      transactionHash: result.transactionHash,\n      upgradedAccount: normalizedAccount,\n      delegatedTo: result.delegatedTo,\n    };\n  } catch (error) {\n    // Re-throw RPC errors as-is\n    if (error instanceof JsonRpcError) {\n      throw error;\n    }\n    throw rpcErrors.internal({\n      message: `Failed to upgrade account: ${error instanceof Error ? error.message : String(error)}`,\n    });\n  }\n}\n"]}

package/package.json

@@ -0,0 +1,72 @@
+{
+  "name": "@metamask-previews/eip-7702-internal-rpc-middleware",
+  "version": "0.0.0-preview-8504447",
+  "description": "Implements internal JSON-RPC methods for EIP-7702 account upgrade functionality",
+  "keywords": [
+    "MetaMask",
+    "Ethereum"
+  ],
+  "homepage": "https://github.com/MetaMask/core/tree/main/packages/eip-7702-internal-rpc-middleware#readme",
+  "bugs": {
+    "url": "https://github.com/MetaMask/core/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/MetaMask/core.git"
+  },
+  "license": "MIT",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
+    },
+    "./package.json": "./package.json"
+  },
+  "main": "./dist/index.cjs",
+  "types": "./dist/index.d.cts",
+  "files": [
+    "dist/"
+  ],
+  "scripts": {
+    "build": "ts-bridge --project tsconfig.build.json --verbose --clean --no-references",
+    "build:docs": "typedoc",
+    "changelog:update": "../../scripts/update-changelog.sh @metamask/eip-7702-internal-rpc-middleware",
+    "changelog:validate": "../../scripts/validate-changelog.sh @metamask/eip-7702-internal-rpc-middleware",
+    "publish:preview": "yarn npm publish --tag preview",
+    "since-latest-release": "../../scripts/since-latest-release.sh",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
+    "test:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
+    "test:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
+    "test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
+  },
+  "dependencies": {
+    "@metamask/controller-utils": "^11.14.1",
+    "@metamask/rpc-errors": "^7.0.2",
+    "@metamask/superstruct": "^3.1.0",
+    "@metamask/utils": "^11.8.1"
+  },
+  "devDependencies": {
+    "@metamask/auto-changelog": "^3.4.4",
+    "@types/jest": "^27.4.1",
+    "deepmerge": "^4.2.2",
+    "jest": "^27.5.1",
+    "ts-jest": "^27.1.4",
+    "typedoc": "^0.24.8",
+    "typedoc-plugin-missing-exports": "^2.0.0",
+    "typescript": "~5.2.2"
+  },
+  "engines": {
+    "node": "^18.18 || >=20"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  }
+}