@defisaver/positions-sdk 0.0.201-fluid-dev-10 → 0.0.201-fluid-dev-11

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -115,73 +115,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, web3, network) =>
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/cjs/liquityV2/index.d.ts

@@ -1,6 +1,6 @@
 import Web3 from 'web3';
 import { EthAddress, NetworkNumber } from '../types/common';
-import { InnerLiquityV2MarketData, LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData } from '../types';
+import { LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData, LiquityV2Versions } from '../types';
 export declare const getLiquityV2MarketData: (web3: Web3, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, mainnetWeb3: Web3) => Promise<LiquityV2MarketData>;
 export declare const getLiquityV2UserTroveIds: (web3: Web3, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, account: EthAddress) => Promise<{
     troves: {
@@ -8,11 +8,16 @@ export declare const getLiquityV2UserTroveIds: (web3: Web3, network: NetworkNumb
     }[];
     nextFreeTroveIndex: string;
 }>;
-export declare const getDebtInFrontLiquityV2: (viewContract: any, marketAddress: EthAddress, troveId: string, accumulatedSum?: string, iterations?: number) => Promise<string>;
-export declare const getLiquityV2TroveData: (web3: Web3, network: NetworkNumber, { selectedMarket, assetsData, marketData, troveId, }: {
+export declare const getDebtInFrontForSingleMarketLiquityV2: (viewContract: any, marketAddress: EthAddress, troveId: string, accumulatedSum?: string, iterations?: number) => Promise<string>;
+export declare const getDebtInFrontForInterestRateSingleMarketLiquityV2: (viewContract: any, marketAddress: EthAddress, interestRate: string, troveId?: string, accumulatedSum?: string, iterations?: number) => Promise<string>;
+export declare const getAllMarketsUnbackedDebts: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, web3: Web3, network: NetworkNumber) => Promise<Record<LiquityV2Versions, string>>;
+export declare const calculateDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string) => string;
+export declare const getDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, troveId: string) => Promise<string>;
+export declare const getDebtInFrontForInterestRateLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, web3: Web3, network: NetworkNumber, viewContract: any, interestRate: string) => Promise<string>;
+export declare const getLiquityV2TroveData: (web3: Web3, network: NetworkNumber, { selectedMarket, assetsData, troveId, allMarketsData, }: {
     selectedMarket: LiquityV2MarketInfo;
     assetsData: LiquityV2AssetsData;
-    marketData: InnerLiquityV2MarketData;
     troveId: string;
+    allMarketsData: Record<LiquityV2Versions, LiquityV2MarketData>;
 }) => Promise<LiquityV2TroveData>;
 export declare const getLiquityV2ClaimableCollateral: (collSurplusPoolAddress: EthAddress, account: EthAddress, web3: Web3, network: NetworkNumber) => Promise<string>;

package/cjs/liquityV2/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports.getDebtInFrontLiquityV2 = exports.getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = void 0;
+exports.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports.getDebtInFrontForInterestRateLiquityV2 = exports.getDebtInFrontLiquityV2 = exports.calculateDebtInFrontLiquityV2 = exports.getAllMarketsUnbackedDebts = exports.getDebtInFrontForInterestRateSingleMarketLiquityV2 = exports.getDebtInFrontForSingleMarketLiquityV2 = exports.getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
@@ -21,6 +21,7 @@ const staking_1 = require("../staking");
 const liquityV2Helpers_1 = require("../helpers/liquityV2Helpers");
 const utils_1 = require("../services/utils");
 const constants_1 = require("../constants");
+const markets_1 = require("../markets");
 const getLiquityV2MarketData = (web3, network, selectedMarket, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const viewContract = (0, contracts_1.LiquityV2ViewContract)(web3, network);
     const { marketAddress, debtToken, collateralToken } = selectedMarket;
@@ -133,22 +134,78 @@ const getLiquityV2UserTroveIds = (web3, network, selectedMarket, troveNFTAddress
     return { troves: filteredTroves, nextFreeTroveIndex };
 });
 exports.getLiquityV2UserTroveIds = getLiquityV2UserTroveIds;
