@morpho-org/blue-sdk 4.5.0 → 4.6.0

package/lib/addresses.d.ts

@@ -211,7 +211,7 @@ declare const _addressesRegistry: {
         readonly metaMorphoFactory: "0x27D4Af0AC9E7FDfA6D0853236f249CC27AE79488";
         readonly chainlinkOracleFactory: "0x39d8622C607A691D7705E8842fbB12E3c38dCD41";
         readonly preLiquidationFactory: "0xe3cE2051a24e58DBFC0eFBe4c2d9e89c5eAe4695";
-        readonly wNative: "0xfc00000000000000000000000000000000000006";
+        readonly wNative: "0xFC00000000000000000000000000000000000006";
     };
     readonly 534352: {
         readonly morpho: "0x2d012EdbAdc37eDc2BC62791B666f9193FDF5a55";
@@ -349,6 +349,19 @@ declare const _addressesRegistry: {
         readonly preLiquidationFactory: "0x678EB53A3bB79111263f47B84989d16D81c36D85";
         readonly wNative: "0xEE7D8BCFb72bC1880D0Cf19822eB0A2e6577aB62";
     };
+    readonly 42793: {
+        readonly morpho: "0xbCE7364E63C3B13C73E9977a83c9704E2aCa876e";
+        readonly bundler3: {
+            readonly bundler3: "0x69dc8086191437b55775b79C730BB3876397e7D1";
+            readonly generalAdapter1: "0xEabdAC78A7f0a9B3dF0e23D69A5a5fF7f580a910";
+        };
+        readonly adaptiveCurveIrm: "0xC1523BE776e66ba07b609b1914D0925278f21FE5";
+        readonly publicAllocator: "0x8b8B1bd41d36c06253203CD21463994aB752c1e6";
+        readonly metaMorphoFactory: "0x997a79c3C04c5B9eb27d343ae126bcCFb5D74781";
+        readonly chainlinkOracleFactory: "0x12FA40f687a35611720E1DcB59976B6e51247298";
+        readonly preLiquidationFactory: "0xd1c37fDd941256FC184eF3A07Be540a90b81Ec21";
+        readonly wNative: "0xc9B53AB2679f573e480d01e0f49e2B5CFB7a3EAb";
+    };
     readonly 239: {
         readonly morpho: "0x918B9F2E4B44E20c6423105BB6cCEB71473aD35c";
         readonly bundler3: {
@@ -566,7 +579,7 @@ export declare let addressesRegistry: {
         readonly metaMorphoFactory: "0x27D4Af0AC9E7FDfA6D0853236f249CC27AE79488";
         readonly chainlinkOracleFactory: "0x39d8622C607A691D7705E8842fbB12E3c38dCD41";
         readonly preLiquidationFactory: "0xe3cE2051a24e58DBFC0eFBe4c2d9e89c5eAe4695";
-        readonly wNative: "0xfc00000000000000000000000000000000000006";
+        readonly wNative: "0xFC00000000000000000000000000000000000006";
     };
     readonly 534352: {
         readonly morpho: "0x2d012EdbAdc37eDc2BC62791B666f9193FDF5a55";
@@ -704,6 +717,19 @@ export declare let addressesRegistry: {
         readonly preLiquidationFactory: "0x678EB53A3bB79111263f47B84989d16D81c36D85";
         readonly wNative: "0xEE7D8BCFb72bC1880D0Cf19822eB0A2e6577aB62";
     };
+    readonly 42793: {
+        readonly morpho: "0xbCE7364E63C3B13C73E9977a83c9704E2aCa876e";
+        readonly bundler3: {
+            readonly bundler3: "0x69dc8086191437b55775b79C730BB3876397e7D1";
+            readonly generalAdapter1: "0xEabdAC78A7f0a9B3dF0e23D69A5a5fF7f580a910";
+        };
+        readonly adaptiveCurveIrm: "0xC1523BE776e66ba07b609b1914D0925278f21FE5";
+        readonly publicAllocator: "0x8b8B1bd41d36c06253203CD21463994aB752c1e6";
+        readonly metaMorphoFactory: "0x997a79c3C04c5B9eb27d343ae126bcCFb5D74781";
+        readonly chainlinkOracleFactory: "0x12FA40f687a35611720E1DcB59976B6e51247298";
+        readonly preLiquidationFactory: "0xd1c37fDd941256FC184eF3A07Be540a90b81Ec21";
+        readonly wNative: "0xc9B53AB2679f573e480d01e0f49e2B5CFB7a3EAb";
+    };
     readonly 239: {
         readonly morpho: "0x918B9F2E4B44E20c6423105BB6cCEB71473aD35c";
         readonly bundler3: {

package/lib/addresses.js

@@ -188,7 +188,7 @@ const _addressesRegistry = {
         metaMorphoFactory: "0x27D4Af0AC9E7FDfA6D0853236f249CC27AE79488",
         chainlinkOracleFactory: "0x39d8622C607A691D7705E8842fbB12E3c38dCD41",
         preLiquidationFactory: "0xe3cE2051a24e58DBFC0eFBe4c2d9e89c5eAe4695",
-        wNative: "0xfc00000000000000000000000000000000000006",
+        wNative: "0xFC00000000000000000000000000000000000006",
     },
     [chain_js_1.ChainId.ScrollMainnet]: {
         morpho: "0x2d012EdbAdc37eDc2BC62791B666f9193FDF5a55",
@@ -331,6 +331,19 @@ const _addressesRegistry = {
         preLiquidationFactory: "0x678EB53A3bB79111263f47B84989d16D81c36D85",
         wNative: "0xEE7D8BCFb72bC1880D0Cf19822eB0A2e6577aB62",
     },
+    [chain_js_1.ChainId.EtherlinkMainnet]: {
+        morpho: "0xbCE7364E63C3B13C73E9977a83c9704E2aCa876e",
+        bundler3: {
+            bundler3: "0x69dc8086191437b55775b79C730BB3876397e7D1",
+            generalAdapter1: "0xEabdAC78A7f0a9B3dF0e23D69A5a5fF7f580a910",
+        },
+        adaptiveCurveIrm: "0xC1523BE776e66ba07b609b1914D0925278f21FE5",
+        publicAllocator: "0x8b8B1bd41d36c06253203CD21463994aB752c1e6",
+        metaMorphoFactory: "0x997a79c3C04c5B9eb27d343ae126bcCFb5D74781",
+        chainlinkOracleFactory: "0x12FA40f687a35611720E1DcB59976B6e51247298",
+        preLiquidationFactory: "0xd1c37fDd941256FC184eF3A07Be540a90b81Ec21",
+        wNative: "0xc9B53AB2679f573e480d01e0f49e2B5CFB7a3EAb",
+    },
     [chain_js_1.ChainId.TacMainnet]: {
         morpho: "0x918B9F2E4B44E20c6423105BB6cCEB71473aD35c",
         bundler3: {
@@ -432,6 +445,9 @@ const _unwrappedTokensMapping = {
     [chain_js_1.ChainId.ArbitrumMainnet]: {
         [_addressesRegistry[chain_js_1.ChainId.ArbitrumMainnet].wNative]: exports.NATIVE_ADDRESS,
     },
+    [chain_js_1.ChainId.EtherlinkMainnet]: {
+        [_addressesRegistry[chain_js_1.ChainId.EtherlinkMainnet].wNative]: exports.NATIVE_ADDRESS,
+    },
     [chain_js_1.ChainId.TacMainnet]: {
         [_addressesRegistry[chain_js_1.ChainId.TacMainnet].wNative]: exports.NATIVE_ADDRESS,
     },

package/lib/chain.d.ts

@@ -16,6 +16,7 @@ export declare enum ChainId {
     PlumeMainnet = 98866,
     CampMainnet = 123420001114,
     KatanaMainnet = 747474,
+    EtherlinkMainnet = 42793,
     TacMainnet = 239,
     LiskMainnet = 1135
 }

package/lib/chain.js

@@ -20,6 +20,7 @@ var ChainId;
     ChainId[ChainId["PlumeMainnet"] = 98866] = "PlumeMainnet";
     ChainId[ChainId["CampMainnet"] = 123420001114] = "CampMainnet";
     ChainId[ChainId["KatanaMainnet"] = 747474] = "KatanaMainnet";
+    ChainId[ChainId["EtherlinkMainnet"] = 42793] = "EtherlinkMainnet";
     ChainId[ChainId["TacMainnet"] = 239] = "TacMainnet";
     ChainId[ChainId["LiskMainnet"] = 1135] = "LiskMainnet";
 })(ChainId || (exports.ChainId = ChainId = {}));
@@ -157,6 +158,13 @@ var ChainUtils;
             explorerUrl: "https://explorer.katanarpc.com",
             identifier: "katana",
         },
+        [ChainId.EtherlinkMainnet]: {
+            name: "Etherlink",
+            id: ChainId.EtherlinkMainnet,
+            nativeCurrency: { name: "Tezos", symbol: "XTZ", decimals: 18 },
+            explorerUrl: "https://explorer.etherlink.com",
+            identifier: "etherlink",
+        },
         [ChainId.TacMainnet]: {
             name: "TAC",
             id: ChainId.TacMainnet,

package/lib/vault/Vault.d.ts

@@ -148,29 +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, at the time of each market's last update (scaled by WAD).
+     * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
+     * weighted-averaged over its market deposits, before deducting the performance fee (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, at the time of each market's last update (scaled by WAD).
+     * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
+     * weighted-averaged over its market deposits, after deducting the performance fee (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).
+     * 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 (scaled by WAD).
      */
-    getApy(timestamp: BigIntish): bigint;
+    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).
+     * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
+     * weighted-averaged over its market deposits, after deducting the performance fee,
+     * if interest was to be accrued on each market at the given timestamp (scaled by WAD).
      */
-    getNetApy(timestamp: BigIntish): bigint;
+    getNetApy(timestamp?: BigIntish): bigint;
     getAllocationProportion(marketId: MarketId): bigint;
     getDepositCapacityLimit(assets: bigint): CapacityLimit;
     getWithdrawCapacityLimit(shares: bigint): CapacityLimit;

package/lib/vault/Vault.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccrualVault = exports.Vault = void 0;
+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");
@@ -153,44 +154,40 @@ 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, at the time of each market's last update (scaled by WAD).
+     * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
+     * weighted-averaged over its market deposits, before deducting the performance fee (scaled by WAD).
      * If interested in the APY at a specific timestamp, use `getApy(timestamp)` instead.
      */
     get apy() {
-        if (this.totalAssets === 0n)
-            return 0n;
-        return (this.allocations
-            .values()
-            .reduce((total, { position }) => total + position.market.supplyApy * position.supplyAssets, 0n) / this.totalAssets);
+        return this.getApy();
     }
     /**
-     * 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).
+     * The MetaMorpho vault's current instantaneous Annual Percentage Yield (APY)
+     * weighted-averaged over its market deposits, after deducting the performance fee (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);
+        return this.getNetApy();
     }
     /**
-     * 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).
+     * 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 (scaled by WAD).
      */
-    getApy(timestamp) {
+    getApy(timestamp = morpho_ts_1.Time.timestamp()) {
         if (this.totalAssets === 0n)
             return 0n;
         return (this.allocations
             .values()
             .reduce((total, { position }) => total +
-            position.market.getSupplyApy(timestamp) * position.supplyAssets, 0n) / this.totalAssets);
+            position.market.getAvgSupplyApy(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).
+     * The MetaMorpho vault's experienced Annual Percentage Yield (APY)
+     * weighted-averaged over its market deposits, after deducting the performance fee,
+     * if interest was to be accrued on each market at the given timestamp (scaled by WAD).
      */
-    getNetApy(timestamp) {
+    getNetApy(timestamp = morpho_ts_1.Time.timestamp()) {
         return index_js_2.MathLib.wMulDown(this.getApy(timestamp), index_js_2.MathLib.WAD - this.fee);
     }
     getAllocationProportion(marketId) {

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": "4.5.0",
+  "version": "4.6.0",
   "author": "Morpho Association <contact@morpho.org>",
   "contributors": [
     "Rubilmax <rmilon@gmail.com>"
@@ -31,8 +31,8 @@
     "typescript": "^5.7.2",
     "viem": "^2.23.0",
     "vitest": "^3.0.5",
-    "@morpho-org/morpho-ts": "^2.4.1",
-    "@morpho-org/test": "^2.1.4"
+    "@morpho-org/test": "^2.1.4",
+    "@morpho-org/morpho-ts": "^2.4.1"
   },
   "scripts": {
     "prepublish": "$npm_execpath build",