@metamask-previews/eth-json-rpc-middleware 21.0.0-preview-c96ff8f → 21.0.0-preview-6b15e01

package/dist/wallet.mjs

@@ -1,9 +1,9 @@
 import * as sigUtil from "@metamask/eth-sig-util";
-import { createScaffoldMiddleware } from "@metamask/json-rpc-engine/v2";
+import { createAsyncMiddleware, createScaffoldMiddleware } from "@metamask/json-rpc-engine";
 import { rpcErrors } from "@metamask/rpc-errors";
 import { isValidHexAddress } from "@metamask/utils";
-import { createWalletRequestExecutionPermissionsHandler } from "./methods/wallet-request-execution-permissions.mjs";
-import { createWalletRevokeExecutionPermissionHandler } from "./methods/wallet-revoke-execution-permission.mjs";
+import { walletRequestExecutionPermissions } from "./methods/wallet-request-execution-permissions.mjs";
+import { walletRevokeExecutionPermission } from "./methods/wallet-revoke-execution-permission.mjs";
 import { stripArrayTypeIfPresent } from "./utils/common.mjs";
 import { normalizeTypedMessage, parseTypedMessage } from "./utils/normalize.mjs";
 import { resemblesAddress, validateAndNormalizeKeyholder as validateKeyholder } from "./utils/validation.mjs";
@@ -13,87 +13,87 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
     }
     return createScaffoldMiddleware({
         // account lookups
-        eth_accounts: lookupAccounts,
-        eth_coinbase: lookupDefaultAccount,
+        eth_accounts: createAsyncMiddleware(lookupAccounts),
+        eth_coinbase: createAsyncMiddleware(lookupDefaultAccount),
         // tx signatures
-        eth_sendTransaction: sendTransaction,
-        eth_signTransaction: signTransaction,
+        eth_sendTransaction: createAsyncMiddleware(sendTransaction),
+        eth_signTransaction: createAsyncMiddleware(signTransaction),
         // message signatures
-        eth_signTypedData: signTypedData,
-        eth_signTypedData_v3: signTypedDataV3,
-        eth_signTypedData_v4: signTypedDataV4,
-        personal_sign: personalSign,
-        eth_getEncryptionPublicKey: encryptionPublicKey,
-        eth_decrypt: decryptMessage,
-        personal_ecRecover: personalRecover,
+        eth_signTypedData: createAsyncMiddleware(signTypedData),
+        eth_signTypedData_v3: createAsyncMiddleware(signTypedDataV3),
+        eth_signTypedData_v4: createAsyncMiddleware(signTypedDataV4),
+        personal_sign: createAsyncMiddleware(personalSign),
+        eth_getEncryptionPublicKey: createAsyncMiddleware(encryptionPublicKey),
+        eth_decrypt: createAsyncMiddleware(decryptMessage),
+        personal_ecRecover: createAsyncMiddleware(personalRecover),
         // EIP-7715
-        wallet_requestExecutionPermissions: createWalletRequestExecutionPermissionsHandler({
+        wallet_requestExecutionPermissions: createAsyncMiddleware(async (req, res) => walletRequestExecutionPermissions(req, res, {
             processRequestExecutionPermissions,
-        }),
-        wallet_revokeExecutionPermission: createWalletRevokeExecutionPermissionHandler({
+        })),
+        wallet_revokeExecutionPermission: createAsyncMiddleware(async (req, res) => walletRevokeExecutionPermission(req, res, {
             processRevokeExecutionPermission,
-        }),
+        })),
     });
     //
     // account lookups
     //
