@wtflabs/x402 0.0.1-beta.14 → 0.0.1-beta.16

package/dist/esm/{chunk-WCQCFJWV.mjs → chunk-YWZNW3IG.mjs}

@@ -9,8 +9,9 @@ import {
   preparePaymentHeader,
   signAuthorization,
   signPaymentHeader
-} from "./chunk-VTLJOZXM.mjs";
+} from "./chunk-27VV4F7H.mjs";
 import {
+  EIP7702SellerWalletMinimalAbi,
   ErrorReasons,
   PERMIT2_ADDRESS,
   SupportedSVMNetworks,
@@ -28,12 +29,11 @@ import {
   permit2WitnessTypes,
   permitTypes,
   signAndSimulateTransaction
-} from "./chunk-NPWDNT2P.mjs";
+} from "./chunk-5UE5XTGG.mjs";
 import {
   getERC20Allowance,
   getERC20Balance,
-  getVersion,
-  usdcABI
+  getVersion
 } from "./chunk-5LTKIVOA.mjs";
 import {
   __export,
@@ -69,266 +69,6 @@ import {
   parseErc6492Signature,
   hexToSignature
 } from "viem";
-
-// 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;
   if (exactEvmPayload.authorizationType !== "eip3009") {
@@ -392,7 +132,7 @@ async function verify(client, payload, paymentRequirements) {
       payer: exactEvmPayload.authorization.from
     };
   }
-  if (getAddress(exactEvmPayload.authorization.to) !== getAddress(paymentRequirements.payTo) && getAddress(exactEvmPayload.authorization.to) !== getAddress(paymentRequirements.extra?.relayer)) {
+  if (getAddress(exactEvmPayload.authorization.to) !== getAddress(paymentRequirements.payTo)) {
     return {
       isValid: false,
       invalidReason: "invalid_exact_evm_payload_recipient_mismatch",
@@ -465,57 +205,36 @@ async function settle(wallet, paymentPayload, paymentRequirements) {
     };
   }
   const { signature } = parseErc6492Signature(payload.signature);
-  let tx;
-  if (paymentRequirements.extra?.relayer) {
-    const sig = 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 sig = hexToSignature(signature);
+  const v = Number(sig.v);
+  const r = sig.r;
+  const s = sig.s;
+  const tx = await wallet.writeContract({
+    address: paymentRequirements.payTo,
+    abi: EIP7702SellerWalletMinimalAbi,
+    functionName: "settleWithERC3009",
+    args: [
+      paymentRequirements.asset,
+      // token
+      payload.authorization.from,
+      // payer
+      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
+  });
   const receipt = await wallet.waitForTransactionReceipt({ hash: tx });
   if (receipt.status !== "success") {
     return {
@@ -676,22 +395,12 @@ async function verify2(client, payload, paymentRequirements) {
       payer: owner
     };
   }
-  if (paymentRequirements.extra?.relayer) {
-    if (getAddress3(spender) !== getAddress3(paymentRequirements.extra?.relayer)) {
-      return {
-        isValid: false,
-        invalidReason: "invalid_spender_address",
-        payer: owner
-      };
-    }
-  } else {
-    if (client.account && getAddress3(spender) !== getAddress3(client.account.address)) {
-      return {
-        isValid: false,
-        invalidReason: "invalid_spender_address",
-        payer: owner
-      };
-    }
+  if (getAddress3(spender) !== getAddress3(paymentRequirements.payTo)) {
+    return {
+      isValid: false,
+      invalidReason: "invalid_spender_address",
+      payer: owner
+    };
   }
   const balance = await getERC20Balance(client, erc20Address, owner);
   if (balance < BigInt(paymentRequirements.maxAmountRequired)) {
@@ -734,84 +443,40 @@ async function settle2(wallet, paymentPayload, paymentRequirements) {
       payer: permitPayload.authorization.owner
     };
   }
-  const { owner, spender, value, deadline } = permitPayload.authorization;
+  const { owner, value, deadline } = permitPayload.authorization;
   const { v, r, s } = splitSignature(permitPayload.signature);
   const tokenAddress = paymentRequirements.asset;
-  const txNonce = await wallet.getTransactionCount({
-    address: wallet.account.address
+  const transactionHash = await wallet.writeContract({
+    address: paymentRequirements.payTo,
+    abi: EIP7702SellerWalletMinimalAbi,
+    functionName: "settleWithPermit",
+    args: [
+      tokenAddress,
+      // token
+      owner,
+      // payer
+      BigInt(value),
+      // amount
+      BigInt(deadline),
+      // deadline
+      v,
+      // v
+      r,
+      // r
+      s
+      // s
+    ],
+    chain: wallet.chain
   });
-  let transactionHash;
-  if (paymentRequirements.extra?.relayer) {
-    transactionHash = await wallet.writeContract({
-      address: paymentRequirements.extra.relayer,
-      abi: permitProxyContractABI,
-      functionName: "settleWithPermit",
-      args: [
-        tokenAddress,
-        // token
-        owner,
-        // payer
-        paymentRequirements.payTo,
-        // seller
-        BigInt(value),
-        // amount
-        BigInt(deadline),
-        // deadline
-        v,
-        // v
-        r,
-        // r
-        s
-        // s
-      ],
-      chain: wallet.chain,
-      nonce: txNonce
-    });
-    const receipt = await wallet.waitForTransactionReceipt({ hash: transactionHash });
-    if (receipt.status !== "success") {
-      return {
-        success: false,
-        errorReason: "transaction_failed",
-        transaction: transactionHash,
-        network: paymentPayload.network,
-        payer: owner
-      };
-    }
-  } else {
-    const [permitTx, transferTx] = await Promise.all([
-      // Call permit to approve the spender
-      wallet.writeContract({
-        address: tokenAddress,
-        abi: erc20PermitABI,
-        functionName: "permit",
-        args: [owner, spender, BigInt(value), BigInt(deadline), v, r, s],
-        chain: wallet.chain,
-        nonce: txNonce
-      }),
-      // Call transferFrom to transfer tokens to payTo address
-      wallet.writeContract({
-        address: tokenAddress,
-        abi: erc20PermitABI,
-        functionName: "transferFrom",
-        args: [owner, paymentRequirements.payTo, BigInt(value)],
-        chain: wallet.chain,
-        nonce: txNonce + 1
-      })
-    ]);
-    const [, receipt] = await Promise.all([
-      wallet.waitForTransactionReceipt({ hash: permitTx }),
-      wallet.waitForTransactionReceipt({ hash: transferTx })
-    ]);
-    if (receipt.status !== "success") {
-      return {
-        success: false,
-        errorReason: "transaction_failed",
-        transaction: transferTx,
-        network: paymentPayload.network,
-        payer: owner
-      };
-    }
-    transactionHash = transferTx;
+  const receipt = await wallet.waitForTransactionReceipt({ hash: transactionHash });
+  if (receipt.status !== "success") {
+    return {
+      success: false,
+      errorReason: "transaction_failed",
+      transaction: transactionHash,
+      network: paymentPayload.network,
+      payer: owner
+    };
   }
   return {
     success: true,
@@ -1077,7 +742,7 @@ function preparePaymentHeader2(from, x402Version, paymentRequirements) {
       signature: void 0,
       authorization: {
         owner: from,
-        spender: paymentRequirements.extra?.relayer || paymentRequirements.payTo,
+        spender: paymentRequirements.payTo,
         value: paymentRequirements.maxAmountRequired,
         deadline
       }
@@ -2071,4 +1736,4 @@ export {
   verify4 as verify2,
   settle4 as settle2
 };
-//# sourceMappingURL=chunk-WCQCFJWV.mjs.map
+//# sourceMappingURL=chunk-YWZNW3IG.mjs.map