@defisaver/positions-sdk 1.0.11-fluid-dev3 → 1.0.11-fluid-dev5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/cjs/fluid/index.js +6 -0
  2. package/cjs/markets/fluid/index.d.ts +20 -0
  3. package/cjs/markets/fluid/index.js +218 -72
  4. package/cjs/types/fluid.d.ts +13 -1
  5. package/cjs/types/fluid.js +10 -0
  6. package/esm/fluid/index.js +6 -0
  7. package/esm/markets/fluid/index.d.ts +20 -0
  8. package/esm/markets/fluid/index.js +205 -69
  9. package/esm/types/fluid.d.ts +13 -1
  10. package/esm/types/fluid.js +10 -0
  11. package/package.json +1 -1
  12. package/src/fluid/index.ts +6 -0
  13. package/src/markets/fluid/index.ts +212 -70
  14. package/src/types/fluid.ts +12 -0
package/esm/types/fluid.js CHANGED
@@ -7,6 +7,8 @@ export var FluidMainnetVersion;
7
7
  FluidMainnetVersion["FLUID_WSTETH_USDC_4"] = "FLUID_WSTETH_USDC_4";
8
8
  FluidMainnetVersion["FLUID_WSTETH_USDT_5"] = "FLUID_WSTETH_USDT_5";
9
9
  FluidMainnetVersion["FLUID_WEETH_WSTETH_6"] = "FLUID_WEETH_WSTETH_6";
10
+ FluidMainnetVersion["FLUID_SUSDE_USDC_7"] = "FLUID_SUSDE_USDC_7";
11
+ FluidMainnetVersion["FLUID_SUSDE_USDT_8"] = "FLUID_SUSDE_USDT_8";
10
12
  FluidMainnetVersion["FLUID_WEETH_USDC_9"] = "FLUID_WEETH_USDC_9";
11
13
  FluidMainnetVersion["FLUID_WEETH_USDT_10"] = "FLUID_WEETH_USDT_10";
12
14
  FluidMainnetVersion["FLUID_ETH_USDC_11"] = "FLUID_ETH_USDC_11";
@@ -31,6 +33,7 @@ export var FluidMainnetVersion;
31
33
  FluidMainnetVersion["FLUID_CBBTC_USDT_30"] = "FLUID_CBBTC_USDT_30";
32
34
  FluidMainnetVersion["FLUID_ETH_CBBTC_31"] = "FLUID_ETH_CBBTC_31";
33
35
  FluidMainnetVersion["FLUID_WEETH_CBBTC_32"] = "FLUID_WEETH_CBBTC_32";
36
+ FluidMainnetVersion["FLUID_WSTETH_CBBTC_33"] = "FLUID_WSTETH_CBBTC_33";
34
37
  FluidMainnetVersion["FLUID_WSTETH_ETH_WSTETH_ETH_44"] = "FLUID_WSTETH_ETH_WSTETH_ETH_44";
35
38
  FluidMainnetVersion["FLUID_ETH_USDC_USDT_45"] = "FLUID_ETH_USDC_USDT_45";
36
39
  FluidMainnetVersion["FLUID_WSTETH_USDC_USDT_46"] = "FLUID_WSTETH_USDC_USDT_46";
@@ -46,6 +49,8 @@ export var FluidMainnetVersion;
46
49
  FluidMainnetVersion["FLUID_SUSDE_GHO_56"] = "FLUID_SUSDE_GHO_56";
47
50
  FluidMainnetVersion["FLUID_WEETH_GHO_57"] = "FLUID_WEETH_GHO_57";
48
51
  FluidMainnetVersion["FLUID_SUSDS_GHO_58"] = "FLUID_SUSDS_GHO_58";
52
+ FluidMainnetVersion["FLUID_WBTC_GHO_59"] = "FLUID_WBTC_GHO_59";
53
+ FluidMainnetVersion["FLUID_CBBTC_GHO_60"] = "FLUID_CBBTC_GHO_60";
49
54
  FluidMainnetVersion["FLUID_GHO_USDC_GHO_USDC_61"] = "FLUID_GHO_USDC_GHO_USDC_61";
50
55
  FluidMainnetVersion["FLUID_WEETH_ETH_WSTETH_74"] = "FLUID_WEETH_ETH_WSTETH_74";
51
56
  FluidMainnetVersion["FLUID_USDC_ETH_USDC_ETH_77"] = "FLUID_USDC_ETH_USDC_ETH_77";
@@ -114,6 +119,11 @@ export var FluidBaseVersions;
114
119
  FluidBaseVersions["FLUID_ETH_CBBTC_14_BASE"] = "FLUID_ETH_CBBTC_14_BASE";
115
120
  FluidBaseVersions["FLUID_WEETH_CBBTC_15_BASE"] = "FLUID_WEETH_CBBTC_15_BASE";
116
121
  FluidBaseVersions["FLUID_WSTETH_CBBTC_16_BASE"] = "FLUID_WSTETH_CBBTC_16_BASE";