-    async function lookupAccounts({ context, }) {
-        return await getAccounts(context.assertGet('origin'));
+    async function lookupAccounts(req, res) {
+        res.result = await getAccounts(req);
     }
-    async function lookupDefaultAccount({ context, }) {
-        const accounts = await getAccounts(context.assertGet('origin'));
-        return accounts[0] || null;
+    async function lookupDefaultAccount(req, res) {
+        const accounts = await getAccounts(req);
+        res.result = accounts[0] || null;
     }
     //
     // transaction signatures
     //
-    async function sendTransaction({ request, context, }) {
+    async function sendTransaction(req, res) {
         if (!processTransaction) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!request.params ||
-            !Array.isArray(request.params) ||
-            !(request.params.length >= 1)) {
+        if (!req.params ||
+            !Array.isArray(req.params) ||
+            !(req.params.length >= 1)) {
             throw rpcErrors.invalidInput();
         }
-        const params = request.params[0];
+        const params = req.params[0];
         const txParams = {
             ...params,
-            from: await validateAndNormalizeKeyholder(params?.from || '', context),
+            from: await validateAndNormalizeKeyholder(params?.from || '', req),
         };
-        return await processTransaction(txParams, request);
+        res.result = await processTransaction(txParams, req);
     }
-    async function signTransaction({ request, context, }) {
+    async function signTransaction(req, res) {
         if (!processSignTransaction) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!request.params ||
-            !Array.isArray(request.params) ||
-            !(request.params.length >= 1)) {
+        if (!req.params ||
+            !Array.isArray(req.params) ||
+            !(req.params.length >= 1)) {
             throw rpcErrors.invalidInput();
         }
-        const params = request.params[0];
+        const params = req.params[0];
         const txParams = {
             ...params,
-            from: await validateAndNormalizeKeyholder(params?.from || '', context),
+            from: await validateAndNormalizeKeyholder(params?.from || '', req),
         };
-        return await processSignTransaction(txParams, request);
+        res.result = await processSignTransaction(txParams, req);
     }
     //
     // message signatures
     //
-    async function signTypedData({ request, context, }) {
+    async function signTypedData(req, res) {
         if (!processTypedMessage) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!request.params ||
-            !Array.isArray(request.params) ||
-            !(request.params.length >= 2)) {
+        if (!req?.params ||
+            !Array.isArray(req.params) ||
+            !(req.params.length >= 2)) {
             throw rpcErrors.invalidInput();
         }
-        const params = request.params;
+        const params = req.params;
         const message = params[0];
-        const address = await validateAndNormalizeKeyholder(params[1], context);
+        const address = await validateAndNormalizeKeyholder(params[1], req);
         const version = 'V1';
         const extraParams = params[2] || {};
         const msgParams = {
@@ -103,19 +103,19 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
             signatureMethod: 'eth_signTypedData',
             version,
         };
-        return await processTypedMessage(msgParams, request, version);
+        res.result = await processTypedMessage(msgParams, req, version);
     }
-    async function signTypedDataV3({ request, context, }) {
+    async function signTypedDataV3(req, res) {
         if (!processTypedMessageV3) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!request.params ||
-            !Array.isArray(request.params) ||
-            !(request.params.length >= 2)) {
+        if (!req?.params ||
+            !Array.isArray(req.params) ||
+            !(req.params.length >= 2)) {
             throw rpcErrors.invalidInput();
         }
-        const params = request.params;
-        const address = await validateAndNormalizeKeyholder(params[0], context);
+        const params = req.params;
+        const address = await validateAndNormalizeKeyholder(params[0], req);
         const message = normalizeTypedMessage(params[1]);
         validatePrimaryType(message);
         validateVerifyingContract(message);
@@ -126,19 +126,19 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
             version,
             signatureMethod: 'eth_signTypedData_v3',
         };
-        return await processTypedMessageV3(msgParams, request, version);
+        res.result = await processTypedMessageV3(msgParams, req, version);
     }
-    async function signTypedDataV4({ request, context, }) {
+    async function signTypedDataV4(req, res) {
         if (!processTypedMessageV4) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!request.params ||
-            !Array.isArray(request.params) ||
-            !(request.params.length >= 2)) {
+        if (!req?.params ||
+            !Array.isArray(req.params) ||
+            !(req.params.length >= 2)) {
             throw rpcErrors.invalidInput();
         }
-        const params = request.params;
-        const address = await validateAndNormalizeKeyholder(params[0], context);
+        const params = req.params;
+        const address = await validateAndNormalizeKeyholder(params[0], req);
         const message = normalizeTypedMessage(params[1]);
         validatePrimaryType(message);
         validateVerifyingContract(message);
@@ -149,18 +149,18 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
             version,
             signatureMethod: 'eth_signTypedData_v4',
         };
-        return await processTypedMessageV4(msgParams, request, version);
+        res.result = await processTypedMessageV4(msgParams, req, version);
     }
-    async function personalSign({ request, context, }) {
+    async function personalSign(req, res) {
         if (!processPersonalMessage) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!request.params ||
-            !Array.isArray(request.params) ||
-            !(request.params.length >= 2)) {
+        if (!req?.params ||
+            !Array.isArray(req.params) ||
+            !(req.params.length >= 2)) {
             throw rpcErrors.invalidInput();
         }
-        const params = request.params;
+        const params = req.params;
         // process normally
         const firstParam = params[0];
         const secondParam = params[1];
@@ -175,6 +175,11 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
         // and the second param is definitely not, but is hex.
         let address, message;
         if (resemblesAddress(firstParam) && !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;
         }
@@ -182,62 +187,62 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
             message = firstParam;
             address = secondParam;
         }
-        address = await validateAndNormalizeKeyholder(address, context);
+        address = await validateAndNormalizeKeyholder(address, req);
         const msgParams = {
             ...extraParams,
             from: address,
             data: message,
             signatureMethod: 'personal_sign',
         };
-        return await processPersonalMessage(msgParams, request);
+        res.result = await processPersonalMessage(msgParams, req);
     }
-    async function personalRecover({ request, }) {
-        if (!request.params ||
-            !Array.isArray(request.params) ||
-            !(request.params.length >= 2)) {
+    async function personalRecover(req, res) {
+        if (!req?.params ||
+            !Array.isArray(req.params) ||
+            !(req.params.length >= 2)) {
             throw rpcErrors.invalidInput();
         }
-        const params = request.params;
+        const params = req.params;
         const message = params[0];
         const signature = params[1];
         const signerAddress = sigUtil.recoverPersonalSignature({
             data: message,
             signature,
         });
-        return signerAddress;
+        res.result = signerAddress;
     }
-    async function encryptionPublicKey({ request, context, }) {
+    async function encryptionPublicKey(req, res) {
         if (!processEncryptionPublicKey) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!request.params ||
-            !Array.isArray(request.params) ||
-            !(request.params.length >= 1)) {
+        if (!req?.params ||
+            !Array.isArray(req.params) ||
+            !(req.params.length >= 1)) {
             throw rpcErrors.invalidInput();
         }
-        const params = request.params;
-        const address = await validateAndNormalizeKeyholder(params[0], context);
-        return await processEncryptionPublicKey(address, request);
+        const params = req.params;
+        const address = await validateAndNormalizeKeyholder(params[0], req);
+        res.result = await processEncryptionPublicKey(address, req);
     }
-    async function decryptMessage({ request, context, }) {
+    async function decryptMessage(req, res) {
         if (!processDecryptMessage) {
             throw rpcErrors.methodNotSupported();
         }
-        if (!request.params ||
-            !Array.isArray(request.params) ||
-            !(request.params.length >= 1)) {
+        if (!req?.params ||
+            !Array.isArray(req.params) ||
+            !(req.params.length >= 1)) {
             throw rpcErrors.invalidInput();
         }
-        const params = request.params;
+        const params = req.params;
         const ciphertext = params[0];
-        const address = await validateAndNormalizeKeyholder(params[1], context);
+        const address = await validateAndNormalizeKeyholder(params[1], req);
         const extraParams = params[2] || {};
         const msgParams = {
             ...extraParams,
             from: address,
             data: ciphertext,
         };
-        return await processDecryptMessage(msgParams, request);
+        res.result = await processDecryptMessage(msgParams, req);
     }
     //
     // utility
@@ -247,12 +252,12 @@ export function createWalletMiddleware({ getAccounts, processDecryptMessage, pro
      * copy of it.
      *
      * @param address - The address to validate and normalize.
-     * @param context - The context of the request.
+     * @param req - The request object.
      * @returns The normalized address, if valid. Otherwise, throws
      * an error
      */
-    async function validateAndNormalizeKeyholder(address, context) {
-        return validateKeyholder(address, context, { getAccounts });
+    async function validateAndNormalizeKeyholder(address, req) {
+        return validateKeyholder(address, req, { getAccounts });
     }
 }
 /**

package/dist/wallet.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"wallet.mjs","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,+BAA+B;AAMlD,OAAO,EAAE,wBAAwB,EAAE,qCAAqC;AACxE,OAAO,EAAE,SAAS,EAAE,6BAA6B;AACjD,OAAO,EAAE,iBAAiB,EAAE,wBAAwB;AAGpD,OAAO,EACL,8CAA8C,EAE/C,2DAAuD;AACxD,OAAO,EAEL,4CAA4C,EAC7C,yDAAqD;AACtD,OAAO,EAAE,uBAAuB,EAAE,2BAAuB;AACzD,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,8BAA0B;AAC7E,OAAO,EACL,gBAAgB,EAChB,6BAA6B,IAAI,iBAAiB,EACnD,+BAA2B;AAkE5B,MAAM,UAAU,sBAAsB,CAAC,EACrC,WAAW,EACX,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,sBAAsB,EACtB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,kCAAkC,EAClC,gCAAgC,GACR;IAKxB,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IAED,OAAO,wBAAwB,CAA0B;QACvD,kBAAkB;QAClB,YAAY,EAAE,cAAc;QAC5B,YAAY,EAAE,oBAAoB;QAElC,gBAAgB;QAChB,mBAAmB,EAAE,eAAe;QACpC,mBAAmB,EAAE,eAAe;QAEpC,qBAAqB;QACrB,iBAAiB,EAAE,aAAa;QAChC,oBAAoB,EAAE,eAAe;QACrC,oBAAoB,EAAE,eAAe;QACrC,aAAa,EAAE,YAAY;QAC3B,0BAA0B,EAAE,mBAAmB;QAC/C,WAAW,EAAE,cAAc;QAC3B,kBAAkB,EAAE,eAAe;QAEnC,WAAW;QACX,kCAAkC,EAChC,8CAA8C,CAAC;YAC7C,kCAAkC;SACnC,CAAC;QACJ,gCAAgC,EAC9B,4CAA4C,CAAC;YAC3C,gCAAgC;SACjC,CAAC;KACL,CAAC,CAAC;IAEH,EAAE;IACF,kBAAkB;IAClB,EAAE;IAEF,KAAK,UAAU,cAAc,CAAC,EAC5B,OAAO,GACgB;QACvB,OAAO,MAAM,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,UAAU,oBAAoB,CAAC,EAClC,OAAO,GACgB;QACvB,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChE,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAC7B,CAAC;IAED,EAAE;IACF,yBAAyB;IACzB,EAAE;IAEF,KAAK,UAAU,eAAe,CAAC,EAC7B,OAAO,EACP,OAAO,GACgB;QACvB,IAAI,CAAC,kBAAkB,EAAE;YACvB,MAAM,SAAS,CAAC,kBAAkB,EAAE,CAAC;SACtC;QACD,IACE,CAAC,OAAO,CAAC,MAAM;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAC7B;YACA,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;SAChC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAkC,CAAC;QAClE,MAAM,QAAQ,GAAsB;YAClC,GAAG,MAAM;YACT,IAAI,EAAE,MAAM,6BAA6B,CAAC,MAAM,EAAE,IAAI,IAAI,EAAE,EAAE,OAAO,CAAC;SACvE,CAAC;QACF,OAAO,MAAM,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,UAAU,eAAe,CAAC,EAC7B,OAAO,EACP,OAAO,GACgB;QACvB,IAAI,CAAC,sBAAsB,EAAE;YAC3B,MAAM,SAAS,CAAC,kBAAkB,EAAE,CAAC;SACtC;QACD,IACE,CAAC,OAAO,CAAC,MAAM;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAC7B;YACA,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;SAChC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAkC,CAAC;QAClE,MAAM,QAAQ,GAAsB;YAClC,GAAG,MAAM;YACT,IAAI,EAAE,MAAM,6BAA6B,CAAC,MAAM,EAAE,IAAI,IAAI,EAAE,EAAE,OAAO,CAAC;SACvE,CAAC;QACF,OAAO,MAAM,sBAAsB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,EAAE;IACF,qBAAqB;IACrB,EAAE;IAEF,KAAK,UAAU,aAAa,CAAC,EAC3B,OAAO,EACP,OAAO,GACgB;QACvB,IAAI,CAAC,mBAAmB,EAAE;YACxB,MAAM,SAAS,CAAC,kBAAkB,EAAE,CAAC;SACtC;QACD,IACE,CAAC,OAAO,CAAC,MAAM;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAC7B;YACA,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;SAChC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAItB,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,OAAO,GAAG,MAAM,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACxE,MAAM,OAAO,GAAG,IAAI,CAAC;QACrB,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACpC,MAAM,SAAS,GAAyB;YACtC,GAAG,WAAW;YACd,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,OAAO;YACb,eAAe,EAAE,mBAAmB;YACpC,OAAO;SACR,CAAC;QAEF,OAAO,MAAM,mBAAmB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,UAAU,eAAe,CAAC,EAC7B,OAAO,EACP,OAAO,GACgB;QACvB,IAAI,CAAC,qBAAqB,EAAE;YAC1B,MAAM,SAAS,CAAC,kBAAkB,EAAE,CAAC;SACtC;QACD,IACE,CAAC,OAAO,CAAC,MAAM;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAC7B;YACA,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;SAChC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAA0B,CAAC;QAElD,MAAM,OAAO,GAAG,MAAM,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACxE,MAAM,OAAO,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACjD,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC7B,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC;QACrB,MAAM,SAAS,GAAuB;YACpC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,OAAO;YACb,OAAO;YACP,eAAe,EAAE,sBAAsB;SACxC,CAAC;QAEF,OAAO,MAAM,qBAAqB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,UAAU,eAAe,CAAC,EAC7B,OAAO,EACP,OAAO,GACgB;QACvB,IAAI,CAAC,qBAAqB,EAAE;YAC1B,MAAM,SAAS,CAAC,kBAAkB,EAAE,CAAC;SACtC;QACD,IACE,CAAC,OAAO,CAAC,MAAM;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAC7B;YACA,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;SAChC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAA0B,CAAC;QAElD,MAAM,OAAO,GAAG,MAAM,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QACxE,MAAM,OAAO,GAAG,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACjD,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC7B,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,IAAI,CAAC;QACrB,MAAM,SAAS,GAAuB;YACpC,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,OAAO;YACb,OAAO;YACP,eAAe,EAAE,sBAAsB;SACxC,CAAC;QAEF,OAAO,MAAM,qBAAqB,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAClE,CAAC;IAED,KAAK,UAAU,YAAY,CAAC,EAC1B,OAAO,EACP,OAAO,GACgB;QACvB,IAAI,CAAC,sBAAsB,EAAE;YAC3B,MAAM,SAAS,CAAC,kBAAkB,EAAE,CAAC;SACtC;QACD,IACE,CAAC,OAAO,CAAC,MAAM;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAC7B;YACA,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;SAChC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAA8C,CAAC;QAEtE,mBAAmB;QACnB,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9B,mEAAmE;QACnE,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAEpC,qDAAqD;QACrD,0DAA0D;QAC1D,oEAAoE;QACpE,mCAAmC;QACnC,EAAE;QACF,4DAA4D;QAC5D,sDAAsD;QACtD,IAAI,OAAe,EAAE,OAAe,CAAC;QACrC,IAAI,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE;YAClE,OAAO,GAAG,UAAU,CAAC;YACrB,OAAO,GAAG,WAAW,CAAC;SACvB;aAAM;YACL,OAAO,GAAG,UAAU,CAAC;YACrB,OAAO,GAAG,WAAW,CAAC;SACvB;QACD,OAAO,GAAG,MAAM,6BAA6B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,SAAS,GAAkB;YAC/B,GAAG,WAAW;YACd,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,OAAO;YACb,eAAe,EAAE,eAAe;SACjC,CAAC;QAEF,OAAO,MAAM,sBAAsB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,UAAU,eAAe,CAAC,EAC7B,OAAO,GACgB;QACvB,IACE,CAAC,OAAO,CAAC,MAAM;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAC7B;YACA,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;SAChC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAA0B,CAAC;QAClD,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,aAAa,GAAG,OAAO,CAAC,wBAAwB,CAAC;YACrD,IAAI,EAAE,OAAO;YACb,SAAS;SACV,CAAC,CAAC;QAEH,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,KAAK,UAAU,mBAAmB,CAAC,EACjC,OAAO,EACP,OAAO,GACgB;QACvB,IAAI,CAAC,0BAA0B,EAAE;YAC/B,MAAM,SAAS,CAAC,kBAAkB,EAAE,CAAC;SACtC;QACD,IACE,CAAC,OAAO,CAAC,MAAM;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAC7B;YACA,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;SAChC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAkB,CAAC;QAE1C,MAAM,OAAO,GAAG,MAAM,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAExE,OAAO,MAAM,0BAA0B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,UAAU,cAAc,CAAC,EAC5B,OAAO,EACP,OAAO,GACgB;QACvB,IAAI,CAAC,qBAAqB,EAAE;YAC1B,MAAM,SAAS,CAAC,kBAAkB,EAAE,CAAC;SACtC;QACD,IACE,CAAC,OAAO,CAAC,MAAM;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;YAC9B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,EAC7B;YACA,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;SAChC;QACD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAiD,CAAC;QAEzE,MAAM,UAAU,GAAW,MAAM,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,OAAO,GAAW,MAAM,6BAA6B,CACzD,MAAM,CAAC,CAAC,CAAC,EACT,OAAO,CACR,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACpC,MAAM,SAAS,GAAkB;YAC/B,GAAG,WAAW;YACd,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,UAAU;SACjB,CAAC;QAEF,OAAO,MAAM,qBAAqB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,EAAE;IACF,UAAU;IACV,EAAE;IAEF;;;;;;;;OAQG;IACH,KAAK,UAAU,6BAA6B,CAC1C,OAAe,EACf,OAAgC;QAEhC,OAAO,iBAAiB,CAAC,OAAc,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;IACrE,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAS,mBAAmB,CAAC,IAAY;IACvC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;KAChC;IAED,gCAAgC;IAChC,MAAM,QAAQ,GAAG,uBAAuB,CAAC,WAAW,CAAC,CAAC;IAEtD,sDAAsD;IACtD,MAAM,mBAAmB,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC5C,IAAI,CAAC,mBAAmB,EAAE;QACxB,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;KAChC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,yBAAyB,CAAC,IAAY;IAC7C,MAAM,EAAE,MAAM,EAAE,EAAE,iBAAiB,EAAE,GAAG,EAAE,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvE,sEAAsE;IACtE,iEAAiE;IACjE,IACE,iBAAiB;QAChB,iBAA4B,KAAK,QAAQ;QAC1C,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,EACrC;QACA,MAAM,SAAS,CAAC,YAAY,EAAE,CAAC;KAChC;AACH,CAAC","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"]}
+{"version":3,"file":"wallet.mjs","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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/eth-json-rpc-middleware",
-  "version": "21.0.0-preview-c96ff8f",
+  "version": "21.0.0-preview-6b15e01",
   "description": "Ethereum-related json-rpc-engine middleware",
   "keywords": [
     "MetaMask",