@agether/sdk 1.5.5 → 1.6.0

package/dist/cli.js

@@ -862,27 +862,23 @@ var X402Client_exports = {};
 __export(X402Client_exports, {
   X402Client: () => X402Client
 });
-function chainIdFromNetwork(network) {
-  const m = network.match(/^eip155:(\d+)$/);
-  return m ? Number(m[1]) : 1;
-}
-var import_ethers2, USDC_DOMAINS, X402Client;
+var import_fetch, import_client, import_client2, import_accounts, X402Client;
 var init_X402Client = __esm({
   "src/clients/X402Client.ts"() {
     "use strict";
-    import_ethers2 = require("ethers");
-    USDC_DOMAINS = {
-      "eip155:1": { name: "USD Coin", version: "2", address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48" },
-      "eip155:8453": { name: "USD Coin", version: "2", address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913" },
-      "eip155:84532": { name: "USD Coin", version: "2", address: "0x036CbD53842c5426634e7929541eC2318f3dCF7e" },
-      "eip155:42161": { name: "USD Coin", version: "2", address: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831" },
-      "eip155:10": { name: "USD Coin", version: "2", address: "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85" }
-    };
+    import_fetch = require("@x402/fetch");
+    import_client = require("@x402/core/client");
+    import_client2 = require("@x402/evm/exact/client");
+    import_accounts = require("viem/accounts");
     X402Client = class {
       constructor(config) {
         this.config = config;
-        const provider = new import_ethers2.ethers.JsonRpcProvider(config.rpcUrl);
-        this.wallet = new import_ethers2.ethers.Wallet(config.privateKey, provider);
+        const privateKey = config.privateKey.startsWith("0x") ? config.privateKey : `0x${config.privateKey}`;
+        const signer = (0, import_accounts.privateKeyToAccount)(privateKey);
+        this.address = signer.address;
+        const client = new import_client.x402Client();
+        (0, import_client2.registerExactEvmScheme)(client, { signer });
+        this.paidFetch = (0, import_fetch.wrapFetchWithPayment)(fetch, client);
       }
       async get(url, opts) {
         return this.request(url, { ...opts, method: "GET" });
@@ -896,13 +892,13 @@ var init_X402Client = __esm({
         });
       }
       getAddress() {
-        return this.wallet.address;
+        return this.address;
       }
-      // ──────────── Core request / 402-retry loop ────────────
+      // ──────────── Core request — @x402/fetch handles 402 automatically ────────────
       async request(url, options) {
         try {
-          console.log("   [1/4] Calling resource server\u2026");
-          const response = await fetch(url, {
+          console.log(`   [x402] ${options?.method || "GET"} ${url}`);
+          const response = await this.paidFetch(url, {
             ...options,
             headers: {
               ...options?.headers,
@@ -911,45 +907,13 @@ var init_X402Client = __esm({
           });
           if (response.ok) {
             const data = await response.json();
-            return { success: true, data };
-          }
-          if (response.status !== 402) {
-            return { success: false, error: `HTTP ${response.status}: ${await response.text()}` };
-          }
-          console.log("   [2/4] 402 received \u2014 parsing payment requirements\u2026");
-          const parsed = await this.parsePaymentRequired(response);
-          if (!parsed) {
-            return { success: false, error: "Could not parse payment requirements from 402 response" };
-          }
-          const { requirements, resource } = parsed;
-          console.log(`         scheme  : ${requirements.scheme}`);
-          console.log(`         network : ${requirements.network}`);
-          console.log(`         amount  : ${requirements.amount} (atomic)`);
-          console.log(`         asset   : ${requirements.asset}`);
-          console.log(`         payTo   : ${requirements.payTo}`);
-          console.log("   [3/4] Signing EIP-3009 transferWithAuthorization\u2026");
-          const paymentPayload = await this.buildPaymentPayload(requirements, resource, url);
-          const paymentB64 = Buffer.from(JSON.stringify(paymentPayload)).toString("base64");
-          await this.riskCheck(paymentPayload, requirements);
-          console.log("   [4/4] Retrying with PAYMENT-SIGNATURE header\u2026");
-          const paidResponse = await fetch(url, {
-            ...options,
-            headers: {
-              ...options?.headers,
-              "X-Agent-Id": this.config.agentId || "",
-              // v2 header
-              "PAYMENT-SIGNATURE": paymentB64,
-              // v1 compat header (some servers still use this)
-              "X-PAYMENT": paymentB64
-            }
-          });
-          if (paidResponse.ok) {
-            const data = await paidResponse.json();
-            const settlementHeader = paidResponse.headers.get("PAYMENT-RESPONSE") || paidResponse.headers.get("X-PAYMENT-RESPONSE");
+            const paymentResponse = response.headers.get("PAYMENT-RESPONSE");
             let txHash;
-            if (settlementHeader) {
+            if (paymentResponse) {
               try {
-                const settlement = JSON.parse(Buffer.from(settlementHeader, "base64").toString("utf-8"));
+                const settlement = JSON.parse(
+                  Buffer.from(paymentResponse, "base64").toString("utf-8")
+                );
                 txHash = settlement.transaction;
               } catch {
               }
@@ -957,164 +921,26 @@ var init_X402Client = __esm({
             return {
               success: true,
               data,
-              paymentInfo: {
-                amount: requirements.amount,
-                asset: requirements.extra?.name || "USDC",
-                network: requirements.network,
-                txHash
-              }
+              ...txHash ? {
+                paymentInfo: {
+                  amount: "",
+                  asset: "USDC",
+                  network: "eip155:8453",
+                  txHash
+                }
+              } : {}
             };
           }
-          const errBody = await paidResponse.text();
-          return { success: false, error: `Payment rejected (HTTP ${paidResponse.status}): ${errBody}` };
+          const errBody = await response.text();
+          return {
+            success: false,
+            error: `HTTP ${response.status}: ${errBody}`
+          };
         } catch (error) {
-          return { success: false, error: `Request failed: ${error instanceof Error ? error.message : String(error)}` };
-        }
-      }
-      // ──────────── Parse 402 response ────────────
-      async parsePaymentRequired(response) {
-        const prHeader = response.headers.get("PAYMENT-REQUIRED") || response.headers.get("x-payment-required");
-        if (prHeader) {
-          try {
-            const decoded = JSON.parse(Buffer.from(prHeader, "base64").toString("utf-8"));
-            if (decoded.accepts?.length) {
-              return { requirements: decoded.accepts[0], resource: decoded.resource };
-            }
-          } catch {
-          }
-        }
-        try {
-          const body = await response.json();
-          if (body.accepts && Array.isArray(body.accepts) && body.accepts.length > 0) {
-            return { requirements: body.accepts[0], resource: body.resource };
-          }
-          if (body.paymentRequirements) {
-            const pr = Array.isArray(body.paymentRequirements) ? body.paymentRequirements[0] : body.paymentRequirements;
-            return { requirements: pr, resource: body.resource };
-          }
-          if (body.scheme && body.network) {
-            return { requirements: body, resource: body.resource };
-          }
-        } catch {
-        }
-        const wwwAuth = response.headers.get("WWW-Authenticate");
-        if (wwwAuth) {
-          const m = wwwAuth.match(/x402[^"]*"([^"]+)"/);
-          if (m) {
-            try {
-              const decoded = JSON.parse(Buffer.from(m[1], "base64").toString("utf-8"));
-              const reqs = Array.isArray(decoded) ? decoded[0] : decoded;
-              return { requirements: reqs };
-            } catch {
-            }
-          }
-        }
-        return null;
-      }
-      // ──────────── Build x402 v2 PaymentPayload with EIP-3009 ────────────
-      //
-      // If an AgentAccount is configured, we use it as the `from` address
-      // (smart wallet pays directly). The AgentAccount implements EIP-1271
-      // so USDC's transferWithAuthorization will call isValidSignature()
-      // to verify the owner's ECDSA signature. The facilitator detects
-      // the >65-byte or smart-wallet case and uses the bytes overload.
-      async buildPaymentPayload(reqs, resource, url) {
-        const now = Math.floor(Date.now() / 1e3);
-        const validAfter = String(now - 60);
-        const validBefore = String(now + (reqs.maxTimeoutSeconds || 300));
-        const nonce = import_ethers2.ethers.hexlify(import_ethers2.ethers.randomBytes(32));
-        const chainId = chainIdFromNetwork(reqs.network);
-        const usdcDomain = USDC_DOMAINS[reqs.network] || USDC_DOMAINS["eip155:1"];
-        const payerAddress = this.config.accountAddress || this.wallet.address;
-        const isSmartWallet = !!this.config.accountAddress;
-        const domain = {
-          name: usdcDomain.name,
-          version: usdcDomain.version,
-          chainId,
-          verifyingContract: reqs.asset || usdcDomain.address
-        };
-        const types = {
-          TransferWithAuthorization: [
-            { name: "from", type: "address" },
-            { name: "to", type: "address" },
-            { name: "value", type: "uint256" },
-            { name: "validAfter", type: "uint256" },
-            { name: "validBefore", type: "uint256" },
-            { name: "nonce", type: "bytes32" }
-          ]
-        };
-        const value = {
-          from: payerAddress,
-          // AgentAccount or EOA
-          to: reqs.payTo,
-          value: reqs.amount,
-          validAfter,
-          validBefore,
-          nonce
-        };
-        let signature = await this.wallet.signTypedData(domain, types, value);
-        if (isSmartWallet) {
-          signature = signature + "00";
-        }
-        if (isSmartWallet) {
-          console.log(`         \u2713 Signed for AgentAccount ${payerAddress.slice(0, 10)}\u2026 (EIP-1271, chain=${chainId})`);
-        } else {
-          console.log(`         \u2713 Signed (from=${payerAddress.slice(0, 10)}\u2026, chain=${chainId})`);
-        }
-        return {
-          x402Version: 2,
-          resource: resource || { url, description: "", mimeType: "application/json" },
-          accepted: {
-            scheme: reqs.scheme,
-            network: reqs.network,
-            amount: reqs.amount,
-            asset: reqs.asset,
-            payTo: reqs.payTo,
-            maxTimeoutSeconds: reqs.maxTimeoutSeconds,
-            extra: reqs.extra || {}
-          },
-          payload: {
-            signature,
-            authorization: {
-              from: payerAddress,
-              // AgentAccount address — facilitator checks balance here
-              to: reqs.payTo,
-              value: reqs.amount,
-              validAfter,
-              validBefore,
-              nonce
-            }
-          }
-        };
-      }
-      // ──────────── Risk check via our backend ────────────
-      async riskCheck(paymentPayload, reqs) {
-        try {
-          const verifyUrl = `${this.config.backendUrl}/x402/verify`;
-          const resp = await fetch(verifyUrl, {
-            method: "POST",
-            headers: {
-              "Content-Type": "application/json",
-              "X-Agent-Id": this.config.agentId || "",
-              ...this.config.accountAddress ? { "X-Agent-Account": this.config.accountAddress } : {}
-            },
-            body: JSON.stringify({
-              x402Version: 2,
-              paymentPayload,
-              paymentRequirements: reqs
-            }),
-            signal: AbortSignal.timeout(5e3)
-          });
-          if (resp.ok) {
-            const result = await resp.json();
-            const decision = resp.headers.get("X-Risk-Decision") || (result.isValid ? "allow" : "unknown");
-            const score = resp.headers.get("X-Risk-Score") || "?";
-            console.log(`         \u2713 Risk check: ${decision} (score=${score})`);
-          } else {
-            console.log(`         \u26A0 Risk check failed (HTTP ${resp.status}) \u2014 continuing anyway`);
-          }
-        } catch {
-          console.log("         \u26A0 Risk check unavailable \u2014 continuing");
+          return {
+            success: false,
+            error: `Request failed: ${error instanceof Error ? error.message : String(error)}`
+          };
         }
       }
     };
@@ -1122,7 +948,7 @@ var init_X402Client = __esm({
 });
 
 // src/cli.ts
-var import_ethers3 = require("ethers");
+var import_ethers2 = require("ethers");
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var os = __toESM(require("os"));
@@ -1228,7 +1054,7 @@ async function cmdInit(privateKey, agentId) {
   const backendUrl = process.env.AGETHER_BACKEND_URL || DEFAULT_BACKEND;
   let wallet;
   try {
-    wallet = new import_ethers3.ethers.Wallet(privateKey);
+    wallet = new import_ethers2.ethers.Wallet(privateKey);
   } catch {
     console.error("\u274C Invalid private key");
     process.exit(1);
@@ -1243,8 +1069,8 @@ async function cmdInit(privateKey, agentId) {
 }
 async function cmdRegister(name) {
   const config = requireConfig();
-  const provider = new import_ethers3.ethers.JsonRpcProvider(config.rpcUrl);
-  const signer = new import_ethers3.ethers.Wallet(config.privateKey, provider);
+  const provider = new import_ethers2.ethers.JsonRpcProvider(config.rpcUrl);
+  const signer = new import_ethers2.ethers.Wallet(config.privateKey, provider);
   const agentName = name || `Agent-${signer.address.slice(0, 8)}`;
   console.log(`\u{1F916} Registering agent: ${agentName}
 `);
@@ -1267,7 +1093,7 @@ async function cmdRegister(name) {
     process.exit(1);
   }
   console.log("  [2/4] Registering on ERC-8004 IdentityRegistry...");
-  const agentRegistry = new import_ethers3.ethers.Contract(registryAddr, ERC8004_ABI, signer);
+  const agentRegistry = new import_ethers2.ethers.Contract(registryAddr, ERC8004_ABI, signer);
   let agentId;
   if (config.agentId && config.agentId !== "0") {
     agentId = BigInt(config.agentId);
@@ -1298,7 +1124,7 @@ async function cmdRegister(name) {
       const agentURI = `data:application/json;base64,${Buffer.from(registrationFile).toString("base64")}`;
       const tx = await agentRegistry["register(string)"](agentURI);
       const receipt = await waitForTx(tx);
-      const transferTopic = import_ethers3.ethers.id("Transfer(address,address,uint256)");
+      const transferTopic = import_ethers2.ethers.id("Transfer(address,address,uint256)");
       const transferLog = receipt.logs.find((log) => log.topics[0] === transferTopic);
       if (transferLog && transferLog.topics.length >= 4) {
         agentId = BigInt(transferLog.topics[3]);
@@ -1331,11 +1157,11 @@ async function cmdRegister(name) {
   if (chainId === 31337 || chainId === 1) {
     console.log("  [3/4] Minting test USDC (Hardhat fork)...");
     const deployerPk = "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80";
-    const deployer = new import_ethers3.ethers.Wallet(deployerPk, provider);
+    const deployer = new import_ethers2.ethers.Wallet(deployerPk, provider);
     const usdcAddr = contracts.usdc;
     if (usdcAddr) {
       try {
-        const usdc = new import_ethers3.ethers.Contract(usdcAddr, MOCK_ERC20_ABI, deployer);
+        const usdc = new import_ethers2.ethers.Contract(usdcAddr, MOCK_ERC20_ABI, deployer);
         const tx = await usdc.mint(signer.address, BigInt(5e10));
         await waitForTx(tx);
         console.log("        \u2713 Minted $50,000 USDC");
@@ -1348,7 +1174,7 @@ async function cmdRegister(name) {
   }
   console.log("  [4/4] Creating AgentAccount...");
   if (factoryAddr) {
-    const factory = new import_ethers3.ethers.Contract(factoryAddr, ACCOUNT_FACTORY_ABI2, signer);
+    const factory = new import_ethers2.ethers.Contract(factoryAddr, ACCOUNT_FACTORY_ABI2, signer);
     try {
       const exists = await factory.accountExists(agentId);
       if (exists) {
@@ -1366,7 +1192,7 @@ async function cmdRegister(name) {
     }
   }
   if (validationAddr) {
-    const vr = new import_ethers3.ethers.Contract(validationAddr, VALIDATION_REGISTRY_ABI, provider);
+    const vr = new import_ethers2.ethers.Contract(validationAddr, VALIDATION_REGISTRY_ABI, provider);
     try {
       const approved = await vr.isAgentCodeApproved(agentId);
       console.log(`
@@ -1587,7 +1413,7 @@ async function cmdX402Call(url, method = "GET", body) {
   const config = requireConfig();
   console.log("\n\u{1F510} x402 Paid API Call\n");
   const x402 = await getX402Client(config);
-  console.log(`   Wallet: ${new import_ethers3.ethers.Wallet(config.privateKey).address}`);
+  console.log(`   Wallet: ${new import_ethers2.ethers.Wallet(config.privateKey).address}`);
   console.log(`
 \u{1F4E1} ${method} ${url}`);
   if (body) console.log(`\u{1F4E6} Body: ${body}`);

package/dist/index.d.mts

@@ -399,22 +399,17 @@ declare class MorphoClient {
 /**
  * x402 HTTP Client — Make paid API calls via the x402 protocol (v2)
  *
- * Implements the Coinbase x402 spec:
- *   https://github.com/coinbase/x402
+ * Built on top of the official @x402/fetch + @x402/evm SDK.
+ * https://docs.x402.org/getting-started/quickstart-for-buyers
  *
  * Flow:
  *   1. Client → Resource Server (normal request)
- *   2. Resource Server → 402 with PaymentRequired JSON body
- *      Body: { x402Version, error, resource, accepts: [PaymentRequirements…] }
- *   3. Client picks a PaymentRequirements from `accepts`,
- *      signs an EIP-3009 transferWithAuthorization (EIP-712 typed data),
- *      builds a PaymentPayload, base64-encodes it as PAYMENT-SIGNATURE header
- *   4. Client → Resource Server (retries with PAYMENT-SIGNATURE)
- *   5. Resource Server forwards to Facilitator /verify → /settle
- *   6. Resource Server → 200 + data  (or error)
+ *   2. Resource Server → 402 with PAYMENT-REQUIRED header (base64 JSON)
+ *   3. @x402/fetch auto-picks PaymentRequirements, signs EIP-3009 via EVM scheme
+ *   4. Client → Resource Server (retries with PAYMENT-SIGNATURE header)
+ *   5. Resource Server → verifies via facilitator → settles → 200 + data
  *
- * Chain support: Base (8453), Ethereum (1), and Hardhat fork (31337).
- * USDC domain is resolved per-chain from USDC_DOMAINS map.
+ * Chain support: Base (8453), Base Sepolia (84532), Ethereum (1).
  */
 interface X402Config {
     privateKey: string;
@@ -445,16 +440,14 @@ interface PaymentRequirements {
     extra?: Record<string, unknown>;
 }
 declare class X402Client {
-    private wallet;
     private config;
+    private paidFetch;
+    private address;
     constructor(config: X402Config);
     get<T = unknown>(url: string, opts?: RequestInit): Promise<X402Response<T>>;
     post<T = unknown>(url: string, body?: unknown, opts?: RequestInit): Promise<X402Response<T>>;
     getAddress(): string;
     private request;
-    private parsePaymentRequired;
-    private buildPaymentPayload;
-    private riskCheck;
 }
 
 /**

package/dist/index.d.ts

@@ -399,22 +399,17 @@ declare class MorphoClient {
 /**
  * x402 HTTP Client — Make paid API calls via the x402 protocol (v2)
  *
- * Implements the Coinbase x402 spec:
- *   https://github.com/coinbase/x402
+ * Built on top of the official @x402/fetch + @x402/evm SDK.
+ * https://docs.x402.org/getting-started/quickstart-for-buyers
  *
  * Flow:
  *   1. Client → Resource Server (normal request)
- *   2. Resource Server → 402 with PaymentRequired JSON body
- *      Body: { x402Version, error, resource, accepts: [PaymentRequirements…] }
- *   3. Client picks a PaymentRequirements from `accepts`,
- *      signs an EIP-3009 transferWithAuthorization (EIP-712 typed data),
- *      builds a PaymentPayload, base64-encodes it as PAYMENT-SIGNATURE header
- *   4. Client → Resource Server (retries with PAYMENT-SIGNATURE)
- *   5. Resource Server forwards to Facilitator /verify → /settle
- *   6. Resource Server → 200 + data  (or error)
+ *   2. Resource Server → 402 with PAYMENT-REQUIRED header (base64 JSON)
+ *   3. @x402/fetch auto-picks PaymentRequirements, signs EIP-3009 via EVM scheme
+ *   4. Client → Resource Server (retries with PAYMENT-SIGNATURE header)
+ *   5. Resource Server → verifies via facilitator → settles → 200 + data
  *
- * Chain support: Base (8453), Ethereum (1), and Hardhat fork (31337).
- * USDC domain is resolved per-chain from USDC_DOMAINS map.
+ * Chain support: Base (8453), Base Sepolia (84532), Ethereum (1).
  */
 interface X402Config {
     privateKey: string;
@@ -445,16 +440,14 @@ interface PaymentRequirements {
     extra?: Record<string, unknown>;
 }
 declare class X402Client {
-    private wallet;
     private config;
+    private paidFetch;
+    private address;
     constructor(config: X402Config);
     get<T = unknown>(url: string, opts?: RequestInit): Promise<X402Response<T>>;
     post<T = unknown>(url: string, body?: unknown, opts?: RequestInit): Promise<X402Response<T>>;
     getAddress(): string;
     private request;
-    private parsePaymentRequired;
-    private buildPaymentPayload;
-    private riskCheck;
 }
 
 /**