@wtflabs/x402 0.0.1-beta.5 → 0.0.1-beta.7

package/dist/cjs/schemes/index.js

@@ -1583,6 +1583,264 @@ async function signAndSimulateTransaction(signer, transaction, rpc) {
   return simulateResult;
 }
 
+// src/types/shared/evm/permitProxyABI.ts
+var permitProxyContractABI = [
+  // settleWithPermit - 使用 EIP-2612 Permit 进行结算
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "token",
+        type: "address"
+      },
+      {
+        internalType: "address",
+        name: "payer",
+        type: "address"
+      },
+      {
+        internalType: "address",
+        name: "seller",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "deadline",
+        type: "uint256"
+      },
+      {
+        internalType: "uint8",
+        name: "v",
+        type: "uint8"
+      },
+      {
+        internalType: "bytes32",
+        name: "r",
+        type: "bytes32"
+      },
+      {
+        internalType: "bytes32",
+        name: "s",
+        type: "bytes32"
+      }
+    ],
+    name: "settleWithPermit",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  // settleWithERC3009 - 使用 EIP-3009 TransferWithAuthorization 进行结算
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "token",
+        type: "address"
+      },
+      {
+        internalType: "address",
+        name: "payer",
+        type: "address"
+      },
+      {
+        internalType: "address",
+        name: "seller",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "validAfter",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "validBefore",
+        type: "uint256"
+      },
+      {
+        internalType: "bytes32",
+        name: "nonce",
+        type: "bytes32"
+      },
+      {
+        internalType: "uint8",
+        name: "v",
+        type: "uint8"
+      },
+      {
+        internalType: "bytes32",
+        name: "r",
+        type: "bytes32"
+      },
+      {
+        internalType: "bytes32",
+        name: "s",
+        type: "bytes32"
+      }
+    ],
+    name: "settleWithERC3009",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  // settleWithERC3009Direct - 直接结算（无手续费）
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "token",
+        type: "address"
+      },
+      {
+        internalType: "address",
+        name: "payer",
+        type: "address"
+      },
+      {
+        internalType: "address",
+        name: "seller",
+        type: "address"
+      },
+      {
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "validAfter",
+        type: "uint256"
+      },
+      {
+        internalType: "uint256",
+        name: "validBefore",
+        type: "uint256"
+      },
+      {
+        internalType: "bytes32",
+        name: "nonce",
+        type: "bytes32"
+      },
+      {
+        internalType: "uint8",
+        name: "v",
+        type: "uint8"
+      },
+      {
+        internalType: "bytes32",
+        name: "r",
+        type: "bytes32"
+      },
+      {
+        internalType: "bytes32",
+        name: "s",
+        type: "bytes32"
+      }
+    ],
+    name: "settleWithERC3009Direct",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
+  },
+  // Events
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "token",
+        type: "address"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "payer",
+        type: "address"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "seller",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "sellerAmount",
+        type: "uint256"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "feeAmount",
+        type: "uint256"
+      },
+      {
+        indexed: false,
+        internalType: "string",
+        name: "path",
+        type: "string"
+      }
+    ],
+    name: "SettledSplit",
+    type: "event"
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "token",
+        type: "address"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "payer",
+        type: "address"
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "seller",
+        type: "address"
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256"
+      },
+      {
+        indexed: false,
+        internalType: "string",
+        name: "path",
+        type: "string"
+      }
+    ],
+    name: "SettledDirect",
+    type: "event"
+  }
+];
+
 // src/schemes/exact/evm/eip3009/facilitator.ts
 async function verify(client, payload, paymentRequirements) {
   const exactEvmPayload = payload.payload;
@@ -1647,7 +1905,7 @@ async function verify(client, payload, paymentRequirements) {
       payer: exactEvmPayload.authorization.from
     };
   }