-const _getDebtInFront = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getDebtInFront(marketAddress, troveId, accumulatedSum, iterations).call(); });
-const getDebtInFrontLiquityV2 = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () {
-    const { debt, next } = yield _getDebtInFront(viewContract, marketAddress, troveId, accumulatedSum, iterations);
+const _getDebtInFrontForSingleMarket = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getDebtInFront(marketAddress, troveId, accumulatedSum, iterations).call(); });
+const getDebtInFrontForSingleMarketLiquityV2 = (viewContract, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () {
+    const { debt, next } = yield _getDebtInFrontForSingleMarket(viewContract, marketAddress, troveId, accumulatedSum, iterations);
     if (next === '0')
         return (0, tokens_1.assetAmountInEth)(debt);
-    return (0, exports.getDebtInFrontLiquityV2)(viewContract, marketAddress, next, debt, iterations);
+    return (0, exports.getDebtInFrontForSingleMarketLiquityV2)(viewContract, marketAddress, next, debt, iterations);
+});
+exports.getDebtInFrontForSingleMarketLiquityV2 = getDebtInFrontForSingleMarketLiquityV2;
+const _getDebtInFrontForInterestRateSingleMarketLiquityV2 = (viewContract, marketAddress, troveId = '0', accumulatedSum = '0', iterations = 2000, interestRate) => __awaiter(void 0, void 0, void 0, function* () { return viewContract.methods.getDebtInFrontByInterestRate(marketAddress, troveId, accumulatedSum, iterations, interestRate).call(); });
+const getDebtInFrontForInterestRateSingleMarketLiquityV2 = (viewContract, marketAddress, interestRate, troveId = '0', accumulatedSum = '0', iterations = 2000) => __awaiter(void 0, void 0, void 0, function* () {
+    if (+interestRate === 0 || !interestRate)
+        return '0';
+    const interestRateWei = new decimal_js_1.default(interestRate).times(1e16).toFixed(0).toString();
+    const res = yield _getDebtInFrontForInterestRateSingleMarketLiquityV2(viewContract, marketAddress, troveId, accumulatedSum, iterations, interestRateWei);
+    const { debt, next } = res;
+    if (next === '0')
+        return (0, tokens_1.assetAmountInEth)(debt);
+    return (0, exports.getDebtInFrontForInterestRateSingleMarketLiquityV2)(viewContract, marketAddress, interestRate, next, debt, iterations);
+});
+exports.getDebtInFrontForInterestRateSingleMarketLiquityV2 = getDebtInFrontForInterestRateSingleMarketLiquityV2;
+const getUnbackedDebtForSingleMarket = (totalBorrowed, web3, network, stabilityPoolAddress) => __awaiter(void 0, void 0, void 0, function* () {
+    const stabilityPoolContract = (0, contracts_1.createContractWrapper)(web3, network, 'LiquityV2StabilityPool', stabilityPoolAddress);
+    const totalBoldDeposits = yield stabilityPoolContract.methods.getTotalBoldDeposits().call();
+    const totalBoldDepositsInEth = (0, tokens_1.assetAmountInEth)(totalBoldDeposits);
+    return decimal_js_1.default.max(new decimal_js_1.default(totalBorrowed).sub(totalBoldDepositsInEth), 0).toString();
+});
+const getAllMarketsUnbackedDebts = (markets, web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const allMarketsUnbackedDebt = yield Promise.all(Object.entries(markets).map(([version, market]) => __awaiter(void 0, void 0, void 0, function* () {
+        const { assetsData, marketData } = market;
+        const unbackedDebt = yield getUnbackedDebtForSingleMarket(assetsData.BOLD.totalBorrow, web3, network, marketData.stabilityPoolAddress);
+        return [version, unbackedDebt];
+    })));
+    return Object.fromEntries(allMarketsUnbackedDebt);
+});
+exports.getAllMarketsUnbackedDebts = getAllMarketsUnbackedDebts;
+const calculateDebtInFrontLiquityV2 = (markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront) => {
+    const selectedMarketUnbackedDebt = new decimal_js_1.default(allMarketsUnbackedDebts[selectedMarket]);
+    if (selectedMarketUnbackedDebt.eq(0))
+        return 'N/A';
+    const amountBeingReedemedOnEachMarket = Object.entries(markets).map(([version, market]) => {
+        if (version === selectedMarket)
+            return new decimal_js_1.default(interestRateDebtInFront);
+        const { assetsData } = market;
+        const unbackedDebt = new decimal_js_1.default(allMarketsUnbackedDebts[version]);
+        const totalBorrow = new decimal_js_1.default(assetsData.BOLD.totalBorrow);
+        const amountToReedem = new decimal_js_1.default(interestRateDebtInFront).mul(unbackedDebt).div(selectedMarketUnbackedDebt);
+        return decimal_js_1.default.min(amountToReedem, totalBorrow);
+    });
+    return amountBeingReedemedOnEachMarket.reduce((acc, val) => acc.plus(val), new decimal_js_1.default(0)).toString();
+};
+exports.calculateDebtInFrontLiquityV2 = calculateDebtInFrontLiquityV2;
+const getDebtInFrontLiquityV2 = (markets, selectedMarket, web3, network, viewContract, troveId) => __awaiter(void 0, void 0, void 0, function* () {
+    const allMarketsUnbackedDebts = yield (0, exports.getAllMarketsUnbackedDebts)(markets, web3, network);
+    const interestRateDebtInFront = yield (0, exports.getDebtInFrontForSingleMarketLiquityV2)(viewContract, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, troveId);
+    return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
 exports.getDebtInFrontLiquityV2 = getDebtInFrontLiquityV2;
-const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsData, marketData, troveId, }) => __awaiter(void 0, void 0, void 0, function* () {
+const getDebtInFrontForInterestRateLiquityV2 = (markets, selectedMarket, web3, network, viewContract, interestRate) => __awaiter(void 0, void 0, void 0, function* () {
+    const allMarketsUnbackedDebts = yield (0, exports.getAllMarketsUnbackedDebts)(markets, web3, network);
+    const interestRateDebtInFront = new decimal_js_1.default(yield (0, exports.getDebtInFrontForInterestRateSingleMarketLiquityV2)(viewContract, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate));
+    return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
+});
+exports.getDebtInFrontForInterestRateLiquityV2 = getDebtInFrontForInterestRateLiquityV2;
+const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsData, troveId, allMarketsData, }) => __awaiter(void 0, void 0, void 0, function* () {
     const viewContract = (0, contracts_1.LiquityV2ViewContract)(web3, network);
-    const { minCollRatio } = marketData;
+    const { minCollRatio } = allMarketsData[selectedMarket.value].marketData;
     const { collateralToken, marketAddress, debtToken } = selectedMarket;
-    const [data, debtInFront] = yield Promise.all([
+    const [_data, debtInFront] = yield Promise.all([
         viewContract.methods.getTroveInfo(marketAddress, troveId).call(),
-        (0, exports.getDebtInFrontLiquityV2)(viewContract, marketAddress, troveId),
+        (0, exports.getDebtInFrontLiquityV2)(allMarketsData, selectedMarket.value, web3, network, viewContract, troveId),
     ]);
+    const data = Object.assign(Object.assign({}, _data), { TCRatio: _data.TCRatio === utils_1.MAXUINT ? '0' : _data.TCRatio });
     const usedAssets = {};
     const debtAssetData = assetsData[debtToken];
     const borrowed = (0, tokens_1.assetAmountInEth)(data.debtAmount);
@@ -176,11 +233,13 @@ const getLiquityV2TroveData = (web3, network, { selectedMarket, assetsData, mark
     const collRatio = new decimal_js_1.default(data.TCRatio).div(1e16).toString();
     const interestRate = new decimal_js_1.default(data.annualInterestRate).div(1e16).toString();
     const interestBatchManager = data.interestBatchManager;
+    const lastInterestRateAdjTime = data.lastInterestRateAdjTime;
     const payload = Object.assign(Object.assign({ usedAssets,
         troveId,
         interestRate,
         interestBatchManager,
-        debtInFront, troveStatus: types_1.LIQUITY_V2_TROVE_STATUS_ENUM[parseInt(data.status, 10)] }, (0, liquityV2Helpers_1.getLiquityV2AggregatedPositionData)({
+        debtInFront,
+        lastInterestRateAdjTime, troveStatus: types_1.LIQUITY_V2_TROVE_STATUS_ENUM[parseInt(data.status, 10)] }, (0, liquityV2Helpers_1.getLiquityV2AggregatedPositionData)({
         usedAssets, assetsData, minCollRatio, interestRate,
     })), { collRatio });
     return payload;

package/cjs/markets/index.d.ts

@@ -4,6 +4,6 @@ export { SparkMarkets } from './spark';
 export { CrvUsdMarkets } from './curveUsd';
 export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export { LlamaLendMarkets } from './llamaLend';
-export { LiquityV2Markets } from './liquityV2';
+export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, } from './fluid';

package/cjs/markets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
+exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.morphoAaveV3AssetEthMarket = exports.morphoAaveV2AssetDefaultMarket = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
 var aave_1 = require("./aave");
 Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
 Object.defineProperty(exports, "aaveV1AssetsDefaultMarket", { enumerable: true, get: function () { return aave_1.aaveV1AssetsDefaultMarket; } });
@@ -28,6 +28,7 @@ var llamaLend_1 = require("./llamaLend");
 Object.defineProperty(exports, "LlamaLendMarkets", { enumerable: true, get: function () { return llamaLend_1.LlamaLendMarkets; } });
 var liquityV2_1 = require("./liquityV2");
 Object.defineProperty(exports, "LiquityV2Markets", { enumerable: true, get: function () { return liquityV2_1.LiquityV2Markets; } });
+Object.defineProperty(exports, "findLiquityV2MarketByAddress", { enumerable: true, get: function () { return liquityV2_1.findLiquityV2MarketByAddress; } });
 var euler_1 = require("./euler");
 Object.defineProperty(exports, "EulerV2Markets", { enumerable: true, get: function () { return euler_1.EulerV2Markets; } });
 var fluid_1 = require("./fluid");

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

@@ -1,4 +1,4 @@
-import { NetworkNumber } from '../../types/common';
+import { EthAddress, NetworkNumber } from '../../types/common';
 import { LiquityV2MarketInfo } from '../../types/liquityV2';
 export declare const LIQUITY_V2_ETH_MARKET: (networkId?: NetworkNumber) => LiquityV2MarketInfo;
 export declare const LIQUITY_V2_WSTETH_MARKET: (networkId?: NetworkNumber) => LiquityV2MarketInfo;
@@ -8,3 +8,4 @@ export declare const LiquityV2Markets: (networkId: NetworkNumber) => {
     readonly liquityv2wsteth: LiquityV2MarketInfo;
     readonly liquityv2reth: LiquityV2MarketInfo;
 };
+export declare const findLiquityV2MarketByAddress: (marketAddress: EthAddress) => LiquityV2MarketInfo | null;

package/cjs/markets/liquityV2/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiquityV2Markets = exports.LIQUITY_V2_RETH_MARKET = exports.LIQUITY_V2_WSTETH_MARKET = exports.LIQUITY_V2_ETH_MARKET = void 0;
+exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LIQUITY_V2_RETH_MARKET = exports.LIQUITY_V2_WSTETH_MARKET = exports.LIQUITY_V2_ETH_MARKET = void 0;
+const utils_1 = require("../../services/utils");
 const common_1 = require("../../types/common");
 const liquityV2_1 = require("../../types/liquityV2");
 const LIQUITY_V2_ETH_MARKET = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -45,3 +46,13 @@ const LiquityV2Markets = (networkId) => ({
     [liquityV2_1.LiquityV2Versions.LiquityV2REth]: (0, exports.LIQUITY_V2_RETH_MARKET)(networkId),
 });
 exports.LiquityV2Markets = LiquityV2Markets;
+const findLiquityV2MarketByAddress = (marketAddress) => {
+    const markets = (0, exports.LiquityV2Markets)(common_1.NetworkNumber.Eth);
+    for (const market of Object.values(markets)) {
+        if ((0, utils_1.compareAddresses)(market.marketAddress, marketAddress)) {
+            return market;
+        }
+    }
+    return null;
+};
+exports.findLiquityV2MarketByAddress = findLiquityV2MarketByAddress;

package/cjs/markets/spark/marketAssets.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sparkAssetsDefaultMarket = exports.sparkAssetsDefaultMarketEth = void 0;
 const common_1 = require("../../types/common");
-exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS'];
+exports.sparkAssetsDefaultMarketEth = ['DAI', 'sDAI', 'USDC', 'ETH', 'wstETH', 'WBTC', 'GNO', 'rETH', 'USDT', 'weETH', 'cbBTC', 'sUSDS', 'USDS'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.sparkAssetsDefaultMarket = {
     [common_1.NetworkNumber.Eth]: exports.sparkAssetsDefaultMarketEth,

package/cjs/morphoAaveV2/index.js

@@ -93,7 +93,7 @@ const getMorphoAaveV2MarketsData = (web3, network, mainnetWeb3) => __awaiter(voi
     });
     const stEthMarket = assetsData.find(({ symbol }) => symbol === 'stETH');
     if (stEthMarket) {
-        stEthMarket.incentiveSupplyApy = yield (0, staking_1.getStETHApy)(mainnetWeb3);
+        stEthMarket.incentiveSupplyApy = yield (0, staking_1.getStakingApy)('stETH', mainnetWeb3);
         stEthMarket.incentiveSupplyToken = 'stETH';
     }
     const payload = {};

package/cjs/morphoAaveV3/index.js

@@ -23,7 +23,6 @@ const utils_1 = require("../services/utils");
 const contracts_1 = require("../contracts");
 const multicall_1 = require("../multicall");
 const staking_1 = require("../staking");
-const dsrService_1 = require("../services/dsrService");
 const moneymarket_1 = require("../moneymarket");
 const aaveV3_1 = require("../aaveV3");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
@@ -239,7 +238,7 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
             data.incentiveSupplyToken = data.symbol;
         }
         if (data.symbol === 'sDAI') {
-            data.incentiveSupplyApy = yield (0, dsrService_1.getDsrApy)(web3, network);
+            data.incentiveSupplyApy = yield (0, staking_1.getStakingApy)('sDAI', mainnetWeb3);
             data.incentiveSupplyToken = 'sDAI';
         }
         return data;

package/cjs/spark/index.js

@@ -17,7 +17,6 @@ const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const utils_1 = require("../services/utils");
 const staking_1 = require("../staking");
-const dsrService_1 = require("../services/dsrService");
 const contracts_1 = require("../contracts");
 const multicall_1 = require("../multicall");
 const sparkHelpers_1 = require("../helpers/sparkHelpers");
@@ -138,7 +137,7 @@ const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3) => __aw
             });
         }
         if (market.symbol === 'sDAI') {
-            market.incentiveSupplyApy = yield (0, dsrService_1.getDsrApy)(web3, network);
+            market.incentiveSupplyApy = yield (0, staking_1.getStakingApy)('sDAI', mainnetWeb3);
             market.incentiveSupplyToken = 'sDAI';
         }
         if (market.canBeBorrowed && market.incentiveSupplyApy) {

package/cjs/staking/staking.d.ts

@@ -1,12 +1,7 @@
 import Web3 from 'web3';
 import { MMAssetsData, MMUsedAssets } from '../types/common';
-export declare const getStETHApy: (web3: Web3, fromBlock?: number, blockNumber?: 'latest' | number) => Promise<string>;
-export declare const getCbETHApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
-export declare const getREthApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
-export declare const getDsrApy: (web3: Web3, blockNumber?: 'latest' | number) => Promise<string>;
-export declare const getSsrApy: () => Promise<string>;
 export declare const STAKING_ASSETS: string[];
-export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => "0" | Promise<any> | undefined;
+export declare const getStakingApy: (asset: string, web3: Web3, blockNumber?: 'latest' | number, fromBlock?: number | undefined) => Promise<string>;
 export declare const calculateInterestEarned: (principal: string, interest: string, type: string, apy?: boolean) => number;
 export declare const calculateNetApy: ({ usedAssets, assetsData, isMorpho }: {
     usedAssets: MMUsedAssets;

package/cjs/staking/staking.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = exports.getSsrApy = exports.getDsrApy = exports.getREthApy = exports.getCbETHApy = exports.getStETHApy = void 0;
+exports.getStETHByWstETHMultiple = exports.getStETHByWstETH = exports.getWstETHByStETH = exports.calculateNetApy = exports.calculateInterestEarned = exports.getStakingApy = exports.STAKING_ASSETS = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const contracts_1 = require("../contracts");
 const common_1 = require("../types/common");
@@ -40,7 +40,6 @@ const getStETHApy = (web3, fromBlock = 17900000, blockNumber = 'latest') => __aw
         return (0, moneymarket_1.aprToApy)(data.data.smaApr);
     }
 });
-exports.getStETHApy = getStETHApy;
 const getCbETHApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     let currentBlock = blockNumber;
     if (blockNumber === 'latest')
@@ -58,7 +57,6 @@ const getCbETHApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0,
         .toString();
     return (0, moneymarket_1.aprToApy)(apr);
 });
