@metamask-previews/transaction-controller 45.1.0-preview-862b5dac → 45.1.0-preview-f51ef7f8

package/dist/utils/eip7702.cjs

@@ -6,8 +6,8 @@ const contracts_1 = require("@ethersproject/contracts");
 const controller_utils_1 = require("@metamask/controller-utils");
 const utils_1 = require("@metamask/utils");
 const feature_flags_1 = require("./feature-flags.cjs");
-const logger_1 = require("../logger.cjs");
 const constants_1 = require("../constants.cjs");
+const logger_1 = require("../logger.cjs");
 exports.DELEGATION_PREFIX = '0xef0100';
 exports.BATCH_FUNCTION_NAME = 'execute';
 exports.CALLS_SIGNATURE = '(address,uint256,bytes)[]';
@@ -114,10 +114,17 @@ exports.signAuthorizationList = signAuthorizationList;
  */
 async function signAuthorization(authorization, transactionMeta, messenger, index) {
     const finalAuthorization = prepareAuthorization(authorization, transactionMeta, index);
+    const { txParams } = transactionMeta;
+    const { from } = txParams;
     const { address, chainId, nonce } = finalAuthorization;
     const chainIdDecimal = parseInt(chainId, 16);
     const nonceDecimal = parseInt(nonce, 16);
-    const signature = await messenger.call('KeyringController:signAuthorization', [chainIdDecimal, address, nonceDecimal]);
+    const signature = await messenger.call('KeyringController:signEip7702AuthorizationMessage', {
+        chainId: chainIdDecimal,
+        contractAddress: address,
+        from,
+        nonce: nonceDecimal,
+    });
     const r = signature.slice(0, 66);
     const s = `0x${signature.slice(66, 130)}`;
     const v = parseInt(signature.slice(130, 132), 16);

package/dist/utils/eip7702.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"eip7702.cjs","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"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","sourcesContent":["import { defaultAbiCoder } from '@ethersproject/abi';\nimport { Contract } from '@ethersproject/contracts';\nimport { query, toHex } from '@metamask/controller-utils';\nimport type EthQuery from '@metamask/eth-query';\nimport { createModuleLogger, type Hex, add0x } from '@metamask/utils';\n\nimport {\n  getEIP7702ContractAddresses,\n  getEIP7702SupportedChains,\n} from './feature-flags';\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\nimport type {\n  BatchTransactionParams,\n  Authorization,\n  AuthorizationList,\n  TransactionMeta,\n} from '../types';\nimport { ABI_IERC7821 } from '../constants';\n\nexport type KeyringControllerAuthorization = [\n  chainId: number,\n  contractAddress: string,\n  nonce: number,\n];\n\nexport type KeyringControllerSignAuthorization = {\n  type: 'KeyringController:signAuthorization';\n  handler: (authorization: KeyringControllerAuthorization) => Promise<string>;\n};\n\nexport const DELEGATION_PREFIX = '0xef0100';\nexport const BATCH_FUNCTION_NAME = 'execute';\nexport const CALLS_SIGNATURE = '(address,uint256,bytes)[]';\n\nconst log = createModuleLogger(projectLogger, 'eip-7702');\n\n/**\n * Determine if a chain supports EIP-7702 using LaunchDarkly feature flag.\n *\n * @param chainId - Hexadecimal ID of the chain.\n * @param messenger - Messenger instance.\n * @returns True if the chain supports EIP-7702.\n */\nexport function doesChainSupportEIP7702(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n) {\n  const supportedChains = getEIP7702SupportedChains(messenger);\n\n  return supportedChains.some(\n    (supportedChainId) =>\n      supportedChainId.toLowerCase() === chainId.toLowerCase(),\n  );\n}\n\n/**\n * Determine if an account has been upgraded to a supported EIP-7702 contract.\n *\n * @param address - The EOA address to check.\n * @param chainId - The chain ID.\n * @param messenger - The messenger instance.\n * @param ethQuery - The EthQuery instance to communicate with the blockchain.\n * @returns An object with the results of the check.\n */\nexport async function isAccountUpgradedToEIP7702(\n  address: Hex,\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  ethQuery: EthQuery,\n) {\n  const contractAddresses = getEIP7702ContractAddresses(chainId, messenger);\n  const code = await query(ethQuery, 'eth_getCode', [address]);\n  const normalizedCode = add0x(code?.toLowerCase?.() ?? '');\n\n  const hasDelegation =\n    code?.length === 48 && normalizedCode.startsWith(DELEGATION_PREFIX);\n\n  const delegationAddress = hasDelegation\n    ? add0x(normalizedCode.slice(DELEGATION_PREFIX.length))\n    : undefined;\n\n  const isSupported = Boolean(\n    delegationAddress &&\n      contractAddresses.some(\n        (contract) =>\n          contract.toLowerCase() === delegationAddress.toLowerCase(),\n      ),\n  );\n\n  return {\n    delegationAddress,\n    isSupported,\n  };\n}\n\n/**\n * Generate an EIP-7702 batch transaction.\n *\n * @param from - The sender address.\n * @param transactions - The transactions to batch.\n * @returns The batch transaction.\n */\nexport function generateEIP7702BatchTransaction(\n  from: Hex,\n  transactions: BatchTransactionParams[],\n): BatchTransactionParams {\n  const erc7821Contract = Contract.getInterface(ABI_IERC7821);\n\n  const calls = transactions.map((transaction) => {\n    const { data, to, value } = transaction;\n\n    return [\n      to ?? '0x0000000000000000000000000000000000000000',\n      value ?? '0x0',\n      data ?? '0x',\n    ];\n  });\n\n  // Single batch mode, no opData.\n  const mode = '0x01'.padEnd(66, '0');\n\n  const callData = defaultAbiCoder.encode([CALLS_SIGNATURE], [calls]);\n\n  const data = erc7821Contract.encodeFunctionData(BATCH_FUNCTION_NAME, [\n    mode,\n    callData,\n  ]) as Hex;\n\n  log('Transaction data', data);\n\n  return {\n    data,\n    to: from,\n  };\n}\n\n/**\n * Sign an authorization list.\n *\n * @param options - Options bag.\n * @param options.authorizationList - The authorization list to sign.\n * @param options.messenger - The controller messenger.\n * @param options.transactionMeta - The transaction metadata.\n * @returns The signed authorization list.\n */\nexport async function signAuthorizationList({\n  authorizationList,\n  messenger,\n  transactionMeta,\n}: {\n  authorizationList?: AuthorizationList;\n  messenger: TransactionControllerMessenger;\n  transactionMeta: TransactionMeta;\n}): Promise<Required<AuthorizationList | undefined>> {\n  if (!authorizationList) {\n    return undefined;\n  }\n\n  const signedAuthorizationList: Required<AuthorizationList> = [];\n  let index = 0;\n\n  for (const authorization of authorizationList) {\n    const signedAuthorization = await signAuthorization(\n      authorization,\n      transactionMeta,\n      messenger,\n      index,\n    );\n\n    signedAuthorizationList.push(signedAuthorization);\n    index += 1;\n  }\n\n  return signedAuthorizationList;\n}\n\n/**\n * Signs an authorization.\n *\n * @param authorization - The authorization to sign.\n * @param transactionMeta - The associated transaction metadata.\n * @param messenger - The messenger to use for signing.\n * @param index - The index of the authorization in the list.\n * @returns The signed authorization.\n */\nasync function signAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  messenger: TransactionControllerMessenger,\n  index: number,\n): Promise<Required<Authorization>> {\n  const finalAuthorization = prepareAuthorization(\n    authorization,\n    transactionMeta,\n    index,\n  );\n\n  const { address, chainId, nonce } = finalAuthorization;\n  const chainIdDecimal = parseInt(chainId, 16);\n  const nonceDecimal = parseInt(nonce, 16);\n\n  const signature = await messenger.call(\n    'KeyringController:signAuthorization',\n    [chainIdDecimal, address, nonceDecimal],\n  );\n\n  const r = signature.slice(0, 66) as Hex;\n  const s = `0x${signature.slice(66, 130)}` as Hex;\n  const v = parseInt(signature.slice(130, 132), 16);\n  const yParity = v - 27 === 0 ? '0x' : '0x1';\n  const finalNonce = nonceDecimal === 0 ? '0x' : nonce;\n\n  const result: Required<Authorization> = {\n    address,\n    chainId,\n    nonce: finalNonce,\n    r,\n    s,\n    yParity,\n  };\n\n  log('Signed authorization', result);\n\n  return result;\n}\n\n/**\n * Prepares an authorization for signing by populating the chainId and nonce.\n *\n * @param authorization - The authorization to prepare.\n * @param transactionMeta - The associated transaction metadata.\n * @param index - The index of the authorization in the list.\n * @returns The prepared authorization.\n */\nfunction prepareAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  index: number,\n): Authorization & { chainId: Hex; nonce: Hex } {\n  const { chainId: existingChainId, nonce: existingNonce } = authorization;\n  const { txParams, chainId: transactionChainId } = transactionMeta;\n  const { nonce: transactionNonce } = txParams;\n\n  const chainId = existingChainId ?? transactionChainId;\n  let nonce = existingNonce;\n\n  if (nonce === undefined) {\n    nonce = toHex(parseInt(transactionNonce as string, 16) + 1 + index);\n  }\n\n  const result = {\n    ...authorization,\n    chainId,\n    nonce,\n  };\n\n  log('Prepared authorization', result);\n\n  return result;\n}\n"]}
+{"version":3,"file":"eip7702.cjs","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"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","sourcesContent":["import { defaultAbiCoder } from '@ethersproject/abi';\nimport { Contract } from '@ethersproject/contracts';\nimport { query, toHex } from '@metamask/controller-utils';\nimport type EthQuery from '@metamask/eth-query';\nimport { createModuleLogger, type Hex, add0x } from '@metamask/utils';\n\nimport {\n  getEIP7702ContractAddresses,\n  getEIP7702SupportedChains,\n} from './feature-flags';\nimport { ABI_IERC7821 } from '../constants';\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\nimport type {\n  BatchTransactionParams,\n  Authorization,\n  AuthorizationList,\n  TransactionMeta,\n} from '../types';\n\nexport type KeyringControllerAuthorization = [\n  chainId: number,\n  contractAddress: string,\n  nonce: number,\n];\n\nexport type KeyringControllerSignAuthorization = {\n  type: 'KeyringController:signEip7702AuthorizationMessage';\n  handler: (authorization: {\n    chainId: number;\n    contractAddress: string;\n    from: string;\n    nonce: number;\n  }) => Promise<string>;\n};\n\nexport const DELEGATION_PREFIX = '0xef0100';\nexport const BATCH_FUNCTION_NAME = 'execute';\nexport const CALLS_SIGNATURE = '(address,uint256,bytes)[]';\n\nconst log = createModuleLogger(projectLogger, 'eip-7702');\n\n/**\n * Determine if a chain supports EIP-7702 using LaunchDarkly feature flag.\n *\n * @param chainId - Hexadecimal ID of the chain.\n * @param messenger - Messenger instance.\n * @returns True if the chain supports EIP-7702.\n */\nexport function doesChainSupportEIP7702(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n) {\n  const supportedChains = getEIP7702SupportedChains(messenger);\n\n  return supportedChains.some(\n    (supportedChainId) =>\n      supportedChainId.toLowerCase() === chainId.toLowerCase(),\n  );\n}\n\n/**\n * Determine if an account has been upgraded to a supported EIP-7702 contract.\n *\n * @param address - The EOA address to check.\n * @param chainId - The chain ID.\n * @param messenger - The messenger instance.\n * @param ethQuery - The EthQuery instance to communicate with the blockchain.\n * @returns An object with the results of the check.\n */\nexport async function isAccountUpgradedToEIP7702(\n  address: Hex,\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  ethQuery: EthQuery,\n) {\n  const contractAddresses = getEIP7702ContractAddresses(chainId, messenger);\n  const code = await query(ethQuery, 'eth_getCode', [address]);\n  const normalizedCode = add0x(code?.toLowerCase?.() ?? '');\n\n  const hasDelegation =\n    code?.length === 48 && normalizedCode.startsWith(DELEGATION_PREFIX);\n\n  const delegationAddress = hasDelegation\n    ? add0x(normalizedCode.slice(DELEGATION_PREFIX.length))\n    : undefined;\n\n  const isSupported = Boolean(\n    delegationAddress &&\n      contractAddresses.some(\n        (contract) =>\n          contract.toLowerCase() === delegationAddress.toLowerCase(),\n      ),\n  );\n\n  return {\n    delegationAddress,\n    isSupported,\n  };\n}\n\n/**\n * Generate an EIP-7702 batch transaction.\n *\n * @param from - The sender address.\n * @param transactions - The transactions to batch.\n * @returns The batch transaction.\n */\nexport function generateEIP7702BatchTransaction(\n  from: Hex,\n  transactions: BatchTransactionParams[],\n): BatchTransactionParams {\n  const erc7821Contract = Contract.getInterface(ABI_IERC7821);\n\n  const calls = transactions.map((transaction) => {\n    const { data, to, value } = transaction;\n\n    return [\n      to ?? '0x0000000000000000000000000000000000000000',\n      value ?? '0x0',\n      data ?? '0x',\n    ];\n  });\n\n  // Single batch mode, no opData.\n  const mode = '0x01'.padEnd(66, '0');\n\n  const callData = defaultAbiCoder.encode([CALLS_SIGNATURE], [calls]);\n\n  const data = erc7821Contract.encodeFunctionData(BATCH_FUNCTION_NAME, [\n    mode,\n    callData,\n  ]) as Hex;\n\n  log('Transaction data', data);\n\n  return {\n    data,\n    to: from,\n  };\n}\n\n/**\n * Sign an authorization list.\n *\n * @param options - Options bag.\n * @param options.authorizationList - The authorization list to sign.\n * @param options.messenger - The controller messenger.\n * @param options.transactionMeta - The transaction metadata.\n * @returns The signed authorization list.\n */\nexport async function signAuthorizationList({\n  authorizationList,\n  messenger,\n  transactionMeta,\n}: {\n  authorizationList?: AuthorizationList;\n  messenger: TransactionControllerMessenger;\n  transactionMeta: TransactionMeta;\n}): Promise<Required<AuthorizationList | undefined>> {\n  if (!authorizationList) {\n    return undefined;\n  }\n\n  const signedAuthorizationList: Required<AuthorizationList> = [];\n  let index = 0;\n\n  for (const authorization of authorizationList) {\n    const signedAuthorization = await signAuthorization(\n      authorization,\n      transactionMeta,\n      messenger,\n      index,\n    );\n\n    signedAuthorizationList.push(signedAuthorization);\n    index += 1;\n  }\n\n  return signedAuthorizationList;\n}\n\n/**\n * Signs an authorization.\n *\n * @param authorization - The authorization to sign.\n * @param transactionMeta - The associated transaction metadata.\n * @param messenger - The messenger to use for signing.\n * @param index - The index of the authorization in the list.\n * @returns The signed authorization.\n */\nasync function signAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  messenger: TransactionControllerMessenger,\n  index: number,\n): Promise<Required<Authorization>> {\n  const finalAuthorization = prepareAuthorization(\n    authorization,\n    transactionMeta,\n    index,\n  );\n\n  const { txParams } = transactionMeta;\n  const { from } = txParams;\n  const { address, chainId, nonce } = finalAuthorization;\n  const chainIdDecimal = parseInt(chainId, 16);\n  const nonceDecimal = parseInt(nonce, 16);\n\n  const signature = await messenger.call(\n    'KeyringController:signEip7702AuthorizationMessage',\n    {\n      chainId: chainIdDecimal,\n      contractAddress: address,\n      from,\n      nonce: nonceDecimal,\n    },\n  );\n\n  const r = signature.slice(0, 66) as Hex;\n  const s = `0x${signature.slice(66, 130)}` as Hex;\n  const v = parseInt(signature.slice(130, 132), 16);\n  const yParity = v - 27 === 0 ? '0x' : '0x1';\n  const finalNonce = nonceDecimal === 0 ? '0x' : nonce;\n\n  const result: Required<Authorization> = {\n    address,\n    chainId,\n    nonce: finalNonce,\n    r,\n    s,\n    yParity,\n  };\n\n  log('Signed authorization', result);\n\n  return result;\n}\n\n/**\n * Prepares an authorization for signing by populating the chainId and nonce.\n *\n * @param authorization - The authorization to prepare.\n * @param transactionMeta - The associated transaction metadata.\n * @param index - The index of the authorization in the list.\n * @returns The prepared authorization.\n */\nfunction prepareAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  index: number,\n): Authorization & { chainId: Hex; nonce: Hex } {\n  const { chainId: existingChainId, nonce: existingNonce } = authorization;\n  const { txParams, chainId: transactionChainId } = transactionMeta;\n  const { nonce: transactionNonce } = txParams;\n\n  const chainId = existingChainId ?? transactionChainId;\n  let nonce = existingNonce;\n\n  if (nonce === undefined) {\n    nonce = toHex(parseInt(transactionNonce as string, 16) + 1 + index);\n  }\n\n  const result = {\n    ...authorization,\n    chainId,\n    nonce,\n  };\n\n  log('Prepared authorization', result);\n\n  return result;\n}\n"]}

package/dist/utils/eip7702.d.cts

@@ -8,8 +8,13 @@ export type KeyringControllerAuthorization = [
     nonce: number
 ];
 export type KeyringControllerSignAuthorization = {
-    type: 'KeyringController:signAuthorization';
-    handler: (authorization: KeyringControllerAuthorization) => Promise<string>;
+    type: 'KeyringController:signEip7702AuthorizationMessage';
+    handler: (authorization: {
+        chainId: number;
+        contractAddress: string;
+        from: string;
+        nonce: number;
+    }) => Promise<string>;
 };
 export declare const DELEGATION_PREFIX = "0xef0100";
 export declare const BATCH_FUNCTION_NAME = "execute";

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

@@ -1 +1 @@
-{"version":3,"file":"eip7702.d.cts","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,QAAQ,4BAA4B;AAChD,OAAO,EAAsB,KAAK,GAAG,EAAS,wBAAwB;AAOtE,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAC/E,OAAO,KAAK,EACV,sBAAsB,EAEtB,iBAAiB,EACjB,eAAe,EAChB,qBAAiB;AAGlB,MAAM,MAAM,8BAA8B,GAAG;IAC3C,OAAO,EAAE,MAAM;IACf,eAAe,EAAE,MAAM;IACvB,KAAK,EAAE,MAAM;CACd,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,IAAI,EAAE,qCAAqC,CAAC;IAC5C,OAAO,EAAE,CAAC,aAAa,EAAE,8BAA8B,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC7E,CAAC;AAEF,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAC5C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,eAAe,8BAA8B,CAAC;AAI3D;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,WAQ1C;AAED;;;;;;;;GAQG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,QAAQ,EAAE,QAAQ;;;GAyBnB;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,sBAAsB,EAAE,GACrC,sBAAsB,CA6BxB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,EAC1C,iBAAiB,EACjB,SAAS,EACT,eAAe,GAChB,EAAE;IACD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAqBnD"}
+{"version":3,"file":"eip7702.d.cts","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,QAAQ,4BAA4B;AAChD,OAAO,EAAsB,KAAK,GAAG,EAAS,wBAAwB;AAQtE,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAC/E,OAAO,KAAK,EACV,sBAAsB,EAEtB,iBAAiB,EACjB,eAAe,EAChB,qBAAiB;AAElB,MAAM,MAAM,8BAA8B,GAAG;IAC3C,OAAO,EAAE,MAAM;IACf,eAAe,EAAE,MAAM;IACvB,KAAK,EAAE,MAAM;CACd,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,IAAI,EAAE,mDAAmD,CAAC;IAC1D,OAAO,EAAE,CAAC,aAAa,EAAE;QACvB,OAAO,EAAE,MAAM,CAAC;QAChB,eAAe,EAAE,MAAM,CAAC;QACxB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAC5C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,eAAe,8BAA8B,CAAC;AAI3D;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,WAQ1C;AAED;;;;;;;;GAQG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,QAAQ,EAAE,QAAQ;;;GAyBnB;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,sBAAsB,EAAE,GACrC,sBAAsB,CA6BxB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,EAC1C,iBAAiB,EACjB,SAAS,EACT,eAAe,GAChB,EAAE;IACD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAqBnD"}

package/dist/utils/eip7702.d.mts

@@ -8,8 +8,13 @@ export type KeyringControllerAuthorization = [
     nonce: number
 ];
 export type KeyringControllerSignAuthorization = {
-    type: 'KeyringController:signAuthorization';
-    handler: (authorization: KeyringControllerAuthorization) => Promise<string>;
+    type: 'KeyringController:signEip7702AuthorizationMessage';
+    handler: (authorization: {
+        chainId: number;
+        contractAddress: string;
+        from: string;
+        nonce: number;
+    }) => Promise<string>;
 };
 export declare const DELEGATION_PREFIX = "0xef0100";
 export declare const BATCH_FUNCTION_NAME = "execute";

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

@@ -1 +1 @@
-{"version":3,"file":"eip7702.d.mts","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,QAAQ,4BAA4B;AAChD,OAAO,EAAsB,KAAK,GAAG,EAAS,wBAAwB;AAOtE,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAC/E,OAAO,KAAK,EACV,sBAAsB,EAEtB,iBAAiB,EACjB,eAAe,EAChB,qBAAiB;AAGlB,MAAM,MAAM,8BAA8B,GAAG;IAC3C,OAAO,EAAE,MAAM;IACf,eAAe,EAAE,MAAM;IACvB,KAAK,EAAE,MAAM;CACd,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,IAAI,EAAE,qCAAqC,CAAC;IAC5C,OAAO,EAAE,CAAC,aAAa,EAAE,8BAA8B,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC7E,CAAC;AAEF,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAC5C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,eAAe,8BAA8B,CAAC;AAI3D;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,WAQ1C;AAED;;;;;;;;GAQG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,QAAQ,EAAE,QAAQ;;;GAyBnB;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,sBAAsB,EAAE,GACrC,sBAAsB,CA6BxB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,EAC1C,iBAAiB,EACjB,SAAS,EACT,eAAe,GAChB,EAAE;IACD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAqBnD"}
+{"version":3,"file":"eip7702.d.mts","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,QAAQ,4BAA4B;AAChD,OAAO,EAAsB,KAAK,GAAG,EAAS,wBAAwB;AAQtE,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAC/E,OAAO,KAAK,EACV,sBAAsB,EAEtB,iBAAiB,EACjB,eAAe,EAChB,qBAAiB;AAElB,MAAM,MAAM,8BAA8B,GAAG;IAC3C,OAAO,EAAE,MAAM;IACf,eAAe,EAAE,MAAM;IACvB,KAAK,EAAE,MAAM;CACd,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,IAAI,EAAE,mDAAmD,CAAC;IAC1D,OAAO,EAAE,CAAC,aAAa,EAAE;QACvB,OAAO,EAAE,MAAM,CAAC;QAChB,eAAe,EAAE,MAAM,CAAC;QACxB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAC5C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,eAAe,8BAA8B,CAAC;AAI3D;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,WAQ1C;AAED;;;;;;;;GAQG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,QAAQ,EAAE,QAAQ;;;GAyBnB;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,sBAAsB,EAAE,GACrC,sBAAsB,CA6BxB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,EAC1C,iBAAiB,EACjB,SAAS,EACT,eAAe,GAChB,EAAE;IACD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAqBnD"}

package/dist/utils/eip7702.mjs

@@ -3,8 +3,8 @@ import { Contract } from "@ethersproject/contracts";
 import { query, toHex } from "@metamask/controller-utils";
 import { createModuleLogger, add0x } from "@metamask/utils";
 import { getEIP7702ContractAddresses, getEIP7702SupportedChains } from "./feature-flags.mjs";
-import { projectLogger } from "../logger.mjs";
 import { ABI_IERC7821 } from "../constants.mjs";
+import { projectLogger } from "../logger.mjs";
 export const DELEGATION_PREFIX = '0xef0100';
 export const BATCH_FUNCTION_NAME = 'execute';
 export const CALLS_SIGNATURE = '(address,uint256,bytes)[]';
@@ -107,10 +107,17 @@ export async function signAuthorizationList({ authorizationList, messenger, tran
  */
 async function signAuthorization(authorization, transactionMeta, messenger, index) {
     const finalAuthorization = prepareAuthorization(authorization, transactionMeta, index);
+    const { txParams } = transactionMeta;
+    const { from } = txParams;
     const { address, chainId, nonce } = finalAuthorization;
     const chainIdDecimal = parseInt(chainId, 16);
     const nonceDecimal = parseInt(nonce, 16);
-    const signature = await messenger.call('KeyringController:signAuthorization', [chainIdDecimal, address, nonceDecimal]);
+    const signature = await messenger.call('KeyringController:signEip7702AuthorizationMessage', {
+        chainId: chainIdDecimal,
+        contractAddress: address,
+        from,
+        nonce: nonceDecimal,
+    });
     const r = signature.slice(0, 66);
     const s = `0x${signature.slice(66, 130)}`;
     const v = parseInt(signature.slice(130, 132), 16);

package/dist/utils/eip7702.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"eip7702.mjs","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"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","sourcesContent":["import { defaultAbiCoder } from '@ethersproject/abi';\nimport { Contract } from '@ethersproject/contracts';\nimport { query, toHex } from '@metamask/controller-utils';\nimport type EthQuery from '@metamask/eth-query';\nimport { createModuleLogger, type Hex, add0x } from '@metamask/utils';\n\nimport {\n  getEIP7702ContractAddresses,\n  getEIP7702SupportedChains,\n} from './feature-flags';\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\nimport type {\n  BatchTransactionParams,\n  Authorization,\n  AuthorizationList,\n  TransactionMeta,\n} from '../types';\nimport { ABI_IERC7821 } from '../constants';\n\nexport type KeyringControllerAuthorization = [\n  chainId: number,\n  contractAddress: string,\n  nonce: number,\n];\n\nexport type KeyringControllerSignAuthorization = {\n  type: 'KeyringController:signAuthorization';\n  handler: (authorization: KeyringControllerAuthorization) => Promise<string>;\n};\n\nexport const DELEGATION_PREFIX = '0xef0100';\nexport const BATCH_FUNCTION_NAME = 'execute';\nexport const CALLS_SIGNATURE = '(address,uint256,bytes)[]';\n\nconst log = createModuleLogger(projectLogger, 'eip-7702');\n\n/**\n * Determine if a chain supports EIP-7702 using LaunchDarkly feature flag.\n *\n * @param chainId - Hexadecimal ID of the chain.\n * @param messenger - Messenger instance.\n * @returns True if the chain supports EIP-7702.\n */\nexport function doesChainSupportEIP7702(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n) {\n  const supportedChains = getEIP7702SupportedChains(messenger);\n\n  return supportedChains.some(\n    (supportedChainId) =>\n      supportedChainId.toLowerCase() === chainId.toLowerCase(),\n  );\n}\n\n/**\n * Determine if an account has been upgraded to a supported EIP-7702 contract.\n *\n * @param address - The EOA address to check.\n * @param chainId - The chain ID.\n * @param messenger - The messenger instance.\n * @param ethQuery - The EthQuery instance to communicate with the blockchain.\n * @returns An object with the results of the check.\n */\nexport async function isAccountUpgradedToEIP7702(\n  address: Hex,\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  ethQuery: EthQuery,\n) {\n  const contractAddresses = getEIP7702ContractAddresses(chainId, messenger);\n  const code = await query(ethQuery, 'eth_getCode', [address]);\n  const normalizedCode = add0x(code?.toLowerCase?.() ?? '');\n\n  const hasDelegation =\n    code?.length === 48 && normalizedCode.startsWith(DELEGATION_PREFIX);\n\n  const delegationAddress = hasDelegation\n    ? add0x(normalizedCode.slice(DELEGATION_PREFIX.length))\n    : undefined;\n\n  const isSupported = Boolean(\n    delegationAddress &&\n      contractAddresses.some(\n        (contract) =>\n          contract.toLowerCase() === delegationAddress.toLowerCase(),\n      ),\n  );\n\n  return {\n    delegationAddress,\n    isSupported,\n  };\n}\n\n/**\n * Generate an EIP-7702 batch transaction.\n *\n * @param from - The sender address.\n * @param transactions - The transactions to batch.\n * @returns The batch transaction.\n */\nexport function generateEIP7702BatchTransaction(\n  from: Hex,\n  transactions: BatchTransactionParams[],\n): BatchTransactionParams {\n  const erc7821Contract = Contract.getInterface(ABI_IERC7821);\n\n  const calls = transactions.map((transaction) => {\n    const { data, to, value } = transaction;\n\n    return [\n      to ?? '0x0000000000000000000000000000000000000000',\n      value ?? '0x0',\n      data ?? '0x',\n    ];\n  });\n\n  // Single batch mode, no opData.\n  const mode = '0x01'.padEnd(66, '0');\n\n  const callData = defaultAbiCoder.encode([CALLS_SIGNATURE], [calls]);\n\n  const data = erc7821Contract.encodeFunctionData(BATCH_FUNCTION_NAME, [\n    mode,\n    callData,\n  ]) as Hex;\n\n  log('Transaction data', data);\n\n  return {\n    data,\n    to: from,\n  };\n}\n\n/**\n * Sign an authorization list.\n *\n * @param options - Options bag.\n * @param options.authorizationList - The authorization list to sign.\n * @param options.messenger - The controller messenger.\n * @param options.transactionMeta - The transaction metadata.\n * @returns The signed authorization list.\n */\nexport async function signAuthorizationList({\n  authorizationList,\n  messenger,\n  transactionMeta,\n}: {\n  authorizationList?: AuthorizationList;\n  messenger: TransactionControllerMessenger;\n  transactionMeta: TransactionMeta;\n}): Promise<Required<AuthorizationList | undefined>> {\n  if (!authorizationList) {\n    return undefined;\n  }\n\n  const signedAuthorizationList: Required<AuthorizationList> = [];\n  let index = 0;\n\n  for (const authorization of authorizationList) {\n    const signedAuthorization = await signAuthorization(\n      authorization,\n      transactionMeta,\n      messenger,\n      index,\n    );\n\n    signedAuthorizationList.push(signedAuthorization);\n    index += 1;\n  }\n\n  return signedAuthorizationList;\n}\n\n/**\n * Signs an authorization.\n *\n * @param authorization - The authorization to sign.\n * @param transactionMeta - The associated transaction metadata.\n * @param messenger - The messenger to use for signing.\n * @param index - The index of the authorization in the list.\n * @returns The signed authorization.\n */\nasync function signAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  messenger: TransactionControllerMessenger,\n  index: number,\n): Promise<Required<Authorization>> {\n  const finalAuthorization = prepareAuthorization(\n    authorization,\n    transactionMeta,\n    index,\n  );\n\n  const { address, chainId, nonce } = finalAuthorization;\n  const chainIdDecimal = parseInt(chainId, 16);\n  const nonceDecimal = parseInt(nonce, 16);\n\n  const signature = await messenger.call(\n    'KeyringController:signAuthorization',\n    [chainIdDecimal, address, nonceDecimal],\n  );\n\n  const r = signature.slice(0, 66) as Hex;\n  const s = `0x${signature.slice(66, 130)}` as Hex;\n  const v = parseInt(signature.slice(130, 132), 16);\n  const yParity = v - 27 === 0 ? '0x' : '0x1';\n  const finalNonce = nonceDecimal === 0 ? '0x' : nonce;\n\n  const result: Required<Authorization> = {\n    address,\n    chainId,\n    nonce: finalNonce,\n    r,\n    s,\n    yParity,\n  };\n\n  log('Signed authorization', result);\n\n  return result;\n}\n\n/**\n * Prepares an authorization for signing by populating the chainId and nonce.\n *\n * @param authorization - The authorization to prepare.\n * @param transactionMeta - The associated transaction metadata.\n * @param index - The index of the authorization in the list.\n * @returns The prepared authorization.\n */\nfunction prepareAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  index: number,\n): Authorization & { chainId: Hex; nonce: Hex } {\n  const { chainId: existingChainId, nonce: existingNonce } = authorization;\n  const { txParams, chainId: transactionChainId } = transactionMeta;\n  const { nonce: transactionNonce } = txParams;\n\n  const chainId = existingChainId ?? transactionChainId;\n  let nonce = existingNonce;\n\n  if (nonce === undefined) {\n    nonce = toHex(parseInt(transactionNonce as string, 16) + 1 + index);\n  }\n\n  const result = {\n    ...authorization,\n    chainId,\n    nonce,\n  };\n\n  log('Prepared authorization', result);\n\n  return result;\n}\n"]}
+{"version":3,"file":"eip7702.mjs","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"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","sourcesContent":["import { defaultAbiCoder } from '@ethersproject/abi';\nimport { Contract } from '@ethersproject/contracts';\nimport { query, toHex } from '@metamask/controller-utils';\nimport type EthQuery from '@metamask/eth-query';\nimport { createModuleLogger, type Hex, add0x } from '@metamask/utils';\n\nimport {\n  getEIP7702ContractAddresses,\n  getEIP7702SupportedChains,\n} from './feature-flags';\nimport { ABI_IERC7821 } from '../constants';\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\nimport type {\n  BatchTransactionParams,\n  Authorization,\n  AuthorizationList,\n  TransactionMeta,\n} from '../types';\n\nexport type KeyringControllerAuthorization = [\n  chainId: number,\n  contractAddress: string,\n  nonce: number,\n];\n\nexport type KeyringControllerSignAuthorization = {\n  type: 'KeyringController:signEip7702AuthorizationMessage';\n  handler: (authorization: {\n    chainId: number;\n    contractAddress: string;\n    from: string;\n    nonce: number;\n  }) => Promise<string>;\n};\n\nexport const DELEGATION_PREFIX = '0xef0100';\nexport const BATCH_FUNCTION_NAME = 'execute';\nexport const CALLS_SIGNATURE = '(address,uint256,bytes)[]';\n\nconst log = createModuleLogger(projectLogger, 'eip-7702');\n\n/**\n * Determine if a chain supports EIP-7702 using LaunchDarkly feature flag.\n *\n * @param chainId - Hexadecimal ID of the chain.\n * @param messenger - Messenger instance.\n * @returns True if the chain supports EIP-7702.\n */\nexport function doesChainSupportEIP7702(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n) {\n  const supportedChains = getEIP7702SupportedChains(messenger);\n\n  return supportedChains.some(\n    (supportedChainId) =>\n      supportedChainId.toLowerCase() === chainId.toLowerCase(),\n  );\n}\n\n/**\n * Determine if an account has been upgraded to a supported EIP-7702 contract.\n *\n * @param address - The EOA address to check.\n * @param chainId - The chain ID.\n * @param messenger - The messenger instance.\n * @param ethQuery - The EthQuery instance to communicate with the blockchain.\n * @returns An object with the results of the check.\n */\nexport async function isAccountUpgradedToEIP7702(\n  address: Hex,\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n  ethQuery: EthQuery,\n) {\n  const contractAddresses = getEIP7702ContractAddresses(chainId, messenger);\n  const code = await query(ethQuery, 'eth_getCode', [address]);\n  const normalizedCode = add0x(code?.toLowerCase?.() ?? '');\n\n  const hasDelegation =\n    code?.length === 48 && normalizedCode.startsWith(DELEGATION_PREFIX);\n\n  const delegationAddress = hasDelegation\n    ? add0x(normalizedCode.slice(DELEGATION_PREFIX.length))\n    : undefined;\n\n  const isSupported = Boolean(\n    delegationAddress &&\n      contractAddresses.some(\n        (contract) =>\n          contract.toLowerCase() === delegationAddress.toLowerCase(),\n      ),\n  );\n\n  return {\n    delegationAddress,\n    isSupported,\n  };\n}\n\n/**\n * Generate an EIP-7702 batch transaction.\n *\n * @param from - The sender address.\n * @param transactions - The transactions to batch.\n * @returns The batch transaction.\n */\nexport function generateEIP7702BatchTransaction(\n  from: Hex,\n  transactions: BatchTransactionParams[],\n): BatchTransactionParams {\n  const erc7821Contract = Contract.getInterface(ABI_IERC7821);\n\n  const calls = transactions.map((transaction) => {\n    const { data, to, value } = transaction;\n\n    return [\n      to ?? '0x0000000000000000000000000000000000000000',\n      value ?? '0x0',\n      data ?? '0x',\n    ];\n  });\n\n  // Single batch mode, no opData.\n  const mode = '0x01'.padEnd(66, '0');\n\n  const callData = defaultAbiCoder.encode([CALLS_SIGNATURE], [calls]);\n\n  const data = erc7821Contract.encodeFunctionData(BATCH_FUNCTION_NAME, [\n    mode,\n    callData,\n  ]) as Hex;\n\n  log('Transaction data', data);\n\n  return {\n    data,\n    to: from,\n  };\n}\n\n/**\n * Sign an authorization list.\n *\n * @param options - Options bag.\n * @param options.authorizationList - The authorization list to sign.\n * @param options.messenger - The controller messenger.\n * @param options.transactionMeta - The transaction metadata.\n * @returns The signed authorization list.\n */\nexport async function signAuthorizationList({\n  authorizationList,\n  messenger,\n  transactionMeta,\n}: {\n  authorizationList?: AuthorizationList;\n  messenger: TransactionControllerMessenger;\n  transactionMeta: TransactionMeta;\n}): Promise<Required<AuthorizationList | undefined>> {\n  if (!authorizationList) {\n    return undefined;\n  }\n\n  const signedAuthorizationList: Required<AuthorizationList> = [];\n  let index = 0;\n\n  for (const authorization of authorizationList) {\n    const signedAuthorization = await signAuthorization(\n      authorization,\n      transactionMeta,\n      messenger,\n      index,\n    );\n\n    signedAuthorizationList.push(signedAuthorization);\n    index += 1;\n  }\n\n  return signedAuthorizationList;\n}\n\n/**\n * Signs an authorization.\n *\n * @param authorization - The authorization to sign.\n * @param transactionMeta - The associated transaction metadata.\n * @param messenger - The messenger to use for signing.\n * @param index - The index of the authorization in the list.\n * @returns The signed authorization.\n */\nasync function signAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  messenger: TransactionControllerMessenger,\n  index: number,\n): Promise<Required<Authorization>> {\n  const finalAuthorization = prepareAuthorization(\n    authorization,\n    transactionMeta,\n    index,\n  );\n\n  const { txParams } = transactionMeta;\n  const { from } = txParams;\n  const { address, chainId, nonce } = finalAuthorization;\n  const chainIdDecimal = parseInt(chainId, 16);\n  const nonceDecimal = parseInt(nonce, 16);\n\n  const signature = await messenger.call(\n    'KeyringController:signEip7702AuthorizationMessage',\n    {\n      chainId: chainIdDecimal,\n      contractAddress: address,\n      from,\n      nonce: nonceDecimal,\n    },\n  );\n\n  const r = signature.slice(0, 66) as Hex;\n  const s = `0x${signature.slice(66, 130)}` as Hex;\n  const v = parseInt(signature.slice(130, 132), 16);\n  const yParity = v - 27 === 0 ? '0x' : '0x1';\n  const finalNonce = nonceDecimal === 0 ? '0x' : nonce;\n\n  const result: Required<Authorization> = {\n    address,\n    chainId,\n    nonce: finalNonce,\n    r,\n    s,\n    yParity,\n  };\n\n  log('Signed authorization', result);\n\n  return result;\n}\n\n/**\n * Prepares an authorization for signing by populating the chainId and nonce.\n *\n * @param authorization - The authorization to prepare.\n * @param transactionMeta - The associated transaction metadata.\n * @param index - The index of the authorization in the list.\n * @returns The prepared authorization.\n */\nfunction prepareAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  index: number,\n): Authorization & { chainId: Hex; nonce: Hex } {\n  const { chainId: existingChainId, nonce: existingNonce } = authorization;\n  const { txParams, chainId: transactionChainId } = transactionMeta;\n  const { nonce: transactionNonce } = txParams;\n\n  const chainId = existingChainId ?? transactionChainId;\n  let nonce = existingNonce;\n\n  if (nonce === undefined) {\n    nonce = toHex(parseInt(transactionNonce as string, 16) + 1 + index);\n  }\n\n  const result = {\n    ...authorization,\n    chainId,\n    nonce,\n  };\n\n  log('Prepared authorization', result);\n\n  return result;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/transaction-controller",
-  "version": "45.1.0-preview-862b5dac",
+  "version": "45.1.0-preview-f51ef7f8",
   "description": "Stores transactions alongside their periodically updated statuses and manages interactions such as approval and cancellation",
   "keywords": [
     "MetaMask",