@x402/evm 2.8.0 → 2.9.0

package/dist/cjs/exact/facilitator/index.js

@@ -150,8 +150,6 @@ var erc20AllowanceAbi = [
     stateMutability: "view"
   }
 ];
-var ERC20_APPROVE_GAS_LIMIT = 70000n;
-var DEFAULT_MAX_FEE_PER_GAS = 1000000000n;
 var PERMIT2_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3";
 var x402ExactPermit2ProxyAddress = "0x402085c248EeA27D92E8b30b2C58ed07f9E20001";
 var permit2WitnessABIComponents = [
@@ -319,7 +317,6 @@ var ErrPermit2InvalidOwner = "permit2_invalid_owner";
 var ErrPermit2PaymentTooEarly = "permit2_payment_too_early";
 var ErrPermit2InvalidNonce = "permit2_invalid_nonce";
 var ErrPermit2612AmountMismatch = "permit2_2612_amount_mismatch";
-var ErrErc20ApprovalInsufficientEthForGas = "erc20_approval_insufficient_eth_for_gas";
 var ErrErc20ApprovalInvalidFormat = "invalid_erc20_approval_extension_format";
 var ErrErc20ApprovalFromMismatch = "erc20_approval_from_mismatch";
 var ErrErc20ApprovalAssetMismatch = "erc20_approval_asset_mismatch";
@@ -346,15 +343,6 @@ var import_viem3 = require("viem");
 // src/multicall.ts
 var import_viem2 = require("viem");
 var MULTICALL3_ADDRESS = "0xcA11bde05977b3631167028862bE2a173976CA11";
-var multicall3GetEthBalanceAbi = [
-  {
-    name: "getEthBalance",
-    inputs: [{ name: "addr", type: "address" }],
-    outputs: [{ name: "balance", type: "uint256" }],
-    stateMutability: "view",
-    type: "function"
-  }
-];
 var multicall3ABI = [
   {
     inputs: [
@@ -826,7 +814,7 @@ function resolveErc20ApprovalExtensionSigner(extension, network) {
 // src/exact/facilitator/permit2.ts
 var import_viem7 = require("viem");
 
-// src/exact/facilitator/erc20approval.ts
+// src/shared/erc20approval.ts
 var import_viem5 = require("viem");
 var APPROVE_SELECTOR = "0x095ea7b3";
 async function validateErc20ApprovalForPayment(info, payer, tokenAddress) {
@@ -924,64 +912,106 @@ async function validateErc20ApprovalForPayment(info, payer, tokenAddress) {
   return { isValid: true };
 }
 
-// src/exact/facilitator/permit2-utils.ts
+// src/shared/permit2.ts
 var import_viem6 = require("viem");
-async function simulatePermit2Settle(signer, permit2Payload) {
+
+// src/upto/facilitator/errors.ts
+var ErrUptoAmountExceedsPermitted = "upto_amount_exceeds_permitted";
+var ErrUptoUnauthorizedFacilitator = "upto_unauthorized_facilitator";
+
+// src/shared/permit2.ts
+async function waitAndReturnSettleResponse(signer, tx, payload, payer) {
+  const receipt = await signer.waitForTransactionReceipt({ hash: tx });
+  if (receipt.status !== "success") {
+    return {
+      success: false,
+      errorReason: ErrInvalidTransactionState,
+      transaction: tx,
+      network: payload.accepted.network,
+      payer
+    };
+  }
+  return {
+    success: true,
+    transaction: tx,
+    network: payload.accepted.network,
+    payer
+  };
+}
+function mapSettleError(error, payload, payer) {
+  let errorReason = ErrTransactionFailed;
+  if (error instanceof Error) {
+    const message = error.message;
+    if (message.includes("Permit2612AmountMismatch")) {
+      errorReason = ErrPermit2612AmountMismatch;
+    } else if (message.includes("InvalidAmount")) {
+      errorReason = ErrPermit2InvalidAmount;
+    } else if (message.includes("InvalidDestination")) {
+      errorReason = ErrPermit2InvalidDestination;
+    } else if (message.includes("InvalidOwner")) {
+      errorReason = ErrPermit2InvalidOwner;
+    } else if (message.includes("PaymentTooEarly")) {
+      errorReason = ErrPermit2PaymentTooEarly;
+    } else if (message.includes("InvalidSignature") || message.includes("SignatureExpired")) {
+      errorReason = ErrPermit2InvalidSignature;
+    } else if (message.includes("InvalidNonce")) {
+      errorReason = ErrPermit2InvalidNonce;
+    } else if (message.includes("erc20_approval_tx_failed")) {
+      errorReason = ErrErc20ApprovalTxFailed;
+    } else if (message.includes("AmountExceedsPermitted")) {
+      errorReason = ErrUptoAmountExceedsPermitted;
+    } else if (message.includes("UnauthorizedFacilitator")) {
+      errorReason = ErrUptoUnauthorizedFacilitator;
+    } else {
+      errorReason = `${ErrTransactionFailed}: ${message.slice(0, 500)}`;
+    }
+  }
+  return {
+    success: false,
+    errorReason,
+    transaction: "",
+    network: payload.accepted.network,
+    payer
+  };
+}
+function validateEip2612PermitForPayment(info, payer, tokenAddress) {
+  if (!validateEip2612GasSponsoringInfo(info)) {
+    return { isValid: false, invalidReason: ErrInvalidEip2612ExtensionFormat };
+  }
+  if ((0, import_viem6.getAddress)(info.from) !== (0, import_viem6.getAddress)(payer)) {
+    return { isValid: false, invalidReason: ErrEip2612FromMismatch };
+  }
+  if ((0, import_viem6.getAddress)(info.asset) !== tokenAddress) {
+    return { isValid: false, invalidReason: ErrEip2612AssetMismatch };
+  }
+  if ((0, import_viem6.getAddress)(info.spender) !== (0, import_viem6.getAddress)(PERMIT2_ADDRESS)) {
+    return { isValid: false, invalidReason: ErrEip2612SpenderNotPermit2 };
+  }
+  const now = Math.floor(Date.now() / 1e3);
+  if (BigInt(info.deadline) < BigInt(now + 6)) {
+    return { isValid: false, invalidReason: ErrEip2612DeadlineExpired };
+  }
+  return { isValid: true };
+}
+async function simulatePermit2Settle(config, signer, settleArgs) {
   try {
     await signer.readContract({
-      address: x402ExactPermit2ProxyAddress,
-      abi: x402ExactPermit2ProxyABI,
+      address: config.proxyAddress,
+      abi: config.proxyABI,
       functionName: "settle",
-      args: buildPermit2SettleArgs(permit2Payload)
+      args: settleArgs
     });
     return true;
   } catch {
     return false;
   }
 }
-function splitEip2612Signature(signature) {
-  const sig = signature.startsWith("0x") ? signature.slice(2) : signature;
-  if (sig.length !== 130) {
-    throw new Error(
-      `invalid EIP-2612 signature length: expected 65 bytes (130 hex chars), got ${sig.length / 2} bytes`
-    );
-  }
-  const r = `0x${sig.slice(0, 64)}`;
-  const s = `0x${sig.slice(64, 128)}`;
-  const v = parseInt(sig.slice(128, 130), 16);
-  return { v, r, s };
-}
-function buildPermit2SettleArgs(permit2Payload) {
-  return [
-    {
-      permitted: {
-        token: (0, import_viem6.getAddress)(permit2Payload.permit2Authorization.permitted.token),
-        amount: BigInt(permit2Payload.permit2Authorization.permitted.amount)
-      },
-      nonce: BigInt(permit2Payload.permit2Authorization.nonce),
-      deadline: BigInt(permit2Payload.permit2Authorization.deadline)
-    },
-    (0, import_viem6.getAddress)(permit2Payload.permit2Authorization.from),
-    {
-      to: (0, import_viem6.getAddress)(permit2Payload.permit2Authorization.witness.to),
-      validAfter: BigInt(permit2Payload.permit2Authorization.witness.validAfter)
-    },
-    permit2Payload.signature
-  ];
-}
-function encodePermit2SettleCalldata(permit2Payload) {
-  return (0, import_viem6.encodeFunctionData)({
-    abi: x402ExactPermit2ProxyABI,
-    functionName: "settle",
-    args: buildPermit2SettleArgs(permit2Payload)
-  });
-}
-async function simulatePermit2SettleWithPermit(signer, permit2Payload, eip2612Info) {
+async function simulatePermit2SettleWithPermit(config, signer, settleArgs, eip2612Info) {
   try {
     const { v, r, s } = splitEip2612Signature(eip2612Info.signature);
     await signer.readContract({
-      address: x402ExactPermit2ProxyAddress,
-      abi: x402ExactPermit2ProxyABI,
+      address: config.proxyAddress,
+      abi: config.proxyABI,
       functionName: "settleWithPermit",
       args: [
         {
@@ -991,7 +1021,7 @@ async function simulatePermit2SettleWithPermit(signer, permit2Payload, eip2612In
           s,
           v
         },
-        ...buildPermit2SettleArgs(permit2Payload)
+        ...settleArgs
       ]
     });
     return true;
@@ -999,12 +1029,30 @@ async function simulatePermit2SettleWithPermit(signer, permit2Payload, eip2612In
     return false;
   }
 }
-async function diagnosePermit2SimulationFailure(signer, tokenAddress, permit2Payload, amountRequired) {
+async function simulatePermit2SettleWithErc20Approval(config, extensionSigner, settleArgs, erc20Info) {
+  if (!extensionSigner.simulateTransactions) {
+    return false;
+  }
+  try {
+    const settleData = (0, import_viem6.encodeFunctionData)({
+      abi: config.proxyABI,
+      functionName: "settle",
+      args: settleArgs
+    });
+    return await extensionSigner.simulateTransactions([
+      erc20Info.signedTransaction,
+      { to: config.proxyAddress, data: settleData, gas: BigInt(3e5) }
+    ]);
+  } catch {
+    return false;
+  }
+}
+async function diagnosePermit2SimulationFailure(config, signer, tokenAddress, permit2Payload, amountRequired) {
   const payer = permit2Payload.permit2Authorization.from;
   const diagnosticCalls = [
     {
-      address: x402ExactPermit2ProxyAddress,
-      abi: x402ExactPermit2ProxyABI,
+      address: config.proxyAddress,
+      abi: config.proxyABI,
       functionName: "PERMIT2"
     },
     {
@@ -1042,11 +1090,11 @@ async function diagnosePermit2SimulationFailure(signer, tokenAddress, permit2Pay
   }
   return { isValid: false, invalidReason: ErrPermit2SimulationFailed, payer };
 }
-async function checkPermit2Prerequisites(signer, tokenAddress, payer, amountRequired) {
+async function checkPermit2Prerequisites(config, signer, tokenAddress, payer, amountRequired) {
   const diagnosticCalls = [
     {
-      address: x402ExactPermit2ProxyAddress,
-      abi: x402ExactPermit2ProxyABI,
+      address: config.proxyAddress,
+      abi: config.proxyABI,
       functionName: "PERMIT2"
     },
     {
@@ -1054,17 +1102,11 @@ async function checkPermit2Prerequisites(signer, tokenAddress, payer, amountRequ
       abi: eip3009ABI,
       functionName: "balanceOf",
       args: [payer]
-    },
-    {
-      address: MULTICALL3_ADDRESS,
-      abi: multicall3GetEthBalanceAbi,
-      functionName: "getEthBalance",
-      args: [payer]
     }
   ];
   try {
     const results = await multicall(signer.readContract.bind(signer), diagnosticCalls);
-    const [proxyResult, balanceResult, ethBalanceResult] = results;
+    const [proxyResult, balanceResult] = results;
     if (proxyResult.status === "failure") {
       return { isValid: false, invalidReason: ErrPermit2ProxyNotDeployed, payer };
     }
@@ -1074,106 +1116,46 @@ async function checkPermit2Prerequisites(signer, tokenAddress, payer, amountRequ
         return { isValid: false, invalidReason: ErrPermit2InsufficientBalance, payer };
       }
     }
-    if (ethBalanceResult.status === "success") {
-      const minEthForApprovalGas = ERC20_APPROVE_GAS_LIMIT * DEFAULT_MAX_FEE_PER_GAS;
-      const ethBalance = ethBalanceResult.result;
-      if (ethBalance < minEthForApprovalGas) {
-        return {
-          isValid: false,
-          invalidReason: ErrErc20ApprovalInsufficientEthForGas,
-          payer
-        };
-      }
-    }
   } catch {
   }
   return { isValid: true, invalidReason: void 0, payer };
 }
-async function simulatePermit2SettleWithErc20Approval(extensionSigner, permit2Payload, erc20Info) {
-  if (!extensionSigner.simulateTransactions) {
-    return false;
-  }
-  try {
-    const settleData = encodePermit2SettleCalldata(permit2Payload);
-    return await extensionSigner.simulateTransactions([
-      erc20Info.signedTransaction,
-      { to: x402ExactPermit2ProxyAddress, data: settleData, gas: BigInt(3e5) }
-    ]);
-  } catch {
-    return false;
-  }
-}
-async function waitAndReturn(signer, tx, payload, payer) {
-  const receipt = await signer.waitForTransactionReceipt({ hash: tx });
-  if (receipt.status !== "success") {
-    return {
-      success: false,
-      errorReason: ErrInvalidTransactionState,
-      transaction: tx,
-      network: payload.accepted.network,
-      payer
-    };
-  }
-  return {
-    success: true,
-    transaction: tx,
-    network: payload.accepted.network,
-    payer
-  };
-}
-function mapSettleError(error, payload, payer) {
-  let errorReason = ErrTransactionFailed;
-  if (error instanceof Error) {
-    const message = error.message;
-    if (message.includes("Permit2612AmountMismatch")) {
-      errorReason = ErrPermit2612AmountMismatch;
-    } else if (message.includes("InvalidAmount")) {
-      errorReason = ErrPermit2InvalidAmount;
-    } else if (message.includes("InvalidDestination")) {
-      errorReason = ErrPermit2InvalidDestination;
-    } else if (message.includes("InvalidOwner")) {
-      errorReason = ErrPermit2InvalidOwner;
-    } else if (message.includes("PaymentTooEarly")) {
-      errorReason = ErrPermit2PaymentTooEarly;
-    } else if (message.includes("InvalidSignature") || message.includes("SignatureExpired")) {
-      errorReason = ErrPermit2InvalidSignature;
-    } else if (message.includes("InvalidNonce")) {
-      errorReason = ErrPermit2InvalidNonce;
-    } else if (message.includes("erc20_approval_tx_failed")) {
-      errorReason = ErrErc20ApprovalTxFailed;
-    } else {
-      errorReason = `${ErrTransactionFailed}: ${message.slice(0, 500)}`;
-    }
-  }
-  return {
-    success: false,
-    errorReason,
-    transaction: "",
-    network: payload.accepted.network,
-    payer
-  };
+function buildExactPermit2SettleArgs(permit2Payload) {
+  return [
+    {
+      permitted: {
+        token: (0, import_viem6.getAddress)(permit2Payload.permit2Authorization.permitted.token),
+        amount: BigInt(permit2Payload.permit2Authorization.permitted.amount)
+      },
+      nonce: BigInt(permit2Payload.permit2Authorization.nonce),
+      deadline: BigInt(permit2Payload.permit2Authorization.deadline)
+    },
+    (0, import_viem6.getAddress)(permit2Payload.permit2Authorization.from),
+    {
+      to: (0, import_viem6.getAddress)(permit2Payload.permit2Authorization.witness.to),
+      validAfter: BigInt(permit2Payload.permit2Authorization.witness.validAfter)
+    },
+    permit2Payload.signature
+  ];
 }
-function validateEip2612PermitForPayment(info, payer, tokenAddress) {
-  if (!validateEip2612GasSponsoringInfo(info)) {
-    return { isValid: false, invalidReason: ErrInvalidEip2612ExtensionFormat };
-  }
-  if ((0, import_viem6.getAddress)(info.from) !== (0, import_viem6.getAddress)(payer)) {
-    return { isValid: false, invalidReason: ErrEip2612FromMismatch };
-  }
-  if ((0, import_viem6.getAddress)(info.asset) !== tokenAddress) {
-    return { isValid: false, invalidReason: ErrEip2612AssetMismatch };
-  }
-  if ((0, import_viem6.getAddress)(info.spender) !== (0, import_viem6.getAddress)(PERMIT2_ADDRESS)) {
-    return { isValid: false, invalidReason: ErrEip2612SpenderNotPermit2 };
-  }
-  const now = Math.floor(Date.now() / 1e3);
-  if (BigInt(info.deadline) < BigInt(now + 6)) {
-    return { isValid: false, invalidReason: ErrEip2612DeadlineExpired };
+function splitEip2612Signature(signature) {
+  const sig = signature.startsWith("0x") ? signature.slice(2) : signature;
+  if (sig.length !== 130) {
+    throw new Error(
+      `invalid EIP-2612 signature length: expected 65 bytes (130 hex chars), got ${sig.length / 2} bytes`
+    );
   }
-  return { isValid: true };
+  const r = `0x${sig.slice(0, 64)}`;
+  const s = `0x${sig.slice(64, 128)}`;
+  const v = parseInt(sig.slice(128, 130), 16);
+  return { v, r, s };
 }
 
 // src/exact/facilitator/permit2.ts
+var exactProxyConfig = {
+  proxyAddress: x402ExactPermit2ProxyAddress,
+  proxyABI: x402ExactPermit2ProxyABI
+};
 async function verifyPermit2(signer, payload, requirements, permit2Payload, context, options) {
   const payer = permit2Payload.permit2Authorization.from;
   if (payload.accepted.scheme !== "exact" || requirements.scheme !== "exact") {
@@ -1287,9 +1269,16 @@ async function verifyPermit2(signer, payload, requirements, permit2Payload, cont
     if (!fieldResult.isValid) {
       return { isValid: false, invalidReason: fieldResult.invalidReason, payer };
     }
-    const simOk2 = await simulatePermit2SettleWithPermit(signer, permit2Payload, eip2612Info);
+    const exactSettleArgs = buildExactPermit2SettleArgs(permit2Payload);
+    const simOk2 = await simulatePermit2SettleWithPermit(
+      exactProxyConfig,
+      signer,
+      exactSettleArgs,
+      eip2612Info
+    );
     if (!simOk2) {
       return diagnosePermit2SimulationFailure(
+        exactProxyConfig,
         signer,
         tokenAddress,
         permit2Payload,
@@ -1314,12 +1303,14 @@ async function verifyPermit2(signer, payload, requirements, permit2Payload, cont
       );
       if (extensionSigner?.simulateTransactions) {
         const simOk2 = await simulatePermit2SettleWithErc20Approval(
+          exactProxyConfig,
           extensionSigner,
-          permit2Payload,
+          buildExactPermit2SettleArgs(permit2Payload),
           erc20Info
         );
         if (!simOk2) {
           return diagnosePermit2SimulationFailure(
+            exactProxyConfig,
             signer,
             tokenAddress,
             permit2Payload,
@@ -1328,12 +1319,23 @@ async function verifyPermit2(signer, payload, requirements, permit2Payload, cont
         }
         return { isValid: true, invalidReason: void 0, payer };
       }
-      return checkPermit2Prerequisites(signer, tokenAddress, payer, requirements.amount);
+      return checkPermit2Prerequisites(
+        exactProxyConfig,
+        signer,
+        tokenAddress,
+        payer,
+        requirements.amount
+      );
     }
   }
-  const simOk = await simulatePermit2Settle(signer, permit2Payload);
+  const simOk = await simulatePermit2Settle(
+    exactProxyConfig,
+    signer,
+    buildExactPermit2SettleArgs(permit2Payload)
+  );
   if (!simOk) {
     return diagnosePermit2SimulationFailure(
+      exactProxyConfig,
       signer,
       tokenAddress,
       permit2Payload,
@@ -1358,7 +1360,7 @@ async function settlePermit2(signer, payload, requirements, permit2Payload, cont
   }
   const eip2612Info = extractEip2612GasSponsoringInfo(payload);
   if (eip2612Info) {
-    return _settlePermit2WithEIP2612(signer, payload, permit2Payload, eip2612Info);
+    return settlePermit2WithEIP2612(exactProxyConfig, signer, payload, permit2Payload, eip2612Info);
   }
   const erc20Info = extractErc20ApprovalGasSponsoringInfo(payload);
   if (erc20Info) {
@@ -1370,18 +1372,24 @@ async function settlePermit2(signer, payload, requirements, permit2Payload, cont
       payload.accepted.network
     );
     if (extensionSigner) {
-      return _settlePermit2WithERC20Approval(extensionSigner, payload, permit2Payload, erc20Info);
+      return settlePermit2WithERC20Approval(
+        exactProxyConfig,
+        extensionSigner,
+        payload,
+        permit2Payload,
+        erc20Info
+      );
     }
   }
-  return _settlePermit2Direct(signer, payload, permit2Payload);
+  return settlePermit2Direct(exactProxyConfig, signer, payload, permit2Payload);
 }
-async function _settlePermit2WithEIP2612(signer, payload, permit2Payload, eip2612Info) {
+async function settlePermit2WithEIP2612(config, signer, payload, permit2Payload, eip2612Info) {
   const payer = permit2Payload.permit2Authorization.from;
   try {
     const { v, r, s } = splitEip2612Signature(eip2612Info.signature);
     const tx = await signer.writeContract({
-      address: x402ExactPermit2ProxyAddress,
-      abi: x402ExactPermit2ProxyABI,
+      address: config.proxyAddress,
+      abi: config.proxyABI,
       functionName: "settleWithPermit",
       args: [
         {
@@ -1391,38 +1399,42 @@ async function _settlePermit2WithEIP2612(signer, payload, permit2Payload, eip261
           s,
           v
         },
-        ...buildPermit2SettleArgs(permit2Payload)
+        ...buildExactPermit2SettleArgs(permit2Payload)
       ]
     });
-    return waitAndReturn(signer, tx, payload, payer);
+    return waitAndReturnSettleResponse(signer, tx, payload, payer);
   } catch (error) {
     return mapSettleError(error, payload, payer);
   }
 }
-async function _settlePermit2WithERC20Approval(extensionSigner, payload, permit2Payload, erc20Info) {
+async function settlePermit2WithERC20Approval(config, extensionSigner, payload, permit2Payload, erc20Info) {
   const payer = permit2Payload.permit2Authorization.from;
   try {
-    const settleData = encodePermit2SettleCalldata(permit2Payload);
+    const settleData = (0, import_viem7.encodeFunctionData)({
+      abi: config.proxyABI,
+      functionName: "settle",
+      args: buildExactPermit2SettleArgs(permit2Payload)
+    });
     const txHashes = await extensionSigner.sendTransactions([
       erc20Info.signedTransaction,
-      { to: x402ExactPermit2ProxyAddress, data: settleData, gas: BigInt(3e5) }
+      { to: config.proxyAddress, data: settleData, gas: BigInt(3e5) }
     ]);
     const settleTxHash = txHashes[txHashes.length - 1];
-    return waitAndReturn(extensionSigner, settleTxHash, payload, payer);
+    return waitAndReturnSettleResponse(extensionSigner, settleTxHash, payload, payer);
   } catch (error) {
     return mapSettleError(error, payload, payer);
   }
 }
-async function _settlePermit2Direct(signer, payload, permit2Payload) {
+async function settlePermit2Direct(config, signer, payload, permit2Payload) {
   const payer = permit2Payload.permit2Authorization.from;
   try {
     const tx = await signer.writeContract({
-      address: x402ExactPermit2ProxyAddress,
-      abi: x402ExactPermit2ProxyABI,
+      address: config.proxyAddress,
+      abi: config.proxyABI,
       functionName: "settle",
-      args: buildPermit2SettleArgs(permit2Payload)
+      args: buildExactPermit2SettleArgs(permit2Payload)
     });
-    return waitAndReturn(signer, tx, payload, payer);
+    return waitAndReturnSettleResponse(signer, tx, payload, payer);
   } catch (error) {
     return mapSettleError(error, payload, payer);
   }
@@ -1527,7 +1539,9 @@ var EVM_NETWORK_CHAIN_ID_MAP = {
   educhain: 41923,
   "skale-base-sepolia": 324705682,
   megaeth: 4326,
-  monad: 143
+  monad: 143,
+  stable: 988,
+  "stable-testnet": 2201
 };
 var NETWORKS = Object.keys(EVM_NETWORK_CHAIN_ID_MAP);
 function getEvmChainIdV1(network) {