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

package/cjs/markets/fluid/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RSETH_WSTETH_79 = exports.RSETH_ETH_WSTETH_78 = exports.USDC_ETH_USDC_ETH_77 = exports.WEETH_ETH_WSTETH_74 = exports.GHO_USDC_GHO_USDC_61 = exports.SUSDS_GHO_58 = exports.WEETH_GHO_57 = exports.SUSDE_GHO_56 = exports.WSTETH_GHO_55 = exports.ETH_GHO_54 = exports.WBTC_CBBTC_USDT_53 = exports.WBTC_CBBTC_USDC_52 = exports.WBTC_CBBTC_WBTC_CBBTC_51 = exports.SUSDE_USDC_USDT_50 = exports.CBBTC_USDC_USDT_49 = exports.WBTC_USDC_USDT_48 = exports.WEETH_USDC_USDT_47 = exports.WSTETH_USDC_USDT_46 = exports.ETH_USDC_USDT_45 = exports.WSTETH_ETH_WSTETH_ETH_44 = exports.WEETH_CBBTC_32 = exports.ETH_CBBTC_31 = exports.CBBTC_USDT_30 = exports.CBBTC_USDC_29 = exports.CBBTC_ETH_28 = exports.WEETHS_WSTETH_27 = exports.WEETH_WBTC_26 = exports.WSTETH_WBTC_25 = exports.ETH_WBTC_24 = exports.WBTC_ETH_23 = exports.WBTC_USDT_22 = exports.WBTC_USDC_21 = exports.WEETH_USDT_20 = exports.WEETH_USDC_19 = exports.SUSDE_USDT_18 = exports.SUSDE_USDC_17 = exports.WEETH_WSTETH_16 = exports.WSTETH_USDT_15 = exports.WSTETH_USDC_14 = exports.WSTETH_ETH_13 = exports.ETH_USDT_12 = exports.ETH_USDC_11 = exports.WEETH_USDT_10 = exports.WEETH_USDC_9 = exports.WEETH_WSTETH_6 = exports.WSTETH_USDT_5 = exports.WSTETH_USDC_4 = exports.WSTETH_ETH_3 = exports.ETH_USDT_2 = exports.ETH_USDC_1 = void 0;
-exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.CBBTC_SUSDS_19_BASE = exports.WSTETH_SUSDS_18_BASE = exports.ETH_SUSDS_17_BASE = exports.WSTETH_CBBTC_16_BASE = exports.WEETH_CBBTC_15_BASE = exports.ETH_CBBTC_14_BASE = exports.CBBTC_ETH_13_BASE = exports.WSTETH_EURC_12_BASE = exports.WEETH_EURC_11_BASE = exports.ETH_EURC_10_BASE = exports.CBETH_EURC_9_BASE = exports.CBBTC_EURC_8_BASE = exports.CBBTC_USDC_7_BASE = exports.CBETH_USDC_6_BASE = exports.WEETH_USDC_5_BASE = exports.WEETH_WSTETH_4_BASE = exports.WSTETH_ETH_3_BASE = exports.WSTETH_USDC_2_BASE = exports.ETH_USDC_1_BASE = exports.WBTC_USDC_USDT_26_ARB = exports.WEETH_USDC_USDT_25_ARB = exports.WSTETH_USDC_USDT_24_ARB = exports.ETH_USDC_USDT_23_ARB = exports.USDC_ETH_USDC_ETH_22_ARB = exports.WEETH_WBTC_21_ARB = exports.WSTETH_WBTC_20_ARB = exports.ETH_WBTC_19_ARB = exports.WBTC_ETH_18_ARB = exports.WEETH_ETH_WSTETH_17_ARB = exports.WSTETH_ETH_WSTETH_ETH_16_ARB = exports.WBTC_USDT_13_ARB = exports.WBTC_USDC_12_ARB = exports.ARB_USDT_11_ARB = exports.ARB_USDC_10_ARB = exports.ETH_ARB_9_ARB = exports.WEETH_USDT_8_ARB = exports.WEETH_USDC_7_ARB = exports.WEETH_WSTETH_6_ARB = exports.WSTETH_ETH_5_ARB = exports.WSTETH_USDT_4_ARB = exports.WSTETH_USDC_3_ARB = exports.ETH_USDT_2_ARB = exports.ETH_USDC_1_ARB = exports.LBTC_CBBTC_WBTC_97 = exports.USDE_USDT_USDT_93 = exports.SUSDE_USDT_USDT_92 = exports.WEETHS_ETH_WSTETH_80 = void 0;
+exports.getFTokenAddress = exports.FluidFTokens = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.WSTETH_CBBTC_16_BASE = exports.WEETH_CBBTC_15_BASE = exports.ETH_CBBTC_14_BASE = exports.CBBTC_ETH_13_BASE = exports.WSTETH_EURC_12_BASE = exports.WEETH_EURC_11_BASE = exports.ETH_EURC_10_BASE = exports.CBETH_EURC_9_BASE = exports.CBBTC_EURC_8_BASE = exports.CBBTC_USDC_7_BASE = exports.CBETH_USDC_6_BASE = exports.WEETH_USDC_5_BASE = exports.WEETH_WSTETH_4_BASE = exports.WSTETH_ETH_3_BASE = exports.WSTETH_USDC_2_BASE = exports.ETH_USDC_1_BASE = exports.WBTC_USDC_USDT_26_ARB = exports.WEETH_USDC_USDT_25_ARB = exports.WSTETH_USDC_USDT_24_ARB = exports.ETH_USDC_USDT_23_ARB = exports.USDC_ETH_USDC_ETH_22_ARB = exports.WEETH_WBTC_21_ARB = exports.WSTETH_WBTC_20_ARB = exports.ETH_WBTC_19_ARB = exports.WBTC_ETH_18_ARB = exports.WEETH_ETH_WSTETH_17_ARB = exports.WSTETH_ETH_WSTETH_ETH_16_ARB = exports.WBTC_USDT_13_ARB = exports.WBTC_USDC_12_ARB = exports.ARB_USDT_11_ARB = exports.ARB_USDC_10_ARB = exports.ETH_ARB_9_ARB = exports.WEETH_USDT_8_ARB = exports.WEETH_USDC_7_ARB = exports.WEETH_WSTETH_6_ARB = exports.WSTETH_ETH_5_ARB = exports.WSTETH_USDT_4_ARB = exports.WSTETH_USDC_3_ARB = exports.ETH_USDT_2_ARB = exports.ETH_USDC_1_ARB = exports.LBTC_CBBTC_WBTC_97 = exports.USDE_USDT_USDT_93 = exports.SUSDE_USDT_USDT_92 = exports.WEETHS_ETH_WSTETH_80 = void 0;
 const common_1 = require("../../types/common");
 const types_1 = require("../../types");
 const ETH_USDC_1 = (networkId = common_1.NetworkNumber.Eth) => ({
@@ -1042,7 +1042,7 @@ const ETH_USDC_1_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'ETH/USDC',
     value: types_1.FluidArbitrumVersion.ETH_USDC_1_ARB,
     url: 'eth-usdc-1-arb',
-    marketAddress: '',
+    marketAddress: '0xeAbBfca72F8a8bf14C4ac59e69ECB2eB69F0811C',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1061,7 +1061,7 @@ const ETH_USDT_2_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'ETH/USDT',
     value: types_1.FluidArbitrumVersion.ETH_USDT_2_ARB,
     url: 'eth-usdt-2-arb',
-    marketAddress: '',
+    marketAddress: '0xbEC491FeF7B4f666b270F9D5E5C3f443cBf20991',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1080,7 +1080,7 @@ const WSTETH_USDC_3_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/USDC',
     value: types_1.FluidArbitrumVersion.WSTETH_USDC_3_ARB,
     url: 'wsteth-usdc-3-arb',
-    marketAddress: '',
+    marketAddress: '0xA0F83Fc5885cEBc0420ce7C7b139Adc80c4F4D91',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1099,7 +1099,7 @@ const WSTETH_USDT_4_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/USDT',
     value: types_1.FluidArbitrumVersion.WSTETH_USDT_4_ARB,
     url: 'wsteth-usdt-4-arb',
-    marketAddress: '',
+    marketAddress: '0x51197586F6A9e2571868b6ffaef308f3bdfEd3aE',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1118,7 +1118,7 @@ const WSTETH_ETH_5_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/ETH',
     value: types_1.FluidArbitrumVersion.WSTETH_ETH_5_ARB,
     url: 'wsteth-eth-5-arb',
-    marketAddress: '',
+    marketAddress: '0x1c2bB46f36561bc4F05A94BD50916496aa501078',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1137,7 +1137,7 @@ const WEETH_WSTETH_6_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/wstETH',
     value: types_1.FluidArbitrumVersion.WEETH_WSTETH_6_ARB,
     url: 'weeth-wsteth-6-arb',
-    marketAddress: '',
+    marketAddress: '0x40D9b8417E6E1DcD358f04E3328bCEd061018A82',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1156,7 +1156,7 @@ const WEETH_USDC_7_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/USDC',
     value: types_1.FluidArbitrumVersion.WEETH_USDC_7_ARB,
     url: 'weeth-usdc-7-arb',
-    marketAddress: '',
+    marketAddress: '0x4045720a33193b4Fe66c94DFbc8D37B0b4D9B469',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1175,7 +1175,7 @@ const WEETH_USDT_8_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/USDT',
     value: types_1.FluidArbitrumVersion.WEETH_USDT_8_ARB,
     url: 'weeth-usdt-8-arb',
-    marketAddress: '',
+    marketAddress: '0xBFADEA65591235f38809076e14803Ac84AcF3F97',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1194,7 +1194,7 @@ const ETH_ARB_9_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'ETH/ARB',
     value: types_1.FluidArbitrumVersion.ETH_ARB_9_ARB,
     url: 'eth-arb-9-arb',
-    marketAddress: '',
+    marketAddress: '0xf55B8e9F0c51Ace009f4b41d03321675d4C643b3',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1213,7 +1213,7 @@ const ARB_USDC_10_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'ARB/USDC',
     value: types_1.FluidArbitrumVersion.ARB_USDC_10_ARB,
     url: 'arb-usdc-10-arb',
-    marketAddress: '',
+    marketAddress: '0xdF16AdaF80584b2723F3BA1Eb7a601338Ba18c4e',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ARB',
@@ -1232,7 +1232,7 @@ const ARB_USDT_11_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'ARB/USDT',
     value: types_1.FluidArbitrumVersion.ARB_USDT_11_ARB,
     url: 'arb-usdt-11-arb',
-    marketAddress: '',
+    marketAddress: '0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ARB',
@@ -1251,7 +1251,7 @@ const WBTC_USDC_12_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'WBTC/USDC',
     value: types_1.FluidArbitrumVersion.ARB_USDT_11_ARB,
     url: 'wbtc_usdc_12_arb',
-    marketAddress: '',
+    marketAddress: '0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'WBTC',
@@ -1270,7 +1270,7 @@ const WBTC_USDT_13_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'WBTC/USDT',
     value: types_1.FluidArbitrumVersion.ARB_USDT_11_ARB,
     url: 'wbtc_usdc_13_arb',
-    marketAddress: '',
+    marketAddress: '0x82B27fA821419F5689381b565a8B0786aA2548De',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'WBTC',
@@ -1289,7 +1289,7 @@ const WSTETH_ETH_WSTETH_ETH_16_ARB = (networkId = common_1.NetworkNumber.Eth) =>
     shortLabel: 'wstETH/ETH',
     value: types_1.FluidArbitrumVersion.WSTETH_ETH_WSTETH_ETH_16_ARB,
     url: 'wsteth-eth-wsteth-eth-16-arb',
-    marketAddress: '',
+    marketAddress: '0xeAEf563015634a9d0EE6CF1357A3b205C35e028D',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1308,7 +1308,7 @@ const WEETH_ETH_WSTETH_17_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/ETH',
     value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'weeth-eth-wsteth-17-arb',
-    marketAddress: '',
+    marketAddress: '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1327,7 +1327,7 @@ const WBTC_ETH_18_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'WBTC/ETH',
     value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'wbtc_eth_18_arb',
-    marketAddress: '',
+    marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'WBTC',
@@ -1346,7 +1346,7 @@ const ETH_WBTC_19_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'ETH/WBTC',
     value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'eth_wbtc_19_arb',
-    marketAddress: '',
+    marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1365,7 +1365,7 @@ const WSTETH_WBTC_20_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/WBTC',
     value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'wsteth_wbtc_20_arb',
-    marketAddress: '',
+    marketAddress: '0x92643E964CA4b2c165a95CA919b0A819acA6D5F1',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1384,7 +1384,7 @@ const WEETH_WBTC_21_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/WBTC',
     value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'weeth_wbtc_21_arb',
-    marketAddress: '',
+    marketAddress: '0x6F72895Cf6904489Bcd862c941c3D02a3eE4f03e',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1403,7 +1403,7 @@ const USDC_ETH_USDC_ETH_22_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/WBTC',
     value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'usdc_eth_usdc_eth_22_arb',
-    marketAddress: '',
+    marketAddress: '0x3A0b7c8840D74D39552EF53F586dD8c3d1234C40',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1422,7 +1422,7 @@ const ETH_USDC_USDT_23_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'ETH/USDC-USDT',
     value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'eth_usdc_usdt_23_arb',
-    marketAddress: '',
+    marketAddress: '0xaD439b9D61b25af1ca4Cd211E3eCb9AfBaAEd84a',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1441,7 +1441,7 @@ const WSTETH_USDC_USDT_24_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/USDC-USDT',
     value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'wsteth_usdc_usdt_23_arb',
-    marketAddress: '',
+    marketAddress: '0x991416539E9DA46db233bCcbaEA38C4f852776D4',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1460,7 +1460,7 @@ const WEETH_USDC_USDT_25_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/USDC-USDT',
     value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'weeth_usdc_usdt_25_arb',
-    marketAddress: '',
+    marketAddress: '0x03271C337c86a6Fd89625A2820e48621DC2a128b',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1479,7 +1479,7 @@ const WBTC_USDC_USDT_26_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'WBTC/USDC-USDT',
     value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'wbtc_usdc_usdt_26_arb',
-    marketAddress: '',
+    marketAddress: '0xF74cb9D69ada3559903149CFD60fD57cEAF95F30',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'WBTC',
@@ -1498,7 +1498,7 @@ const ETH_USDC_1_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'ETH/USDC',
     value: types_1.FluidBaseVersions.ETH_USDC_1_BASE,
     url: 'eth-usdc-1-base',
-    marketAddress: '',
+    marketAddress: '0xeAbBfca72F8a8bf14C4ac59e69ECB2eB69F0811C',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1517,7 +1517,7 @@ const WSTETH_USDC_2_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/USDC',
     value: types_1.FluidBaseVersions.WSTETH_USDC_2_BASE,
     url: 'wsteth-usdc-2-base',
-    marketAddress: '',
+    marketAddress: '0xbEC491FeF7B4f666b270F9D5E5C3f443cBf20991',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1536,7 +1536,7 @@ const WSTETH_ETH_3_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/ETH',
     value: types_1.FluidBaseVersions.WSTETH_ETH_3_BASE,
     url: 'wsteth-eth-3-base',
-    marketAddress: '',
+    marketAddress: '0xA0F83Fc5885cEBc0420ce7C7b139Adc80c4F4D91',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1555,7 +1555,7 @@ const WEETH_WSTETH_4_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/wstETH',
     value: types_1.FluidBaseVersions.WEETH_WSTETH_4_BASE,
     url: 'weeth-wsteth-4-base',
-    marketAddress: '',
+    marketAddress: '0x51197586F6A9e2571868b6ffaef308f3bdfEd3aE',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1574,7 +1574,7 @@ const WEETH_USDC_5_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/USDC',
     value: types_1.FluidBaseVersions.WEETH_USDC_5_BASE,
     url: 'weeth-usdc-5-base',
-    marketAddress: '',
+    marketAddress: '0x1c2bB46f36561bc4F05A94BD50916496aa501078',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1593,7 +1593,7 @@ const CBETH_USDC_6_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'CBETH/USDC',
     value: types_1.FluidBaseVersions.CBETH_USDC_6_BASE,
     url: 'cbeth-usdc-6-base',
-    marketAddress: '',
+    marketAddress: '0x40D9b8417E6E1DcD358f04E3328bCEd061018A82',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'CBETH',
@@ -1612,7 +1612,7 @@ const CBBTC_USDC_7_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'cbBTC/USDC',
     value: types_1.FluidBaseVersions.CBBTC_USDC_7_BASE,
     url: 'cbbtc-usdc-7-base',
-    marketAddress: '',
+    marketAddress: '0x4045720a33193b4Fe66c94DFbc8D37B0b4D9B469',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'cbBTC',
@@ -1631,7 +1631,7 @@ const CBBTC_EURC_8_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'cbBTC/EURC',
     value: types_1.FluidBaseVersions.CBBTC_EURC_8_BASE,
     url: 'cbbtc-eurc-8-base',
-    marketAddress: '',
+    marketAddress: '0xBFADEA65591235f38809076e14803Ac84AcF3F97',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'cbBTC',
@@ -1650,7 +1650,7 @@ const CBETH_EURC_9_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'CBETH/EURC',
     value: types_1.FluidBaseVersions.CBETH_EURC_9_BASE,
     url: 'cbeth-eurc-9-base',
-    marketAddress: '',
+    marketAddress: '0xf55B8e9F0c51Ace009f4b41d03321675d4C643b3',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'CBETH',
@@ -1669,7 +1669,7 @@ const ETH_EURC_10_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'ETH/EURC',
     value: types_1.FluidBaseVersions.ETH_EURC_10_BASE,
     url: 'eth-eurc-10-base',
-    marketAddress: '',
+    marketAddress: '0xdF16AdaF80584b2723F3BA1Eb7a601338Ba18c4e',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1688,7 +1688,7 @@ const WEETH_EURC_11_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/EURC',
     value: types_1.FluidBaseVersions.WEETH_EURC_11_BASE,
     url: 'weeth-eurc-11-base',
-    marketAddress: '',
+    marketAddress: '0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1707,7 +1707,7 @@ const WSTETH_EURC_12_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/EURC',
     value: types_1.FluidBaseVersions.WSTETH_EURC_12_BASE,
     url: 'wsteth-eurc-12-base',
-    marketAddress: '',
+    marketAddress: '0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1726,7 +1726,7 @@ const CBBTC_ETH_13_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'cbBTC/ETH',
     value: types_1.FluidBaseVersions.CBBTC_ETH_13_BASE,
     url: 'cbbtc-eth-13-base',
-    marketAddress: '',
+    marketAddress: '0x82B27fA821419F5689381b565a8B0786aA2548De',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'cbBTC',
@@ -1745,7 +1745,7 @@ const ETH_CBBTC_14_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'ETH/cbBTC',
     value: types_1.FluidBaseVersions.ETH_CBBTC_14_BASE,
     url: 'eth-cbbtc-14-base',
-    marketAddress: '',
+    marketAddress: '0x1982CC7b1570C2503282d0A0B41F69b3B28fdcc3',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1764,7 +1764,7 @@ const WEETH_CBBTC_15_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'weETH/cbBTC',
     value: types_1.FluidBaseVersions.WEETH_CBBTC_15_BASE,
     url: 'weeth-cbbtc-15-base',
-    marketAddress: '',
+    marketAddress: '0xb4F3bf2d96139563777C0231899cE06EE95Cc946',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1783,70 +1783,69 @@ const WSTETH_CBBTC_16_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/cbBTC',
     value: types_1.FluidBaseVersions.WSTETH_CBBTC_16_BASE,
     url: 'wsteth-cbbtc-16-base',
-    marketAddress: '',
+    marketAddress: '0xeAEf563015634a9d0EE6CF1357A3b205C35e028D',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
     debtAsset: 'cbBTC',
 });
 exports.WSTETH_CBBTC_16_BASE = WSTETH_CBBTC_16_BASE;