122
+ FluidBaseVersions["FLUID_ETH_SUSDS_17_BASE"] = "FLUID_ETH_SUSDS_17_BASE";
123
+ FluidBaseVersions["FLUID_WSTETH_SUSDS_18_BASE"] = "FLUID_WSTETH_SUSDS_18_BASE";
124
+ FluidBaseVersions["FLUID_CBBTC_SUSDS_19_BASE"] = "FLUID_CBBTC_SUSDS_19_BASE";
125
+ FluidBaseVersions["FLUID_LBTC_USDC_21_BASE"] = "FLUID_LBTC_USDC_21_BASE";
126
+ FluidBaseVersions["FLUID_LBTC_SUSDS_22_BASE"] = "FLUID_LBTC_SUSDS_22_BASE";
117
127
  })(FluidBaseVersions || (FluidBaseVersions = {}));
118
128
  export var FluidMainnetDepositToken;
119
129
  (function (FluidMainnetDepositToken) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "1.0.11-fluid-dev3",
3
+ "version": "1.0.11-fluid-dev5",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/fluid/index.ts CHANGED
@@ -517,6 +517,7 @@ const parseT3MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
517
517
  const totalBorrowVaultUsd = new Dec(totalBorrowSharesInVault).mul(debtSharePrice).toString();
518
518
 
519
519
  const borrowableUSD = new Dec(borrowableShares).mul(debtSharePrice).toString();
520
+ const maxBorrowSharesUsd = new Dec(maxBorrowShares).mul(debtSharePrice).toString();
520
521
 
521
522
  const marketData = {
522
523
  vaultId: +data.vaultId,
@@ -553,6 +554,7 @@ const parseT3MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
553
554
  borrowable: borrowableShares,
554
555
  borrowableDex: new Dec(maxBorrowShares).minus(totalBorrowShares).toString(),
555
556
  maxBorrowShares,
557
+ maxBorrowSharesUsd,
556
558
  borrowDexFee,
557
559
  debtSharePrice,
558
560
  };
@@ -710,11 +712,13 @@ const parseT4MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
710
712
  const totalBorrowSharesInVault = assetAmountInEth(data.totalBorrowVault);
711
713
  const debtSharePrice = new Dec(quoteTokensPerShare).mul(prices[quoteToken.address]).toString();
712
714
  const totalBorrowVaultUsd = new Dec(totalBorrowSharesInVault).mul(debtSharePrice).toString();
715
+ const maxBorrowSharesUsd = new Dec(maxBorrowShares).mul(debtSharePrice).toString();
713
716
  const borrowableUSD = new Dec(borrowableShares).mul(debtSharePrice).toString();
714
717
 
715
718
  const totalSupplySharesInVault = assetAmountInEth(data.totalSupplyVault);
716
719
  const collSharePrice = new Dec(oraclePrice).mul(debtSharePrice).toString();
717
720
  const totalSupplyVaultUsd = new Dec(totalSupplySharesInVault).mul(collSharePrice).toString();
721
+ const maxSupplySharesUsd = new Dec(maxSupplyShares).mul(collSharePrice).toString();
718
722
  const withdrawableUSD = new Dec(withdrawableShares).mul(collSharePrice).toString();
719
723
 
720
724
  const marketData = {
@@ -750,6 +754,7 @@ const parseT4MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
750
754
  borrowable: borrowableShares,
751
755
  borrowableDex: new Dec(maxBorrowShares).minus(totalBorrowShares).toString(),
752
756
  maxBorrowShares,
757
+ maxBorrowSharesUsd,
753
758
  borrowDexFee,
754
759
  totalSupplyToken0,
755
760
  totalSupplyToken1,
@@ -759,6 +764,7 @@ const parseT4MarketData = async (web3: Web3, data: FluidView.VaultDataStructOutp
759
764
  withdrawable: withdrawableShares,
760
765
  widthdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
761
766
  maxSupplyShares,
767
+ maxSupplySharesUsd,
762
768
  collDexFee: supplyDexFee,
763
769
  collSharePrice,
764
770
  debtSharePrice,
package/src/markets/fluid/index.ts CHANGED
@@ -131,6 +131,45 @@ export const FLUID_WEETH_WSTETH_6 = (networkId: NetworkNumber = NetworkNumber.Et
131
131
  isDeprecatingSoon: true,
132
132
  });
133
133
 
134
+ export const FLUID_SUSDE_USDC_7 = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
135
+ btcBased: false,
136
+ ethBased: false,
137
+ wstETHBased: false,
138
+ stableBased: true,
139
+ chainIds: [NetworkNumber.Eth],
140
+ label: '#7 (sUSDe / USDC)',
141
+ shortLabel: 'sUSDe/USDC',
142
+ value: FluidMainnetVersion.FLUID_SUSDE_USDC_7,
143
+ url: 'susde-usdc-7',
144
+ marketAddress: '0x4045720a33193b4Fe66c94DFbc8D37B0b4D9B469',
145
+ id: 7,
146
+ hasSmartCollateral: false,
147
+ hasSmartDebt: false,
148
+ collateralAsset0: 'sUSDe',
149
+ debtAsset0: 'USDC',
150
+ type: FluidVaultType.T1,
151
+ isDeprecatingSoon: true,
152
+ });
153
+
154
+ export const FLUID_SUSDE_USDT_8 = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
155
+ btcBased: false,
156
+ ethBased: false,
157
+ wstETHBased: false,
158
+ stableBased: true,
159
+ chainIds: [NetworkNumber.Eth],
160
+ label: '#8 (sUSDe / USDT)',
161
+ shortLabel: 'sUSDe/USDT',
162
+ value: FluidMainnetVersion.FLUID_SUSDE_USDT_8,
163
+ url: 'susde-usdt-8',
164
+ marketAddress: '0xBFADEA65591235f38809076e14803Ac84AcF3F97',
165
+ id: 8,
166
+ hasSmartCollateral: false,
167
+ hasSmartDebt: false,
168
+ collateralAsset0: 'sUSDe',
169
+ debtAsset0: 'USDT',
170
+ type: FluidVaultType.T1,
171
+ isDeprecatingSoon: true,
172
+ });
134
173
 
