@wtflabs/x402 0.0.1-beta.4 → 0.0.1-beta.6

package/dist/cjs/facilitator/index.js

@@ -315,6 +315,21 @@ var permit2Types = {
     { name: "amount", type: "uint256" }
   ]
 };
+var permit2WitnessTypes = {
+  PermitWitnessTransferFrom: [
+    { name: "permitted", type: "TokenPermissions" },
+    { name: "spender", type: "address" },
+    { name: "nonce", type: "uint256" },
+    { name: "deadline", type: "uint256" },
+    { name: "witness", type: "Witness" }
+  ],
+  TokenPermissions: [
+    { name: "token", type: "address" },
+    { name: "amount", type: "uint256" }
+  ],
+  Witness: [{ name: "to", type: "address" }]
+};
+var WITNESS_TYPE_STRING = "Witness(address to)";
 var permit2ABI = [
   {
     inputs: [
@@ -384,6 +399,45 @@ var permit2ABI = [
     outputs: [{ internalType: "uint256", name: "", type: "uint256" }],
     stateMutability: "view",
     type: "function"
+  },
+  {
+    inputs: [
+      {
+        components: [
+          {
+            components: [
+              { internalType: "address", name: "token", type: "address" },
+              { internalType: "uint256", name: "amount", type: "uint256" }
+            ],
+            internalType: "struct ISignatureTransfer.TokenPermissions",
+            name: "permitted",
+            type: "tuple"
+          },
+          { internalType: "uint256", name: "nonce", type: "uint256" },
+          { internalType: "uint256", name: "deadline", type: "uint256" }
+        ],
+        internalType: "struct ISignatureTransfer.PermitTransferFrom",
+        name: "permit",
+        type: "tuple"
+      },
+      {
+        components: [
+          { internalType: "address", name: "to", type: "address" },
+          { internalType: "uint256", name: "requestedAmount", type: "uint256" }
+        ],
+        internalType: "struct ISignatureTransfer.SignatureTransferDetails",
+        name: "transferDetails",
+        type: "tuple"
+      },
+      { internalType: "address", name: "owner", type: "address" },
+      { internalType: "bytes32", name: "witness", type: "bytes32" },
+      { internalType: "string", name: "witnessTypeString", type: "string" },
+      { internalType: "bytes", name: "signature", type: "bytes" }
+    ],
+    name: "permitWitnessTransferFrom",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function"
   }
 ];
 
@@ -1201,6 +1255,8 @@ var ErrorReasons = [
   "invalid_authorization_type",
   "invalid_permit_signature",
   "invalid_permit2_signature",
+  "invalid_permit2_witness_signature",
+  "witness_recipient_mismatch",
   "permit_expired",
   "permit2_expired",
   "permit2_not_approved",
@@ -1208,6 +1264,7 @@ var ErrorReasons = [
   "invalid_spender_address",
   "token_mismatch",
   "insufficient_payment_amount",
+  "insufficient_token_balance",
   "transaction_failed",
   "settlement_failed"
 ];
@@ -1250,7 +1307,9 @@ var Permit2EvmPayloadAuthorizationSchema = import_zod3.z.object({
   token: import_zod3.z.string().regex(EvmAddressRegex),
   amount: import_zod3.z.string().refine(isInteger).refine(hasMaxLength(EvmMaxAtomicUnits)),
   deadline: import_zod3.z.string().refine(isInteger),
-  nonce: import_zod3.z.string().refine(isInteger)
+  nonce: import_zod3.z.string().refine(isInteger),
+  to: import_zod3.z.string().regex(EvmAddressRegex).optional()
+  // Witness: binds recipient address to signature
 });
 var ExactEvmPayloadSchema = import_zod3.z.discriminatedUnion("authorizationType", [
   import_zod3.z.object({
@@ -1836,6 +1895,264 @@ var import_compute_budget2 = require("@solana-program/compute-budget");
 // src/schemes/exact/index.ts
 var SCHEME = "exact";
 
+// 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 verify2(client, payload, paymentRequirements) {
   const exactEvmPayload = payload.payload;
@@ -1900,7 +2217,7 @@ async function verify2(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",
@@ -1973,21 +2290,57 @@ async function settle2(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
+        payload.authorization.to,
+        // 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 {
@@ -2023,63 +2376,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 verify3(client, payload, paymentRequirements) {
   if (payload.payload.authorizationType !== "permit" || payload.scheme !== SCHEME || paymentRequirements.scheme !== SCHEME) {
@@ -2147,8 +2443,8 @@ async function verify3(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",
@@ -2212,21 +2508,28 @@ async function settle3(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
@@ -2295,11 +2598,41 @@ async function verify4(client, payload, paymentRequirements) {
     };
   }
   const permit2Payload = payload.payload;
-  const { owner, spender, token, amount, deadline, nonce } = permit2Payload.authorization;
+  const { owner, spender, token, amount, deadline, nonce, to } = permit2Payload.authorization;
   const chainId = getNetworkId(payload.network);
   const tokenAddress = (0, import_viem5.getAddress)(token);
   const ownerAddress = (0, import_viem5.getAddress)(owner);
-  const permit2TypedData = {
+  const hasWitness = !!to;
+  if (hasWitness) {
+    if ((0, import_viem5.getAddress)(to) !== (0, import_viem5.getAddress)(paymentRequirements.payTo)) {
+      return {
+        isValid: false,
+        invalidReason: "witness_recipient_mismatch",
+        payer: owner
+      };
+    }
+  }
+  const permit2TypedData = hasWitness ? {
+    types: permit2WitnessTypes,
+    domain: {
+      name: "Permit2",
+      chainId,
+      verifyingContract: PERMIT2_ADDRESS
+    },
+    primaryType: "PermitWitnessTransferFrom",
+    message: {
+      permitted: {
+        token: tokenAddress,
+        amount
+      },
+      spender: (0, import_viem5.getAddress)(spender),
+      nonce,
+      deadline,
+      witness: {
+        to: (0, import_viem5.getAddress)(to)
+      }
+    }
+  } : {
     types: permit2Types,
     domain: {
       name: "Permit2",
@@ -2325,7 +2658,7 @@ async function verify4(client, payload, paymentRequirements) {
   if (!recoveredAddress) {
     return {
       isValid: false,
-      invalidReason: "invalid_permit2_signature",
+      invalidReason: hasWitness ? "invalid_permit2_witness_signature" : "invalid_permit2_signature",
       payer: owner
     };
   }
@@ -2400,10 +2733,34 @@ async function settle4(wallet, paymentPayload, paymentRequirements) {
       payer: permit2Payload.authorization.owner
     };
   }
-  const { owner, token, amount, deadline, nonce } = permit2Payload.authorization;
+  const { owner, token, amount, deadline, nonce, to } = permit2Payload.authorization;
   const tokenAddress = (0, import_viem5.getAddress)(token);
   const ownerAddress = (0, import_viem5.getAddress)(owner);
-  const tx = await wallet.writeContract({
+  const hasWitness = !!to;
+  const tx = hasWitness ? await wallet.writeContract({
+    address: PERMIT2_ADDRESS,
+    abi: permit2ABI,
+    functionName: "permitWitnessTransferFrom",
+    args: [
+      {
+        permitted: {
+          token: tokenAddress,
+          amount: BigInt(amount)
+        },
+        nonce: BigInt(nonce),
+        deadline: BigInt(deadline)
+      },
+      {
+        to: paymentRequirements.payTo,
+        requestedAmount: BigInt(amount)
+      },
+      ownerAddress,
+      (0, import_viem5.keccak256)((0, import_viem5.encodeAbiParameters)([{ type: "address", name: "to" }], [(0, import_viem5.getAddress)(to)])),
+      WITNESS_TYPE_STRING,
+      permit2Payload.signature
+    ],
+    chain: wallet.chain
+  }) : await wallet.writeContract({
     address: PERMIT2_ADDRESS,
     abi: permit2ABI,
     functionName: "permitTransferFrom",