@morpho-org/blue-sdk 5.1.0 → 5.1.2

package/lib/addresses.d.ts

@@ -396,6 +396,7 @@ declare const _addressesRegistry: {
     };
     readonly 1329: {
         readonly morpho: "0xc9cDAc20FCeAAF616f7EB0bb6Cd2c69dcfa9094c";
+        readonly permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3";
         readonly bundler3: {
             readonly bundler3: "0xF9457356F18A3349Bb317Ac144c3Bcc62e5761aD";
             readonly generalAdapter1: "0x02e0e71e145f254820B9D89c9E6068f08256F601";
@@ -406,6 +407,7 @@ declare const _addressesRegistry: {
         readonly chainlinkOracleFactory: "0x4bD68c2FF3274207EC07ED281C915758b6F23F07";
         readonly preLiquidationFactory: "0x65eD61058cEB4895B7d62437BaCEA39b04f6D27B";
         readonly wNative: "0xE30feDd158A2e3b13e9badaeABaFc5516e95e8C7";
+        readonly usdc: "0xe15fC38F6D8c56aF07bbCBe3BAf5708A2Bf42392";
     };
 };
 export type ChainDeployments<Addresses = ChainAddresses> = {
@@ -1095,6 +1097,7 @@ export declare let addressesRegistry: {
     };
     readonly 1329: {
         readonly morpho: "0xc9cDAc20FCeAAF616f7EB0bb6Cd2c69dcfa9094c";
+        readonly permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3";
         readonly bundler3: {
             readonly bundler3: "0xF9457356F18A3349Bb317Ac144c3Bcc62e5761aD";
             readonly generalAdapter1: "0x02e0e71e145f254820B9D89c9E6068f08256F601";
@@ -1105,6 +1108,7 @@ export declare let addressesRegistry: {
         readonly chainlinkOracleFactory: "0x4bD68c2FF3274207EC07ED281C915758b6F23F07";
         readonly preLiquidationFactory: "0x65eD61058cEB4895B7d62437BaCEA39b04f6D27B";
         readonly wNative: "0xE30feDd158A2e3b13e9badaeABaFc5516e95e8C7";
+        readonly usdc: "0xe15fC38F6D8c56aF07bbCBe3BAf5708A2Bf42392";
     };
 };
 export declare let addresses: Record<number, ChainAddresses>;

package/lib/addresses.js

@@ -386,6 +386,7 @@ const _addressesRegistry = {
     },
     [chain_js_1.ChainId.SeiMainnet]: {
         morpho: "0xc9cDAc20FCeAAF616f7EB0bb6Cd2c69dcfa9094c",
+        permit2: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
         bundler3: {
             bundler3: "0xF9457356F18A3349Bb317Ac144c3Bcc62e5761aD",
             generalAdapter1: "0x02e0e71e145f254820B9D89c9E6068f08256F601",
@@ -396,6 +397,7 @@ const _addressesRegistry = {
         chainlinkOracleFactory: "0x4bD68c2FF3274207EC07ED281C915758b6F23F07",
         preLiquidationFactory: "0x65eD61058cEB4895B7d62437BaCEA39b04f6D27B",
         wNative: "0xE30feDd158A2e3b13e9badaeABaFc5516e95e8C7",
+        usdc: "0xe15fC38F6D8c56aF07bbCBe3BAf5708A2Bf42392",
     },
 };
 const _deployments = {

package/lib/market/Market.d.ts

@@ -191,6 +191,14 @@ export declare class Market implements IMarket {
      * Defaults to `Time.timestamp()` (returns the current borrow APY).
      */
     getAvgBorrowApy(timestamp?: BigIntish): number;
+    /**
+     * Returns the average rate at which interest _would_ accrue for suppliers of this market,
+     * if `accrueInterest` was called at the given timestamp (scaled by WAD).
+     * @param timestamp The timestamp at which to calculate the average supply rate.
+     * Must be greater than or equal to `lastUpdate`.
+     * Defaults to `Time.timestamp()` (returns the current average supply rate).
+     */
+    getAvgSupplyRate(timestamp?: BigIntish): bigint;
     /**
      * The market's experienced supply-side Annual Percentage Yield (APY),
      * if interest was to be accrued at the given timestamp.

package/lib/market/Market.js

@@ -4,7 +4,6 @@ exports.Market = exports.CapacityLimitReason = void 0;
 const morpho_ts_1 = require("@morpho-org/morpho-ts");
 const errors_js_1 = require("../errors.js");
 const index_js_1 = require("../math/index.js");
-const viem_1 = require("viem");
 const MarketParams_js_1 = require("./MarketParams.js");
 const MarketUtils_js_1 = require("./MarketUtils.js");
 var CapacityLimitReason;
@@ -209,8 +208,8 @@ class Market {
      * Defaults to `Time.timestamp()` (returns the current supply APY).
      */
     getSupplyApy(timestamp = morpho_ts_1.Time.timestamp()) {
-        const borrowApy = this.getBorrowApy(timestamp);
-        return (borrowApy * +(0, viem_1.formatEther)(this.utilization) * (1 - +(0, viem_1.formatEther)(this.fee)));
+        const borrowRate = this.getEndBorrowRate(timestamp);
+        return MarketUtils_js_1.MarketUtils.rateToApy(index_js_1.MathLib.wMulUp(index_js_1.MathLib.wMulDown(borrowRate, this.utilization), index_js_1.MathLib.WAD - this.fee));
     }
     /**
      * The market's experienced borrow-side Annual Percentage Yield (APY),
@@ -223,6 +222,17 @@ class Market {
         const borrowRate = this.getAvgBorrowRate(timestamp);
         return MarketUtils_js_1.MarketUtils.rateToApy(borrowRate);
     }
+    /**
+     * Returns the average rate at which interest _would_ accrue for suppliers of this market,
+     * if `accrueInterest` was called at the given timestamp (scaled by WAD).
+     * @param timestamp The timestamp at which to calculate the average supply rate.
+     * Must be greater than or equal to `lastUpdate`.
+     * Defaults to `Time.timestamp()` (returns the current average supply rate).
+     */
+    getAvgSupplyRate(timestamp = morpho_ts_1.Time.timestamp()) {
+        const borrowRate = this.getAvgBorrowRate(timestamp);
+        return index_js_1.MathLib.wMulUp(index_js_1.MathLib.wMulDown(borrowRate, this.utilization), index_js_1.MathLib.WAD - this.fee);
+    }
     /**
      * The market's experienced supply-side Annual Percentage Yield (APY),
      * if interest was to be accrued at the given timestamp.
@@ -231,8 +241,7 @@ class Market {
      * Defaults to `Time.timestamp()` (returns the current supply APY).
      */
     getAvgSupplyApy(timestamp = morpho_ts_1.Time.timestamp()) {
-        const borrowApy = this.getAvgBorrowApy(timestamp);
-        return (borrowApy * +(0, viem_1.formatEther)(this.utilization) * (1 - +(0, viem_1.formatEther)(this.fee)));
+        return MarketUtils_js_1.MarketUtils.rateToApy(this.getAvgSupplyRate(timestamp));
     }
     /**
      * Returns a new market derived from this market, whose interest has been accrued up to the given timestamp.

package/lib/vault/Vault.d.ts

@@ -156,9 +156,15 @@ export declare class AccrualVault extends Vault implements IAccrualVault {
     /**
      * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
      * weighted-averaged over its market deposits, after deducting the performance fee.
-     * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
+     * If interested in the APY at a specific timestamp, use `getNetApy(timestamp)` instead.
      */
     get netApy(): number;
+    /**
+     * The MetaMorpho vault's per-second rate at which interest _would_ accrue,
+     * weighted-averaged over its market deposits, before deducting the performance fee,
+     * if interest was to be accrued on each market at the given timestamp.
+     */
+    private _getAvgRate;
     /**
      * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
      * weighted-averaged over its market deposits, before deducting the performance fee,

package/lib/vault/Vault.js

@@ -5,7 +5,6 @@ const morpho_ts_1 = require("@morpho-org/morpho-ts");
 const index_js_1 = require("../market/index.js");
 const index_js_2 = require("../math/index.js");
 const index_js_3 = require("../token/index.js");
-const viem_1 = require("viem");
 const VaultMarketAllocation_js_1 = require("./VaultMarketAllocation.js");
 class Vault extends index_js_3.VaultToken {
     /**
@@ -165,24 +164,33 @@ class AccrualVault extends Vault {
     /**
      * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
      * weighted-averaged over its market deposits, after deducting the performance fee.
-     * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
+     * If interested in the APY at a specific timestamp, use `getNetApy(timestamp)` instead.
      */
     get netApy() {
         return this.getNetApy();
     }
     /**
-     * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
+     * The MetaMorpho vault's per-second rate at which interest _would_ accrue,
      * weighted-averaged over its market deposits, before deducting the performance fee,
      * if interest was to be accrued on each market at the given timestamp.
      */
-    getApy(timestamp = morpho_ts_1.Time.timestamp()) {
+    _getAvgRate(timestamp = morpho_ts_1.Time.timestamp()) {
         if (this.totalAssets === 0n)
-            return 0;
+            return 0n;
         return (this.allocations
             .values()
             .reduce((total, { position }) => total +
-            position.market.getAvgSupplyApy(timestamp) *
-                Number(position.supplyAssets), 0) / Number(this.totalAssets));
+            position.market.getAvgSupplyRate(timestamp) * position.supplyAssets, 0n) / this.totalAssets);
+    }
+    /**
+     * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
+     * weighted-averaged over its market deposits, before deducting the performance fee,
+     * if interest was to be accrued on each market at the given timestamp.
+     */
+    getApy(timestamp = morpho_ts_1.Time.timestamp()) {
+        if (this.totalAssets === 0n)
+            return 0;
+        return index_js_1.MarketUtils.rateToApy(this._getAvgRate(timestamp));
     }
     /**
      * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
@@ -190,7 +198,7 @@ class AccrualVault extends Vault {
      * if interest was to be accrued on each market at the given timestamp.
      */
     getNetApy(timestamp = morpho_ts_1.Time.timestamp()) {
-        return this.getApy(timestamp) * (1 - +(0, viem_1.formatEther)(this.fee));
+        return index_js_1.MarketUtils.rateToApy(index_js_2.MathLib.wMulDown(this._getAvgRate(timestamp), index_js_2.MathLib.WAD - this.fee));
     }
     getAllocationProportion(marketId) {
         if (this.totalAssets === 0n)

package/lib/vault/VaultMarketAllocation.d.ts

@@ -1,7 +1,7 @@
 import type { AccrualPosition } from "../position/index.js";
-import type { VaultMarketConfig } from "./VaultMarketConfig.js";
+import { type IVaultMarketConfig, VaultMarketConfig } from "./VaultMarketConfig.js";
 export interface IVaultMarketAllocation {
-    config: VaultMarketConfig;
+    config: IVaultMarketConfig;
     position: AccrualPosition;
 }
 export declare class VaultMarketAllocation implements IVaultMarketAllocation {

package/lib/vault/VaultMarketAllocation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VaultMarketAllocation = void 0;
 const index_js_1 = require("../math/index.js");
+const VaultMarketConfig_js_1 = require("./VaultMarketConfig.js");
 class VaultMarketAllocation {
     /**
      * The vault's configuration on the corresponding market.
@@ -12,7 +13,7 @@ class VaultMarketAllocation {
      */
     position;
     constructor({ config, position }) {
-        this.config = config;
+        this.config = new VaultMarketConfig_js_1.VaultMarketConfig(config);
         this.position = position;
     }
     get vault() {

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": "5.1.0",
+  "version": "5.1.2",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"