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

package/cjs/fluid/index.js

@@ -47,6 +47,9 @@ const parseVaultType = (vaultType) => {
 const getChainLinkPricesForTokens = (tokens, network, web3) => __awaiter(void 0, void 0, void 0, function* () {
     const isMainnet = (0, utils_1.isMainnetNetwork)(network);
     const noDuplicateTokens = new Array(...new Set(tokens));
+    // TODO: this needs to be refactored
+    const ethPriceChainlink = yield (0, priceService_1.getEthPriceForFluid)(web3, network);
+    const btcPriceChainlink = yield (0, priceService_1.getBTCPriceForFluid)(web3, network);
     const calls = noDuplicateTokens.flatMap((address) => {
         const assetInfo = (0, tokens_1.getAssetInfoByAddress)(address, network);
         const isTokenUSDA = assetInfo.symbol === 'USDA';
@@ -86,6 +89,27 @@ const getChainLinkPricesForTokens = (tokens, network, web3) => __awaiter(void 0,
                 acc[token] = new decimal_js_1.default(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 decimal_js_1.default(ethPriceChainlink).mul(1.049).toString();
+                break;
+            }
+            case 'rsETH': {
+                acc[token] = new decimal_js_1.default(ethPriceChainlink).mul(1.0454).toString();
+                break;
+            }
+            case 'weETHs': {
+                acc[token] = new decimal_js_1.default(ethPriceChainlink).mul(1.026).toString();
+                break;
+            }
+            case 'LBTC': {
+                acc[token] = new decimal_js_1.default(btcPriceChainlink).toString();
+                break;
+            }
+            case 'sUSDS': {
+                acc[token] = new decimal_js_1.default('105276929').toString();
+                break;
+            }
             case 'weETH': {
                 const { ethPrice, weETHRate, } = (0, priceService_1.parseWeETHPriceCalls)(prices[i + offset][0], prices[i + offset + 1], prices[i + offset + 2][0]);
                 offset += 2;
@@ -100,6 +124,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 decimal_js_1.default('105276929').div(1e8).toString();
+    }
     const isTokenUSDA = asset.symbol === 'USDA';
     const isMainnet = (0, utils_1.isMainnetNetwork)(network);
     const loanTokenFeedAddress = (0, priceService_1.getChainlinkAssetAddress)(asset.symbol, network);
@@ -120,6 +147,30 @@ const getTokenPriceFromChainlink = (asset, network, web3) => __awaiter(void 0, v
     }
     return new decimal_js_1.default(loanTokenPrice).div(1e8).toString();
 });
+const getMarketRateForDex = (token1PerShare, token0PerShare, rate0, rate1, price0, price1) => {
+    const token0PerShareUsd = new decimal_js_1.default(token0PerShare).mul(price0).toString();
+    const token1PerShareUsd = new decimal_js_1.default(token1PerShare).mul(price1).toString();
+    const sharesCombinedUsd = new decimal_js_1.default(token0PerShareUsd).plus(token1PerShareUsd);
+    const rate0PerShare = new decimal_js_1.default(rate0).mul(token0PerShareUsd).div(sharesCombinedUsd).toString();
+    const rate1PerShare = new decimal_js_1.default(rate1).mul(token1PerShareUsd).div(sharesCombinedUsd).toString();
+    return new decimal_js_1.default(rate0PerShare).plus(rate1PerShare).toString();
+};
+const getAdditionalMarketRateForDex = (token1PerShare, token0PerShare, incentiveSupplyRate0, incentiveSupplyRate1, price0, price1) => {
+    const token0PerShareUsd = new decimal_js_1.default(token0PerShare).mul(price0).toString();
+    const token1PerShareUsd = new decimal_js_1.default(token1PerShare).mul(price1).toString();
+    const sharesCombinedUsd = new decimal_js_1.default(token0PerShareUsd).plus(token1PerShareUsd);
+    const rate0PerShare = incentiveSupplyRate0 ? new decimal_js_1.default(incentiveSupplyRate0).mul(token0PerShareUsd).div(sharesCombinedUsd).toString() : 0;
+    const rate1PerShare = incentiveSupplyRate1 ? new decimal_js_1.default(incentiveSupplyRate1).mul(token1PerShareUsd).div(sharesCombinedUsd).toString() : 0;
+    return new decimal_js_1.default(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 decimal_js_1.default(data.tradingApy).div(100).toString();
+});
 const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const collAsset = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const debtAsset = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
@@ -144,6 +195,7 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset.symbol, mainnetWeb3);
         collAssetData.incentiveSupplyToken = collAsset.symbol;
     }
+    const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
     const debtAssetData = {
         symbol: debtAsset.symbol,
         address: debtAsset.address,
@@ -159,10 +211,7 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAssetData.incentiveBorrowApy = yield (0, staking_1.getStakingApy)(debtAsset.symbol, mainnetWeb3);
         debtAssetData.incentiveBorrowToken = debtAsset.symbol;
     }
-    if (staking_1.STAKING_ASSETS.includes(debtAssetData.symbol)) {
-        debtAssetData.incentiveBorrowApy = yield (0, staking_1.getStakingApy)(debtAsset.symbol, mainnetWeb3);
-        debtAssetData.incentiveBorrowToken = debtAsset.symbol;
-    }
+    const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
     const assetsData = {
         [collAsset.symbol]: collAssetData,
         [debtAsset.symbol]: debtAssetData,
@@ -206,6 +255,8 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         liquidationMaxLimit,
         borrowRate,
         supplyRate,
+        incentiveSupplyRate,
+        incentiveBorrowRate,
         oraclePrice,
     };
     return {
@@ -213,19 +264,6 @@ const parseT1MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         marketData,
     };
 });
