@defisaver/positions-sdk 1.0.11-fluid-dev11 → 1.0.11-fluid-dev13

package/esm/fluid/index.js

@@ -17,7 +17,7 @@ import { getFluidAggregatedData, mergeAssetData, mergeUsedAssets, parseDexBorrow
 import { chunkAndMulticall } from '../multicall';
 import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
 import { USD_QUOTE } from '../constants';
-import { getChainlinkAssetAddress, getWeETHChainLinkPriceCalls, getWstETHChainLinkPriceCalls, getWstETHPriceFluid, parseWeETHPriceCalls, parseWstETHPriceCalls, } from '../services/priceService';
+import { getChainlinkAssetAddress, getWeETHChainLinkPriceCalls, getWstETHChainLinkPriceCalls, getWstETHPriceFluid, parseWeETHPriceCalls, parseWstETHPriceCalls, getEthPriceForFluid, getBTCPriceForFluid, } from '../services/priceService';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 export const EMPTY_USED_ASSET = {
     isSupplied: false,
@@ -41,6 +41,9 @@ const parseVaultType = (vaultType) => {
 const getChainLinkPricesForTokens = (tokens, network, web3) => __awaiter(void 0, void 0, void 0, function* () {
     const isMainnet = isMainnetNetwork(network);
     const noDuplicateTokens = new Array(...new Set(tokens));
+    // TODO: this needs to be refactored
+    const ethPriceChainlink = yield getEthPriceForFluid(web3, network);
+    const btcPriceChainlink = yield getBTCPriceForFluid(web3, network);
     const calls = noDuplicateTokens.flatMap((address) => {
         const assetInfo = getAssetInfoByAddress(address, network);
         const isTokenUSDA = assetInfo.symbol === 'USDA';
@@ -80,6 +83,27 @@ const getChainLinkPricesForTokens = (tokens, network, web3) => __awaiter(void 0,
                 acc[token] = new Dec(ethPrice).mul(wstETHRate).toString();
                 break;
             }
+            // TODO: These addresses do not have chainlink feeds, so we need to handle them separately, this is hotfix
+            case 'ezETH': {
+                acc[token] = new Dec(ethPriceChainlink).mul(1.049).toString();
+                break;
+            }
+            case 'rsETH': {
+                acc[token] = new Dec(ethPriceChainlink).mul(1.0454).toString();
+                break;
+            }
+            case 'weETHs': {
+                acc[token] = new Dec(ethPriceChainlink).mul(1.026).toString();
+                break;
+            }
+            case 'LBTC': {
+                acc[token] = new Dec(btcPriceChainlink).toString();
+                break;
+            }
+            case 'sUSDS': {
+                acc[token] = new Dec('105276929').toString();
+                break;
+            }
             case 'weETH': {
                 const { ethPrice, weETHRate, } = parseWeETHPriceCalls(prices[i + offset][0], prices[i + offset + 1], prices[i + offset + 2][0]);
                 offset += 2;
@@ -94,6 +118,9 @@ const getChainLinkPricesForTokens = (tokens, network, web3) => __awaiter(void 0,
     }, {});
 });
 const getTokenPriceFromChainlink = (asset, network, web3) => __awaiter(void 0, void 0, void 0, function* () {
+    if (asset.symbol === 'sUSDS') {
+        return new Dec('105276929').div(1e8).toString();
+    }
     const isTokenUSDA = asset.symbol === 'USDA';
     const isMainnet = isMainnetNetwork(network);
     const loanTokenFeedAddress = getChainlinkAssetAddress(asset.symbol, network);
@@ -114,6 +141,30 @@ const getTokenPriceFromChainlink = (asset, network, web3) => __awaiter(void 0, v
     }
     return new Dec(loanTokenPrice).div(1e8).toString();
 });
+const getMarketRateForDex = (token1PerShare, token0PerShare, rate0, rate1, price0, price1) => {
+    const token0PerShareUsd = new Dec(token0PerShare).mul(price0).toString();
+    const token1PerShareUsd = new Dec(token1PerShare).mul(price1).toString();
+    const sharesCombinedUsd = new Dec(token0PerShareUsd).plus(token1PerShareUsd);
+    const rate0PerShare = new Dec(rate0).mul(token0PerShareUsd).div(sharesCombinedUsd).toString();
+    const rate1PerShare = new Dec(rate1).mul(token1PerShareUsd).div(sharesCombinedUsd).toString();
+    return new Dec(rate0PerShare).plus(rate1PerShare).toString();
+};
+const getAdditionalMarketRateForDex = (token1PerShare, token0PerShare, incentiveSupplyRate0, incentiveSupplyRate1, price0, price1) => {
+    const token0PerShareUsd = new Dec(token0PerShare).mul(price0).toString();
+    const token1PerShareUsd = new Dec(token1PerShare).mul(price1).toString();
+    const sharesCombinedUsd = new Dec(token0PerShareUsd).plus(token1PerShareUsd);
+    const rate0PerShare = incentiveSupplyRate0 ? new Dec(incentiveSupplyRate0).mul(token0PerShareUsd).div(sharesCombinedUsd).toString() : 0;
+    const rate1PerShare = incentiveSupplyRate1 ? new Dec(incentiveSupplyRate1).mul(token1PerShareUsd).div(sharesCombinedUsd).toString() : 0;
+    return new Dec(rate0PerShare).plus(rate1PerShare).toString();
+};
+const getTradingApy = (poolAddress) => __awaiter(void 0, void 0, void 0, function* () {
+    const res = yield fetch(`https://api.fluid.instadapp.io/v2/1/dexes/${poolAddress}/apy`);
+    if (!res.ok) {
+        return '0';
+    }
+    const data = yield res.json();
+    return new Dec(data.tradingApy).div(100).toString();
+});
 const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
     const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
@@ -138,6 +189,7 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collAssetData.incentiveSupplyApy = yield getStakingApy(collAsset.symbol, mainnetWeb3);
         collAssetData.incentiveSupplyToken = collAsset.symbol;
     }
+    const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
     const debtAssetData = {
         symbol: debtAsset.symbol,
         address: debtAsset.address,
@@ -153,10 +205,7 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAssetData.incentiveBorrowApy = yield getStakingApy(debtAsset.symbol, mainnetWeb3);
         debtAssetData.incentiveBorrowToken = debtAsset.symbol;
     }
-    if (STAKING_ASSETS.includes(debtAssetData.symbol)) {
-        debtAssetData.incentiveBorrowApy = yield getStakingApy(debtAsset.symbol, mainnetWeb3);
-        debtAssetData.incentiveBorrowToken = debtAsset.symbol;
-    }
+    const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
     const assetsData = {
         [collAsset.symbol]: collAssetData,
         [debtAsset.symbol]: debtAssetData,
@@ -200,6 +249,8 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         liquidationMaxLimit,
         borrowRate,
         supplyRate,
+        incentiveSupplyRate,
+        incentiveBorrowRate,
         oraclePrice,
     };
     return {
@@ -207,19 +258,6 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         marketData,
     };
 });
-const getMarketRateForDex = (token1PerShare, token0PerShare, rate0, rate1) => {
-    const sharesCombined = new Dec(token1PerShare).plus(token0PerShare);
-    const rate0PerShare = new Dec(rate0).mul(token0PerShare).div(sharesCombined).toString();
-    const rate1PerShare = new Dec(rate1).mul(token1PerShare).div(sharesCombined).toString();
-    return new Dec(rate0PerShare).plus(rate1PerShare).toString();
-};
-const getAdditionalMarketRateForDex = (token1PerShare, token0PerShare, incentiveSupplyRate0, incentiveSupplyRate1) => {
-    console.log(incentiveSupplyRate0, incentiveSupplyRate1);
-    const sharesCombined = new Dec(token1PerShare).plus(token0PerShare);
-    const rate0PerShare = incentiveSupplyRate0 ? new Dec(incentiveSupplyRate0).mul(token0PerShare).div(sharesCombined).toString() : 0;
-    const rate1PerShare = incentiveSupplyRate1 ? new Dec(incentiveSupplyRate1).mul(token1PerShare).div(sharesCombined).toString() : 0;
-    return new Dec(rate0PerShare).plus(rate1PerShare).toString();
-};
 const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
     const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
@@ -262,8 +300,9 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collSecondAssetData.incentiveSupplyApy = yield getStakingApy(collAsset1.symbol, mainnetWeb3);
         collSecondAssetData.incentiveSupplyToken = collAsset1.symbol;
     }
-    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1);
-    const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collFirstAssetData.incentiveSupplyApy, collSecondAssetData.incentiveSupplyApy);
+    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1, collFirstAssetData.price, collSecondAssetData.price);
+    const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collFirstAssetData.incentiveSupplyApy, collSecondAssetData.incentiveSupplyApy, collFirstAssetData.price, collSecondAssetData.price);
+    const tradingSupplyRate = yield getTradingApy(data.dexSupplyData.dexPool);
     const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
     const debtAssetData = {
         symbol: debtAsset.symbol,
@@ -277,6 +316,7 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAssetData.incentiveBorrowApy = yield getStakingApy(debtAsset.symbol, mainnetWeb3);
         debtAssetData.incentiveBorrowToken = debtAsset.symbol;
     }
