@agether/openclaw-plugin 1.1.1 → 1.3.0

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "agether",
   "name": "Agether Credit",
   "description": "On-chain credit protocol for AI agents — Morpho-backed overcollateralized credit, ERC-8004 identity, x402 payments",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "skills": ["skills/agether"],
   "configSchema": {
     "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agether/openclaw-plugin",
-  "version": "1.1.1",
+  "version": "1.3.0",
   "description": "OpenClaw plugin for Agether — on-chain credit for AI agents",
   "main": "src/index.ts",
   "openclaw": {
@@ -9,7 +9,7 @@
     ]
   },
   "dependencies": {
-    "@agether/sdk": "^1.1.0",
+    "@agether/sdk": "^1.3.0",
     "axios": "^1.6.0",
     "ethers": "^6.9.0"
   },

package/src/index.ts

@@ -30,6 +30,7 @@ const ERC8004_ABI = [
   "function register(string agentURI) returns (uint256)",
   "function ownerOf(uint256 tokenId) view returns (address)",
   "function balanceOf(address owner) view returns (uint256)",
+  "function tokenOfOwnerByIndex(address owner, uint256 index) view returns (uint256)",
 ];
 
 const COLLATERAL_TOKENS: Record<string, { address: string; decimals: number }> = {
@@ -69,6 +70,23 @@ async function getAccountAddr(signer: ethers.Wallet, factoryAddr: string, agentI
   return addr;
 }
 
+// ─── Auto-resolve agentId from chain ──────────────────────
+let _cachedAgentId: string | null = null;
+
+async function resolveAgentId(cfg: PluginConfig, signer: ethers.Wallet, status: any): Promise<string> {
+  // 1. Config takes priority
+  if (cfg.agentId && cfg.agentId !== "0") return cfg.agentId;
+  // 2. Session cache
+  if (_cachedAgentId) return _cachedAgentId;
+  // 3. Look up on-chain: does this wallet own any ERC-8004 token?
+  const agentRegistry = new ethers.Contract(status.contracts.agentRegistry, ERC8004_ABI, signer.provider!);
+  const balance: bigint = await agentRegistry.balanceOf(signer.address);
+  if (balance === 0n) throw new Error("No agent registered. Use agether_register first.");
+  const tokenId: bigint = await agentRegistry.tokenOfOwnerByIndex(signer.address, 0);
+  _cachedAgentId = tokenId.toString();
+  return _cachedAgentId;
+}
+
 function ok(text: string) {
   return { content: [{ type: "text" as const, text }] };
 }
@@ -103,15 +121,17 @@ export default function register(api: any) {
 
         const result: any = {
           address,
-          agentId: cfg.agentId || "not set",
+          agentId: cfg.agentId || _cachedAgentId || "not registered",
           eth: ethers.formatEther(ethBal),
           usdc: ethers.formatUnits(usdcBal, 6),
         };
 
-        // AgentAccount balances
-        if (cfg.agentId && status.contracts.accountFactory) {
-          try {
-            const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
+        // AgentAccount balances — try to auto-resolve agentId
+        try {
+          const agentId = await resolveAgentId(cfg, signer, status);
+          result.agentId = agentId;
+          if (status.contracts.accountFactory) {
+            const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
             const accEth = await provider.getBalance(accountAddr);
             const accUsdc = await usdc.balanceOf(accountAddr);
             result.agentAccount = {
@@ -119,8 +139,8 @@ export default function register(api: any) {
               eth: ethers.formatEther(accEth),
               usdc: ethers.formatUnits(accUsdc, 6),
             };
-          } catch { /* no account yet */ }
-        }
+          }
+        } catch { /* no agent registered yet */ }
 
         return ok(JSON.stringify(result, null, 2));
       } catch (e) { return fail(e); }
@@ -211,13 +231,15 @@ export default function register(api: any) {
           accountAddr = await factory.getAccount(agentId);
         }
 
+        // Cache agentId for the session so all subsequent tools work
+        _cachedAgentId = agentId.toString();
+
         return ok(JSON.stringify({
           status: "registered",
           agentId: agentId.toString(),
           address: signer.address,
           agentAccount: accountAddr,
           tx: tx.hash,
-          important: "Save this agentId in your plugin config: plugins.entries.agether.config.agentId",
         }));
       } catch (e) { return fail(e); }
     },