-const getMarketRateForDex = (token1PerShare, token0PerShare, rate0, rate1) => {
-    const sharesCombined = new decimal_js_1.default(token1PerShare).plus(token0PerShare);
-    const rate0PerShare = new decimal_js_1.default(rate0).mul(token0PerShare).div(sharesCombined).toString();
-    const rate1PerShare = new decimal_js_1.default(rate1).mul(token1PerShare).div(sharesCombined).toString();
-    return new decimal_js_1.default(rate0PerShare).plus(rate1PerShare).toString();
-};
-const getAdditionalMarketRateForDex = (token1PerShare, token0PerShare, incentiveSupplyRate0, incentiveSupplyRate1) => {
-    console.log(incentiveSupplyRate0, incentiveSupplyRate1);
-    const sharesCombined = new decimal_js_1.default(token1PerShare).plus(token0PerShare);
-    const rate0PerShare = incentiveSupplyRate0 ? new decimal_js_1.default(incentiveSupplyRate0).mul(token0PerShare).div(sharesCombined).toString() : 0;
-    const rate1PerShare = incentiveSupplyRate1 ? new decimal_js_1.default(incentiveSupplyRate1).mul(token1PerShare).div(sharesCombined).toString() : 0;
-    return new decimal_js_1.default(rate0PerShare).plus(rate1PerShare).toString();
-};
 const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const collAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const collAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network);
@@ -268,8 +306,9 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collSecondAssetData.incentiveSupplyApy = yield (0, staking_1.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 decimal_js_1.default(data.borrowRateVault).div(100).toString();
     const debtAssetData = {
         symbol: debtAsset.symbol,
@@ -283,6 +322,7 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAssetData.incentiveBorrowApy = yield (0, staking_1.getStakingApy)(debtAsset.symbol, mainnetWeb3);
         debtAssetData.incentiveBorrowToken = debtAsset.symbol;
     }
+    const incentiveBorrowRate = debtAssetData.incentiveBorrowApy;
     const assetsData = [
         [collAsset0.symbol, collFirstAssetData],
         [collAsset1.symbol, collSecondAssetData],
@@ -332,17 +372,20 @@ const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         borrowRate,
         supplyRate: marketSupplyRate,
         incentiveSupplyRate,
+        incentiveBorrowRate,
         totalSupplyToken0,
         totalSupplyToken1,
         withdrawableToken0,
         withdrawableToken1,
         withdrawableUSD,
         withdrawable: withdrawableShares,
-        widthdrawableDex: new decimal_js_1.default(maxSupplyShares).minus(totalSupplyShares).toString(),
+        withdrawableDex: new decimal_js_1.default(maxSupplyShares).minus(totalSupplyShares).toString(),
         maxSupplyShares,
         maxSupplySharesUsd,
         collDexFee: supplyDexFee,
         oraclePrice,
+        tradingSupplyRate,
+        tradingBorrowRate: '0',
     };
     return {
         assetsData,
@@ -372,6 +415,7 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         collAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset.symbol, mainnetWeb3);
         collAssetData.incentiveSupplyToken = collAsset.symbol;
     }
