@morpho-org/blue-sdk 1.7.2 → 1.7.4

package/lib/market/Market.d.ts

@@ -12,6 +12,12 @@ export interface CapacityLimit {
     value: bigint;
     limiter: CapacityLimitReason;
 }
+export interface MaxBorrowOptions {
+    maxLtv?: bigint;
+}
+export interface MaxWithdrawCollateralOptions {
+    maxLtv?: bigint;
+}
 export interface MaxPositionCapacities {
     supply: CapacityLimit;
     withdraw: CapacityLimit;
@@ -190,7 +196,7 @@ export declare class Market implements InputMarket {
      * Returns the maximum amount of loan assets that can be borrowed given a certain amount of collateral.
      * @param collateral The amount of collateral to consider.
      */
-    getMaxBorrowAssets(collateral: bigint): bigint;
+    getMaxBorrowAssets(collateral: bigint, { maxLtv }?: MaxBorrowOptions): bigint;
     /**
      * Returns the maximum amount of loan assets that can be borrowed given a certain borrow position.
      * @param position The borrow position to consider.
@@ -224,7 +230,7 @@ export declare class Market implements InputMarket {
     getWithdrawableCollateral(position: {
         collateral: bigint;
         borrowShares: bigint;
-    }): bigint;
+    }, { maxLtv }?: MaxWithdrawCollateralOptions): bigint;
     /**
      * Returns whether a given borrow position is healthy.
      * @param position The borrow position to check.
@@ -281,7 +287,7 @@ export declare class Market implements InputMarket {
     getBorrowCapacityLimit({ collateral, borrowShares, }: {
         collateral: bigint;
         borrowShares?: bigint;
-    }): CapacityLimit;
+    }, options?: MaxBorrowOptions): CapacityLimit;
     /**
      * Returns the maximum amount of loan assets that can be repaid given a certain borrow position
      * and a balance of loan assets, and the reason for the limit.
@@ -304,7 +310,7 @@ export declare class Market implements InputMarket {
     getWithdrawCollateralCapacityLimit(position: {
         collateral: bigint;
         borrowShares: bigint;
-    }): CapacityLimit;
+    }, options?: MaxWithdrawCollateralOptions): CapacityLimit;
     /**
      * Returns the maximum capacity for all interactions with Morpho Blue given a certain position
      * and loan and collateral balances.
@@ -316,5 +322,8 @@ export declare class Market implements InputMarket {
         collateral: bigint;
         supplyShares: bigint;
         borrowShares: bigint;
-    }, loanTokenBalance: bigint, collateralTokenBalance: bigint): MaxPositionCapacities;
+    }, loanTokenBalance: bigint, collateralTokenBalance: bigint, options?: {
+        borrow?: MaxBorrowOptions;
+        withdrawCollateral?: MaxWithdrawCollateralOptions;
+    }): MaxPositionCapacities;
 }

package/lib/market/Market.js

@@ -278,8 +278,10 @@ class Market {
      * Returns the maximum amount of loan assets that can be borrowed given a certain amount of collateral.
      * @param collateral The amount of collateral to consider.
      */
-    getMaxBorrowAssets(collateral) {
-        return MarketUtils_1.MarketUtils.getMaxBorrowAssets(collateral, this, this.config);
+    getMaxBorrowAssets(collateral, { maxLtv = this.config.lltv } = {}) {
+        return MarketUtils_1.MarketUtils.getMaxBorrowAssets(collateral, this, {
+            lltv: maths_1.MathLib.min(maxLtv, this.config.lltv),
+        });
     }
     /**
      * Returns the maximum amount of loan assets that can be borrowed given a certain borrow position.
@@ -313,8 +315,10 @@ class Market {
      * Returns the amount of collateral that can be withdrawn given a certain borrow position.
      * @param position The borrow position to consider.
      */
-    getWithdrawableCollateral(position) {
-        return MarketUtils_1.MarketUtils.getWithdrawableCollateral(position, this, this.config);
+    getWithdrawableCollateral(position, { maxLtv = this.config.lltv } = {}) {
+        return MarketUtils_1.MarketUtils.getWithdrawableCollateral(position, this, {
+            lltv: maths_1.MathLib.min(maxLtv, this.config.lltv),
+        });
     }
     /**
      * Returns whether a given borrow position is healthy.
@@ -363,9 +367,9 @@ class Market {
      * and the reason for the limit.
      * @param position The borrow position to consider.
      */
-    getBorrowCapacityLimit({ collateral, borrowShares = 0n, }) {
+    getBorrowCapacityLimit({ collateral, borrowShares = 0n, }, options) {
         // handle edge cases when the user is liquidatable (maxBorrow < borrow)
-        const maxBorrowableAssets = maths_1.MathLib.zeroFloorSub(this.getMaxBorrowAssets(collateral), this.toBorrowAssets(borrowShares));
+        const maxBorrowableAssets = maths_1.MathLib.zeroFloorSub(this.getMaxBorrowAssets(collateral, options), this.toBorrowAssets(borrowShares));
         const { liquidity } = this;
         if (maxBorrowableAssets > liquidity)
             return {
@@ -417,8 +421,8 @@ class Market {
      * and the reason for the limit.
      * @param position The borrow position to consider.
      */
-    getWithdrawCollateralCapacityLimit(position) {
-        const withdrawableCollateral = this.getWithdrawableCollateral(position);
+    getWithdrawCollateralCapacityLimit(position, options) {
+        const withdrawableCollateral = this.getWithdrawableCollateral(position, options);
         if (position.collateral > withdrawableCollateral)
             return {
                 value: withdrawableCollateral,
@@ -436,20 +440,20 @@ class Market {
      * @param loanTokenBalance The balance of loan assets.
      * @param collateralTokenBalance The balance of collateral assets.
      */
-    getMaxCapacities(position, loanTokenBalance, collateralTokenBalance) {
+    getMaxCapacities(position, loanTokenBalance, collateralTokenBalance, options) {
         return {
             supply: {
                 value: loanTokenBalance,
                 limiter: CapacityLimitReason.balance,
             },
             withdraw: this.getWithdrawCapacityLimit(position),
-            borrow: this.getBorrowCapacityLimit(position),
+            borrow: this.getBorrowCapacityLimit(position, options?.borrow),
             repay: this.getRepayCapacityLimit(position.borrowShares, loanTokenBalance),
             supplyCollateral: {
                 value: collateralTokenBalance,
                 limiter: CapacityLimitReason.balance,
             },
-            withdrawCollateral: this.getWithdrawCollateralCapacityLimit(position),
+            withdrawCollateral: this.getWithdrawCollateralCapacityLimit(position, options?.withdrawCollateral),
         };
     }
 }

package/lib/market/MarketUtils.js

@@ -22,7 +22,7 @@ var MarketUtils;
             market.collateralToken.substring(2).toLowerCase().padStart(64, "0") +
             market.oracle.substring(2).padStart(64, "0") +
             market.irm.substring(2).toLowerCase().padStart(64, "0") +
-            market.lltv.toString(16).padStart(64, "0")).toString("hex")}`;
+            BigInt(market.lltv).toString(16).padStart(64, "0")).toString("hex")}`;
     }
     MarketUtils.getMarketId = getMarketId;
     /**

package/lib/maths/AdaptiveCurveIrmLib.js

@@ -121,8 +121,11 @@ var AdaptiveCurveIrmLib;
         rateAtTarget = BigInt(rateAtTarget);
         if (borrowRate >= rateAtTarget) {
             const maxBorrowRate = MathLib_1.MathLib.wMulDown(rateAtTarget, AdaptiveCurveIrmLib.CURVE_STEEPNESS);
+            const diffToMaxBorrowRate = maxBorrowRate - rateAtTarget;
+            if (diffToMaxBorrowRate === 0n)
+                return MathLib_1.MathLib.WAD;
             return MathLib_1.MathLib.min(MathLib_1.MathLib.WAD, AdaptiveCurveIrmLib.TARGET_UTILIZATION +
-                MathLib_1.MathLib.mulDivDown(MathLib_1.MathLib.WAD - AdaptiveCurveIrmLib.TARGET_UTILIZATION, borrowRate - rateAtTarget, maxBorrowRate - rateAtTarget));
+                MathLib_1.MathLib.mulDivDown(MathLib_1.MathLib.WAD - AdaptiveCurveIrmLib.TARGET_UTILIZATION, borrowRate - rateAtTarget, diffToMaxBorrowRate));
         }
         const minBorrowRate = MathLib_1.MathLib.wDivDown(rateAtTarget, AdaptiveCurveIrmLib.CURVE_STEEPNESS);
         return MathLib_1.MathLib.max(0n, MathLib_1.MathLib.mulDivDown(AdaptiveCurveIrmLib.TARGET_UTILIZATION, borrowRate - minBorrowRate, rateAtTarget - minBorrowRate));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morpho-org/blue-sdk",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "author": "Morpho Association <contact@morpho.org>",
   "license": "MIT",
   "main": "lib/index.js",
@@ -16,8 +16,8 @@
     "keccak256": "^1.0.6"
   },
   "devDependencies": {
-    "@morpho-org/morpho-test": "^1.7.2",
-    "@morpho-org/morpho-ts": "^1.7.2",
+    "@morpho-org/morpho-test": "^1.7.4",
+    "@morpho-org/morpho-ts": "^1.7.4",
     "@types/jest": "^29.5.12",
     "@types/node": "^22.1.0",
     "jest": "^29.7.0",
@@ -25,7 +25,7 @@
     "typescript": "^5.4.5"
   },
   "peerDependencies": {
-    "@morpho-org/morpho-ts": "^1.7.2"
+    "@morpho-org/morpho-ts": "^1.7.4"
   },
   "publishConfig": {
     "access": "public"
@@ -49,5 +49,5 @@
     ],
     "preset": "ts-jest"
   },
-  "gitHead": "deea0629f694c66ea05202f357a495775144b839"
+  "gitHead": "09517429d483381a758182323547e8a6fe75f2c9"
 }