@defisaver/positions-sdk 2.1.159-shifter-v2-dev → 2.1.160-dev

package/cjs/portfolio/index.js

@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPortfolioData = getPortfolioData;
-exports.getShifterPortfolioData = getShifterPortfolioData;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const common_1 = require("../types/common");
 const markets_1 = require("../markets");
@@ -620,275 +619,4 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
         };
     });
 }
-function getShifterPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
-    return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
-        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 morphoMarkets = Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network));
-        const compoundV3Markets = Object.values((0, markets_1.CompoundMarkets)(network)).filter((market) => market.chainIds.includes(network) && market.value !== types_1.CompoundVersions.CompoundV2);
-        const sparkMarkets = Object.values((0, markets_1.SparkMarkets)(network)).filter((market) => market.chainIds.includes(network));
-        const aaveV3Markets = [types_1.AaveVersions.AaveV3, types_1.AaveVersions.AaveV3Lido, types_1.AaveVersions.AaveV3Etherfi].map((version) => (0, markets_1.AaveMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
-        const aaveV2Markets = [types_1.AaveVersions.AaveV2].map((version) => (0, markets_1.AaveMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
-        const compoundV2Markets = [types_1.CompoundVersions.CompoundV2].map((version) => (0, markets_1.CompoundMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
-        const crvUsdMarkets = Object.values((0, markets_1.CrvUsdMarkets)(network)).filter((market) => market.chainIds.includes(network));
-        const llamaLendMarkets = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb].includes(network) ? Object.values((0, markets_1.LlamaLendMarkets)(network)).filter((market) => market.chainIds.includes(network)) : [];
-        const liquityV2Markets = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)) : [];
-        const aaveV4Spokes = Object.values((0, markets_1.AaveV4Spokes)(network)).filter((market) => market.chainIds.includes(network));
-        const args = [network, { batch: { multicall: { batchSize: isSim ? 2000 : 2500000 } } }];
-        const client = (0, viem_1.getViemProvider)(provider, ...args);
-        const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, ...args);
-        const markets = {
-            morphoMarketsData: {},
-            morphoMidnightMarketsData: {}, // Morpho Midnight is not fetched for the shifter; key kept so the payload shape is stable
-            compoundV3MarketsData: {},
-            sparkMarketsData: {},
-            aaveV3MarketsData: {},
-            aaveV2MarketsData: {},
-            compoundV2MarketsData: {},
-            crvUsdMarketsData: {},
-            llamaLendMarketsData: {},
-            liquityV2MarketsData: {},
-            aaveV4SpokesData: {},
-            fluidMarketsData: {},
-            makerMarketsData: {},
-        };
-        const makerCdps = {};
-        const positions = {};
-        for (const address of addresses) {
-            positions[address.toLowerCase()] = {
-                aaveV3: {},
-                aaveV4: {},
-                morphoBlue: {},
-                morphoMidnight: {}, // not fetched for the shifter (see markets above)
-                compoundV3: {},
-                spark: {},
-                maker: {},
-                aaveV2: {},
-                compoundV2: {},
-                liquity: {},
-                crvUsd: {},
-                llamaLend: {},
-                fluid: {
-                    error: '',
-                    data: {},
-                },
-            };
-        }
-        yield Promise.allSettled([
-            // === MARKET DATA (needs to be fetched first) ===
-            ...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.morphoMarketsData[market.value] = yield (0, morphoBlue_1._getMorphoBluePortfolioMarketData)(client, network, market);
-            })),
-            ...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.compoundV3MarketsData[market.value] = yield (0, compoundV3_1._getCompoundV3MarketsData)(client, network, market, defaultClient);
-            })),
-            ...sparkMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.sparkMarketsData[market.value] = yield (0, spark_1._getSparkMarketsData)(client, network, market);
-            })),
-            ...aaveV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.aaveV3MarketsData[market.value] = yield (0, aaveV3_1._getAaveV3MarketData)(client, network, market);
-            })),
-            ...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
-                markets.aaveV4SpokesData[spoke.value] = yield (0, aaveV4_1._getAaveV4SpokeData)(client, network, spoke);
-            })),
-            ...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.aaveV2MarketsData[market.value] = yield (0, aaveV2_1._getAaveV2MarketsData)(client, network, market);
-            })),
-            ...compoundV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.compoundV2MarketsData[market.value] = yield (0, compoundV2_1._getCompoundV2MarketsData)(client, network);
-            })),
-            ...crvUsdMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.crvUsdMarketsData[market.value] = yield (0, curveUsd_1._getCurveUsdGlobalData)(client, network, market);
-            })),
-            ...llamaLendMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.llamaLendMarketsData[market.value] = yield (0, llamaLend_1._getLlamaLendGlobalData)(client, network, market);
-            })),
-            ...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
-                markets.liquityV2MarketsData[market.value] = yield (0, liquityV2_1._getLiquityV2MarketData)(client, network, market);
-            })),
-            (() => __awaiter(this, void 0, void 0, function* () {
-                if (!isFluidSupported)
-                    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 (!isMainnet)
-                    return; // Maker CDPs are only available on mainnet
-                try {
-                    markets.makerMarketsData = yield (0, maker_1._getMakerIlksData)(client, network, markets_1.MakerActiveIlks);
-                }
-                catch (error) {
-                    console.error('Error fetching Maker ilks data:', error);
-                }
-            }))(),
-            // === INDEPENDENT USER DATA (doesn't depend on market data) ===
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                if (!isMainnet)
-                    return; // Maker CDPs are only available on mainnet
-                const makerCdp = yield (0, maker_1._getUserCdps)(client, network, address);
-                makerCdps[address.toLowerCase()] = makerCdp;
-            })),
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isFluidSupported)
-                        return; // Fluid is not available on Optimism
-                    const userPositions = (yield (0, fluid_1._getUserPositionsPortfolio)(client, network, address));
-                    for (const position of userPositions) {
-                        if (position.userData && new decimal_js_1.default(position.userData.suppliedUsd).gt(0)) {
-                            positions[address.toLowerCase()].fluid.data[position.userData.nftId] = position.userData;
-                        }
-                    }
-                }
-                catch (error) {
-                    console.error(`Error fetching Fluid positions for address ${address}:`, error);
-                    positions[address.toLowerCase()].fluid = {
-                        error: `Error fetching Fluid positions for address ${address}`,
-                        data: {},
-                    };
-                }
-            })),
-        ]);
-        yield Promise.all([
-            ...aaveV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, aaveV3_1._getAaveV3AccountData)(client, network, address, Object.assign({ selectedMarket: market }, markets.aaveV3MarketsData[market.value]));
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].aaveV3[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching AaveV3 account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].aaveV3[market.value] = { error: `Error fetching AaveV3 account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-            ...aaveV4Spokes.map((spoke) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, aaveV4_1._getAaveV4AccountData)(client, network, markets.aaveV4SpokesData[spoke.value], address);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].aaveV4[spoke.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}:`, error);
-                    positions[address.toLowerCase()].aaveV4[spoke.value] = { error: `Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}`, data: null };
-                }
-            }))).flat(),
-            ...morphoMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, morphoBlue_1._getMorphoBlueAccountData)(client, network, address, market, markets.morphoMarketsData[market.value]);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-            ...compoundV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, compoundV3_1._getCompoundV3AccountData)(client, network, address, constants_1.ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData });
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].compoundV3[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching CompoundV3 account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].compoundV3[market.value] = { error: `Error fetching CompoundV3 account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-            ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData });
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].spark[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching Spark account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        // reuse ilk data fetched for the markets payload; ilks outside the active set are fetched on demand
-                        const cdpData = yield (0, maker_1._getMakerCdpData)(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel]);
-                        if (cdpData) {
-                            positions[address.toLowerCase()].maker[cdpInfo.id] = { error: '', data: cdpData };
-                        }
-                    }
-                    catch (error) {
-                        console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
-                        positions[address.toLowerCase()].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
-                    }
-                }));
-            })).flat(),
-            ...aaveV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, aaveV2_1._getAaveV2AccountData)(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].aaveV2[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching AaveV2 account data for address ${address}:`, error);
-                    positions[address.toLowerCase()].aaveV2[market.value] = { error: `Error fetching AaveV2 account data for address ${address}`, data: null };
-                }
-            }))).flat(),
-            ...compoundV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, compoundV2_1._getCompoundV2AccountData)(client, network, address, markets.compoundV2MarketsData[market.value].assetsData);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
-                        positions[address.toLowerCase()].compoundV2[market.value] = { error: '', data: accData };
-                }
-                catch (error) {
-                    console.error(`Error fetching CompoundV2 account data for address ${address}:`, error);
-                    positions[address.toLowerCase()].compoundV2[market.value] = { error: `Error fetching CompoundV2 account data for address ${address}`, data: null };
-                }
-            }))).flat(),
-            ...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (!isMainnet)
-                        return; // Liquity trove info is only available on mainnet
-                    const troveInfo = yield (0, liquity_1._getLiquityTroveInfo)(client, network, address);
-                    if (new decimal_js_1.default(troveInfo.collateral).gt(0))
-                        positions[address.toLowerCase()].liquity = { error: '', data: troveInfo };
-                }
-                catch (error) {
-                    console.error(`Error fetching Liquity trove info for address ${address}:`, error);
-                    positions[address.toLowerCase()].liquity = { error: `Error fetching Liquity trove info for address ${address}`, data: null };
-                }
-            })),
-            ...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, curveUsd_1._getCurveUsdUserData)(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
-                        positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: markets.crvUsdMarketsData[market.value].borrowRate }) };
-                    }
-                }
-                catch (error) {
-                    console.error(`Error fetching Curve USD account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].crvUsd[market.value] = { error: `Error fetching Curve USD account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-            ...llamaLendMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const accData = yield (0, llamaLend_1._getLlamaLendUserData)(client, network, address, market, markets.llamaLendMarketsData[market.value]);
-                    if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
-                        positions[address.toLowerCase()].llamaLend[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: markets.llamaLendMarketsData[market.value].borrowRate }) };
-                    }
-                }
-                catch (error) {
-                    console.error(`Error fetching LlamaLend account data for address ${address} on market ${market.value}:`, error);
-                    positions[address.toLowerCase()].llamaLend[market.value] = { error: `Error fetching LlamaLend account data for address ${address} on market ${market.value}`, data: null };
-                }
-            }))).flat(),
-        ]);
-        return {
-            positions,
-            markets,
-        };
-    });
-}
 __exportStar(require("./discovery"), exports);