-const ETH_SUSDS_17_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
-    stableBased: true,
-    btcBased: false,
-    wstETHBased: false,
-    ethBased: true,
-    type: types_1.FluidVaultType.T1,
-    id: 17,
-    chainIds: [common_1.NetworkNumber.Base],
-    label: 'ETH / sUSDS Market 17',
-    shortLabel: 'ETH/sUSDS',
-    value: types_1.FluidBaseVersions.ETH_SUSDS_17_BASE,
-    url: 'eth-susds-17-base',
-    marketAddress: '',
-    hasSmartCollateral: false,
-    hasSmartDebt: false,
-    collateralAsset: 'ETH',
-    debtAsset: 'sSUDS',
-});
-exports.ETH_SUSDS_17_BASE = ETH_SUSDS_17_BASE;
-const WSTETH_SUSDS_18_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
-    stableBased: true,
-    btcBased: false,
-    wstETHBased: true,
-    ethBased: true,
-    type: types_1.FluidVaultType.T1,
-    id: 18,
-    chainIds: [common_1.NetworkNumber.Base],
-    label: 'wstETH / sUSDS Market 18',
-    shortLabel: 'wstETH/sUSDS',
-    value: types_1.FluidBaseVersions.WSTETH_SUSDS_18_BASE,
-    url: 'wsteth-susds-18-base',
-    marketAddress: '',
-    hasSmartCollateral: false,
-    hasSmartDebt: false,
-    collateralAsset: 'wstETH',
-    debtAsset: 'sUSDS',
-});
-exports.WSTETH_SUSDS_18_BASE = WSTETH_SUSDS_18_BASE;
-const CBBTC_SUSDS_19_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
-    stableBased: true,
-    btcBased: false,
-    wstETHBased: false,
-    ethBased: false,
-    type: types_1.FluidVaultType.T1,
-    id: 19,
-    chainIds: [common_1.NetworkNumber.Base],
-    label: 'cbBTC / sUSDS Market 19',
-    shortLabel: 'cbBTC/sUSDS',
-    value: types_1.FluidBaseVersions.CBBTC_SUSDS_19_BASE,
-    url: 'cbbtc-susds-19-base',
-    marketAddress: '',
-    hasSmartCollateral: false,
-    hasSmartDebt: false,
-    collateralAsset: 'cbBTC',
-    debtAsset: 'sUSDS',
-});
-exports.CBBTC_SUSDS_19_BASE = CBBTC_SUSDS_19_BASE;
+// export const ETH_SUSDS_17_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
+//   stableBased: true,
+//   btcBased: false,
+//   wstETHBased: false,
+//   ethBased: true,
+//   type: FluidVaultType.T1,
+//   id: 17,
+//   chainIds: [NetworkNumber.Base],
+//   label: 'ETH / sUSDS Market 17',
+//   shortLabel: 'ETH/sUSDS',
+//   value: FluidBaseVersions.ETH_SUSDS_17_BASE,
+//   url: 'eth-susds-17-base',
+//   marketAddress: '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd',
+//   hasSmartCollateral: false,
+//   hasSmartDebt: false,
+//   collateralAsset: 'ETH',
+//   debtAsset: 'sSUDS',
+// });
+//
+// export const WSTETH_SUSDS_18_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
+//   stableBased: true,
+//   btcBased: false,
+//   wstETHBased: true,
+//   ethBased: true,
+//   type: FluidVaultType.T1,
+//   id: 18,
+//   chainIds: [NetworkNumber.Base],
+//   label: 'wstETH / sUSDS Market 18',
+//   shortLabel: 'wstETH/sUSDS',
+//   value: FluidBaseVersions.WSTETH_SUSDS_18_BASE,
+//   url: 'wsteth-susds-18-base',
+//   marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
+//   hasSmartCollateral: false,
+//   hasSmartDebt: false,
+//   collateralAsset: 'wstETH',
+//   debtAsset: 'sUSDS',
+// });
+//
+// export const CBBTC_SUSDS_19_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
+//   stableBased: true,
+//   btcBased: false,
+//   wstETHBased: false,
+//   ethBased: false,
+//   type: FluidVaultType.T1,
+//   id: 19,
+//   chainIds: [NetworkNumber.Base],
+//   label: 'cbBTC / sUSDS Market 19',
+//   shortLabel: 'cbBTC/sUSDS',
+//   value: FluidBaseVersions.CBBTC_SUSDS_19_BASE,
+//   url: 'cbbtc-susds-19-base',
+//   marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
+//   hasSmartCollateral: false,
+//   hasSmartDebt: false,
+//   collateralAsset: 'cbBTC',
+//   debtAsset: 'sUSDS',
+// });
 const FluidMarkets = (networkId) => ({
     [types_1.FluidMainnetVersion.ETH_USDC_1]: (0, exports.ETH_USDC_1)(networkId),
     [types_1.FluidMainnetVersion.ETH_USDT_2]: (0, exports.ETH_USDT_2)(networkId),
@@ -1944,12 +1943,47 @@ const FluidMarkets = (networkId) => ({
     [types_1.FluidBaseVersions.ETH_CBBTC_14_BASE]: (0, exports.ETH_CBBTC_14_BASE)(networkId),
     [types_1.FluidBaseVersions.WEETH_CBBTC_15_BASE]: (0, exports.WEETH_CBBTC_15_BASE)(networkId),
     [types_1.FluidBaseVersions.WSTETH_CBBTC_16_BASE]: (0, exports.WSTETH_CBBTC_16_BASE)(networkId),
-    [types_1.FluidBaseVersions.ETH_SUSDS_17_BASE]: (0, exports.ETH_SUSDS_17_BASE)(networkId),
-    [types_1.FluidBaseVersions.WSTETH_SUSDS_18_BASE]: (0, exports.WSTETH_SUSDS_18_BASE)(networkId),
-    [types_1.FluidBaseVersions.CBBTC_SUSDS_19_BASE]: (0, exports.CBBTC_SUSDS_19_BASE)(networkId),
 });
 exports.FluidMarkets = FluidMarkets;
 const getFluidVersionsDataForNetwork = (network) => (Object.values((0, exports.FluidMarkets)(network)).filter(({ chainIds, marketAddress, type }) => !!marketAddress && chainIds.includes(network) && type === types_1.FluidVaultType.T1));
 exports.getFluidVersionsDataForNetwork = getFluidVersionsDataForNetwork;
 const getFluidMarketInfoById = (vaultId, network = 1) => (0, exports.getFluidVersionsDataForNetwork)(network).find(({ id }) => id === vaultId);
 exports.getFluidMarketInfoById = getFluidMarketInfoById;
+const FluidMainnetFTokenAddresses = {
+    [types_1.FluidMainnetDepositToken.ETH]: '0x90551c1795392094FE6D29B758EcCD233cFAa260',
+    [types_1.FluidMainnetDepositToken.USDC]: '0x9Fb7b4477576Fe5B32be4C1843aFB1e55F251B33',
+    [types_1.FluidMainnetDepositToken.USDT]: '0x5C20B550819128074FD538Edf79791733ccEdd18',
+    [types_1.FluidMainnetDepositToken.wstETH]: '0x2411802D8BEA09be0aF8fD8D08314a63e706b29C',
+    [types_1.FluidMainnetDepositToken.GHO]: '0x6A29A46E21C730DcA1d8b23d637c101cec605C5B',
+    [types_1.FluidMainnetDepositToken.sUSDS]: '0x2BBE31d63E6813E3AC858C04dae43FB2a72B0D11',
+};
+const FluidArbitrumFTokenAddresses = {
+    [types_1.FluidArbitrumDepositToken.ETH]: '0x45Df0656F8aDf017590009d2f1898eeca4F0a205',
+    [types_1.FluidArbitrumDepositToken.USDC]: '0x1A996cb54bb95462040408C06122D45D6Cdb6096',
+    [types_1.FluidArbitrumDepositToken.USDT]: '0x4A03F37e7d3fC243e3f99341d36f4b829BEe5E03',
+    [types_1.FluidArbitrumDepositToken.wstETH]: '0x66C25Cd75EBdAA7E04816F643d8E46cecd3183c9',
+    [types_1.FluidArbitrumDepositToken.ARB]: '0xbE3860FD4c3facDf8ad57Aa8c1A36D6dc4390a49',
+};
+const FluidBaseFTokenAddresses = {
+    [types_1.FluidBaseDepositToken.ETH]: '0x9272D6153133175175Bc276512B2336BE3931CE9',
+    [types_1.FluidBaseDepositToken.USDC]: '0xf42f5795D9ac7e9D757dB633D693cD548Cfd9169',
+    [types_1.FluidBaseDepositToken.EURC]: '0x1943FA26360f038230442525Cf1B9125b5DCB401',
+    [types_1.FluidBaseDepositToken.wstETH]: '0x896E39f0E9af61ECA9dD2938E14543506ef2c2b5',
+    [types_1.FluidBaseDepositToken.sUSDS]: '0xf62e339f21d8018940f188F6987Bcdf02A849619',
+};
+const FluidFTokens = (networkId) => {
+    switch (networkId) {
+        case common_1.NetworkNumber.Eth:
+            return FluidMainnetFTokenAddresses;
+        case common_1.NetworkNumber.Arb:
+            return FluidArbitrumFTokenAddresses;
+        case common_1.NetworkNumber.Base:
+            return FluidBaseFTokenAddresses;
+        default:
+            throw new Error('Invalid network id');
+    }
+};
+exports.FluidFTokens = FluidFTokens;
+// @ts-ignore
+const getFTokenAddress = (token, networkId) => (0, exports.FluidFTokens)(networkId)[token];
+exports.getFTokenAddress = getFTokenAddress;

package/cjs/markets/index.d.ts

@@ -6,4 +6,4 @@ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets } from './liquityV2';
 export { EulerV2Markets } from './euler';
-export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById } from './fluid';
+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.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.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; } });
@@ -34,3 +34,4 @@ var fluid_1 = require("./fluid");
 Object.defineProperty(exports, "FluidMarkets", { enumerable: true, get: function () { return fluid_1.FluidMarkets; } });
 Object.defineProperty(exports, "getFluidVersionsDataForNetwork", { enumerable: true, get: function () { return fluid_1.getFluidVersionsDataForNetwork; } });
 Object.defineProperty(exports, "getFluidMarketInfoById", { enumerable: true, get: function () { return fluid_1.getFluidMarketInfoById; } });