+    const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
     const assetsData = [
         [collAsset0.symbol, collFirstAssetData],
         [collAsset1.symbol, collSecondAssetData],
@@ -326,17 +366,20 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         borrowRate,
         supplyRate: marketSupplyRate,
         incentiveSupplyRate,
+        incentiveBorrowRate,
         totalSupplyToken0,
         totalSupplyToken1,
         withdrawableToken0,
         withdrawableToken1,
         withdrawableUSD,
         withdrawable: withdrawableShares,
-        widthdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
+        withdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
         maxSupplyShares,
         maxSupplySharesUsd,
         collDexFee: supplyDexFee,
         oraclePrice,
+        tradingSupplyRate,
+        tradingBorrowRate: '0',
     };
     return {
         assetsData,
@@ -366,6 +409,7 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collAssetData.incentiveSupplyApy = yield getStakingApy(collAsset.symbol, mainnetWeb3);
         collAssetData.incentiveSupplyToken = collAsset.symbol;
     }
+    const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
     const debtAsset0Data = {
         symbol: debtAsset0.symbol,
         address: debtAsset0.address,
@@ -398,8 +442,9 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAsset1Data.incentiveSupplyApy = yield getStakingApy(debtAsset1.symbol, mainnetWeb3);
         debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
     }
-    const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1);
-    const incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy, debtAsset1Data.incentiveSupplyApy);
+    const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1, debtAsset0Data.price, debtAsset1Data.price);
+    const incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy, debtAsset1Data.incentiveSupplyApy, debtAsset0Data.price, debtAsset1Data.price);
+    const tradingBorrowRate = yield getTradingApy(data.dexBorrowData.dexPool);
     const assetsData = [
         [collAsset.symbol, collAssetData],
         [debtAsset0.symbol, debtAsset0Data],
@@ -444,6 +489,9 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         borrowRate: marketBorrowRate,
         supplyRate,
         incentiveBorrowRate,
+        incentiveSupplyRate,
+        tradingBorrowRate,
+        tradingSupplyRate: '0',
         borrowableToken0,
         borrowableToken1,
         totalBorrowToken0,
@@ -539,10 +587,13 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAsset1Data.incentiveSupplyApy = yield getStakingApy(debtAsset1.symbol, mainnetWeb3);
         debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
     }
