@defisaver/positions-sdk 2.1.168 → 2.1.169-custom-fetching-dev

package/cjs/helpers/aaveV4Helpers/index.js

@@ -161,12 +161,15 @@ const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
     let supplyUnstable = 0;
     let longAsset = '';
     let shortAsset = '';
+    let stableCollAsset = '';
     Object.values(usedAssets).forEach(({ symbol, suppliedUsd, borrowedUsd, collateral, reserveId, }) => {
         const spokeAsset = `${symbol}-${reserveId}`;
         const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
         const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
-        if (isSupplied && moneymarket_1.STABLE_ASSETS.includes(symbol) && collateral)
+        if (isSupplied && moneymarket_1.STABLE_ASSETS.includes(symbol) && collateral) {
             supplyStable += 1;
+            stableCollAsset = spokeAsset;
+        }
         if (isBorrowed && moneymarket_1.STABLE_ASSETS.includes(symbol))
             borrowStable += 1;
         if (isBorrowed && !moneymarket_1.STABLE_ASSETS.includes(symbol)) {
@@ -181,6 +184,7 @@ const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
     const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
     const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
     const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
+    const isStablePair = supplyStable === 1 && borrowStable === 1 && supplyUnstable === 0 && borrowUnstable === 0;
     if (isLong) {
         return {
             leveragedType: types_1.LeverageType.Long,
@@ -199,6 +203,12 @@ const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
             leveragedAsset: longAsset,
         };
     }
+    if (isStablePair) {
+        return {
+            leveragedType: types_1.LeverageType.StablePair,
+            leveragedAsset: stableCollAsset,
+        };
+    }
     return {
         leveragedType: types_1.LeverageType.None,
         leveragedAsset: '',

package/cjs/markets/morphoBlue/index.d.ts

@@ -109,6 +109,7 @@ export declare const MORPHO_BLUE_AERO_USDC_625_BASE: (networkId?: NetworkNumber)
 export declare const MORPHO_BLUE_USDE_USDC_915_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBETH_USDC_770_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_CBXRP_USDC_625_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
+export declare const MORPHO_BLUE_CBHYPE_USDC_625_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SYRUPUSDC_USDC_915_ARB: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MorphoBlueWBTCUSDC_860_Arb: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WSTETH_USDC_860_ARB: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -226,6 +227,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphoblueusdeusdc_915_base: MorphoBlueMarketData;
     readonly morphobluecbethusdc_770_base: MorphoBlueMarketData;
     readonly morphobluecbxrpusdc_625_base: MorphoBlueMarketData;
+    readonly morphobluecbhypeusdc_625_base: MorphoBlueMarketData;
     readonly morphobluewsuperoethbweth_915_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_945_base: MorphoBlueMarketData;
     readonly morphobluecbetheth_965_base: MorphoBlueMarketData;

package/cjs/markets/morphoBlue/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MORPHO_BLUE_PRIME_PYUSD_860 = exports.MORPHO_BLUE_PTWEETH_USDA_860 = exports.MORPHO_BLUE_WOETH_ETH_860 = exports.MORPHO_BLUE_SWBTC_WBTC_945 = exports.MORPHO_BLUE_LBTC_WBTC_945 = exports.MORPHO_BLUE_MORPHO_USDC_625 = exports.MORPHO_BLUE_SUSDS_USDT_965 = exports.MORPHO_BLUE_LBTC_CBBTC_945 = exports.MORPHO_BLUE_LBTC_USDC_860 = exports.MORPHO_BLUE_SYRUPUSDC_USDC_915 = exports.MORPHO_BLUE_USR_USDC_915 = exports.MORPHO_BLUE_USDE_DAI_777 = exports.MORPHO_BLUE_USDE_DAI_945 = exports.MORPHO_BLUE_USDE_DAI_915 = exports.MORPHO_BLUE_USDE_DAI_860 = exports.MORPHO_BLUE_SUSDE_DAI_777 = exports.MORPHO_BLUE_SUSDE_DAI_945 = exports.MORPHO_BLUE_SUSDE_DAI_915 = exports.MORPHO_BLUE_SUSDE_DAI_860 = exports.MORPHO_BLUE_WSTETH_ETH_965_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_ETH_945 = exports.MORPHO_BLUE_WEETH_ETH_945 = exports.MORPHO_BLUE_EZETH_ETH_945 = exports.MORPHO_BLUE_EZETH_ETH_860 = exports.MORPHO_BLUE_RSWETH_ETH_945 = exports.MORPHO_BLUE_RSETH_ETH_945 = exports.MORPHO_BLUE_ETH_USDT_915 = exports.MORPHO_BLUE_USDE_USDTB_915 = exports.MORPHO_BLUE_SUSDE_USDTB_915 = exports.MORPHO_BLUE_SUSDE_USDC_915 = exports.MORPHO_BLUE_CBBTC_USDC_860 = exports.MORPHO_BLUE_CBBTC_ETH_915 = exports.MORPHO_BLUE_TBTC_USDC = exports.MORPHO_BLUE_MKR_DAI_777 = exports.MORPHO_BLUE_MKR_USDC = exports.MORPHO_BLUE_SUSDE_USDT = exports.MORPHO_BLUE_USDE_USDT = exports.MORPHO_BLUE_WSTETH_PYUSD = exports.MORPHO_BLUE_WSTETH_USDA_EXCHANGE_RATE = exports.MORPHO_BLUE_WSTETH_USDT = exports.MORPHO_BLUE_WBTC_ETH = exports.MORPHO_BLUE_WBTC_PYUSD = exports.MORPHO_BLUE_WBTC_USDT = exports.MORPHO_BLUE_ETH_USDC_860 = exports.MORPHO_BLUE_ETH_USDC_915 = exports.MORPHO_BLUE_WBTC_USDC = exports.MORPHO_BLUE_SDAI_USDC = exports.MORPHO_BLUE_WEETH_ETH_860 = exports.MORPHO_BLUE_WSTETH_USDC = void 0;
 exports.MORPHO_BLUE_WETH_EURC_860_BASE = exports.MORPHO_BLUE_CBBTC_EURC_860_BASE = exports.MORPHO_BLUE_WSTETH_EURC_860_BASE = exports.MORPHO_BLUE_LBTC_CBBTC_945_BASE = exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE = exports.MORPHO_BLUE_BSDETH_ETH_860_BASE = exports.MORPHO_BLUE_CBBTC_USDC_860_BASE = exports.MORPHO_BLUE_CBBTC_ETH_915_BASE = exports.MORPHO_BLUE_RETH_ETH_945_BASE = exports.MORPHO_BLUE_RETH_USDC_860_BASE = exports.MORPHO_BLUE_ETH_USDC_860_BASE = exports.MORPHO_BLUE_CBETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE = exports.MORPHO_BLUE_WSTETH_USDC_860_BASE_13c42741 = exports.MORPHO_BLUE_WSTETH_ETH_965_BASE = exports.MORPHO_BLUE_WSTETH_ETH_945_BASE = exports.MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d = exports.MORPHO_BLUE_CBETH_USDC_860_BASE = exports.MORPHO_BLUE_WBTC_PYUSD_860 = exports.MORPHO_BLUE_WBTC_RLUSD_860 = exports.MORPHO_BLUE_ETH_USDT_860 = exports.MORPHO_BLUE_WEETH_USDT_770 = exports.MORPHO_BLUE_CBBTC_PYUSD_860 = exports.MORPHO_BLUE_SYRUPUSDT_USDT_915 = exports.MORPHO_BLUE_WEETH_USDT_860_A6A4C1F1 = exports.MORPHO_BLUE_WEETH_USDT_860 = exports.MORPHO_BLUE_CBBTC_ETH_915_12DBF493 = exports.MORPHO_BLUE_WBTC_ETH_915 = exports.MORPHO_BLUE_CBBTC_RLUSD_860 = exports.MORPHO_BLUE_STUSDS_USDC_860 = exports.MORPHO_BLUE_USD3_USDC_915 = exports.MORPHO_BLUE_ETH_USDC_860_94B823E6 = exports.MORPHO_BLUE_WEETH_USDC_860_85252BB8 = exports.MORPHO_BLUE_WEETH_USDC_860 = exports.MORPHO_BLUE_WEETH_USDC_770 = exports.MORPHO_BLUE_SYRUPUSDC_RLUSD_915 = exports.MORPHO_BLUE_WSTETH_USDT_860 = exports.MORPHO_BLUE_WBTC_USDT_860 = exports.MORPHO_BLUE_SUSDE_PYUSD_915 = exports.MORPHO_BLUE_LBTC_PYUSD_860 = exports.MORPHO_BLUE_CBBTC_USDT_860 = exports.MORPHO_BLUE_WEETH_PYUSD_860 = exports.MORPHO_BLUE_WEETH_RLUSD_860 = exports.MORPHO_BLUE_CBBTC_USDC_860_BC99DE6A = exports.MORPHO_BLUE_WBTC_USDC_860 = exports.MORPHO_BLUE_SYRUPUSDC_PYUSD_915 = exports.MORPHO_BLUE_WSTETH_USDC_860 = exports.MORPHO_BLUE_KBTC_PYUSD_860 = exports.MORPHO_BLUE_KBTC_RLUSD_860 = void 0;
-exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.MORPHO_BLUE_WBTC_USDT0_860_ARB = exports.MORPHO_BLUE_WSTETH_USDT0_860_ARB = exports.MORPHO_BLUE_ETH_USDT0_860_ARB = exports.MORPHO_BLUE_WEETH_USDT0_860_ARB = exports.MORPHO_BLUE_SUSDS_USDT0_945_ARB = exports.MORPHO_BLUE_WEETH_USDC_860_ARB = exports.MORPHO_BLUE_SUSDS_USDC_945_ARB = exports.MORPHO_BLUE_ETH_USDC_860_ARB = exports.MORPHO_BLUE_WSTETH_USDC_860_ARB = exports.MorphoBlueWBTCUSDC_860_Arb = exports.MORPHO_BLUE_SYRUPUSDC_USDC_915_ARB = exports.MORPHO_BLUE_CBXRP_USDC_625_BASE = exports.MORPHO_BLUE_CBETH_USDC_770_BASE = exports.MORPHO_BLUE_USDE_USDC_915_BASE = exports.MORPHO_BLUE_AERO_USDC_625_BASE = exports.MORPHO_BLUE_EZETH_ETH_777_BASE = exports.MORPHO_BLUE_EZETH_USDC_777_BASE = exports.MORPHO_BLUE_WEETH_ETH_945_BASE = exports.MORPHO_BLUE_WEETH_USDC_777_BASE = exports.MORPHO_BLUE_WEETH_ETH_915_BASE = exports.MORPHO_BLUE_CBETH_EURC_860_BASE = void 0;
+exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.MORPHO_BLUE_WBTC_USDT0_860_ARB = exports.MORPHO_BLUE_WSTETH_USDT0_860_ARB = exports.MORPHO_BLUE_ETH_USDT0_860_ARB = exports.MORPHO_BLUE_WEETH_USDT0_860_ARB = exports.MORPHO_BLUE_SUSDS_USDT0_945_ARB = exports.MORPHO_BLUE_WEETH_USDC_860_ARB = exports.MORPHO_BLUE_SUSDS_USDC_945_ARB = exports.MORPHO_BLUE_ETH_USDC_860_ARB = exports.MORPHO_BLUE_WSTETH_USDC_860_ARB = exports.MorphoBlueWBTCUSDC_860_Arb = exports.MORPHO_BLUE_SYRUPUSDC_USDC_915_ARB = exports.MORPHO_BLUE_CBHYPE_USDC_625_BASE = exports.MORPHO_BLUE_CBXRP_USDC_625_BASE = exports.MORPHO_BLUE_CBETH_USDC_770_BASE = exports.MORPHO_BLUE_USDE_USDC_915_BASE = exports.MORPHO_BLUE_AERO_USDC_625_BASE = exports.MORPHO_BLUE_EZETH_ETH_777_BASE = exports.MORPHO_BLUE_EZETH_USDC_777_BASE = exports.MORPHO_BLUE_WEETH_ETH_945_BASE = exports.MORPHO_BLUE_WEETH_USDC_777_BASE = exports.MORPHO_BLUE_WEETH_ETH_915_BASE = exports.MORPHO_BLUE_CBETH_EURC_860_BASE = void 0;
 const utils_1 = require("../../services/utils");
 const types_1 = require("../../types");
 // MAINNET
@@ -1767,6 +1767,22 @@ const MORPHO_BLUE_CBXRP_USDC_625_BASE = (networkId = types_1.NetworkNumber.Base)
     protocolName: 'morpho-blue',
 });
 exports.MORPHO_BLUE_CBXRP_USDC_625_BASE = MORPHO_BLUE_CBXRP_USDC_625_BASE;
+const MORPHO_BLUE_CBHYPE_USDC_625_BASE = (networkId = types_1.NetworkNumber.Base) => ({
+    chainIds: [types_1.NetworkNumber.Base],
+    label: 'Morpho Blue',
+    shortLabel: 'cbHYPE/USDC',
+    value: types_1.MorphoBlueVersions.MorphoBlueCbHYPEUSDC_625_Base,
+    url: 'cbhypeusdc-76629002',
+    loanToken: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913',
+    collateralToken: '0xB200000000000000000000451d033a5000cb479e',
+    oracle: '0x7FaD8B8De2DDb7b4B415e1Aa3613e45EeF9E4bFf',
+    oracleType: types_1.MorphoBlueOracleType.MARKET_RATE,
+    irm: '0x46415998764C29aB2a25CbeA6254146D50D22687',
+    lltv: 0.625,
+    marketId: '0x76629002c9fdb20fb2092053a4f22c5c65e04a81887218b9546f2a2d82b4c0a8',
+    protocolName: 'morpho-blue',
+});
+exports.MORPHO_BLUE_CBHYPE_USDC_625_BASE = MORPHO_BLUE_CBHYPE_USDC_625_BASE;
 // ARBITRUM
 const MORPHO_BLUE_SYRUPUSDC_USDC_915_ARB = (networkId = types_1.NetworkNumber.Eth) => ({
     chainIds: [types_1.NetworkNumber.Arb],
@@ -2052,6 +2068,7 @@ const MorphoBlueMarkets = (networkId) => ({
     [types_1.MorphoBlueVersions.MorphoBlueUSDeUSDC_915_Base]: (0, exports.MORPHO_BLUE_USDE_USDC_915_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueCbEthUSDC_770_Base]: (0, exports.MORPHO_BLUE_CBETH_USDC_770_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueCbXRPUSDC_625_Base]: (0, exports.MORPHO_BLUE_CBXRP_USDC_625_BASE)(networkId),
+    [types_1.MorphoBlueVersions.MorphoBlueCbHYPEUSDC_625_Base]: (0, exports.MORPHO_BLUE_CBHYPE_USDC_625_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueWsuperOETHbWETH_915_Base]: (0, exports.MORPHO_BLUE_WSUPEROETHB_WETH_915_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueCbEthEth_945_Base]: (0, exports.MORPHO_BLUE_CBETH_ETH_945_BASE)(networkId),
     [types_1.MorphoBlueVersions.MorphoBlueCbEthEth_965_Base]: (0, exports.MORPHO_BLUE_CBETH_ETH_965_BASE)(networkId),

package/cjs/moneymarket/moneymarketCommonService.js

@@ -20,7 +20,7 @@ exports.calcShortLiqPrice = calcShortLiqPrice;
 const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimitUsd) => {
     if (leverageType === common_1.LeverageType.Short || leverageType === common_1.LeverageType.VolatilePairReverse)
         return (0, exports.calcShortLiqPrice)(assetPrice, borrowedUsd, borrowLimitUsd);
-    if (leverageType === common_1.LeverageType.Long || leverageType === common_1.LeverageType.VolatilePair)
+    if (leverageType === common_1.LeverageType.Long || leverageType === common_1.LeverageType.VolatilePair || leverageType === common_1.LeverageType.StablePair)
         return (0, exports.calcLongLiqPrice)(assetPrice, borrowedUsd, borrowLimitUsd);
     console.error('invalid leverageType', leverageType);
     return '0';
@@ -44,11 +44,14 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let supplyUnstable = 0;
     let longAsset = '';
     let shortAsset = '';
+    let stableCollAsset = '';
     Object.values(usedAssets).forEach(({ symbol, suppliedUsd, borrowedUsd, collateral, }) => {
         const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
         const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
-        if (isSupplied && exports.STABLE_ASSETS.includes(symbol) && collateral)
+        if (isSupplied && exports.STABLE_ASSETS.includes(symbol) && collateral) {
             supplyStable += 1;
+            stableCollAsset = symbol;
+        }
         if (isBorrowed && exports.STABLE_ASSETS.includes(symbol))
             borrowStable += 1;
         if (isBorrowed && !exports.STABLE_ASSETS.includes(symbol)) {
@@ -63,6 +66,7 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
     const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
     const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
+    const isStablePair = supplyStable === 1 && borrowStable === 1 && supplyUnstable === 0 && borrowUnstable === 0;
     if (isLong) {
         return {
             leveragedType: common_1.LeverageType.Long,
@@ -81,6 +85,12 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
             leveragedAsset: longAsset,
         };
     }
+    if (isStablePair) {
+        return {
+            leveragedType: common_1.LeverageType.StablePair,
+            leveragedAsset: stableCollAsset,
+        };
+    }
     return {
         leveragedType: common_1.LeverageType.None,
         leveragedAsset: '',

package/cjs/portfolio/customDeFiData.d.ts

@@ -0,0 +1,3 @@
+import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+import { CustomDeFiData, CustomDeFiDataOptions } from '../types';
+export declare function getCustomDeFiData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], options?: CustomDeFiDataOptions): Promise<CustomDeFiData>;

package/cjs/portfolio/customDeFiData.js

@@ -0,0 +1,262 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCustomDeFiData = getCustomDeFiData;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const common_1 = require("../types/common");
+const markets_1 = require("../markets");
+const types_1 = require("../types");
+const viem_1 = require("../services/viem");
+const constants_1 = require("../constants");
+const aaveV2_1 = require("../aaveV2");
+const aaveV3_1 = require("../aaveV3");
+const aaveV4_1 = require("../aaveV4");
+const compoundV2_1 = require("../compoundV2");
+const compoundV3_1 = require("../compoundV3");
+const spark_1 = require("../spark");
+const curveUsd_1 = require("../curveUsd");
+const llamaLend_1 = require("../llamaLend");
+const morphoBlue_1 = require("../morphoBlue");
+const morphoMidnight_1 = require("../morphoMidnight");
+const maker_1 = require("../maker");
+const liquity_1 = require("../liquity");
+const liquityV2_1 = require("../liquityV2");
+const fluid_1 = require("../fluid");
+const umbrella_1 = require("../umbrella");
+const aaveV3_2 = require("../claiming/aaveV3");
+const spark_2 = require("../claiming/spark");
+const king_1 = require("../claiming/king");
+const ethena_1 = require("../claiming/ethena");
+const uniswap_1 = require("../claiming/uniswap");
+const lower = (address) => address.toLowerCase();
+const positive = (value) => new decimal_js_1.default(value || '0').gt(0);
+const supported = (list, network) => (Object.values(list).filter((m) => m.chainIds.includes(network)));
+function getCustomDeFiData(provider_1, network_1, defaultProvider_1, addresses_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, options = {}) {
+        var _a;
+        const { protocols = Object.values(types_1.PortfolioProtocol), fetchStaking = false, fetchRewards = false, returnEmptyEModePositions = false, fetchFluidMarkets = false, isSim = false, } = options;
+        // JSON-RPC body ends up ~4x the calldata cap; 250k keeps it under the ~2.5MB provider limit.
+        const batchSize = (_a = options.batchSize) !== null && _a !== void 0 ? _a : (isSim ? 2000 : 250000);
+        const has = (protocol) => protocols.includes(protocol);
+        const isMainnet = network === common_1.NetworkNumber.Eth;
+        const isFluidSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network);
+        const client = (0, viem_1.getViemProvider)(provider, network, { batch: { multicall: { batchSize } } });
+        const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, network, { batch: { multicall: { batchSize } } });
+        const aaveV3Markets = has(types_1.PortfolioProtocol.AaveV3)
+            ? [types_1.AaveVersions.AaveV3, types_1.AaveVersions.AaveV3Lido, types_1.AaveVersions.AaveV3Etherfi].map((v) => (0, markets_1.AaveMarkets)(network)[v]).filter((m) => m.chainIds.includes(network))
+            : [];
+        const aaveV2Markets = has(types_1.PortfolioProtocol.AaveV2) ? [(0, markets_1.AaveMarkets)(network)[types_1.AaveVersions.AaveV2]].filter((m) => m.chainIds.includes(network)) : [];
+        const aaveV4Spokes = has(types_1.PortfolioProtocol.AaveV4) ? supported((0, markets_1.AaveV4Spokes)(network), network) : [];
+        const compoundV3Markets = has(types_1.PortfolioProtocol.CompoundV3) ? supported((0, markets_1.CompoundMarkets)(network), network).filter((m) => m.value !== types_1.CompoundVersions.CompoundV2) : [];
+        const compoundV2Markets = has(types_1.PortfolioProtocol.CompoundV2) ? [(0, markets_1.CompoundMarkets)(network)[types_1.CompoundVersions.CompoundV2]].filter((m) => m.chainIds.includes(network)) : [];
+        const sparkMarkets = has(types_1.PortfolioProtocol.Spark) ? supported((0, markets_1.SparkMarkets)(network), network) : [];
+        const morphoMarkets = has(types_1.PortfolioProtocol.MorphoBlue) ? supported((0, markets_1.MorphoBlueMarkets)(network), network) : [];
+        const morphoMidnightMarkets = has(types_1.PortfolioProtocol.MorphoMidnight) ? supported((0, markets_1.MorphoMidnightMarkets)(network), network) : [];
+        const crvUsdMarkets = has(types_1.PortfolioProtocol.CrvUsd) ? supported((0, markets_1.CrvUsdMarkets)(network), network) : [];
+        const llamaLendMarkets = has(types_1.PortfolioProtocol.LlamaLend) && [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb].includes(network) ? supported((0, markets_1.LlamaLendMarkets)(network), network) : [];
+        const liquityV2Markets = has(types_1.PortfolioProtocol.LiquityV2) && isMainnet ? Object.values((0, markets_1.LiquityV2Markets)(network)) : [];
+        const liquityV2StakingMarkets = liquityV2Markets.filter((m) => !m.isLegacy);
+        const fetchMaker = has(types_1.PortfolioProtocol.Maker) && isMainnet;
+        const fetchLiquity = has(types_1.PortfolioProtocol.Liquity) && isMainnet;
+        const fetchFluid = has(types_1.PortfolioProtocol.Fluid) && isFluidSupported;
+        const markets = {
+            morphoMarketsData: {},
+            morphoMidnightMarketsData: {},
+            compoundV3MarketsData: {},
+            sparkMarketsData: {},
+            aaveV3MarketsData: {},
+            aaveV2MarketsData: {},
+            compoundV2MarketsData: {},
+            crvUsdMarketsData: {},
+            llamaLendMarketsData: {},
+            liquityV2MarketsData: {},
+            aaveV4SpokesData: {},
+            fluidMarketsData: {},
+            makerMarketsData: {},
+        };
+        const makerCdps = {};
+        const positions = {};
+        const stakingPositions = {};
+        const rewardsData = {};
+        for (const address of addresses) {
+            positions[lower(address)] = {
+                aaveV3: {},
+                aaveV4: {},
+                morphoBlue: {},
+                morphoMidnight: {},
+                compoundV3: {},
+                spark: {},
+                maker: {},
+                aaveV2: {},
+                compoundV2: {},
+                liquity: {},
+                crvUsd: {},
+                llamaLend: {},
+                fluid: { error: '', data: {} },
+            };
+            if (fetchStaking) {
+                stakingPositions[lower(address)] = {
+                    aaveV3: {}, morphoBlue: {}, liquity: {}, liquityV2: {}, fluid: { error: '', data: {} },
+                };
+            }
+            if (fetchRewards) {
+                rewardsData[lower(address)] = {
+                    merkl: {}, aaveV3: {}, spark: {}, spk: {}, king: {}, ethena: {}, uniswap: {},
+                };
+            }
+        }
+        const run = (label, fetch, store, onError) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                store(yield fetch());
+            }
+            catch (error) {
+                console.error(`Error fetching ${label}:`, error);
+                onError({ error: `Error fetching ${label}`, data: null });
+            }
+        });
+        const perAddress = (list, task) => list.map((m) => addresses.map((a) => task(m, a))).flat();
+        const batchRewards = (key, label, fetch, enabled = true) => (() => __awaiter(this, void 0, void 0, function* () {
+            if (!enabled) {
+                for (const address of addresses)
+                    rewardsData[lower(address)][key] = { error: '', data: [] };
+                return;
+            }
+            try {
+                const result = yield fetch();
+                for (const address of addresses)
+                    rewardsData[lower(address)][key] = { error: '', data: result[lower(address)] || [] };
+            }
+            catch (error) {
+                console.error(`Error fetching ${label}:`, error);
+                for (const address of addresses)
+                    rewardsData[lower(address)][key] = { error: `Error fetching ${label}`, data: null };
+            }
+        }))();
+        yield Promise.allSettled([
+            ...morphoMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.morphoMarketsData[m.value] = yield (0, morphoBlue_1._getMorphoBluePortfolioMarketData)(client, network, m); })),
+            ...morphoMidnightMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.morphoMidnightMarketsData[m.value] = yield (0, morphoMidnight_1._getMorphoMidnightMarketData)(client, network, m); })),
+            ...compoundV3Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.compoundV3MarketsData[m.value] = yield (0, compoundV3_1._getCompoundV3MarketsData)(client, network, m, defaultClient); })),
+            ...sparkMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.sparkMarketsData[m.value] = yield (0, spark_1._getSparkMarketsData)(client, network, m); })),
+            ...aaveV3Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.aaveV3MarketsData[m.value] = yield (0, aaveV3_1._getAaveV3MarketData)(client, network, m); })),
+            ...aaveV4Spokes.map((s) => __awaiter(this, void 0, void 0, function* () { markets.aaveV4SpokesData[s.value] = yield (0, aaveV4_1._getAaveV4SpokeData)(client, network, s); })),
+            ...aaveV2Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.aaveV2MarketsData[m.value] = yield (0, aaveV2_1._getAaveV2MarketsData)(client, network, m); })),
+            ...compoundV2Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.compoundV2MarketsData[m.value] = yield (0, compoundV2_1._getCompoundV2MarketsData)(client, network); })),
+            ...crvUsdMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.crvUsdMarketsData[m.value] = yield (0, curveUsd_1._getCurveUsdGlobalData)(client, network, m); })),
+            ...llamaLendMarkets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.llamaLendMarketsData[m.value] = yield (0, llamaLend_1._getLlamaLendGlobalData)(client, network, m); })),
+            ...liquityV2Markets.map((m) => __awaiter(this, void 0, void 0, function* () { markets.liquityV2MarketsData[m.value] = yield (0, liquityV2_1._getLiquityV2MarketData)(client, network, m); })),
+            (() => __awaiter(this, void 0, void 0, function* () {
+                if (!fetchFluid || !fetchFluidMarkets)
+                    return;
+                try {
+                    markets.fluidMarketsData = yield (0, fluid_1._getAllFluidMarketDataPortfolio)(client, network);
+                }
+                catch (error) {
+                    console.error('Error fetching Fluid markets data:', error);
+                }
+            }))(),
+            (() => __awaiter(this, void 0, void 0, function* () {
+                if (!fetchMaker)
+                    return;
+                try {
+                    markets.makerMarketsData = yield (0, maker_1._getMakerIlksData)(client, network, markets_1.MakerActiveIlks);
+                }
+                catch (error) {
+                    console.error('Error fetching Maker ilks data:', error);
+                }
+            }))(),
+            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
+                if (!fetchMaker)
+                    return;
+                makerCdps[lower(address)] = yield (0, maker_1._getUserCdps)(client, network, address);
+            })),
+            ...addresses.map((address) => fetchFluid && run(`Fluid positions for address ${address}`, () => (0, fluid_1._getUserPositionsPortfolio)(client, network, address), (userPositions) => {
+                for (const position of userPositions) {
+                    if (position.userData && positive(position.userData.suppliedUsd))
+                        positions[lower(address)].fluid.data[position.userData.nftId] = position.userData;
+                }
+            }, (err) => { positions[lower(address)].fluid = { error: err.error, data: {} }; })),
+            ...(fetchStaking ? [
+                ...addresses.map((address) => fetchFluid && run(`Fluid lend data for address ${address}`, () => (0, fluid_1._getAllUserEarnPositionsWithFTokens)(client, network, address), (data) => { stakingPositions[lower(address)].fluid = data; }, (err) => { stakingPositions[lower(address)].fluid = err; })),
+                ...addresses.map((address) => fetchLiquity && run(`Liquity staking data for address ${address}`, () => (0, liquity_1.getLiquityStakingData)(client, network, address), (data) => { stakingPositions[lower(address)].liquity = data; }, (err) => { stakingPositions[lower(address)].liquity = err; })),
+                ...addresses.map((address) => has(types_1.PortfolioProtocol.AaveV3) && isMainnet && run(`Aave V3 staking data for address ${address}`, () => (0, aaveV3_1.getStakeAaveData)(client, network, address), (data) => { stakingPositions[lower(address)].aaveV3 = data; }, (err) => { stakingPositions[lower(address)].aaveV3 = err; })),
+                ...addresses.map((address) => has(types_1.PortfolioProtocol.AaveV3) && isMainnet && run(`Umbrella staking data for address ${address}`, () => (0, umbrella_1.getUmbrellaData)(client, network, address), (data) => { stakingPositions[lower(address)].umbrella = data; }, (err) => { stakingPositions[lower(address)].umbrella = err; })),
+                ...perAddress(liquityV2StakingMarkets, (market, address) => run(`Liquity V2 staking data for address ${address}, market ${market.value}`, () => (0, liquityV2_1.getLiquityV2Staking)(client, network, market.value, address), (data) => { stakingPositions[lower(address)].liquityV2[market.value] = { error: '', data }; }, (err) => { stakingPositions[lower(address)].liquityV2[market.value] = err; })),
+            ] : []),
+            ...(fetchRewards ? [
+                batchRewards('king', 'King rewards data', () => (0, king_1.getKingRewards)(client, network, addresses), isMainnet),
+                batchRewards('uniswap', 'Uniswap rewards data', () => (0, uniswap_1.getUniswapRewards)(client, network, addresses), isMainnet),
+                batchRewards('spk', 'Spark Airdrop rewards data', () => (0, spark_2.fetchSparkAirdropRewards)(client, network, addresses), isMainnet && has(types_1.PortfolioProtocol.Spark)),
+                batchRewards('ethena', 'Ethena Airdrop rewards data', () => (0, ethena_1.fetchEthenaAirdropRewards)(addresses), isMainnet),
+                ...addresses.map((address) => run(`Merkl rewards data for address ${address}`, () => (0, aaveV3_2.getMerklUnclaimedRewards)(address, network), (data) => { rewardsData[lower(address)].merkl = { error: '', data }; }, (err) => { rewardsData[lower(address)].merkl = err; })),
+                ...perAddress(aaveV3Markets, (market, address) => run(`Aave V3 rewards data for address ${address}, market ${market.value}`, () => (0, aaveV3_2.getUnclaimedRewardsForAllMarkets)(client, network, address, market.providerAddress), (data) => { rewardsData[lower(address)].aaveV3[market.value] = { error: '', data }; }, (err) => { rewardsData[lower(address)].aaveV3[market.value] = err; })),
+                ...perAddress(sparkMarkets, (market, address) => {
+                    if (!isMainnet) {
+                        rewardsData[lower(address)].spark[market.value] = { error: '', data: [] };
+                        return Promise.resolve();
+                    }
+                    return run(`Spark rewards data for address ${address}, market ${market.value}`, () => (0, spark_2.fetchSparkRewards)(client, network, address, market.providerAddress), (data) => { rewardsData[lower(address)].spark[market.value] = { error: '', data }; }, (err) => { rewardsData[lower(address)].spark[market.value] = err; });
+                }),
+            ] : []),
+        ]);
+        yield Promise.all([
+            ...perAddress(aaveV3Markets, (market, address) => run(`AaveV3 account data for address ${address} on market ${market.value}`, () => (0, aaveV3_1._getAaveV3AccountData)(client, network, address, Object.assign({ selectedMarket: market }, markets.aaveV3MarketsData[market.value])), (data) => { if (returnEmptyEModePositions || positive(data.suppliedUsd))
+                positions[lower(address)].aaveV3[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].aaveV3[market.value] = err; })),
+            ...perAddress(sparkMarkets, (market, address) => run(`Spark account data for address ${address} on market ${market.value}`, () => (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData }), (data) => { if (returnEmptyEModePositions || positive(data.suppliedUsd))
+                positions[lower(address)].spark[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].spark[market.value] = err; })),
+            ...perAddress(aaveV4Spokes, (spoke, address) => run(`AaveV4 account data for address ${address} on spoke ${spoke.value}`, () => (0, aaveV4_1._getAaveV4AccountData)(client, network, markets.aaveV4SpokesData[spoke.value], address), (data) => { if (positive(data.suppliedUsd))
+                positions[lower(address)].aaveV4[spoke.value] = { error: '', data }; }, (err) => { positions[lower(address)].aaveV4[spoke.value] = err; })),
+            ...perAddress(morphoMarkets, (market, address) => run(`MorphoBlue account data for address ${address} on market ${market.value}`, () => (0, morphoBlue_1._getMorphoBlueAccountData)(client, network, address, market, markets.morphoMarketsData[market.value]), (data) => { if (positive(data.suppliedUsd))
+                positions[lower(address)].morphoBlue[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].morphoBlue[market.value] = err; })),
+            ...(fetchStaking ? perAddress(morphoMarkets, (market, address) => run(`MorphoBlue earn data for address ${address} on market ${market.value}`, () => (0, morphoBlue_1.getMorphoEarn)(client, network, address, market, markets.morphoMarketsData[market.value]), (data) => { if (data && positive(data.amount))
+                stakingPositions[lower(address)].morphoBlue[market.value] = { error: '', data }; }, (err) => { stakingPositions[lower(address)].morphoBlue[market.value] = err; })) : []),
+            ...perAddress(morphoMidnightMarkets, (market, address) => {
+                var _a;
+                if (!((_a = markets.morphoMidnightMarketsData[market.value]) === null || _a === void 0 ? void 0 : _a.isCreated))
+                    return Promise.resolve();
+                return run(`MorphoMidnight account data for address ${address} on market ${market.value}`, () => (0, morphoMidnight_1._getMorphoMidnightAccountData)(client, network, address, market, markets.morphoMidnightMarketsData[market.value]), (data) => { if (positive(data.suppliedUsd))
+                    positions[lower(address)].morphoMidnight[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].morphoMidnight[market.value] = err; });
+            }),
+            ...perAddress(compoundV3Markets, (market, address) => run(`CompoundV3 account data for address ${address} on market ${market.value}`, () => (0, compoundV3_1._getCompoundV3AccountData)(client, network, address, constants_1.ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData }), (data) => { if (positive(data.suppliedUsd))
+                positions[lower(address)].compoundV3[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].compoundV3[market.value] = err; })),
+            ...perAddress(compoundV2Markets, (market, address) => run(`CompoundV2 account data for address ${address}`, () => (0, compoundV2_1._getCompoundV2AccountData)(client, network, address, markets.compoundV2MarketsData[market.value].assetsData), (data) => { if (positive(data.suppliedUsd))
+                positions[lower(address)].compoundV2[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].compoundV2[market.value] = err; })),
+            ...perAddress(aaveV2Markets, (market, address) => run(`AaveV2 account data for address ${address}`, () => (0, aaveV2_1._getAaveV2AccountData)(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market), (data) => { if (positive(data.suppliedUsd))
+                positions[lower(address)].aaveV2[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].aaveV2[market.value] = err; })),
+            ...perAddress(crvUsdMarkets, (market, address) => run(`Curve USD account data for address ${address} on market ${market.value}`, () => (0, curveUsd_1._getCurveUsdUserData)(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand, markets.crvUsdMarketsData[market.value].borrowRate), (data) => { if (positive(data.suppliedUsd) || positive(data.borrowedUsd))
+                positions[lower(address)].crvUsd[market.value] = { error: '', data }; }, (err) => { positions[lower(address)].crvUsd[market.value] = err; })),
+            ...perAddress(llamaLendMarkets, (market, address) => run(`LlamaLend account data for address ${address} on market ${market.value}`, () => (0, llamaLend_1._getLlamaLendUserData)(client, network, address, market, markets.llamaLendMarketsData[market.value]), (data) => {
+                if (positive(data.suppliedUsd) || positive(data.borrowedUsd)) {
+                    positions[lower(address)].llamaLend[market.value] = { error: '', data: Object.assign(Object.assign({}, data), { borrowRate: markets.llamaLendMarketsData[market.value].borrowRate }) };
+                }
+            }, (err) => { positions[lower(address)].llamaLend[market.value] = err; })),
+            ...addresses.map((address) => (makerCdps[lower(address)] || []).map((cdpInfo) => run(`Maker CDP data for address ${address} with ID ${cdpInfo.id}`, () => (0, maker_1._getMakerCdpData)(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel]), (data) => { if (data)
+                positions[lower(address)].maker[cdpInfo.id] = { error: '', data }; }, (err) => { positions[lower(address)].maker[cdpInfo.id] = err; }))).flat(),
+            ...addresses.map((address) => fetchLiquity && run(`Liquity trove info for address ${address}`, () => (0, liquity_1._getLiquityTroveInfo)(client, network, address), (data) => { if (positive(data.collateral))
+                positions[lower(address)].liquity = { error: '', data }; }, (err) => { positions[lower(address)].liquity = err; })),
+            ...(fetchStaking && has(types_1.PortfolioProtocol.LiquityV2) ? addresses.map((address) => {
+                if (!isMainnet) {
+                    stakingPositions[lower(address)].liquityV2SBoldYBold = { error: '', data: null };
+                    return Promise.resolve();
+                }
+                return run(`sBold/yBold data for address ${address}`, () => (0, liquityV2_1.getLiquitySAndYBold)(client, network, stakingPositions[lower(address)].liquityV2, address), (data) => { stakingPositions[lower(address)].liquityV2SBoldYBold = { error: '', data }; }, (err) => { stakingPositions[lower(address)].liquityV2SBoldYBold = err; });
+            }) : []),
+        ]);
+        return {
+            positions,
+            stakingPositions,
+            rewardsData,
+            markets,
+        };
+    });
+}

package/cjs/portfolio/index.d.ts

@@ -11,4 +11,5 @@ export declare function getShifterPortfolioData(provider: EthereumProvider, netw
     markets: PortfolioMarketsData;
 }>;
 export * from './discovery';
+export * from './customDeFiData';
 export { getWalletLendingSummaries } from './lendingSummaries';