+    const incentiveSupplyRate = collAssetData.incentiveSupplyApy;
     const debtAsset0Data = {
         symbol: debtAsset0.symbol,
         address: debtAsset0.address,
@@ -404,8 +448,9 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAsset1Data.incentiveSupplyApy = yield (0, staking_1.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],
@@ -450,6 +495,9 @@ const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         borrowRate: marketBorrowRate,
         supplyRate,
         incentiveBorrowRate,
+        incentiveSupplyRate,
+        tradingBorrowRate,
+        tradingSupplyRate: '0',
         borrowableToken0,
         borrowableToken1,
         totalBorrowToken0,
@@ -545,10 +593,13 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         debtAsset1Data.incentiveSupplyApy = yield (0, staking_1.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 = (0, markets_1.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],
@@ -556,7 +607,6 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         [debtAsset1.symbol, debtAsset1Data],
     ]
         .reduce((acc, [symbol, partialData]) => (Object.assign(Object.assign({}, acc), { [symbol]: (0, fluidHelpers_1.mergeAssetData)(acc[symbol], partialData) })), {});
-    const marketInfo = (0, markets_1.getFluidMarketInfoById)(+data.vaultId, network);
     const liqRatio = new decimal_js_1.default(data.liquidationThreshold).div(100).toString();
     const liquidationMaxLimit = new decimal_js_1.default(data.liquidationMaxLimit).div(100).toString();
     const liqFactor = new decimal_js_1.default(data.liquidationThreshold).div(10000).toString();
@@ -613,13 +663,15 @@ const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0
         withdrawableToken1,
         withdrawableUSD,
         withdrawable: withdrawableShares,
-        widthdrawableDex: new decimal_js_1.default(maxSupplyShares).minus(totalSupplyShares).toString(),
+        withdrawableDex: new decimal_js_1.default(maxSupplyShares).minus(totalSupplyShares).toString(),
         maxSupplyShares,
         maxSupplySharesUsd,
         collDexFee: supplyDexFee,
         collSharePrice,
         debtSharePrice,
         oraclePrice,
+        tradingBorrowRate,
+        tradingSupplyRate,
     };
     return {
         assetsData,

package/cjs/helpers/fluidHelpers/index.js

@@ -10,6 +10,24 @@ const types_1 = require("../../types");
 const moneymarket_1 = require("../../moneymarket");
 const staking_1 = require("../../staking");
 const utils_1 = require("../../services/utils");
+const calculateNetApyDex = ({ marketData, suppliedUsd, borrowedUsd }) => {
+    const { borrowRate, supplyRate, incentiveBorrowRate, incentiveSupplyRate, tradingBorrowRate, tradingSupplyRate, } = marketData;
+    const totalBorrowRate = new decimal_js_1.default(borrowRate).minus(tradingBorrowRate || '0').toString();
+    const totalSupplyRate = new decimal_js_1.default(supplyRate).add(tradingSupplyRate || '0').toString();
+    const borrowIncentive = new decimal_js_1.default(incentiveBorrowRate || '0').mul(borrowedUsd).div(100).toString();
+    const supplyIncentive = new decimal_js_1.default(incentiveSupplyRate || '0').mul(suppliedUsd).div(100).toString();
+    const incentiveUsd = new decimal_js_1.default(supplyIncentive).minus(borrowIncentive).toString();
+    const borrowInterest = new decimal_js_1.default(totalBorrowRate).mul(borrowedUsd).div(100).toString();
+    const supplyInterest = new decimal_js_1.default(totalSupplyRate).mul(suppliedUsd).div(100).toString();
+    const totalInterestUsd = new decimal_js_1.default(supplyInterest).add(incentiveUsd).minus(borrowInterest).toString();
+    const balance = new decimal_js_1.default(suppliedUsd).sub(borrowedUsd).toString();
+    const netApy = new decimal_js_1.default(totalInterestUsd).div(balance).times(100).toString();
+    return {
+        netApy,
+        incentiveUsd,
+        totalInterestUsd,
+    };
+};
 const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyShares, borrowShares) => {
     const payload = {};
     payload.suppliedUsd = [types_1.FluidVaultType.T1, types_1.FluidVaultType.T3].includes(marketData.vaultType)
@@ -18,7 +36,8 @@ const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyS
     payload.borrowedUsd = [types_1.FluidVaultType.T1, types_1.FluidVaultType.T2].includes(marketData.vaultType)
         ? (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd)
         : new decimal_js_1.default(marketData.debtSharePrice).mul(borrowShares).toString();
-    const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData: assetsData });
+    const isDex = [types_1.FluidVaultType.T2, types_1.FluidVaultType.T3, types_1.FluidVaultType.T4].includes(marketData.vaultType);
+    const { netApy, incentiveUsd, totalInterestUsd } = isDex ? calculateNetApyDex({ marketData, suppliedUsd: payload.suppliedUsd, borrowedUsd: payload.borrowedUsd }) : (0, staking_1.calculateNetApy)({ usedAssets, assetsData: assetsData });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;
@@ -51,7 +70,7 @@ exports.getFluidAggregatedData = getFluidAggregatedData;
 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/cjs/helpers/morphoBlueHelpers/index.js