-    const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1);
-    const incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy, debtAsset1Data.incentiveSupplyApy);
-    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1);
-    const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collAsset0Data.incentiveSupplyApy, collAsset1Data.incentiveSupplyApy);
+    const marketInfo = getFluidMarketInfoById(+data.vaultId, network);
+    const marketBorrowRate = getMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, borrowRate0, borrowRate1, debtAsset0Data.price, debtAsset1Data.price);
+    const incentiveBorrowRate = getAdditionalMarketRateForDex(token1PerBorrowShare, token0PerBorrowShare, debtAsset0Data.incentiveSupplyApy, debtAsset1Data.incentiveSupplyApy, debtAsset0Data.price, debtAsset1Data.price);
+    const tradingBorrowRate = yield getTradingApy(data.dexBorrowData.dexPool);
+    const marketSupplyRate = getMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, supplyRate0, supplyRate1, collAsset0Data.price, collAsset1Data.price);
+    const incentiveSupplyRate = getAdditionalMarketRateForDex(token1PerSupplyShare, token0PerSupplyShare, collAsset0Data.incentiveSupplyApy, collAsset1Data.incentiveSupplyApy, collAsset0Data.price, collAsset1Data.price);
+    const tradingSupplyRate = yield getTradingApy(data.dexSupplyData.dexPool);
     const assetsData = [
         [collAsset0.symbol, collAsset0Data],
         [collAsset1.symbol, collAsset1Data],
@@ -550,7 +601,6 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         [debtAsset1.symbol, debtAsset1Data],
     ]
         .reduce((acc, [symbol, partialData]) => (Object.assign(Object.assign({}, acc), { [symbol]: mergeAssetData(acc[symbol], partialData) })), {});
