@morpho-org/blue-sdk 3.0.2 → 3.0.4

package/lib/addresses.d.ts

@@ -321,6 +321,19 @@ export declare const addressesRegistry: {
         readonly preLiquidationFactory: "0xF184156Cf6Ad4D3dA7F6449D40755A0f9de97ef3";
         readonly wNative: "0xEa237441c92CAe6FC17Caaf9a7acB3f953be4bd1";
     };
+    readonly 123420001114: {
+        readonly morpho: "0xc7CAd9B1377Eb8103397Cb07Cb5c4f03eb2eBEa8";
+        readonly bundler3: {
+            readonly bundler3: "0xc1A86b3a552C5a34e1ecc910341A64Cc89b2CB01";
+            readonly generalAdapter1: "0x86eaf48Fd73c1Aa30E801D01d0efFd731c3E5E85";
+        };
+        readonly adaptiveCurveIrm: "0xeEccdD33c0C06d7DDa31E3C4a1Cdb35a2A756246";
+        readonly publicAllocator: "0x1e145648DA9aC9d831B4F7931C06e9828083BD40";
+        readonly metaMorphoFactory: "0xa8CD521d42b716821D7ddD2Ca6a237087aA5b487";
+        readonly chainlinkOracleFactory: "0x24Bc64f44B429EEA86c8B1f9C03F54Ab0C6c0C15";
+        readonly preLiquidationFactory: "0x6C0155CC30f760DC49138B389F5B69F56eD08841";
+        readonly wNative: "0x1aE9c40eCd2DD6ad5858E5430A556d7aff28A44b";
+    };
 };
 export declare const addresses: Record<number, ChainAddresses>;
 export type AddressLabel = DottedKeys<(typeof addressesRegistry)[ChainId]>;

package/lib/addresses.js

@@ -296,6 +296,19 @@ exports.addressesRegistry = {
         preLiquidationFactory: "0xF184156Cf6Ad4D3dA7F6449D40755A0f9de97ef3",
         wNative: "0xEa237441c92CAe6FC17Caaf9a7acB3f953be4bd1",
     },
+    [chain_js_1.ChainId.CampMainnet]: {
+        morpho: "0xc7CAd9B1377Eb8103397Cb07Cb5c4f03eb2eBEa8",
+        bundler3: {
+            bundler3: "0xc1A86b3a552C5a34e1ecc910341A64Cc89b2CB01",
+            generalAdapter1: "0x86eaf48Fd73c1Aa30E801D01d0efFd731c3E5E85",
+        },
+        adaptiveCurveIrm: "0xeEccdD33c0C06d7DDa31E3C4a1Cdb35a2A756246",
+        publicAllocator: "0x1e145648DA9aC9d831B4F7931C06e9828083BD40",
+        metaMorphoFactory: "0xa8CD521d42b716821D7ddD2Ca6a237087aA5b487",
+        chainlinkOracleFactory: "0x24Bc64f44B429EEA86c8B1f9C03F54Ab0C6c0C15",
+        preLiquidationFactory: "0x6C0155CC30f760DC49138B389F5B69F56eD08841",
+        wNative: "0x1aE9c40eCd2DD6ad5858E5430A556d7aff28A44b",
+    },
 };
 exports.addresses = exports.addressesRegistry;
 const getChainAddresses = (chainId) => {
@@ -341,6 +354,7 @@ exports.unwrappedTokensMapping = {
     [chain_js_1.ChainId.ModeMainnet]: {},
     [chain_js_1.ChainId.CornMainnet]: {},
     [chain_js_1.ChainId.PlumeMainnet]: {},
+    [chain_js_1.ChainId.CampMainnet]: {},
 };
 function getUnwrappedToken(wrappedToken, chainId) {
     return exports.unwrappedTokensMapping[chainId][wrappedToken];

package/lib/chain.d.ts

@@ -13,7 +13,8 @@ export declare enum ChainId {
     HemiMainnet = 43111,
     ModeMainnet = 34443,
     CornMainnet = 21000000,
-    PlumeMainnet = 98866
+    PlumeMainnet = 98866,
+    CampMainnet = 123420001114
 }
 export interface ChainMetadata {
     readonly name: string;

package/lib/chain.js

@@ -18,6 +18,7 @@ var ChainId;
     ChainId[ChainId["ModeMainnet"] = 34443] = "ModeMainnet";
     ChainId[ChainId["CornMainnet"] = 21000000] = "CornMainnet";
     ChainId[ChainId["PlumeMainnet"] = 98866] = "PlumeMainnet";
+    ChainId[ChainId["CampMainnet"] = 123420001114] = "CampMainnet";
 })(ChainId || (exports.ChainId = ChainId = {}));
 var ChainUtils;
 (function (ChainUtils) {
@@ -139,5 +140,12 @@ var ChainUtils;
             explorerUrl: "https://phoenix-explorer.plumenetwork.xyz",
             identifier: "plume",
         },
+        [ChainId.CampMainnet]: {
+            name: "Camp",
+            id: ChainId.CampMainnet,
+            nativeCurrency: { name: "Camp", symbol: "CAMP", decimals: 18 },
+            explorerUrl: "https://basecamp.cloud.blockscout.com/",
+            identifier: "camp",
+        },
     };
 })(ChainUtils || (exports.ChainUtils = ChainUtils = {}));