-exports.getCbETHApy = getCbETHApy;
 const getREthApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     let currentBlock = blockNumber;
     if (blockNumber === 'latest')
@@ -76,7 +74,6 @@ const getREthApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, v
         .toString();
     return (0, moneymarket_1.aprToApy)(apr);
 });
-exports.getREthApy = getREthApy;
 const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
     const potContract = (0, contracts_1.PotContract)(web3, common_1.NetworkNumber.Eth);
     return new decimal_js_1.default(yield potContract.methods.dsr().call())
@@ -86,13 +83,11 @@ const getDsrApy = (web3, blockNumber = 'latest') => __awaiter(void 0, void 0, vo
         .mul(100)
         .toString();
 });
-exports.getDsrApy = getDsrApy;
 const getSsrApy = () => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield fetch('https://fe.defisaver.com/api/sky/data');
     const data = yield res.json();
     return new decimal_js_1.default(data.data.skyData[0].sky_savings_rate_apy).mul(100).toString();
 });
-exports.getSsrApy = getSsrApy;
 const getSuperOETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield fetch('https://origin.squids.live/origin-squid/graphql', {
         method: 'POST',
@@ -112,48 +107,50 @@ const getSuperOETHApy = () => __awaiter(void 0, void 0, void 0, function* () {
 });
 const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function* () {
     const res = yield fetch(`https://fe.defisaver.com/api/staking/apy?asset=${asset}`);
+    if (!res.ok)
+        throw new Error(`Failed to fetch APY for ${asset}`);
     const data = yield res.json();
     // if our server returns apr, transform it into apy
     if (['weETH'].includes(asset)) {
         return (0, moneymarket_1.aprToApy)(data.apy);
     }
-    return data.apy;
+    return String(data.apy);
 });
 exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS'];
-const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => {
+const getStakingApy = (asset, web3, blockNumber = 'latest', fromBlock = undefined) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
-            return (0, exports.getStETHApy)(web3, fromBlock, blockNumber);
+            return yield getStETHApy(web3, fromBlock, blockNumber);
         if (asset === 'cbETH')
-            return (0, exports.getCbETHApy)(web3, blockNumber);
+            return yield getCbETHApy(web3, blockNumber);
         if (asset === 'rETH')
-            return (0, exports.getREthApy)(web3, blockNumber);
+            return yield getREthApy(web3, blockNumber);
         if (asset === 'sDAI')
-            return (0, exports.getDsrApy)(web3);
+            return yield getDsrApy(web3);
         if (asset === 'sUSDe')
-            return getApyFromDfsApi('sUSDe');
+            return yield getApyFromDfsApi('sUSDe');
         if (asset === 'weETH')
-            return getApyFromDfsApi('weETH');
+            return yield getApyFromDfsApi('weETH');
         if (asset === 'ezETH')
-            return getApyFromDfsApi('ezETH');
+            return yield getApyFromDfsApi('ezETH');
         if (asset === 'osETH')
-            return getApyFromDfsApi('osETH');
+            return yield getApyFromDfsApi('osETH');
         if (asset === 'ETHx')
-            return getApyFromDfsApi('ETHx');
+            return yield getApyFromDfsApi('ETHx');
         if (asset === 'rsETH' || asset === 'wrsETH')
-            return getApyFromDfsApi('rsETH');
+            return yield getApyFromDfsApi('rsETH');
         if (asset === 'pufETH')
-            return getApyFromDfsApi('pufETH');
+            return yield getApyFromDfsApi('pufETH');
         if (asset === 'wsuperOETHb')
-            return getSuperOETHApy();
+            return yield getSuperOETHApy();
         if (asset === 'sUSDS')
-            return (0, exports.getSsrApy)();
+            return yield getSsrApy();
     }
     catch (e) {
         console.error(`Failed to fetch APY for ${asset}`);
-        return '0';
     }
-};
+    return '0';
+});
 exports.getStakingApy = getStakingApy;
 const calculateInterestEarned = (principal, interest, type, apy = false) => {
     let interval = 1;