-    const marketInfo = getFluidMarketInfoById(+data.vaultId, network);
     const liqRatio = new Dec(data.liquidationThreshold).div(100).toString();
     const liquidationMaxLimit = new Dec(data.liquidationMaxLimit).div(100).toString();
     const liqFactor = new Dec(data.liquidationThreshold).div(10000).toString();
@@ -607,13 +657,15 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         withdrawableToken1,
         withdrawableUSD,
         withdrawable: withdrawableShares,
-        widthdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
+        withdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
         maxSupplyShares,
         maxSupplySharesUsd,
         collDexFee: supplyDexFee,
         collSharePrice,
         debtSharePrice,
         oraclePrice,
+        tradingBorrowRate,
+        tradingSupplyRate,
     };
     return {
         assetsData,

package/esm/helpers/fluidHelpers/index.js

@@ -4,6 +4,24 @@ import { FluidVaultType, } from '../../types';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import { getEthAmountForDecimals } from '../../services/utils';
+const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }) => {
+    const { borrowRate, supplyRate, incentiveBorrowRate, incentiveSupplyRate, tradingBorrowRate, tradingSupplyRate, } = marketData;
+    const totalBorrowRate = new Dec(borrowRate).minus(tradingBorrowRate || '0').toString();
+    const totalSupplyRate = new Dec(supplyRate).add(tradingSupplyRate || '0').toString();
+    const borrowIncentive = new Dec(incentiveBorrowRate || '0').mul(borrowedUsd).div(100).toString();
+    const supplyIncentive = new Dec(incentiveSupplyRate || '0').mul(suppliedUsd).div(100).toString();
+    const incentiveUsd = new Dec(supplyIncentive).minus(borrowIncentive).toString();
+    const borrowInterest = new Dec(totalBorrowRate).mul(borrowedUsd).div(100).toString();
+    const supplyInterest = new Dec(totalSupplyRate).mul(suppliedUsd).div(100).toString();
+    const totalInterestUsd = new Dec(supplyInterest).add(incentiveUsd).minus(borrowInterest).toString();
+    const balance = new Dec(suppliedUsd).sub(borrowedUsd).toString();
+    const netApy = new Dec(totalInterestUsd).div(balance).times(100).toString();
+    return {
+        netApy,
+        incentiveUsd,
+        totalInterestUsd,
+    };
+};
 export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyShares, borrowShares) => {
     const payload = {};
     payload.suppliedUsd = [FluidVaultType.T1, FluidVaultType.T3].includes(marketData.vaultType)
@@ -12,7 +30,8 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, },
     payload.borrowedUsd = [FluidVaultType.T1, FluidVaultType.T2].includes(marketData.vaultType)
         ? getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd)
         : new Dec(marketData.debtSharePrice).mul(borrowShares).toString();
