@defisaver/positions-sdk 0.0.201-fluid-dev-3 → 0.0.201-fluid-dev-5

package/cjs/types/fluid.d.ts

@@ -24,8 +24,6 @@ export declare enum FluidMainnetVersion {
     WSTETH_USDC_4 = "WSTETH_USDC_4",
     WSTETH_USDT_5 = "WSTETH_USDT_5",
     WEETH_WSTETH_6 = "WEETH_WSTETH_6",
-    SUSDE_USDC_7 = "SUSDE_USDC_7",
-    SUSDE_USDT_8 = "SUSDE_USDT_8",
     WEETH_USDC_9 = "WEETH_USDC_9",
     WEETH_USDT_10 = "WEETH_USDT_10",
     ETH_USDC_11 = "ETH_USDC_11",
@@ -50,7 +48,6 @@ export declare enum FluidMainnetVersion {
     CBBTC_USDT_30 = "CBBTC_USDT_30",
     ETH_CBBTC_31 = "ETH_CBBTC_31",
     WEETH_CBBTC_32 = "WEETH_CBBTC_32",
-    WSTETH_CBBTC_33 = "WSTETH_CBBTC_33",
     WSTETH_ETH_WSTETH_ETH_44 = "WSTETH_ETH_WSTETH_ETH_44",
     ETH_USDC_USDT_45 = "ETH_USDC_USDT_45",
     WSTETH_USDC_USDT_46 = "WSTETH_USDC_USDT_46",
@@ -66,8 +63,6 @@ export declare enum FluidMainnetVersion {
     SUSDE_GHO_56 = "SUSDE_GHO_56",
     WEETH_GHO_57 = "WEETH_GHO_57",
     SUSDS_GHO_58 = "SUSDS_GHO_58",
-    WBTC_GHO_59 = "WBTC_GHO_59",
-    CBBTC_GHO_60 = "CBBTC_GHO_60",
     GHO_USDC_GHO_USDC_61 = "GHO_USDC_GHO_USDC_61",
     WEETH_ETH_WSTETH_74 = "WEETH_ETH_WSTETH_74",
     USDC_ETH_USDC_ETH_77 = "USDC_ETH_USDC_ETH_77",
@@ -120,10 +115,7 @@ export declare enum FluidBaseVersions {
     CBBTC_ETH_13_BASE = "CBBTC_ETH_13_BASE",
     ETH_CBBTC_14_BASE = "ETH_CBBTC_14_BASE",
     WEETH_CBBTC_15_BASE = "WEETH_CBBTC_15_BASE",
-    WSTETH_CBBTC_16_BASE = "WSTETH_CBBTC_16_BASE",
-    ETH_SUSDS_17_BASE = "ETH_SUSDS_17_BASE",
-    WSTETH_SUSDS_18_BASE = "WSTETH_SUSDS_18_BASE",
-    CBBTC_SUSDS_19_BASE = "CBBTC_SUSDS_19_BASE"
+    WSTETH_CBBTC_16_BASE = "WSTETH_CBBTC_16_BASE"
 }
 export type FluidVersions = FluidArbitrumVersion | FluidBaseVersions | FluidMainnetVersion;
 export declare enum FluidMainnetDepositToken {
@@ -131,7 +123,8 @@ export declare enum FluidMainnetDepositToken {
     wstETH = "wstETH",
     USDC = "USDC",
     USDT = "USDT",
-    GHO = "GHO"
+    GHO = "GHO",
+    sUSDS = "sUSDS"
 }
 export declare enum FluidArbitrumDepositToken {
     ETH = "ETH",
@@ -144,7 +137,8 @@ export declare enum FluidBaseDepositToken {
     ETH = "ETH",
     USDC = "USDC",
     wstETH = "wstETH",
-    EURC = "EURC"
+    EURC = "EURC",
+    sUSDS = "sUSDS"
 }
 export type FluidDepositTokenByNetwork = {
     [NetworkNumber.Eth]: FluidMainnetDepositToken;

package/cjs/types/fluid.js

@@ -10,8 +10,6 @@ var FluidMainnetVersion;
     FluidMainnetVersion["WSTETH_USDC_4"] = "WSTETH_USDC_4";
     FluidMainnetVersion["WSTETH_USDT_5"] = "WSTETH_USDT_5";
     FluidMainnetVersion["WEETH_WSTETH_6"] = "WEETH_WSTETH_6";
-    FluidMainnetVersion["SUSDE_USDC_7"] = "SUSDE_USDC_7";
-    FluidMainnetVersion["SUSDE_USDT_8"] = "SUSDE_USDT_8";
     FluidMainnetVersion["WEETH_USDC_9"] = "WEETH_USDC_9";
     FluidMainnetVersion["WEETH_USDT_10"] = "WEETH_USDT_10";
     FluidMainnetVersion["ETH_USDC_11"] = "ETH_USDC_11";
@@ -36,7 +34,6 @@ var FluidMainnetVersion;
     FluidMainnetVersion["CBBTC_USDT_30"] = "CBBTC_USDT_30";
     FluidMainnetVersion["ETH_CBBTC_31"] = "ETH_CBBTC_31";
     FluidMainnetVersion["WEETH_CBBTC_32"] = "WEETH_CBBTC_32";
-    FluidMainnetVersion["WSTETH_CBBTC_33"] = "WSTETH_CBBTC_33";
     FluidMainnetVersion["WSTETH_ETH_WSTETH_ETH_44"] = "WSTETH_ETH_WSTETH_ETH_44";
     FluidMainnetVersion["ETH_USDC_USDT_45"] = "ETH_USDC_USDT_45";
     FluidMainnetVersion["WSTETH_USDC_USDT_46"] = "WSTETH_USDC_USDT_46";
@@ -52,8 +49,6 @@ var FluidMainnetVersion;
     FluidMainnetVersion["SUSDE_GHO_56"] = "SUSDE_GHO_56";
     FluidMainnetVersion["WEETH_GHO_57"] = "WEETH_GHO_57";
     FluidMainnetVersion["SUSDS_GHO_58"] = "SUSDS_GHO_58";
-    FluidMainnetVersion["WBTC_GHO_59"] = "WBTC_GHO_59";
-    FluidMainnetVersion["CBBTC_GHO_60"] = "CBBTC_GHO_60";
     FluidMainnetVersion["GHO_USDC_GHO_USDC_61"] = "GHO_USDC_GHO_USDC_61";
     FluidMainnetVersion["WEETH_ETH_WSTETH_74"] = "WEETH_ETH_WSTETH_74";
     FluidMainnetVersion["USDC_ETH_USDC_ETH_77"] = "USDC_ETH_USDC_ETH_77";
@@ -109,9 +104,6 @@ var FluidBaseVersions;
     FluidBaseVersions["ETH_CBBTC_14_BASE"] = "ETH_CBBTC_14_BASE";
     FluidBaseVersions["WEETH_CBBTC_15_BASE"] = "WEETH_CBBTC_15_BASE";
     FluidBaseVersions["WSTETH_CBBTC_16_BASE"] = "WSTETH_CBBTC_16_BASE";
-    FluidBaseVersions["ETH_SUSDS_17_BASE"] = "ETH_SUSDS_17_BASE";
-    FluidBaseVersions["WSTETH_SUSDS_18_BASE"] = "WSTETH_SUSDS_18_BASE";
-    FluidBaseVersions["CBBTC_SUSDS_19_BASE"] = "CBBTC_SUSDS_19_BASE";
 })(FluidBaseVersions || (exports.FluidBaseVersions = FluidBaseVersions = {}));
 var FluidMainnetDepositToken;
 (function (FluidMainnetDepositToken) {
@@ -120,6 +112,7 @@ var FluidMainnetDepositToken;
     FluidMainnetDepositToken["USDC"] = "USDC";
     FluidMainnetDepositToken["USDT"] = "USDT";
     FluidMainnetDepositToken["GHO"] = "GHO";
+    FluidMainnetDepositToken["sUSDS"] = "sUSDS";
 })(FluidMainnetDepositToken || (exports.FluidMainnetDepositToken = FluidMainnetDepositToken = {}));
 var FluidArbitrumDepositToken;
 (function (FluidArbitrumDepositToken) {
@@ -135,6 +128,7 @@ var FluidBaseDepositToken;
     FluidBaseDepositToken["USDC"] = "USDC";
     FluidBaseDepositToken["wstETH"] = "wstETH";
     FluidBaseDepositToken["EURC"] = "EURC";
+    FluidBaseDepositToken["sUSDS"] = "sUSDS";
 })(FluidBaseDepositToken || (exports.FluidBaseDepositToken = FluidBaseDepositToken = {}));
 var FluidVaultType;
 (function (FluidVaultType) {

package/esm/config/contracts.d.ts

@@ -6715,6 +6715,12 @@ export namespace ETHPriceFeed {
         "1": {
             address: string;
         };
+        "8453": {
+            address: string;
+        };
+        "42161": {
+            address: string;
+        };
     };
     export { networks_73 as networks };
 }
@@ -6799,6 +6805,12 @@ export namespace WstETHPriceFeed {
         "1": {
             address: string;
         };
+        "8453": {
+            address: string;
+        };
+        "42161": {
+            address: string;
+        };
     };
     export { networks_75 as networks };
 }
@@ -7283,6 +7295,9 @@ export namespace DFSFeedRegistry {
         "8453": {
             address: string;
         };
+        "42161": {
+            address: string;
+        };
     };
     export { networks_78 as networks };
 }

package/esm/config/contracts.js

@@ -1014,7 +1014,9 @@ module.exports = {
     "ETHPriceFeed": {
         "abi": [{ "inputs": [{ "internalType": "address", "name": "_aggregator", "type": "address" }, { "internalType": "address", "name": "_accessController", "type": "address" }], "stateMutability": "nonpayable", "type": "constructor" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "int256", "name": "current", "type": "int256" }, { "indexed": true, "internalType": "uint256", "name": "roundId", "type": "uint256" }, { "indexed": false, "internalType": "uint256", "name": "updatedAt", "type": "uint256" }], "name": "AnswerUpdated", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "uint256", "name": "roundId", "type": "uint256" }, { "indexed": true, "internalType": "address", "name": "startedBy", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "startedAt", "type": "uint256" }], "name": "NewRound", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "from", "type": "address" }, { "indexed": true, "internalType": "address", "name": "to", "type": "address" }], "name": "OwnershipTransferRequested", "type": "event" }, { "anonymous": false, "inputs": [{ "indexed": true, "internalType": "address", "name": "from", "type": "address" }, { "indexed": true, "internalType": "address", "name": "to", "type": "address" }], "name": "OwnershipTransferred", "type": "event" }, { "inputs": [], "name": "acceptOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "accessController", "outputs": [{ "internalType": "contract AccessControllerInterface", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "aggregator", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_aggregator", "type": "address" }], "name": "confirmAggregator", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "decimals", "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "description", "outputs": [{ "internalType": "string", "name": "", "type": "string" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "_roundId", "type": "uint256" }], "name": "getAnswer", "outputs": [{ "internalType": "int256", "name": "", "type": "int256" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint80", "name": "_roundId", "type": "uint80" }], "name": "getRoundData", "outputs": [{ "internalType": "uint80", "name": "roundId", "type": "uint80" }, { "internalType": "int256", "name": "answer", "type": "int256" }, { "internalType": "uint256", "name": "startedAt", "type": "uint256" }, { "internalType": "uint256", "name": "updatedAt", "type": "uint256" }, { "internalType": "uint80", "name": "answeredInRound", "type": "uint80" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint256", "name": "_roundId", "type": "uint256" }], "name": "getTimestamp", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "latestAnswer", "outputs": [{ "internalType": "int256", "name": "", "type": "int256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "latestRound", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "latestRoundData", "outputs": [{ "internalType": "uint80", "name": "roundId", "type": "uint80" }, { "internalType": "int256", "name": "answer", "type": "int256" }, { "internalType": "uint256", "name": "startedAt", "type": "uint256" }, { "internalType": "uint256", "name": "updatedAt", "type": "uint256" }, { "internalType": "uint80", "name": "answeredInRound", "type": "uint80" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "latestTimestamp", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "owner", "outputs": [{ "internalType": "address payable", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint16", "name": "", "type": "uint16" }], "name": "phaseAggregators", "outputs": [{ "internalType": "contract AggregatorV2V3Interface", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "phaseId", "outputs": [{ "internalType": "uint16", "name": "", "type": "uint16" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_aggregator", "type": "address" }], "name": "proposeAggregator", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "proposedAggregator", "outputs": [{ "internalType": "contract AggregatorV2V3Interface", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "uint80", "name": "_roundId", "type": "uint80" }], "name": "proposedGetRoundData", "outputs": [{ "internalType": "uint80", "name": "roundId", "type": "uint80" }, { "internalType": "int256", "name": "answer", "type": "int256" }, { "internalType": "uint256", "name": "startedAt", "type": "uint256" }, { "internalType": "uint256", "name": "updatedAt", "type": "uint256" }, { "internalType": "uint80", "name": "answeredInRound", "type": "uint80" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "proposedLatestRoundData", "outputs": [{ "internalType": "uint80", "name": "roundId", "type": "uint80" }, { "internalType": "int256", "name": "answer", "type": "int256" }, { "internalType": "uint256", "name": "startedAt", "type": "uint256" }, { "internalType": "uint256", "name": "updatedAt", "type": "uint256" }, { "internalType": "uint80", "name": "answeredInRound", "type": "uint80" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_accessController", "type": "address" }], "name": "setController", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_to", "type": "address" }], "name": "transferOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [], "name": "version", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }],
         "networks": {
-            "1": { "address": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419" }
+            "1": { "address": "0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419" },
+            "8453": { "address": "0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70" },
+            "42161": { "address": "0x639Fe6ab55C921f74e7fac1ee960C0B6293ba612" }
         },
     },
     "USDCPriceFeed": {
@@ -1026,7 +1028,9 @@ module.exports = {
     "WstETHPriceFeed": {
         "abi": [{ "inputs": [{ "internalType": "address", "name": "stETHtoETHPriceFeed_", "type": "address" }, { "internalType": "address", "name": "wstETH_", "type": "address" }, { "internalType": "uint8", "name": "decimals_", "type": "uint8" }], "stateMutability": "nonpayable", "type": "constructor" }, { "inputs": [], "name": "BadDecimals", "type": "error" }, { "inputs": [], "name": "InvalidInt256", "type": "error" }, { "inputs": [], "name": "decimals", "outputs": [{ "internalType": "uint8", "name": "", "type": "uint8" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "description", "outputs": [{ "internalType": "string", "name": "", "type": "string" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "latestRoundData", "outputs": [{ "internalType": "uint80", "name": "roundId", "type": "uint80" }, { "internalType": "int256", "name": "answer", "type": "int256" }, { "internalType": "uint256", "name": "startedAt", "type": "uint256" }, { "internalType": "uint256", "name": "updatedAt", "type": "uint256" }, { "internalType": "uint80", "name": "answeredInRound", "type": "uint80" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "stETHToETHPriceFeedDecimals", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "stETHtoETHPriceFeed", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "version", "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "wstETH", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "wstETHScale", "outputs": [{ "internalType": "int256", "name": "", "type": "int256" }], "stateMutability": "view", "type": "function" }],
         "networks": {
-            "1": { "address": "0x4F67e4d9BD67eFa28236013288737D39AeF48e79" }
+            "1": { "address": "0x4F67e4d9BD67eFa28236013288737D39AeF48e79" },
+            "8453": { "address": "0x43a5C292A453A3bF3606fa856197f09D7B74251a" },
+            "42161": { "address": "0xb523AE262D20A936BC152e6023996e46FDC2A95D" }
         }
     },
     "MorphoBlueView": {
@@ -1072,6 +1076,7 @@ module.exports = {
         "abi": [{ "inputs": [], "name": "NonContractCall", "type": "error" }, { "inputs": [], "name": "SenderNotAdmin", "type": "error" }, { "inputs": [], "name": "SenderNotOwner", "type": "error" }, { "inputs": [], "name": "adminVault", "outputs": [{ "internalType": "contract AdminVault", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "", "type": "address" }, { "internalType": "address", "name": "", "type": "address" }], "name": "aggregators", "outputs": [{ "internalType": "address", "name": "", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }], "name": "getFeed", "outputs": [{ "internalType": "address", "name": "aggregator", "type": "address" }], "stateMutability": "view", "type": "function" }, { "inputs": [], "name": "kill", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }], "name": "latestRoundData", "outputs": [{ "internalType": "uint80", "name": "roundId", "type": "uint80" }, { "internalType": "int256", "name": "answer", "type": "int256" }, { "internalType": "uint256", "name": "startedAt", "type": "uint256" }, { "internalType": "uint256", "name": "updatedAt", "type": "uint256" }, { "internalType": "uint80", "name": "answeredInRound", "type": "uint80" }], "stateMutability": "view", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "base", "type": "address" }, { "internalType": "address", "name": "quote", "type": "address" }, { "internalType": "address", "name": "aggregator", "type": "address" }], "name": "setFeed", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address[]", "name": "bases", "type": "address[]" }, { "internalType": "address[]", "name": "quotes", "type": "address[]" }, { "internalType": "address[]", "name": "aggregator", "type": "address[]" }], "name": "setFeeds", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [{ "internalType": "address", "name": "_token", "type": "address" }, { "internalType": "address", "name": "_receiver", "type": "address" }, { "internalType": "uint256", "name": "_amount", "type": "uint256" }], "name": "withdrawStuckFunds", "outputs": [], "stateMutability": "nonpayable", "type": "function" }],
         "networks": {
             "8453": { "address": "0x7dFF34190d0307fC234fc7E8C152C9715083eB02" },
+            "42161": { "address": "0x158E27De8B5E5bC3FA1C6D5b365a291c54f6b0Fd" }
         }
     },
     "LlamaLendView": {

package/esm/fluid/index.d.ts

@@ -37,3 +37,11 @@ export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNu
     marketData: FluidMarketData;
 }>;
 export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3) => Promise<FluidMarketData[]>;
+export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, token: string) => Promise<{
+    fTokenAddress: any;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+}>;

package/esm/fluid/index.js

@@ -8,16 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { NetworkNumber } from '../types/common';
 import { FluidVaultType, } from '../types';
 import { DFSFeedRegistryContract, FeedRegistryContract, FluidViewContract } from '../contracts';
 import { getEthAmountForDecimals, isMainnetNetwork } from '../services/utils';
 import { getFluidAggregatedData } from '../helpers/fluidHelpers';
 import { chunkAndMulticall } from '../multicall';
-import { getFluidMarketInfoById, getFluidVersionsDataForNetwork } from '../markets';
+import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
 import { USD_QUOTE } from '../constants';
-import { getChainlinkAssetAddress, getWstETHPrice } from '../services/priceService';
+import { getChainlinkAssetAddress, getWstETHPriceFluid } from '../services/priceService';
 export const EMPTY_USED_ASSET = {
     isSupplied: false,
     isBorrowed: false,
@@ -38,8 +38,8 @@ const parseVaultType = (vaultType) => {
     }
 };
 const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void 0, function* () {
-    const collAsset = getAssetInfoByAddress(data.supplyToken0);
-    const debtAsset = getAssetInfoByAddress(data.borrowToken0);
+    const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
+    const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
     const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
     const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
     const oracleScaleFactor = new Dec(27).add(debtAsset.decimals).sub(collAsset.decimals).toString();
@@ -51,7 +51,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
     let loanTokenPrice;
     if (debtAsset.symbol === 'wstETH') {
         // need to handle wstETH for l2s inside getWstETHPrice
-        loanTokenPrice = yield getWstETHPrice(web3);
+        loanTokenPrice = yield getWstETHPriceFluid(web3, network);
     }
     else if (isMainnet) {
         const feedRegistryContract = FeedRegistryContract(web3, NetworkNumber.Eth);
@@ -203,5 +203,22 @@ export const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0,
         params: [version.marketAddress],
     }));
     const data = yield chunkAndMulticall(calls, 10, 'latest', web3, network);
+    // @ts-ignore
     return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network); })));
 });
+export const getFluidTokenData = (web3, network, token) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = FluidViewContract(web3, network);
+    const fTokenAddress = getFTokenAddress(token, network);
+    const data = yield view.methods.getFTokenData(fTokenAddress).call();
+    const supplyRate = new Dec(data.supplyRate).div(100).toString();
+    const decimals = data.decimals;
+    const rewardsRate = new Dec(assetAmountInEth(data.rewardsRate)).div(100).toString();
+    return {
+        fTokenAddress,
+        fTokenSymbol: data.symbol,
+        decimals,
+        totalDeposited: getEthAmountForDecimals(data.totalAssets, decimals),
+        withdrawable: getEthAmountForDecimals(data.withdrawable, decimals),
+        apy: new Dec(supplyRate).add(rewardsRate).toString(),
+    };
+});

package/esm/markets/fluid/index.d.ts

@@ -94,9 +94,6 @@ export declare const CBBTC_ETH_13_BASE: (networkId?: NetworkNumber) => FluidMark
 export declare const ETH_CBBTC_14_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETH_CBBTC_15_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WSTETH_CBBTC_16_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const ETH_SUSDS_17_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const WSTETH_SUSDS_18_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const CBBTC_SUSDS_19_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FluidMarkets: (networkId: NetworkNumber) => {
     ETH_USDC_1: FluidMarketInfo;
     ETH_USDT_2: FluidMarketInfo;
@@ -192,9 +189,27 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     ETH_CBBTC_14_BASE: FluidMarketInfo;
     WEETH_CBBTC_15_BASE: FluidMarketInfo;
     WSTETH_CBBTC_16_BASE: FluidMarketInfo;
-    ETH_SUSDS_17_BASE: FluidMarketInfo;
-    WSTETH_SUSDS_18_BASE: FluidMarketInfo;
-    CBBTC_SUSDS_19_BASE: FluidMarketInfo;
 };
 export declare const getFluidVersionsDataForNetwork: (network: NetworkNumber) => FluidMarketInfo[];
 export declare const getFluidMarketInfoById: (vaultId: number, network?: NetworkNumber) => FluidMarketInfo | undefined;
+export declare const FluidFTokens: (networkId: NetworkNumber) => {
+    ETH: string;
+    USDC: string;
+    USDT: string;
+    wstETH: string;
+    GHO: string;
+    sUSDS: string;
+} | {
+    ETH: string;
+    USDC: string;
+    USDT: string;
+    wstETH: string;
+    ARB: string;
+} | {
+    ETH: string;
+    USDC: string;
+    EURC: string;
+    wstETH: string;
+    sUSDS: string;
+};
+export declare const getFTokenAddress: (token: string, networkId: NetworkNumber) => any;