@x402/evm 2.5.0 → 2.7.0

package/README.md

@@ -125,6 +125,30 @@ const client = new x402Client()
   .registerSchemeV1("base", new ExactEvmClientV1(signer));
 ```
 
+### Extension RPC Configuration (Optional)
+
+`ExactEvmClient` only requires signer support for `address` + `signTypedData`.
+Permit2 extension enrichment (EIP-2612 / ERC-20 approval gas sponsoring) can
+optionally use explicit RPC config when signer read/fee helpers are unavailable.
+
+No chain-default RPC fallback is applied by the SDK.
+
+```typescript
+// Per-network explicit registration
+const client = new x402Client()
+  .register("eip155:137", new ExactEvmClient(signer, { rpcUrl: polygonRpcUrl }))
+  .register("eip155:8453", new ExactEvmClient(signer, { rpcUrl: baseRpcUrl }));
+
+// Wildcard registration with chain-id keyed config map
+const wildcardClient = new x402Client().register(
+  "eip155:*",
+  new ExactEvmClient(signer, {
+    137: { rpcUrl: polygonRpcUrl },
+    8453: { rpcUrl: baseRpcUrl },
+  }),
+);
+```
+
 ### 3. Using Config (Flexible)
 
 ```typescript
@@ -181,3 +205,4 @@ npm run format
 - `@x402/core` - Core protocol types and client
 - `@x402/fetch` - HTTP wrapper with automatic payment handling
 - `@x402/svm` - Solana/SVM implementation
+- `@x402/stellar` - Stellar implementation

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

@@ -1,7 +1,8 @@
-export { E as ExactEvmScheme, a as Permit2AllowanceParams, c as createPermit2ApprovalTx, d as erc20AllowanceAbi, g as getPermit2AllowanceReadParams } from '../../permit2-CQbXqCMC.js';
-import { SelectPaymentRequirements, PaymentPolicy, x402Client } from '@x402/core/client';
+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';
+import { x402Client, SelectPaymentRequirements, PaymentPolicy } from '@x402/core/client';
 import { Network } from '@x402/core/types';
-import { C as ClientEvmSigner } from '../../signer-DC81R8wQ.js';
+import { C as ClientEvmSigner } from '../../signer-D912R4mq.js';
 
 /**
  * Configuration options for registering EVM schemes to an x402Client
@@ -21,8 +22,14 @@ interface EvmClientConfig {
      */
     policies?: PaymentPolicy[];
     /**
-     * Optional specific networks to register
-     * If not provided, registers wildcard support (eip155:*)
+     * Optional Exact EVM client scheme options.
+     * Supports either a single config ({ rpcUrl }) or per-chain configs
+     * keyed by EVM chain ID ({ 8453: { rpcUrl: "..." } }).
+     */
+    schemeOptions?: ExactEvmSchemeOptions;
+    /**
+     * Optional specific networks to register.
+     * If not provided, registers wildcard support (eip155:*).
      */
     networks?: Network[];
 }