@@ -117,73 +117,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/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/cjs/markets/fluid/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FLUID_CBBTC_GHO_60 = exports.FLUID_WBTC_GHO_59 = exports.FLUID_SUSDS_GHO_58 = exports.FLUID_WEETH_GHO_57 = exports.FLUID_SUSDE_GHO_56 = exports.FLUID_WSTETH_GHO_55 = exports.FLUID_ETH_GHO_54 = exports.FLUID_WBTC_CBBTC_USDT_53 = exports.FLUID_WBTC_CBBTC_USDC_52 = exports.FLUID_WBTC_CBBTC_WBTC_CBBTC_51 = exports.FLUID_SUSDE_USDC_USDT_50 = exports.FLUID_CBBTC_USDC_USDT_49 = exports.FLUID_WBTC_USDC_USDT_48 = exports.FLUID_WEETH_USDC_USDT_47 = exports.FLUID_WSTETH_USDC_USDT_46 = exports.FLUID_ETH_USDC_USDT_45 = exports.FLUID_WSTETH_ETH_WSTETH_ETH_44 = exports.FLUID_WEETH_CBBTC_32 = exports.FLUID_WSTETH_CBBTC_33 = exports.FLUID_ETH_CBBTC_31 = exports.FLUID_CBBTC_USDT_30 = exports.FLUID_CBBTC_USDC_29 = exports.FLUID_CBBTC_ETH_28 = exports.FLUID_WEETHS_WSTETH_27 = exports.FLUID_WEETH_WBTC_26 = exports.FLUID_WSTETH_WBTC_25 = exports.FLUID_ETH_WBTC_24 = exports.FLUID_WBTC_ETH_23 = exports.FLUID_WBTC_USDT_22 = exports.FLUID_WBTC_USDC_21 = exports.FLUID_WEETH_USDT_20 = exports.FLUID_WEETH_USDC_19 = exports.FLUID_SUSDE_USDT_18 = exports.FLUID_SUSDE_USDC_17 = exports.FLUID_WEETH_WSTETH_16 = exports.FLUID_WSTETH_USDT_15 = exports.FLUID_WSTETH_USDC_14 = exports.FLUID_WSTETH_ETH_13 = exports.FLUID_ETH_USDT_12 = exports.FLUID_ETH_USDC_11 = exports.FLUID_WEETH_USDT_10 = exports.FLUID_WEETH_USDC_9 = exports.FLUID_SUSDE_USDT_8 = exports.FLUID_SUSDE_USDC_7 = exports.FLUID_WEETH_WSTETH_6 = exports.FLUID_WSTETH_USDT_5 = exports.FLUID_WSTETH_USDC_4 = exports.FLUID_WSTETH_ETH_3 = exports.FLUID_ETH_USDT_2 = exports.FLUID_ETH_USDC_1 = void 0;
-exports.FLUID_WEETH_WSTETH_4_BASE = exports.FLUID_WSTETH_ETH_3_BASE = exports.FLUID_WSTETH_USDC_2_BASE = exports.FLUID_ETH_USDC_1_BASE = exports.FLUID_SUSDS_USDC_USDT_30_ARB = exports.FLUID_WBTC_USDC_USDT_26_ARB = exports.FLUID_WEETH_USDC_USDT_25_ARB = exports.FLUID_WSTETH_USDC_USDT_24_ARB = exports.FLUID_ETH_USDC_USDT_23_ARB = exports.FLUID_USDC_ETH_USDC_ETH_22_ARB = exports.FLUID_WEETH_WBTC_21_ARB = exports.FLUID_WSTETH_WBTC_20_ARB = exports.FLUID_ETH_WBTC_19_ARB = exports.FLUID_WBTC_ETH_18_ARB = exports.FLUID_WEETH_ETH_WSTETH_17_ARB = exports.FLUID_WSTETH_ETH_WSTETH_ETH_16_ARB = exports.FLUID_WBTC_USDT_13_ARB = exports.FLUID_WBTC_USDC_12_ARB = exports.FLUID_ARB_USDT_11_ARB = exports.FLUID_ARB_USDC_10_ARB = exports.FLUID_ETH_ARB_9_ARB = exports.FLUID_WEETH_USDT_8_ARB = exports.FLUID_WEETH_USDC_7_ARB = exports.FLUID_WEETH_WSTETH_6_ARB = exports.FLUID_WSTETH_ETH_5_ARB = exports.FLUID_WSTETH_USDT_4_ARB = exports.FLUID_WSTETH_USDC_3_ARB = exports.FLUID_ETH_USDT_2_ARB = exports.FLUID_ETH_USDC_1_ARB = exports.FLUID_WBTC_LBTC_WBTC_115 = exports.FLUID_LBTC_CBBTC_CBBTC_114 = exports.FLUID_LBTC_GHO_109 = exports.FLUID_LBTC_USDT_108 = exports.FLUID_LBTC_USDC_107 = exports.FLUID_EZETH_ETH_WSTETH_104 = exports.FLUID_EZETH_WSTETH_103 = exports.FLUID_USDC_CBBTC_102 = exports.FLUID_USDC_WBTC_101 = exports.FLUID_USDC_ETH_100 = exports.FLUID_USDE_USDT_USDC_USDT_99 = exports.FLUID_SUSDE_USDT_USDC_USDT_98 = exports.FLUID_LBTC_CBBTC_WBTC_97 = exports.FLUID_USDE_USDT_USDT_93 = exports.FLUID_SUSDE_USDT_USDT_92 = exports.FLUID_WEETHS_ETH_WSTETH_80 = exports.FLUID_RSETH_WSTETH_79 = exports.FLUID_RSETH_ETH_WSTETH_78 = exports.FLUID_USDC_ETH_USDC_ETH_77 = exports.FLUID_WEETH_ETH_WSTETH_74 = exports.FLUID_GHO_USDC_GHO_USDC_61 = void 0;
-exports.getFTokenAddress = exports.FluidFTokens = exports.getFluidMarketInfoByAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.FLUID_LBTC_SUSDS_22_BASE = exports.FLUID_LBTC_USDC_21_BASE = exports.FLUID_CBBTC_SUSDS_19_BASE = exports.FLUID_WSTETH_SUSDS_18_BASE = exports.FLUID_ETH_SUSDS_17_BASE = exports.FLUID_WSTETH_CBBTC_16_BASE = exports.FLUID_WEETH_CBBTC_15_BASE = exports.FLUID_ETH_CBBTC_14_BASE = exports.FLUID_CBBTC_ETH_13_BASE = exports.FLUID_WSTETH_EURC_12_BASE = exports.FLUID_WEETH_EURC_11_BASE = exports.FLUID_ETH_EURC_10_BASE = exports.FLUID_CBETH_EURC_9_BASE = exports.FLUID_CBBTC_EURC_8_BASE = exports.FLUID_CBBTC_USDC_7_BASE = exports.FLUID_CBETH_USDC_6_BASE = exports.FLUID_WEETH_USDC_5_BASE = void 0;
+exports.FLUID_WEETH_USDC_5_BASE = exports.FLUID_WEETH_WSTETH_4_BASE = exports.FLUID_WSTETH_ETH_3_BASE = exports.FLUID_WSTETH_USDC_2_BASE = exports.FLUID_ETH_USDC_1_BASE = exports.FLUID_WBTC_USDC_USDT_26_ARB = exports.FLUID_WEETH_USDC_USDT_25_ARB = exports.FLUID_WSTETH_USDC_USDT_24_ARB = exports.FLUID_ETH_USDC_USDT_23_ARB = exports.FLUID_USDC_ETH_USDC_ETH_22_ARB = exports.FLUID_WEETH_WBTC_21_ARB = exports.FLUID_WSTETH_WBTC_20_ARB = exports.FLUID_ETH_WBTC_19_ARB = exports.FLUID_WBTC_ETH_18_ARB = exports.FLUID_WEETH_ETH_WSTETH_17_ARB = exports.FLUID_WSTETH_ETH_WSTETH_ETH_16_ARB = exports.FLUID_WBTC_USDT_13_ARB = exports.FLUID_WBTC_USDC_12_ARB = exports.FLUID_ARB_USDT_11_ARB = exports.FLUID_ARB_USDC_10_ARB = exports.FLUID_ETH_ARB_9_ARB = exports.FLUID_WEETH_USDT_8_ARB = exports.FLUID_WEETH_USDC_7_ARB = exports.FLUID_WEETH_WSTETH_6_ARB = exports.FLUID_WSTETH_ETH_5_ARB = exports.FLUID_WSTETH_USDT_4_ARB = exports.FLUID_WSTETH_USDC_3_ARB = exports.FLUID_ETH_USDT_2_ARB = exports.FLUID_ETH_USDC_1_ARB = exports.FLUID_WBTC_LBTC_WBTC_115 = exports.FLUID_LBTC_CBBTC_CBBTC_114 = exports.FLUID_LBTC_GHO_109 = exports.FLUID_LBTC_USDT_108 = exports.FLUID_LBTC_USDC_107 = exports.FLUID_EZETH_ETH_WSTETH_104 = exports.FLUID_EZETH_WSTETH_103 = exports.FLUID_USDC_CBBTC_102 = exports.FLUID_USDC_WBTC_101 = exports.FLUID_USDC_ETH_100 = exports.FLUID_USDE_USDT_USDC_USDT_99 = exports.FLUID_SUSDE_USDT_USDC_USDT_98 = exports.FLUID_LBTC_CBBTC_WBTC_97 = exports.FLUID_USDE_USDT_USDT_93 = exports.FLUID_SUSDE_USDT_USDT_92 = exports.FLUID_WEETHS_ETH_WSTETH_80 = exports.FLUID_RSETH_WSTETH_79 = exports.FLUID_RSETH_ETH_WSTETH_78 = exports.FLUID_USDC_ETH_USDC_ETH_77 = exports.FLUID_WEETH_ETH_WSTETH_74 = exports.FLUID_GHO_USDC_GHO_USDC_61 = void 0;
+exports.getFTokenAddress = exports.FluidFTokens = exports.getFluidMarketInfoByAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.FLUID_LBTC_SUSDS_22_BASE = exports.FLUID_LBTC_USDC_21_BASE = exports.FLUID_CBBTC_SUSDS_19_BASE = exports.FLUID_WSTETH_SUSDS_18_BASE = exports.FLUID_ETH_SUSDS_17_BASE = exports.FLUID_WSTETH_CBBTC_16_BASE = exports.FLUID_WEETH_CBBTC_15_BASE = exports.FLUID_ETH_CBBTC_14_BASE = exports.FLUID_CBBTC_ETH_13_BASE = exports.FLUID_WSTETH_EURC_12_BASE = exports.FLUID_WEETH_EURC_11_BASE = exports.FLUID_ETH_EURC_10_BASE = exports.FLUID_CBETH_EURC_9_BASE = exports.FLUID_CBBTC_EURC_8_BASE = exports.FLUID_CBBTC_USDC_7_BASE = exports.FLUID_CBETH_USDC_6_BASE = void 0;
 const common_1 = require("../../types/common");
 const types_1 = require("../../types");
 const utils_1 = require("../../services/utils");
