@x402/evm 2.8.0 → 2.9.0

package/README.md

@@ -57,33 +57,6 @@ This package provides three main components for handling x402 payments on EVM-co
 ]
 ```
 
-### Client Builder (`@x402/evm/client`)
-
-**Convenience builder** for creating fully-configured EVM clients
-
-**Exports:**
-- `createEvmClient(config)` - Creates x402Client with EVM support
-- `EvmClientConfig` - Configuration interface
-
-**What it does:**
-- Automatically registers V2 wildcard scheme (`eip155:*`)
-- Automatically registers all V1 networks from `NETWORKS`
-- Optionally applies payment policies
-- Optionally uses custom payment selector
-
-**Example:**
-```typescript
-import { createEvmClient } from "@x402/evm/client";
-import { toClientEvmSigner } from "@x402/evm";
-import { privateKeyToAccount } from "viem/accounts";
-
-const account = privateKeyToAccount("0x...");
-const signer = toClientEvmSigner(account);
-
-const client = createEvmClient({ signer });
-// Ready to use with both V1 and V2!
-```
-
 ## Version Differences
 
 ### V2 (Main Package)
@@ -102,17 +75,7 @@ const client = createEvmClient({ signer });
 
 ## Usage Patterns
 
-### 1. Using Pre-built Builder (Recommended)
-
-```typescript
-import { createEvmClient } from "@x402/evm/client";
-import { wrapFetchWithPayment } from "@x402/fetch";
-
-const client = createEvmClient({ signer: myEvmSigner });
-const paidFetch = wrapFetchWithPayment(fetch, client);
-```
-
-### 2. Direct Registration (Full Control)
+### 1. Direct Registration (Full Control)
 
 ```typescript
 import { x402Client } from "@x402/core/client";
@@ -149,7 +112,7 @@ const wildcardClient = new x402Client().register(
 );
 ```
 
-### 3. Using Config (Flexible)
+### 2. Using Config (Flexible)
 
 ```typescript
 import { x402Client } from "@x402/core/client";

package/dist/cjs/exact/client/index.d.ts

@@ -1,8 +1,9 @@
-import { i as ExactEvmSchemeOptions } from '../../permit2-U9Zolx3O.js';
-export { E as ExactEvmScheme, j as ExactEvmSchemeConfig, k as ExactEvmSchemeConfigByChainId, P as Permit2AllowanceParams, c as createPermit2ApprovalTx, e as erc20AllowanceAbi, g as getPermit2AllowanceReadParams } from '../../permit2-U9Zolx3O.js';
+export { E as ExactEvmScheme } from '../../scheme-CXDF0D2A.js';
 import { x402Client, SelectPaymentRequirements, PaymentPolicy } from '@x402/core/client';
 import { Network } from '@x402/core/types';
 import { C as ClientEvmSigner } from '../../signer-D912R4mq.js';
