@metamask-previews/transaction-controller 71.0.0-preview-1efee3183 → 72.0.0-preview-3c2e73813

package/dist/utils/gas-fee-tokens.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gas-fee-tokens.d.ts","sourceRoot":"","sources":["../../src/utils/gas-fee-tokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAS3C,OAAO,KAAK,EACV,WAAW,EACX,8BAA8B,EAC9B,eAAe,EAChB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAQvD,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,4BAA4B,EAAE,CAC5B,eAAe,EAAE,eAAe,KAC7B,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CAAC,EACpC,OAAO,EACP,4BAA4B,EAC5B,SAAS,EACT,gBAAgB,EAChB,eAAe,EACf,mBAAmB,GACpB,EAAE,sBAAsB,GAAG,OAAO,CAAC;IAClC,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,0BAA0B,EAAE,OAAO,CAAC;CACrC,CAAC,CA8DD;AAED;;;;;;;;;GASG;AACH,wBAAsB,6BAA6B,CAAC,EAClD,SAAS,EACT,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,iBAAiB,GAClB,EAAE;IACD,SAAS,EAAE,8BAA8B,CAAC;IAC1C,eAAe,EAAE,eAAe,CAAC;IACjC,iBAAiB,EAAE,CAAC,WAAW,EAAE,eAAe,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5E,WAAW,EAAE,eAAe,CAAC;IAC7B,iBAAiB,EAAE,CACjB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,IAAI,KAC9B,IAAI,CAAC;CACX,GAAG,OAAO,CAAC,IAAI,CAAC,CA0DhB"}
+{"version":3,"file":"gas-fee-tokens.d.ts","sourceRoot":"","sources":["../../src/utils/gas-fee-tokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAS3C,OAAO,KAAK,EACV,WAAW,EACX,8BAA8B,EAC9B,eAAe,EAChB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAQvD,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,4BAA4B,EAAE,CAC5B,eAAe,EAAE,eAAe,KAC7B,OAAO,CAAC,OAAO,CAAC,CAAC;IACtB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,wBAAsB,eAAe,CAAC,EACpC,OAAO,EACP,4BAA4B,EAC5B,SAAS,EACT,gBAAgB,EAChB,eAAe,EACf,mBAAmB,GACpB,EAAE,sBAAsB,GAAG,OAAO,CAAC;IAClC,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC,CA8DD;AAED;;;;;;;;;GASG;AACH,wBAAsB,6BAA6B,CAAC,EAClD,SAAS,EACT,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,iBAAiB,GAClB,EAAE;IACD,SAAS,EAAE,8BAA8B,CAAC;IAC1C,eAAe,EAAE,eAAe,CAAC;IACjC,iBAAiB,EAAE,CAAC,WAAW,EAAE,eAAe,KAAK,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5E,WAAW,EAAE,eAAe,CAAC;IAC7B,iBAAiB,EAAE,CACjB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,CAAC,EAAE,EAAE,eAAe,KAAK,IAAI,KAC9B,IAAI,CAAC;CACX,GAAG,OAAO,CAAC,IAAI,CAAC,CAgEhB"}

package/dist/utils/gas-fee-tokens.js

@@ -17,7 +17,7 @@ const log = createModuleLogger(projectLogger, 'gas-fee-tokens');
  * @param request.publicKeyEIP7702 - Public key to validate EIP-7702 contract signatures.
  * @param request.transactionMeta - The transaction metadata.
  * @param request.getSimulationConfig - Optional transaction simulation parameters.
- * @returns The available gas fee tokens and whether gas fee sponsorship is available.
+ * @returns An array of gas fee tokens.
  */
 export async function getGasFeeTokens({ chainId, isEIP7702GasFeeTokensEnabled, messenger, publicKeyEIP7702, transactionMeta, getSimulationConfig, }) {
     const { delegationAddress, txParams } = transactionMeta;
@@ -66,7 +66,7 @@ export async function getGasFeeTokens({ chainId, isEIP7702GasFeeTokensEnabled, m
     }
     catch (error) {
         log('Failed to gas fee tokens', error);
-        return { gasFeeTokens: [], isGasFeeSponsoredAvailable: false };
+        return { gasFeeTokens: [], isGasFeeSponsored: false };
     }
 }
 /**
@@ -91,21 +91,27 @@ export async function checkGasFeeTokenBeforePublish({ messenger, networkClientId
         if (hasNativeBalance) {
             log('Ignoring gas fee token before publish due to sufficient native balance');
             updateTransaction(transaction.id, (tx) => {
+                tx.isExternalSign = false;
                 tx.selectedGasFeeToken = undefined;
             });
             return;
         }
     }
-    const gasFeeTokens = await fetchGasFeeTokens(transaction);
+    const gasFeeTokens = await fetchGasFeeTokens({
+        ...transaction,
+        isExternalSign: true,
+    });
     const isSelectedGasFeeTokenAvailable = gasFeeTokens?.some((token) => token.tokenAddress.toLowerCase() === selectedGasFeeToken.toLowerCase());
     if (!isSelectedGasFeeTokenAvailable) {
         updateTransaction(transaction.id, (tx) => {
             tx.gasFeeTokens = gasFeeTokens;
+            tx.isExternalSign = false;
         });
         throw new Error('Gas fee token not found and insufficient native balance');
     }
     updateTransaction(transaction.id, (tx) => {
         tx.gasFeeTokens = gasFeeTokens;
+        tx.isExternalSign = true;
         tx.txParams.nonce = undefined;
     });
     log('Updated gas fee tokens before publish', gasFeeTokens);
@@ -115,11 +121,12 @@ export async function checkGasFeeTokenBeforePublish({ messenger, networkClientId
  * Extract gas fee tokens from a simulation response.
  *
  * @param response - The simulation response.
- * @returns The available gas fee tokens and whether gas fee sponsorship is available.
+ * @returns gasFeeTokens: An array of gas fee tokens. isGasFeeSponsored: Whether the transaction is sponsored
  */
 function parseGasFeeTokens(response) {
     const feeLevel = response.transactions?.[0]
         ?.fees?.[0];
+    const isGasFeeSponsored = response.sponsorship?.isSponsored ?? false;
     const tokenFees = feeLevel?.tokenFees ?? [];
     return {
         gasFeeTokens: tokenFees.map((tokenFee) => ({
@@ -136,7 +143,7 @@ function parseGasFeeTokens(response) {
             symbol: tokenFee.token.symbol,
             tokenAddress: tokenFee.token.address,
         })),
-        isGasFeeSponsoredAvailable: response.sponsorship?.isSponsored ?? false,
+        isGasFeeSponsored,
     };
 }
 /**

package/dist/utils/gas-fee-tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"gas-fee-tokens.js","sourceRoot":"","sources":["../../src/utils/gas-fee-tokens.ts"],"names":[],"mappings":"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","sourcesContent":["import type { NetworkClientId } from '@metamask/network-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { Hex } from '@metamask/utils';\nimport { createModuleLogger } from '@metamask/utils';\n\nimport { simulateTransactions } from '../api/simulation-api.js';\nimport type { SimulationRequestTransaction } from '../api/simulation-api.js';\nimport type {\n  SimulationResponse,\n  SimulationResponseTransaction,\n} from '../api/simulation-api.js';\nimport type {\n  GasFeeToken,\n  TransactionControllerMessenger,\n  TransactionMeta,\n} from '../index.js';\nimport { projectLogger } from '../logger.js';\nimport type { GetSimulationConfig } from '../types.js';\nimport { isNativeBalanceSufficientForGas } from './balance.js';\nimport { ERROR_MESSAGE_NO_UPGRADE_CONTRACT } from './batch.js';\nimport { ERROR_MESSGE_PUBLIC_KEY, doesChainSupportEIP7702 } from './eip7702.js';\nimport { getEIP7702UpgradeContractAddress } from './feature-flags.js';\n\nconst log = createModuleLogger(projectLogger, 'gas-fee-tokens');\n\nexport type GetGasFeeTokensRequest = {\n  chainId: Hex;\n  isEIP7702GasFeeTokensEnabled: (\n    transactionMeta: TransactionMeta,\n  ) => Promise<boolean>;\n  getSimulationConfig: GetSimulationConfig;\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n  transactionMeta: TransactionMeta;\n};\n\n/**\n * Get gas fee tokens for a transaction.\n *\n * @param request - The request object.\n * @param request.chainId - The chain ID of the transaction.\n * @param request.isEIP7702GasFeeTokensEnabled - Callback to check if EIP-7702 gas fee tokens are enabled.\n * @param request.messenger - The messenger instance.\n * @param request.publicKeyEIP7702 - Public key to validate EIP-7702 contract signatures.\n * @param request.transactionMeta - The transaction metadata.\n * @param request.getSimulationConfig - Optional transaction simulation parameters.\n * @returns The available gas fee tokens and whether gas fee sponsorship is available.\n */\nexport async function getGasFeeTokens({\n  chainId,\n  isEIP7702GasFeeTokensEnabled,\n  messenger,\n  publicKeyEIP7702,\n  transactionMeta,\n  getSimulationConfig,\n}: GetGasFeeTokensRequest): Promise<{\n  gasFeeTokens: GasFeeToken[];\n  isGasFeeSponsoredAvailable: boolean;\n}> {\n  const { delegationAddress, txParams } = transactionMeta;\n  const { authorizationList: authorizationListRequest } = txParams;\n  const data = txParams.data as Hex;\n  const from = txParams.from as Hex;\n  const to = txParams.to as Hex;\n  const value = txParams.value as Hex;\n\n  log('Request', { chainId, txParams });\n\n  const is7702GasFeeTokensEnabled =\n    await isEIP7702GasFeeTokensEnabled(transactionMeta);\n\n  const with7702 =\n    is7702GasFeeTokensEnabled && doesChainSupportEIP7702(chainId, messenger);\n\n  let authorizationList:\n    | SimulationRequestTransaction['authorizationList']\n    | undefined = authorizationListRequest?.map((authorization) => ({\n    address: authorization.address,\n    from,\n  }));\n\n  if (with7702 && !delegationAddress && !authorizationList) {\n    authorizationList = buildAuthorizationList({\n      chainId,\n      from,\n      messenger,\n      publicKeyEIP7702,\n    });\n  }\n\n  try {\n    const response = await simulateTransactions(chainId, {\n      getSimulationConfig,\n      transactions: [\n        {\n          authorizationList,\n          data,\n          from,\n          to,\n          value,\n        },\n      ],\n      suggestFees: {\n        withTransfer: true,\n        withFeeTransfer: true,\n        with7702,\n      },\n    });\n\n    log('Response', response);\n\n    const result = parseGasFeeTokens(response);\n\n    log('Gas fee tokens', result);\n\n    return result;\n  } catch (error) {\n    log('Failed to gas fee tokens', error);\n    return { gasFeeTokens: [], isGasFeeSponsoredAvailable: false };\n  }\n}\n\n/**\n * Check and update gas fee token selection before publishing a transaction.\n *\n * @param request - Request object.\n * @param request.messenger - The transaction controller messenger.\n * @param request.networkClientId - The network client ID.\n * @param request.fetchGasFeeTokens - Function to fetch gas fee tokens.\n * @param request.transaction - Transaction metadata.\n * @param request.updateTransaction - Function to update the transaction.\n */\nexport async function checkGasFeeTokenBeforePublish({\n  messenger,\n  networkClientId,\n  fetchGasFeeTokens,\n  transaction,\n  updateTransaction,\n}: {\n  messenger: TransactionControllerMessenger;\n  networkClientId: NetworkClientId;\n  fetchGasFeeTokens: (transaction: TransactionMeta) => Promise<GasFeeToken[]>;\n  transaction: TransactionMeta;\n  updateTransaction: (\n    transactionId: string,\n    fn: (tx: TransactionMeta) => void,\n  ) => void;\n}): Promise<void> {\n  const {\n    excludeNativeTokenForFee,\n    isGasFeeTokenIgnoredIfBalance,\n    selectedGasFeeToken,\n  } = transaction;\n\n  if (\n    !selectedGasFeeToken ||\n    (!isGasFeeTokenIgnoredIfBalance && !excludeNativeTokenForFee)\n  ) {\n    return;\n  }\n\n  log('Checking gas fee token before publish', { selectedGasFeeToken });\n\n  if (!excludeNativeTokenForFee) {\n    const hasNativeBalance = await isNativeBalanceSufficientForGas(\n      transaction,\n      messenger,\n      networkClientId,\n    );\n\n    if (hasNativeBalance) {\n      log(\n        'Ignoring gas fee token before publish due to sufficient native balance',\n      );\n\n      updateTransaction(transaction.id, (tx) => {\n        tx.selectedGasFeeToken = undefined;\n      });\n\n      return;\n    }\n  }\n\n  const gasFeeTokens = await fetchGasFeeTokens(transaction);\n\n  const isSelectedGasFeeTokenAvailable = gasFeeTokens?.some(\n    (token) =>\n      token.tokenAddress.toLowerCase() === selectedGasFeeToken.toLowerCase(),\n  );\n\n  if (!isSelectedGasFeeTokenAvailable) {\n    updateTransaction(transaction.id, (tx) => {\n      tx.gasFeeTokens = gasFeeTokens;\n    });\n\n    throw new Error('Gas fee token not found and insufficient native balance');\n  }\n\n  updateTransaction(transaction.id, (tx) => {\n    tx.gasFeeTokens = gasFeeTokens;\n    tx.txParams.nonce = undefined;\n  });\n\n  log('Updated gas fee tokens before publish', gasFeeTokens);\n  log('Publishing with selected gas fee token', { selectedGasFeeToken });\n}\n\n/**\n * Extract gas fee tokens from a simulation response.\n *\n * @param response - The simulation response.\n * @returns The available gas fee tokens and whether gas fee sponsorship is available.\n */\nfunction parseGasFeeTokens(response: SimulationResponse): {\n  gasFeeTokens: GasFeeToken[];\n  isGasFeeSponsoredAvailable: boolean;\n} {\n  const feeLevel = response.transactions?.[0]\n    ?.fees?.[0] as Required<SimulationResponseTransaction>['fees'][0];\n\n  const tokenFees = feeLevel?.tokenFees ?? [];\n\n  return {\n    gasFeeTokens: tokenFees.map((tokenFee) => ({\n      amount: tokenFee.balanceNeededToken,\n      balance: tokenFee.currentBalanceToken,\n      decimals: tokenFee.token.decimals,\n      fee: tokenFee.serviceFee,\n      gas: feeLevel.gas,\n      gasTransfer: tokenFee.transferEstimate,\n      maxFeePerGas: feeLevel.maxFeePerGas,\n      maxPriorityFeePerGas: feeLevel.maxPriorityFeePerGas,\n      rateWei: tokenFee.rateWei,\n      recipient: tokenFee.feeRecipient,\n      symbol: tokenFee.token.symbol,\n      tokenAddress: tokenFee.token.address,\n    })),\n    isGasFeeSponsoredAvailable: response.sponsorship?.isSponsored ?? false,\n  };\n}\n\n/**\n * Generate the authorization list for the request.\n *\n * @param request - The request object.\n * @param request.chainId - The chain ID.\n * @param request.from - The sender's address.\n * @param request.messenger - The messenger instance.\n * @param request.publicKeyEIP7702 - The public key for EIP-7702.\n * @returns The authorization list.\n */\nfunction buildAuthorizationList({\n  chainId,\n  from,\n  messenger,\n  publicKeyEIP7702,\n}: {\n  chainId: Hex;\n  from: Hex;\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n}): SimulationRequestTransaction['authorizationList'] | undefined {\n  if (!publicKeyEIP7702) {\n    throw rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY);\n  }\n\n  const upgradeAddress = getEIP7702UpgradeContractAddress(\n    chainId,\n    messenger,\n    publicKeyEIP7702,\n  );\n\n  if (!upgradeAddress) {\n    throw rpcErrors.internal(ERROR_MESSAGE_NO_UPGRADE_CONTRACT);\n  }\n\n  return [\n    {\n      address: upgradeAddress,\n      from,\n    },\n  ];\n}\n"]}
+{"version":3,"file":"gas-fee-tokens.js","sourceRoot":"","sources":["../../src/utils/gas-fee-tokens.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAWhE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,iCAAiC,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,gCAAgC,EAAE,MAAM,oBAAoB,CAAC;AAEtE,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;AAahE;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EACpC,OAAO,EACP,4BAA4B,EAC5B,SAAS,EACT,gBAAgB,EAChB,eAAe,EACf,mBAAmB,GACI;IAIvB,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC;IACxD,MAAM,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,GAAG,QAAQ,CAAC;IACjE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAW,CAAC;IAClC,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAW,CAAC;IAClC,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAS,CAAC;IAC9B,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAY,CAAC;IAEpC,GAAG,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtC,MAAM,yBAAyB,GAC7B,MAAM,4BAA4B,CAAC,eAAe,CAAC,CAAC;IAEtD,MAAM,QAAQ,GACZ,yBAAyB,IAAI,uBAAuB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE3E,IAAI,iBAAiB,GAEL,wBAAwB,EAAE,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAChE,OAAO,EAAE,aAAa,CAAC,OAAO;QAC9B,IAAI;KACL,CAAC,CAAC,CAAC;IAEJ,IAAI,QAAQ,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzD,iBAAiB,GAAG,sBAAsB,CAAC;YACzC,OAAO;YACP,IAAI;YACJ,SAAS;YACT,gBAAgB;SACjB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,OAAO,EAAE;YACnD,mBAAmB;YACnB,YAAY,EAAE;gBACZ;oBACE,iBAAiB;oBACjB,IAAI;oBACJ,IAAI;oBACJ,EAAE;oBACF,KAAK;iBACN;aACF;YACD,WAAW,EAAE;gBACX,YAAY,EAAE,IAAI;gBAClB,eAAe,EAAE,IAAI;gBACrB,QAAQ;aACT;SACF,CAAC,CAAC;QAEH,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE1B,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAE3C,GAAG,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;QAE9B,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC;IACxD,CAAC;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,6BAA6B,CAAC,EAClD,SAAS,EACT,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,iBAAiB,GAUlB;IACC,MAAM,EACJ,wBAAwB,EACxB,6BAA6B,EAC7B,mBAAmB,GACpB,GAAG,WAAW,CAAC;IAEhB,IACE,CAAC,mBAAmB;QACpB,CAAC,CAAC,6BAA6B,IAAI,CAAC,wBAAwB,CAAC,EAC7D,CAAC;QACD,OAAO;IACT,CAAC;IAED,GAAG,CAAC,uCAAuC,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAEtE,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC9B,MAAM,gBAAgB,GAAG,MAAM,+BAA+B,CAC5D,WAAW,EACX,SAAS,EACT,eAAe,CAChB,CAAC;QAEF,IAAI,gBAAgB,EAAE,CAAC;YACrB,GAAG,CACD,wEAAwE,CACzE,CAAC;YAEF,iBAAiB,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;gBACvC,EAAE,CAAC,cAAc,GAAG,KAAK,CAAC;gBAC1B,EAAE,CAAC,mBAAmB,GAAG,SAAS,CAAC;YACrC,CAAC,CAAC,CAAC;YAEH,OAAO;QACT,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC;QAC3C,GAAG,WAAW;QACd,cAAc,EAAE,IAAI;KACrB,CAAC,CAAC;IAEH,MAAM,8BAA8B,GAAG,YAAY,EAAE,IAAI,CACvD,CAAC,KAAK,EAAE,EAAE,CACR,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,KAAK,mBAAmB,CAAC,WAAW,EAAE,CACzE,CAAC;IAEF,IAAI,CAAC,8BAA8B,EAAE,CAAC;QACpC,iBAAiB,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;YACvC,EAAE,CAAC,YAAY,GAAG,YAAY,CAAC;YAC/B,EAAE,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;IAC7E,CAAC;IAED,iBAAiB,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;QACvC,EAAE,CAAC,YAAY,GAAG,YAAY,CAAC;QAC/B,EAAE,CAAC,cAAc,GAAG,IAAI,CAAC;QACzB,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,uCAAuC,EAAE,YAAY,CAAC,CAAC;IAC3D,GAAG,CAAC,wCAAwC,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAC;AACzE,CAAC;AAED;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,QAA4B;IAIrD,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QACzC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAuD,CAAC;IAEpE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,WAAW,EAAE,WAAW,IAAI,KAAK,CAAC;IAErE,MAAM,SAAS,GAAG,QAAQ,EAAE,SAAS,IAAI,EAAE,CAAC;IAE5C,OAAO;QACL,YAAY,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YACzC,MAAM,EAAE,QAAQ,CAAC,kBAAkB;YACnC,OAAO,EAAE,QAAQ,CAAC,mBAAmB;YACrC,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,QAAQ;YACjC,GAAG,EAAE,QAAQ,CAAC,UAAU;YACxB,GAAG,EAAE,QAAQ,CAAC,GAAG;YACjB,WAAW,EAAE,QAAQ,CAAC,gBAAgB;YACtC,YAAY,EAAE,QAAQ,CAAC,YAAY;YACnC,oBAAoB,EAAE,QAAQ,CAAC,oBAAoB;YACnD,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,SAAS,EAAE,QAAQ,CAAC,YAAY;YAChC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,MAAM;YAC7B,YAAY,EAAE,QAAQ,CAAC,KAAK,CAAC,OAAO;SACrC,CAAC,CAAC;QACH,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,sBAAsB,CAAC,EAC9B,OAAO,EACP,IAAI,EACJ,SAAS,EACT,gBAAgB,GAMjB;IACC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,SAAS,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,cAAc,GAAG,gCAAgC,CACrD,OAAO,EACP,SAAS,EACT,gBAAgB,CACjB,CAAC;IAEF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,SAAS,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO;QACL;YACE,OAAO,EAAE,cAAc;YACvB,IAAI;SACL;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { NetworkClientId } from '@metamask/network-controller';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { Hex } from '@metamask/utils';\nimport { createModuleLogger } from '@metamask/utils';\n\nimport { simulateTransactions } from '../api/simulation-api.js';\nimport type { SimulationRequestTransaction } from '../api/simulation-api.js';\nimport type {\n  SimulationResponse,\n  SimulationResponseTransaction,\n} from '../api/simulation-api.js';\nimport type {\n  GasFeeToken,\n  TransactionControllerMessenger,\n  TransactionMeta,\n} from '../index.js';\nimport { projectLogger } from '../logger.js';\nimport type { GetSimulationConfig } from '../types.js';\nimport { isNativeBalanceSufficientForGas } from './balance.js';\nimport { ERROR_MESSAGE_NO_UPGRADE_CONTRACT } from './batch.js';\nimport { ERROR_MESSGE_PUBLIC_KEY, doesChainSupportEIP7702 } from './eip7702.js';\nimport { getEIP7702UpgradeContractAddress } from './feature-flags.js';\n\nconst log = createModuleLogger(projectLogger, 'gas-fee-tokens');\n\nexport type GetGasFeeTokensRequest = {\n  chainId: Hex;\n  isEIP7702GasFeeTokensEnabled: (\n    transactionMeta: TransactionMeta,\n  ) => Promise<boolean>;\n  getSimulationConfig: GetSimulationConfig;\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n  transactionMeta: TransactionMeta;\n};\n\n/**\n * Get gas fee tokens for a transaction.\n *\n * @param request - The request object.\n * @param request.chainId - The chain ID of the transaction.\n * @param request.isEIP7702GasFeeTokensEnabled - Callback to check if EIP-7702 gas fee tokens are enabled.\n * @param request.messenger - The messenger instance.\n * @param request.publicKeyEIP7702 - Public key to validate EIP-7702 contract signatures.\n * @param request.transactionMeta - The transaction metadata.\n * @param request.getSimulationConfig - Optional transaction simulation parameters.\n * @returns An array of gas fee tokens.\n */\nexport async function getGasFeeTokens({\n  chainId,\n  isEIP7702GasFeeTokensEnabled,\n  messenger,\n  publicKeyEIP7702,\n  transactionMeta,\n  getSimulationConfig,\n}: GetGasFeeTokensRequest): Promise<{\n  gasFeeTokens: GasFeeToken[];\n  isGasFeeSponsored: boolean;\n}> {\n  const { delegationAddress, txParams } = transactionMeta;\n  const { authorizationList: authorizationListRequest } = txParams;\n  const data = txParams.data as Hex;\n  const from = txParams.from as Hex;\n  const to = txParams.to as Hex;\n  const value = txParams.value as Hex;\n\n  log('Request', { chainId, txParams });\n\n  const is7702GasFeeTokensEnabled =\n    await isEIP7702GasFeeTokensEnabled(transactionMeta);\n\n  const with7702 =\n    is7702GasFeeTokensEnabled && doesChainSupportEIP7702(chainId, messenger);\n\n  let authorizationList:\n    | SimulationRequestTransaction['authorizationList']\n    | undefined = authorizationListRequest?.map((authorization) => ({\n    address: authorization.address,\n    from,\n  }));\n\n  if (with7702 && !delegationAddress && !authorizationList) {\n    authorizationList = buildAuthorizationList({\n      chainId,\n      from,\n      messenger,\n      publicKeyEIP7702,\n    });\n  }\n\n  try {\n    const response = await simulateTransactions(chainId, {\n      getSimulationConfig,\n      transactions: [\n        {\n          authorizationList,\n          data,\n          from,\n          to,\n          value,\n        },\n      ],\n      suggestFees: {\n        withTransfer: true,\n        withFeeTransfer: true,\n        with7702,\n      },\n    });\n\n    log('Response', response);\n\n    const result = parseGasFeeTokens(response);\n\n    log('Gas fee tokens', result);\n\n    return result;\n  } catch (error) {\n    log('Failed to gas fee tokens', error);\n    return { gasFeeTokens: [], isGasFeeSponsored: false };\n  }\n}\n\n/**\n * Check and update gas fee token selection before publishing a transaction.\n *\n * @param request - Request object.\n * @param request.messenger - The transaction controller messenger.\n * @param request.networkClientId - The network client ID.\n * @param request.fetchGasFeeTokens - Function to fetch gas fee tokens.\n * @param request.transaction - Transaction metadata.\n * @param request.updateTransaction - Function to update the transaction.\n */\nexport async function checkGasFeeTokenBeforePublish({\n  messenger,\n  networkClientId,\n  fetchGasFeeTokens,\n  transaction,\n  updateTransaction,\n}: {\n  messenger: TransactionControllerMessenger;\n  networkClientId: NetworkClientId;\n  fetchGasFeeTokens: (transaction: TransactionMeta) => Promise<GasFeeToken[]>;\n  transaction: TransactionMeta;\n  updateTransaction: (\n    transactionId: string,\n    fn: (tx: TransactionMeta) => void,\n  ) => void;\n}): Promise<void> {\n  const {\n    excludeNativeTokenForFee,\n    isGasFeeTokenIgnoredIfBalance,\n    selectedGasFeeToken,\n  } = transaction;\n\n  if (\n    !selectedGasFeeToken ||\n    (!isGasFeeTokenIgnoredIfBalance && !excludeNativeTokenForFee)\n  ) {\n    return;\n  }\n\n  log('Checking gas fee token before publish', { selectedGasFeeToken });\n\n  if (!excludeNativeTokenForFee) {\n    const hasNativeBalance = await isNativeBalanceSufficientForGas(\n      transaction,\n      messenger,\n      networkClientId,\n    );\n\n    if (hasNativeBalance) {\n      log(\n        'Ignoring gas fee token before publish due to sufficient native balance',\n      );\n\n      updateTransaction(transaction.id, (tx) => {\n        tx.isExternalSign = false;\n        tx.selectedGasFeeToken = undefined;\n      });\n\n      return;\n    }\n  }\n\n  const gasFeeTokens = await fetchGasFeeTokens({\n    ...transaction,\n    isExternalSign: true,\n  });\n\n  const isSelectedGasFeeTokenAvailable = gasFeeTokens?.some(\n    (token) =>\n      token.tokenAddress.toLowerCase() === selectedGasFeeToken.toLowerCase(),\n  );\n\n  if (!isSelectedGasFeeTokenAvailable) {\n    updateTransaction(transaction.id, (tx) => {\n      tx.gasFeeTokens = gasFeeTokens;\n      tx.isExternalSign = false;\n    });\n\n    throw new Error('Gas fee token not found and insufficient native balance');\n  }\n\n  updateTransaction(transaction.id, (tx) => {\n    tx.gasFeeTokens = gasFeeTokens;\n    tx.isExternalSign = true;\n    tx.txParams.nonce = undefined;\n  });\n\n  log('Updated gas fee tokens before publish', gasFeeTokens);\n  log('Publishing with selected gas fee token', { selectedGasFeeToken });\n}\n\n/**\n * Extract gas fee tokens from a simulation response.\n *\n * @param response - The simulation response.\n * @returns gasFeeTokens: An array of gas fee tokens. isGasFeeSponsored: Whether the transaction is sponsored\n */\nfunction parseGasFeeTokens(response: SimulationResponse): {\n  gasFeeTokens: GasFeeToken[];\n  isGasFeeSponsored: boolean;\n} {\n  const feeLevel = response.transactions?.[0]\n    ?.fees?.[0] as Required<SimulationResponseTransaction>['fees'][0];\n\n  const isGasFeeSponsored = response.sponsorship?.isSponsored ?? false;\n\n  const tokenFees = feeLevel?.tokenFees ?? [];\n\n  return {\n    gasFeeTokens: tokenFees.map((tokenFee) => ({\n      amount: tokenFee.balanceNeededToken,\n      balance: tokenFee.currentBalanceToken,\n      decimals: tokenFee.token.decimals,\n      fee: tokenFee.serviceFee,\n      gas: feeLevel.gas,\n      gasTransfer: tokenFee.transferEstimate,\n      maxFeePerGas: feeLevel.maxFeePerGas,\n      maxPriorityFeePerGas: feeLevel.maxPriorityFeePerGas,\n      rateWei: tokenFee.rateWei,\n      recipient: tokenFee.feeRecipient,\n      symbol: tokenFee.token.symbol,\n      tokenAddress: tokenFee.token.address,\n    })),\n    isGasFeeSponsored,\n  };\n}\n\n/**\n * Generate the authorization list for the request.\n *\n * @param request - The request object.\n * @param request.chainId - The chain ID.\n * @param request.from - The sender's address.\n * @param request.messenger - The messenger instance.\n * @param request.publicKeyEIP7702 - The public key for EIP-7702.\n * @returns The authorization list.\n */\nfunction buildAuthorizationList({\n  chainId,\n  from,\n  messenger,\n  publicKeyEIP7702,\n}: {\n  chainId: Hex;\n  from: Hex;\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n}): SimulationRequestTransaction['authorizationList'] | undefined {\n  if (!publicKeyEIP7702) {\n    throw rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY);\n  }\n\n  const upgradeAddress = getEIP7702UpgradeContractAddress(\n    chainId,\n    messenger,\n    publicKeyEIP7702,\n  );\n\n  if (!upgradeAddress) {\n    throw rpcErrors.internal(ERROR_MESSAGE_NO_UPGRADE_CONTRACT);\n  }\n\n  return [\n    {\n      address: upgradeAddress,\n      from,\n    },\n  ];\n}\n"]}

package/dist/utils/nonce.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nonce.d.ts","sourceRoot":"","sources":["../../src/utils/nonce.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,SAAS,EACT,WAAW,IAAI,uBAAuB,EACvC,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAKtE;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,GACpD,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CAyBzD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uCAAuC,CACrD,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,iBAAiB,EAAE,EACxC,YAAY,EAAE,eAAe,EAAE,GAC9B,uBAAuB,EAAE,CAwD3B"}
+{"version":3,"file":"nonce.d.ts","sourceRoot":"","sources":["../../src/utils/nonce.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,SAAS,EACT,WAAW,IAAI,uBAAuB,EACvC,MAAM,yBAAyB,CAAC;AAGjC,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAKtE;;;;;;GAMG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,GACpD,OAAO,CAAC,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC,CA+BzD;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uCAAuC,CACrD,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,iBAAiB,EAAE,EACxC,YAAY,EAAE,eAAe,EAAE,GAC9B,uBAAuB,EAAE,CAwD3B"}

package/dist/utils/nonce.js

@@ -10,7 +10,11 @@ const log = createModuleLogger(projectLogger, 'nonce');
  * @returns The next hexadecimal nonce to be used for the given transaction, and optionally a function to release the nonce lock.
  */
 export async function getNextNonce(txMeta, getNonceLock) {
-    const { customNonceValue, txParams: { from, nonce: existingNonce }, } = txMeta;
+    const { customNonceValue, isExternalSign, txParams: { from, nonce: existingNonce }, } = txMeta;
+    if (isExternalSign) {
+        log('Skipping nonce as signed externally');
+        return [undefined, undefined];
+    }
     const customNonce = customNonceValue ? toHex(customNonceValue) : undefined;
     if (customNonce) {
         log('Using custom nonce', customNonce);

package/dist/utils/nonce.js.map

@@ -1 +1 @@
-{"version":3,"file":"nonce.js","sourceRoot":"","sources":["../../src/utils/nonce.ts"],"names":[],"mappings":"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","sourcesContent":["import { toHex } from '@metamask/controller-utils';\nimport type {\n  NonceLock,\n  Transaction as NonceTrackerTransaction,\n} from '@metamask/nonce-tracker';\n\nimport { createModuleLogger, projectLogger } from '../logger.js';\nimport type { TransactionMeta, TransactionStatus } from '../types.js';\nimport { getAuthorizationAuthority } from './eip7702.js';\n\nconst log = createModuleLogger(projectLogger, 'nonce');\n\n/**\n * Determine the next nonce to be used for a transaction.\n *\n * @param txMeta - The transaction metadata.\n * @param getNonceLock - An anonymous function that acquires the nonce lock for an address\n * @returns The next hexadecimal nonce to be used for the given transaction, and optionally a function to release the nonce lock.\n */\nexport async function getNextNonce(\n  txMeta: TransactionMeta,\n  getNonceLock: (address: string) => Promise<NonceLock>,\n): Promise<[string | undefined, (() => void) | undefined]> {\n  const {\n    customNonceValue,\n    txParams: { from, nonce: existingNonce },\n  } = txMeta;\n\n  const customNonce = customNonceValue ? toHex(customNonceValue) : undefined;\n\n  if (customNonce) {\n    log('Using custom nonce', customNonce);\n    return [customNonce, undefined];\n  }\n\n  if (existingNonce) {\n    log('Using existing nonce', existingNonce);\n    return [existingNonce, undefined];\n  }\n\n  const nonceLock = await getNonceLock(from);\n  const nonce = toHex(nonceLock.nextNonce);\n  const releaseLock = nonceLock.releaseLock.bind(nonceLock);\n\n  log('Using nonce from nonce tracker', nonce, nonceLock.nonceDetails);\n\n  return [nonce, releaseLock];\n}\n\n/**\n * Filter and format transactions for the nonce tracker.\n *\n * Includes the outer transaction nonce when `txParams.from` matches, and EIP-7702\n * authorization nonces only when their recovered authority matches `fromAddress`.\n * This keeps foreign authorizations (e.g. Money Account upgrades on a same-chain\n * pay batch) out of the payer's nonce history.\n *\n * @param currentChainId - Chain ID of the current network.\n * @param fromAddress - Address of the account from which the transactions to filter from are sent.\n * @param transactionStatuses - Status of the transactions for which to filter.\n * @param transactions - Array of transactionMeta objects that have been prefiltered.\n * @returns Array of transactions formatted for the nonce tracker.\n */\nexport function getAndFormatTransactionsForNonceTracker(\n  currentChainId: string,\n  fromAddress: string,\n  transactionStatuses: TransactionStatus[],\n  transactions: TransactionMeta[],\n): NonceTrackerTransaction[] {\n  const normalizedFromAddress = fromAddress.toLowerCase();\n\n  return transactions\n    .filter(\n      ({ chainId, isTransfer, isUserOperation, status, txParams: { nonce } }) =>\n        !isTransfer &&\n        !isUserOperation &&\n        chainId === currentChainId &&\n        transactionStatuses.includes(status) &&\n        Boolean(nonce),\n    )\n    .flatMap(({ status, txParams }) => {\n      const { authorizationList, from, gas, value, nonce } = txParams;\n      // the only value we care about is the nonce\n      // but we need to return the other values to satisfy the type\n      // TODO: refactor nonceTracker to not require this\n      /* istanbul ignore next */\n      const toNonceTrackerTransaction = (\n        currentNonce: string,\n        authority: string,\n      ): NonceTrackerTransaction => ({\n        status,\n        history: [{}],\n        txParams: {\n          from: authority,\n          gas: gas ?? '',\n          value: value ?? '',\n          nonce: currentNonce,\n        },\n      });\n\n      const formatted: NonceTrackerTransaction[] = [];\n\n      if (from.toLowerCase() === normalizedFromAddress && nonce) {\n        formatted.push(toNonceTrackerTransaction(nonce, from));\n      }\n\n      for (const authorization of authorizationList ?? []) {\n        if (authorization.nonce === undefined) {\n          continue;\n        }\n\n        const authority = getAuthorizationAuthority(authorization, from);\n\n        if (authority?.toLowerCase() !== normalizedFromAddress) {\n          continue;\n        }\n\n        formatted.push(\n          toNonceTrackerTransaction(authorization.nonce, authority),\n        );\n      }\n\n      return formatted;\n    });\n}\n"]}
+{"version":3,"file":"nonce.js","sourceRoot":"","sources":["../../src/utils/nonce.ts"],"names":[],"mappings":"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","sourcesContent":["import { toHex } from '@metamask/controller-utils';\nimport type {\n  NonceLock,\n  Transaction as NonceTrackerTransaction,\n} from '@metamask/nonce-tracker';\n\nimport { createModuleLogger, projectLogger } from '../logger.js';\nimport type { TransactionMeta, TransactionStatus } from '../types.js';\nimport { getAuthorizationAuthority } from './eip7702.js';\n\nconst log = createModuleLogger(projectLogger, 'nonce');\n\n/**\n * Determine the next nonce to be used for a transaction.\n *\n * @param txMeta - The transaction metadata.\n * @param getNonceLock - An anonymous function that acquires the nonce lock for an address\n * @returns The next hexadecimal nonce to be used for the given transaction, and optionally a function to release the nonce lock.\n */\nexport async function getNextNonce(\n  txMeta: TransactionMeta,\n  getNonceLock: (address: string) => Promise<NonceLock>,\n): Promise<[string | undefined, (() => void) | undefined]> {\n  const {\n    customNonceValue,\n    isExternalSign,\n    txParams: { from, nonce: existingNonce },\n  } = txMeta;\n\n  if (isExternalSign) {\n    log('Skipping nonce as signed externally');\n    return [undefined, undefined];\n  }\n\n  const customNonce = customNonceValue ? toHex(customNonceValue) : undefined;\n\n  if (customNonce) {\n    log('Using custom nonce', customNonce);\n    return [customNonce, undefined];\n  }\n\n  if (existingNonce) {\n    log('Using existing nonce', existingNonce);\n    return [existingNonce, undefined];\n  }\n\n  const nonceLock = await getNonceLock(from);\n  const nonce = toHex(nonceLock.nextNonce);\n  const releaseLock = nonceLock.releaseLock.bind(nonceLock);\n\n  log('Using nonce from nonce tracker', nonce, nonceLock.nonceDetails);\n\n  return [nonce, releaseLock];\n}\n\n/**\n * Filter and format transactions for the nonce tracker.\n *\n * Includes the outer transaction nonce when `txParams.from` matches, and EIP-7702\n * authorization nonces only when their recovered authority matches `fromAddress`.\n * This keeps foreign authorizations (e.g. Money Account upgrades on a same-chain\n * pay batch) out of the payer's nonce history.\n *\n * @param currentChainId - Chain ID of the current network.\n * @param fromAddress - Address of the account from which the transactions to filter from are sent.\n * @param transactionStatuses - Status of the transactions for which to filter.\n * @param transactions - Array of transactionMeta objects that have been prefiltered.\n * @returns Array of transactions formatted for the nonce tracker.\n */\nexport function getAndFormatTransactionsForNonceTracker(\n  currentChainId: string,\n  fromAddress: string,\n  transactionStatuses: TransactionStatus[],\n  transactions: TransactionMeta[],\n): NonceTrackerTransaction[] {\n  const normalizedFromAddress = fromAddress.toLowerCase();\n\n  return transactions\n    .filter(\n      ({ chainId, isTransfer, isUserOperation, status, txParams: { nonce } }) =>\n        !isTransfer &&\n        !isUserOperation &&\n        chainId === currentChainId &&\n        transactionStatuses.includes(status) &&\n        Boolean(nonce),\n    )\n    .flatMap(({ status, txParams }) => {\n      const { authorizationList, from, gas, value, nonce } = txParams;\n      // the only value we care about is the nonce\n      // but we need to return the other values to satisfy the type\n      // TODO: refactor nonceTracker to not require this\n      /* istanbul ignore next */\n      const toNonceTrackerTransaction = (\n        currentNonce: string,\n        authority: string,\n      ): NonceTrackerTransaction => ({\n        status,\n        history: [{}],\n        txParams: {\n          from: authority,\n          gas: gas ?? '',\n          value: value ?? '',\n          nonce: currentNonce,\n        },\n      });\n\n      const formatted: NonceTrackerTransaction[] = [];\n\n      if (from.toLowerCase() === normalizedFromAddress && nonce) {\n        formatted.push(toNonceTrackerTransaction(nonce, from));\n      }\n\n      for (const authorization of authorizationList ?? []) {\n        if (authorization.nonce === undefined) {\n          continue;\n        }\n\n        const authority = getAuthorizationAuthority(authorization, from);\n\n        if (authority?.toLowerCase() !== normalizedFromAddress) {\n          continue;\n        }\n\n        formatted.push(\n          toNonceTrackerTransaction(authorization.nonce, authority),\n        );\n      }\n\n      return formatted;\n    });\n}\n"]}

package/dist/utils/signature.d.ts

@@ -1,11 +1,28 @@
 import type { Hex } from '@metamask/utils';
+/**
+ * Maximum number of cached signature verification results.
+ *
+ * Sized well above the expected working set (one entry per signed contract per
+ * chain in the EIP-7702 feature flag) so the cache never evicts in practice,
+ * while still bounding memory if the flag data ever grows unexpectedly.
+ */
+export declare const MAX_CACHE_SIZE = 1000;
 /**
  * Verify if the signature is the specified data signed by the specified public key.
  *
+ * Results are memoized as the underlying elliptic curve recovery is expensive
+ * and is otherwise repeated for identical inputs on hot paths.
+ *
  * @param data - The data to check.
  * @param signature - The signature to check.
  * @param publicKey - The public key to check.
  * @returns True if the signature is correct, false otherwise.
  */
 export declare function isValidSignature(data: Hex[], signature: Hex, publicKey: Hex): boolean;
+/**
+ * Clear the signature verification cache.
+ *
+ * Intended for tests only, as cached results can never become stale.
+ */
+export declare function clearSignatureCache(): void;
 //# sourceMappingURL=signature.d.ts.map

package/dist/utils/signature.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signature.d.ts","sourceRoot":"","sources":["../../src/utils/signature.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAG3C;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,GAAG,EAAE,EACX,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,GAAG,GACb,OAAO,CAUT"}
+{"version":3,"file":"signature.d.ts","sourceRoot":"","sources":["../../src/utils/signature.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AAG3C;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,OAAO,CAAC;AAYnC;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,GAAG,EAAE,EACX,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,GAAG,GACb,OAAO,CAiBT;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,IAAI,CAE1C"}

package/dist/utils/signature.js

@@ -1,14 +1,63 @@
 import { verifyMessage } from '@ethersproject/wallet';
 import { add0x, hexToBytes, remove0x } from '@metamask/utils';
+/**
+ * Maximum number of cached signature verification results.
+ *
+ * Sized well above the expected working set (one entry per signed contract per
+ * chain in the EIP-7702 feature flag) so the cache never evicts in practice,
+ * while still bounding memory if the flag data ever grows unexpectedly.
+ */
+export const MAX_CACHE_SIZE = 1000;
+/**
+ * Cache of signature verification results, keyed by data, signature, and
+ * public key.
+ *
+ * Verification is a pure function of those three inputs, so a cached result can
+ * never become stale and requires no invalidation. New feature flag data simply
+ * produces new keys.
+ */
+const verificationCache = new Map();
 /**
  * Verify if the signature is the specified data signed by the specified public key.
  *
+ * Results are memoized as the underlying elliptic curve recovery is expensive
+ * and is otherwise repeated for identical inputs on hot paths.
+ *
  * @param data - The data to check.
  * @param signature - The signature to check.
  * @param publicKey - The public key to check.
  * @returns True if the signature is correct, false otherwise.
  */
 export function isValidSignature(data, signature, publicKey) {
+    const cacheKey = `${data.join(',')}:${signature}:${publicKey}`;
+    const cachedResult = verificationCache.get(cacheKey);
+    if (cachedResult !== undefined) {
+        return cachedResult;
+    }
+    const result = verifySignature(data, signature, publicKey);
+    if (verificationCache.size >= MAX_CACHE_SIZE) {
+        verificationCache.clear();
+    }
+    verificationCache.set(cacheKey, result);
+    return result;
+}
+/**
+ * Clear the signature verification cache.
+ *
+ * Intended for tests only, as cached results can never become stale.
+ */
+export function clearSignatureCache() {
+    verificationCache.clear();
+}
+/**
+ * Verify if the signature is the specified data signed by the specified public key.
+ *
+ * @param data - The data to check.
+ * @param signature - The signature to check.
+ * @param publicKey - The public key to check.
+ * @returns True if the signature is correct, false otherwise.
+ */
+function verifySignature(data, signature, publicKey) {
     try {
         const joinedHex = add0x(data.map(remove0x).join(''));
         const dataBytes = hexToBytes(joinedHex);

package/dist/utils/signature.js.map

@@ -1 +1 @@
-{"version":3,"file":"signature.js","sourceRoot":"","sources":["../../src/utils/signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE9D;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAW,EACX,SAAc,EACd,SAAc;IAEd,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAE5D,OAAO,eAAe,CAAC,WAAW,EAAE,KAAK,SAAS,CAAC,WAAW,EAAE,CAAC;IACnE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC","sourcesContent":["import { verifyMessage } from '@ethersproject/wallet';\nimport type { Hex } from '@metamask/utils';\nimport { add0x, hexToBytes, remove0x } from '@metamask/utils';\n\n/**\n * Verify if the signature is the specified data signed by the specified public key.\n *\n * @param data - The data to check.\n * @param signature - The signature to check.\n * @param publicKey - The public key to check.\n * @returns True if the signature is correct, false otherwise.\n */\nexport function isValidSignature(\n  data: Hex[],\n  signature: Hex,\n  publicKey: Hex,\n): boolean {\n  try {\n    const joinedHex = add0x(data.map(remove0x).join(''));\n    const dataBytes = hexToBytes(joinedHex);\n    const actualPublicKey = verifyMessage(dataBytes, signature);\n\n    return actualPublicKey.toLowerCase() === publicKey.toLowerCase();\n  } catch {\n    return false;\n  }\n}\n"]}
+{"version":3,"file":"signature.js","sourceRoot":"","sources":["../../src/utils/signature.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE9D;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC;AAEnC;;;;;;;GAOG;AACH,MAAM,iBAAiB,GAAG,IAAI,GAAG,EAAmB,CAAC;AAErD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,gBAAgB,CAC9B,IAAW,EACX,SAAc,EACd,SAAc;IAEd,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,SAAS,IAAI,SAAS,EAAE,CAAC;IAC/D,MAAM,YAAY,GAAG,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAErD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;IAE3D,IAAI,iBAAiB,CAAC,IAAI,IAAI,cAAc,EAAE,CAAC;QAC7C,iBAAiB,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAExC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB;IACjC,iBAAiB,CAAC,KAAK,EAAE,CAAC;AAC5B,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,eAAe,CAAC,IAAW,EAAE,SAAc,EAAE,SAAc;IAClE,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QACrD,MAAM,SAAS,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,eAAe,GAAG,aAAa,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAE5D,OAAO,eAAe,CAAC,WAAW,EAAE,KAAK,SAAS,CAAC,WAAW,EAAE,CAAC;IACnE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC","sourcesContent":["import { verifyMessage } from '@ethersproject/wallet';\nimport type { Hex } from '@metamask/utils';\nimport { add0x, hexToBytes, remove0x } from '@metamask/utils';\n\n/**\n * Maximum number of cached signature verification results.\n *\n * Sized well above the expected working set (one entry per signed contract per\n * chain in the EIP-7702 feature flag) so the cache never evicts in practice,\n * while still bounding memory if the flag data ever grows unexpectedly.\n */\nexport const MAX_CACHE_SIZE = 1000;\n\n/**\n * Cache of signature verification results, keyed by data, signature, and\n * public key.\n *\n * Verification is a pure function of those three inputs, so a cached result can\n * never become stale and requires no invalidation. New feature flag data simply\n * produces new keys.\n */\nconst verificationCache = new Map<string, boolean>();\n\n/**\n * Verify if the signature is the specified data signed by the specified public key.\n *\n * Results are memoized as the underlying elliptic curve recovery is expensive\n * and is otherwise repeated for identical inputs on hot paths.\n *\n * @param data - The data to check.\n * @param signature - The signature to check.\n * @param publicKey - The public key to check.\n * @returns True if the signature is correct, false otherwise.\n */\nexport function isValidSignature(\n  data: Hex[],\n  signature: Hex,\n  publicKey: Hex,\n): boolean {\n  const cacheKey = `${data.join(',')}:${signature}:${publicKey}`;\n  const cachedResult = verificationCache.get(cacheKey);\n\n  if (cachedResult !== undefined) {\n    return cachedResult;\n  }\n\n  const result = verifySignature(data, signature, publicKey);\n\n  if (verificationCache.size >= MAX_CACHE_SIZE) {\n    verificationCache.clear();\n  }\n\n  verificationCache.set(cacheKey, result);\n\n  return result;\n}\n\n/**\n * Clear the signature verification cache.\n *\n * Intended for tests only, as cached results can never become stale.\n */\nexport function clearSignatureCache(): void {\n  verificationCache.clear();\n}\n\n/**\n * Verify if the signature is the specified data signed by the specified public key.\n *\n * @param data - The data to check.\n * @param signature - The signature to check.\n * @param publicKey - The public key to check.\n * @returns True if the signature is correct, false otherwise.\n */\nfunction verifySignature(data: Hex[], signature: Hex, publicKey: Hex): boolean {\n  try {\n    const joinedHex = add0x(data.map(remove0x).join(''));\n    const dataBytes = hexToBytes(joinedHex);\n    const actualPublicKey = verifyMessage(dataBytes, signature);\n\n    return actualPublicKey.toLowerCase() === publicKey.toLowerCase();\n  } catch {\n    return false;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/transaction-controller",
-  "version": "71.0.0-preview-1efee3183",
+  "version": "72.0.0-preview-3c2e73813",
   "description": "Stores transactions alongside their periodically updated statuses and manages interactions such as approval and cancellation",
   "keywords": [
     "Ethereum",