@agether/sdk 1.5.4 → 1.6.0

package/dist/index.js

@@ -553,26 +553,48 @@ var MorphoClient = class {
       tx: txHash
     };
   }
-  /** Get ETH / USDC balances for EOA and AgentAccount. */
+  /** Get ETH / USDC / collateral balances for EOA and AgentAccount. */
   async getBalances() {
     const eoaAddr = this.wallet.address;
     const usdc = new import_ethers2.Contract(this.config.contracts.usdc, ERC20_ABI, this.provider);
     const ethBal = await this.provider.getBalance(eoaAddr);
     const usdcBal = await usdc.balanceOf(eoaAddr);
+    const eoaCollateral = {};
+    for (const [symbol, info] of Object.entries(BASE_COLLATERALS)) {
+      try {
+        const token = new import_ethers2.Contract(info.address, ERC20_ABI, this.provider);
+        const bal = await token.balanceOf(eoaAddr);
+        eoaCollateral[symbol] = import_ethers2.ethers.formatUnits(bal, info.decimals);
+      } catch {
+        eoaCollateral[symbol] = "0";
+      }
+    }
     const result = {
       agentId: this.agentId || "?",
       address: eoaAddr,
       eth: import_ethers2.ethers.formatEther(ethBal),
-      usdc: import_ethers2.ethers.formatUnits(usdcBal, 6)
+      usdc: import_ethers2.ethers.formatUnits(usdcBal, 6),
+      collateral: eoaCollateral
     };
     try {
       const acctAddr = await this.getAccountAddress();
       const acctEth = await this.provider.getBalance(acctAddr);
       const acctUsdc = await usdc.balanceOf(acctAddr);
+      const acctCollateral = {};
+      for (const [symbol, info] of Object.entries(BASE_COLLATERALS)) {
+        try {
+          const token = new import_ethers2.Contract(info.address, ERC20_ABI, this.provider);
+          const bal = await token.balanceOf(acctAddr);
+          acctCollateral[symbol] = import_ethers2.ethers.formatUnits(bal, info.decimals);
+        } catch {
+          acctCollateral[symbol] = "0";
+        }
+      }
       result.agentAccount = {
         address: acctAddr,
         eth: import_ethers2.ethers.formatEther(acctEth),
-        usdc: import_ethers2.ethers.formatUnits(acctUsdc, 6)
+        usdc: import_ethers2.ethers.formatUnits(acctUsdc, 6),
+        collateral: acctCollateral
       };
     } catch {
     }
@@ -1072,23 +1094,19 @@ var MorphoClient = class {
 var import_axios2 = __toESM(require("axios"));
 
 // src/clients/X402Client.ts
-var import_ethers3 = require("ethers");
-var 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" }
-};
-function chainIdFromNetwork(network) {
-  const m = network.match(/^eip155:(\d+)$/);
-  return m ? Number(m[1]) : 1;
-}
+var import_fetch = require("@x402/fetch");
+var import_client = require("@x402/core/client");
+var import_client2 = require("@x402/evm/exact/client");
+var import_accounts = require("viem/accounts");
 var X402Client = class {
   constructor(config) {
     this.config = config;
-    const provider = new import_ethers3.ethers.JsonRpcProvider(config.rpcUrl);
-    this.wallet = new import_ethers3.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" });
@@ -1102,13 +1120,13 @@ var X402Client = class {
     });
   }
   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,
@@ -1117,45 +1135,13 @@ var X402Client = class {
       });
       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 {
           }
@@ -1163,164 +1149,26 @@ var X402Client = class {
         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_ethers3.ethers.hexlify(import_ethers3.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)}`
+      };
     }
   }
 };
@@ -1416,7 +1264,7 @@ var ScoringClient = class {
 };
 
 // src/clients/AgentIdentityClient.ts
-var import_ethers4 = require("ethers");
+var import_ethers3 = require("ethers");
 var ERC8004_IDENTITY_ABI = [
   // Registration
   "function register() returns (uint256)",
@@ -1458,8 +1306,8 @@ var AgentIdentityClient = class {
     this.signer = options.signer;
     const identityAddr = options.config.contracts?.identityRegistry || ERC8004_SEPOLIA.identityRegistry;
     const reputationAddr = options.config.contracts?.reputationRegistry || ERC8004_SEPOLIA.reputationRegistry;
-    this.identityRegistry = new import_ethers4.ethers.Contract(identityAddr, ERC8004_IDENTITY_ABI, this.signer);
-    this.reputationRegistry = new import_ethers4.ethers.Contract(reputationAddr, ERC8004_REPUTATION_ABI, this.signer);
+    this.identityRegistry = new import_ethers3.ethers.Contract(identityAddr, ERC8004_IDENTITY_ABI, this.signer);
+    this.reputationRegistry = new import_ethers3.ethers.Contract(reputationAddr, ERC8004_REPUTATION_ABI, this.signer);
   }
   // ============ Identity Functions ============
   /**
@@ -1526,7 +1374,7 @@ var AgentIdentityClient = class {
   async registerWithMetadata(agentURI, metadata) {
     const metadataEntries = metadata.map((m) => ({
       key: m.key,
-      value: import_ethers4.ethers.toUtf8Bytes(m.value)
+      value: import_ethers3.ethers.toUtf8Bytes(m.value)
     }));
     const tx = await this.identityRegistry["register(string,tuple(string,bytes)[])"](
       agentURI,
@@ -1563,7 +1411,7 @@ var AgentIdentityClient = class {
     const tx = await this.identityRegistry.setMetadata(
       agentId,
       key,
-      import_ethers4.ethers.toUtf8Bytes(value)
+      import_ethers3.ethers.toUtf8Bytes(value)
     );
     const receipt = await tx.wait();
     return receipt.hash;
@@ -1573,7 +1421,7 @@ var AgentIdentityClient = class {
    */
   async getMetadata(agentId, key) {
     const value = await this.identityRegistry.getMetadata(agentId, key);
-    return import_ethers4.ethers.toUtf8String(value);
+    return import_ethers3.ethers.toUtf8String(value);
   }
   /**
    * Transfer agent to new owner
@@ -1607,8 +1455,8 @@ var AgentIdentityClient = class {
    * Give feedback to an agent
    */
   async giveFeedback(input) {
-    const feedbackHash = import_ethers4.ethers.keccak256(
-      import_ethers4.ethers.AbiCoder.defaultAbiCoder().encode(
+    const feedbackHash = import_ethers3.ethers.keccak256(
+      import_ethers3.ethers.AbiCoder.defaultAbiCoder().encode(
         ["uint256", "int128", "uint256"],
         [input.agentId, input.value, Date.now()]
       )