@defisaver/positions-sdk 2.1.158-dev → 2.1.158-morpho-batch-dev

package/esm/contracts.d.ts

@@ -100745,6 +100745,26 @@ export declare const MorphoBlueViewContractViem: (client: Client, network: Netwo
 export declare const MorphoMidnightViewContractViem: (client: Client, network: NetworkNumber, block?: Blockish) => {
     read: {
         getRatio: (args: readonly [`0x${string}`, `0x${string}`], options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [];
+            readonly name: "InvalidCollateralIndex";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "InvalidOfferMarketId";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "InvalidOfferType";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "NoOrdersProvided";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "ZeroAmountRequested";
+            readonly type: "error";
+        }, {
             readonly inputs: readonly [{
                 readonly internalType: "bytes32";
                 readonly name: "_id";
@@ -100986,6 +101006,26 @@ export declare const MorphoMidnightViewContractViem: (client: Client, network: N
             readonly type: "function";
         }], "getRatio", readonly [`0x${string}`, `0x${string}`]>, "address" | "args" | "abi" | "functionName">> | undefined) => Promise<bigint>;
         getMarketInfo: (args: readonly [`0x${string}`], options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [];
+            readonly name: "InvalidCollateralIndex";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "InvalidOfferMarketId";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "InvalidOfferType";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "NoOrdersProvided";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "ZeroAmountRequested";
+            readonly type: "error";
+        }, {
             readonly inputs: readonly [{
                 readonly internalType: "bytes32";
                 readonly name: "_id";
@@ -101237,6 +101277,26 @@ export declare const MorphoMidnightViewContractViem: (client: Client, network: N
             prices: readonly bigint[];
         }>;
         getPositionInfo: (args: readonly [`0x${string}`, `0x${string}`], options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [];
+            readonly name: "InvalidCollateralIndex";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "InvalidOfferMarketId";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "InvalidOfferType";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "NoOrdersProvided";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "ZeroAmountRequested";
+            readonly type: "error";
+        }, {
             readonly inputs: readonly [{
                 readonly internalType: "bytes32";
                 readonly name: "_id";
@@ -101499,6 +101559,26 @@ export declare const MorphoMidnightViewContractViem: (client: Client, network: N
             enterGate: `0x${string}`;
             liquidatorGate: `0x${string}`;
         }], options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [];
+            readonly name: "InvalidCollateralIndex";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "InvalidOfferMarketId";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "InvalidOfferType";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "NoOrdersProvided";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "ZeroAmountRequested";
+            readonly type: "error";
+        }, {
             readonly inputs: readonly [{
                 readonly internalType: "bytes32";
                 readonly name: "_id";
@@ -101754,6 +101834,26 @@ export declare const MorphoMidnightViewContractViem: (client: Client, network: N
             liquidatorGate: `0x${string}`;
         }]>, "address" | "args" | "abi" | "functionName">> | undefined) => Promise<`0x${string}`>;
         toMarket: (args: readonly [`0x${string}`], options?: import("viem").Prettify<import("viem").UnionOmit<import("viem").ReadContractParameters<readonly [{
+            readonly inputs: readonly [];
+            readonly name: "InvalidCollateralIndex";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "InvalidOfferMarketId";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "InvalidOfferType";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "NoOrdersProvided";
+            readonly type: "error";
+        }, {
+            readonly inputs: readonly [];
+            readonly name: "ZeroAmountRequested";
+            readonly type: "error";
+        }, {
             readonly inputs: readonly [{
                 readonly internalType: "bytes32";
                 readonly name: "_id";
@@ -102011,6 +102111,26 @@ export declare const MorphoMidnightViewContractViem: (client: Client, network: N
     };
     address: `0x${string}`;
     abi: readonly [{
+        readonly inputs: readonly [];
+        readonly name: "InvalidCollateralIndex";
+        readonly type: "error";
+    }, {
+        readonly inputs: readonly [];
+        readonly name: "InvalidOfferMarketId";
+        readonly type: "error";
+    }, {
+        readonly inputs: readonly [];
+        readonly name: "InvalidOfferType";
+        readonly type: "error";
+    }, {
+        readonly inputs: readonly [];
+        readonly name: "NoOrdersProvided";
+        readonly type: "error";
+    }, {
+        readonly inputs: readonly [];
+        readonly name: "ZeroAmountRequested";
+        readonly type: "error";
+    }, {
         readonly inputs: readonly [{
             readonly internalType: "bytes32";
             readonly name: "_id";

package/esm/savings/index.js

@@ -27,16 +27,16 @@ export const getSavingsData = (provider, network, accounts) => __awaiter(void 0,
     const savingsData = {};
     yield Promise.all([
         ...(network === NetworkNumber.Eth ? [
-            ...morphoVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
+            (() => __awaiter(void 0, void 0, void 0, function* () {
                 try {
-                    const vault = morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey);
-                    const data = yield morphoVaults.getMorphoVaultData(provider, network, vault, accounts);
-                    savingsData[vaultKey] = data;
+                    const vaults = morphoVaultsList.map((vaultKey) => morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey));
+                    const data = yield morphoVaults.getMorphoVaultsData(provider, network, vaults, accounts);
+                    Object.assign(savingsData, data);
                 }
                 catch (err) {
-                    console.error(`[getSavingsData] Error fetching morpho vault ${vaultKey}:`, err);
+                    console.error('[getSavingsData] Error fetching morpho vaults:', err);
                 }
-            })),
+            }))(),
             ...yearnVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
                 try {
                     const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);

package/esm/savings/morphoVaults/index.d.ts

@@ -1,7 +1,19 @@
 import { Client } from 'viem';
 import * as morphoVaultsOptions from './options';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
-import { MorphoVault, SavingsVaultData } from '../../types';
+import { EthAddress, EthereumProvider, NetworkNumber, MorphoVault, MorphoVaultType, SavingsVaultData } from '../../types';
 export { morphoVaultsOptions, };
-export declare const _getMorphoVaultData: (provider: Client, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]) => Promise<SavingsVaultData>;
+/**
+ * Fetches liquidity for all given vaults in a single API request (chunked if over the page cap),
+ * returned as a map keyed by lowercased vault address. A vault missing from the API response is
+ * absent from the map.
+ */
+export declare const fetchMorphoVaultsLiquidity: (network: NetworkNumber, vaults: MorphoVault[]) => Promise<Record<string, string>>;
+/**
+ * Fetches data for all given vaults with a single Morpho API request for their liquidity,
+ * instead of one request per vault. The on-chain reads run in parallel with the API request.
+ * A vault whose on-chain reads fail or that is missing from the API response is left out of
+ * the result; a failed API request rejects, leaving all vaults out.
+ */
+export declare const _getMorphoVaultsData: (provider: Client, network: NetworkNumber, vaults: MorphoVault[], accounts: EthAddress[]) => Promise<Partial<Record<MorphoVaultType, SavingsVaultData>>>;
+export declare function getMorphoVaultsData(provider: EthereumProvider, network: NetworkNumber, vaults: MorphoVault[], accounts: EthAddress[]): Promise<Partial<Record<MorphoVaultType, SavingsVaultData>>>;
 export declare function getMorphoVaultData(provider: EthereumProvider, network: NetworkNumber, morphoVault: MorphoVault, accounts: EthAddress[]): Promise<SavingsVaultData>;

package/esm/savings/morphoVaults/index.js

@@ -14,38 +14,73 @@ import * as morphoVaultsOptions from './options';
 import { getViemProvider } from '../../services/viem';
 import { getMorphoVaultContractViem } from '../../contracts';
 export { morphoVaultsOptions, };
-const vaultDataQuery = `
-  query VaultByAddress($address: String!, $chainId: Int!) {
-    vaultByAddress(address: $address, chainId: $chainId) {
-      address
-      state {
-        totalAssets
-        totalAssetsUsd
-        totalSupply
-      }
-      liquidity {
-        underlying
-        usd
+const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
+// Morpho API caps list page size at 100 items
+const MORPHO_API_PAGE_SIZE = 100;
+const vaultsLiquidityQuery = `
+  query VaultsLiquidity($addresses: [String!], $chainIds: [Int!]) {
+    vaults(first: ${MORPHO_API_PAGE_SIZE}, where: { address_in: $addresses, chainId_in: $chainIds }) {
+      items {
+        address
+        liquidity {
+          underlying
+        }
       }
     }
 }`;
-const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
-export const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
+/**
+ * Fetches liquidity for all given vaults in a single API request (chunked if over the page cap),
+ * returned as a map keyed by lowercased vault address. A vault missing from the API response is
+ * absent from the map.
+ */
+export const fetchMorphoVaultsLiquidity = (network, vaults) => __awaiter(void 0, void 0, void 0, function* () {
+    const chunks = [];
+    for (let i = 0; i < vaults.length; i += MORPHO_API_PAGE_SIZE)
+        chunks.push(vaults.slice(i, i + MORPHO_API_PAGE_SIZE));
+    const liquidityByAddress = {};
+    yield Promise.all(chunks.map((chunk) => __awaiter(void 0, void 0, void 0, function* () {
+        const data = yield graphqlRequest(MORPHO_BLUE_API, vaultsLiquidityQuery, {
+            addresses: chunk.map((vault) => vault.address),
+            chainIds: [network],
+            // the BigInt scalar serializes as a JSON number when it fits in Number.MAX_SAFE_INTEGER, a string otherwise
+        });
+        (data.vaults.items || []).forEach((item) => {
+            var _a, _b;
+            if (((_a = item === null || item === void 0 ? void 0 : item.liquidity) === null || _a === void 0 ? void 0 : _a.underlying) !== undefined && ((_b = item.liquidity) === null || _b === void 0 ? void 0 : _b.underlying) !== null) {
+                liquidityByAddress[item.address.toLowerCase()] = String(item.liquidity.underlying);
+            }
+        });
+    })));
+    return liquidityByAddress;
+});
+const getBatchedViemProvider = (provider, network) => getViemProvider(provider, network, {
+    batch: {
+        multicall: {
+            batchSize: 2500000,
+        },
+    },
+});
+const getMorphoVaultChainData = (provider, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
     const morphoVaultContract = getMorphoVaultContractViem(provider, morphoVault.address);
     const shares = {};
-    const [totalAssets, totalSupply, decimals, decimalsOffset, vaultData] = yield Promise.all([
+    const [totalAssets, totalSupply, decimals, decimalsOffset] = yield Promise.all([
         morphoVaultContract.read.totalAssets(),
         morphoVaultContract.read.totalSupply(),
         morphoVaultContract.read.decimals(),
         morphoVaultContract.read.DECIMALS_OFFSET(),
-        graphqlRequest(MORPHO_BLUE_API, vaultDataQuery, { address: morphoVault.address, chainId: network }),
         ...accounts.map((account) => __awaiter(void 0, void 0, void 0, function* () {
             const share = yield morphoVaultContract.read.balanceOf([account]);
             shares[account] = share;
         })),
     ]);
+    return {
+        totalAssets, totalSupply, decimals, decimalsOffset, shares,
+    };
+});
+const formatMorphoVaultData = (morphoVault, chainData, liquidityUnderlying, accounts) => {
+    const { totalAssets, totalSupply, decimals, decimalsOffset, shares, } = chainData;
     const poolSize = assetAmountInEth(totalAssets.toString(), morphoVault.asset);
-    const liquidity = assetAmountInEth(vaultData.vaultByAddress.liquidity.underlying, morphoVault.asset);
+    const liquidity = assetAmountInEth(liquidityUnderlying, morphoVault.asset);
     const supplied = {};
     accounts.forEach((account) => {
         const share = shares[account] || BigInt(0);
@@ -60,15 +95,49 @@ export const _getMorphoVaultData = (provider, network, morphoVault, accounts) =>
         asset: morphoVault.asset,
         optionType: morphoVault.type,
     };
+};
+/**
+ * Fetches data for all given vaults with a single Morpho API request for their liquidity,
+ * instead of one request per vault. The on-chain reads run in parallel with the API request.
+ * A vault whose on-chain reads fail or that is missing from the API response is left out of
+ * the result; a failed API request rejects, leaving all vaults out.
+ */
+export const _getMorphoVaultsData = (provider, network, vaults, accounts) => __awaiter(void 0, void 0, void 0, function* () {
+    const [liquidityByAddress, chainData] = yield Promise.all([
+        fetchMorphoVaultsLiquidity(network, vaults),
+        Promise.all(vaults.map((vault) => getMorphoVaultChainData(provider, vault, accounts).catch((err) => {
+            console.error(`[getMorphoVaultsData] Error fetching on-chain data for morpho vault ${vault.type}:`, err);
+            return null;
+        }))),
+    ]);
+    const savingsData = {};
+    vaults.forEach((vault, i) => {
+        const vaultChainData = chainData[i];
+        if (!vaultChainData)
+            return;
+        const liquidityUnderlying = liquidityByAddress[vault.address.toLowerCase()];
+        if (liquidityUnderlying === undefined) {
+            console.error(`[getMorphoVaultsData] Vault ${vault.type} (${vault.address}) missing from Morpho API response`);
+            return;
+        }
+        savingsData[vault.type] = formatMorphoVaultData(vault, vaultChainData, liquidityUnderlying, accounts);
+    });
+    return savingsData;
 });
+export function getMorphoVaultsData(provider, network, vaults, accounts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return _getMorphoVaultsData(getBatchedViemProvider(provider, network), network, vaults, accounts);
+    });
+}
 export function getMorphoVaultData(provider, network, morphoVault, accounts) {
     return __awaiter(this, void 0, void 0, function* () {
-        return _getMorphoVaultData(getViemProvider(provider, network, {
-            batch: {
-                multicall: {
-                    batchSize: 2500000,
-                },
-            },
-        }), network, morphoVault, accounts);
+        const [liquidityByAddress, chainData] = yield Promise.all([
+            fetchMorphoVaultsLiquidity(network, [morphoVault]),
+            getMorphoVaultChainData(getBatchedViemProvider(provider, network), morphoVault, accounts),
+        ]);
+        const liquidityUnderlying = liquidityByAddress[morphoVault.address.toLowerCase()];
+        if (liquidityUnderlying === undefined)
+            throw new Error(`Vault ${morphoVault.address} missing from Morpho API response`);
+        return formatMorphoVaultData(morphoVault, chainData, liquidityUnderlying, accounts);
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.158-dev",
+  "version": "2.1.158-morpho-batch-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV4/lend.ts

@@ -50,6 +50,7 @@ export const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress> = {
   USDT_PRIME: '0x46c588DD8453aC259c1f6a54b4C9A93C2aC3762D',
 
   USDC_PAXOS: '0xaed7c529bD2878170B61C758DfAa215AC7a4FD07',
+  USDG_PAXOS: '0x378B4a7c394E22bd562F66eB612165893533c124',
   USDT_PAXOS: '0xa0e97e45C2f89003730E467Bd484fA3eEcE5B4Cf',
   PT_USDG_Sep_PAXOS: '0x7Df10B4A01350D2A1d95cFbE7c9207d7210A2663',
 };

package/src/config/contracts.ts

@@ -1126,15 +1126,27 @@ export const MorphoBlueView =  {
     },
   } as const;
 export const MidnightView =  {
-    "abi": [{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"getMarketInfo","outputs":[{"components":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint128","name":"totalUnits","type":"uint128"},{"internalType":"uint128","name":"lossFactor","type":"uint128"},{"internalType":"uint128","name":"withdrawable","type":"uint128"},{"internalType":"uint128","name":"continuousFeeCredit","type":"uint128"},{"internalType":"uint16[7]","name":"settlementFees","type":"uint16[7]"},{"internalType":"uint32","name":"continuousFee","type":"uint32"},{"internalType":"uint8","name":"tickSpacing","type":"uint8"},{"internalType":"uint256[]","name":"prices","type":"uint256[]"}],"internalType":"struct MidnightView.MarketInfo","name":"info","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getPositionInfo","outputs":[{"components":[{"internalType":"uint128","name":"credit","type":"uint128"},{"internalType":"uint128","name":"pendingFee","type":"uint128"},{"internalType":"uint128","name":"debt","type":"uint128"},{"internalType":"uint128","name":"collateralBitmap","type":"uint128"},{"internalType":"uint128[]","name":"collateral","type":"uint128[]"},{"internalType":"uint256","name":"ratio","type":"uint256"}],"internalType":"struct MidnightView.PositionInfo","name":"pos","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"_market","type":"tuple"}],"name":"toId","outputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"toMarket","outputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"market","type":"tuple"}],"stateMutability":"view","type":"function"}],
+    "abi": [{"inputs":[],"name":"InvalidCollateralIndex","type":"error"},{"inputs":[],"name":"InvalidOfferMarketId","type":"error"},{"inputs":[],"name":"InvalidOfferType","type":"error"},{"inputs":[],"name":"NoOrdersProvided","type":"error"},{"inputs":[],"name":"ZeroAmountRequested","type":"error"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"getMarketInfo","outputs":[{"components":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint128","name":"totalUnits","type":"uint128"},{"internalType":"uint128","name":"lossFactor","type":"uint128"},{"internalType":"uint128","name":"withdrawable","type":"uint128"},{"internalType":"uint128","name":"continuousFeeCredit","type":"uint128"},{"internalType":"uint16[7]","name":"settlementFees","type":"uint16[7]"},{"internalType":"uint32","name":"continuousFee","type":"uint32"},{"internalType":"uint8","name":"tickSpacing","type":"uint8"},{"internalType":"uint256[]","name":"prices","type":"uint256[]"}],"internalType":"struct MidnightView.MarketInfo","name":"info","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getPositionInfo","outputs":[{"components":[{"internalType":"uint128","name":"credit","type":"uint128"},{"internalType":"uint128","name":"pendingFee","type":"uint128"},{"internalType":"uint128","name":"debt","type":"uint128"},{"internalType":"uint128","name":"collateralBitmap","type":"uint128"},{"internalType":"uint128[]","name":"collateral","type":"uint128[]"},{"internalType":"uint256","name":"ratio","type":"uint256"}],"internalType":"struct MidnightView.PositionInfo","name":"pos","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"_market","type":"tuple"}],"name":"toId","outputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"toMarket","outputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"market","type":"tuple"}],"stateMutability":"view","type":"function"}],
     "networks": {
       "1": {
-        "address": "0xB64FBf011343961D9AC4A04b714414E35ebE6BE0",
-        "createdBlock": 25938908,
+        "address": "0xb8e1dAAd42e18203cfCED7193FE0e2E19d713A56",
+        "createdBlock": 25983494,
+        "oldVersions": {
+          "25938908": {
+            "abi": [{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"getMarketInfo","outputs":[{"components":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint128","name":"totalUnits","type":"uint128"},{"internalType":"uint128","name":"lossFactor","type":"uint128"},{"internalType":"uint128","name":"withdrawable","type":"uint128"},{"internalType":"uint128","name":"continuousFeeCredit","type":"uint128"},{"internalType":"uint16[7]","name":"settlementFees","type":"uint16[7]"},{"internalType":"uint32","name":"continuousFee","type":"uint32"},{"internalType":"uint8","name":"tickSpacing","type":"uint8"},{"internalType":"uint256[]","name":"prices","type":"uint256[]"}],"internalType":"struct MidnightView.MarketInfo","name":"info","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getPositionInfo","outputs":[{"components":[{"internalType":"uint128","name":"credit","type":"uint128"},{"internalType":"uint128","name":"pendingFee","type":"uint128"},{"internalType":"uint128","name":"debt","type":"uint128"},{"internalType":"uint128","name":"collateralBitmap","type":"uint128"},{"internalType":"uint128[]","name":"collateral","type":"uint128[]"},{"internalType":"uint256","name":"ratio","type":"uint256"}],"internalType":"struct MidnightView.PositionInfo","name":"pos","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"_market","type":"tuple"}],"name":"toId","outputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"toMarket","outputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"market","type":"tuple"}],"stateMutability":"view","type":"function"}],
+            "address": "0xB64FBf011343961D9AC4A04b714414E35ebE6BE0",
+          }
+        },
       },
       "8453": {
-        "address": "0x3aa272f329E8B562A3bA56Bb6979a44D23A28839",
-        "createdBlock": 48932293,
+        "address": "0xdEab43eb1519bD4314bc99c4019866734103D3Ae",
+        "createdBlock": 51346932,
+        "oldVersions": {
+          "48932293": {
+            "abi": [{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"getMarketInfo","outputs":[{"components":[{"internalType":"bytes32","name":"id","type":"bytes32"},{"internalType":"uint128","name":"totalUnits","type":"uint128"},{"internalType":"uint128","name":"lossFactor","type":"uint128"},{"internalType":"uint128","name":"withdrawable","type":"uint128"},{"internalType":"uint128","name":"continuousFeeCredit","type":"uint128"},{"internalType":"uint16[7]","name":"settlementFees","type":"uint16[7]"},{"internalType":"uint32","name":"continuousFee","type":"uint32"},{"internalType":"uint8","name":"tickSpacing","type":"uint8"},{"internalType":"uint256[]","name":"prices","type":"uint256[]"}],"internalType":"struct MidnightView.MarketInfo","name":"info","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getPositionInfo","outputs":[{"components":[{"internalType":"uint128","name":"credit","type":"uint128"},{"internalType":"uint128","name":"pendingFee","type":"uint128"},{"internalType":"uint128","name":"debt","type":"uint128"},{"internalType":"uint128","name":"collateralBitmap","type":"uint128"},{"internalType":"uint128[]","name":"collateral","type":"uint128[]"},{"internalType":"uint256","name":"ratio","type":"uint256"}],"internalType":"struct MidnightView.PositionInfo","name":"pos","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"},{"internalType":"address","name":"_user","type":"address"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"_market","type":"tuple"}],"name":"toId","outputs":[{"internalType":"bytes32","name":"id","type":"bytes32"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes32","name":"_id","type":"bytes32"}],"name":"toMarket","outputs":[{"components":[{"internalType":"uint256","name":"chainId","type":"uint256"},{"internalType":"address","name":"midnight","type":"address"},{"internalType":"address","name":"loanToken","type":"address"},{"components":[{"internalType":"address","name":"token","type":"address"},{"internalType":"uint256","name":"lltv","type":"uint256"},{"internalType":"uint256","name":"liquidationCursor","type":"uint256"},{"internalType":"address","name":"oracle","type":"address"}],"internalType":"struct CollateralParams[]","name":"collateralParams","type":"tuple[]"},{"internalType":"uint256","name":"maturity","type":"uint256"},{"internalType":"uint256","name":"rcfThreshold","type":"uint256"},{"internalType":"address","name":"enterGate","type":"address"},{"internalType":"address","name":"liquidatorGate","type":"address"}],"internalType":"struct Market","name":"market","type":"tuple"}],"stateMutability":"view","type":"function"}],
+            "address": "0x3aa272f329E8B562A3bA56Bb6979a44D23A28839",
+          }
+        },
       }
     },
   } as const;

package/src/savings/index.ts

@@ -43,15 +43,15 @@ export const getSavingsData = async (
 
   await Promise.all([
     ...(network === NetworkNumber.Eth ? [
-      ...morphoVaultsList.map(async (vaultKey) => {
+      (async () => {
         try {
-          const vault = morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey);
-          const data = await morphoVaults.getMorphoVaultData(provider, network, vault, accounts);
-          savingsData[vaultKey] = data;
+          const vaults = morphoVaultsList.map((vaultKey) => morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey));
+          const data = await morphoVaults.getMorphoVaultsData(provider, network, vaults, accounts);
+          Object.assign(savingsData, data);
         } catch (err) {
-          console.error(`[getSavingsData] Error fetching morpho vault ${vaultKey}:`, err);
+          console.error('[getSavingsData] Error fetching morpho vaults:', err);
         }
-      }),
+      })(),
       ...yearnVaultsList.map(async (vaultKey) => {
         try {
           const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);