135
174
  export const FLUID_WEETH_USDC_9 = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
136
175
  btcBased: false,
@@ -571,6 +610,25 @@ export const FLUID_ETH_CBBTC_31 = (networkId: NetworkNumber = NetworkNumber.Eth)
571
610
  debtAsset0: 'cbBTC',
572
611
  });
573
612
 
613
+ export const FLUID_WSTETH_CBBTC_33 = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
614
+ stableBased: false,
615
+ btcBased: true,
616
+ wstETHBased: true,
617
+ ethBased: true,
618
+ type: FluidVaultType.T1,
619
+ chainIds: [NetworkNumber.Eth],
620
+ label: '#33 (wstETH / cbBTC)',
621
+ shortLabel: 'wstETH/cbBTC',
622
+ value: FluidMainnetVersion.FLUID_WSTETH_CBBTC_33,
623
+ url: 'wsteth-cbbtc-33',
624
+ id: 33,
625
+ marketAddress: '0x6E0cDB09eb33cD3894C905E0DFF9289b95a86FFF',
626
+ hasSmartCollateral: false,
627
+ hasSmartDebt: false,
628
+ collateralAsset0: 'wstETH',
629
+ debtAsset0: 'cbBTC',
630
+ });
631
+
574
632
  export const FLUID_WEETH_CBBTC_32 = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
575
633
  stableBased: false,
576
634
  btcBased: true,
@@ -590,7 +648,6 @@ export const FLUID_WEETH_CBBTC_32 = (networkId: NetworkNumber = NetworkNumber.Et
590
648
  debtAsset0: 'cbBTC',
591
649
  });
592
650
 
593
-
594
651
  export const FLUID_WSTETH_ETH_WSTETH_ETH_44 = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
595
652
  stableBased: false,
596
653
  btcBased: false,
@@ -888,6 +945,43 @@ export const FLUID_SUSDS_GHO_58 = (networkId: NetworkNumber = NetworkNumber.Eth)
888
945
  debtAsset0: 'GHO',
889
946
  });
890
947
 
948
+ export const FLUID_WBTC_GHO_59 = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
949
+ stableBased: true,
950
+ btcBased: true,
951
+ wstETHBased: false,
952
+ ethBased: false,
953
+ type: FluidVaultType.T1,
954
+ id: 59,
955
+ chainIds: [NetworkNumber.Eth],
956
+ label: '#59 (WBTC / GHO)',
957
+ shortLabel: 'WBTC/GHO',
958
+ value: FluidMainnetVersion.FLUID_WBTC_GHO_59,
959
+ url: 'wbtc-gho-59',
960
+ marketAddress: '0xe58Ed61ff0C9db46c8772FF7286B6B187D4fe68f',
961
+ hasSmartCollateral: false,
962
+ hasSmartDebt: false,
963
+ collateralAsset0: 'WBTC',
964
+ debtAsset0: 'GHO',
965
+ });
966
+
967
+ export const FLUID_CBBTC_GHO_60 = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
968
+ stableBased: true,
969
+ btcBased: true,
970
+ wstETHBased: false,
971
+ ethBased: false,
972
+ type: FluidVaultType.T1,
973
+ id: 60,
974
+ chainIds: [NetworkNumber.Eth],
975
+ label: '#60 (cbBTC / GHO)',
976
+ shortLabel: 'cbBTC/GHO',
977
+ value: FluidMainnetVersion.FLUID_CBBTC_GHO_60,
978
+ url: 'cbbtc-gho-60',
979
+ marketAddress: '0x81A0dD6c5DDB8474b483c31309b66d7173263CbB',
980
+ hasSmartCollateral: false,
981
+ hasSmartDebt: false,
982
+ collateralAsset0: 'cbBTC',
983
+ debtAsset0: 'GHO',
984
+ });
891
985
 
892
986
  export const FLUID_GHO_USDC_GHO_USDC_61 = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
893
987
  stableBased: true,