package/lib/market/Market.d.ts

@@ -104,21 +104,51 @@ export declare class Market implements IMarket {
     /**
      * Returns the rate at which interest accrued for suppliers of this market,
      * since the last time the market was updated (scaled by WAD).
+     * @deprecated There's no such thing as a supply rate in Morpho. Only the supply APY is meaningful.
      */
     get supplyRate(): bigint;
     /**
-     * Returns the rate at which interest accrued for borrowers of this market,
+     * Returns the rate at which interest accrues for borrowers of this market,
      * since the last time the market was updated (scaled by WAD).
+     * If interested in the rate at a specific timestamp, use `getAccrualBorrowRate(timestamp)` instead.
      */
     get borrowRate(): bigint;
     /**
-     * The market's supply-side Annual Percentage Yield (APY) (scaled by WAD).
+     * The market's current, instantaneous supply-side Annual Percentage Yield (APY) (scaled by WAD).
+     * If interested in the APY at a specific timestamp, use `getSupplyApy(timestamp)` instead.
      */
     get supplyApy(): bigint;
     /**
-     * The market's borrow-side Annual Percentage Yield (APY) (scaled by WAD).
+     * The market's current, instantaneous borrow-side Annual Percentage Yield (APY) (scaled by WAD).
+     * If interested in the APY at a specific timestamp, use `getBorrowApy(timestamp)` instead.
      */
     get borrowApy(): bigint;
+    /**
+     * Returns the instantaneous rate at which interest accrues for borrowers of this market,
+     * at the given timestamp, if the state remains unchanged (not accrued) (scaled by WAD).
+     * It is fundamentally different from the rate at which interest is paid by borrowers to lenders in the case of an interest accrual,
+     * as in the case of the AdaptiveCurveIRM, the (approximated) average rate since the last update is used instead.
+     * @param timestamp The timestamp at which to calculate the borrow rate. Must be greater than or equal to `lastUpdate`. Defaults to `Time.timestamp()` (returns the current borrow rate).
+     */
+    getBorrowRate(timestamp?: BigIntish): bigint;
+    /**
+     * Returns the rate at which interest accrues for borrowers of this market,
+     * at the given timestamp, if the state remains unchanged (not accrued) (scaled by WAD).
+     * @param timestamp The timestamp at which to calculate the accrual borrow rate. Must be greater than or equal to `lastUpdate`. Defaults to `Time.timestamp()` (returns the current borrow rate).
+     */
+    getAccrualBorrowRate(timestamp?: BigIntish): bigint;
+    /**
+     * The market's instantaneous borrow-side Annual Percentage Yield (APY) at the given timestamp,
+     * if the state remains unchanged (not accrued) (scaled by WAD).
+     * @param timestamp The timestamp at which to calculate the borrow APY. Must be greater than or equal to `lastUpdate`. Defaults to `Time.timestamp()` (returns the current borrow APY).
+     */
+    getBorrowApy(timestamp?: BigIntish): bigint;
+    /**
+     * The market's instantaneous supply-side Annual Percentage Yield (APY) at the given timestamp,
+     * if the state remains unchanged (not accrued) (scaled by WAD).
+     * @param timestamp The timestamp at which to calculate the supply APY. Must be greater than or equal to `lastUpdate`. Defaults to `Time.timestamp()` (returns the current supply APY).
+     */
+    getSupplyApy(timestamp?: BigIntish): 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`. Defaults to `lastUpdate` (returns a copy of the market).

package/lib/market/Market.js

@@ -103,30 +103,82 @@ class Market {
     /**
      * Returns the rate at which interest accrued for suppliers of this market,
      * since the last time the market was updated (scaled by WAD).
+     * @deprecated There's no such thing as a supply rate in Morpho. Only the supply APY is meaningful.
      */
     get supplyRate() {
         return MarketUtils_js_1.MarketUtils.getSupplyRate(this.borrowRate, this);
     }
     /**
-     * Returns the rate at which interest accrued for borrowers of this market,
+     * Returns the rate at which interest accrues for borrowers of this market,
      * since the last time the market was updated (scaled by WAD).
+     * If interested in the rate at a specific timestamp, use `getAccrualBorrowRate(timestamp)` instead.
      */
     get borrowRate() {
-        if (this.rateAtTarget == null)
-            return 0n;
-        return index_js_1.AdaptiveCurveIrmLib.getBorrowRate(this.utilization, this.rateAtTarget, 0n).avgBorrowRate;
+        return this.getAccrualBorrowRate();
     }
     /**
-     * The market's supply-side Annual Percentage Yield (APY) (scaled by WAD).
+     * The market's current, instantaneous supply-side Annual Percentage Yield (APY) (scaled by WAD).
+     * If interested in the APY at a specific timestamp, use `getSupplyApy(timestamp)` instead.
      */
     get supplyApy() {
-        return MarketUtils_js_1.MarketUtils.compoundRate(this.supplyRate);
+        return this.getSupplyApy();
     }
     /**
-     * The market's borrow-side Annual Percentage Yield (APY) (scaled by WAD).
+     * The market's current, instantaneous borrow-side Annual Percentage Yield (APY) (scaled by WAD).
+     * If interested in the APY at a specific timestamp, use `getBorrowApy(timestamp)` instead.
      */
     get borrowApy() {
-        return MarketUtils_js_1.MarketUtils.compoundRate(this.borrowRate);
+        return this.getBorrowApy();
+    }
+    /**
+     * Returns the instantaneous rate at which interest accrues for borrowers of this market,
+     * at the given timestamp, if the state remains unchanged (not accrued) (scaled by WAD).
+     * It is fundamentally different from the rate at which interest is paid by borrowers to lenders in the case of an interest accrual,
+     * as in the case of the AdaptiveCurveIRM, the (approximated) average rate since the last update is used instead.
+     * @param timestamp The timestamp at which to calculate the borrow rate. Must be greater than or equal to `lastUpdate`. Defaults to `Time.timestamp()` (returns the current borrow rate).
+     */
+    getBorrowRate(timestamp = morpho_ts_1.Time.timestamp()) {
+        if (this.rateAtTarget == null)
+            return 0n;
+        timestamp = BigInt(timestamp);
+        const elapsed = timestamp - this.lastUpdate;
+        if (elapsed < 0n)
+            throw new errors_js_1.BlueErrors.InvalidInterestAccrual(this.id, timestamp, this.lastUpdate);
+        const { endBorrowRate } = index_js_1.AdaptiveCurveIrmLib.getBorrowRate(this.utilization, this.rateAtTarget, elapsed);
+        return endBorrowRate;
+    }
+    /**
+     * Returns the rate at which interest accrues for borrowers of this market,
+     * at the given timestamp, if the state remains unchanged (not accrued) (scaled by WAD).
+     * @param timestamp The timestamp at which to calculate the accrual borrow rate. Must be greater than or equal to `lastUpdate`. Defaults to `Time.timestamp()` (returns the current borrow rate).
+     */
+    getAccrualBorrowRate(timestamp = morpho_ts_1.Time.timestamp()) {
+        if (this.rateAtTarget == null)
+            return 0n;
+        timestamp = BigInt(timestamp);
+        const elapsed = timestamp - this.lastUpdate;
+        if (elapsed < 0n)
+            throw new errors_js_1.BlueErrors.InvalidInterestAccrual(this.id, timestamp, this.lastUpdate);
+        const { avgBorrowRate } = index_js_1.AdaptiveCurveIrmLib.getBorrowRate(this.utilization, this.rateAtTarget, elapsed);
+        return avgBorrowRate;
+    }
+    /**
+     * The market's instantaneous borrow-side Annual Percentage Yield (APY) at the given timestamp,
+     * if the state remains unchanged (not accrued) (scaled by WAD).
+     * @param timestamp The timestamp at which to calculate the borrow APY. Must be greater than or equal to `lastUpdate`. Defaults to `Time.timestamp()` (returns the current borrow APY).
+     */
+    getBorrowApy(timestamp = morpho_ts_1.Time.timestamp()) {
+        const borrowRate = this.getBorrowRate(timestamp);
+        return MarketUtils_js_1.MarketUtils.compoundRate(borrowRate);
+    }
+    /**
+     * The market's instantaneous supply-side Annual Percentage Yield (APY) at the given timestamp,
+     * if the state remains unchanged (not accrued) (scaled by WAD).
+     * @param timestamp The timestamp at which to calculate the supply APY. Must be greater than or equal to `lastUpdate`. Defaults to `Time.timestamp()` (returns the current supply APY).
+     */
+    getSupplyApy(timestamp = morpho_ts_1.Time.timestamp()) {
+        const borrowApy = this.getBorrowApy(timestamp);
+        return index_js_1.MathLib.wMulUp(index_js_1.MathLib.wMulDown(borrowApy, this.utilization), index_js_1.MathLib.WAD - this.fee);
     }
     /**
      * Returns a new market derived from this market, whose interest has been accrued up to the given timestamp.

package/lib/market/MarketUtils.d.ts

@@ -30,6 +30,7 @@ export declare namespace MarketUtils {
      * since the last time the market was updated (scaled by WAD).
      * @param borrowRate The average borrow rate since the last market update (scaled by WAD).
      * @param market The market state.
+     * @deprecated There's no such thing as a supply rate in Morpho. Only the supply APY is meaningful.
      */
     function getSupplyRate(borrowRate: BigIntish, { utilization, fee }: {
         utilization: BigIntish;

package/lib/market/MarketUtils.js

@@ -54,6 +54,7 @@ var MarketUtils;
      * since the last time the market was updated (scaled by WAD).
      * @param borrowRate The average borrow rate since the last market update (scaled by WAD).
      * @param market The market state.
+     * @deprecated There's no such thing as a supply rate in Morpho. Only the supply APY is meaningful.
      */
     function getSupplyRate(borrowRate, { utilization, fee }) {
         const borrowRateWithoutFees = index_js_1.MathLib.wMulUp(borrowRate, utilization);

package/lib/math/AdaptiveCurveIrmLib.d.ts

@@ -33,6 +33,7 @@ export declare namespace AdaptiveCurveIrmLib {
     function wExp(x: BigIntish): bigint;
     function getBorrowRate(startUtilization: BigIntish, startRateAtTarget: BigIntish, elapsed: BigIntish): {
         avgBorrowRate: bigint;
+        endBorrowRate: bigint;
         endRateAtTarget: bigint;
     };
     function getUtilizationAtBorrowRate(borrowRate: BigIntish, rateAtTarget: BigIntish): bigint;

package/lib/math/AdaptiveCurveIrmLib.js

@@ -109,9 +109,11 @@ var AdaptiveCurveIrmLib;
         const coeff = err < 0
             ? MathLib_js_1.MathLib.WAD - MathLib_js_1.MathLib.wDivDown(MathLib_js_1.MathLib.WAD, AdaptiveCurveIrmLib.CURVE_STEEPNESS)
             : AdaptiveCurveIrmLib.CURVE_STEEPNESS - MathLib_js_1.MathLib.WAD;
+        const _curve = (rateAtTarget) => MathLib_js_1.MathLib.wMulDown(MathLib_js_1.MathLib.wMulDown(coeff, err) + MathLib_js_1.MathLib.WAD, rateAtTarget);
         // Non negative if avgRateAtTarget >= 0 because if err < 0, coeff <= 1.
         return {
-            avgBorrowRate: MathLib_js_1.MathLib.wMulDown(MathLib_js_1.MathLib.wMulDown(coeff, err) + MathLib_js_1.MathLib.WAD, avgRateAtTarget),
+            avgBorrowRate: _curve(avgRateAtTarget),
+            endBorrowRate: _curve(endRateAtTarget),
             endRateAtTarget,
         };
     }

package/lib/vault/Vault.d.ts

@@ -148,13 +148,29 @@ export declare class AccrualVault extends Vault implements IAccrualVault {
      */
     get liquidity(): bigint;
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits, before deducting the performance fee.
+     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
+     * before deducting the performance fee, at the time of each market's last update (scaled by WAD).
+     * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
     get apy(): bigint;
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits, after deducting the performance fee.
+     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
+     * after deducting the performance fee, at the time of each market's last update (scaled by WAD).
+     * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
     get netApy(): bigint;
+    /**
+     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
+     * before deducting the performance fee, at the given timestamp,
+     * if the state of all the markets remains unchanged (not accrued) (scaled by WAD).
+     */
+    getApy(timestamp: BigIntish): bigint;
+    /**
+     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
+     * after deducting the performance fee, at the given timestamp,
+     * if the state of all the markets remains unchanged (not accrued) (scaled by WAD).
+     */
+    getNetApy(timestamp: BigIntish): bigint;
     getAllocationProportion(marketId: MarketId): bigint;
     getDepositCapacityLimit(assets: bigint): CapacityLimit;
     getWithdrawCapacityLimit(shares: bigint): CapacityLimit;

package/lib/vault/Vault.js

@@ -153,7 +153,9 @@ class AccrualVault extends Vault {
             .reduce((total, { position }) => total + position.withdrawCapacityLimit.value, 0n);
     }
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits, before deducting the performance fee.
+     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
+     * before deducting the performance fee, at the time of each market's last update (scaled by WAD).
+     * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
     get apy() {
         if (this.totalAssets === 0n)
@@ -163,11 +165,34 @@ class AccrualVault extends Vault {
             .reduce((total, { position }) => total + position.market.supplyApy * position.supplyAssets, 0n) / this.totalAssets);
     }
     /**
-     * The MetaMorpho vault's APY on its assets averaged over its market deposits, after deducting the performance fee.
+     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
+     * after deducting the performance fee, at the time of each market's last update (scaled by WAD).
+     * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
     get netApy() {
         return index_js_2.MathLib.wMulDown(this.apy, index_js_2.MathLib.WAD - this.fee);
     }
+    /**
+     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
+     * before deducting the performance fee, at the given timestamp,
+     * if the state of all the markets remains unchanged (not accrued) (scaled by WAD).
+     */
+    getApy(timestamp) {
+        if (this.totalAssets === 0n)
+            return 0n;
+        return (this.allocations
+            .values()
+            .reduce((total, { position }) => total +
+            position.market.getSupplyApy(timestamp) * position.supplyAssets, 0n) / this.totalAssets);
+    }
+    /**
+     * The MetaMorpho vault's APY on its assets averaged over its market deposits,
+     * after deducting the performance fee, at the given timestamp,
+     * if the state of all the markets remains unchanged (not accrued) (scaled by WAD).
+     */
+    getNetApy(timestamp) {
+        return index_js_2.MathLib.wMulDown(this.getApy(timestamp), index_js_2.MathLib.WAD - this.fee);
+    }
     getAllocationProportion(marketId) {
         if (this.totalAssets === 0n)
             return 0n;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@morpho-org/blue-sdk",
   "description": "Framework-agnostic package that defines Morpho-related entity classes (such as `Market`, `Token`, `Vault`).",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"