@metamask-previews/eth-json-rpc-middleware 21.0.0-preview-2e88eaea → 21.0.0-preview-c96ff8f

package/dist/utils/validation.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.cts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAe,8BAA8B;AAEjE,OAAO,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,wBAAwB;AAE3D,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,cAAc,EACnB,EAAE,WAAW,EAAE,EAAE;IAAE,WAAW,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;CAAE,GAC3E,OAAO,CAAC,GAAG,CAAC,CA0Bd;AAED,wBAAgB,cAAc,CAAC,UAAU,EACvC,KAAK,EAAE,OAAO,GAAG,UAAU,EAC3B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GACzB,OAAO,CAAC,KAAK,IAAI,UAAU,CAQ7B;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGrD"}
+{"version":3,"file":"validation.d.cts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAe,8BAA8B;AAEjE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,iBAAiB,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,EAC9C,EAAE,WAAW,EAAE,EAAE;IAAE,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;CAAE,GACtE,OAAO,CAAC,GAAG,CAAC,CA0Bd;AAED,wBAAgB,cAAc,CAAC,UAAU,EACvC,KAAK,EAAE,OAAO,GAAG,UAAU,EAC3B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GACzB,OAAO,CAAC,KAAK,IAAI,UAAU,CAQ7B;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGrD"}

package/dist/utils/validation.d.mts

@@ -1,7 +1,10 @@
+import type { MiddlewareContext } from "@metamask/json-rpc-engine/v2";
 import type { Struct } from "@metamask/superstruct";
