@morpho-org/blue-sdk 1.0.4 → 1.0.6

package/lib/addresses.d.ts

@@ -71,7 +71,7 @@ export declare const addresses: {
     readonly 8453: {
         readonly morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb";
         readonly permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3";
-        readonly bundler: "0xb5D342521EB5b983aE6a6324A4D9eac87C9D1987";
+        readonly bundler: "0x23055618898e202386e6c13955a58D3C68200BFB";
         readonly wNative: "0x4200000000000000000000000000000000000006";
         readonly adaptiveCurveIrm: "0x46415998764C29aB2a25CbeA6254146D50D22687";
         readonly publicAllocator: "0xA090dD1a701408Df1d4d0B85b716c87565f90467";

package/lib/addresses.js

@@ -79,7 +79,7 @@ exports.addresses = {
     [chain_1.ChainId.BaseMainnet]: {
         morpho: "0xBBBBBbbBBb9cC5e90e3b3Af64bdAF62C37EEFFCb",
         permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
-        bundler: "0xb5D342521EB5b983aE6a6324A4D9eac87C9D1987",
+        bundler: "0x23055618898e202386e6c13955a58D3C68200BFB",
         wNative: "0x4200000000000000000000000000000000000006",
         adaptiveCurveIrm: "0x46415998764C29aB2a25CbeA6254146D50D22687",
         publicAllocator: "0xA090dD1a701408Df1d4d0B85b716c87565f90467",

package/lib/market/Market.d.ts

@@ -144,7 +144,10 @@ export declare class Market implements InputMarket {
     toSupplyShares(assets: BigNumberish, rounding?: RoundingDirection): bigint;
     toBorrowAssets(shares: BigNumberish, rounding?: RoundingDirection): bigint;
     toBorrowShares(assets: BigNumberish, rounding?: RoundingDirection): bigint;
-    getBorrowCapacityLimit(collateral: bigint): CapacityLimit;
+    getBorrowCapacityLimit({ collateral, borrowShares, }: {
+        collateral: bigint;
+        borrowShares?: bigint;
+    }): CapacityLimit;
     getRepayCapacityLimit(borrowShares: bigint, loanTokenBalance: bigint): CapacityLimit;
     getWithdrawCapacityLimit(supplyShares: bigint): CapacityLimit;
     getWithdrawCollateralCapacityLimit(position: {

package/lib/market/Market.js

@@ -170,8 +170,9 @@ class Market {
     toBorrowShares(assets, rounding) {
         return MarketUtils_1.MarketUtils.toBorrowShares(assets, this, rounding);
     }
-    getBorrowCapacityLimit(collateral) {
-        const maxBorrowableAssets = this.getMaxBorrowAssets(collateral);
+    getBorrowCapacityLimit({ collateral, borrowShares = 0n, }) {
+        // handle edge cases when the user is liquidatable (maxBorrow < borrow)
+        const maxBorrowableAssets = maths_1.MathUtils.zeroFloorSub(this.getMaxBorrowAssets(collateral), this.toBorrowAssets(borrowShares));
         const { liquidity } = this;
         if (maxBorrowableAssets > liquidity)
             return {
@@ -227,7 +228,7 @@ class Market {
                 limiter: CapacityLimitReason.balance,
             },
             withdraw: this.getWithdrawCapacityLimit(position.supplyShares),
-            borrow: this.getBorrowCapacityLimit(position.collateral),
+            borrow: this.getBorrowCapacityLimit(position),
             repay: this.getRepayCapacityLimit(position.borrowShares, loanTokenBalance),
             supplyCollateral: {
                 value: collateralTokenBalance,

package/lib/market/MarketUtils.js

@@ -24,8 +24,12 @@ var MarketUtils;
     MarketUtils.getLiquidationIncentiveFactor = getLiquidationIncentiveFactor;
     function getUtilization({ totalSupplyAssets, totalBorrowAssets, }) {
         totalSupplyAssets = (0, ethers_1.toBigInt)(totalSupplyAssets);
-        if (totalSupplyAssets === 0n)
+        totalBorrowAssets = (0, ethers_1.toBigInt)(totalBorrowAssets);
+        if (totalSupplyAssets === 0n) {
+            if (totalBorrowAssets > 0n)
+                return ethers_1.MaxUint256;
             return 0n;
+        }
         return maths_1.MathLib.wDivDown(totalBorrowAssets, totalSupplyAssets);
     }
     MarketUtils.getUtilization = getUtilization;

package/lib/position/Position.js

@@ -124,7 +124,7 @@ class AccrualPosition extends Position {
         return this.market.getBorrowCapacityUsage(this);
     }
     get borrowCapacityLimit() {
-        return this.market.getBorrowCapacityLimit(this.collateral);
+        return this.market.getBorrowCapacityLimit(this);
     }
     get withdrawCapacityLimit() {
         return this.market.getWithdrawCapacityLimit(this.supplyShares);

package/lib/token/ERC20Metadata.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ERC20Metadata__factory = exports.Bytes32ERC20__factory = exports.decodeString = exports.isBytes32ERC20Metadata = void 0;
 const ethers_1 = require("ethers");
 const ethers_types_1 = require("ethers-types");
-const addresses_1 = __importDefault(require("@morpho-org/blue-sdk/src/addresses"));
+const addresses_1 = __importDefault(require("../addresses"));
 const chain_1 = require("../chain");
 const isBytes32ERC20Metadata = (address, chainId) => {
     switch (chainId) {

package/lib/token/WrappedToken.d.ts

@@ -1,6 +1,6 @@
 import { RoundingDirection } from "../maths";
 import { Address } from "../types";
-import { Vault } from "../vault";
+import { Vault, VaultConfig } from "../vault";
 import { InputToken, Token } from "./Token";
 export declare abstract class WrappedToken extends Token {
     readonly underlying: Address;
@@ -33,10 +33,10 @@ export declare class ExchangeRateWrappedToken extends WrappedToken {
     constructor(token: InputToken, underlying: Address, wrappedTokenExchangeRate: bigint);
 }
 export declare class VaultToken extends WrappedToken {
-    readonly underlying: Address;
     protected _wrap(amount: bigint, rounding: RoundingDirection): bigint;
     protected _unwrap(amount: bigint, rounding: RoundingDirection): bigint;
     totalAssets: bigint;
     totalSupply: bigint;
-    constructor(token: InputToken, underlying: Address, { totalAssets, totalSupply }: Pick<Vault, "totalAssets" | "totalSupply">);
+    config: VaultConfig;
+    constructor(token: InputToken, { totalAssets, totalSupply, config, }: Pick<Vault, "totalAssets" | "totalSupply" | "config">);
 }

package/lib/token/WrappedToken.js

@@ -4,6 +4,7 @@ exports.VaultToken = exports.ExchangeRateWrappedToken = exports.ConstantWrappedT
 const ethers_1 = require("ethers");
 const ethers_2 = require("../ethers");
 const maths_1 = require("../maths");
+const vault_1 = require("../vault");
 const Token_1 = require("./Token");
 class WrappedToken extends Token_1.Token {
     constructor(token, underlying) {
@@ -72,16 +73,16 @@ class ExchangeRateWrappedToken extends WrappedToken {
 exports.ExchangeRateWrappedToken = ExchangeRateWrappedToken;
 class VaultToken extends WrappedToken {
     _wrap(amount, rounding) {
-        return maths_1.SharesMath.toShares(amount, this.totalAssets, this.totalSupply, rounding);
+        return vault_1.VaultUtils.toShares(amount, this, this.config, rounding);
     }
     _unwrap(amount, rounding) {
-        return maths_1.SharesMath.toAssets(amount, this.totalAssets, this.totalSupply, rounding);
+        return vault_1.VaultUtils.toAssets(amount, this, this.config, rounding);
     }
-    constructor(token, underlying, { totalAssets, totalSupply }) {
-        super(token, underlying);
-        this.underlying = underlying;
+    constructor(token, { totalAssets, totalSupply, config, }) {
+        super(token, config.asset);
         this.totalAssets = totalAssets;
         this.totalSupply = totalSupply;
+        this.config = config;
     }
 }
 exports.VaultToken = VaultToken;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morpho-org/blue-sdk",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "author": "Morpho Association <contact@morpho.org>",
   "license": "MIT",
   "main": "lib/index.js",
@@ -50,5 +50,5 @@
     ],
     "preset": "ts-jest"
   },
-  "gitHead": "e3de20633be74fc506bd0a3a8d0115bcc0744d70"
+  "gitHead": "bbda7acf4856a4096456091ef5862d0df7e06f22"
 }