@agether/openclaw-plugin 1.2.0 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agether/openclaw-plugin",
-  "version": "1.2.0",
+  "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

@@ -566,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]);
 
@@ -632,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);
@@ -693,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);
 
@@ -711,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); }
     },