-import type { Hex, JsonRpcRequest } from "@metamask/utils";
-export declare function validateAndNormalizeKeyholder(address: Hex, req: JsonRpcRequest, { getAccounts }: {
-    getAccounts: (req: JsonRpcRequest) => Promise<string[]>;
+import type { Hex } from "@metamask/utils";
+export declare function validateAndNormalizeKeyholder(address: Hex, context: MiddlewareContext<{
+    origin: string;
+}>, { getAccounts }: {
+    getAccounts: (origin: string) => Promise<string[]>;
 }): Promise<Hex>;
 export declare function validateParams<ParamsType>(value: unknown | ParamsType, struct: Struct<ParamsType>): asserts value is ParamsType;
 export declare function resemblesAddress(str: string): boolean;

package/dist/utils/validation.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.mts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAe,8BAA8B;AAEjE,OAAO,KAAK,EAAE,GAAG,EAAE,cAAc,EAAE,wBAAwB;AAE3D,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,GAAG,EACZ,GAAG,EAAE,cAAc,EACnB,EAAE,WAAW,EAAE,EAAE;IAAE,WAAW,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;CAAE,GAC3E,OAAO,CAAC,GAAG,CAAC,CA0Bd;AAED,wBAAgB,cAAc,CAAC,UAAU,EACvC,KAAK,EAAE,OAAO,GAAG,UAAU,EAC3B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GACzB,OAAO,CAAC,KAAK,IAAI,UAAU,CAQ7B;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGrD"}
+{"version":3,"file":"validation.d.mts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,qCAAqC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAe,8BAA8B;AAEjE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C,wBAAsB,6BAA6B,CACjD,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,iBAAiB,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,EAC9C,EAAE,WAAW,EAAE,EAAE;IAAE,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAA;CAAE,GACtE,OAAO,CAAC,GAAG,CAAC,CA0Bd;AAED,wBAAgB,cAAc,CAAC,UAAU,EACvC,KAAK,EAAE,OAAO,GAAG,UAAU,EAC3B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,GACzB,OAAO,CAAC,KAAK,IAAI,UAAU,CAQ7B;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAGrD"}

package/dist/utils/validation.mjs

@@ -1,12 +1,12 @@
 import { providerErrors, rpcErrors } from "@metamask/rpc-errors";
 import { validate } from "@metamask/superstruct";
-export async function validateAndNormalizeKeyholder(address, req, { getAccounts }) {
+export async function validateAndNormalizeKeyholder(address, context, { getAccounts }) {
     if (typeof address === 'string' &&
         address.length > 0 &&
         resemblesAddress(address)) {
         // Ensure that an "unauthorized" error is thrown if the requester
         // does not have the `eth_accounts` permission.
-        const accounts = await getAccounts(req);
+        const accounts = await getAccounts(context.assertGet('origin'));
         const normalizedAccounts = accounts.map((_address) => _address.toLowerCase());
         const normalizedAddress = address.toLowerCase();
         if (normalizedAccounts.includes(normalizedAddress)) {

package/dist/utils/validation.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"validation.mjs","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,6BAA6B;AAEjE,OAAO,EAAE,QAAQ,EAAE,8BAA8B;AAGjD,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,OAAY,EACZ,GAAmB,EACnB,EAAE,WAAW,EAA+D;IAE5E,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,CAAC,MAAM,GAAG,CAAC;QAClB,gBAAgB,CAAC,OAAO,CAAC,EACzB;QACA,iEAAiE;QACjE,+CAA+C;QAC/C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,CAAC;QAExC,MAAM,kBAAkB,GAAa,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC7D,QAAQ,CAAC,WAAW,EAAE,CACvB,CAAC;QAEF,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAS,CAAC;QAEvD,IAAI,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YAClD,OAAO,iBAAiB,CAAC;SAC1B;QAED,MAAM,cAAc,CAAC,YAAY,EAAE,CAAC;KACrC;IAED,MAAM,SAAS,CAAC,aAAa,CAAC;QAC5B,OAAO,EAAE,uDAAuD;KACjE,CAAC,CAAC;AACL,CAAC;AAED,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,gBAAgB,CAAC,CAC/C,CAAC;KACH;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAC1C,0BAA0B;IAC1B,OAAO,GAAG,CAAC,MAAM,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,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, JsonRpcRequest } from '@metamask/utils';\n\nexport async function validateAndNormalizeKeyholder(\n  address: Hex,\n  req: JsonRpcRequest,\n  { getAccounts }: { getAccounts: (req: JsonRpcRequest) => Promise<string[]> },\n): Promise<Hex> {\n  if (\n    typeof address === 'string' &&\n    address.length > 0 &&\n    resemblesAddress(address)\n  ) {\n    // Ensure that an \"unauthorized\" error is thrown if the requester\n    // does not have the `eth_accounts` permission.\n    const accounts = await getAccounts(req);\n\n    const normalizedAccounts: string[] = accounts.map((_address) =>\n      _address.toLowerCase(),\n    );\n\n    const normalizedAddress = address.toLowerCase() as Hex;\n\n    if (normalizedAccounts.includes(normalizedAddress)) {\n      return normalizedAddress;\n    }\n\n    throw providerErrors.unauthorized();\n  }\n\n  throw rpcErrors.invalidParams({\n    message: `Invalid parameters: must provide an Ethereum address.`,\n  });\n}\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 params`),\n    );\n  }\n}\n\nexport function resemblesAddress(str: string): boolean {\n  // hex prefix 2 + 20 bytes\n  return str.length === 2 + 20 * 2;\n}\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"]}
+{"version":3,"file":"validation.mjs","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,6BAA6B;AAEjE,OAAO,EAAE,QAAQ,EAAE,8BAA8B;AAGjD,MAAM,CAAC,KAAK,UAAU,6BAA6B,CACjD,OAAY,EACZ,OAA8C,EAC9C,EAAE,WAAW,EAA0D;IAEvE,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,CAAC,MAAM,GAAG,CAAC;QAClB,gBAAgB,CAAC,OAAO,CAAC,EACzB;QACA,iEAAiE;QACjE,+CAA+C;QAC/C,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEhE,MAAM,kBAAkB,GAAa,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC7D,QAAQ,CAAC,WAAW,EAAE,CACvB,CAAC;QAEF,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAS,CAAC;QAEvD,IAAI,kBAAkB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YAClD,OAAO,iBAAiB,CAAC;SAC1B;QAED,MAAM,cAAc,CAAC,YAAY,EAAE,CAAC;KACrC;IAED,MAAM,SAAS,CAAC,aAAa,CAAC;QAC5B,OAAO,EAAE,uDAAuD;KACjE,CAAC,CAAC;AACL,CAAC;AAED,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,gBAAgB,CAAC,CAC/C,CAAC;KACH;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAC1C,0BAA0B;IAC1B,OAAO,GAAG,CAAC,MAAM,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,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 type { MiddlewareContext } from '@metamask/json-rpc-engine/v2';\nimport { providerErrors, rpcErrors } from '@metamask/rpc-errors';\nimport type { Struct, StructError } from '@metamask/superstruct';\nimport { validate } from '@metamask/superstruct';\nimport type { Hex } from '@metamask/utils';\n\nexport async function validateAndNormalizeKeyholder(\n  address: Hex,\n  context: MiddlewareContext<{ origin: string }>,\n  { getAccounts }: { getAccounts: (origin: string) => Promise<string[]> },\n): Promise<Hex> {\n  if (\n    typeof address === 'string' &&\n    address.length > 0 &&\n    resemblesAddress(address)\n  ) {\n    // Ensure that an \"unauthorized\" error is thrown if the requester\n    // does not have the `eth_accounts` permission.\n    const accounts = await getAccounts(context.assertGet('origin'));\n\n    const normalizedAccounts: string[] = accounts.map((_address) =>\n      _address.toLowerCase(),\n    );\n\n    const normalizedAddress = address.toLowerCase() as Hex;\n\n    if (normalizedAccounts.includes(normalizedAddress)) {\n      return normalizedAddress;\n    }\n\n    throw providerErrors.unauthorized();\n  }\n\n  throw rpcErrors.invalidParams({\n    message: `Invalid parameters: must provide an Ethereum address.`,\n  });\n}\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 params`),\n    );\n  }\n}\n\nexport function resemblesAddress(str: string): boolean {\n  // hex prefix 2 + 20 bytes\n  return str.length === 2 + 20 * 2;\n}\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.cjs

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createWalletMiddleware = void 0;
 const sigUtil = __importStar(require("@metamask/eth-sig-util"));
-const json_rpc_engine_1 = require("@metamask/json-rpc-engine");
+const v2_1 = require("@metamask/json-rpc-engine/v2");
 const rpc_errors_1 = require("@metamask/rpc-errors");
 const utils_1 = require("@metamask/utils");
 const wallet_request_execution_permissions_1 = require("./methods/wallet-request-execution-permissions.cjs");
@@ -37,89 +37,89 @@ function createWalletMiddleware({ getAccounts, processDecryptMessage, processEnc
     if (!getAccounts) {
         throw new Error('opts.getAccounts is required');
     }
-    return (0, json_rpc_engine_1.createScaffoldMiddleware)({
+    return (0, v2_1.createScaffoldMiddleware)({
         // account lookups
-        eth_accounts: (0, json_rpc_engine_1.createAsyncMiddleware)(lookupAccounts),
-        eth_coinbase: (0, json_rpc_engine_1.createAsyncMiddleware)(lookupDefaultAccount),
+        eth_accounts: lookupAccounts,
+        eth_coinbase: lookupDefaultAccount,
         // tx signatures
-        eth_sendTransaction: (0, json_rpc_engine_1.createAsyncMiddleware)(sendTransaction),
-        eth_signTransaction: (0, json_rpc_engine_1.createAsyncMiddleware)(signTransaction),
+        eth_sendTransaction: sendTransaction,
+        eth_signTransaction: signTransaction,
         // message signatures
-        eth_signTypedData: (0, json_rpc_engine_1.createAsyncMiddleware)(signTypedData),
-        eth_signTypedData_v3: (0, json_rpc_engine_1.createAsyncMiddleware)(signTypedDataV3),
-        eth_signTypedData_v4: (0, json_rpc_engine_1.createAsyncMiddleware)(signTypedDataV4),
-        personal_sign: (0, json_rpc_engine_1.createAsyncMiddleware)(personalSign),
-        eth_getEncryptionPublicKey: (0, json_rpc_engine_1.createAsyncMiddleware)(encryptionPublicKey),
-        eth_decrypt: (0, json_rpc_engine_1.createAsyncMiddleware)(decryptMessage),
-        personal_ecRecover: (0, json_rpc_engine_1.createAsyncMiddleware)(personalRecover),
+        eth_signTypedData: signTypedData,
+        eth_signTypedData_v3: signTypedDataV3,
+        eth_signTypedData_v4: signTypedDataV4,
+        personal_sign: personalSign,
+        eth_getEncryptionPublicKey: encryptionPublicKey,
+        eth_decrypt: decryptMessage,
+        personal_ecRecover: personalRecover,
         // EIP-7715
-        wallet_requestExecutionPermissions: (0, json_rpc_engine_1.createAsyncMiddleware)(async (req, res) => (0, wallet_request_execution_permissions_1.walletRequestExecutionPermissions)(req, res, {
+        wallet_requestExecutionPermissions: (0, wallet_request_execution_permissions_1.createWalletRequestExecutionPermissionsHandler)({
             processRequestExecutionPermissions,
-        })),
-        wallet_revokeExecutionPermission: (0, json_rpc_engine_1.createAsyncMiddleware)(async (req, res) => (0, wallet_revoke_execution_permission_1.walletRevokeExecutionPermission)(req, res, {
+        }),
+        wallet_revokeExecutionPermission: (0, wallet_revoke_execution_permission_1.createWalletRevokeExecutionPermissionHandler)({
             processRevokeExecutionPermission,
-        })),
+        }),
     });
     //
     // account lookups
     //
-    async function lookupAccounts(req, res) {
-        res.result = await getAccounts(req);
+    async function lookupAccounts({ context, }) {
+        return await getAccounts(context.assertGet('origin'));
     }
-    async function lookupDefaultAccount(req, res) {
-        const accounts = await getAccounts(req);
-        res.result = accounts[0] || null;
+    async function lookupDefaultAccount({ context, }) {
+        const accounts = await getAccounts(context.assertGet('origin'));
+        return accounts[0] || null;
     }
     //
     // transaction signatures
     //
-    async function sendTransaction(req, res) {
+    async function sendTransaction({ request, context, }) {
         if (!processTransaction) {
             throw rpc_errors_1.rpcErrors.methodNotSupported();
         }
-        if (!req.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 1)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 1)) {
             throw rpc_errors_1.rpcErrors.invalidInput();
         }
-        const params = req.params[0];
+        const params = request.params[0];
         const txParams = {
             ...params,
-            from: await validateAndNormalizeKeyholder(params?.from || '', req),
+            from: await validateAndNormalizeKeyholder(params?.from || '', context),
         };
-        res.result = await processTransaction(txParams, req);
+        return await processTransaction(txParams, request);
     }
-    async function signTransaction(req, res) {
+    async function signTransaction({ request, context, }) {
         if (!processSignTransaction) {
             throw rpc_errors_1.rpcErrors.methodNotSupported();
         }
-        if (!req.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 1)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 1)) {
             throw rpc_errors_1.rpcErrors.invalidInput();
         }
-        const params = req.params[0];
+        const params = request.params[0];
         const txParams = {
             ...params,
-            from: await validateAndNormalizeKeyholder(params?.from || '', req),
+            from: await validateAndNormalizeKeyholder(params?.from || '', context),
         };
-        res.result = await processSignTransaction(txParams, req);
+        return await processSignTransaction(txParams, request);
     }
     //
     // message signatures
     //
-    async function signTypedData(req, res) {
+    async function signTypedData({ request, context, }) {
         if (!processTypedMessage) {
             throw rpc_errors_1.rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 2)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 2)) {
             throw rpc_errors_1.rpcErrors.invalidInput();
         }
-        const params = req.params;
+        const params = request.params;
         const message = params[0];
-        const address = await validateAndNormalizeKeyholder(params[1], req);
+        const address = await validateAndNormalizeKeyholder(params[1], context);
         const version = 'V1';
         const extraParams = params[2] || {};
         const msgParams = {
@@ -129,19 +129,19 @@ function createWalletMiddleware({ getAccounts, processDecryptMessage, processEnc
             signatureMethod: 'eth_signTypedData',
             version,
         };
-        res.result = await processTypedMessage(msgParams, req, version);
+        return await processTypedMessage(msgParams, request, version);
     }
-    async function signTypedDataV3(req, res) {
+    async function signTypedDataV3({ request, context, }) {
         if (!processTypedMessageV3) {
             throw rpc_errors_1.rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 2)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 2)) {
             throw rpc_errors_1.rpcErrors.invalidInput();
         }
-        const params = req.params;
-        const address = await validateAndNormalizeKeyholder(params[0], req);
+        const params = request.params;
+        const address = await validateAndNormalizeKeyholder(params[0], context);
         const message = (0, normalize_1.normalizeTypedMessage)(params[1]);
         validatePrimaryType(message);
         validateVerifyingContract(message);
@@ -152,19 +152,19 @@ function createWalletMiddleware({ getAccounts, processDecryptMessage, processEnc
             version,
             signatureMethod: 'eth_signTypedData_v3',
         };
-        res.result = await processTypedMessageV3(msgParams, req, version);
+        return await processTypedMessageV3(msgParams, request, version);
     }
-    async function signTypedDataV4(req, res) {
+    async function signTypedDataV4({ request, context, }) {
         if (!processTypedMessageV4) {
             throw rpc_errors_1.rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 2)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 2)) {
             throw rpc_errors_1.rpcErrors.invalidInput();
         }
-        const params = req.params;
-        const address = await validateAndNormalizeKeyholder(params[0], req);
+        const params = request.params;
+        const address = await validateAndNormalizeKeyholder(params[0], context);
         const message = (0, normalize_1.normalizeTypedMessage)(params[1]);
         validatePrimaryType(message);
         validateVerifyingContract(message);
@@ -175,18 +175,18 @@ function createWalletMiddleware({ getAccounts, processDecryptMessage, processEnc
             version,
             signatureMethod: 'eth_signTypedData_v4',
         };
-        res.result = await processTypedMessageV4(msgParams, req, version);
+        return await processTypedMessageV4(msgParams, request, version);
     }
-    async function personalSign(req, res) {
+    async function personalSign({ request, context, }) {
         if (!processPersonalMessage) {
             throw rpc_errors_1.rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 2)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 2)) {
             throw rpc_errors_1.rpcErrors.invalidInput();
         }
-        const params = req.params;
+        const params = request.params;
         // process normally
         const firstParam = params[0];
         const secondParam = params[1];
@@ -201,11 +201,6 @@ function createWalletMiddleware({ getAccounts, processDecryptMessage, processEnc
         // and the second param is definitely not, but is hex.
         let address, message;
         if ((0, validation_1.resemblesAddress)(firstParam) && !(0, validation_1.resemblesAddress)(secondParam)) {
-            let warning = `The eth_personalSign method requires params ordered `;
-            warning += `[message, address]. This was previously handled incorrectly, `;
-            warning += `and has been corrected automatically. `;
-            warning += `Please switch this param order for smooth behavior in the future.`;
-            res.warning = warning;
             address = firstParam;
             message = secondParam;
         }
@@ -213,62 +208,62 @@ function createWalletMiddleware({ getAccounts, processDecryptMessage, processEnc
             message = firstParam;
             address = secondParam;
         }
-        address = await validateAndNormalizeKeyholder(address, req);
+        address = await validateAndNormalizeKeyholder(address, context);
         const msgParams = {
             ...extraParams,
             from: address,
             data: message,
             signatureMethod: 'personal_sign',
         };
-        res.result = await processPersonalMessage(msgParams, req);
+        return await processPersonalMessage(msgParams, request);
     }
-    async function personalRecover(req, res) {
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 2)) {
+    async function personalRecover({ request, }) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 2)) {
             throw rpc_errors_1.rpcErrors.invalidInput();
         }
-        const params = req.params;
+        const params = request.params;
         const message = params[0];
         const signature = params[1];
         const signerAddress = sigUtil.recoverPersonalSignature({
             data: message,
             signature,
         });
-        res.result = signerAddress;
+        return signerAddress;
     }
-    async function encryptionPublicKey(req, res) {
+    async function encryptionPublicKey({ request, context, }) {
         if (!processEncryptionPublicKey) {
             throw rpc_errors_1.rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 1)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 1)) {
             throw rpc_errors_1.rpcErrors.invalidInput();
         }
-        const params = req.params;
-        const address = await validateAndNormalizeKeyholder(params[0], req);
-        res.result = await processEncryptionPublicKey(address, req);
+        const params = request.params;
+        const address = await validateAndNormalizeKeyholder(params[0], context);
+        return await processEncryptionPublicKey(address, request);
     }
-    async function decryptMessage(req, res) {
+    async function decryptMessage({ request, context, }) {
         if (!processDecryptMessage) {
             throw rpc_errors_1.rpcErrors.methodNotSupported();
         }
-        if (!req?.params ||
-            !Array.isArray(req.params) ||
-            !(req.params.length >= 1)) {
+        if (!request.params ||
+            !Array.isArray(request.params) ||
+            !(request.params.length >= 1)) {
             throw rpc_errors_1.rpcErrors.invalidInput();
         }
-        const params = req.params;
+        const params = request.params;
         const ciphertext = params[0];
-        const address = await validateAndNormalizeKeyholder(params[1], req);
+        const address = await validateAndNormalizeKeyholder(params[1], context);
         const extraParams = params[2] || {};
         const msgParams = {
             ...extraParams,
             from: address,
             data: ciphertext,
         };
-        res.result = await processDecryptMessage(msgParams, req);
+        return await processDecryptMessage(msgParams, request);
     }
     //
     // utility
@@ -278,12 +273,12 @@ function createWalletMiddleware({ getAccounts, processDecryptMessage, processEnc
      * copy of it.
      *
      * @param address - The address to validate and normalize.
-     * @param req - The request object.
+     * @param context - The context of the request.
      * @returns The normalized address, if valid. Otherwise, throws
      * an error
      */
-    async function validateAndNormalizeKeyholder(address, req) {
-        return (0, validation_1.validateAndNormalizeKeyholder)(address, req, { getAccounts });
+    async function validateAndNormalizeKeyholder(address, context) {
+        return (0, validation_1.validateAndNormalizeKeyholder)(address, context, { getAccounts });
     }
 }
 exports.createWalletMiddleware = createWalletMiddleware;

package/dist/wallet.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.cjs","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"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","sourcesContent":["import * as sigUtil from '@metamask/eth-sig-util';\nimport type { JsonRpcMiddleware } from '@metamask/json-rpc-engine';\nimport {\n  createAsyncMiddleware,\n  createScaffoldMiddleware,\n} from '@metamask/json-rpc-engine';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport { isValidHexAddress } from '@metamask/utils';\nimport type {\n  JsonRpcRequest,\n  PendingJsonRpcResponse,\n  Json,\n  Hex,\n} from '@metamask/utils';\n\nimport {\n  type ProcessRequestExecutionPermissionsHook,\n  walletRequestExecutionPermissions,\n} from './methods/wallet-request-execution-permissions';\nimport {\n  type ProcessRevokeExecutionPermissionHook,\n  walletRevokeExecutionPermission,\n} from './methods/wallet-revoke-execution-permission';\nimport type { Block } from './types';\nimport { stripArrayTypeIfPresent } from './utils/common';\nimport { normalizeTypedMessage, parseTypedMessage } from './utils/normalize';\nimport {\n  resemblesAddress,\n  validateAndNormalizeKeyholder as validateKeyholder,\n} from './utils/validation';\n\n/*\nexport type TransactionParams = {\n  [prop: string]: Json;\n  from: string;\n}\n*/\n\n/*\nexport type TransactionParams = JsonRpcParams & {\n  from: string;\n}\n*/\n\nexport type TransactionParams = {\n  from: string;\n};\n\nexport type MessageParams = TransactionParams & {\n  data: string;\n  signatureMethod?: string;\n};\n\nexport type TypedMessageParams = MessageParams & {\n  version: string;\n};\n\nexport type TypedMessageV1Params = Omit<TypedMessageParams, 'data'> & {\n  data: Record<string, unknown>[];\n};\n\nexport type WalletMiddlewareOptions = {\n  getAccounts: (req: JsonRpcRequest) => Promise<string[]>;\n  processDecryptMessage?: (\n    msgParams: MessageParams,\n    req: JsonRpcRequest,\n  ) => Promise<string>;\n  processEncryptionPublicKey?: (\n    address: string,\n    req: JsonRpcRequest,\n  ) => Promise<string>;\n  processPersonalMessage?: (\n    msgParams: MessageParams,\n    req: JsonRpcRequest,\n  ) => Promise<string>;\n  processTransaction?: (\n    txParams: TransactionParams,\n    req: JsonRpcRequest,\n  ) => Promise<string>;\n  processSignTransaction?: (\n    txParams: TransactionParams,\n    req: JsonRpcRequest,\n  ) => Promise<string>;\n  processTypedMessage?: (\n    msgParams: TypedMessageV1Params,\n    req: JsonRpcRequest,\n    version: string,\n  ) => Promise<string>;\n  processTypedMessageV3?: (\n    msgParams: TypedMessageParams,\n    req: JsonRpcRequest,\n    version: string,\n  ) => Promise<string>;\n  processTypedMessageV4?: (\n    msgParams: TypedMessageParams,\n    req: JsonRpcRequest,\n    version: string,\n  ) => Promise<string>;\n  processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;\n  processRevokeExecutionPermission?: ProcessRevokeExecutionPermissionHook;\n};\n\nexport function createWalletMiddleware({\n  getAccounts,\n  processDecryptMessage,\n  processEncryptionPublicKey,\n  processPersonalMessage,\n  processTransaction,\n  processSignTransaction,\n  processTypedMessage,\n  processTypedMessageV3,\n  processTypedMessageV4,\n  processRequestExecutionPermissions,\n  processRevokeExecutionPermission,\n}: // }: WalletMiddlewareOptions): JsonRpcMiddleware<string, Block> {\nWalletMiddlewareOptions): JsonRpcMiddleware<any, Block> {\n  if (!getAccounts) {\n    throw new Error('opts.getAccounts is required');\n  }\n\n  return createScaffoldMiddleware({\n    // account lookups\n    eth_accounts: createAsyncMiddleware(lookupAccounts),\n    eth_coinbase: createAsyncMiddleware(lookupDefaultAccount),\n\n    // tx signatures\n    eth_sendTransaction: createAsyncMiddleware(sendTransaction),\n    eth_signTransaction: createAsyncMiddleware(signTransaction),\n\n    // message signatures\n    eth_signTypedData: createAsyncMiddleware(signTypedData),\n    eth_signTypedData_v3: createAsyncMiddleware(signTypedDataV3),\n    eth_signTypedData_v4: createAsyncMiddleware(signTypedDataV4),\n    personal_sign: createAsyncMiddleware(personalSign),\n    eth_getEncryptionPublicKey: createAsyncMiddleware(encryptionPublicKey),\n    eth_decrypt: createAsyncMiddleware(decryptMessage),\n    personal_ecRecover: createAsyncMiddleware(personalRecover),\n\n    // EIP-7715\n    wallet_requestExecutionPermissions: createAsyncMiddleware(\n      async (req, res) =>\n        walletRequestExecutionPermissions(req, res, {\n          processRequestExecutionPermissions,\n        }),\n    ),\n    wallet_revokeExecutionPermission: createAsyncMiddleware(async (req, res) =>\n      walletRevokeExecutionPermission(req, res, {\n        processRevokeExecutionPermission,\n      }),\n    ),\n  });\n\n  //\n  // account lookups\n  //\n\n  async function lookupAccounts(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    res.result = await getAccounts(req);\n  }\n\n  async function lookupDefaultAccount(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    const accounts = await getAccounts(req);\n    res.result = accounts[0] || null;\n  }\n\n  //\n  // transaction signatures\n  //\n\n  async function sendTransaction(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    if (!processTransaction) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !req.params ||\n      !Array.isArray(req.params) ||\n      !(req.params.length >= 1)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = req.params[0] as TransactionParams | undefined;\n    const txParams: TransactionParams = {\n      ...params,\n      from: await validateAndNormalizeKeyholder(params?.from || '', req),\n    };\n    res.result = await processTransaction(txParams, req);\n  }\n\n  async function signTransaction(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    if (!processSignTransaction) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !req.params ||\n      !Array.isArray(req.params) ||\n      !(req.params.length >= 1)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = req.params[0] as TransactionParams | undefined;\n    const txParams: TransactionParams = {\n      ...params,\n      from: await validateAndNormalizeKeyholder(params?.from || '', req),\n    };\n    res.result = await processSignTransaction(txParams, req);\n  }\n\n  //\n  // message signatures\n  //\n  async function signTypedData(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    if (!processTypedMessage) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !req?.params ||\n      !Array.isArray(req.params) ||\n      !(req.params.length >= 2)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = req.params as [\n      Record<string, unknown>[],\n      string,\n      Record<string, string>?,\n    ];\n    const message = params[0];\n    const address = await validateAndNormalizeKeyholder(params[1], req);\n    const version = 'V1';\n    const extraParams = params[2] || {};\n    const msgParams: TypedMessageV1Params = {\n      ...extraParams,\n      from: address,\n      data: message,\n      signatureMethod: 'eth_signTypedData',\n      version,\n    };\n\n    res.result = await processTypedMessage(msgParams, req, version);\n  }\n\n  async function signTypedDataV3(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    if (!processTypedMessageV3) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !req?.params ||\n      !Array.isArray(req.params) ||\n      !(req.params.length >= 2)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = req.params as [string, string];\n\n    const address = await validateAndNormalizeKeyholder(params[0], req);\n    const message = normalizeTypedMessage(params[1]);\n    validatePrimaryType(message);\n    validateVerifyingContract(message);\n    const version = 'V3';\n    const msgParams: TypedMessageParams = {\n      data: message,\n      from: address,\n      version,\n      signatureMethod: 'eth_signTypedData_v3',\n    };\n\n    res.result = await processTypedMessageV3(msgParams, req, version);\n  }\n\n  async function signTypedDataV4(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    if (!processTypedMessageV4) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !req?.params ||\n      !Array.isArray(req.params) ||\n      !(req.params.length >= 2)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = req.params as [string, string];\n\n    const address = await validateAndNormalizeKeyholder(params[0], req);\n    const message = normalizeTypedMessage(params[1]);\n    validatePrimaryType(message);\n    validateVerifyingContract(message);\n    const version = 'V4';\n    const msgParams: TypedMessageParams = {\n      data: message,\n      from: address,\n      version,\n      signatureMethod: 'eth_signTypedData_v4',\n    };\n\n    res.result = await processTypedMessageV4(msgParams, req, version);\n  }\n\n  async function personalSign(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    if (!processPersonalMessage) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !req?.params ||\n      !Array.isArray(req.params) ||\n      !(req.params.length >= 2)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = req.params as [string, string, TransactionParams?];\n\n    // process normally\n    const firstParam = params[0];\n    const secondParam = params[1];\n    // non-standard \"extraParams\" to be appended to our \"msgParams\" obj\n    const extraParams = params[2] || {};\n\n    // We initially incorrectly ordered these parameters.\n    // To gracefully respect users who adopted this API early,\n    // we are currently gracefully recovering from the wrong param order\n    // when it is clearly identifiable.\n    //\n    // That means when the first param is definitely an address,\n    // and the second param is definitely not, but is hex.\n    let address: string, message: string;\n    if (resemblesAddress(firstParam) && !resemblesAddress(secondParam)) {\n      let warning = `The eth_personalSign method requires params ordered `;\n      warning += `[message, address]. This was previously handled incorrectly, `;\n      warning += `and has been corrected automatically. `;\n      warning += `Please switch this param order for smooth behavior in the future.`;\n      (res as any).warning = warning;\n\n      address = firstParam;\n      message = secondParam;\n    } else {\n      message = firstParam;\n      address = secondParam;\n    }\n    address = await validateAndNormalizeKeyholder(address, req);\n\n    const msgParams: MessageParams = {\n      ...extraParams,\n      from: address,\n      data: message,\n      signatureMethod: 'personal_sign',\n    };\n\n    res.result = await processPersonalMessage(msgParams, req);\n  }\n\n  async function personalRecover(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    if (\n      !req?.params ||\n      !Array.isArray(req.params) ||\n      !(req.params.length >= 2)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = req.params as [string, string];\n    const message = params[0];\n    const signature = params[1];\n    const signerAddress = sigUtil.recoverPersonalSignature({\n      data: message,\n      signature,\n    });\n\n    res.result = signerAddress;\n  }\n\n  async function encryptionPublicKey(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    if (!processEncryptionPublicKey) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !req?.params ||\n      !Array.isArray(req.params) ||\n      !(req.params.length >= 1)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = req.params as [string];\n\n    const address = await validateAndNormalizeKeyholder(params[0], req);\n\n    res.result = await processEncryptionPublicKey(address, req);\n  }\n\n  async function decryptMessage(\n    req: JsonRpcRequest,\n    res: PendingJsonRpcResponse,\n  ): Promise<void> {\n    if (!processDecryptMessage) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !req?.params ||\n      !Array.isArray(req.params) ||\n      !(req.params.length >= 1)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n    const params = req.params as [string, string, Record<string, Json>?];\n\n    const ciphertext: string = params[0];\n    const address: string = await validateAndNormalizeKeyholder(params[1], req);\n    const extraParams = params[2] || {};\n    const msgParams: MessageParams = {\n      ...extraParams,\n      from: address,\n      data: ciphertext,\n    };\n\n    res.result = await processDecryptMessage(msgParams, req);\n  }\n\n  //\n  // utility\n  //\n\n  /**\n   * Validates the keyholder address, and returns a normalized (i.e. lowercase)\n   * copy of it.\n   *\n   * @param address - The address to validate and normalize.\n   * @param req - The request object.\n   * @returns The normalized address, if valid. Otherwise, throws\n   * an error\n   */\n  async function validateAndNormalizeKeyholder(\n    address: string,\n    req: JsonRpcRequest,\n  ): Promise<string> {\n    return validateKeyholder(address as Hex, req, { getAccounts });\n  }\n}\n\n/**\n * Validates primary of typedSignMessage, to ensure that it's type definition is present in message.\n *\n * @param data - The data passed in typedSign request.\n */\nfunction validatePrimaryType(data: string) {\n  const { primaryType, types } = parseTypedMessage(data);\n  if (!types) {\n    throw rpcErrors.invalidInput();\n  }\n\n  // Primary type can be an array.\n  const baseType = stripArrayTypeIfPresent(primaryType);\n\n  // Return if the base type is not defined in the types\n  const baseTypeDefinitions = types[baseType];\n  if (!baseTypeDefinitions) {\n    throw rpcErrors.invalidInput();\n  }\n}\n\n/**\n * Validates verifyingContract of typedSignMessage.\n *\n * @param data - The data passed in typedSign request.\n * This function allows the verifyingContract to be either:\n * - A valid hex address\n * - The string \"cosmos\" (as it is hard-coded in some Cosmos ecosystem's EVM adapters)\n * - An empty string\n */\nfunction validateVerifyingContract(data: string) {\n  const { domain: { verifyingContract } = {} } = parseTypedMessage(data);\n  // Explicit check for cosmos here has been added to address this issue\n  // https://github.com/MetaMask/eth-json-rpc-middleware/issues/337\n  if (\n    verifyingContract &&\n    (verifyingContract as string) !== 'cosmos' &&\n    !isValidHexAddress(verifyingContract)\n  ) {\n    throw rpcErrors.invalidInput();\n  }\n}\n"]}
+{"version":3,"file":"wallet.cjs","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"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","sourcesContent":["import * as sigUtil from '@metamask/eth-sig-util';\nimport type {\n  JsonRpcMiddleware,\n  MiddlewareContext,\n  MiddlewareParams,\n} from '@metamask/json-rpc-engine/v2';\nimport { createScaffoldMiddleware } from '@metamask/json-rpc-engine/v2';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport { isValidHexAddress } from '@metamask/utils';\nimport type { JsonRpcRequest, Json, Hex } from '@metamask/utils';\n\nimport {\n  createWalletRequestExecutionPermissionsHandler,\n  type ProcessRequestExecutionPermissionsHook,\n} from './methods/wallet-request-execution-permissions';\nimport {\n  type ProcessRevokeExecutionPermissionHook,\n  createWalletRevokeExecutionPermissionHandler,\n} from './methods/wallet-revoke-execution-permission';\nimport { stripArrayTypeIfPresent } from './utils/common';\nimport { normalizeTypedMessage, parseTypedMessage } from './utils/normalize';\nimport {\n  resemblesAddress,\n  validateAndNormalizeKeyholder as validateKeyholder,\n} from './utils/validation';\n\nexport type TransactionParams = {\n  from: string;\n};\n\nexport type MessageParams = TransactionParams & {\n  data: string;\n  signatureMethod?: string;\n};\n\nexport type TypedMessageParams = MessageParams & {\n  version: string;\n};\n\nexport type TypedMessageV1Params = Omit<TypedMessageParams, 'data'> & {\n  data: Record<string, unknown>[];\n};\n\nexport type WalletMiddlewareOptions = {\n  getAccounts: (origin: string) => Promise<string[]>;\n  processDecryptMessage?: (\n    msgParams: MessageParams,\n    req: JsonRpcRequest,\n  ) => Promise<string>;\n  processEncryptionPublicKey?: (\n    address: string,\n    req: JsonRpcRequest,\n  ) => Promise<string>;\n  processPersonalMessage?: (\n    msgParams: MessageParams,\n    req: JsonRpcRequest,\n  ) => Promise<string>;\n  processTransaction?: (\n    txParams: TransactionParams,\n    req: JsonRpcRequest,\n  ) => Promise<string>;\n  processSignTransaction?: (\n    txParams: TransactionParams,\n    req: JsonRpcRequest,\n  ) => Promise<string>;\n  processTypedMessage?: (\n    msgParams: TypedMessageV1Params,\n    req: JsonRpcRequest,\n    version: string,\n  ) => Promise<string>;\n  processTypedMessageV3?: (\n    msgParams: TypedMessageParams,\n    req: JsonRpcRequest,\n    version: string,\n  ) => Promise<string>;\n  processTypedMessageV4?: (\n    msgParams: TypedMessageParams,\n    req: JsonRpcRequest,\n    version: string,\n  ) => Promise<string>;\n  processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;\n  processRevokeExecutionPermission?: ProcessRevokeExecutionPermissionHook;\n};\n\nexport type WalletMiddlewareContext = MiddlewareContext<{ origin: string }>;\nexport type WalletMiddlewareParams = MiddlewareParams<\n  JsonRpcRequest,\n  WalletMiddlewareContext\n>;\n\nexport function createWalletMiddleware({\n  getAccounts,\n  processDecryptMessage,\n  processEncryptionPublicKey,\n  processPersonalMessage,\n  processTransaction,\n  processSignTransaction,\n  processTypedMessage,\n  processTypedMessageV3,\n  processTypedMessageV4,\n  processRequestExecutionPermissions,\n  processRevokeExecutionPermission,\n}: WalletMiddlewareOptions): JsonRpcMiddleware<\n  JsonRpcRequest,\n  Json,\n  WalletMiddlewareContext\n> {\n  if (!getAccounts) {\n    throw new Error('opts.getAccounts is required');\n  }\n\n  return createScaffoldMiddleware<WalletMiddlewareContext>({\n    // account lookups\n    eth_accounts: lookupAccounts,\n    eth_coinbase: lookupDefaultAccount,\n\n    // tx signatures\n    eth_sendTransaction: sendTransaction,\n    eth_signTransaction: signTransaction,\n\n    // message signatures\n    eth_signTypedData: signTypedData,\n    eth_signTypedData_v3: signTypedDataV3,\n    eth_signTypedData_v4: signTypedDataV4,\n    personal_sign: personalSign,\n    eth_getEncryptionPublicKey: encryptionPublicKey,\n    eth_decrypt: decryptMessage,\n    personal_ecRecover: personalRecover,\n\n    // EIP-7715\n    wallet_requestExecutionPermissions:\n      createWalletRequestExecutionPermissionsHandler({\n        processRequestExecutionPermissions,\n      }),\n    wallet_revokeExecutionPermission:\n      createWalletRevokeExecutionPermissionHandler({\n        processRevokeExecutionPermission,\n      }),\n  });\n\n  //\n  // account lookups\n  //\n\n  async function lookupAccounts({\n    context,\n  }: WalletMiddlewareParams): Promise<Json> {\n    return await getAccounts(context.assertGet('origin'));\n  }\n\n  async function lookupDefaultAccount({\n    context,\n  }: WalletMiddlewareParams): Promise<Json> {\n    const accounts = await getAccounts(context.assertGet('origin'));\n    return accounts[0] || null;\n  }\n\n  //\n  // transaction signatures\n  //\n\n  async function sendTransaction({\n    request,\n    context,\n  }: WalletMiddlewareParams): Promise<Json> {\n    if (!processTransaction) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !request.params ||\n      !Array.isArray(request.params) ||\n      !(request.params.length >= 1)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = request.params[0] as TransactionParams | undefined;\n    const txParams: TransactionParams = {\n      ...params,\n      from: await validateAndNormalizeKeyholder(params?.from || '', context),\n    };\n    return await processTransaction(txParams, request);\n  }\n\n  async function signTransaction({\n    request,\n    context,\n  }: WalletMiddlewareParams): Promise<Json> {\n    if (!processSignTransaction) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !request.params ||\n      !Array.isArray(request.params) ||\n      !(request.params.length >= 1)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = request.params[0] as TransactionParams | undefined;\n    const txParams: TransactionParams = {\n      ...params,\n      from: await validateAndNormalizeKeyholder(params?.from || '', context),\n    };\n    return await processSignTransaction(txParams, request);\n  }\n\n  //\n  // message signatures\n  //\n\n  async function signTypedData({\n    request,\n    context,\n  }: WalletMiddlewareParams): Promise<Json> {\n    if (!processTypedMessage) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !request.params ||\n      !Array.isArray(request.params) ||\n      !(request.params.length >= 2)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = request.params as [\n      Record<string, unknown>[],\n      string,\n      Record<string, string>?,\n    ];\n    const message = params[0];\n    const address = await validateAndNormalizeKeyholder(params[1], context);\n    const version = 'V1';\n    const extraParams = params[2] || {};\n    const msgParams: TypedMessageV1Params = {\n      ...extraParams,\n      from: address,\n      data: message,\n      signatureMethod: 'eth_signTypedData',\n      version,\n    };\n\n    return await processTypedMessage(msgParams, request, version);\n  }\n\n  async function signTypedDataV3({\n    request,\n    context,\n  }: WalletMiddlewareParams): Promise<Json> {\n    if (!processTypedMessageV3) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !request.params ||\n      !Array.isArray(request.params) ||\n      !(request.params.length >= 2)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = request.params as [string, string];\n\n    const address = await validateAndNormalizeKeyholder(params[0], context);\n    const message = normalizeTypedMessage(params[1]);\n    validatePrimaryType(message);\n    validateVerifyingContract(message);\n    const version = 'V3';\n    const msgParams: TypedMessageParams = {\n      data: message,\n      from: address,\n      version,\n      signatureMethod: 'eth_signTypedData_v3',\n    };\n\n    return await processTypedMessageV3(msgParams, request, version);\n  }\n\n  async function signTypedDataV4({\n    request,\n    context,\n  }: WalletMiddlewareParams): Promise<Json> {\n    if (!processTypedMessageV4) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !request.params ||\n      !Array.isArray(request.params) ||\n      !(request.params.length >= 2)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = request.params as [string, string];\n\n    const address = await validateAndNormalizeKeyholder(params[0], context);\n    const message = normalizeTypedMessage(params[1]);\n    validatePrimaryType(message);\n    validateVerifyingContract(message);\n    const version = 'V4';\n    const msgParams: TypedMessageParams = {\n      data: message,\n      from: address,\n      version,\n      signatureMethod: 'eth_signTypedData_v4',\n    };\n\n    return await processTypedMessageV4(msgParams, request, version);\n  }\n\n  async function personalSign({\n    request,\n    context,\n  }: WalletMiddlewareParams): Promise<Json> {\n    if (!processPersonalMessage) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !request.params ||\n      !Array.isArray(request.params) ||\n      !(request.params.length >= 2)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = request.params as [string, string, TransactionParams?];\n\n    // process normally\n    const firstParam = params[0];\n    const secondParam = params[1];\n    // non-standard \"extraParams\" to be appended to our \"msgParams\" obj\n    const extraParams = params[2] || {};\n\n    // We initially incorrectly ordered these parameters.\n    // To gracefully respect users who adopted this API early,\n    // we are currently gracefully recovering from the wrong param order\n    // when it is clearly identifiable.\n    //\n    // That means when the first param is definitely an address,\n    // and the second param is definitely not, but is hex.\n    let address: string, message: string;\n    if (resemblesAddress(firstParam) && !resemblesAddress(secondParam)) {\n      address = firstParam;\n      message = secondParam;\n    } else {\n      message = firstParam;\n      address = secondParam;\n    }\n    address = await validateAndNormalizeKeyholder(address, context);\n\n    const msgParams: MessageParams = {\n      ...extraParams,\n      from: address,\n      data: message,\n      signatureMethod: 'personal_sign',\n    };\n\n    return await processPersonalMessage(msgParams, request);\n  }\n\n  async function personalRecover({\n    request,\n  }: WalletMiddlewareParams): Promise<Json> {\n    if (\n      !request.params ||\n      !Array.isArray(request.params) ||\n      !(request.params.length >= 2)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = request.params as [string, string];\n    const message = params[0];\n    const signature = params[1];\n    const signerAddress = sigUtil.recoverPersonalSignature({\n      data: message,\n      signature,\n    });\n\n    return signerAddress;\n  }\n\n  async function encryptionPublicKey({\n    request,\n    context,\n  }: WalletMiddlewareParams): Promise<Json> {\n    if (!processEncryptionPublicKey) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !request.params ||\n      !Array.isArray(request.params) ||\n      !(request.params.length >= 1)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n\n    const params = request.params as [string];\n\n    const address = await validateAndNormalizeKeyholder(params[0], context);\n\n    return await processEncryptionPublicKey(address, request);\n  }\n\n  async function decryptMessage({\n    request,\n    context,\n  }: WalletMiddlewareParams): Promise<Json> {\n    if (!processDecryptMessage) {\n      throw rpcErrors.methodNotSupported();\n    }\n    if (\n      !request.params ||\n      !Array.isArray(request.params) ||\n      !(request.params.length >= 1)\n    ) {\n      throw rpcErrors.invalidInput();\n    }\n    const params = request.params as [string, string, Record<string, Json>?];\n\n    const ciphertext: string = params[0];\n    const address: string = await validateAndNormalizeKeyholder(\n      params[1],\n      context,\n    );\n    const extraParams = params[2] || {};\n    const msgParams: MessageParams = {\n      ...extraParams,\n      from: address,\n      data: ciphertext,\n    };\n\n    return await processDecryptMessage(msgParams, request);\n  }\n\n  //\n  // utility\n  //\n\n  /**\n   * Validates the keyholder address, and returns a normalized (i.e. lowercase)\n   * copy of it.\n   *\n   * @param address - The address to validate and normalize.\n   * @param context - The context of the request.\n   * @returns The normalized address, if valid. Otherwise, throws\n   * an error\n   */\n  async function validateAndNormalizeKeyholder(\n    address: string,\n    context: WalletMiddlewareContext,\n  ): Promise<string> {\n    return validateKeyholder(address as Hex, context, { getAccounts });\n  }\n}\n\n/**\n * Validates primary of typedSignMessage, to ensure that it's type definition is present in message.\n *\n * @param data - The data passed in typedSign request.\n */\nfunction validatePrimaryType(data: string) {\n  const { primaryType, types } = parseTypedMessage(data);\n  if (!types) {\n    throw rpcErrors.invalidInput();\n  }\n\n  // Primary type can be an array.\n  const baseType = stripArrayTypeIfPresent(primaryType);\n\n  // Return if the base type is not defined in the types\n  const baseTypeDefinitions = types[baseType];\n  if (!baseTypeDefinitions) {\n    throw rpcErrors.invalidInput();\n  }\n}\n\n/**\n * Validates verifyingContract of typedSignMessage.\n *\n * @param data - The data passed in typedSign request.\n * This function allows the verifyingContract to be either:\n * - A valid hex address\n * - The string \"cosmos\" (as it is hard-coded in some Cosmos ecosystem's EVM adapters)\n * - An empty string\n */\nfunction validateVerifyingContract(data: string) {\n  const { domain: { verifyingContract } = {} } = parseTypedMessage(data);\n  // Explicit check for cosmos here has been added to address this issue\n  // https://github.com/MetaMask/eth-json-rpc-middleware/issues/337\n  if (\n    verifyingContract &&\n    (verifyingContract as string) !== 'cosmos' &&\n    !isValidHexAddress(verifyingContract)\n  ) {\n    throw rpcErrors.invalidInput();\n  }\n}\n"]}

package/dist/wallet.d.cts

@@ -1,8 +1,7 @@
-import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine";
-import type { JsonRpcRequest } from "@metamask/utils";
+import type { JsonRpcMiddleware, MiddlewareContext, MiddlewareParams } from "@metamask/json-rpc-engine/v2";
+import type { JsonRpcRequest, Json } from "@metamask/utils";
 import { type ProcessRequestExecutionPermissionsHook } from "./methods/wallet-request-execution-permissions.cjs";
 import { type ProcessRevokeExecutionPermissionHook } from "./methods/wallet-revoke-execution-permission.cjs";
-import type { Block } from "./types.cjs";
 export type TransactionParams = {
     from: string;
 };
@@ -17,7 +16,7 @@ export type TypedMessageV1Params = Omit<TypedMessageParams, 'data'> & {
     data: Record<string, unknown>[];
 };
 export type WalletMiddlewareOptions = {
-    getAccounts: (req: JsonRpcRequest) => Promise<string[]>;
+    getAccounts: (origin: string) => Promise<string[]>;
     processDecryptMessage?: (msgParams: MessageParams, req: JsonRpcRequest) => Promise<string>;
     processEncryptionPublicKey?: (address: string, req: JsonRpcRequest) => Promise<string>;
     processPersonalMessage?: (msgParams: MessageParams, req: JsonRpcRequest) => Promise<string>;
@@ -29,5 +28,9 @@ export type WalletMiddlewareOptions = {
     processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;
     processRevokeExecutionPermission?: ProcessRevokeExecutionPermissionHook;
 };
-export declare function createWalletMiddleware({ getAccounts, processDecryptMessage, processEncryptionPublicKey, processPersonalMessage, processTransaction, processSignTransaction, processTypedMessage, processTypedMessageV3, processTypedMessageV4, processRequestExecutionPermissions, processRevokeExecutionPermission, }: WalletMiddlewareOptions): JsonRpcMiddleware<any, Block>;
+export type WalletMiddlewareContext = MiddlewareContext<{
+    origin: string;
+}>;
+export type WalletMiddlewareParams = MiddlewareParams<JsonRpcRequest, WalletMiddlewareContext>;
+export declare function createWalletMiddleware({ getAccounts, processDecryptMessage, processEncryptionPublicKey, processPersonalMessage, processTransaction, processSignTransaction, processTypedMessage, processTypedMessageV3, processTypedMessageV4, processRequestExecutionPermissions, processRevokeExecutionPermission, }: WalletMiddlewareOptions): JsonRpcMiddleware<JsonRpcRequest, Json, WalletMiddlewareContext>;
 //# sourceMappingURL=wallet.d.cts.map

package/dist/wallet.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.cts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kCAAkC;AAOnE,OAAO,KAAK,EACV,cAAc,EAIf,wBAAwB;AAEzB,OAAO,EACL,KAAK,sCAAsC,EAE5C,2DAAuD;AACxD,OAAO,EACL,KAAK,oCAAoC,EAE1C,yDAAqD;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,oBAAgB;AAqBrC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG;IACpE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,WAAW,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACxD,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,0BAA0B,CAAC,EAAE,CAC3B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kBAAkB,CAAC,EAAE,CACnB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,mBAAmB,CAAC,EAAE,CACpB,SAAS,EAAE,oBAAoB,EAC/B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kCAAkC,CAAC,EAAE,sCAAsC,CAAC;IAC5E,gCAAgC,CAAC,EAAE,oCAAoC,CAAC;CACzE,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,EACrC,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,kCAAkC,EAClC,gCAAgC,GACjC,EACD,uBAAuB,GAAG,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAoWtD"}
+{"version":3,"file":"wallet.d.cts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EACjB,qCAAqC;AAItC,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAO,wBAAwB;AAEjE,OAAO,EAEL,KAAK,sCAAsC,EAC5C,2DAAuD;AACxD,OAAO,EACL,KAAK,oCAAoC,EAE1C,yDAAqD;AAQtD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG;IACpE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,0BAA0B,CAAC,EAAE,CAC3B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kBAAkB,CAAC,EAAE,CACnB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,mBAAmB,CAAC,EAAE,CACpB,SAAS,EAAE,oBAAoB,EAC/B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kCAAkC,CAAC,EAAE,sCAAsC,CAAC;IAC5E,gCAAgC,CAAC,EAAE,oCAAoC,CAAC;CACzE,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAC5E,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CACnD,cAAc,EACd,uBAAuB,CACxB,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,EACrC,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,kCAAkC,EAClC,gCAAgC,GACjC,EAAE,uBAAuB,GAAG,iBAAiB,CAC5C,cAAc,EACd,IAAI,EACJ,uBAAuB,CACxB,CA4VA"}

package/dist/wallet.d.mts

@@ -1,8 +1,7 @@
-import type { JsonRpcMiddleware } from "@metamask/json-rpc-engine";
-import type { JsonRpcRequest } from "@metamask/utils";
+import type { JsonRpcMiddleware, MiddlewareContext, MiddlewareParams } from "@metamask/json-rpc-engine/v2";
+import type { JsonRpcRequest, Json } from "@metamask/utils";
 import { type ProcessRequestExecutionPermissionsHook } from "./methods/wallet-request-execution-permissions.mjs";
 import { type ProcessRevokeExecutionPermissionHook } from "./methods/wallet-revoke-execution-permission.mjs";
-import type { Block } from "./types.mjs";
 export type TransactionParams = {
     from: string;
 };
@@ -17,7 +16,7 @@ export type TypedMessageV1Params = Omit<TypedMessageParams, 'data'> & {
     data: Record<string, unknown>[];
 };
 export type WalletMiddlewareOptions = {
-    getAccounts: (req: JsonRpcRequest) => Promise<string[]>;
+    getAccounts: (origin: string) => Promise<string[]>;
     processDecryptMessage?: (msgParams: MessageParams, req: JsonRpcRequest) => Promise<string>;
     processEncryptionPublicKey?: (address: string, req: JsonRpcRequest) => Promise<string>;
     processPersonalMessage?: (msgParams: MessageParams, req: JsonRpcRequest) => Promise<string>;
@@ -29,5 +28,9 @@ export type WalletMiddlewareOptions = {
     processRequestExecutionPermissions?: ProcessRequestExecutionPermissionsHook;
     processRevokeExecutionPermission?: ProcessRevokeExecutionPermissionHook;
 };
-export declare function createWalletMiddleware({ getAccounts, processDecryptMessage, processEncryptionPublicKey, processPersonalMessage, processTransaction, processSignTransaction, processTypedMessage, processTypedMessageV3, processTypedMessageV4, processRequestExecutionPermissions, processRevokeExecutionPermission, }: WalletMiddlewareOptions): JsonRpcMiddleware<any, Block>;
+export type WalletMiddlewareContext = MiddlewareContext<{
+    origin: string;
+}>;
+export type WalletMiddlewareParams = MiddlewareParams<JsonRpcRequest, WalletMiddlewareContext>;
+export declare function createWalletMiddleware({ getAccounts, processDecryptMessage, processEncryptionPublicKey, processPersonalMessage, processTransaction, processSignTransaction, processTypedMessage, processTypedMessageV3, processTypedMessageV4, processRequestExecutionPermissions, processRevokeExecutionPermission, }: WalletMiddlewareOptions): JsonRpcMiddleware<JsonRpcRequest, Json, WalletMiddlewareContext>;
 //# sourceMappingURL=wallet.d.mts.map

package/dist/wallet.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.d.mts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,kCAAkC;AAOnE,OAAO,KAAK,EACV,cAAc,EAIf,wBAAwB;AAEzB,OAAO,EACL,KAAK,sCAAsC,EAE5C,2DAAuD;AACxD,OAAO,EACL,KAAK,oCAAoC,EAE1C,yDAAqD;AACtD,OAAO,KAAK,EAAE,KAAK,EAAE,oBAAgB;AAqBrC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG;IACpE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,WAAW,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACxD,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,0BAA0B,CAAC,EAAE,CAC3B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kBAAkB,CAAC,EAAE,CACnB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,mBAAmB,CAAC,EAAE,CACpB,SAAS,EAAE,oBAAoB,EAC/B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kCAAkC,CAAC,EAAE,sCAAsC,CAAC;IAC5E,gCAAgC,CAAC,EAAE,oCAAoC,CAAC;CACzE,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,EACrC,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,kCAAkC,EAClC,gCAAgC,GACjC,EACD,uBAAuB,GAAG,iBAAiB,CAAC,GAAG,EAAE,KAAK,CAAC,CAoWtD"}
+{"version":3,"file":"wallet.d.mts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EACjB,qCAAqC;AAItC,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAO,wBAAwB;AAEjE,OAAO,EAEL,KAAK,sCAAsC,EAC5C,2DAAuD;AACxD,OAAO,EACL,KAAK,oCAAoC,EAE1C,yDAAqD;AAQtD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,aAAa,GAAG;IAC/C,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,GAAG;IACpE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,0BAA0B,CAAC,EAAE,CAC3B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,SAAS,EAAE,aAAa,EACxB,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kBAAkB,CAAC,EAAE,CACnB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,sBAAsB,CAAC,EAAE,CACvB,QAAQ,EAAE,iBAAiB,EAC3B,GAAG,EAAE,cAAc,KAChB,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,mBAAmB,CAAC,EAAE,CACpB,SAAS,EAAE,oBAAoB,EAC/B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,qBAAqB,CAAC,EAAE,CACtB,SAAS,EAAE,kBAAkB,EAC7B,GAAG,EAAE,cAAc,EACnB,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,kCAAkC,CAAC,EAAE,sCAAsC,CAAC;IAC5E,gCAAgC,CAAC,EAAE,oCAAoC,CAAC;CACzE,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,iBAAiB,CAAC;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAC5E,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,CACnD,cAAc,EACd,uBAAuB,CACxB,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,EACrC,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,kCAAkC,EAClC,gCAAgC,GACjC,EAAE,uBAAuB,GAAG,iBAAiB,CAC5C,cAAc,EACd,IAAI,EACJ,uBAAuB,CACxB,CA4VA"}