@morpho-org/blue-sdk 1.7.1 → 1.7.3

package/lib/market/Market.d.ts

@@ -114,25 +114,25 @@ export declare class Market implements InputMarket {
     get borrowApy(): bigint;
     /**
      * Returns a new market derived from this market, whose interest has been accrued up to the given timestamp.
-     * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to `lastUpdate`.
+     * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to `lastUpdate`. Defaults to `lastUpdate` (returns a copy of the market).
      */
-    accrueInterest(timestamp: BigIntish): Market;
-    supply(assets: bigint, shares: bigint, timestamp?: bigint): {
+    accrueInterest(timestamp?: BigIntish): Market;
+    supply(assets: bigint, shares: bigint, timestamp?: BigIntish): {
         market: Market;
         assets: bigint;
         shares: bigint;
     };
-    withdraw(assets: bigint, shares: bigint, timestamp?: bigint): {
+    withdraw(assets: bigint, shares: bigint, timestamp?: BigIntish): {
         market: Market;
         assets: bigint;
         shares: bigint;
     };
-    borrow(assets: bigint, shares: bigint, timestamp?: bigint): {
+    borrow(assets: bigint, shares: bigint, timestamp?: BigIntish): {
         market: Market;
         assets: bigint;
         shares: bigint;
     };
-    repay(assets: bigint, shares: bigint, timestamp?: bigint): {
+    repay(assets: bigint, shares: bigint, timestamp?: BigIntish): {
         market: Market;
         assets: bigint;
         shares: bigint;

package/lib/market/Market.js

@@ -129,15 +129,15 @@ class Market {
     }
     /**
      * Returns a new market derived from this market, whose interest has been accrued up to the given timestamp.
-     * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to `lastUpdate`.
+     * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to `lastUpdate`. Defaults to `lastUpdate` (returns a copy of the market).
      */
-    accrueInterest(timestamp) {
+    accrueInterest(timestamp = this.lastUpdate) {
         timestamp = BigInt(timestamp);
         const elapsed = timestamp - this.lastUpdate;
         if (elapsed < 0n)
             throw new errors_1.BlueErrors.InvalidInterestAccrual(this.id, timestamp, this.lastUpdate);
         if (elapsed === 0n)
-            return this;
+            return new Market(this);
         let borrowRate = 0n;
         let { rateAtTarget } = this;
         if (rateAtTarget != null) {
@@ -155,7 +155,7 @@ class Market {
             rateAtTarget,
         });
     }
-    supply(assets, shares, timestamp = this.lastUpdate) {
+    supply(assets, shares, timestamp) {
         if (assets === 0n && shares === 0n)
             throw new errors_1.BlueErrors.InconsistentInput();
         const market = this.accrueInterest(timestamp);
@@ -167,7 +167,7 @@ class Market {
         market.totalSupplyShares += shares;
         return { market, assets, shares };
     }
-    withdraw(assets, shares, timestamp = this.lastUpdate) {
+    withdraw(assets, shares, timestamp) {
         if (assets === 0n && shares === 0n)
             throw new errors_1.BlueErrors.InconsistentInput();
         const market = this.accrueInterest(timestamp);
@@ -181,7 +181,7 @@ class Market {
             throw new errors_1.BlueErrors.InsufficientLiquidity(market.id);
         return { market, assets, shares };
     }
-    borrow(assets, shares, timestamp = this.lastUpdate) {
+    borrow(assets, shares, timestamp) {
         if (assets === 0n && shares === 0n)
             throw new errors_1.BlueErrors.InconsistentInput();
         const market = this.accrueInterest(timestamp);
@@ -195,7 +195,7 @@ class Market {
             throw new errors_1.BlueErrors.InsufficientLiquidity(market.id);
         return { market, assets, shares };
     }
-    repay(assets, shares, timestamp = this.lastUpdate) {
+    repay(assets, shares, timestamp) {
         if (assets === 0n && shares === 0n)
             throw new errors_1.BlueErrors.InconsistentInput();
         const market = this.accrueInterest(timestamp);

package/lib/market/MarketConfig.d.ts

@@ -40,13 +40,13 @@ export declare class MarketConfig implements MarketParams {
      * The market's liquidation Loan-To-Value (scaled by WAD).
      */
     readonly lltv: bigint;
-    constructor({ collateralToken, loanToken, oracle, irm, lltv }: MarketParams);
     /**
      * The market's hex-encoded id, defined as the hash of the market params.
      */
-    get id(): MarketId;
+    readonly id: MarketId;
     /**
      * The market's liquidation incentive factor.
      */
-    get liquidationIncentiveFactor(): bigint;
+    readonly liquidationIncentiveFactor: bigint;
+    constructor(params: MarketParams);
 }

package/lib/market/MarketConfig.js

@@ -50,25 +50,27 @@ class MarketConfig {
      * The market's liquidation Loan-To-Value (scaled by WAD).
      */
     lltv;
-    constructor({ collateralToken, loanToken, oracle, irm, lltv }) {
-        this.collateralToken = collateralToken;
-        this.loanToken = loanToken;
-        this.oracle = oracle;
-        this.irm = irm;
-        this.lltv = BigInt(lltv);
-        MarketConfig._CACHE[this.id] = this;
-    }
     /**
      * The market's hex-encoded id, defined as the hash of the market params.
      */
-    get id() {
-        return MarketUtils_1.MarketUtils.getMarketId(this);
-    }
+    // Cached because params are readonly.
+    id;
     /**
      * The market's liquidation incentive factor.
      */
-    get liquidationIncentiveFactor() {
-        return MarketUtils_1.MarketUtils.getLiquidationIncentiveFactor(this);
+    // Cached because lltv is readonly.
+    liquidationIncentiveFactor;
+    constructor(params) {
+        const { collateralToken, loanToken, oracle, irm, lltv } = params;
+        this.collateralToken = collateralToken;
+        this.loanToken = loanToken;
+        this.oracle = oracle;
+        this.irm = irm;
+        this.lltv = BigInt(lltv);
+        this.id = MarketUtils_1.MarketUtils.getMarketId(params);
+        this.liquidationIncentiveFactor =
+            MarketUtils_1.MarketUtils.getLiquidationIncentiveFactor(params);
+        MarketConfig._CACHE[this.id] = this;
     }
 }
 exports.MarketConfig = MarketConfig;

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/lib/position/Position.d.ts

@@ -1,5 +1,5 @@
 import { Market } from "../market";
-import { Address, MarketId } from "../types";
+import { Address, BigIntish, MarketId } from "../types";
 export interface InputPosition {
     user: Address;
     marketId: MarketId;
@@ -91,25 +91,29 @@ export declare class AccrualPosition extends Position implements InputAccrualPos
     get borrowCapacityLimit(): import("../market").CapacityLimit;
     get withdrawCapacityLimit(): import("../market").CapacityLimit;
     get withdrawCollateralCapacityLimit(): import("../market").CapacityLimit;
-    accrueInterest(timestamp: bigint): AccrualPosition;
-    supply(assets: bigint, shares: bigint, timestamp?: bigint): {
+    /**
+     * Returns a new position derived from this position, whose interest has been accrued up to the given timestamp.
+     * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to the market's `lastUpdate`.
+     */
+    accrueInterest(timestamp?: BigIntish): AccrualPosition;
+    supply(assets: bigint, shares: bigint, timestamp?: BigIntish): {
         position: AccrualPosition;
         assets: bigint;
         shares: bigint;
     };
-    withdraw(assets: bigint, shares: bigint, timestamp?: bigint): {
+    withdraw(assets: bigint, shares: bigint, timestamp?: BigIntish): {
         position: AccrualPosition;
         assets: bigint;
         shares: bigint;
     };
-    supplyCollateral(assets: bigint, timestamp?: bigint): AccrualPosition;
-    withdrawCollateral(assets: bigint, timestamp?: bigint): AccrualPosition;
-    borrow(assets: bigint, shares: bigint, timestamp?: bigint): {
+    supplyCollateral(assets: bigint): AccrualPosition;
+    withdrawCollateral(assets: bigint, timestamp?: BigIntish): AccrualPosition;
+    borrow(assets: bigint, shares: bigint, timestamp?: BigIntish): {
         position: AccrualPosition;
         assets: bigint;
         shares: bigint;
     };
-    repay(assets: bigint, shares: bigint, timestamp?: bigint): {
+    repay(assets: bigint, shares: bigint, timestamp?: BigIntish): {
         position: AccrualPosition;
         assets: bigint;
         shares: bigint;

package/lib/position/Position.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccrualPosition = exports.Position = void 0;
 const errors_1 = require("../errors");
+const market_1 = require("../market");
 class Position {
     /**
      * The user holding this position.
@@ -126,6 +127,10 @@ class AccrualPosition extends Position {
     get withdrawCollateralCapacityLimit() {
         return this.market.getWithdrawCollateralCapacityLimit(this);
     }
+    /**
+     * Returns a new position derived from this position, whose interest has been accrued up to the given timestamp.
+     * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to the market's `lastUpdate`.
+     */
     accrueInterest(timestamp) {
         return new AccrualPosition(this, this.market.accrueInterest(timestamp));
     }
@@ -151,12 +156,11 @@ class AccrualPosition extends Position {
             shares,
         };
     }
-    supplyCollateral(assets, timestamp = this.market.lastUpdate) {
-        const market = this.market.accrueInterest(timestamp);
+    supplyCollateral(assets) {
         this.collateral += assets;
-        return new AccrualPosition(this, market);
+        return new AccrualPosition(this, new market_1.Market(this.market));
     }
-    withdrawCollateral(assets, timestamp = this.market.lastUpdate) {
+    withdrawCollateral(assets, timestamp) {
         const market = this.market.accrueInterest(timestamp);
         this.collateral -= assets;
         if (this.collateral < 0n)

package/lib/vault/Vault.d.ts

@@ -1,7 +1,7 @@
 import { CapacityLimit } from "../market";
 import { RoundingDirection } from "../maths";
 import { VaultToken } from "../token";
-import { Address, MarketId } from "../types";
+import { Address, BigIntish, MarketId } from "../types";
 import { VaultConfig } from "./VaultConfig";
 import { InputVaultMarketAllocation, VaultMarketAllocation } from "./VaultMarketAllocation";
 export interface Pending<T> {
@@ -158,5 +158,9 @@ export declare class AccrualVault extends Vault implements InputAccrualVault {
     getAllocationProportion(marketId: MarketId): bigint;
     getDepositCapacityLimit(assets: bigint): CapacityLimit;
     getWithdrawCapacityLimit(shares: bigint): CapacityLimit;
-    accrueInterest(timestamp: bigint): AccrualVault;
+    /**
+     * Returns a new vault derived from this vault, whose interest has been accrued up to the given timestamp.
+     * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to each of the vault's market's `lastUpdate`.
+     */
+    accrueInterest(timestamp: BigIntish): AccrualVault;
 }

package/lib/vault/Vault.js

@@ -135,12 +135,9 @@ class AccrualVault extends Vault {
             withdrawQueue: allocations.map(({ position }) => position.market.id),
             totalAssets: allocations.reduce((total, { position }) => total + position.supplyAssets, 0n),
         });
-        this.allocations = new Map(allocations.map(({ config, position }) => [
-            position.market.id,
-            new VaultMarketAllocation_1.VaultMarketAllocation({
-                config,
-                position,
-            }),
+        this.allocations = new Map(allocations.map((allocation) => [
+            allocation.position.market.id,
+            new VaultMarketAllocation_1.VaultMarketAllocation(allocation),
         ]));
         this.collateralAllocations = new Map();
         for (const { marketId, position } of this.allocations.values()) {
@@ -216,6 +213,10 @@ class AccrualVault extends Vault {
             limiter: market_1.CapacityLimitReason.balance,
         };
     }
+    /**
+     * Returns a new vault derived from this vault, whose interest has been accrued up to the given timestamp.
+     * @param timestamp The timestamp at which to accrue interest. Must be greater than or equal to each of the vault's market's `lastUpdate`.
+     */
     accrueInterest(timestamp) {
         const vault = new AccrualVault(this, Array.from(this.allocations.values(), ({ config, position }) => ({
             config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morpho-org/blue-sdk",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "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.1",
-    "@morpho-org/morpho-ts": "^1.7.1",
+    "@morpho-org/morpho-test": "^1.7.3",
+    "@morpho-org/morpho-ts": "^1.7.3",
     "@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.1"
+    "@morpho-org/morpho-ts": "^1.7.3"
   },
   "publishConfig": {
     "access": "public"
@@ -49,5 +49,5 @@
     ],
     "preset": "ts-jest"
   },
-  "gitHead": "396bb4772f53ae6563d1c9e7afd3572f365a0303"
+  "gitHead": "9084b3dbc30b38d90bb118f7e503110ba148eb51"
 }