-    const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({ usedAssets, assetsData: assetsData });
+    const isDex = [FluidVaultType.T2, FluidVaultType.T3, FluidVaultType.T4].includes(marketData.vaultType);
+    const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({ marketData, suppliedUsd: payload.suppliedUsd, borrowedUsd: payload.borrowedUsd }) : calculateNetApy({ usedAssets, assetsData: assetsData });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;
@@ -44,7 +63,7 @@ export const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, },
 export const parseDexSupplyData = (dexSupplyData, collAsset0, collAsset1) => {
     const { dexPool, // address of the dex pool
     dexId, // id of the dex pool
-    fee: _fee, // fee of the dex pool TODO videti sa Rajkom
+    fee: _fee, // fee of the dex pool (Only used as swap fees)
     lastStoredPrice, // last stored price of the dex pool
     centerPrice, // center price of the dex pool
     token0Utilization, // token0 utilization

package/esm/helpers/morphoBlueHelpers/index.js

@@ -107,73 +107,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, web3, netwo
     return { borrowRate, supplyRate };
 });
 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/esm/markets/fluid/index.d.ts

@@ -95,7 +95,6 @@ export declare const FLUID_ETH_USDC_USDT_23_ARB: (networkId?: NetworkNumber) =>
 export declare const FLUID_WSTETH_USDC_USDT_24_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_WEETH_USDC_USDT_25_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_WBTC_USDC_USDT_26_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const FLUID_SUSDS_USDC_USDT_30_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_ETH_USDC_1_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_WSTETH_USDC_2_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FLUID_WSTETH_ETH_3_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
@@ -213,7 +212,6 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     FLUID_WSTETH_USDC_USDT_24_ARB: FluidMarketInfo;
     FLUID_WEETH_USDC_USDT_25_ARB: FluidMarketInfo;
     FLUID_WBTC_USDC_USDT_26_ARB: FluidMarketInfo;
-    FLUID_SUSDS_USDC_USDT_30_ARB: FluidMarketInfo;
     FLUID_ETH_USDC_1_BASE: FluidMarketInfo;
     FLUID_WSTETH_USDC_2_BASE: FluidMarketInfo;
     FLUID_WSTETH_ETH_3_BASE: FluidMarketInfo;

package/esm/markets/fluid/index.js

@@ -1759,25 +1759,28 @@ export const FLUID_WBTC_USDC_USDT_26_ARB = (networkId = NetworkNumber.Eth) => ({
     debtAsset0: 'USDC',
     debtAsset1: 'USDT',
 });