package/cjs/savings/morphoVaults/index.js

@@ -55,7 +55,7 @@ const morphoVaultsOptions = __importStar(require("./options"));
 exports.morphoVaultsOptions = morphoVaultsOptions;
 const viem_1 = require("../../services/viem");
 const contracts_1 = require("../../contracts");
-const MORPHO_BLUE_API = 'https://api.morpho.org/graphql';
+const constants_1 = require("../../constants");
 // Morpho API caps list page size at 100 items
 const MORPHO_API_PAGE_SIZE = 100;
 const vaultsLiquidityQuery = `
@@ -80,7 +80,7 @@ const fetchMorphoVaultsLiquidity = (network, vaults) => __awaiter(void 0, void 0
         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 (0, graphql_request_1.request)(MORPHO_BLUE_API, vaultsLiquidityQuery, {
+        const data = yield (0, graphql_request_1.request)(constants_1.MORPHO_API_URL, 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

package/cjs/types/aave.d.ts

@@ -126,7 +126,6 @@ export interface AavePositionData extends MMPositionData {
     minRatio: string;
     collRatio: string;
     safetyRatioWithLtvZeroFallback?: string;
-    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -160,7 +159,6 @@ export interface AaveV3AggregatedPositionData {
     collRatio: string;
     borrowLimitWithLtvZeroFallbackUsd: string;
     safetyRatioWithLtvZeroFallback: string;
-    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;

package/cjs/types/aaveV4.d.ts

@@ -169,7 +169,6 @@ export interface AaveV4AggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
-    safetyRatio: string;
     liqRatio: string;
     liqPercent: string;
     leveragedType: LeverageType;

package/cjs/types/compound.d.ts

@@ -96,7 +96,6 @@ export interface CompoundAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
-    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -116,7 +115,6 @@ export interface CompoundAggregatedPositionData {
 export interface CompoundPositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
-    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;

package/cjs/types/fluid.d.ts

@@ -323,7 +323,6 @@ export interface FluidAggregatedVaultData {
     merklBorrowIncentives: IncentiveData[];
     ratio: string;
     collRatio: string;
-    safetyRatio: string;
     minRatio: string;
     totalInterestUsd: string;
     leveragedType?: LeverageType;

package/cjs/types/liquity.d.ts

@@ -24,7 +24,6 @@ export interface LiquityTroveInfo {
     totalETH: string;
     totalLUSD: string;
     minCollateralRatio: number;
-    safetyRatio: string;
     priceForRecovery: string;
     debtInFront: string;
     exposure: string;

package/cjs/types/liquityV2.d.ts

@@ -94,7 +94,6 @@ export interface LiquityV2AggregatedTroveData {
     liquidationPrice: string;
     ratio: string;
     collRatio: string;
-    safetyRatio: string;
     exposure: string;
 }
 export interface LiquityV2TroveData {
@@ -102,7 +101,6 @@ export interface LiquityV2TroveData {
     troveId: string;
     ratio: string;
     collRatio: string;
-    safetyRatio?: string;
     liqRatio: string;
     borrowLimitRatio: string;
     interestRate: string;

package/cjs/types/maker.d.ts

@@ -43,7 +43,6 @@ export interface CdpData {
     debtAssetMarketPrice: string;
     liquidationPrice: string;
     ratio: string;
-    safetyRatio: string;
     liqRatio: string;
     liqPercent: number;
     assetPrice: string;

package/cjs/types/morphoBlue.d.ts

@@ -185,7 +185,6 @@ export interface MorphoBlueAggregatedPositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
-    safetyRatio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;
@@ -208,7 +207,6 @@ export interface MorphoBluePositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
-    safetyRatio?: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;

package/cjs/types/morphoMidnight.d.ts

@@ -170,7 +170,6 @@ export interface MorphoMidnightAggregatedPositionData {
     ltv: string;
     ratio: string;
     healthRatio: string;
-    safetyRatio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;

package/cjs/types/portfolio.d.ts

@@ -1,16 +1,15 @@
-import { AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions } from './aave';
-import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokesType } from './aaveV4';
+import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
+import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
 import { EthAddress } from './common';
-import { CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions } from './compound';
-import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidMarketData, FluidVaultData } from './fluid';
+import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
+import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
+import { FluidVaultData } from './fluid';
 import { LiquityTroveInfo } from './liquity';
-import { LiquityV2MarketData } from './liquityV2';
-import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
-import { CdpData, IlkInfo } from './maker';
-import { MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
-import { MorphoMidnightMarketInfo, MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
-import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
+import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
+import { CdpData } from './maker';
+import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+import { MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
+import { SparkPositionData, SparkVersions } from './spark';
 export interface PortfolioProtocolData<T> {
     error: string;
     data: T | null;
@@ -60,18 +59,3 @@ export interface PortfolioPositionsDataForAddress {
 export interface PortfolioPositionsData {
     [key: EthAddress]: PortfolioPositionsDataForAddress;
 }
-export interface PortfolioMarketsData {
-    morphoMarketsData: Record<string, MorphoBlueMarketInfo>;
-    morphoMidnightMarketsData: Record<string, MorphoMidnightMarketInfo>;
-    compoundV3MarketsData: Record<string, CompoundV3MarketsData>;
-    sparkMarketsData: Record<string, SparkMarketsData>;
-    aaveV3MarketsData: Record<string, AaveV3MarketData>;
-    aaveV2MarketsData: Record<string, AaveV2MarketData>;
-    compoundV2MarketsData: Record<string, CompoundV2MarketsData>;
-    crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData>;
-    llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData>;
-    liquityV2MarketsData: Record<string, LiquityV2MarketData>;
-    aaveV4SpokesData: Record<string, AaveV4SpokeData>;
-    fluidMarketsData: Record<string, FluidMarketData>;
-    makerMarketsData: Record<string, IlkInfo>;
-}

package/cjs/types/spark.d.ts

@@ -85,7 +85,6 @@ export interface SparkAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
-    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -105,7 +104,6 @@ export interface SparkPositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
     collRatio: string;
-    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;

package/esm/aaveV2/index.js

@@ -167,8 +167,6 @@ export const _getAaveV2AccountData = (provider, network, address, assetsData, ma
     payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
         ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
         : '0';
-    // Aave v2 has no LTV-0 fallback (AaveV3View only), so its safety ratio is the plain ratio.
-    payload.safetyRatio = payload.ratio;
     // Calculate borrow limits per asset
     Object.values(payload.usedAssets).forEach((item) => {
         if (item.isBorrowed) {

package/esm/constants/index.d.ts

@@ -10,3 +10,4 @@ export declare const ZERO_BYTES32 = "0x00000000000000000000000000000000000000000
 export declare const WAD = 1000000000000000000;
 export declare const USD_QUOTE = "0x0000000000000000000000000000000000000348";
 export declare const borrowOperations: string[];
+export declare const MORPHO_API_URL = "https://fe.defisaver.com/api/morpho/graphql";

package/esm/constants/index.js

@@ -10,3 +10,6 @@ export const ZERO_BYTES32 = '0x0000000000000000000000000000000000000000000000000
 export const WAD = 1e18;
 export const USD_QUOTE = '0x0000000000000000000000000000000000000348';
 export const borrowOperations = ['borrow', 'payback'];
+// Proxies Morpho's GraphQL API through the DFS backend, which attaches the private API key
+// for better rate limits (DEV-13673)
+export const MORPHO_API_URL = 'https://fe.defisaver.com/api/morpho/graphql';

package/esm/fluid/index.d.ts

@@ -133,7 +133,6 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
         merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
-        safetyRatio: string;
         minRatio: string;
         totalInterestUsd: string;
         leveragedType?: import("../types").LeverageType;
@@ -168,7 +167,6 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
         merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
-        safetyRatio: string;
         minRatio: string;
         totalInterestUsd: string;
         leveragedType?: import("../types").LeverageType;
@@ -203,7 +201,6 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
-        safetyRatio: string;
         minRatio: string;
         totalInterestUsd: string;
         leveragedType?: import("../types").LeverageType;
@@ -224,5 +221,3 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         nftId: string;
     } | undefined;
 }[]>;
-export declare const _getAllFluidMarketDataPortfolio: (provider: PublicClient, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;
-export declare const getAllFluidMarketDataPortfolio: (provider: EthereumProvider, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;

package/esm/fluid/index.js

@@ -1381,36 +1381,3 @@ export const _getUserPositionsPortfolio = (provider, network, user) => __awaiter
         userData: userData[i],
     })).filter(md => md.marketData !== undefined);
 });
-export const _getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () {
-    const versions = getFluidVersionsDataForNetwork(network);
-    if (versions.length === 0)
-        return {};
-    const view = FluidViewContractViem(provider, network);
-    const vaultsData = yield Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress])));
-    const tokens = Array.from(new Set(vaultsData.map((vaultData) => {
-        const vaultTokens = [getAssetInfoByAddress(vaultData.supplyToken0, network).symbol, getAssetInfoByAddress(vaultData.borrowToken0, network).symbol];
-        if (vaultData.supplyToken1 && !compareAddresses(ZERO_ADDRESS, vaultData.supplyToken1))
-            vaultTokens.push(getAssetInfoByAddress(vaultData.supplyToken1, network).symbol);
-        if (vaultData.borrowToken1 && !compareAddresses(ZERO_ADDRESS, vaultData.borrowToken1))
-            vaultTokens.push(getAssetInfoByAddress(vaultData.borrowToken1, network).symbol);
-        return vaultTokens;
-    }).flat()));
-    // ETH and WBTC needed for other tokens prices
-    if (!tokens.includes('ETH'))
-        tokens.push('ETH');
-    if (!tokens.includes('WBTC'))
-        tokens.push('WBTC');
-    const [tokenPrices, merklCampaigns] = yield Promise.all([
-        getTokensPricesForPortfolio(tokens, provider, network),
-        getFluidMerklCampaigns(network),
-    ]);
-    const parsedMarketsData = yield Promise.all(vaultsData.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices); })));
-    const marketsData = {};
-    parsedMarketsData.forEach((marketData, i) => {
-        if (!marketData)
-            return;
-        marketsData[versions[i].value] = attachFluidMerklIncentives(marketData, merklCampaigns);
-    });
-    return marketsData;
-});
-export const getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () { return _getAllFluidMarketDataPortfolio(getViemProvider(provider, network, { batch: { multicall: true } }), network); });

package/esm/helpers/aaveHelpers/index.js

@@ -125,9 +125,6 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
         return new Dec(suppliedUsd).mul(effectiveLtv);
     });
     payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new Dec(payload.borrowLimitWithLtvZeroFallbackUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-    // Normalised safety ratio (100 = liquidation on every protocol): the automation ratio above, falling back
-    // to the regular ratio when the fallback carries its '0' placeholder.
-    payload.safetyRatio = +payload.safetyRatioWithLtvZeroFallback ? payload.safetyRatioWithLtvZeroFallback : payload.ratio;
     payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);

package/esm/helpers/aaveV4Helpers/index.js

@@ -208,7 +208,6 @@ export const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, networ
     payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.minRatio = '100';
     payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-    payload.safetyRatio = payload.ratio;
     payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     const { leveragedType, leveragedAsset } = isLeveragedPosAaveV4(usedAssets);

package/esm/helpers/compoundHelpers/index.js

@@ -93,7 +93,6 @@ export const getCompoundV2AggregatedData = (_a) => {
     payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
         ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
         : '0';
-    payload.safetyRatio = payload.ratio;
     // Calculate borrow limits per asset
     Object.values(usedAssets).forEach((item) => {
         if (item.isBorrowed) {
@@ -135,7 +134,6 @@ export const getCompoundV3AggregatedData = (_a) => {
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;
     payload.minRatio = '100';
-    payload.safetyRatio = payload.ratio;
     payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     payload.minDebt = assetsData[selectedMarket.baseAsset].minDebt;

package/esm/helpers/curveUsdHelpers/index.js

@@ -28,8 +28,6 @@ export const getCrvUsdAggregatedData = (_a) => {
         : '0';
     // this is all approximation
     payload.minAllowedRatio = mapRange(numOfBands, 4, 50, 115, 140); // collateral ratio
-    // Collateral ratio rebased so 100 sits on the band-derived minimum (normalised safety ratio, same scale as the other protocols).
-    payload.safetyRatio = loanExists && payload.minAllowedRatio ? new Dec(payload.ratio).div(payload.minAllowedRatio).mul(100).toString() : '0';
     payload.collFactor = new Dec(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
     // only take in consideration collAsset
     payload.borrowLimitUsd = ((_b = usedAssets === null || usedAssets === void 0 ? void 0 : usedAssets[selectedMarket.collAsset]) === null || _b === void 0 ? void 0 : _b.isSupplied)

package/esm/helpers/fluidHelpers/index.js

@@ -78,7 +78,6 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, },
     payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.minRatio = marketData.minRatio;
-    payload.safetyRatio = payload.ratio;
     const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
     payload.leveragedType = leveragedType;
     payload.liquidationPrice = '';

package/esm/helpers/liquityV2Helpers/index.js

@@ -41,7 +41,6 @@ export const getLiquityV2AggregatedPositionData = ({ usedAssets, assetsData, min
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
     payload.ratio = (+payload.suppliedUsd && +payload.borrowedUsd) ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = (+payload.suppliedUsd && +payload.borrowedUsd) ? new Dec(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
-    payload.safetyRatio = payload.ratio;
     const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApyLiquityV2(usedAssets, assetsData, interestRate);
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;