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

package/esm/markets/fluid/index.js

@@ -1,5 +1,5 @@
 import { NetworkNumber } from '../../types/common';
-import { FluidArbitrumVersion, FluidBaseVersions, FluidMainnetVersion, FluidVaultType, } from '../../types';
+import { FluidArbitrumDepositToken, FluidArbitrumVersion, FluidBaseDepositToken, FluidBaseVersions, FluidMainnetDepositToken, FluidMainnetVersion, FluidVaultType, } from '../../types';
 export const ETH_USDC_1 = (networkId = NetworkNumber.Eth) => ({
     btcBased: false,
     wstETHBased: false,
@@ -984,7 +984,7 @@ export const ETH_USDC_1_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'ETH/USDC',
     value: FluidArbitrumVersion.ETH_USDC_1_ARB,
     url: 'eth-usdc-1-arb',
-    marketAddress: '',
+    marketAddress: '0xeAbBfca72F8a8bf14C4ac59e69ECB2eB69F0811C',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1002,7 +1002,7 @@ export const ETH_USDT_2_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'ETH/USDT',
     value: FluidArbitrumVersion.ETH_USDT_2_ARB,
     url: 'eth-usdt-2-arb',
-    marketAddress: '',
+    marketAddress: '0xbEC491FeF7B4f666b270F9D5E5C3f443cBf20991',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1020,7 +1020,7 @@ export const WSTETH_USDC_3_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/USDC',
     value: FluidArbitrumVersion.WSTETH_USDC_3_ARB,
     url: 'wsteth-usdc-3-arb',
-    marketAddress: '',
+    marketAddress: '0xA0F83Fc5885cEBc0420ce7C7b139Adc80c4F4D91',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1038,7 +1038,7 @@ export const WSTETH_USDT_4_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/USDT',
     value: FluidArbitrumVersion.WSTETH_USDT_4_ARB,
     url: 'wsteth-usdt-4-arb',
-    marketAddress: '',
+    marketAddress: '0x51197586F6A9e2571868b6ffaef308f3bdfEd3aE',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1056,7 +1056,7 @@ export const WSTETH_ETH_5_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/ETH',
     value: FluidArbitrumVersion.WSTETH_ETH_5_ARB,
     url: 'wsteth-eth-5-arb',
-    marketAddress: '',
+    marketAddress: '0x1c2bB46f36561bc4F05A94BD50916496aa501078',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1074,7 +1074,7 @@ export const WEETH_WSTETH_6_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/wstETH',
     value: FluidArbitrumVersion.WEETH_WSTETH_6_ARB,
     url: 'weeth-wsteth-6-arb',
-    marketAddress: '',
+    marketAddress: '0x40D9b8417E6E1DcD358f04E3328bCEd061018A82',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1092,7 +1092,7 @@ export const WEETH_USDC_7_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/USDC',
     value: FluidArbitrumVersion.WEETH_USDC_7_ARB,
     url: 'weeth-usdc-7-arb',
-    marketAddress: '',
+    marketAddress: '0x4045720a33193b4Fe66c94DFbc8D37B0b4D9B469',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1110,7 +1110,7 @@ export const WEETH_USDT_8_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/USDT',
     value: FluidArbitrumVersion.WEETH_USDT_8_ARB,
     url: 'weeth-usdt-8-arb',
-    marketAddress: '',
+    marketAddress: '0xBFADEA65591235f38809076e14803Ac84AcF3F97',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1128,7 +1128,7 @@ export const ETH_ARB_9_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'ETH/ARB',
     value: FluidArbitrumVersion.ETH_ARB_9_ARB,
     url: 'eth-arb-9-arb',
-    marketAddress: '',
+    marketAddress: '0xf55B8e9F0c51Ace009f4b41d03321675d4C643b3',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1146,7 +1146,7 @@ export const ARB_USDC_10_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'ARB/USDC',
     value: FluidArbitrumVersion.ARB_USDC_10_ARB,
     url: 'arb-usdc-10-arb',
-    marketAddress: '',
+    marketAddress: '0xdF16AdaF80584b2723F3BA1Eb7a601338Ba18c4e',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ARB',
@@ -1164,7 +1164,7 @@ export const ARB_USDT_11_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'ARB/USDT',
     value: FluidArbitrumVersion.ARB_USDT_11_ARB,
     url: 'arb-usdt-11-arb',
-    marketAddress: '',
+    marketAddress: '0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ARB',
@@ -1182,7 +1182,7 @@ export const WBTC_USDC_12_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'WBTC/USDC',
     value: FluidArbitrumVersion.ARB_USDT_11_ARB,
     url: 'wbtc_usdc_12_arb',
-    marketAddress: '',
+    marketAddress: '0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'WBTC',
@@ -1200,7 +1200,7 @@ export const WBTC_USDT_13_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'WBTC/USDT',
     value: FluidArbitrumVersion.ARB_USDT_11_ARB,
     url: 'wbtc_usdc_13_arb',
-    marketAddress: '',
+    marketAddress: '0x82B27fA821419F5689381b565a8B0786aA2548De',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'WBTC',
@@ -1218,7 +1218,7 @@ export const WSTETH_ETH_WSTETH_ETH_16_ARB = (networkId = NetworkNumber.Eth) => (
     shortLabel: 'wstETH/ETH',
     value: FluidArbitrumVersion.WSTETH_ETH_WSTETH_ETH_16_ARB,
     url: 'wsteth-eth-wsteth-eth-16-arb',
-    marketAddress: '',
+    marketAddress: '0xeAEf563015634a9d0EE6CF1357A3b205C35e028D',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1236,7 +1236,7 @@ export const WEETH_ETH_WSTETH_17_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/ETH',
     value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'weeth-eth-wsteth-17-arb',
-    marketAddress: '',
+    marketAddress: '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1254,7 +1254,7 @@ export const WBTC_ETH_18_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'WBTC/ETH',
     value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'wbtc_eth_18_arb',
-    marketAddress: '',
+    marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'WBTC',
@@ -1272,7 +1272,7 @@ export const ETH_WBTC_19_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'ETH/WBTC',
     value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'eth_wbtc_19_arb',
-    marketAddress: '',
+    marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1290,7 +1290,7 @@ export const WSTETH_WBTC_20_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/WBTC',
     value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'wsteth_wbtc_20_arb',
-    marketAddress: '',
+    marketAddress: '0x92643E964CA4b2c165a95CA919b0A819acA6D5F1',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1308,7 +1308,7 @@ export const WEETH_WBTC_21_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/WBTC',
     value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'weeth_wbtc_21_arb',
-    marketAddress: '',
+    marketAddress: '0x6F72895Cf6904489Bcd862c941c3D02a3eE4f03e',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1326,7 +1326,7 @@ export const USDC_ETH_USDC_ETH_22_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/WBTC',
     value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'usdc_eth_usdc_eth_22_arb',
-    marketAddress: '',
+    marketAddress: '0x3A0b7c8840D74D39552EF53F586dD8c3d1234C40',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1344,7 +1344,7 @@ export const ETH_USDC_USDT_23_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'ETH/USDC-USDT',
     value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'eth_usdc_usdt_23_arb',
-    marketAddress: '',
+    marketAddress: '0xaD439b9D61b25af1ca4Cd211E3eCb9AfBaAEd84a',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1362,7 +1362,7 @@ export const WSTETH_USDC_USDT_24_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/USDC-USDT',
     value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'wsteth_usdc_usdt_23_arb',
-    marketAddress: '',
+    marketAddress: '0x991416539E9DA46db233bCcbaEA38C4f852776D4',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1380,7 +1380,7 @@ export const WEETH_USDC_USDT_25_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/USDC-USDT',
     value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'weeth_usdc_usdt_25_arb',
-    marketAddress: '',
+    marketAddress: '0x03271C337c86a6Fd89625A2820e48621DC2a128b',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1398,7 +1398,7 @@ export const WBTC_USDC_USDT_26_ARB = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'WBTC/USDC-USDT',
     value: FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
     url: 'wbtc_usdc_usdt_26_arb',
-    marketAddress: '',
+    marketAddress: '0xF74cb9D69ada3559903149CFD60fD57cEAF95F30',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'WBTC',
@@ -1416,7 +1416,7 @@ export const ETH_USDC_1_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'ETH/USDC',
     value: FluidBaseVersions.ETH_USDC_1_BASE,
     url: 'eth-usdc-1-base',
-    marketAddress: '',
+    marketAddress: '0xeAbBfca72F8a8bf14C4ac59e69ECB2eB69F0811C',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1434,7 +1434,7 @@ export const WSTETH_USDC_2_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/USDC',
     value: FluidBaseVersions.WSTETH_USDC_2_BASE,
     url: 'wsteth-usdc-2-base',
-    marketAddress: '',
+    marketAddress: '0xbEC491FeF7B4f666b270F9D5E5C3f443cBf20991',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1452,7 +1452,7 @@ export const WSTETH_ETH_3_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/ETH',
     value: FluidBaseVersions.WSTETH_ETH_3_BASE,
     url: 'wsteth-eth-3-base',
-    marketAddress: '',
+    marketAddress: '0xA0F83Fc5885cEBc0420ce7C7b139Adc80c4F4D91',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1470,7 +1470,7 @@ export const WEETH_WSTETH_4_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/wstETH',
     value: FluidBaseVersions.WEETH_WSTETH_4_BASE,
     url: 'weeth-wsteth-4-base',
-    marketAddress: '',
+    marketAddress: '0x51197586F6A9e2571868b6ffaef308f3bdfEd3aE',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1488,7 +1488,7 @@ export const WEETH_USDC_5_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/USDC',
     value: FluidBaseVersions.WEETH_USDC_5_BASE,
     url: 'weeth-usdc-5-base',
-    marketAddress: '',
+    marketAddress: '0x1c2bB46f36561bc4F05A94BD50916496aa501078',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1506,7 +1506,7 @@ export const CBETH_USDC_6_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'CBETH/USDC',
     value: FluidBaseVersions.CBETH_USDC_6_BASE,
     url: 'cbeth-usdc-6-base',
-    marketAddress: '',
+    marketAddress: '0x40D9b8417E6E1DcD358f04E3328bCEd061018A82',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'CBETH',
@@ -1524,7 +1524,7 @@ export const CBBTC_USDC_7_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'cbBTC/USDC',
     value: FluidBaseVersions.CBBTC_USDC_7_BASE,
     url: 'cbbtc-usdc-7-base',
-    marketAddress: '',
+    marketAddress: '0x4045720a33193b4Fe66c94DFbc8D37B0b4D9B469',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'cbBTC',
@@ -1542,7 +1542,7 @@ export const CBBTC_EURC_8_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'cbBTC/EURC',
     value: FluidBaseVersions.CBBTC_EURC_8_BASE,
     url: 'cbbtc-eurc-8-base',
-    marketAddress: '',
+    marketAddress: '0xBFADEA65591235f38809076e14803Ac84AcF3F97',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'cbBTC',
@@ -1560,7 +1560,7 @@ export const CBETH_EURC_9_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'CBETH/EURC',
     value: FluidBaseVersions.CBETH_EURC_9_BASE,
     url: 'cbeth-eurc-9-base',
-    marketAddress: '',
+    marketAddress: '0xf55B8e9F0c51Ace009f4b41d03321675d4C643b3',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'CBETH',
@@ -1578,7 +1578,7 @@ export const ETH_EURC_10_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'ETH/EURC',
     value: FluidBaseVersions.ETH_EURC_10_BASE,
     url: 'eth-eurc-10-base',
-    marketAddress: '',
+    marketAddress: '0xdF16AdaF80584b2723F3BA1Eb7a601338Ba18c4e',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1596,7 +1596,7 @@ export const WEETH_EURC_11_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/EURC',
     value: FluidBaseVersions.WEETH_EURC_11_BASE,
     url: 'weeth-eurc-11-base',
-    marketAddress: '',
+    marketAddress: '0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1614,7 +1614,7 @@ export const WSTETH_EURC_12_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/EURC',
     value: FluidBaseVersions.WSTETH_EURC_12_BASE,
     url: 'wsteth-eurc-12-base',
-    marketAddress: '',
+    marketAddress: '0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
@@ -1632,7 +1632,7 @@ export const CBBTC_ETH_13_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'cbBTC/ETH',
     value: FluidBaseVersions.CBBTC_ETH_13_BASE,
     url: 'cbbtc-eth-13-base',
-    marketAddress: '',
+    marketAddress: '0x82B27fA821419F5689381b565a8B0786aA2548De',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'cbBTC',
@@ -1650,7 +1650,7 @@ export const ETH_CBBTC_14_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'ETH/cbBTC',
     value: FluidBaseVersions.ETH_CBBTC_14_BASE,
     url: 'eth-cbbtc-14-base',
-    marketAddress: '',
+    marketAddress: '0x1982CC7b1570C2503282d0A0B41F69b3B28fdcc3',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'ETH',
@@ -1668,7 +1668,7 @@ export const WEETH_CBBTC_15_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'weETH/cbBTC',
     value: FluidBaseVersions.WEETH_CBBTC_15_BASE,
     url: 'weeth-cbbtc-15-base',
-    marketAddress: '',
+    marketAddress: '0xb4F3bf2d96139563777C0231899cE06EE95Cc946',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'weETH',
@@ -1686,66 +1686,68 @@ export const WSTETH_CBBTC_16_BASE = (networkId = NetworkNumber.Eth) => ({
     shortLabel: 'wstETH/cbBTC',
     value: FluidBaseVersions.WSTETH_CBBTC_16_BASE,
     url: 'wsteth-cbbtc-16-base',
-    marketAddress: '',
+    marketAddress: '0xeAEf563015634a9d0EE6CF1357A3b205C35e028D',
     hasSmartCollateral: false,
     hasSmartDebt: false,
     collateralAsset: 'wstETH',
     debtAsset: 'cbBTC',
 });
-export const ETH_SUSDS_17_BASE = (networkId = NetworkNumber.Eth) => ({
-    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: '',
-    hasSmartCollateral: false,
-    hasSmartDebt: false,
-    collateralAsset: 'ETH',
-    debtAsset: 'sSUDS',
-});
-export const WSTETH_SUSDS_18_BASE = (networkId = NetworkNumber.Eth) => ({
-    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: '',
-    hasSmartCollateral: false,
-    hasSmartDebt: false,
-    collateralAsset: 'wstETH',
-    debtAsset: 'sUSDS',
-});
-export const CBBTC_SUSDS_19_BASE = (networkId = NetworkNumber.Eth) => ({
-    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: '',
-    hasSmartCollateral: false,
-    hasSmartDebt: false,
-    collateralAsset: 'cbBTC',
-    debtAsset: 'sUSDS',
-});
+// 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',
+// });
 export const FluidMarkets = (networkId) => ({
     [FluidMainnetVersion.ETH_USDC_1]: ETH_USDC_1(networkId),
     [FluidMainnetVersion.ETH_USDT_2]: ETH_USDT_2(networkId),
@@ -1843,9 +1845,42 @@ export const FluidMarkets = (networkId) => ({
     [FluidBaseVersions.ETH_CBBTC_14_BASE]: ETH_CBBTC_14_BASE(networkId),
     [FluidBaseVersions.WEETH_CBBTC_15_BASE]: WEETH_CBBTC_15_BASE(networkId),
     [FluidBaseVersions.WSTETH_CBBTC_16_BASE]: WSTETH_CBBTC_16_BASE(networkId),
-    [FluidBaseVersions.ETH_SUSDS_17_BASE]: ETH_SUSDS_17_BASE(networkId),
-    [FluidBaseVersions.WSTETH_SUSDS_18_BASE]: WSTETH_SUSDS_18_BASE(networkId),
-    [FluidBaseVersions.CBBTC_SUSDS_19_BASE]: CBBTC_SUSDS_19_BASE(networkId),
 });
 export const getFluidVersionsDataForNetwork = (network) => (Object.values(FluidMarkets(network)).filter(({ chainIds, marketAddress, type }) => !!marketAddress && chainIds.includes(network) && type === FluidVaultType.T1));
 export const getFluidMarketInfoById = (vaultId, network = 1) => getFluidVersionsDataForNetwork(network).find(({ id }) => id === vaultId);
+const FluidMainnetFTokenAddresses = {
+    [FluidMainnetDepositToken.ETH]: '0x90551c1795392094FE6D29B758EcCD233cFAa260',
+    [FluidMainnetDepositToken.USDC]: '0x9Fb7b4477576Fe5B32be4C1843aFB1e55F251B33',
+    [FluidMainnetDepositToken.USDT]: '0x5C20B550819128074FD538Edf79791733ccEdd18',
+    [FluidMainnetDepositToken.wstETH]: '0x2411802D8BEA09be0aF8fD8D08314a63e706b29C',
+    [FluidMainnetDepositToken.GHO]: '0x6A29A46E21C730DcA1d8b23d637c101cec605C5B',
+    [FluidMainnetDepositToken.sUSDS]: '0x2BBE31d63E6813E3AC858C04dae43FB2a72B0D11',
+};
+const FluidArbitrumFTokenAddresses = {
+    [FluidArbitrumDepositToken.ETH]: '0x45Df0656F8aDf017590009d2f1898eeca4F0a205',
+    [FluidArbitrumDepositToken.USDC]: '0x1A996cb54bb95462040408C06122D45D6Cdb6096',
+    [FluidArbitrumDepositToken.USDT]: '0x4A03F37e7d3fC243e3f99341d36f4b829BEe5E03',
+    [FluidArbitrumDepositToken.wstETH]: '0x66C25Cd75EBdAA7E04816F643d8E46cecd3183c9',
+    [FluidArbitrumDepositToken.ARB]: '0xbE3860FD4c3facDf8ad57Aa8c1A36D6dc4390a49',
+};
+const FluidBaseFTokenAddresses = {
+    [FluidBaseDepositToken.ETH]: '0x9272D6153133175175Bc276512B2336BE3931CE9',
+    [FluidBaseDepositToken.USDC]: '0xf42f5795D9ac7e9D757dB633D693cD548Cfd9169',
+    [FluidBaseDepositToken.EURC]: '0x1943FA26360f038230442525Cf1B9125b5DCB401',
+    [FluidBaseDepositToken.wstETH]: '0x896E39f0E9af61ECA9dD2938E14543506ef2c2b5',
+    [FluidBaseDepositToken.sUSDS]: '0xf62e339f21d8018940f188F6987Bcdf02A849619',
+};
+export const FluidFTokens = (networkId) => {
+    switch (networkId) {
+        case NetworkNumber.Eth:
+            return FluidMainnetFTokenAddresses;
+        case NetworkNumber.Arb:
+            return FluidArbitrumFTokenAddresses;
+        case NetworkNumber.Base:
+            return FluidBaseFTokenAddresses;
+        default:
+            throw new Error('Invalid network id');
+    }
+};
+// @ts-ignore
+export const getFTokenAddress = (token, networkId) => FluidFTokens(networkId)[token];

package/esm/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/esm/markets/index.js

@@ -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/esm/multicall/index.js

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

package/esm/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/esm/services/priceService.js

@@ -12,6 +12,7 @@ import { getAssetInfo } from '@defisaver/tokens';
 import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract, WstETHPriceFeedContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
 import { multicall } from '../multicall';
+import { getEthAmountForDecimals } from './utils';
 export const getEthPrice = (web3) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = ETHPriceFeedContract(web3, NetworkNumber.Eth);
     const price = yield contract.methods.latestAnswer().call();
@@ -47,6 +48,32 @@ export const getWstETHPrice = (web3) => __awaiter(void 0, void 0, void 0, functi
     const wstETHRate = new Dec(multicallRes[1].answer).div(1e8);
     return new Dec(ethPrice).mul(wstETHRate).toString();
 });
+// 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
+export const getWstETHPriceFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const wstETHFeedContract = WstETHPriceFeedContract(web3, network);
+    const ethFeedContract = 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 multicall(calls, web3, network);
+    const ethPrice = new Dec(multicallRes[0][0]).div(1e8);
+    const wstETHRate = getEthAmountForDecimals(multicallRes[1].answer, multicallRes[2][0]);
+    return new Dec(ethPrice).mul(wstETHRate).toString();
+});
 // chainlink price feed available only on mainnet
 export const getChainlinkAssetAddress = (symbol, network) => {
     // Chainlink only has BTC/USD feed so we use that for BTC derivatives

package/esm/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;