+Object.defineProperty(exports, "getFTokenAddress", { enumerable: true, get: function () { return fluid_1.getFTokenAddress; } });

package/cjs/multicall/index.js

@@ -32,6 +32,7 @@ const multicall = (calls, web3, network = common_1.NetworkNumber.Eth, blockNumbe
 exports.multicall = multicall;
 const chunkAndMulticall = (calls, chunkSize, blockNumber = 'latest', web3, network = common_1.NetworkNumber.Eth) => __awaiter(void 0, void 0, void 0, function* () {
     const chunkedCalls = (0, lodash_1.chunk)(calls, chunkSize);
+    // @ts-ignore
     const results = yield Promise.all(chunkedCalls.map((cnk) => (0, exports.multicall)(cnk, web3, network, blockNumber)));
     return results.flat(1);
 });

package/cjs/services/priceService.d.ts

@@ -4,4 +4,5 @@ export declare const getEthPrice: (web3: Web3) => Promise<string>;
 export declare const getUSDCPrice: (web3: Web3) => Promise<string>;
 export declare const getCompPrice: (web3: Web3) => Promise<string>;
 export declare const getWstETHPrice: (web3: Web3) => Promise<string>;
+export declare const getWstETHPriceFluid: (web3: Web3, network: NetworkNumber) => Promise<string>;
 export declare const getChainlinkAssetAddress: (symbol: string, network: NetworkNumber) => string;

package/cjs/services/priceService.js

@@ -12,12 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getChainlinkAssetAddress = exports.getWstETHPrice = exports.getCompPrice = exports.getUSDCPrice = exports.getEthPrice = void 0;
+exports.getChainlinkAssetAddress = exports.getWstETHPriceFluid = 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");
 const common_1 = require("../types/common");
 const multicall_1 = require("../multicall");
+const utils_1 = require("./utils");
 const getEthPrice = (web3) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = (0, contracts_1.ETHPriceFeedContract)(web3, common_1.NetworkNumber.Eth);
     const price = yield contract.methods.latestAnswer().call();
@@ -57,6 +58,33 @@ const getWstETHPrice = (web3) => __awaiter(void 0, void 0, void 0, function* ()
     return new decimal_js_1.default(ethPrice).mul(wstETHRate).toString();
 });
 exports.getWstETHPrice = getWstETHPrice;