@@ -50,4 +57,4 @@ interface EvmClientConfig {
  */
 declare function registerExactEvmScheme(client: x402Client, config: EvmClientConfig): x402Client;
 
-export { type EvmClientConfig, registerExactEvmScheme };
+export { type EvmClientConfig, ExactEvmSchemeOptions, registerExactEvmScheme };

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

@@ -28,9 +28,6 @@ __export(client_exports, {
 });
 module.exports = __toCommonJS(client_exports);
 
-// src/exact/client/scheme.ts
-var import_extensions2 = require("@x402/extensions");
-
 // src/constants.ts
 var authorizationTypes = {
   TransferWithAuthorization: [
@@ -108,7 +105,7 @@ var PERMIT2_ADDRESS = "0x000000000022D473030F116dDEE9F6B43aC78BA3";
 var x402ExactPermit2ProxyAddress = "0x402085c248EeA27D92E8b30b2C58ed07f9E20001";
 
 // src/exact/client/scheme.ts
-var import_viem6 = require("viem");
+var import_viem7 = require("viem");
 
 // src/utils.ts
 var import_viem = require("viem");
@@ -138,6 +135,11 @@ 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) {
@@ -319,7 +321,6 @@ async function signEip2612Permit(signer, tokenAddress, tokenName, tokenVersion,
 
 // src/exact/client/erc20approval.ts
 var import_viem5 = require("viem");
-var import_extensions = require("@x402/extensions");
 async function signErc20ApprovalTransaction(signer, tokenAddress, chainId) {
   const from = signer.address;
   const spender = (0, import_viem5.getAddress)(PERMIT2_ADDRESS);
@@ -332,7 +333,10 @@ async function signErc20ApprovalTransaction(signer, tokenAddress, chainId) {
   let maxFeePerGas;
   let maxPriorityFeePerGas;
   try {
-    const fees = await signer.estimateFeesPerGas();
+    const fees = await signer.estimateFeesPerGas?.();
+    if (!fees) {
+      throw new Error("no fee estimates available");
+    }
     maxFeePerGas = fees.maxFeePerGas;
     maxPriorityFeePerGas = fees.maxPriorityFeePerGas;
   } catch {
@@ -354,8 +358,65 @@ async function signErc20ApprovalTransaction(signer, tokenAddress, chainId) {
     spender,
     amount: import_viem5.maxUint256.toString(),
     signedTransaction,
-    version: import_extensions.ERC20_APPROVAL_GAS_SPONSORING_VERSION
+    version: ERC20_APPROVAL_GAS_SPONSORING_VERSION
+  };
+}
+
+// src/exact/client/rpc.ts
+var import_viem6 = require("viem");
+var rpcClientCache = /* @__PURE__ */ new Map();
+function isConfigByChainId(options) {
+  const keys = Object.keys(options);
+  return keys.length > 0 && keys.every((key) => /^\d+$/.test(key));
+}
+function getRpcClient(rpcUrl) {
+  const existing = rpcClientCache.get(rpcUrl);
+  if (existing) {
+    return existing;
+  }
+  const client = (0, import_viem6.createPublicClient)({
+    transport: (0, import_viem6.http)(rpcUrl)
+  });
+  rpcClientCache.set(rpcUrl, client);
+  return client;
+}
+function resolveRpcUrl(network, options) {
+  if (!options) {
+    return void 0;
+  }
+  if (isConfigByChainId(options)) {
+    const chainId = getEvmChainId(network);
+    const optionsByChainId = options;
+    return optionsByChainId[chainId]?.rpcUrl;
+  }
+  return options.rpcUrl;
+}
+function resolveExtensionRpcCapabilities(network, signer, options) {
+  const capabilities = {
+    signTransaction: signer.signTransaction,
+    readContract: signer.readContract,
+    getTransactionCount: signer.getTransactionCount,
+    estimateFeesPerGas: signer.estimateFeesPerGas
   };
+  const needsRpcBackfill = !capabilities.readContract || !capabilities.getTransactionCount || !capabilities.estimateFeesPerGas;
+  if (!needsRpcBackfill) {
+    return capabilities;
+  }
+  const rpcUrl = resolveRpcUrl(network, options);
+  if (!rpcUrl) {
+    return capabilities;
+  }
+  const rpcClient = getRpcClient(rpcUrl);
+  if (!capabilities.readContract) {
+    capabilities.readContract = (args) => rpcClient.readContract(args);
+  }
+  if (!capabilities.getTransactionCount) {
+    capabilities.getTransactionCount = async (args) => rpcClient.getTransactionCount({ address: args.address });
+  }
+  if (!capabilities.estimateFeesPerGas) {
+    capabilities.estimateFeesPerGas = async () => rpcClient.estimateFeesPerGas();
+  }
+  return capabilities;
 }
 
 // src/exact/client/scheme.ts
@@ -364,11 +425,14 @@ var ExactEvmScheme = class {
    * Creates a new ExactEvmClient instance.
    *
    * @param signer - The EVM signer for client operations.
-   *   Must support `readContract` for EIP-2612 gas sponsoring.
-   *   Use `createWalletClient(...).extend(publicActions)` or `toClientEvmSigner(account, publicClient)`.
+   *   Base flow only requires `address` + `signTypedData`.
+   *   Extension enrichment (EIP-2612 / ERC-20 approval sponsoring) additionally
+   *   requires optional capabilities like `readContract` and tx signing helpers.
+   * @param options - Optional RPC configuration used to backfill extension capabilities.
    */
-  constructor(signer) {
+  constructor(signer, options) {
     this.signer = signer;
+    this.options = options;
     this.scheme = "exact";
   }
   /**
@@ -426,7 +490,15 @@ var ExactEvmScheme = class {
    * @returns Extension data for EIP-2612 gas sponsoring, or undefined if not applicable
    */
   async trySignEip2612Permit(requirements, result, context) {
-    if (!context?.extensions?.[import_extensions2.EIP2612_GAS_SPONSORING.key]) {
+    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;
@@ -435,9 +507,9 @@ var ExactEvmScheme = class {
       return void 0;
     }
     const chainId = getEvmChainId(requirements.network);
-    const tokenAddress = (0, import_viem6.getAddress)(requirements.asset);
+    const tokenAddress = (0, import_viem7.getAddress)(requirements.asset);
     try {
-      const allowance = await this.signer.readContract({
+      const allowance = await capabilities.readContract({
         address: tokenAddress,
         abi: erc20AllowanceAbi,
         functionName: "allowance",
@@ -451,7 +523,11 @@ var ExactEvmScheme = class {
     const permit2Auth = result.payload?.permit2Authorization;
     const deadline = permit2Auth?.deadline ?? Math.floor(Date.now() / 1e3 + requirements.maxTimeoutSeconds).toString();
     const info = await signEip2612Permit(
-      this.signer,
+      {
+        address: this.signer.address,
+        signTypedData: (msg) => this.signer.signTypedData(msg),
+        readContract: capabilities.readContract
+      },
       tokenAddress,
       tokenName,
       tokenVersion,
@@ -460,7 +536,7 @@ var ExactEvmScheme = class {
       requirements.amount
     );
     return {
-      [import_extensions2.EIP2612_GAS_SPONSORING.key]: { info }
+      [EIP2612_GAS_SPONSORING_KEY]: { info }
     };
   }
   /**
@@ -483,16 +559,24 @@ var ExactEvmScheme = class {
    * @returns Extension data for ERC-20 approval gas sponsoring, or undefined if not applicable
    */
   async trySignErc20Approval(requirements, _result, context) {
-    if (!context?.extensions?.[import_extensions2.ERC20_APPROVAL_GAS_SPONSORING.key]) {
+    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 (!this.signer.signTransaction || !this.signer.getTransactionCount) {
+    if (!capabilities.signTransaction || !capabilities.getTransactionCount) {
       return void 0;
     }
     const chainId = getEvmChainId(requirements.network);
-    const tokenAddress = (0, import_viem6.getAddress)(requirements.asset);
+    const tokenAddress = (0, import_viem7.getAddress)(requirements.asset);
     try {
-      const allowance = await this.signer.readContract({
+      const allowance = await capabilities.readContract({
         address: tokenAddress,
         abi: erc20AllowanceAbi,
         functionName: "allowance",
@@ -503,18 +587,33 @@ var ExactEvmScheme = class {
       }
     } catch {
     }
-    const info = await signErc20ApprovalTransaction(this.signer, tokenAddress, chainId);
+    const info = await signErc20ApprovalTransaction(
+      {
+        address: this.signer.address,
+        signTransaction: capabilities.signTransaction,
+        getTransactionCount: capabilities.getTransactionCount,
+        estimateFeesPerGas: capabilities.estimateFeesPerGas
+      },
+      tokenAddress,
+      chainId
+    );
     return {
-      [import_extensions2.ERC20_APPROVAL_GAS_SPONSORING.key]: { info }
+      [ERC20_APPROVAL_GAS_SPONSORING_KEY]: { info }
     };
   }
 };
 
 // src/exact/v1/client/scheme.ts
-var import_viem8 = require("viem");
+var import_viem11 = require("viem");
 
 // src/exact/v1/facilitator/scheme.ts
-var import_viem7 = require("viem");
+var import_viem10 = require("viem");
+
+// src/exact/facilitator/eip3009-utils.ts
+var import_viem9 = require("viem");
+
+// src/multicall.ts
+var import_viem8 = require("viem");
 
 // src/v1/index.ts
 var EVM_NETWORK_CHAIN_ID_MAP = {
@@ -571,7 +670,7 @@ var ExactEvmSchemeV1 = class {
     const now = Math.floor(Date.now() / 1e3);
     const authorization = {
       from: this.signer.address,
-      to: (0, import_viem8.getAddress)(selectedV1.payTo),
+      to: (0, import_viem11.getAddress)(selectedV1.payTo),
       value: selectedV1.maxAmountRequired,
       validAfter: (now - 600).toString(),
       // 10 minutes before
@@ -609,11 +708,11 @@ var ExactEvmSchemeV1 = class {
       name,
       version,
       chainId,
-      verifyingContract: (0, import_viem8.getAddress)(requirements.asset)
+      verifyingContract: (0, import_viem11.getAddress)(requirements.asset)
     };
     const message = {
-      from: (0, import_viem8.getAddress)(authorization.from),
-      to: (0, import_viem8.getAddress)(authorization.to),
+      from: (0, import_viem11.getAddress)(authorization.from),
+      to: (0, import_viem11.getAddress)(authorization.to),
       value: BigInt(authorization.value),
       validAfter: BigInt(authorization.validAfter),
       validBefore: BigInt(authorization.validBefore),
@@ -630,7 +729,7 @@ var ExactEvmSchemeV1 = class {
 
 // src/exact/client/register.ts
 function registerExactEvmScheme(client, config) {
-  const evmScheme = new ExactEvmScheme(config.signer);
+  const evmScheme = new ExactEvmScheme(config.signer, config.schemeOptions);
   if (config.networks && config.networks.length > 0) {
     config.networks.forEach((network) => {
       client.register(network, evmScheme);