@@ -236,9 +258,9 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         const signer = getSigner(cfg);
         const status = await getBackendStatus(cfg);
-        if (!cfg.agentId) return fail("No agentId configured");
+        const agentId = await resolveAgentId(cfg, signer, status);
 
-        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
+        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
         const morpho = new ethers.Contract(status.contracts.morphoCredit, MORPHO_CREDIT_ABI, signer.provider!);
 
         const positions: any[] = [];
@@ -285,13 +307,13 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         const signer = getSigner(cfg);
         const status = await getBackendStatus(cfg);
-        if (!cfg.agentId) return fail("No agentId configured");
+        const agentId = await resolveAgentId(cfg, signer, status);
 
         const tokenInfo = COLLATERAL_TOKENS[params.token];
         if (!tokenInfo) return fail(`Unsupported token: ${params.token}. Use WETH, wstETH, or cbETH`);
 
         const morphoCreditAddr = status.contracts.morphoCredit;
-        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
+        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
         const amount = ethers.parseUnits(params.amount, tokenInfo.decimals);
 
         // Check balance
@@ -351,13 +373,13 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         const signer = getSigner(cfg);
         const status = await getBackendStatus(cfg);
-        if (!cfg.agentId) return fail("No agentId configured");
+        const agentId = await resolveAgentId(cfg, signer, status);
 
         const tokenInfo = COLLATERAL_TOKENS[params.token];
         if (!tokenInfo) return fail(`Unsupported token: ${params.token}`);
 
         const morphoCreditAddr = status.contracts.morphoCredit;
-        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
+        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
         const collateralWei = ethers.parseUnits(params.collateralAmount, tokenInfo.decimals);
         const borrowWei = ethers.parseUnits(params.borrowAmount, 6);
 
@@ -526,9 +548,9 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         const signer = getSigner(cfg);
         const status = await getBackendStatus(cfg);
-        if (!cfg.agentId) return fail("No agentId configured");
+        const agentId = await resolveAgentId(cfg, signer, status);
 
-        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
+        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
         const morpho = new ethers.Contract(status.contracts.morphoCredit, MORPHO_CREDIT_ABI, signer.provider!);
 
         // Find active collateral