@@ -1082,7 +1176,7 @@ export const FLUID_SUSDE_USDT_USDC_USDT_98 = (networkId: NetworkNumber = Network
1082
1176
  shortLabel: 'sUSDe-USDT/USDC-USDT',
1083
1177
  value: FluidMainnetVersion.FLUID_SUSDE_USDT_USDC_USDT_98,
1084
1178
  url: 'susde-usdt-usdc-usdt-98',
1085
- marketAddress: '',
1179
+ marketAddress: '0xB170B94BeFe21098966aa9905Da6a2F569463A21',
1086
1180
  hasSmartCollateral: true,
1087
1181
  hasSmartDebt: true,
1088
1182
  collateralAsset0: 'sUSDe',
@@ -1103,7 +1197,7 @@ export const FLUID_USDE_USDT_USDC_USDT_99 = (networkId: NetworkNumber = NetworkN
1103
1197
  shortLabel: 'USDe-USDT/USDC-USDT',
1104
1198
  value: FluidMainnetVersion.FLUID_USDE_USDT_USDC_USDT_99,
1105
1199
  url: 'usde-usdt-usdc-usdt-99',
1106
- marketAddress: '',
1200
+ marketAddress: '0xaEac94D417BF8d8bb3A44507100Ab8c0D3b12cA1',
1107
1201
  hasSmartCollateral: true,
1108
1202
  hasSmartDebt: true,
1109
1203
  collateralAsset0: 'USDe',
@@ -1124,7 +1218,7 @@ export const FLUID_USDC_ETH_100 = (networkId: NetworkNumber = NetworkNumber.Eth)
1124
1218
  shortLabel: 'USDC/ETH',
1125
1219
  value: FluidMainnetVersion.FLUID_USDC_ETH_100,
1126
1220
  url: 'usdc-eth-100',
1127
- marketAddress: '',
1221
+ marketAddress: '0x348aD11DB2c90e7FdF8e57420C569F76dBe38a59',
1128
1222
  hasSmartCollateral: false,
1129
1223
  hasSmartDebt: false,
1130
1224
  collateralAsset0: 'USDC',
@@ -1143,7 +1237,7 @@ export const FLUID_USDC_WBTC_101 = (networkId: NetworkNumber = NetworkNumber.Eth
1143
1237
  shortLabel: 'USDC/WBTC',
1144
1238
  value: FluidMainnetVersion.FLUID_USDC_WBTC_101,
1145
1239
  url: 'usdc-wbtc-101',
1146
- marketAddress: '',
1240
+ marketAddress: '0xF140Ea1C1D657EaaB802FF7626dC220cD4007CE7',
1147
1241
  hasSmartCollateral: false,
1148
1242
  hasSmartDebt: false,
1149
1243
  collateralAsset0: 'USDC',
@@ -1162,7 +1256,7 @@ export const FLUID_USDC_CBBTC_102 = (networkId: NetworkNumber = NetworkNumber.Et
1162
1256
  shortLabel: 'USDC/cbBTC',
1163
1257
  value: FluidMainnetVersion.FLUID_USDC_CBBTC_102,
1164
1258
  url: 'usdc-cbbtc-102',
1165
- marketAddress: '',
1259
+ marketAddress: '0x1581f8C3De000b9A1cde85CaF68eC979D76a7b5E',
1166
1260
  hasSmartCollateral: false,
1167
1261
  hasSmartDebt: false,
1168
1262
  collateralAsset0: 'USDC',
@@ -1181,7 +1275,7 @@ export const FLUID_EZETH_WSTETH_103 = (networkId: NetworkNumber = NetworkNumber.
1181
1275
  shortLabel: 'ezETH/wstETH',
1182
1276
  value: FluidMainnetVersion.FLUID_EZETH_WSTETH_103,
1183
1277
  url: 'ezeth-wsteth-103',
1184
- marketAddress: '',
1278
+ marketAddress: '0x18D31F2E1374574DF8309F92305008Beb49d3618',
1185
1279
  hasSmartCollateral: false,
1186
1280
  hasSmartDebt: false,
1187
1281
  collateralAsset0: 'ezETH',
@@ -1200,7 +1294,7 @@ export const FLUID_EZETH_ETH_WSTETH_104 = (networkId: NetworkNumber = NetworkNum
1200
1294
  shortLabel: 'ezETH-ETH/wstETH',
1201
1295
  value: FluidMainnetVersion.FLUID_EZETH_ETH_WSTETH_104,
1202
1296
  url: 'ezeth-eth-wsteth-104',
1203
- marketAddress: '',
1297
+ marketAddress: '0x7ca57429d74EeDA2ae0AaE009277cB140d2B4901',
1204
1298
  hasSmartCollateral: true,
1205
1299
  hasSmartDebt: false,
1206
1300
  collateralAsset0: 'ezETH',
@@ -1220,7 +1314,7 @@ export const FLUID_LBTC_USDC_107 = (networkId: NetworkNumber = NetworkNumber.Eth
1220
1314
  shortLabel: 'LBTC/USDC',
1221
1315
  value: FluidMainnetVersion.FLUID_LBTC_USDC_107,
1222
1316
  url: 'lbtc-usdc-107',
1223
- marketAddress: '',
1317
+ marketAddress: '0x9714427bd5A212EF6779EF46577771A39F55fA3D',
1224
1318
  hasSmartCollateral: false,
1225
1319
  hasSmartDebt: false,
1226
1320
  collateralAsset0: 'LBTC',
@@ -1239,7 +1333,7 @@ export const FLUID_LBTC_USDT_108 = (networkId: NetworkNumber = NetworkNumber.Eth
1239
1333
  shortLabel: 'LBTC/USDT',
1240
1334
  value: FluidMainnetVersion.FLUID_LBTC_USDT_108,
1241
1335
  url: 'lbtc-usdt-108',
1242
- marketAddress: '',
1336
+ marketAddress: '0x9f64b16071387bcFD63A1EA7a518e22597575F14',
1243
1337
  hasSmartCollateral: false,
1244
1338
  hasSmartDebt: false,
1245
1339
  collateralAsset0: 'LBTC',
@@ -1258,7 +1352,7 @@ export const FLUID_LBTC_GHO_109 = (networkId: NetworkNumber = NetworkNumber.Eth)
1258
1352
  shortLabel: 'LBTC/GHO',
1259
1353
  value: FluidMainnetVersion.FLUID_LBTC_GHO_109,
1260
1354
  url: 'lbtc-gho-109',
1261
- marketAddress: '',
1355
+ marketAddress: '0x6388eEFD6b462662Ac295D7B436cbCa8651BEAf4',
1262
1356
  hasSmartCollateral: false,
1263
1357
  hasSmartDebt: false,
1264
1358
  collateralAsset0: 'LBTC',
@@ -1277,7 +1371,7 @@ export const FLUID_LBTC_CBBTC_CBBTC_114 = (networkId: NetworkNumber = NetworkNum
1277
1371
  shortLabel: 'LBTC-cbBTC/cbBTC',
1278
1372
  value: FluidMainnetVersion.FLUID_LBTC_CBBTC_CBBTC_114,
1279
1373
  url: 'lbtc-cbbtc-cbbtc-114',
1280
- marketAddress: '',
1374
+ marketAddress: '0x9f1F074EB64470f804b34E6948132b8aAE17028F',
1281
1375
  hasSmartCollateral: true,
1282
1376
  hasSmartDebt: false,
1283
1377
  collateralAsset0: 'LBTC',
@@ -1297,7 +1391,7 @@ export const FLUID_WBTC_LBTC_WBTC_115 = (networkId: NetworkNumber = NetworkNumbe
1297
1391
  shortLabel: 'WBTC-LBTC/WBTC',
1298
1392
  value: FluidMainnetVersion.FLUID_WBTC_LBTC_WBTC_115,
1299
1393
  url: 'wbtc-lbtc-wbtc-115',
1300
- marketAddress: '',
1394
+ marketAddress: '0x57A9f4e109EcEF8990BC794df0D159fb29861f2A',
1301
1395
  hasSmartCollateral: true,
1302
1396
  hasSmartDebt: false,
1303
1397
  collateralAsset0: 'WBTC',
@@ -1780,7 +1874,7 @@ export const FLUID_SUSDS_USDC_USDT_30_ARB = (networkId: NetworkNumber = NetworkN
1780
1874
  shortLabel: 'sUSDS/USDC-USDT',
1781
1875
  value: FluidArbitrumVersion.FLUID_SUSDS_USDC_USDT_30_ARB,
1782
1876
  url: 'susds_usdc_usdt_30_arb',
1783
- marketAddress: '',
1877
+ marketAddress: '0xE6b5D1CdC4935295c84772C4700932b4BFC93274',
1784
1878
  hasSmartCollateral: false,
1785
1879
  hasSmartDebt: true,
1786
1880
  collateralAsset0: 'sUSDS',
@@ -2092,62 +2186,100 @@ export const FLUID_WSTETH_CBBTC_16_BASE = (networkId: NetworkNumber = NetworkNum
2092
2186
  debtAsset0: 'cbBTC',
2093
2187
  });
2094
2188
 
2095
- // export const FLUID_ETH_SUSDS_17_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
2096
- // stableBased: true,
2097
- // btcBased: false,
2098
- // wstETHBased: false,
2099
- // ethBased: true,
2100
- // type: FluidVaultType.T1,
2101
- // id: 17,
2102
- // chainIds: [NetworkNumber.Base],
2103
- // label: 'ETH / sUSDS Market 17',
2104
- // shortLabel: 'ETH/sUSDS',
2105
- // value: FluidBaseVersions.FLUID_ETH_SUSDS_17_BASE,
2106
- // url: 'eth-susds-17-base',
2107
- // marketAddress: '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd',
2108
- // hasSmartCollateral: false,
2109
- // hasSmartDebt: false,
2110
- // collateralAsset0: 'ETH',
2111
- // debtAsset0: 'sSUDS',
2112
- // });
2113
- //
2114
- // export const FLUID_WSTETH_SUSDS_18_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
2115
- // stableBased: true,
2116
- // btcBased: false,
2117
- // wstETHBased: true,
2118
- // ethBased: true,
2119
- // type: FluidVaultType.T1,
2120
- // id: 18,
2121
- // chainIds: [NetworkNumber.Base],
2122
- // label: 'wstETH / sUSDS Market 18',
2123
- // shortLabel: 'wstETH/sUSDS',
2124
- // value: FluidBaseVersions.FLUID_WSTETH_SUSDS_18_BASE,
2125
- // url: 'wsteth-susds-18-base',
2126
- // marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
2127
- // hasSmartCollateral: false,
2128
- // hasSmartDebt: false,
2129
- // collateralAsset0: 'wstETH',
2130
- // debtAsset0: 'sUSDS',
2131
- // });
2132
- //
2133
- // export const FLUID_CBBTC_SUSDS_19_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
2134
- // stableBased: true,
2135
- // btcBased: false,
2136
- // wstETHBased: false,
2137
- // ethBased: false,
2138
- // type: FluidVaultType.T1,
2139
- // id: 19,
2140
- // chainIds: [NetworkNumber.Base],
2141
- // label: 'cbBTC / sUSDS Market 19',
2142
- // shortLabel: 'cbBTC/sUSDS',
2143
- // value: FluidBaseVersions.FLUID_CBBTC_SUSDS_19_BASE,
2144
- // url: 'cbbtc-susds-19-base',
2145
- // marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
2146
- // hasSmartCollateral: false,
2147
- // hasSmartDebt: false,
2148
- // collateralAsset0: 'cbBTC',
2149
- // debtAsset0: 'sUSDS',
2150
- // });
2189
+ export const FLUID_ETH_SUSDS_17_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
2190
+ stableBased: true,
2191
+ btcBased: false,
2192
+ wstETHBased: false,
2193
+ ethBased: true,
2194
+ type: FluidVaultType.T1,
2195
+ id: 17,
2196
+ chainIds: [NetworkNumber.Base],
2197
+ label: 'ETH / sUSDS Market 17',
2198
+ shortLabel: 'ETH/sUSDS',
2199
+ value: FluidBaseVersions.FLUID_ETH_SUSDS_17_BASE,
2200
+ url: 'eth-susds-17-base',
2201
+ marketAddress: '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd',
2202
+ hasSmartCollateral: false,
2203
+ hasSmartDebt: false,
2204
+ collateralAsset0: 'ETH',
2205
+ debtAsset0: 'sSUDS',
2206
+ });
2207
+
2208
+ export const FLUID_WSTETH_SUSDS_18_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
2209
+ stableBased: true,
2210
+ btcBased: false,
2211
+ wstETHBased: true,
2212
+ ethBased: true,
2213
+ type: FluidVaultType.T1,
2214
+ id: 18,
2215
+ chainIds: [NetworkNumber.Base],
2216
+ label: 'wstETH / sUSDS Market 18',
2217
+ shortLabel: 'wstETH/sUSDS',
2218
+ value: FluidBaseVersions.FLUID_WSTETH_SUSDS_18_BASE,
2219
+ url: 'wsteth-susds-18-base',
2220
+ marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
2221
+ hasSmartCollateral: false,
2222
+ hasSmartDebt: false,
2223
+ collateralAsset0: 'wstETH',
2224
+ debtAsset0: 'sUSDS',
2225
+ });
2226
+
2227
+ export const FLUID_CBBTC_SUSDS_19_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
2228
+ stableBased: true,
2229
+ btcBased: true,
2230
+ wstETHBased: false,
2231
+ ethBased: false,
2232
+ type: FluidVaultType.T1,
2233
+ id: 19,
2234
+ chainIds: [NetworkNumber.Base],
2235
+ label: 'cbBTC / sUSDS Market 19',
2236
+ shortLabel: 'cbBTC/sUSDS',
2237
+ value: FluidBaseVersions.FLUID_CBBTC_SUSDS_19_BASE,
2238
+ url: 'cbbtc-susds-19-base',
2239
+ marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
2240
+ hasSmartCollateral: false,
2241
+ hasSmartDebt: false,
2242
+ collateralAsset0: 'cbBTC',
2243
+ debtAsset0: 'sUSDS',
2244
+ });
2245
+
2246
+ export const FLUID_LBTC_USDC_21_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
2247
+ stableBased: true,
2248
+ btcBased: true,
2249
+ wstETHBased: false,
2250
+ ethBased: false,
2251
+ type: FluidVaultType.T1,
2252
+ id: 21,
2253
+ chainIds: [NetworkNumber.Base],
2254
+ label: 'LBTC / USDC Market 21',
2255
+ shortLabel: 'LBTC/USDC',
2256
+ value: FluidBaseVersions.FLUID_LBTC_USDC_21_BASE,
2257
+ url: 'lbtc-usdc-21-base',
2258
+ marketAddress: '0x6F72895Cf6904489Bcd862c941c3D02a3eE4f03e',
2259
+ hasSmartCollateral: false,
2260
+ hasSmartDebt: false,
2261
+ collateralAsset0: 'LBTC',
2262
+ debtAsset0: 'USDC',
2263
+ });
2264
+
2265
+ export const FLUID_LBTC_SUSDS_22_BASE = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
2266
+ stableBased: true,
2267
+ btcBased: true,
2268
+ wstETHBased: false,
2269
+ ethBased: false,
2270
+ type: FluidVaultType.T1,
2271
+ id: 22,
2272
+ chainIds: [NetworkNumber.Base],
2273
+ label: 'LBTC / sUSDS Market 22',
2274
+ shortLabel: 'LBTC/sUSDS',
2275
+ value: FluidBaseVersions.FLUID_LBTC_SUSDS_22_BASE,
2276
+ url: 'lbtc-susds-22-base',
2277
+ marketAddress: '0x3A0b7c8840D74D39552EF53F586dD8c3d1234C40',
2278
+ hasSmartCollateral: false,
2279
+ hasSmartDebt: false,
2280
+ collateralAsset0: 'LBTC',
2281
+ debtAsset0: 'sUSDS',
2282
+ });
2151
2283
 
