@elizaos/plugin-x402 2.0.0-alpha.1 → 2.0.0-alpha.6

package/{typescript/dist → dist}/index.js

@@ -36,9 +36,30 @@ var checkPaymentHistoryAction = {
       schema: { type: "number" }
     }
   ],
-  validate: async (runtime) => {
-    const service = runtime.getService("x402_payment");
-    return !!service && service.isActive();
+  validate: async (runtime, message, state, options) => {
+    const __avTextRaw = typeof message?.content?.text === "string" ? message.content.text : "";
+    const __avText = __avTextRaw.toLowerCase();
+    const __avKeywords = ["check", "payment", "history"];
+    const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
+    const __avRegex = new RegExp("\\b(?:check|payment|history)\\b", "i");
+    const __avRegexOk = __avRegex.test(__avText);
+    const __avSource = String(message?.content?.source ?? message?.source ?? "");
+    const __avExpectedSource = "";
+    const __avSourceOk = __avExpectedSource ? __avSource === __avExpectedSource : Boolean(__avSource || state || runtime?.agentId || runtime?.getService);
+    const __avOptions = options && typeof options === "object" ? options : {};
+    const __avInputOk = __avText.trim().length > 0 || Object.keys(__avOptions).length > 0 || Boolean(message?.content && typeof message.content === "object");
+    if (!(__avKeywordOk && __avRegexOk && __avSourceOk && __avInputOk)) {
+      return false;
+    }
+    const __avLegacyValidate = async (runtime2) => {
+      const service = runtime2.getService("x402_payment");
+      return !!service && service.isActive();
+    };
+    try {
+      return Boolean(await __avLegacyValidate(runtime, message, state, options));
+    } catch {
+      return false;
+    }
   },
   handler: async (runtime, _message, _state, options, callback) => {
     const service = runtime.getService("x402_payment");
@@ -189,9 +210,30 @@ var setPaymentPolicyAction = {
       schema: { type: "string" }
     }
   ],
-  validate: async (runtime) => {
-    const service = runtime.getService("x402_payment");
-    return !!service && service.isActive();
+  validate: async (runtime, message, state, options) => {
+    const __avTextRaw = typeof message?.content?.text === "string" ? message.content.text : "";
+    const __avText = __avTextRaw.toLowerCase();
+    const __avKeywords = ["set", "payment", "policy"];
+    const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
+    const __avRegex = new RegExp("\\b(?:set|payment|policy)\\b", "i");
+    const __avRegexOk = __avRegex.test(__avText);
+    const __avSource = String(message?.content?.source ?? message?.source ?? "");
+    const __avExpectedSource = "";
+    const __avSourceOk = __avExpectedSource ? __avSource === __avExpectedSource : Boolean(__avSource || state || runtime?.agentId || runtime?.getService);
+    const __avOptions = options && typeof options === "object" ? options : {};
+    const __avInputOk = __avText.trim().length > 0 || Object.keys(__avOptions).length > 0 || Boolean(message?.content && typeof message.content === "object");
+    if (!(__avKeywordOk && __avRegexOk && __avSourceOk && __avInputOk)) {
+      return false;
+    }
+    const __avLegacyValidate = async (runtime2) => {
+      const service = runtime2.getService("x402_payment");
+      return !!service && service.isActive();
+    };
+    try {
+      return Boolean(await __avLegacyValidate(runtime, message, state, options));
+    } catch {
+      return false;
+    }
   },
   handler: async (runtime, _message, _state, options, callback) => {
     const service = runtime.getService("x402_payment");
@@ -390,9 +432,30 @@ var payForServiceAction = {
       schema: { type: "string" }
     }
   ],
-  validate: async (runtime) => {
-    const service = runtime.getService("x402_payment");
-    return !!service && service.canMakePayments();
+  validate: async (runtime, message, state, options) => {
+    const __avTextRaw = typeof message?.content?.text === "string" ? message.content.text : "";
+    const __avText = __avTextRaw.toLowerCase();
+    const __avKeywords = ["pay", "for", "service"];
+    const __avKeywordOk = __avKeywords.length > 0 && __avKeywords.some((kw) => kw.length > 0 && __avText.includes(kw));
+    const __avRegex = new RegExp("\\b(?:pay|for|service)\\b", "i");
+    const __avRegexOk = __avRegex.test(__avText);
+    const __avSource = String(message?.content?.source ?? message?.source ?? "");
+    const __avExpectedSource = "";
+    const __avSourceOk = __avExpectedSource ? __avSource === __avExpectedSource : Boolean(__avSource || state || runtime?.agentId || runtime?.getService);
+    const __avOptions = options && typeof options === "object" ? options : {};
+    const __avInputOk = __avText.trim().length > 0 || Object.keys(__avOptions).length > 0 || Boolean(message?.content && typeof message.content === "object");
+    if (!(__avKeywordOk && __avRegexOk && __avSourceOk && __avInputOk)) {
+      return false;
+    }
+    const __avLegacyValidate = async (runtime2) => {
+      const service = runtime2.getService("x402_payment");
+      return !!service && service.canMakePayments();
+    };
+    try {
+      return Boolean(await __avLegacyValidate(runtime, message, state, options));
+    } catch {
+      return false;
+    }
   },
   handler: async (runtime, message, _state, options, callback) => {
     const service = runtime.getService("x402_payment");
@@ -537,6 +600,7 @@ function extractUrlFromMessage(message) {
 var paymentBalanceProvider = {
   name: "x402_payment_status",
   description: "Current x402 payment status including wallet, spending, and earning summary",
+  dynamic: true,
   get: async (runtime, _message, _state) => {
     const service = runtime.getService("x402_payment");
     if (!service || !service.isActive()) {
@@ -577,6 +641,9 @@ Payments: Inactive (no wallet configured)`,
   }
 };
 
+// routes/agent-card.ts
+import { logger as logger4 } from "@elizaos/core";
+
 // networks.ts
 var NETWORK_REGISTRY = {
   base: {
@@ -585,7 +652,8 @@ var NETWORK_REGISTRY = {
     name: "Base",
     usdcAddress: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
     usdcDomainName: "USDC",
-    usdcPermitVersion: "2"
+    usdcPermitVersion: "2",
+    rpcUrl: "https://mainnet.base.org"
   },
   "base-sepolia": {
     caip2: "eip155:84532",
@@ -593,7 +661,8 @@ var NETWORK_REGISTRY = {
     name: "Base Sepolia",
     usdcAddress: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
     usdcDomainName: "USDC",
-    usdcPermitVersion: "2"
+    usdcPermitVersion: "2",
+    rpcUrl: "https://sepolia.base.org"
   },
   ethereum: {
     caip2: "eip155:1",
@@ -601,7 +670,8 @@ var NETWORK_REGISTRY = {
     name: "Ethereum",
     usdcAddress: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
     usdcDomainName: "USD Coin",
-    usdcPermitVersion: "2"
+    usdcPermitVersion: "2",
+    rpcUrl: "https://cloudflare-eth.com"
   },
   sepolia: {
     caip2: "eip155:11155111",
@@ -609,7 +679,8 @@ var NETWORK_REGISTRY = {
     name: "Sepolia",
     usdcAddress: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
     usdcDomainName: "USDC",
-    usdcPermitVersion: "2"
+    usdcPermitVersion: "2",
+    rpcUrl: "https://rpc.sepolia.org"
   }
 };
 function resolveNetwork(key) {
@@ -643,8 +714,10 @@ async function handleAgentCard(req, res, runtime) {
   try {
     const networkInfo = resolveNetwork(networkKey);
     caip2Network = networkInfo.caip2;
-  } catch {
+  } catch (err) {
     caip2Network = networkKey;
+    const msg = err instanceof Error ? err.message : String(err);
+    logger4.warn("[x402] Agent card: could not resolve network '" + networkKey + "': " + msg);
   }
   const character = runtime.character;
   const agentName = character?.name ?? "ElizaOS Agent";
@@ -706,9 +779,10 @@ var agentCardRoute = {
 
 // services/x402-service.ts
 import { Service } from "@elizaos/core";
-import { logger as logger4 } from "@elizaos/core";
+import { logger as logger5 } from "@elizaos/core";
 
 // client/signer.ts
+import { createPublicClient, http } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 var PERMIT_TYPES = {
   Permit: [
@@ -761,12 +835,35 @@ class EvmPaymentSigner {
     const v = parseInt(raw.slice(128, 130), 16);
     return { v, r, s };
   }
+  async queryOnChainNonce(usdcAddress, rpcUrl, chainId) {
+    const client = createPublicClient({
+      transport: http(rpcUrl)
+    });
+    const result = await client.readContract({
+      address: usdcAddress,
+      abi: [{
+        inputs: [{ name: "owner", type: "address" }],
+        name: "nonces",
+        outputs: [{ name: "", type: "uint256" }],
+        stateMutability: "view",
+        type: "function"
+      }],
+      functionName: "nonces",
+      args: [this.account.address]
+    });
+    return result;
+  }
   async buildPaymentHeader(requirement) {
     const networkInfo = resolveNetwork(this.network);
     const amount = BigInt(requirement.maxAmountRequired);
     const tokenName = requirement.extra?.name ?? networkInfo.usdcDomainName;
     const tokenVersion = requirement.extra?.version ?? networkInfo.usdcPermitVersion;
-    const nonce = BigInt(requirement.extra?.nonce ?? "0");
+    let nonce;
+    if (requirement.extra?.nonce !== undefined) {
+      nonce = BigInt(requirement.extra.nonce);
+    } else {
+      nonce = await this.queryOnChainNonce(requirement.asset, networkInfo.rpcUrl, networkInfo.chainId);
+    }
     const deadline = BigInt(Math.floor(Date.now() / 1000) + requirement.maxTimeoutSeconds);
     const spender = requirement.payTo;
     const domain = {
@@ -840,43 +937,43 @@ function selectPaymentOption(accepts, signerNetworkId) {
   return matching ?? null;
 }
 function createFetchWithPayment(options) {
-  const { signer, policyEngine, circuitBreaker, storage, logger: logger4 } = options;
+  const { signer, policyEngine, circuitBreaker, storage, logger: logger5 } = options;
   return async function fetchWithPayment(input, init) {
     const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
-    logger4.debug(`[x402] Making request to ${url}`);
+    logger5.debug(`[x402] Making request to ${url}`);
     const initialResponse = await fetch(input, init);
     if (initialResponse.status !== 402) {
       return initialResponse;
     }
-    logger4.info(`[x402] Received 402 Payment Required from ${url}`);
+    logger5.info(`[x402] Received 402 Payment Required from ${url}`);
     const paymentRequired = parsePaymentRequired(initialResponse);
     if (!paymentRequired) {
-      logger4.error("[x402] Could not parse payment requirement header from 402 response");
+      logger5.error("[x402] Could not parse payment requirement header from 402 response");
       return initialResponse;
     }
     if (!paymentRequired.accepts || paymentRequired.accepts.length === 0) {
-      logger4.error("[x402] No payment options in 402 response");
+      logger5.error("[x402] No payment options in 402 response");
       return initialResponse;
     }
     const requirement = selectPaymentOption(paymentRequired.accepts, signer.networkId);
     if (!requirement) {
-      logger4.error("[x402] No compatible payment option found");
+      logger5.error("[x402] No compatible payment option found");
       return initialResponse;
     }
     const amount = BigInt(requirement.maxAmountRequired);
-    logger4.info(`[x402] Payment required: ${amount} to ${requirement.payTo} on ${requirement.network}`);
+    logger5.info(`[x402] Payment required: ${amount} to ${requirement.payTo} on ${requirement.network}`);
     const policyResult = await policyEngine.evaluateOutgoing({
       amount,
       recipient: requirement.payTo,
       resource: url
     });
     if (!policyResult.allowed) {
-      logger4.warn(`[x402] Payment blocked by policy: ${policyResult.reason}`);
+      logger5.warn(`[x402] Payment blocked by policy: ${policyResult.reason}`);
       return initialResponse;
     }
     const breakerResult = circuitBreaker.check(amount);
     if (!breakerResult.allowed) {
-      logger4.warn(`[x402] Payment blocked by circuit breaker: ${breakerResult.reason}`);
+      logger5.warn(`[x402] Payment blocked by circuit breaker: ${breakerResult.reason}`);
       return initialResponse;
     }
     let paymentHeader;
@@ -884,11 +981,11 @@ function createFetchWithPayment(options) {
       paymentHeader = await signer.buildPaymentHeader(requirement);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
-      logger4.error(`[x402] Failed to sign payment: ${message}`);
+      logger5.error(`[x402] Failed to sign payment: ${message}`);
       circuitBreaker.recordFailure();
       return initialResponse;
     }
-    logger4.info("[x402] Retrying request with X-PAYMENT header");
+    logger5.info("[x402] Retrying request with X-PAYMENT header");
     const retryHeaders = new Headers(init?.headers);
     retryHeaders.set("X-PAYMENT", paymentHeader);
     const retryInit = {
@@ -900,7 +997,7 @@ function createFetchWithPayment(options) {
       retryResponse = await fetch(input, retryInit);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
-      logger4.error(`[x402] Retry request failed: ${message}`);
+      logger5.error(`[x402] Retry request failed: ${message}`);
       circuitBreaker.recordFailure();
       return initialResponse;
     }
@@ -924,14 +1021,14 @@ function createFetchWithPayment(options) {
       await storage.recordPayment(record);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
-      logger4.error(`[x402] Failed to record payment: ${message}`);
+      logger5.error(`[x402] Failed to record payment: ${message}`);
     }
     if (retryResponse.ok) {
       circuitBreaker.recordSuccess(amount);
-      logger4.info(`[x402] Payment successful: ${amount} to ${requirement.payTo}`);
+      logger5.info(`[x402] Payment successful: ${amount} to ${requirement.payTo}`);
     } else {
       circuitBreaker.recordFailure();
-      logger4.warn(`[x402] Payment request returned ${retryResponse.status} after payment`);
+      logger5.warn(`[x402] Payment request returned ${retryResponse.status} after payment`);
     }
     return retryResponse;
   };
@@ -1284,7 +1381,7 @@ class SqlitePaymentStorage {
     let metadata = {};
     try {
       metadata = JSON.parse(row.metadata);
-    } catch {}
+    } catch (_metadataParseError) {}
     return {
       id: row.id,
       direction: row.direction,
@@ -1358,23 +1455,23 @@ class X402Service extends Service {
       enabled
     };
     if (!enabled) {
-      logger4.info("[x402] Service inactive — no private key configured or explicitly disabled");
+      logger5.info("[x402] Service inactive — no private key configured or explicitly disabled");
       return;
     }
     try {
       resolveNetwork(network);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
-      logger4.error(`[x402] Invalid network configuration: ${message}`);
+      logger5.error(`[x402] Invalid network configuration: ${message}`);
       this.serviceConfig.enabled = false;
       return;
     }
     try {
       this.signer = new EvmPaymentSigner(privateKey, network);
-      logger4.info(`[x402] Wallet initialized: ${this.signer.address} on ${network}`);
+      logger5.info(`[x402] Wallet initialized: ${this.signer.address} on ${network}`);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
-      logger4.error(`[x402] Failed to initialize signer: ${message}`);
+      logger5.error(`[x402] Failed to initialize signer: ${message}`);
       this.serviceConfig.enabled = false;
       return;
     }
@@ -1383,14 +1480,14 @@ class X402Service extends Service {
     if (dbPath) {
       try {
         this.storage = new SqlitePaymentStorage(dbPath);
-        logger4.info(`[x402] Using SQLite storage at ${dbPath}`);
+        logger5.info(`[x402] Using SQLite storage at ${dbPath}`);
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
-        logger4.warn(`[x402] Failed to initialize SQLite storage: ${message}. Falling back to memory storage.`);
+        logger5.warn(`[x402] Failed to initialize SQLite storage: ${message}. Falling back to memory storage.`);
         this.storage = new MemoryPaymentStorage;
       }
     } else {
-      logger4.info("[x402] Using in-memory storage (set X402_DB_PATH for persistence)");
+      logger5.info("[x402] Using in-memory storage (set X402_DB_PATH for persistence)");
     }
     const policy = {
       outgoing: {
@@ -1414,12 +1511,12 @@ class X402Service extends Service {
       policyEngine: this.policyEngine,
       circuitBreaker: this.circuitBreaker,
       storage: this.storage,
-      logger: logger4
+      logger: logger5
     });
-    logger4.info(`[x402] Service active — max per-txn: $${this.serviceConfig.maxPaymentUsd}, max daily: $${this.serviceConfig.maxTotalUsd}`);
+    logger5.info(`[x402] Service active — max per-txn: $${this.serviceConfig.maxPaymentUsd}, max daily: $${this.serviceConfig.maxTotalUsd}`);
   }
   async stop() {
-    logger4.info("[x402] Service stopping");
+    logger5.info("[x402] Service stopping");
     this.signer = null;
     this.fetchWithPayment = null;
   }
@@ -1456,7 +1553,7 @@ class X402Service extends Service {
   updatePolicy(policy) {
     if (this.policyEngine) {
       this.policyEngine.updatePolicy(policy);
-      logger4.info("[x402] Payment policy updated");
+      logger5.info("[x402] Payment policy updated");
     }
   }
   getWalletAddress() {
@@ -1479,7 +1576,7 @@ class X402Service extends Service {
   }
   resetCircuitBreaker() {
     this.circuitBreaker.reset();
-    logger4.info("[x402] Circuit breaker reset");
+    logger5.info("[x402] Circuit breaker reset");
   }
 }
 // middleware/facilitator-client.ts
@@ -1816,7 +1913,7 @@ class PostgresPaymentStorage {
     let metadata = {};
     try {
       metadata = typeof row.metadata === "string" ? JSON.parse(row.metadata) : row.metadata;
-    } catch {}
+    } catch (_metadataParseError) {}
     return {
       id: row.id,
       direction: row.direction,
@@ -1913,7 +2010,6 @@ var x402Plugin = {
     X402_MAX_TOTAL_USD: null,
     X402_ENABLED: null
   },
-  init: async (_config, _runtime) => {},
   services: [X402Service],
   actions: [payForServiceAction, checkPaymentHistoryAction, setPaymentPolicyAction],
   providers: [paymentBalanceProvider],
@@ -1971,4 +2067,4 @@ export {
   CircuitBreaker
 };
 
-//# debugId=8D689045A014B14A64756E2164756E21
+//# debugId=2EC8B924AB46A7D764756E2164756E21