@agether/sdk 2.3.1 → 2.3.2

package/dist/cli.js

@@ -133,7 +133,8 @@ var init_abis = __esm({
       "function getNonce(address sender, uint192 key) view returns (uint256 nonce)",
       "function balanceOf(address account) view returns (uint256)",
       "function depositTo(address account) payable",
-      "event UserOperationEvent(bytes32 indexed userOpHash, address indexed sender, address indexed paymaster, uint256 nonce, bool success, uint256 actualGasCost, uint256 actualGasUsed)"
+      "event UserOperationEvent(bytes32 indexed userOpHash, address indexed sender, address indexed paymaster, uint256 nonce, bool success, uint256 actualGasCost, uint256 actualGasUsed)",
+      "event UserOperationRevertReason(bytes32 indexed userOpHash, address indexed sender, uint256 nonce, bytes revertReason)"
     ];
     SAFE7579_ACCOUNT_ABI = [
       // ERC-7579 execution (called via UserOp through Safe7579 fallback)
@@ -943,6 +944,41 @@ var init_MorphoClient = __esm({
           params = p;
           usedToken = symbol;
         }
+        try {
+          const marketId = import_ethers.ethers.keccak256(
+            import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
+              ["address", "address", "address", "address", "uint256"],
+              [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
+            )
+          );
+          const pos = await this.morphoBlue.position(marketId, acctAddr);
+          if (pos.collateral === 0n) {
+            throw new AgetherError(
+              `No collateral deposited for ${usedToken}. Deposit collateral first.`,
+              "NO_COLLATERAL"
+            );
+          }
+          const oracleContract = new import_ethers.Contract(params.oracle, ["function price() view returns (uint256)"], this.provider);
+          const oraclePrice = await oracleContract.price();
+          const collateralValueInLoan = BigInt(pos.collateral) * oraclePrice / 10n ** 36n;
+          const maxBorrowTotal = collateralValueInLoan * params.lltv / 10n ** 18n;
+          const mktState = await this.morphoBlue.market(marketId);
+          const totalBorrowShares = BigInt(mktState.totalBorrowShares);
+          const totalBorrowAssets = BigInt(mktState.totalBorrowAssets);
+          const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
+          const maxAdditional = maxBorrowTotal > currentDebt ? maxBorrowTotal - currentDebt : 0n;
+          if (amount > maxAdditional) {
+            const maxUsd = import_ethers.ethers.formatUnits(maxAdditional, 6);
+            const colFormatted = import_ethers.ethers.formatUnits(pos.collateral, 18);
+            throw new AgetherError(
+              `Borrow of $${usdcAmount} USDC exceeds max borrowable $${maxUsd} USDC (collateral: ${colFormatted} ${usedToken}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Deposit more collateral or reduce borrow amount.`,
+              "EXCEEDS_MAX_LTV"
+            );
+          }
+        } catch (e) {
+          if (e instanceof AgetherError) throw e;
+          console.warn("[agether] borrow pre-check failed (proceeding anyway):", e instanceof Error ? e.message : e);
+        }
         const data = morphoIface.encodeFunctionData("borrow", [
           this._toTuple(params),
           amount,
@@ -974,6 +1010,35 @@ var init_MorphoClient = __esm({
         const colWei = import_ethers.ethers.parseUnits(collateralAmount, colInfo.decimals);
         const borrowWei = import_ethers.ethers.parseUnits(borrowUsdcAmount, 6);
         const morphoAddr = this.config.contracts.morphoBlue;
+        try {
+          const marketId = import_ethers.ethers.keccak256(
+            import_ethers.ethers.AbiCoder.defaultAbiCoder().encode(
+              ["address", "address", "address", "address", "uint256"],
+              [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
+            )
+          );
+          const pos = await this.morphoBlue.position(marketId, acctAddr);
+          const totalCollateral = BigInt(pos.collateral) + colWei;
+          const oracleContract = new import_ethers.Contract(params.oracle, ["function price() view returns (uint256)"], this.provider);
+          const oraclePrice = await oracleContract.price();
+          const collateralValueInLoan = totalCollateral * oraclePrice / 10n ** 36n;
+          const maxBorrowTotal = collateralValueInLoan * params.lltv / 10n ** 18n;
+          const mktState = await this.morphoBlue.market(marketId);
+          const totalBorrowShares = BigInt(mktState.totalBorrowShares);
+          const totalBorrowAssets = BigInt(mktState.totalBorrowAssets);
+          const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
+          const maxAdditional = maxBorrowTotal > currentDebt ? maxBorrowTotal - currentDebt : 0n;
+          if (borrowWei > maxAdditional) {
+            const maxUsd = import_ethers.ethers.formatUnits(maxAdditional, 6);
+            throw new AgetherError(
+              `Borrow of $${borrowUsdcAmount} USDC exceeds max borrowable $${maxUsd} USDC (total collateral: ${import_ethers.ethers.formatUnits(totalCollateral, colInfo.decimals)} ${tokenSymbol}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Reduce borrow or increase collateral.`,
+              "EXCEEDS_MAX_LTV"
+            );
+          }
+        } catch (e) {
+          if (e instanceof AgetherError) throw e;
+          console.warn("[agether] depositAndBorrow pre-check failed (proceeding anyway):", e instanceof Error ? e.message : e);
+        }
         const colToken = new import_ethers.Contract(colInfo.address, ERC20_ABI, this._signer);
         const acctBalance = await colToken.balanceOf(acctAddr);
         if (acctBalance < colWei) {
@@ -1343,6 +1408,40 @@ var init_MorphoClient = __esm({
         const tx = await this.entryPoint.handleOps([userOp], await this.getSignerAddress());
         const receipt = await tx.wait();
         this._refreshSigner();
+        const epIface = new import_ethers.ethers.Interface(ENTRYPOINT_V07_ABI);
+        for (const log of receipt.logs) {
+          try {
+            const parsed = epIface.parseLog({ topics: log.topics, data: log.data });
+            if (parsed?.name === "UserOperationEvent" && !parsed.args.success) {
+              let revertMsg = "UserOp inner execution reverted";
+              for (const rLog of receipt.logs) {
+                try {
+                  const rParsed = epIface.parseLog({ topics: rLog.topics, data: rLog.data });
+                  if (rParsed?.name === "UserOperationRevertReason") {
+                    const reason = rParsed.args.revertReason;
+                    try {
+                      if (reason.length >= 10 && reason.slice(0, 10) === "0x08c379a0") {
+                        const decoded = import_ethers.ethers.AbiCoder.defaultAbiCoder().decode(["string"], "0x" + reason.slice(10));
+                        revertMsg = `UserOp reverted: ${decoded[0]}`;
+                      } else {
+                        revertMsg = `UserOp reverted with data: ${reason}`;
+                      }
+                    } catch {
+                      revertMsg = `UserOp reverted with data: ${reason}`;
+                    }
+                    break;
+                  }
+                } catch {
+                  continue;
+                }
+              }
+              throw new AgetherError(revertMsg, "USEROP_EXECUTION_FAILED");
+            }
+          } catch (e) {
+            if (e instanceof AgetherError) throw e;
+            continue;
+          }
+        }
         return receipt;
       }
       /**

package/dist/index.js

@@ -216,7 +216,8 @@ var ENTRYPOINT_V07_ABI = [
   "function getNonce(address sender, uint192 key) view returns (uint256 nonce)",
   "function balanceOf(address account) view returns (uint256)",
   "function depositTo(address account) payable",
-  "event UserOperationEvent(bytes32 indexed userOpHash, address indexed sender, address indexed paymaster, uint256 nonce, bool success, uint256 actualGasCost, uint256 actualGasUsed)"
+  "event UserOperationEvent(bytes32 indexed userOpHash, address indexed sender, address indexed paymaster, uint256 nonce, bool success, uint256 actualGasCost, uint256 actualGasUsed)",
+  "event UserOperationRevertReason(bytes32 indexed userOpHash, address indexed sender, uint256 nonce, bytes revertReason)"
 ];
 var SAFE7579_ACCOUNT_ABI = [
   // ERC-7579 execution (called via UserOp through Safe7579 fallback)
@@ -1192,6 +1193,41 @@ var MorphoClient = class {
       params = p;
       usedToken = symbol;
     }
+    try {
+      const marketId = import_ethers2.ethers.keccak256(
+        import_ethers2.ethers.AbiCoder.defaultAbiCoder().encode(
+          ["address", "address", "address", "address", "uint256"],
+          [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
+        )
+      );
+      const pos = await this.morphoBlue.position(marketId, acctAddr);
+      if (pos.collateral === 0n) {
+        throw new AgetherError(
+          `No collateral deposited for ${usedToken}. Deposit collateral first.`,
+          "NO_COLLATERAL"
+        );
+      }
+      const oracleContract = new import_ethers2.Contract(params.oracle, ["function price() view returns (uint256)"], this.provider);
+      const oraclePrice = await oracleContract.price();
+      const collateralValueInLoan = BigInt(pos.collateral) * oraclePrice / 10n ** 36n;
+      const maxBorrowTotal = collateralValueInLoan * params.lltv / 10n ** 18n;
+      const mktState = await this.morphoBlue.market(marketId);
+      const totalBorrowShares = BigInt(mktState.totalBorrowShares);
+      const totalBorrowAssets = BigInt(mktState.totalBorrowAssets);
+      const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
+      const maxAdditional = maxBorrowTotal > currentDebt ? maxBorrowTotal - currentDebt : 0n;
+      if (amount > maxAdditional) {
+        const maxUsd = import_ethers2.ethers.formatUnits(maxAdditional, 6);
+        const colFormatted = import_ethers2.ethers.formatUnits(pos.collateral, 18);
+        throw new AgetherError(
+          `Borrow of $${usdcAmount} USDC exceeds max borrowable $${maxUsd} USDC (collateral: ${colFormatted} ${usedToken}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Deposit more collateral or reduce borrow amount.`,
+          "EXCEEDS_MAX_LTV"
+        );
+      }
+    } catch (e) {
+      if (e instanceof AgetherError) throw e;
+      console.warn("[agether] borrow pre-check failed (proceeding anyway):", e instanceof Error ? e.message : e);
+    }
     const data = morphoIface.encodeFunctionData("borrow", [
       this._toTuple(params),
       amount,
@@ -1223,6 +1259,35 @@ var MorphoClient = class {
     const colWei = import_ethers2.ethers.parseUnits(collateralAmount, colInfo.decimals);
     const borrowWei = import_ethers2.ethers.parseUnits(borrowUsdcAmount, 6);
     const morphoAddr = this.config.contracts.morphoBlue;
+    try {
+      const marketId = import_ethers2.ethers.keccak256(
+        import_ethers2.ethers.AbiCoder.defaultAbiCoder().encode(
+          ["address", "address", "address", "address", "uint256"],
+          [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
+        )
+      );
+      const pos = await this.morphoBlue.position(marketId, acctAddr);
+      const totalCollateral = BigInt(pos.collateral) + colWei;
+      const oracleContract = new import_ethers2.Contract(params.oracle, ["function price() view returns (uint256)"], this.provider);
+      const oraclePrice = await oracleContract.price();
+      const collateralValueInLoan = totalCollateral * oraclePrice / 10n ** 36n;
+      const maxBorrowTotal = collateralValueInLoan * params.lltv / 10n ** 18n;
+      const mktState = await this.morphoBlue.market(marketId);
+      const totalBorrowShares = BigInt(mktState.totalBorrowShares);
+      const totalBorrowAssets = BigInt(mktState.totalBorrowAssets);
+      const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
+      const maxAdditional = maxBorrowTotal > currentDebt ? maxBorrowTotal - currentDebt : 0n;
+      if (borrowWei > maxAdditional) {
+        const maxUsd = import_ethers2.ethers.formatUnits(maxAdditional, 6);
+        throw new AgetherError(
+          `Borrow of $${borrowUsdcAmount} USDC exceeds max borrowable $${maxUsd} USDC (total collateral: ${import_ethers2.ethers.formatUnits(totalCollateral, colInfo.decimals)} ${tokenSymbol}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Reduce borrow or increase collateral.`,
+          "EXCEEDS_MAX_LTV"
+        );
+      }
+    } catch (e) {
+      if (e instanceof AgetherError) throw e;
+      console.warn("[agether] depositAndBorrow pre-check failed (proceeding anyway):", e instanceof Error ? e.message : e);
+    }
     const colToken = new import_ethers2.Contract(colInfo.address, ERC20_ABI, this._signer);
     const acctBalance = await colToken.balanceOf(acctAddr);
     if (acctBalance < colWei) {
@@ -1592,6 +1657,40 @@ var MorphoClient = class {
     const tx = await this.entryPoint.handleOps([userOp], await this.getSignerAddress());
     const receipt = await tx.wait();
     this._refreshSigner();
+    const epIface = new import_ethers2.ethers.Interface(ENTRYPOINT_V07_ABI);
+    for (const log of receipt.logs) {
+      try {
+        const parsed = epIface.parseLog({ topics: log.topics, data: log.data });
+        if (parsed?.name === "UserOperationEvent" && !parsed.args.success) {
+          let revertMsg = "UserOp inner execution reverted";
+          for (const rLog of receipt.logs) {
+            try {
+              const rParsed = epIface.parseLog({ topics: rLog.topics, data: rLog.data });
+              if (rParsed?.name === "UserOperationRevertReason") {
+                const reason = rParsed.args.revertReason;
+                try {
+                  if (reason.length >= 10 && reason.slice(0, 10) === "0x08c379a0") {
+                    const decoded = import_ethers2.ethers.AbiCoder.defaultAbiCoder().decode(["string"], "0x" + reason.slice(10));
+                    revertMsg = `UserOp reverted: ${decoded[0]}`;
+                  } else {
+                    revertMsg = `UserOp reverted with data: ${reason}`;
+                  }
+                } catch {
+                  revertMsg = `UserOp reverted with data: ${reason}`;
+                }
+                break;
+              }
+            } catch {
+              continue;
+            }
+          }
+          throw new AgetherError(revertMsg, "USEROP_EXECUTION_FAILED");
+        }
+      } catch (e) {
+        if (e instanceof AgetherError) throw e;
+        continue;
+      }
+    }
     return receipt;
   }
   /**

package/dist/index.mjs

@@ -144,7 +144,8 @@ var ENTRYPOINT_V07_ABI = [
   "function getNonce(address sender, uint192 key) view returns (uint256 nonce)",
   "function balanceOf(address account) view returns (uint256)",
   "function depositTo(address account) payable",
-  "event UserOperationEvent(bytes32 indexed userOpHash, address indexed sender, address indexed paymaster, uint256 nonce, bool success, uint256 actualGasCost, uint256 actualGasUsed)"
+  "event UserOperationEvent(bytes32 indexed userOpHash, address indexed sender, address indexed paymaster, uint256 nonce, bool success, uint256 actualGasCost, uint256 actualGasUsed)",
+  "event UserOperationRevertReason(bytes32 indexed userOpHash, address indexed sender, uint256 nonce, bytes revertReason)"
 ];
 var SAFE7579_ACCOUNT_ABI = [
   // ERC-7579 execution (called via UserOp through Safe7579 fallback)
@@ -1120,6 +1121,41 @@ var MorphoClient = class {
       params = p;
       usedToken = symbol;
     }
+    try {
+      const marketId = ethers2.keccak256(
+        ethers2.AbiCoder.defaultAbiCoder().encode(
+          ["address", "address", "address", "address", "uint256"],
+          [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
+        )
+      );
+      const pos = await this.morphoBlue.position(marketId, acctAddr);
+      if (pos.collateral === 0n) {
+        throw new AgetherError(
+          `No collateral deposited for ${usedToken}. Deposit collateral first.`,
+          "NO_COLLATERAL"
+        );
+      }
+      const oracleContract = new Contract2(params.oracle, ["function price() view returns (uint256)"], this.provider);
+      const oraclePrice = await oracleContract.price();
+      const collateralValueInLoan = BigInt(pos.collateral) * oraclePrice / 10n ** 36n;
+      const maxBorrowTotal = collateralValueInLoan * params.lltv / 10n ** 18n;
+      const mktState = await this.morphoBlue.market(marketId);
+      const totalBorrowShares = BigInt(mktState.totalBorrowShares);
+      const totalBorrowAssets = BigInt(mktState.totalBorrowAssets);
+      const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
+      const maxAdditional = maxBorrowTotal > currentDebt ? maxBorrowTotal - currentDebt : 0n;
+      if (amount > maxAdditional) {
+        const maxUsd = ethers2.formatUnits(maxAdditional, 6);
+        const colFormatted = ethers2.formatUnits(pos.collateral, 18);
+        throw new AgetherError(
+          `Borrow of $${usdcAmount} USDC exceeds max borrowable $${maxUsd} USDC (collateral: ${colFormatted} ${usedToken}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Deposit more collateral or reduce borrow amount.`,
+          "EXCEEDS_MAX_LTV"
+        );
+      }
+    } catch (e) {
+      if (e instanceof AgetherError) throw e;
+      console.warn("[agether] borrow pre-check failed (proceeding anyway):", e instanceof Error ? e.message : e);
+    }
     const data = morphoIface.encodeFunctionData("borrow", [
       this._toTuple(params),
       amount,
@@ -1151,6 +1187,35 @@ var MorphoClient = class {
     const colWei = ethers2.parseUnits(collateralAmount, colInfo.decimals);
     const borrowWei = ethers2.parseUnits(borrowUsdcAmount, 6);
     const morphoAddr = this.config.contracts.morphoBlue;
+    try {
+      const marketId = ethers2.keccak256(
+        ethers2.AbiCoder.defaultAbiCoder().encode(
+          ["address", "address", "address", "address", "uint256"],
+          [params.loanToken, params.collateralToken, params.oracle, params.irm, params.lltv]
+        )
+      );
+      const pos = await this.morphoBlue.position(marketId, acctAddr);
+      const totalCollateral = BigInt(pos.collateral) + colWei;
+      const oracleContract = new Contract2(params.oracle, ["function price() view returns (uint256)"], this.provider);
+      const oraclePrice = await oracleContract.price();
+      const collateralValueInLoan = totalCollateral * oraclePrice / 10n ** 36n;
+      const maxBorrowTotal = collateralValueInLoan * params.lltv / 10n ** 18n;
+      const mktState = await this.morphoBlue.market(marketId);
+      const totalBorrowShares = BigInt(mktState.totalBorrowShares);
+      const totalBorrowAssets = BigInt(mktState.totalBorrowAssets);
+      const currentDebt = totalBorrowShares > 0n ? (BigInt(pos.borrowShares) * totalBorrowAssets + totalBorrowShares - 1n) / totalBorrowShares : 0n;
+      const maxAdditional = maxBorrowTotal > currentDebt ? maxBorrowTotal - currentDebt : 0n;
+      if (borrowWei > maxAdditional) {
+        const maxUsd = ethers2.formatUnits(maxAdditional, 6);
+        throw new AgetherError(
+          `Borrow of $${borrowUsdcAmount} USDC exceeds max borrowable $${maxUsd} USDC (total collateral: ${ethers2.formatUnits(totalCollateral, colInfo.decimals)} ${tokenSymbol}, LLTV: ${Number(params.lltv) / 1e18 * 100}%). Reduce borrow or increase collateral.`,
+          "EXCEEDS_MAX_LTV"
+        );
+      }
+    } catch (e) {
+      if (e instanceof AgetherError) throw e;
+      console.warn("[agether] depositAndBorrow pre-check failed (proceeding anyway):", e instanceof Error ? e.message : e);
+    }
     const colToken = new Contract2(colInfo.address, ERC20_ABI, this._signer);
     const acctBalance = await colToken.balanceOf(acctAddr);
     if (acctBalance < colWei) {
@@ -1520,6 +1585,40 @@ var MorphoClient = class {
     const tx = await this.entryPoint.handleOps([userOp], await this.getSignerAddress());
     const receipt = await tx.wait();
     this._refreshSigner();
+    const epIface = new ethers2.Interface(ENTRYPOINT_V07_ABI);
+    for (const log of receipt.logs) {
+      try {
+        const parsed = epIface.parseLog({ topics: log.topics, data: log.data });
+        if (parsed?.name === "UserOperationEvent" && !parsed.args.success) {
+          let revertMsg = "UserOp inner execution reverted";
+          for (const rLog of receipt.logs) {
+            try {
+              const rParsed = epIface.parseLog({ topics: rLog.topics, data: rLog.data });
+              if (rParsed?.name === "UserOperationRevertReason") {
+                const reason = rParsed.args.revertReason;
+                try {
+                  if (reason.length >= 10 && reason.slice(0, 10) === "0x08c379a0") {
+                    const decoded = ethers2.AbiCoder.defaultAbiCoder().decode(["string"], "0x" + reason.slice(10));
+                    revertMsg = `UserOp reverted: ${decoded[0]}`;
+                  } else {
+                    revertMsg = `UserOp reverted with data: ${reason}`;
+                  }
+                } catch {
+                  revertMsg = `UserOp reverted with data: ${reason}`;
+                }
+                break;
+              }
+            } catch {
+              continue;
+            }
+          }
+          throw new AgetherError(revertMsg, "USEROP_EXECUTION_FAILED");
+        }
+      } catch (e) {
+        if (e instanceof AgetherError) throw e;
+        continue;
+      }
+    }
     return receipt;
   }
   /**

package/package.json

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