-  if ((0, import_viem2.getAddress)(exactEvmPayload.authorization.to) !== (0, import_viem2.getAddress)(paymentRequirements.payTo)) {
+  if ((0, import_viem2.getAddress)(exactEvmPayload.authorization.to) !== (0, import_viem2.getAddress)(paymentRequirements.payTo) && (0, import_viem2.getAddress)(exactEvmPayload.authorization.to) !== (0, import_viem2.getAddress)(paymentRequirements.extra?.relayer)) {
     return {
       isValid: false,
       invalidReason: "invalid_exact_evm_payload_recipient_mismatch",
@@ -1720,21 +1978,57 @@ async function settle(wallet, paymentPayload, paymentRequirements) {
     };
   }
   const { signature } = (0, import_viem2.parseErc6492Signature)(payload.signature);
-  const tx = await wallet.writeContract({
-    address: paymentRequirements.asset,
-    abi: usdcABI,
-    functionName: "transferWithAuthorization",
-    args: [
-      payload.authorization.from,
-      payload.authorization.to,
-      BigInt(payload.authorization.value),
-      BigInt(payload.authorization.validAfter),
-      BigInt(payload.authorization.validBefore),
-      payload.authorization.nonce,
-      signature
-    ],
-    chain: wallet.chain
-  });
+  let tx;
+  if (paymentRequirements.extra?.relayer) {
+    const sig = (0, import_viem2.hexToSignature)(signature);
+    const v = Number(sig.v);
+    const r = sig.r;
+    const s = sig.s;
+    tx = await wallet.writeContract({
+      address: paymentRequirements.extra.relayer,
+      abi: permitProxyContractABI,
+      functionName: "settleWithERC3009",
+      args: [
+        paymentRequirements.asset,
+        // token
+        payload.authorization.from,
+        // payer
+        paymentRequirements.payTo,
+        // seller
+        BigInt(payload.authorization.value),
+        // amount
+        BigInt(payload.authorization.validAfter),
+        // validAfter
+        BigInt(payload.authorization.validBefore),
+        // validBefore
+        payload.authorization.nonce,
+        // nonce
+        v,
+        // v (uint8)
+        r,
+        // r (bytes32)
+        s
+        // s (bytes32)
+      ],
+      chain: wallet.chain
+    });
+  } else {
+    tx = await wallet.writeContract({
+      address: paymentRequirements.asset,
+      abi: usdcABI,
+      functionName: "transferWithAuthorization",
+      args: [
+        payload.authorization.from,
+        payload.authorization.to,
+        BigInt(payload.authorization.value),
+        BigInt(payload.authorization.validAfter),
+        BigInt(payload.authorization.validBefore),
+        payload.authorization.nonce,
+        signature
+      ],
+      chain: wallet.chain
+    });
+  }
   const receipt = await wallet.waitForTransactionReceipt({ hash: tx });
   if (receipt.status !== "success") {
     return {
@@ -1828,63 +2122,6 @@ function splitSignature(signature) {
   return { v, r, s };
 }
 
-// src/types/shared/evm/permitProxyABI.ts
-var permitProxyContractABI = [
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "token",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address"
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address"
-      },
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256"
-      },
-      {
-        internalType: "uint256",
-        name: "deadline",
-        type: "uint256"
-      },
-      {
-        internalType: "uint8",
-        name: "v",
-        type: "uint8"
-      },
-      {
-        internalType: "bytes32",
-        name: "r",
-        type: "bytes32"
-      },
-      {
-        internalType: "bytes32",
-        name: "s",
-        type: "bytes32"
-      },
-      {
-        internalType: "address",
-        name: "to",
-        type: "address"
-      }
-    ],
-    name: "permitAndTransfer",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function"
-  }
-];
-
 // src/schemes/exact/evm/permit/facilitator.ts
 async function verify2(client, payload, paymentRequirements) {
   if (payload.payload.authorizationType !== "permit" || payload.scheme !== SCHEME || paymentRequirements.scheme !== SCHEME) {
@@ -1952,8 +2189,8 @@ async function verify2(client, payload, paymentRequirements) {
       payer: owner
     };
   }
-  if (paymentRequirements.extra?.proxyAddress) {
-    if ((0, import_viem4.getAddress)(spender) !== (0, import_viem4.getAddress)(paymentRequirements.extra?.proxyAddress)) {
+  if (paymentRequirements.extra?.relayer) {
+    if ((0, import_viem4.getAddress)(spender) !== (0, import_viem4.getAddress)(paymentRequirements.extra?.relayer)) {
       return {
         isValid: false,
         invalidReason: "invalid_spender_address",
@@ -2017,21 +2254,28 @@ async function settle2(wallet, paymentPayload, paymentRequirements) {
     address: wallet.account.address
   });
   let transactionHash;
-  if (paymentRequirements.extra?.proxyAddress) {
+  if (paymentRequirements.extra?.relayer) {
     transactionHash = await wallet.writeContract({
-      address: paymentRequirements.extra.proxyAddress,
+      address: paymentRequirements.extra.relayer,
       abi: permitProxyContractABI,
-      functionName: "permitAndTransfer",
+      functionName: "settleWithPermit",
       args: [
         tokenAddress,
+        // token
         owner,
-        spender,
+        // payer
+        paymentRequirements.payTo,
+        // seller
         BigInt(value),
+        // amount
         BigInt(deadline),
+        // deadline
         v,
+        // v
         r,
-        s,
-        paymentRequirements.payTo
+        // r
+        s
+        // s
       ],
       chain: wallet.chain,
       nonce: txNonce
@@ -2448,7 +2692,7 @@ function preparePaymentHeader(from, x402Version, paymentRequirements) {
       signature: void 0,
       authorization: {
         from,
-        to: paymentRequirements.payTo,
+        to: paymentRequirements.extra?.relayer || paymentRequirements.payTo,
         value: paymentRequirements.maxAmountRequired,
         validAfter: validAfter.toString(),
         validBefore: validBefore.toString(),
@@ -2506,7 +2750,7 @@ function preparePaymentHeader2(from, x402Version, paymentRequirements) {
       signature: void 0,
       authorization: {
         owner: from,
-        spender: paymentRequirements.extra?.relayer,
+        spender: paymentRequirements.extra?.relayer || paymentRequirements.payTo,
         value: paymentRequirements.maxAmountRequired,
         deadline
       }