-export const FLUID_SUSDS_USDC_USDT_30_ARB = (networkId = NetworkNumber.Eth) => ({
-    stableBased: true,
-    btcBased: false,
-    wstETHBased: false,
-    ethBased: false,
-    type: FluidVaultType.T3,
-    id: 30,
-    chainIds: [NetworkNumber.Arb],
-    label: '#30 (sUSDS / USDC-USDT)',
-    shortLabel: 'sUSDS/USDC-USDT',
-    value: FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB,
-    url: 'susds_usdc_usdt_30_arb',
-    marketAddress: '0xE6b5D1CdC4935295c84772C4700932b4BFC93274',
-    hasSmartCollateral: false,
-    hasSmartDebt: true,
-    collateralAsset0: 'sUSDS',
-    debtAsset0: 'USDC',
-    debtAsset1: 'USDT',
-});
+// TODO: This issue is due to sUSDS price fetching via multicall on arbi fails and it's not handled correctly
+/*
+export const FLUID_SUSDS_USDC_USDT_30_ARB = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
+  stableBased: true,
+  btcBased: false,
+  wstETHBased: false,
+  ethBased: false,
+  type: FluidVaultType.T3,
+  id: 30,
+  chainIds: [NetworkNumber.Arb],
+  label: '#30 (sUSDS / USDC-USDT)',
+  shortLabel: 'sUSDS/USDC-USDT',
+  value: FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB,
+  url: 'susds_usdc_usdt_30_arb',
+  marketAddress: '0xE6b5D1CdC4935295c84772C4700932b4BFC93274',
+  hasSmartCollateral: false,
+  hasSmartDebt: true,
+  collateralAsset0: 'sUSDS',
+  debtAsset0: 'USDC',
+  debtAsset1: 'USDT',
+});
+*/
 export const FLUID_ETH_USDC_1_BASE = (networkId = NetworkNumber.Eth) => ({
     stableBased: true,
     btcBased: false,
@@ -2082,7 +2085,7 @@ export const FLUID_ETH_SUSDS_17_BASE = (networkId = NetworkNumber.Eth) => ({
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset0: 'ETH',
-    debtAsset0: 'sSUDS',
+    debtAsset0: 'sUSDS',
 });
 export const FLUID_WSTETH_SUSDS_18_BASE = (networkId = NetworkNumber.Eth) => ({
     stableBased: true,
@@ -2253,7 +2256,7 @@ export const FluidMarkets = (networkId) => ({
     [FluidArbitrumVersion.FLUID_WSTETH_USDC_USDT_24_ARB]: FLUID_WSTETH_USDC_USDT_24_ARB(networkId),
     [FluidArbitrumVersion.FLUID_WEETH_USDC_USDT_25_ARB]: FLUID_WEETH_USDC_USDT_25_ARB(networkId),
     [FluidArbitrumVersion.FLUID_WBTC_USDC_USDT_26_ARB]: FLUID_WBTC_USDC_USDT_26_ARB(networkId),
-    [FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB]: FLUID_SUSDS_USDC_USDT_30_ARB(networkId),
+    // [FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB]: FLUID_SUSDS_USDC_USDT_30_ARB(networkId),
     // base
     [FluidBaseVersions.FLUID_ETH_USDC_1_BASE]: FLUID_ETH_USDC_1_BASE(networkId),
     [FluidBaseVersions.FLUID_WSTETH_USDC_2_BASE]: FLUID_WSTETH_USDC_2_BASE(networkId),

package/esm/services/priceService.d.ts

@@ -28,4 +28,6 @@ export declare const parseWeETHPriceCalls: (_ethPrice: string, weETHrate: {
     weETHRate: string;
 };
 export declare const getWstETHPriceFluid: (web3: Web3, network: NetworkNumber) => Promise<string>;
+export declare const getBTCPriceForFluid: (web3: Web3, network: NetworkNumber) => Promise<string>;
+export declare const getEthPriceForFluid: (web3: Web3, network: NetworkNumber) => Promise<string>;
 export declare const getChainlinkAssetAddress: (symbol: string, network: NetworkNumber) => string;

package/esm/services/priceService.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { getAssetInfo } from '@defisaver/tokens';
-import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract, WeETHPriceFeedContract, WstETHPriceFeedContract, } from '../contracts';
+import { COMPPriceFeedContract, ETHPriceFeedContract, BTCPriceFeedContract, USDCPriceFeedContract, WeETHPriceFeedContract, WstETHPriceFeedContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
 import { multicall } from '../multicall';
 import { getEthAmountForDecimals } from './utils';
@@ -109,6 +109,16 @@ export const getWstETHPriceFluid = (web3, network) => __awaiter(void 0, void 0,
     const { ethPrice, wstETHRate } = parseWstETHPriceCalls(multicallRes[0][0], multicallRes[1], multicallRes[2][0]);
     return new Dec(ethPrice).mul(wstETHRate).toString();
 });
+export const getBTCPriceForFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const contract = BTCPriceFeedContract(web3, network);
+    const price = yield contract.methods.latestAnswer().call();
+    return new Dec(price).div(1e8).toString();
+});
+export const getEthPriceForFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const contract = ETHPriceFeedContract(web3, network);
+    const price = yield contract.methods.latestAnswer().call();
+    return new Dec(price).div(1e8).toString();
+});
 // chainlink price feed available only on mainnet
 export const getChainlinkAssetAddress = (symbol, network) => {
     // Chainlink only has BTC/USD feed so we use that for BTC derivatives