+// this is a fixed version, the original version is above but requires to refactor comp v3 function, so it's easier to just copy the function for now
+const getWstETHPriceFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const wstETHFeedContract = (0, contracts_1.WstETHPriceFeedContract)(web3, network);
+    const ethFeedContract = (0, contracts_1.ETHPriceFeedContract)(web3, network);
+    const calls = [
+        {
+            target: ethFeedContract.options.address,
+            abiItem: ethFeedContract.options.jsonInterface.find(({ name }) => name === 'latestAnswer'),
+            params: [],
+        },
+        {
+            target: wstETHFeedContract.options.address,
+            abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'latestRoundData'),
+            params: [],
+        },
+        {
+            target: wstETHFeedContract.options.address,
+            abiItem: wstETHFeedContract.options.jsonInterface.find(({ name }) => name === 'decimals'),
+            params: [],
+        },
+    ];
+    const multicallRes = yield (0, multicall_1.multicall)(calls, web3, network);
+    const ethPrice = new decimal_js_1.default(multicallRes[0][0]).div(1e8);
+    const wstETHRate = (0, utils_1.getEthAmountForDecimals)(multicallRes[1].answer, multicallRes[2][0]);
+    return new decimal_js_1.default(ethPrice).mul(wstETHRate).toString();
+});
+exports.getWstETHPriceFluid = getWstETHPriceFluid;
 // chainlink price feed available only on mainnet
 const getChainlinkAssetAddress = (symbol, network) => {
     // Chainlink only has BTC/USD feed so we use that for BTC derivatives