@@ -544,6 +566,10 @@ export default function register(api: any) {
 
         // Borrow via AgentAccount.execute → drawWithCollateral
         const account = new ethers.Contract(accountAddr, AGENT_ACCOUNT_ABI, signer);
+
+        // Ensure credit provider approved (one-time, idempotent)
+        try { const cpTx = await account.approveCreditProvider(status.contracts.morphoCredit); await cpTx.wait(); } catch { /* already approved */ }
+
         const morphoIface = new ethers.Interface(MORPHO_CREDIT_ABI);
         const calldata = morphoIface.encodeFunctionData("drawWithCollateral", [collateralAddr, amountWei]);
 
@@ -583,9 +609,9 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         const signer = getSigner(cfg);
         const status = await getBackendStatus(cfg);
-        if (!cfg.agentId) return fail("No agentId configured");
+        const agentId = await resolveAgentId(cfg, signer, status);
 
-        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
+        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
         const morpho = new ethers.Contract(status.contracts.morphoCredit, MORPHO_CREDIT_ABI, signer.provider!);
 
         // Find active collateral with debt
@@ -610,14 +636,15 @@ export default function register(api: any) {
         const morphoIface = new ethers.Interface(MORPHO_CREDIT_ABI);
         const erc20Iface = new ethers.Interface(ERC20_ABI);
 
-        // Approve USDC for MorphoCredit
-        const approveData = erc20Iface.encodeFunctionData("approve", [status.contracts.morphoCredit, amountWei]);
-        const approveTx = await account.execute(status.contracts.usdc, 0, approveData);
-        await approveTx.wait();
-
-        // Repay
-        const repayData = morphoIface.encodeFunctionData("repayWithCollateral", [collateralAddr, amountWei]);
-        const tx = await account.execute(status.contracts.morphoCredit, 0, repayData);
+        // Single tx via executeBatch: approve USDC + repayWithCollateral
+        const tx = await account.executeBatch(
+          [status.contracts.usdc, status.contracts.morphoCredit],
+          [0, 0],
+          [
+            erc20Iface.encodeFunctionData("approve", [status.contracts.morphoCredit, amountWei]),
+            morphoIface.encodeFunctionData("repayWithCollateral", [collateralAddr, amountWei]),
+          ],
+        );
         await tx.wait();
 
         const totalDebt = await morpho.getTotalDebt(accountAddr);
@@ -652,12 +679,12 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         const signer = getSigner(cfg);
         const status = await getBackendStatus(cfg);
-        if (!cfg.agentId) return fail("No agentId configured");
+        const agentId = await resolveAgentId(cfg, signer, status);
 
         const tokenInfo = COLLATERAL_TOKENS[params.token];
         if (!tokenInfo) return fail(`Unsupported token: ${params.token}`);
 
-        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
+        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
         const morpho = new ethers.Contract(status.contracts.morphoCredit, MORPHO_CREDIT_ABI, signer.provider!);
         const pos = await morpho.getPosition(accountAddr, tokenInfo.address);
 
@@ -671,15 +698,18 @@ export default function register(api: any) {
 
         const account = new ethers.Contract(accountAddr, AGENT_ACCOUNT_ABI, signer);
         const morphoIface = new ethers.Interface(MORPHO_CREDIT_ABI);
+        const erc20Iface = new ethers.Interface(ERC20_ABI);
 
-        // Step 1: Withdraw from Morpho → AgentAccount
-        const withdrawData = morphoIface.encodeFunctionData("withdrawCollateral", [tokenInfo.address, withdrawAmount]);
-        const tx1 = await account.execute(status.contracts.morphoCredit, 0, withdrawData);
-        await tx1.wait();
-
-        // Step 2: Move from AgentAccount → EOA
-        const tx2 = await account.withdraw(tokenInfo.address, withdrawAmount, signer.address);
-        await tx2.wait();
+        // Single tx via executeBatch: withdrawCollateral + transfer to EOA
+        const tx = await account.executeBatch(
+          [status.contracts.morphoCredit, tokenInfo.address],
+          [0, 0],
+          [
+            morphoIface.encodeFunctionData("withdrawCollateral", [tokenInfo.address, withdrawAmount]),
+            erc20Iface.encodeFunctionData("transfer", [signer.address, withdrawAmount]),
+          ],
+        );
+        await tx.wait();
 
         const newPos = await morpho.getPosition(accountAddr, tokenInfo.address);
 
@@ -689,7 +719,7 @@ export default function register(api: any) {
           remainingCollateral: `${ethers.formatUnits(newPos.collateralAmount, tokenInfo.decimals)} ${params.token}`,
           remainingDebt: `$${ethers.formatUnits(newPos.borrowedAmount, 6)}`,
           destination: signer.address,
-          tx: tx1.hash,
+          tx: tx.hash,
         }));
       } catch (e) { return fail(e); }
     },
