@x402/evm 2.3.1 → 2.4.0

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

@@ -470,6 +470,7 @@ async function settleEIP3009(signer, payload, requirements, eip3009Payload, conf
 }
 
 // src/exact/facilitator/permit2.ts
+var import_extensions = require("@x402/extensions");
 var import_viem2 = require("viem");
 var erc20AllowanceABI = [
   {
@@ -595,13 +596,36 @@ async function verifyPermit2(signer, payload, requirements, permit2Payload) {
       args: [payer, PERMIT2_ADDRESS]
     });
     if (allowance < BigInt(requirements.amount)) {
-      return {
-        isValid: false,
-        invalidReason: "permit2_allowance_required",
-        payer
-      };
+      const eip2612Info = (0, import_extensions.extractEip2612GasSponsoringInfo)(payload);
+      if (eip2612Info) {
+        const validationResult = validateEip2612PermitForPayment(eip2612Info, payer, tokenAddress);
+        if (!validationResult.isValid) {
+          return {
+            isValid: false,
+            invalidReason: validationResult.invalidReason,
+            payer
+          };
+        }
+      } else {
+        return {
+          isValid: false,
+          invalidReason: "permit2_allowance_required",
+          payer
+        };
+      }
     }
   } catch {
+    const eip2612Info = (0, import_extensions.extractEip2612GasSponsoringInfo)(payload);
+    if (eip2612Info) {
+      const validationResult = validateEip2612PermitForPayment(eip2612Info, payer, tokenAddress);
+      if (!validationResult.isValid) {
+        return {
+          isValid: false,
+          invalidReason: validationResult.invalidReason,
+          payer
+        };
+      }
+    }
   }
   try {
     const balance = await signer.readContract({
@@ -639,28 +663,63 @@ async function settlePermit2(signer, payload, requirements, permit2Payload) {
     };
   }
   try {
-    const tx = await signer.writeContract({
-      address: x402ExactPermit2ProxyAddress,
-      abi: x402ExactPermit2ProxyABI,
-      functionName: "settle",
-      args: [
-        {
-          permitted: {
-            token: (0, import_viem2.getAddress)(permit2Payload.permit2Authorization.permitted.token),
-            amount: BigInt(permit2Payload.permit2Authorization.permitted.amount)
+    const eip2612Info = (0, import_extensions.extractEip2612GasSponsoringInfo)(payload);
+    let tx;
+    if (eip2612Info) {
+      const { v, r, s } = splitEip2612Signature(eip2612Info.signature);
+      tx = await signer.writeContract({
+        address: x402ExactPermit2ProxyAddress,
+        abi: x402ExactPermit2ProxyABI,
+        functionName: "settleWithPermit",
+        args: [
+          {
+            value: BigInt(eip2612Info.amount),
+            deadline: BigInt(eip2612Info.deadline),
+            r,
+            s,
+            v
           },
-          nonce: BigInt(permit2Payload.permit2Authorization.nonce),
-          deadline: BigInt(permit2Payload.permit2Authorization.deadline)
-        },
-        (0, import_viem2.getAddress)(payer),
-        {
-          to: (0, import_viem2.getAddress)(permit2Payload.permit2Authorization.witness.to),
-          validAfter: BigInt(permit2Payload.permit2Authorization.witness.validAfter),
-          extra: permit2Payload.permit2Authorization.witness.extra
-        },
-        permit2Payload.signature
-      ]
-    });
+          {
+            permitted: {
+              token: (0, import_viem2.getAddress)(permit2Payload.permit2Authorization.permitted.token),
+              amount: BigInt(permit2Payload.permit2Authorization.permitted.amount)
+            },
+            nonce: BigInt(permit2Payload.permit2Authorization.nonce),
+            deadline: BigInt(permit2Payload.permit2Authorization.deadline)
+          },
+          (0, import_viem2.getAddress)(payer),
+          {
+            to: (0, import_viem2.getAddress)(permit2Payload.permit2Authorization.witness.to),
+            validAfter: BigInt(permit2Payload.permit2Authorization.witness.validAfter),
+            extra: permit2Payload.permit2Authorization.witness.extra
+          },
+          permit2Payload.signature
+        ]
+      });
+    } else {
+      tx = await signer.writeContract({
+        address: x402ExactPermit2ProxyAddress,
+        abi: x402ExactPermit2ProxyABI,
+        functionName: "settle",
+        args: [
+          {
+            permitted: {
+              token: (0, import_viem2.getAddress)(permit2Payload.permit2Authorization.permitted.token),
+              amount: BigInt(permit2Payload.permit2Authorization.permitted.amount)
+            },
+            nonce: BigInt(permit2Payload.permit2Authorization.nonce),
+            deadline: BigInt(permit2Payload.permit2Authorization.deadline)
+          },
+          (0, import_viem2.getAddress)(payer),
+          {
+            to: (0, import_viem2.getAddress)(permit2Payload.permit2Authorization.witness.to),
+            validAfter: BigInt(permit2Payload.permit2Authorization.witness.validAfter),
+            extra: permit2Payload.permit2Authorization.witness.extra
+          },
+          permit2Payload.signature
+        ]
+      });
+    }
     const receipt = await signer.waitForTransactionReceipt({ hash: tx });
     if (receipt.status !== "success") {
       return {
@@ -706,6 +765,37 @@ async function settlePermit2(signer, payload, requirements, permit2Payload) {
     };
   }
 }
+function validateEip2612PermitForPayment(info, payer, tokenAddress) {
+  if (!(0, import_extensions.validateEip2612GasSponsoringInfo)(info)) {
+    return { isValid: false, invalidReason: "invalid_eip2612_extension_format" };
+  }
+  if ((0, import_viem2.getAddress)(info.from) !== (0, import_viem2.getAddress)(payer)) {
+    return { isValid: false, invalidReason: "eip2612_from_mismatch" };
+  }
+  if ((0, import_viem2.getAddress)(info.asset) !== tokenAddress) {
+    return { isValid: false, invalidReason: "eip2612_asset_mismatch" };
+  }
+  if ((0, import_viem2.getAddress)(info.spender) !== (0, import_viem2.getAddress)(PERMIT2_ADDRESS)) {
+    return { isValid: false, invalidReason: "eip2612_spender_not_permit2" };
+  }
+  const now = Math.floor(Date.now() / 1e3);
+  if (BigInt(info.deadline) < BigInt(now + 6)) {
+    return { isValid: false, invalidReason: "eip2612_deadline_expired" };
+  }
+  return { isValid: true };
+}
+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 };
+}
 
 // src/exact/facilitator/scheme.ts
 var ExactEvmScheme = class {