@agether/sdk 1.11.1 → 1.11.2

package/dist/index.js

@@ -854,7 +854,7 @@ var MorphoClient = class {
             const mkt = await this.morphoBlue.market(m.uniqueKey);
             const totalBorrowShares = BigInt(mkt.totalBorrowShares);
             const totalBorrowAssets = BigInt(mkt.totalBorrowAssets);
-            debt = totalBorrowShares > 0n ? BigInt(pos.borrowShares) * totalBorrowAssets / totalBorrowShares : 0n;
+            debt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
             totalDebt += debt;
           } catch (e) {
             console.warn(`[agether] debt calc failed for market ${m.uniqueKey}:`, e instanceof Error ? e.message : e);
@@ -916,7 +916,7 @@ var MorphoClient = class {
         const mktState = await this.morphoBlue.market(m.uniqueKey);
         const totalBorrowShares = BigInt(mktState.totalBorrowShares);
         const totalBorrowAssets = BigInt(mktState.totalBorrowAssets);
-        const currentDebt = totalBorrowShares > 0n ? BigInt(pos.borrowShares) * totalBorrowAssets / totalBorrowShares : 0n;
+        const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
         let collateralValueInLoan;
         try {
           const oracleContract = new import_ethers2.Contract(m.oracle, [
@@ -1279,13 +1279,14 @@ var MorphoClient = class {
     if (!colInfo) throw new AgetherError(`Unknown collateral: ${tokenSymbol}`, "UNKNOWN_COLLATERAL");
     const params = marketParams ?? await this.findMarketForCollateral(tokenSymbol);
     const morphoAddr = this.config.contracts.morphoBlue;
+    const usdcAddr = this.config.contracts.usdc;
     const dest = receiver || await this.getSignerAddress();
     let weiAmount;
+    const markets = await this.getMarkets();
+    const market = markets.find(
+      (m) => m.collateralAsset?.address.toLowerCase() === colInfo.address.toLowerCase()
+    );
     if (amount === "all") {
-      const markets = await this.getMarkets();
-      const market = markets.find(
-        (m) => m.collateralAsset.address.toLowerCase() === colInfo.address.toLowerCase()
-      );
       if (!market) throw new AgetherError("Market not found", "MARKET_NOT_FOUND");
       const pos = await this.morphoBlue.position(market.uniqueKey, acctAddr);
       weiAmount = pos.collateral;
@@ -1293,19 +1294,65 @@ var MorphoClient = class {
     } else {
       weiAmount = import_ethers2.ethers.parseUnits(amount, colInfo.decimals);
     }
-    const data = morphoIface.encodeFunctionData("withdrawCollateral", [
+    let hasDustDebt = false;
+    let dustBorrowShares = 0n;
+    let dustApproveAmount = 0n;
+    if (market) {
+      try {
+        const pos = await this.morphoBlue.position(market.uniqueKey, acctAddr);
+        dustBorrowShares = BigInt(pos.borrowShares);
+        if (dustBorrowShares > 0n) {
+          hasDustDebt = true;
+          const onChainMkt = await this.morphoBlue.market(market.uniqueKey);
+          const totalBorrowAssets = BigInt(onChainMkt.totalBorrowAssets);
+          const totalBorrowShares = BigInt(onChainMkt.totalBorrowShares);
+          const estimated = totalBorrowShares > 0n ? dustBorrowShares * totalBorrowAssets / totalBorrowShares + 10n : 0n;
+          dustApproveAmount = estimated > 0n ? estimated : import_ethers2.ethers.parseUnits("1", 6);
+          console.log(`[agether] dust borrow shares detected: ${dustBorrowShares} shares \u2248 ${import_ethers2.ethers.formatUnits(dustApproveAmount, 6)} USDC \u2014 auto-repaying before withdraw`);
+        }
+      } catch (e) {
+        console.warn("[agether] failed to check borrow shares before withdraw:", e instanceof Error ? e.message : e);
+      }
+    }
+    const withdrawData = morphoIface.encodeFunctionData("withdrawCollateral", [
       this._toTuple(params),
       weiAmount,
       acctAddr,
       dest
     ]);
-    const receipt = await this.exec(morphoAddr, data);
+    let receipt;
+    if (hasDustDebt) {
+      const usdcContract = new import_ethers2.Contract(usdcAddr, ERC20_ABI, this._signer);
+      const acctBalance = await usdcContract.balanceOf(acctAddr);
+      if (acctBalance < dustApproveAmount) {
+        const shortfall = dustApproveAmount - acctBalance;
+        const eoaBalance = await usdcContract.balanceOf(await this.getSignerAddress());
+        if (eoaBalance >= shortfall) {
+          console.log(`[agether] transferring ${import_ethers2.ethers.formatUnits(shortfall, 6)} USDC from EOA \u2192 AgentAccount for dust repay`);
+          const transferTx = await usdcContract.transfer(acctAddr, shortfall);
+          await transferTx.wait();
+          this._refreshSigner();
+        }
+      }
+      const targets = [usdcAddr, morphoAddr, morphoAddr];
+      const values = [0n, 0n, 0n];
+      const datas = [
+        erc20Iface.encodeFunctionData("approve", [morphoAddr, dustApproveAmount]),
+        morphoIface.encodeFunctionData("repay", [
+          this._toTuple(params),
+          0n,
+          dustBorrowShares,
+          acctAddr,
+          "0x"
+        ]),
+        withdrawData
+      ];
+      receipt = await this.batch(targets, values, datas);
+    } else {
+      receipt = await this.exec(morphoAddr, withdrawData);
+    }
     let remainingCollateral = "0";
     try {
-      const markets = await this.getMarkets();
-      const market = markets.find(
-        (m) => m.collateralAsset.address.toLowerCase() === colInfo.address.toLowerCase()
-      );
       if (market) {
         const pos = await this.morphoBlue.position(market.uniqueKey, acctAddr);
         remainingCollateral = import_ethers2.ethers.formatUnits(pos.collateral, colInfo.decimals);

package/dist/index.mjs

@@ -789,7 +789,7 @@ var MorphoClient = class {
             const mkt = await this.morphoBlue.market(m.uniqueKey);
             const totalBorrowShares = BigInt(mkt.totalBorrowShares);
             const totalBorrowAssets = BigInt(mkt.totalBorrowAssets);
-            debt = totalBorrowShares > 0n ? BigInt(pos.borrowShares) * totalBorrowAssets / totalBorrowShares : 0n;
+            debt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
             totalDebt += debt;
           } catch (e) {
             console.warn(`[agether] debt calc failed for market ${m.uniqueKey}:`, e instanceof Error ? e.message : e);
@@ -851,7 +851,7 @@ var MorphoClient = class {
         const mktState = await this.morphoBlue.market(m.uniqueKey);
         const totalBorrowShares = BigInt(mktState.totalBorrowShares);
         const totalBorrowAssets = BigInt(mktState.totalBorrowAssets);
-        const currentDebt = totalBorrowShares > 0n ? BigInt(pos.borrowShares) * totalBorrowAssets / totalBorrowShares : 0n;
+        const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
         let collateralValueInLoan;
         try {
           const oracleContract = new Contract2(m.oracle, [
@@ -1214,13 +1214,14 @@ var MorphoClient = class {
     if (!colInfo) throw new AgetherError(`Unknown collateral: ${tokenSymbol}`, "UNKNOWN_COLLATERAL");
     const params = marketParams ?? await this.findMarketForCollateral(tokenSymbol);
     const morphoAddr = this.config.contracts.morphoBlue;
+    const usdcAddr = this.config.contracts.usdc;
     const dest = receiver || await this.getSignerAddress();
     let weiAmount;
+    const markets = await this.getMarkets();
+    const market = markets.find(
+      (m) => m.collateralAsset?.address.toLowerCase() === colInfo.address.toLowerCase()
+    );
     if (amount === "all") {
-      const markets = await this.getMarkets();
-      const market = markets.find(
-        (m) => m.collateralAsset.address.toLowerCase() === colInfo.address.toLowerCase()
-      );
       if (!market) throw new AgetherError("Market not found", "MARKET_NOT_FOUND");
       const pos = await this.morphoBlue.position(market.uniqueKey, acctAddr);
       weiAmount = pos.collateral;
@@ -1228,19 +1229,65 @@ var MorphoClient = class {
     } else {
       weiAmount = ethers2.parseUnits(amount, colInfo.decimals);
     }
-    const data = morphoIface.encodeFunctionData("withdrawCollateral", [
+    let hasDustDebt = false;
+    let dustBorrowShares = 0n;
+    let dustApproveAmount = 0n;
+    if (market) {
+      try {
+        const pos = await this.morphoBlue.position(market.uniqueKey, acctAddr);
+        dustBorrowShares = BigInt(pos.borrowShares);
+        if (dustBorrowShares > 0n) {
+          hasDustDebt = true;
+          const onChainMkt = await this.morphoBlue.market(market.uniqueKey);
+          const totalBorrowAssets = BigInt(onChainMkt.totalBorrowAssets);
+          const totalBorrowShares = BigInt(onChainMkt.totalBorrowShares);
+          const estimated = totalBorrowShares > 0n ? dustBorrowShares * totalBorrowAssets / totalBorrowShares + 10n : 0n;
+          dustApproveAmount = estimated > 0n ? estimated : ethers2.parseUnits("1", 6);
+          console.log(`[agether] dust borrow shares detected: ${dustBorrowShares} shares \u2248 ${ethers2.formatUnits(dustApproveAmount, 6)} USDC \u2014 auto-repaying before withdraw`);
+        }
+      } catch (e) {
+        console.warn("[agether] failed to check borrow shares before withdraw:", e instanceof Error ? e.message : e);
+      }
+    }
+    const withdrawData = morphoIface.encodeFunctionData("withdrawCollateral", [
       this._toTuple(params),
       weiAmount,
       acctAddr,
       dest
     ]);
-    const receipt = await this.exec(morphoAddr, data);
+    let receipt;
+    if (hasDustDebt) {
+      const usdcContract = new Contract2(usdcAddr, ERC20_ABI, this._signer);
+      const acctBalance = await usdcContract.balanceOf(acctAddr);
+      if (acctBalance < dustApproveAmount) {
+        const shortfall = dustApproveAmount - acctBalance;
+        const eoaBalance = await usdcContract.balanceOf(await this.getSignerAddress());
+        if (eoaBalance >= shortfall) {
+          console.log(`[agether] transferring ${ethers2.formatUnits(shortfall, 6)} USDC from EOA \u2192 AgentAccount for dust repay`);
+          const transferTx = await usdcContract.transfer(acctAddr, shortfall);
+          await transferTx.wait();
+          this._refreshSigner();
+        }
+      }
+      const targets = [usdcAddr, morphoAddr, morphoAddr];
+      const values = [0n, 0n, 0n];
+      const datas = [
+        erc20Iface.encodeFunctionData("approve", [morphoAddr, dustApproveAmount]),
+        morphoIface.encodeFunctionData("repay", [
+          this._toTuple(params),
+          0n,
+          dustBorrowShares,
+          acctAddr,
+          "0x"
+        ]),
+        withdrawData
+      ];
+      receipt = await this.batch(targets, values, datas);
+    } else {
+      receipt = await this.exec(morphoAddr, withdrawData);
+    }
     let remainingCollateral = "0";
     try {
-      const markets = await this.getMarkets();
-      const market = markets.find(
-        (m) => m.collateralAsset.address.toLowerCase() === colInfo.address.toLowerCase()
-      );
       if (market) {
         const pos = await this.morphoBlue.position(market.uniqueKey, acctAddr);
         remainingCollateral = ethers2.formatUnits(pos.collateral, colInfo.decimals);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agether/sdk",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "TypeScript SDK for Agether - autonomous credit for AI agents on Base",
   "main": "dist/index.js",
   "module": "dist/index.mjs",