2152
2284
  export const FluidMarkets = (networkId: NetworkNumber) => ({
2153
2285
  [FluidMainnetVersion.FLUID_ETH_USDC_1]: FLUID_ETH_USDC_1(networkId),
@@ -2156,6 +2288,8 @@ export const FluidMarkets = (networkId: NetworkNumber) => ({
2156
2288
  [FluidMainnetVersion.FLUID_WSTETH_USDC_4]: FLUID_WSTETH_USDC_4(networkId),
2157
2289
  [FluidMainnetVersion.FLUID_WSTETH_USDT_5]: FLUID_WSTETH_USDT_5(networkId),
2158
2290
  [FluidMainnetVersion.FLUID_WEETH_WSTETH_6]: FLUID_WEETH_WSTETH_6(networkId),
2291
+ [FluidMainnetVersion.FLUID_SUSDE_USDC_7]: FLUID_SUSDE_USDC_7(networkId),
2292
+ [FluidMainnetVersion.FLUID_SUSDE_USDT_8]: FLUID_SUSDE_USDT_8(networkId),
2159
2293
  [FluidMainnetVersion.FLUID_WEETH_USDC_9]: FLUID_WEETH_USDC_9(networkId),
2160
2294
  [FluidMainnetVersion.FLUID_WEETH_USDT_10]: FLUID_WEETH_USDT_10(networkId),
2161
2295
  [FluidMainnetVersion.FLUID_ETH_USDC_11]: FLUID_ETH_USDC_11(networkId),
@@ -2180,6 +2314,7 @@ export const FluidMarkets = (networkId: NetworkNumber) => ({
2180
2314
  [FluidMainnetVersion.FLUID_CBBTC_USDT_30]: FLUID_CBBTC_USDT_30(networkId),
2181
2315
  [FluidMainnetVersion.FLUID_ETH_CBBTC_31]: FLUID_ETH_CBBTC_31(networkId),
2182
2316
  [FluidMainnetVersion.FLUID_WEETH_CBBTC_32]: FLUID_WEETH_CBBTC_32(networkId),
2317
+ [FluidMainnetVersion.FLUID_WSTETH_CBBTC_33]: FLUID_WSTETH_CBBTC_33(networkId),
2183
2318
  [FluidMainnetVersion.FLUID_WSTETH_ETH_WSTETH_ETH_44]: FLUID_WSTETH_ETH_WSTETH_ETH_44(networkId),
2184
2319
  [FluidMainnetVersion.FLUID_ETH_USDC_USDT_45]: FLUID_ETH_USDC_USDT_45(networkId),
2185
2320
  [FluidMainnetVersion.FLUID_WSTETH_USDC_USDT_46]: FLUID_WSTETH_USDC_USDT_46(networkId),
@@ -2195,6 +2330,8 @@ export const FluidMarkets = (networkId: NetworkNumber) => ({
2195
2330
  [FluidMainnetVersion.FLUID_SUSDE_GHO_56]: FLUID_SUSDE_GHO_56(networkId),
2196
2331
  [FluidMainnetVersion.FLUID_WEETH_GHO_57]: FLUID_WEETH_GHO_57(networkId),
2197
2332
  [FluidMainnetVersion.FLUID_SUSDS_GHO_58]: FLUID_SUSDS_GHO_58(networkId),
2333
+ [FluidMainnetVersion.FLUID_WBTC_GHO_59]: FLUID_WBTC_GHO_59(networkId),
2334
+ [FluidMainnetVersion.FLUID_CBBTC_GHO_60]: FLUID_CBBTC_GHO_60(networkId),
2198
2335
  [FluidMainnetVersion.FLUID_GHO_USDC_GHO_USDC_61]: FLUID_GHO_USDC_GHO_USDC_61(networkId),
2199
2336
  [FluidMainnetVersion.FLUID_WEETH_ETH_WSTETH_74]: FLUID_WEETH_ETH_WSTETH_74(networkId),
2200
2337
  [FluidMainnetVersion.FLUID_USDC_ETH_USDC_ETH_77]: FLUID_USDC_ETH_USDC_ETH_77(networkId),
@@ -2262,6 +2399,11 @@ export const FluidMarkets = (networkId: NetworkNumber) => ({
2262
2399
  [FluidBaseVersions.FLUID_ETH_CBBTC_14_BASE]: FLUID_ETH_CBBTC_14_BASE(networkId),
2263
2400
  [FluidBaseVersions.FLUID_WEETH_CBBTC_15_BASE]: FLUID_WEETH_CBBTC_15_BASE(networkId),
2264
2401
  [FluidBaseVersions.FLUID_WSTETH_CBBTC_16_BASE]: FLUID_WSTETH_CBBTC_16_BASE(networkId),
2402
+ [FluidBaseVersions.FLUID_ETH_SUSDS_17_BASE]: FLUID_ETH_SUSDS_17_BASE(networkId),
2403
+ [FluidBaseVersions.FLUID_WSTETH_SUSDS_18_BASE]: FLUID_WSTETH_SUSDS_18_BASE(networkId),
2404
+ [FluidBaseVersions.FLUID_CBBTC_SUSDS_19_BASE]: FLUID_CBBTC_SUSDS_19_BASE(networkId),
2405
+ [FluidBaseVersions.FLUID_LBTC_USDC_21_BASE]: FLUID_LBTC_USDC_21_BASE(networkId),
2406
+ [FluidBaseVersions.FLUID_LBTC_SUSDS_22_BASE]: FLUID_LBTC_SUSDS_22_BASE(networkId),
2265
2407
  });
2266
2408
 
2267
2409
  export const getFluidVersionsDataForNetwork = (network: NetworkNumber) => (
package/src/types/fluid.ts CHANGED
@@ -29,6 +29,8 @@ export enum FluidMainnetVersion {
29
29
  FLUID_WSTETH_USDC_4 = 'FLUID_WSTETH_USDC_4',
30
30
  FLUID_WSTETH_USDT_5 = 'FLUID_WSTETH_USDT_5',
31
31
  FLUID_WEETH_WSTETH_6 = 'FLUID_WEETH_WSTETH_6',
32
+ FLUID_SUSDE_USDC_7 = 'FLUID_SUSDE_USDC_7',
33
+ FLUID_SUSDE_USDT_8 = 'FLUID_SUSDE_USDT_8',
32
34
  FLUID_WEETH_USDC_9 = 'FLUID_WEETH_USDC_9',
33
35
  FLUID_WEETH_USDT_10 = 'FLUID_WEETH_USDT_10',
34
36
  FLUID_ETH_USDC_11 = 'FLUID_ETH_USDC_11',
@@ -53,6 +55,7 @@ export enum FluidMainnetVersion {
53
55
  FLUID_CBBTC_USDT_30 = 'FLUID_CBBTC_USDT_30',
54
56
  FLUID_ETH_CBBTC_31 = 'FLUID_ETH_CBBTC_31',
55
57
  FLUID_WEETH_CBBTC_32 = 'FLUID_WEETH_CBBTC_32',
58
+ FLUID_WSTETH_CBBTC_33 = 'FLUID_WSTETH_CBBTC_33',
56
59
  FLUID_WSTETH_ETH_WSTETH_ETH_44 = 'FLUID_WSTETH_ETH_WSTETH_ETH_44',
57
60
  FLUID_ETH_USDC_USDT_45 = 'FLUID_ETH_USDC_USDT_45',
58
61
  FLUID_WSTETH_USDC_USDT_46 = 'FLUID_WSTETH_USDC_USDT_46',
@@ -68,6 +71,8 @@ export enum FluidMainnetVersion {
68
71
  FLUID_SUSDE_GHO_56 = 'FLUID_SUSDE_GHO_56',
69
72
  FLUID_WEETH_GHO_57 = 'FLUID_WEETH_GHO_57',
70
73
  FLUID_SUSDS_GHO_58 = 'FLUID_SUSDS_GHO_58',
74
+ FLUID_WBTC_GHO_59 = 'FLUID_WBTC_GHO_59',
75
+ FLUID_CBBTC_GHO_60 = 'FLUID_CBBTC_GHO_60',
71
76
  FLUID_GHO_USDC_GHO_USDC_61 = 'FLUID_GHO_USDC_GHO_USDC_61',
72
77
  FLUID_WEETH_ETH_WSTETH_74 = 'FLUID_WEETH_ETH_WSTETH_74',
73
78
  FLUID_USDC_ETH_USDC_ETH_77 = 'FLUID_USDC_ETH_USDC_ETH_77',
@@ -136,6 +141,11 @@ export enum FluidBaseVersions {
136
141
  FLUID_ETH_CBBTC_14_BASE = 'FLUID_ETH_CBBTC_14_BASE',
137
142
  FLUID_WEETH_CBBTC_15_BASE = 'FLUID_WEETH_CBBTC_15_BASE',
138
143
  FLUID_WSTETH_CBBTC_16_BASE = 'FLUID_WSTETH_CBBTC_16_BASE',
144
+ FLUID_ETH_SUSDS_17_BASE = 'FLUID_ETH_SUSDS_17_BASE',
145
+ FLUID_WSTETH_SUSDS_18_BASE = 'FLUID_WSTETH_SUSDS_18_BASE',
146
+ FLUID_CBBTC_SUSDS_19_BASE = 'FLUID_CBBTC_SUSDS_19_BASE',
147
+ FLUID_LBTC_USDC_21_BASE = 'FLUID_LBTC_USDC_21_BASE',
148
+ FLUID_LBTC_SUSDS_22_BASE = 'FLUID_LBTC_SUSDS_22_BASE',
139
149
  }
140
150
 
141
151
  export type FluidVersions = FluidArbitrumVersion | FluidBaseVersions | FluidMainnetVersion;
@@ -244,6 +254,7 @@ export interface InnerFluidMarketData {
244
254
  // T2 and T4 vaults
245
255
  collSharePrice?: string,
246
256
  maxSupplyShares?: string,
257
+ maxSupplySharesUsd?: string,
247
258
  withdrawableUSD?: string,
248
259
  totalSupplyToken0?: string,
249
260
  totalSupplyToken1?: string,
@@ -253,6 +264,7 @@ export interface InnerFluidMarketData {
253
264
  // T3 and T4 vaults
254
265
  debtSharePrice?: string,
255
266
  maxBorrowShares?: string,
267
+ maxBorrowSharesUsd?: string,
256
268
  borrowableUSD?: string,
257
269
  borrowableToken0?: string,
258
270
  borrowableToken1?: string,