@@ -1859,26 +1859,28 @@ const FLUID_WBTC_USDC_USDT_26_ARB = (networkId = common_1.NetworkNumber.Eth) =>
     debtAsset1: 'USDT',
 });
 exports.FLUID_WBTC_USDC_USDT_26_ARB = FLUID_WBTC_USDC_USDT_26_ARB;
-const FLUID_SUSDS_USDC_USDT_30_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
-    stableBased: true,
-    btcBased: false,
-    wstETHBased: false,
-    ethBased: false,
-    type: types_1.FluidVaultType.T3,
-    id: 30,
-    chainIds: [common_1.NetworkNumber.Arb],
-    label: '#30 (sUSDS / USDC-USDT)',
-    shortLabel: 'sUSDS/USDC-USDT',
-    value: types_1.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',
-});
-exports.FLUID_SUSDS_USDC_USDT_30_ARB = FLUID_SUSDS_USDC_USDT_30_ARB;
+// 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',
+});
+*/
 const FLUID_ETH_USDC_1_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     stableBased: true,
     btcBased: false,
@@ -2199,7 +2201,7 @@ const FLUID_ETH_SUSDS_17_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset0: 'ETH',
-    debtAsset0: 'sSUDS',
+    debtAsset0: 'sUSDS',
 });
 exports.FLUID_ETH_SUSDS_17_BASE = FLUID_ETH_SUSDS_17_BASE;
 const FLUID_WSTETH_SUSDS_18_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -2375,7 +2377,7 @@ const FluidMarkets = (networkId) => ({
     [types_1.FluidArbitrumVersion.FLUID_WSTETH_USDC_USDT_24_ARB]: (0, exports.FLUID_WSTETH_USDC_USDT_24_ARB)(networkId),
     [types_1.FluidArbitrumVersion.FLUID_WEETH_USDC_USDT_25_ARB]: (0, exports.FLUID_WEETH_USDC_USDT_25_ARB)(networkId),
     [types_1.FluidArbitrumVersion.FLUID_WBTC_USDC_USDT_26_ARB]: (0, exports.FLUID_WBTC_USDC_USDT_26_ARB)(networkId),
-    [types_1.FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB]: (0, exports.FLUID_SUSDS_USDC_USDT_30_ARB)(networkId),
+    // [FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB]: FLUID_SUSDS_USDC_USDT_30_ARB(networkId),
     // base
     [types_1.FluidBaseVersions.FLUID_ETH_USDC_1_BASE]: (0, exports.FLUID_ETH_USDC_1_BASE)(networkId),
     [types_1.FluidBaseVersions.FLUID_WSTETH_USDC_2_BASE]: (0, exports.FLUID_WSTETH_USDC_2_BASE)(networkId),

package/cjs/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/cjs/services/priceService.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.getChainlinkAssetAddress = exports.getWstETHPriceFluid = exports.parseWeETHPriceCalls = exports.parseWstETHPriceCalls = exports.getWeETHChainLinkPriceCalls = exports.getWstETHChainLinkPriceCalls = exports.getWstETHPrice = exports.getCompPrice = exports.getUSDCPrice = exports.getEthPrice = void 0;
+exports.getChainlinkAssetAddress = exports.getEthPriceForFluid = exports.getBTCPriceForFluid = exports.getWstETHPriceFluid = exports.parseWeETHPriceCalls = exports.parseWstETHPriceCalls = exports.getWeETHChainLinkPriceCalls = exports.getWstETHChainLinkPriceCalls = exports.getWstETHPrice = exports.getCompPrice = exports.getUSDCPrice = exports.getEthPrice = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
@@ -124,6 +124,18 @@ const getWstETHPriceFluid = (web3, network) => __awaiter(void 0, void 0, void 0,
     return new decimal_js_1.default(ethPrice).mul(wstETHRate).toString();
 });
 exports.getWstETHPriceFluid = getWstETHPriceFluid;
+const getBTCPriceForFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const contract = (0, contracts_1.BTCPriceFeedContract)(web3, network);
+    const price = yield contract.methods.latestAnswer().call();
+    return new decimal_js_1.default(price).div(1e8).toString();
+});
+exports.getBTCPriceForFluid = getBTCPriceForFluid;
+const getEthPriceForFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const contract = (0, contracts_1.ETHPriceFeedContract)(web3, network);
+    const price = yield contract.methods.latestAnswer().call();
+    return new decimal_js_1.default(price).div(1e8).toString();
+});
+exports.getEthPriceForFluid = getEthPriceForFluid;
 // chainlink price feed available only on mainnet
 const getChainlinkAssetAddress = (symbol, network) => {
     // Chainlink only has BTC/USD feed so we use that for BTC derivatives