@agether/agether 2.3.1 → 2.5.0

package/openclaw.plugin.json

@@ -8,6 +8,12 @@
     "type": "object",
     "additionalProperties": false,
     "properties": {
+      "chain": {
+        "type": "number",
+        "description": "Chain ID: 1 = Ethereum (default), 8453 = Base",
+        "default": 1,
+        "enum": [1, 8453]
+      },
       "agentId": {
         "type": "string",
         "description": "ERC-8004 agent ID (set after registration, auto-saved by tools)"
@@ -36,6 +42,7 @@
     "required": []
   },
   "uiHints": {
+    "chain": { "label": "Chain", "placeholder": "1 (Ethereum)" },
     "agentId": { "label": "Agent ID", "placeholder": "17676" },
     "autoDraw": { "label": "Auto-Draw Credit", "placeholder": "false" },
     "autoYield": { "label": "Auto-Yield (use yield before borrowing)", "placeholder": "false" },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@agether/agether",
-  "version": "2.3.1",
-  "description": "OpenClaw plugin for Agether — onchain credit for AI agents",
+  "version": "2.5.0",
+  "description": "OpenClaw plugin for Agether — onchain credit for AI agents on Ethereum & Base",
   "main": "src/index.ts",
   "openclaw": {
     "extensions": [
@@ -9,7 +9,7 @@
     ]
   },
   "dependencies": {
-    "@agether/sdk": "^2.6.1",
+    "@agether/sdk": "^2.7.0",
     "axios": "^1.6.0",
     "ethers": "^6.9.0"
   },

package/skills/agether/SKILL.md

@@ -5,7 +5,7 @@ description: On-chain credit protocol for AI agents on Base. Morpho credit & len
 
 # Agether — On-Chain Credit for AI Agents
 
-You are an AI agent with on-chain financial capabilities on **Base mainnet**. You can borrow USDC, earn yield by lending, and pay for APIs autonomously.
+You are an AI agent with on-chain financial capabilities on **Ethereum** and **Base** mainnets. You can borrow USDC, earn yield by lending, and pay for APIs autonomously.
 
 ---
 
@@ -62,7 +62,24 @@ Both `agether_set_agent` and `agether_register` save the agentId to config perma
 
 ---
 
-## 🛠 YOUR TOOLS
+## � CHAIN RESOLUTION (CRITICAL)
+
+If `agether_health` returns `chain: "?"`, the chain is NOT configured. You MUST resolve this before proceeding with any on-chain action:
+
+```
+1. Ask user: "Which blockchain would you like to use? **Ethereum** or **Base**?"
+2. User chooses a chain
+3. Call `agether_set_chain(chain: "<ethereum or base>")`
+4. After set → call `agether_health` to confirm everything is working on that chain
+```
+
+`agether_set_chain` saves the chain to config permanently (survives restarts). Accepts: `ethereum`, `eth`, `1`, `base`, `8453`.
+
+**IMPORTANT:** Resolve chain BEFORE resolving agentId — the agent registration happens on a specific chain.
+
+---
+
+## �🛠 YOUR TOOLS
 
 ### Health & Diagnostics
 | Tool | What it does |
@@ -76,6 +93,7 @@ Both `agether_set_agent` and `agether_register` save the agentId to config perma
 | `agether_balance` | Show ETH + USDC + all collateral token balances for both EOA wallet and AgentAccount (Safe). Tokens auto-discovered from markets. |
 | `agether_register` | Register on-chain: mints ERC-8004 identity NFT + creates Safe account (via Safe7579). Auto-saves agentId to config. |
 | `agether_set_agent` | Set a known agentId (e.g. from memory) and save to config. Use when agentId is "?" but you remember it. |
+| `agether_set_chain` | Set the active blockchain (Ethereum or Base) and save to config. Use when chain is "?" or user wants to switch chains. Persists across restarts. |
 | `agether_score` | Get credit score. `refresh: false` = free read. `refresh: true` = pays x402, computes fresh score on-chain. **Always call this when user asks about score.** |
 | `agether_kya_status` | Check if KYA code verification is required for this deployment. |
 | `agether_set_kya` | Enable or disable KYA verification gate (owner only). |
@@ -129,6 +147,7 @@ These settings are in `openclaw.json` under `plugins.entries.agether.config`:
 | Setting | Type | Default | Description |
 |---------|------|---------|-------------|
 | `agentId` | string | — | ERC-8004 agent ID (auto-saved by register/set_agent tools) |
+| `chain` | number | — | Chain ID: `1` (Ethereum) or `8453` (Base). Auto-saved by `agether_set_chain`. If not set, bot asks user on first interaction. |
 | `autoDraw` | boolean | `false` | Auto-borrow from Morpho when USDC is low for x402 payments |
 | `autoYield` | boolean | `false` | Auto-withdraw earned yield before borrowing. Waterfall: balance → yield → borrow |
 | `dailySpendLimitUsdc` | number | `0` | Daily spending cap for x402 auto-draw (0 = unlimited). Persisted to cache file. |
@@ -156,11 +175,13 @@ When `autoYield` and/or `autoDraw` are enabled, `x402_pay` automatically sources
 ### Session start (first message or new conversation)
 ```
 1. agether_health                ← ONE call for full context
-2. Check the "alerts" array:
+2. Check the "chain" field:
+     → If chain is "?" → go to CHAIN RESOLUTION (must resolve before anything else)
+3. Check the "alerts" array:
      → If any 🔴 alerts → WARN user immediately (liquidation risk!)
      → If any 🟡 alerts → mention the risk casually
      → If "agentId: ?" → go to AGENT ID RESOLUTION
-3. Now you have full context to handle any request
+4. Now you have full context to handle any request
 ```
 
 ### User asks to call a paid API (x402)
@@ -278,7 +299,7 @@ For supply positions (lent USDC):
 
 ### User asks "what can I do?" or "what is agether?"
 ```
-Explain: You're an AI agent with on-chain credit on Base.
+Explain: You're an AI agent with on-chain credit on Ethereum and Base.
 You can:
 - Deposit collateral and borrow USDC instantly (125% collateral ratio)
 - Earn yield by lending USDC to Morpho markets
@@ -287,7 +308,7 @@ You can:
 - Sponsor other agents with collateral
 - Monitor position health and avoid liquidation
 - Move funds freely between AgentAccount and EOA wallet
-- All on Base mainnet, all autonomous
+- Operate on Ethereum or Base mainnet, all autonomous
 ```
 
 ---
@@ -338,7 +359,7 @@ If something **fails**:
 
 | Parameter | Value |
 |-----------|-------|
-| Chain | Base mainnet (8453) |
+| Chains | Ethereum mainnet (1) or Base mainnet (8453) — set via `agether_set_chain` |
 | Currency | USDC (6 decimals) |
 | Max LTV | 80% (= 125% collateral ratio) |
 | Collateral tokens | Dynamically discovered from Morpho markets (call `morpho_markets`) |
@@ -373,7 +394,7 @@ The plugin reads secrets from environment variables via OpenClaw's secrets syste
 | Ankr RPC key | `ANKR_API_KEY` | No | Alternative premium RPC |
 | QuickNode RPC URL | `QUICKNODE_URL` | No | Full URL including API key |
 
-If no RPC key is set, the plugin falls back to `https://base-rpc.publicnode.com` (free, rate-limited).
+If no RPC key is set, the plugin falls back to free public RPCs (`https://ethereum-rpc.publicnode.com` or `https://base-rpc.publicnode.com` depending on chain — rate-limited).
 
 ---
 
@@ -407,7 +428,9 @@ Wallet transfers:
 
 ---
 
-## 📍 CONTRACT ADDRESSES (Base Mainnet)
+## 📍 CONTRACT ADDRESSES
+
+Contracts are deployed on both **Ethereum** and **Base** mainnets. The SDK auto-resolves the correct addresses based on the configured chain. Key shared addresses:
 
 | Contract | Address |
 |----------|---------|

package/src/index.ts

@@ -4,30 +4,44 @@
  * Each tool = MorphoClient / X402Client call → format result with txLink.
  * Market discovery via Morpho GraphQL API (no backend dependency for markets).
  *
+ * Supported chains: Ethereum (1, default), Base (8453).
+ *
  * v2: Secrets-first config
  * ─────────────────────────
  * - privateKey     → AGETHER_PRIVATE_KEY env var (set via `openclaw secrets configure` → crypto)
  * - rpcUrl         → auto-resolved from ALCHEMY_API_KEY / ANKR_API_KEY / QUICKNODE_URL env vars,
- *                    falls back to https://base-rpc.publicnode.com
- * - backendUrl     → hardcoded (no config needed)
+ *                    falls back to publicnode.com (chain-aware)
  * - agentId        → optional plugin config field (auto-saved by tools)
- *
- * The plugin works with an empty `plugins.entries.agether.config: {}`.
+ * - chain          → plugin config field (default: 1 = Ethereum)
  */
 
-import axios from "axios";
 import * as fs from "fs";
 import * as path from "path";
 import {
   MorphoClient,
   X402Client,
+  ScoringClient,
+  getContractAddresses,
+  ChainId,
 } from "@agether/sdk";
 
 // ─── Constants ────────────────────────────────────────────
 
 const BACKEND_URL = "http://95.179.189.214:3001";
-const DEFAULT_RPC = "https://base-rpc.publicnode.com";
-const BASESCAN = "https://basescan.org/tx";
+
+// Per-chain defaults
+const CHAIN_DEFAULTS: Record<number, { rpc: string; explorer: string; chainName: string }> = {
+  [ChainId.Ethereum]: {
+    rpc: "https://ethereum-rpc.publicnode.com",
+    explorer: "https://etherscan.io/tx",
+    chainName: "Ethereum",
+  },
+  [ChainId.Base]: {
+    rpc: "https://base-rpc.publicnode.com",
+    explorer: "https://basescan.org/tx",
+    chainName: "Base",
+  },
+};
 
 // ─── Spending Cache (persists dailySpendLimit tracker across restarts) ────
 
@@ -73,11 +87,14 @@ interface PluginConfig {
   privateKey: string;
   agentId?: string;
   rpcUrl: string;
-  backendUrl: string;
+  chainId: ChainId;
+  chainConfigured: boolean; // true if user explicitly set chain in config
 }
 
 function txLink(hash: string): string {
-  return hash ? `${BASESCAN}/${hash}` : "";
+  if (!hash) return "";
+  const explorer = CHAIN_DEFAULTS[activeChainId]?.explorer ?? CHAIN_DEFAULTS[ChainId.Ethereum].explorer;
+  return `${explorer}/${hash}`;
 }
 
 function ok(text: string) {
@@ -102,18 +119,25 @@ function fail(err: unknown) {
 /**
  * Resolve RPC URL from environment secrets.
  * Priority: ALCHEMY_API_KEY → ANKR_API_KEY → QUICKNODE_URL → publicnode fallback.
+ * Chain-aware: uses the correct endpoint subdomain for the configured chain.
  */
-function resolveRpcUrl(): string {
+function resolveRpcUrl(chainId: ChainId): string {
   const alchemy = process.env.ALCHEMY_API_KEY;
-  if (alchemy) return `https://base-mainnet.g.alchemy.com/v2/${alchemy}`;
+  if (alchemy) {
+    const alchemyChain = chainId === ChainId.Base ? "base-mainnet" : "eth-mainnet";
+    return `https://${alchemyChain}.g.alchemy.com/v2/${alchemy}`;
+  }
 
   const ankr = process.env.ANKR_API_KEY;
-  if (ankr) return `https://rpc.ankr.com/base/${ankr}`;
+  if (ankr) {
+    const ankrChain = chainId === ChainId.Base ? "base" : "eth";
+    return `https://rpc.ankr.com/${ankrChain}/${ankr}`;
+  }
 
   const quicknode = process.env.QUICKNODE_URL;
   if (quicknode) return quicknode;
 
-  return DEFAULT_RPC;
+  return CHAIN_DEFAULTS[chainId]?.rpc ?? CHAIN_DEFAULTS[ChainId.Ethereum].rpc;
 }
 
 /**
@@ -134,16 +158,22 @@ function resolvePrivateKey(): string {
 
 function getConfig(api: any): PluginConfig {
   const cfg = api.config?.plugins?.entries?.["agether"]?.config ?? {};
+  const rawChain = cfg.chain;
+  const chainConfigured = rawChain !== undefined && rawChain !== null && rawChain !== "";
+  const chainId = (rawChain as ChainId) || ChainId.Ethereum;
+  activeChainId = chainId; // Update module-level for txLink
   return {
     privateKey: resolvePrivateKey(),
     agentId: cfg.agentId,
-    rpcUrl: resolveRpcUrl(),
-    backendUrl: BACKEND_URL,
+    rpcUrl: resolveRpcUrl(chainId),
+    chainId,
+    chainConfigured,
   };
 }
 
 // Module-level cache
 let cachedAgentId: string | undefined;
+let activeChainId: ChainId = ChainId.Ethereum;
 
 function createClient(cfg: PluginConfig): MorphoClient {
   const agentId = cachedAgentId || cfg.agentId;
@@ -151,6 +181,7 @@ function createClient(cfg: PluginConfig): MorphoClient {
     privateKey: cfg.privateKey,
     rpcUrl: cfg.rpcUrl,
     agentId,
+    chainId: cfg.chainId,
   });
 }
 
@@ -177,6 +208,29 @@ function persistAgentId(agentId: string): string {
   }
 }
 
+/** Persist chain to openclaw.json so it survives restarts. */
+function persistChainId(chainId: ChainId): string {
+  activeChainId = chainId;
+  try {
+    const home = process.env.HOME || process.env.USERPROFILE || "/root";
+    const cfgPath = path.join(home, ".openclaw", "openclaw.json");
+    const raw = fs.readFileSync(cfgPath, "utf-8");
+    const json = JSON.parse(raw);
+
+    // Ensure config path exists
+    if (!json.plugins) json.plugins = {};
+    if (!json.plugins.entries) json.plugins.entries = {};
+    if (!json.plugins.entries.agether) json.plugins.entries.agether = {};
+    if (!json.plugins.entries.agether.config) json.plugins.entries.agether.config = {};
+
+    json.plugins.entries.agether.config.chain = chainId;
+    fs.writeFileSync(cfgPath, JSON.stringify(json, null, 2));
+    return "saved";
+  } catch (e) {
+    return `write failed: ${e instanceof Error ? e.message : String(e)}`;
+  }
+}
+
 // ─── Plugin Entry ─────────────────────────────────────────
 
 export default function register(api: any) {
@@ -186,7 +240,7 @@ export default function register(api: any) {
   api.registerTool({
     name: "agether_balance",
     description:
-      "Check ETH and USDC balances for the agent's EOA wallet and AgentAccount on Base.",
+      "Check ETH and USDC balances for the agent's EOA wallet and AgentAccount.",
     parameters: { type: "object", properties: {}, required: [] },
     async execute() {
       try {
@@ -204,7 +258,7 @@ export default function register(api: any) {
   api.registerTool({
     name: "agether_register",
     description:
-      "Register a new ERC-8004 agent identity on Base and create a Safe smart account (via Safe7579). Returns the new agentId.",
+      "Register a new ERC-8004 agent identity and create a Safe smart account (via Safe7579). Returns the new agentId.",
     parameters: {
       type: "object",
       properties: {
@@ -271,6 +325,53 @@ export default function register(api: any) {
     },
   });
 
+  // ═══════════════════════════════════════════════════════
+  //  TOOL: agether_set_chain
+  // ═══════════════════════════════════════════════════════
+  api.registerTool({
+    name: "agether_set_chain",
+    description:
+      "Set the active blockchain network and save it to config. " +
+      "Use this when the user chooses a chain (Ethereum or Base). " +
+      "Accepts chain name ('ethereum', 'base') or chain ID (1, 8453). " +
+      "This persists across restarts.",
+    parameters: {
+      type: "object",
+      properties: {
+        chain: {
+          type: "string",
+          description: "Chain name ('ethereum', 'base') or chain ID ('1', '8453')",
+        },
+      },
+      required: ["chain"],
+    },
+    async execute(_id: string, params: { chain: string }) {
+      try {
+        // Resolve chain name / ID to ChainId
+        const input = params.chain.toLowerCase().trim();
+        let chainId: ChainId;
+        if (input === "ethereum" || input === "eth" || input === "1") {
+          chainId = ChainId.Ethereum;
+        } else if (input === "base" || input === "8453") {
+          chainId = ChainId.Base;
+        } else {
+          return fail(`Unknown chain "${params.chain}". Supported: ethereum (1), base (8453)`);
+        }
+
+        const persistStatus = persistChainId(chainId);
+        const chainInfo = CHAIN_DEFAULTS[chainId];
+        return ok(JSON.stringify({
+          status: "chain_set",
+          chainId,
+          chainName: chainInfo.chainName,
+          explorer: chainInfo.explorer,
+          rpc: resolveRpcUrl(chainId).replace(/\/[a-zA-Z0-9_-]{20,}$/, '/***'),
+          configSaved: persistStatus,
+        }));
+      } catch (e) { return fail(e); }
+    },
+  });
+
   // ═══════════════════════════════════════════════════════
   //  TOOL: agether_kya_status
   // ═══════════════════════════════════════════════════════
@@ -751,7 +852,7 @@ export default function register(api: any) {
   api.registerTool({
     name: "morpho_markets",
     description:
-      "List available Morpho Blue USDC markets on Base — liquidity, supply/borrow APY, utilization, LLTV. " +
+      "List available Morpho Blue USDC markets — liquidity, supply/borrow APY, utilization, LLTV. " +
       "Optionally filter by collateral token.",
     parameters: {
       type: "object",
@@ -806,24 +907,30 @@ export default function register(api: any) {
         const agentId = client.getAgentId();
 
         if (params.refresh) {
-          // x402-gated fresh score — account address required for payment
+          // x402-gated fresh score via ScoringClient
           const accountAddress = await client.getAccountAddress();
-          const x402 = new X402Client({
-            privateKey: cfg.privateKey,
-            rpcUrl: cfg.rpcUrl,
-            backendUrl: cfg.backendUrl,
-            agentId,
-            accountAddress,
-            // Safe7579 needs validator prefix for ERC-1271 isValidSignature routing
-            validatorModule: "0xde896C58163b5f6cAC5B16C1b0109843f26106F6",
+          const contracts = getContractAddresses(cfg.chainId);
+          const scoring = new ScoringClient({
+            endpoint: BACKEND_URL,
+            chainId: cfg.chainId,
+            x402: {
+              privateKey: cfg.privateKey,
+              rpcUrl: cfg.rpcUrl,
+              agentId,
+              accountAddress,
+              validatorModule: contracts.erc8004ValidationModule,
+            },
           });
-          const result = await x402.get(`${cfg.backendUrl}/score/${agentId}`);
-          if (!result.success) return fail(result.error || "Score request failed");
-          return ok(JSON.stringify(result.data, null, 2));
+          const result = await scoring.requestScore(agentId);
+          return ok(JSON.stringify(result, null, 2));
         }
 
-        // Free: read current onchain score
-        const { data } = await axios.get(`${cfg.backendUrl}/score/${agentId}/current`);
+        // Free: read current onchain score via ScoringClient
+        const scoring = new ScoringClient({
+          endpoint: BACKEND_URL,
+          chainId: cfg.chainId,
+        });
+        const data = await scoring.getCurrentScore(agentId);
         return ok(JSON.stringify(data, null, 2));
       } catch (e) { return fail(e); }
     },
@@ -956,10 +1063,10 @@ export default function register(api: any) {
 
         const autoDrawEnabled = agetherCfg.autoDraw === true;
         const autoYieldEnabled = agetherCfg.autoYield === true;
+        const contracts = getContractAddresses(cfg.chainId);
         const x402 = new X402Client({
           privateKey: cfg.privateKey,
           rpcUrl: cfg.rpcUrl,
-          backendUrl: cfg.backendUrl,
           agentId,
           accountAddress,
           autoDraw: autoDrawEnabled,
@@ -970,7 +1077,7 @@ export default function register(api: any) {
           // Persist every spending update to cache file
           onSpendingUpdate: (state: any) => saveSpendCache(state),
           // Safe7579 needs validator prefix for ERC-1271 isValidSignature routing
-          validatorModule: "0xde896C58163b5f6cAC5B16C1b0109843f26106F6",
+          validatorModule: contracts.erc8004ValidationModule,
         });
 
         let result;
@@ -1117,6 +1224,11 @@ export default function register(api: any) {
           alerts.push("⛽ Low ETH for gas — may fail on-chain transactions. Send ETH to EOA.");
         }
 
+        // Check if chain is explicitly configured
+        if (!cfg.chainConfigured) {
+          alerts.push("⚠️ Chain not configured — currently defaulting to Ethereum. Ask user which chain to use and call agether_set_chain.");
+        }
+
         const result = {
           agentId: balances.agentId,
           walletAddress: balances.address,
@@ -1130,6 +1242,9 @@ export default function register(api: any) {
           totalBorrowingHeadroom: `$${(Number(maxBorrow.total) / 1e6).toFixed(2)}`,
           positions: positionHealth,
           alerts: alerts.length > 0 ? alerts : ["✅ All positions healthy"],
+          chain: cfg.chainConfigured
+            ? (CHAIN_DEFAULTS[cfg.chainId]?.chainName ?? `Chain ${cfg.chainId}`)
+            : "?",
           rpcSource: process.env.ALCHEMY_API_KEY ? "Alchemy" :
                      process.env.ANKR_API_KEY ? "Ankr" :
                      process.env.QUICKNODE_URL ? "QuickNode" : "PublicNode (free)",
@@ -1161,11 +1276,21 @@ export default function register(api: any) {
         checks.push({ check: "Private key (AGETHER_PRIVATE_KEY)", status: "❌ missing", detail: "Set via: openclaw secrets configure → source: env → id: AGETHER_PRIVATE_KEY" });
       }
 
-      // 2. RPC URL
-      const rpcUrl = resolveRpcUrl();
+      // 2. Chain & RPC URL
+      const pluginCfg = api.config?.plugins?.entries?.["agether"]?.config ?? {};
+      const rawChain = pluginCfg.chain;
+      const chainConfigured = rawChain !== undefined && rawChain !== null && rawChain !== "";
+      const prefChainId = (rawChain as ChainId) || ChainId.Ethereum;
+      const chainName = CHAIN_DEFAULTS[prefChainId]?.chainName ?? "Unknown";
+      const rpcUrl = resolveRpcUrl(prefChainId);
       const rpcSource = process.env.ALCHEMY_API_KEY ? "Alchemy" :
                         process.env.ANKR_API_KEY ? "Ankr" :
                         process.env.QUICKNODE_URL ? "QuickNode" : "PublicNode (free fallback)";
+      if (chainConfigured) {
+        checks.push({ check: "Chain", status: `✅ ${chainName} (${prefChainId})` });
+      } else {
+        checks.push({ check: "Chain", status: "⚠️ not configured (defaulting to Ethereum)", detail: "Ask user which chain to use and call agether_set_chain" });
+      }
       checks.push({ check: "RPC endpoint", status: `✅ ${rpcSource}`, detail: rpcUrl.replace(/\/[a-zA-Z0-9_-]{20,}$/, '/***') });
 
       // 3. Agent registration
@@ -1361,8 +1486,9 @@ export default function register(api: any) {
         const balances = await client.getBalances();
         const agentId = balances.agentId ?? "?";
         const safeUsdc = balances.agentAccount?.usdc ?? "0";
+        const chainName = CHAIN_DEFAULTS[cfg.chainId]?.chainName ?? `Chain ${cfg.chainId}`;
         api.logger?.info?.(
-          `[agether] Session start — Agent #${agentId}, EOA: ${balances.eth} ETH / $${balances.usdc} USDC, Safe: $${safeUsdc} USDC`,
+          `[agether] Session start — ${chainName}, Agent #${agentId}, EOA: ${balances.eth} ETH / $${balances.usdc} USDC, Safe: $${safeUsdc} USDC`,
         );
       } catch {
         // Silently fail — hook should not block conversations