@@ -758,8 +788,10 @@ export default function register(api: any) {
     async execute() {
       try {
         const cfg = getConfig(api);
-        if (!cfg.agentId) return fail("No agentId configured");
-        const { data } = await axios.get(`${cfg.backendUrl}/credit/score/${cfg.agentId}`);
+        const signer = getSigner(cfg);
+        const status = await getBackendStatus(cfg);
+        const agentId = await resolveAgentId(cfg, signer, status);
+        const { data } = await axios.get(`${cfg.backendUrl}/credit/score/${agentId}`);
         return ok(JSON.stringify(data, null, 2));
       } catch (e) { return fail(e); }
     },
@@ -783,9 +815,9 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         const signer = getSigner(cfg);
         const status = await getBackendStatus(cfg);
-        if (!cfg.agentId) return fail("No agentId configured");
+        const agentId = await resolveAgentId(cfg, signer, status);
 
-        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
+        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
         const amountWei = ethers.parseUnits(params.amount, 6);
 
         const usdc = new ethers.Contract(status.contracts.usdc, ERC20_ABI, signer);
@@ -834,15 +866,15 @@ export default function register(api: any) {
 
         // Resolve AgentAccount address for x402 payments
         let accountAddress: string | undefined;
-        if (cfg.agentId && status.contracts.accountFactory) {
-          try {
-            accountAddress = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
-          } catch { /* no account, pay from EOA */ }
-        }
+        let agentId: string | undefined;
+        try {
+          agentId = await resolveAgentId(cfg, signer, status);
+          accountAddress = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
+        } catch { /* no account, pay from EOA */ }
 
         // Auto-draw: if enabled, check USDC balance and borrow if needed
         const shouldAutoDraw = params.autoDraw ?? cfg.autoDraw;
-        if (shouldAutoDraw && accountAddress && cfg.agentId) {
+        if (shouldAutoDraw && accountAddress && agentId) {
           const usdc = new ethers.Contract(status.contracts.usdc, ERC20_ABI, signer.provider!);
           const accBalance = await usdc.balanceOf(accountAddress);
           // If balance < $1, try to auto-borrow $10 (enough for several x402 calls)
@@ -871,7 +903,7 @@ export default function register(api: any) {
           privateKey: cfg.privateKey,
           rpcUrl: cfg.rpcUrl!,
           backendUrl: cfg.backendUrl!,
-          agentId: cfg.agentId,
+          agentId: agentId,
           accountAddress,
         });
 
@@ -912,14 +944,17 @@ export default function register(api: any) {
         const usdc = new ethers.Contract(status.contracts.usdc, ERC20_ABI, provider);
         const usdcBal = await usdc.balanceOf(signer.address);
 
-        let text = `💰 Agent #${cfg.agentId || "?"}\n`;
+        let agentId: string | undefined;
+        try { agentId = await resolveAgentId(cfg, signer, status); } catch {}
+
+        let text = `💰 Agent #${agentId || "?"}\n`;
         text += `Address: ${signer.address}\n`;
         text += `ETH: ${parseFloat(ethers.formatEther(ethBal)).toFixed(6)}\n`;
         text += `USDC: $${ethers.formatUnits(usdcBal, 6)}`;
 
-        if (cfg.agentId && status.contracts.accountFactory) {
+        if (agentId && status.contracts.accountFactory) {
           try {
-            const accAddr = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
+            const accAddr = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
             const accUsdc = await usdc.balanceOf(accAddr);
             text += `\n\n🏦 AgentAccount: ${accAddr}\nUSDC: $${ethers.formatUnits(accUsdc, 6)}`;
           } catch { /* no account */ }
@@ -940,13 +975,13 @@ export default function register(api: any) {
         const cfg = getConfig(api);
         const signer = getSigner(cfg);
         const status = await getBackendStatus(cfg);
-        if (!cfg.agentId) return { text: "❌ No agentId configured" };
+        const agentId = await resolveAgentId(cfg, signer, status);
 
-        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, cfg.agentId);
+        const accountAddr = await getAccountAddr(signer, status.contracts.accountFactory, agentId);
         const morpho = new ethers.Contract(status.contracts.morphoCredit, MORPHO_CREDIT_ABI, signer.provider!);
         const totalDebt = await morpho.getTotalDebt(accountAddr);
 
-        let text = `📊 Morpho — Agent #${cfg.agentId}\nAccount: ${accountAddr}\nTotal debt: $${ethers.formatUnits(totalDebt, 6)}\n`;
+        let text = `📊 Morpho — Agent #${agentId}\nAccount: ${accountAddr}\nTotal debt: $${ethers.formatUnits(totalDebt, 6)}\n`;
 
         for (const [symbol, info] of Object.entries(COLLATERAL_TOKENS)) {
           const pos = await morpho.getPosition(accountAddr, info.address);