+import { E as ExactEvmSchemeOptions } from '../../permit2-CyZxwngN.js';
+export { j as ExactEvmSchemeConfig, k as ExactEvmSchemeConfigByChainId, P as Permit2AllowanceParams, c as createPermit2ApprovalTx, e as erc20AllowanceAbi, g as getPermit2AllowanceReadParams } from '../../permit2-CyZxwngN.js';
 
 /**
  * Configuration options for registering EVM schemes to an x402Client

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

@@ -28,6 +28,9 @@ __export(client_exports, {
 });
 module.exports = __toCommonJS(client_exports);
 
+// src/exact/client/eip3009.ts
+var import_viem2 = require("viem");
+
 // src/constants.ts
 var authorizationTypes = {
   TransferWithAuthorization: [
@@ -104,9 +107,6 @@ var DEFAULT_MAX_PRIORITY_FEE_PER_GAS = 100000000n;
 var PERMIT2_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3";
 var x402ExactPermit2ProxyAddress = "0x402085c248EeA27D92E8b30b2C58ed07f9E20001";
 
-// src/exact/client/scheme.ts
-var import_viem7 = require("viem");
-
 // src/utils.ts
 var import_viem = require("viem");
 function getEvmChainId(network) {
@@ -135,13 +135,7 @@ function createPermit2Nonce() {
   return BigInt((0, import_viem.toHex)(randomBytes)).toString();
 }
 
-// src/exact/extensions.ts
-var EIP2612_GAS_SPONSORING_KEY = "eip2612GasSponsoring";
-var ERC20_APPROVAL_GAS_SPONSORING_KEY = "erc20ApprovalGasSponsoring";
-var ERC20_APPROVAL_GAS_SPONSORING_VERSION = "1";
-
 // src/exact/client/eip3009.ts
-var import_viem2 = require("viem");
 async function createEIP3009Payload(signer, x402Version, paymentRequirements) {
   const nonce = createNonce();
   const now = Math.floor(Date.now() / 1e3);
@@ -194,9 +188,24 @@ async function signEIP3009Authorization(signer, authorization, requirements) {
 }
 
 // src/exact/client/permit2.ts
+var import_viem6 = require("viem");
+
+// src/exact/extensions.ts
+var EIP2612_GAS_SPONSORING_KEY = "eip2612GasSponsoring";
+var ERC20_APPROVAL_GAS_SPONSORING_KEY = "erc20ApprovalGasSponsoring";
+var ERC20_APPROVAL_GAS_SPONSORING_VERSION = "1";
+
+// src/shared/permit2.ts
+var import_viem5 = require("viem");
+
+// src/multicall.ts
 var import_viem3 = require("viem");
-var MAX_UINT256 = BigInt("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
-async function createPermit2Payload(signer, x402Version, paymentRequirements) {
+
+// src/shared/erc20approval.ts
+var import_viem4 = require("viem");
+
+// src/shared/permit2.ts
+async function createPermit2PayloadForProxy(proxyAddress, signer, x402Version, paymentRequirements) {
   const now = Math.floor(Date.now() / 1e3);
   const nonce = createPermit2Nonce();
   const validAfter = (now - 600).toString();
@@ -204,14 +213,14 @@ async function createPermit2Payload(signer, x402Version, paymentRequirements) {
   const permit2Authorization = {
     from: signer.address,
     permitted: {
-      token: (0, import_viem3.getAddress)(paymentRequirements.asset),
+      token: (0, import_viem5.getAddress)(paymentRequirements.asset),
       amount: paymentRequirements.amount
     },
-    spender: x402ExactPermit2ProxyAddress,
+    spender: proxyAddress,
     nonce,
     deadline,
     witness: {
-      to: (0, import_viem3.getAddress)(paymentRequirements.payTo),
+      to: (0, import_viem5.getAddress)(paymentRequirements.payTo),
       validAfter
     }
   };
@@ -220,67 +229,71 @@ async function createPermit2Payload(signer, x402Version, paymentRequirements) {
     permit2Authorization,
     paymentRequirements
   );
-  const payload = {
-    signature,
-    permit2Authorization
-  };
   return {
     x402Version,
-    payload
+    payload: { signature, permit2Authorization }
   };
 }
 async function signPermit2Authorization(signer, permit2Authorization, requirements) {
   const chainId = getEvmChainId(requirements.network);
-  const domain = {
-    name: "Permit2",
-    chainId,
-    verifyingContract: PERMIT2_ADDRESS
-  };
-  const message = {
-    permitted: {
-      token: (0, import_viem3.getAddress)(permit2Authorization.permitted.token),
-      amount: BigInt(permit2Authorization.permitted.amount)
-    },
-    spender: (0, import_viem3.getAddress)(permit2Authorization.spender),
-    nonce: BigInt(permit2Authorization.nonce),
-    deadline: BigInt(permit2Authorization.deadline),
-    witness: {
-      to: (0, import_viem3.getAddress)(permit2Authorization.witness.to),
-      validAfter: BigInt(permit2Authorization.witness.validAfter)
-    }
-  };
   return await signer.signTypedData({
-    domain,
+    domain: { name: "Permit2", chainId, verifyingContract: PERMIT2_ADDRESS },
     types: permit2WitnessTypes,
     primaryType: "PermitWitnessTransferFrom",
-    message
+    message: {
+      permitted: {
+        token: (0, import_viem5.getAddress)(permit2Authorization.permitted.token),
+        amount: BigInt(permit2Authorization.permitted.amount)
+      },
+      spender: (0, import_viem5.getAddress)(permit2Authorization.spender),
+      nonce: BigInt(permit2Authorization.nonce),
+      deadline: BigInt(permit2Authorization.deadline),
+      witness: {
+        to: (0, import_viem5.getAddress)(permit2Authorization.witness.to),
+        validAfter: BigInt(permit2Authorization.witness.validAfter)
+      }
+    }
   });
 }
+
+// src/exact/client/permit2.ts
+var MAX_UINT256 = BigInt("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+async function createPermit2Payload(signer, x402Version, paymentRequirements) {
+  return createPermit2PayloadForProxy(
+    x402ExactPermit2ProxyAddress,
+    signer,
+    x402Version,
+    paymentRequirements
+  );
+}
 function createPermit2ApprovalTx(tokenAddress) {
-  const data = (0, import_viem3.encodeFunctionData)({
+  const data = (0, import_viem6.encodeFunctionData)({
     abi: erc20ApproveAbi,
     functionName: "approve",
     args: [PERMIT2_ADDRESS, MAX_UINT256]
   });
   return {
-    to: (0, import_viem3.getAddress)(tokenAddress),
+    to: (0, import_viem6.getAddress)(tokenAddress),
     data
   };
 }
 function getPermit2AllowanceReadParams(params) {
   return {
-    address: (0, import_viem3.getAddress)(params.tokenAddress),
+    address: (0, import_viem6.getAddress)(params.tokenAddress),
     abi: erc20AllowanceAbi,
     functionName: "allowance",
-    args: [(0, import_viem3.getAddress)(params.ownerAddress), PERMIT2_ADDRESS]
+    args: [(0, import_viem6.getAddress)(params.ownerAddress), PERMIT2_ADDRESS]
   };
 }
 
+// src/shared/extensions.ts
+var import_viem10 = require("viem");
+
 // src/exact/client/eip2612.ts
-var import_viem4 = require("viem");
+var import_viem7 = require("viem");
 async function signEip2612Permit(signer, tokenAddress, tokenName, tokenVersion, chainId, deadline, permittedAmount) {
   const owner = signer.address;
-  const spender = (0, import_viem4.getAddress)(PERMIT2_ADDRESS);
+  const spender = (0, import_viem7.getAddress)(PERMIT2_ADDRESS);
   const nonce = await signer.readContract({
     address: tokenAddress,
     abi: eip2612NoncesAbi,
@@ -320,14 +333,14 @@ async function signEip2612Permit(signer, tokenAddress, tokenName, tokenVersion,
 }
 
 // src/exact/client/erc20approval.ts
-var import_viem5 = require("viem");
+var import_viem8 = require("viem");
 async function signErc20ApprovalTransaction(signer, tokenAddress, chainId) {
   const from = signer.address;
-  const spender = (0, import_viem5.getAddress)(PERMIT2_ADDRESS);
-  const data = (0, import_viem5.encodeFunctionData)({
+  const spender = (0, import_viem8.getAddress)(PERMIT2_ADDRESS);
+  const data = (0, import_viem8.encodeFunctionData)({
     abi: erc20ApproveAbi,
     functionName: "approve",
-    args: [spender, import_viem5.maxUint256]
+    args: [spender, import_viem8.maxUint256]
   });
   const nonce = await signer.getTransactionCount({ address: from });
   let maxFeePerGas;
@@ -356,14 +369,14 @@ async function signErc20ApprovalTransaction(signer, tokenAddress, chainId) {
     from,
     asset: tokenAddress,
     spender,
-    amount: import_viem5.maxUint256.toString(),
+    amount: import_viem8.maxUint256.toString(),
     signedTransaction,
     version: ERC20_APPROVAL_GAS_SPONSORING_VERSION
   };
 }
 
-// src/exact/client/rpc.ts
-var import_viem6 = require("viem");
+// src/shared/rpc.ts
+var import_viem9 = require("viem");
 var rpcClientCache = /* @__PURE__ */ new Map();
 function isConfigByChainId(options) {
   const keys = Object.keys(options);
@@ -374,8 +387,8 @@ function getRpcClient(rpcUrl) {
   if (existing) {
     return existing;
   }
-  const client = (0, import_viem6.createPublicClient)({
-    transport: (0, import_viem6.http)(rpcUrl)
+  const client = (0, import_viem9.createPublicClient)({
+    transport: (0, import_viem9.http)(rpcUrl)
   });
   rpcClientCache.set(rpcUrl, client);
   return client;
@@ -419,6 +432,93 @@ function resolveExtensionRpcCapabilities(network, signer, options) {
   return capabilities;
 }
 
+// src/shared/extensions.ts
+async function trySignEip2612PermitExtension(signer, options, requirements, result, context) {
+  const capabilities = resolveExtensionRpcCapabilities(requirements.network, signer, options);
+  if (!capabilities.readContract) {
+    return void 0;
+  }
+  if (!context?.extensions?.[EIP2612_GAS_SPONSORING_KEY]) {
+    return void 0;
+  }
+  const tokenName = requirements.extra?.name;
+  const tokenVersion = requirements.extra?.version;
+  if (!tokenName || !tokenVersion) {
+    return void 0;
+  }
+  const chainId = getEvmChainId(requirements.network);
+  const tokenAddress = (0, import_viem10.getAddress)(requirements.asset);
+  try {
+    const allowance = await capabilities.readContract({
+      address: tokenAddress,
+      abi: erc20AllowanceAbi,
+      functionName: "allowance",
+      args: [signer.address, PERMIT2_ADDRESS]
+    });
+    if (allowance >= BigInt(requirements.amount)) {
+      return void 0;
+    }
+  } catch {
+  }
+  const permit2Auth = result.payload?.permit2Authorization;
+  const deadline = permit2Auth?.deadline ?? Math.floor(Date.now() / 1e3 + requirements.maxTimeoutSeconds).toString();
+  const info = await signEip2612Permit(
+    {
+      address: signer.address,
+      signTypedData: (msg) => signer.signTypedData(msg),
+      readContract: capabilities.readContract
+    },
+    tokenAddress,
+    tokenName,
+    tokenVersion,
+    chainId,
+    deadline,
+    requirements.amount
+  );
+  return {
+    [EIP2612_GAS_SPONSORING_KEY]: { info }
+  };
+}
+async function trySignErc20ApprovalExtension(signer, options, requirements, context) {
+  const capabilities = resolveExtensionRpcCapabilities(requirements.network, signer, options);
+  if (!capabilities.readContract) {
+    return void 0;
+  }
+  if (!context?.extensions?.[ERC20_APPROVAL_GAS_SPONSORING_KEY]) {
+    return void 0;
+  }
+  if (!capabilities.signTransaction || !capabilities.getTransactionCount) {
+    return void 0;
+  }
+  const chainId = getEvmChainId(requirements.network);
+  const tokenAddress = (0, import_viem10.getAddress)(requirements.asset);
+  try {
+    const allowance = await capabilities.readContract({
+      address: tokenAddress,
+      abi: erc20AllowanceAbi,
+      functionName: "allowance",
+      args: [signer.address, PERMIT2_ADDRESS]
+    });
+    if (allowance >= BigInt(requirements.amount)) {
+      return void 0;
+    }
+  } catch {
+  }
+  const info = await signErc20ApprovalTransaction(
+    {
+      address: signer.address,
+      signTransaction: capabilities.signTransaction,
+      getTransactionCount: capabilities.getTransactionCount,
+      estimateFeesPerGas: capabilities.estimateFeesPerGas
+    },
+    tokenAddress,
+    chainId
+  );
+  return {
+    [ERC20_APPROVAL_GAS_SPONSORING_KEY]: { info }
+  };
+}
+
 // src/exact/client/scheme.ts
 var ExactEvmScheme = class {
   /**
@@ -452,7 +552,9 @@ var ExactEvmScheme = class {
     const assetTransferMethod = paymentRequirements.extra?.assetTransferMethod ?? "eip3009";
     if (assetTransferMethod === "permit2") {
       const result = await createPermit2Payload(this.signer, x402Version, paymentRequirements);
-      const eip2612Extensions = await this.trySignEip2612Permit(
+      const eip2612Extensions = await trySignEip2612PermitExtension(
+        this.signer,
+        this.options,
         paymentRequirements,
         result,
         context
@@ -463,7 +565,12 @@ var ExactEvmScheme = class {
           extensions: eip2612Extensions
         };
       }
-      const erc20Extensions = await this.trySignErc20Approval(paymentRequirements, result, context);
+      const erc20Extensions = await trySignErc20ApprovalExtension(
+        this.signer,
+        this.options,
+        paymentRequirements,
+        context
+      );
       if (erc20Extensions) {
         return {
           ...result,
@@ -474,146 +581,16 @@ var ExactEvmScheme = class {
     }
     return createEIP3009Payload(this.signer, x402Version, paymentRequirements);
   }
-  /**
-   * Attempts to sign an EIP-2612 permit for gasless Permit2 approval.
-   *
-   * Returns extension data if:
-   * 1. Server advertises eip2612GasSponsoring
-   * 2. Signer has readContract capability
-   * 3. Current Permit2 allowance is insufficient
-   *
-   * Returns undefined if the extension should not be used.
-   *
-   * @param requirements - The payment requirements from the server
-   * @param result - The payment payload result from the scheme
-   * @param context - Optional context containing server extensions and metadata
-   * @returns Extension data for EIP-2612 gas sponsoring, or undefined if not applicable
-   */
-  async trySignEip2612Permit(requirements, result, context) {
-    const capabilities = resolveExtensionRpcCapabilities(
-      requirements.network,
-      this.signer,
-      this.options
-    );
-    if (!capabilities.readContract) {
-      return void 0;
-    }
-    if (!context?.extensions?.[EIP2612_GAS_SPONSORING_KEY]) {
-      return void 0;
-    }
-    const tokenName = requirements.extra?.name;
-    const tokenVersion = requirements.extra?.version;
-    if (!tokenName || !tokenVersion) {
-      return void 0;
-    }
-    const chainId = getEvmChainId(requirements.network);
-    const tokenAddress = (0, import_viem7.getAddress)(requirements.asset);
-    try {
-      const allowance = await capabilities.readContract({
-        address: tokenAddress,
-        abi: erc20AllowanceAbi,
-        functionName: "allowance",
-        args: [this.signer.address, PERMIT2_ADDRESS]
-      });
-      if (allowance >= BigInt(requirements.amount)) {
-        return void 0;
-      }
-    } catch {
-    }
-    const permit2Auth = result.payload?.permit2Authorization;
-    const deadline = permit2Auth?.deadline ?? Math.floor(Date.now() / 1e3 + requirements.maxTimeoutSeconds).toString();
-    const info = await signEip2612Permit(
-      {
-        address: this.signer.address,
-        signTypedData: (msg) => this.signer.signTypedData(msg),
-        readContract: capabilities.readContract
-      },
-      tokenAddress,
-      tokenName,
-      tokenVersion,
-      chainId,
-      deadline,
-      requirements.amount
-    );
-    return {
-      [EIP2612_GAS_SPONSORING_KEY]: { info }
-    };
-  }
-  /**
-   * Attempts to sign an ERC-20 approval transaction for gasless Permit2 approval.
-   *
-   * This is the fallback path when the token does not support EIP-2612. The client
-   * signs (but does not broadcast) a raw `approve(Permit2, MaxUint256)` transaction.
-   * The facilitator broadcasts it atomically before settling.
-   *
-   * Returns extension data if:
-   * 1. Server advertises erc20ApprovalGasSponsoring
-   * 2. Signer has signTransaction + getTransactionCount capabilities
-   * 3. Current Permit2 allowance is insufficient
-   *
-   * Returns undefined if the extension should not be used.
-   *
-   * @param requirements - The payment requirements from the server
-   * @param _result - The payment payload result from the scheme (unused)
-   * @param context - Optional context containing server extensions and metadata
-   * @returns Extension data for ERC-20 approval gas sponsoring, or undefined if not applicable
-   */
-  async trySignErc20Approval(requirements, _result, context) {
-    const capabilities = resolveExtensionRpcCapabilities(
-      requirements.network,
-      this.signer,
-      this.options
-    );
-    if (!capabilities.readContract) {
-      return void 0;
-    }
-    if (!context?.extensions?.[ERC20_APPROVAL_GAS_SPONSORING_KEY]) {
-      return void 0;
-    }
-    if (!capabilities.signTransaction || !capabilities.getTransactionCount) {
-      return void 0;
-    }
-    const chainId = getEvmChainId(requirements.network);
-    const tokenAddress = (0, import_viem7.getAddress)(requirements.asset);
-    try {
-      const allowance = await capabilities.readContract({
-        address: tokenAddress,
-        abi: erc20AllowanceAbi,
-        functionName: "allowance",
-        args: [this.signer.address, PERMIT2_ADDRESS]
-      });
-      if (allowance >= BigInt(requirements.amount)) {
-        return void 0;
-      }
-    } catch {
-    }
-    const info = await signErc20ApprovalTransaction(
-      {
-        address: this.signer.address,
-        signTransaction: capabilities.signTransaction,
-        getTransactionCount: capabilities.getTransactionCount,
-        estimateFeesPerGas: capabilities.estimateFeesPerGas
-      },
-      tokenAddress,
-      chainId
-    );
-    return {
-      [ERC20_APPROVAL_GAS_SPONSORING_KEY]: { info }
-    };
-  }
 };
 
 // src/exact/v1/client/scheme.ts
-var import_viem11 = require("viem");
+var import_viem13 = require("viem");
 
 // src/exact/v1/facilitator/scheme.ts
-var import_viem10 = require("viem");
+var import_viem12 = require("viem");
 
 // src/exact/facilitator/eip3009-utils.ts
-var import_viem9 = require("viem");
-
-// src/multicall.ts
-var import_viem8 = require("viem");
+var import_viem11 = require("viem");
 
 // src/v1/index.ts
 var EVM_NETWORK_CHAIN_ID_MAP = {
@@ -635,7 +612,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) {
@@ -670,7 +649,7 @@ var ExactEvmSchemeV1 = class {
     const now = Math.floor(Date.now() / 1e3);
     const authorization = {
       from: this.signer.address,
-      to: (0, import_viem11.getAddress)(selectedV1.payTo),
+      to: (0, import_viem13.getAddress)(selectedV1.payTo),
       value: selectedV1.maxAmountRequired,
       validAfter: (now - 600).toString(),
       // 10 minutes before
@@ -708,11 +687,11 @@ var ExactEvmSchemeV1 = class {
       name,
       version,
       chainId,
-      verifyingContract: (0, import_viem11.getAddress)(requirements.asset)
+      verifyingContract: (0, import_viem13.getAddress)(requirements.asset)
     };
     const message = {
-      from: (0, import_viem11.getAddress)(authorization.from),
-      to: (0, import_viem11.getAddress)(authorization.to),
+      from: (0, import_viem13.getAddress)(authorization.from),
+      to: (0, import_viem13.getAddress)(authorization.to),
       value: BigInt(authorization.value),
       validAfter: BigInt(authorization.validAfter),
       validBefore: BigInt(authorization.validBefore),