@defisaver/positions-sdk 0.0.201-fluid-dev-2 → 0.0.201-fluid-dev-3
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.
- package/cjs/fluid/index.js +6 -4
- package/cjs/markets/fluid/index.d.ts +28 -0
- package/cjs/markets/fluid/index.js +282 -2
- package/cjs/types/fluid.d.ts +17 -2
- package/cjs/types/fluid.js +14 -0
- package/esm/fluid/index.js +4 -2
- package/esm/markets/fluid/index.d.ts +28 -0
- package/esm/markets/fluid/index.js +267 -1
- package/esm/types/fluid.d.ts +17 -2
- package/esm/types/fluid.js +14 -0
- package/package.json +1 -1
- package/src/fluid/index.ts +4 -2
- package/src/markets/fluid/index.ts +279 -1
- package/src/types/fluid.ts +15 -0
package/cjs/fluid/index.js
CHANGED
|
@@ -21,7 +21,7 @@ const contracts_1 = require("../contracts");
|
|
|
21
21
|
const utils_1 = require("../services/utils");
|
|
22
22
|
const fluidHelpers_1 = require("../helpers/fluidHelpers");
|
|
23
23
|
const multicall_1 = require("../multicall");
|
|
24
|
-
const
|
|
24
|
+
const markets_1 = require("../markets");
|
|
25
25
|
const constants_1 = require("../constants");
|
|
26
26
|
const priceService_1 = require("../services/priceService");
|
|
27
27
|
exports.EMPTY_USED_ASSET = {
|
|
@@ -96,10 +96,11 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
|
|
|
96
96
|
[collAsset.symbol]: collAssetData,
|
|
97
97
|
[debtAsset.symbol]: debtAssetData,
|
|
98
98
|
};
|
|
99
|
-
const marketInfo = (0,
|
|
99
|
+
const marketInfo = (0, markets_1.getFluidMarketInfoById)(+data.vaultId, network);
|
|
100
100
|
const totalSupplyVault = (0, utils_1.getEthAmountForDecimals)(data.totalSupplyVault, collAsset.decimals);
|
|
101
101
|
const totalBorrowVault = (0, utils_1.getEthAmountForDecimals)(data.totalBorrowVault, debtAsset.decimals);
|
|
102
102
|
const liqRatio = new decimal_js_1.default(data.liquidationThreshold).div(100).toString();
|
|
103
|
+
const liquidationMaxLimit = new decimal_js_1.default(data.liquidationMaxLimit).div(100).toString();
|
|
103
104
|
const liqFactor = new decimal_js_1.default(data.liquidationThreshold).div(10000).toString();
|
|
104
105
|
const marketData = {
|
|
105
106
|
vaultId: +data.vaultId,
|
|
@@ -120,7 +121,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
|
|
|
120
121
|
totalSupplyVault,
|
|
121
122
|
totalBorrowVault,
|
|
122
123
|
totalSupplyVaultUsd: new decimal_js_1.default(totalSupplyVault).mul(collAssetData.price).toString(),
|
|
123
|
-
totalBorrowVaultUsd: new decimal_js_1.default(
|
|
124
|
+
totalBorrowVaultUsd: new decimal_js_1.default(totalBorrowVault).mul(debtAssetData.price).toString(),
|
|
124
125
|
withdrawalLimit: (0, utils_1.getEthAmountForDecimals)(data.withdrawalLimit, collAsset.decimals),
|
|
125
126
|
withdrawableUntilLimit: (0, utils_1.getEthAmountForDecimals)(data.withdrawableUntilLimit, collAsset.decimals),
|
|
126
127
|
withdrawable: (0, utils_1.getEthAmountForDecimals)(data.withdrawable, collAsset.decimals),
|
|
@@ -131,6 +132,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
|
|
|
131
132
|
maxBorrowLimit: (0, utils_1.getEthAmountForDecimals)(data.maxBorrowLimit, debtAsset.decimals),
|
|
132
133
|
baseBorrowLimit: (0, utils_1.getEthAmountForDecimals)(data.baseBorrowLimit, debtAsset.decimals),
|
|
133
134
|
minimumBorrowing: (0, utils_1.getEthAmountForDecimals)(data.minimumBorrowing, debtAsset.decimals),
|
|
135
|
+
liquidationMaxLimit,
|
|
134
136
|
borrowRate,
|
|
135
137
|
supplyRate,
|
|
136
138
|
};
|
|
@@ -203,7 +205,7 @@ const getFluidPositionWithMarket = (web3, network, vaultId) => __awaiter(void 0,
|
|
|
203
205
|
});
|
|
204
206
|
exports.getFluidPositionWithMarket = getFluidPositionWithMarket;
|
|
205
207
|
const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0, void 0, function* () {
|
|
206
|
-
const versions = (0,
|
|
208
|
+
const versions = (0, markets_1.getFluidVersionsDataForNetwork)(network);
|
|
207
209
|
const view = (0, contracts_1.FluidViewContract)(web3, network);
|
|
208
210
|
const calls = versions.map((version) => ({
|
|
209
211
|
target: view.options.address,
|
|
@@ -65,8 +65,19 @@ export declare const WEETH_USDT_8_ARB: (networkId?: NetworkNumber) => FluidMarke
|
|
|
65
65
|
export declare const ETH_ARB_9_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
66
66
|
export declare const ARB_USDC_10_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
67
67
|
export declare const ARB_USDT_11_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
68
|
+
export declare const WBTC_USDC_12_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
69
|
+
export declare const WBTC_USDT_13_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
68
70
|
export declare const WSTETH_ETH_WSTETH_ETH_16_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
69
71
|
export declare const WEETH_ETH_WSTETH_17_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
72
|
+
export declare const WBTC_ETH_18_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
73
|
+
export declare const ETH_WBTC_19_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
74
|
+
export declare const WSTETH_WBTC_20_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
75
|
+
export declare const WEETH_WBTC_21_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
76
|
+
export declare const USDC_ETH_USDC_ETH_22_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
77
|
+
export declare const ETH_USDC_USDT_23_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
78
|
+
export declare const WSTETH_USDC_USDT_24_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
79
|
+
export declare const WEETH_USDC_USDT_25_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
80
|
+
export declare const WBTC_USDC_USDT_26_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
70
81
|
export declare const ETH_USDC_1_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
71
82
|
export declare const WSTETH_USDC_2_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
72
83
|
export declare const WSTETH_ETH_3_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
@@ -83,6 +94,9 @@ export declare const CBBTC_ETH_13_BASE: (networkId?: NetworkNumber) => FluidMark
|
|
|
83
94
|
export declare const ETH_CBBTC_14_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
84
95
|
export declare const WEETH_CBBTC_15_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
85
96
|
export declare const WSTETH_CBBTC_16_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
97
|
+
export declare const ETH_SUSDS_17_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
98
|
+
export declare const WSTETH_SUSDS_18_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
99
|
+
export declare const CBBTC_SUSDS_19_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
86
100
|
export declare const FluidMarkets: (networkId: NetworkNumber) => {
|
|
87
101
|
ETH_USDC_1: FluidMarketInfo;
|
|
88
102
|
ETH_USDT_2: FluidMarketInfo;
|
|
@@ -149,8 +163,19 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
|
|
|
149
163
|
ETH_ARB_9_ARB: FluidMarketInfo;
|
|
150
164
|
ARB_USDC_10_ARB: FluidMarketInfo;
|
|
151
165
|
ARB_USDT_11_ARB: FluidMarketInfo;
|
|
166
|
+
WBTC_USDC_12_ARB: FluidMarketInfo;
|
|
167
|
+
WBTC_USDT_13_ARB: FluidMarketInfo;
|
|
152
168
|
WSTETH_ETH_WSTETH_ETH_16_ARB: FluidMarketInfo;
|
|
153
169
|
WEETH_ETH_WSTETH_17_ARB: FluidMarketInfo;
|
|
170
|
+
WBTC_ETH_18_ARB: FluidMarketInfo;
|
|
171
|
+
ETH_WBTC_19_ARB: FluidMarketInfo;
|
|
172
|
+
WSTETH_WBTC_20_ARB: FluidMarketInfo;
|
|
173
|
+
WEETH_WBTC_21_ARB: FluidMarketInfo;
|
|
174
|
+
USDC_ETH_USDC_ETH_22_ARB: FluidMarketInfo;
|
|
175
|
+
ETH_USDC_USDT_23_ARB: FluidMarketInfo;
|
|
176
|
+
WSTETH_USDC_USDT_24_ARB: FluidMarketInfo;
|
|
177
|
+
WEETH_USDC_USDT_25_ARB: FluidMarketInfo;
|
|
178
|
+
WBTC_USDC_USDT_26_ARB: FluidMarketInfo;
|
|
154
179
|
ETH_USDC_1_BASE: FluidMarketInfo;
|
|
155
180
|
WSTETH_USDC_2_BASE: FluidMarketInfo;
|
|
156
181
|
WSTETH_ETH_3_BASE: FluidMarketInfo;
|
|
@@ -167,6 +192,9 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
|
|
|
167
192
|
ETH_CBBTC_14_BASE: FluidMarketInfo;
|
|
168
193
|
WEETH_CBBTC_15_BASE: FluidMarketInfo;
|
|
169
194
|
WSTETH_CBBTC_16_BASE: FluidMarketInfo;
|
|
195
|
+
ETH_SUSDS_17_BASE: FluidMarketInfo;
|
|
196
|
+
WSTETH_SUSDS_18_BASE: FluidMarketInfo;
|
|
197
|
+
CBBTC_SUSDS_19_BASE: FluidMarketInfo;
|
|
170
198
|
};
|
|
171
199
|
export declare const getFluidVersionsDataForNetwork: (network: NetworkNumber) => FluidMarketInfo[];
|
|
172
200
|
export declare const getFluidMarketInfoById: (vaultId: number, network?: NetworkNumber) => FluidMarketInfo | undefined;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
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;
|
|
4
|
-
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.WEETH_ETH_WSTETH_17_ARB = exports.WSTETH_ETH_WSTETH_ETH_16_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;
|
|
4
|
+
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;
|
|
5
5
|
const common_1 = require("../../types/common");
|
|
6
6
|
const types_1 = require("../../types");
|
|
7
7
|
const ETH_USDC_1 = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
@@ -1239,6 +1239,44 @@ const ARB_USDT_11_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
|
1239
1239
|
debtAsset: 'USDT',
|
|
1240
1240
|
});
|
|
1241
1241
|
exports.ARB_USDT_11_ARB = ARB_USDT_11_ARB;
|
|
1242
|
+
const WBTC_USDC_12_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1243
|
+
stableBased: true,
|
|
1244
|
+
btcBased: true,
|
|
1245
|
+
wstETHBased: false,
|
|
1246
|
+
ethBased: false,
|
|
1247
|
+
type: types_1.FluidVaultType.T1,
|
|
1248
|
+
id: 12,
|
|
1249
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1250
|
+
label: 'WBTC / USDC Market 12',
|
|
1251
|
+
shortLabel: 'WBTC/USDC',
|
|
1252
|
+
value: types_1.FluidArbitrumVersion.ARB_USDT_11_ARB,
|
|
1253
|
+
url: 'wbtc_usdc_12_arb',
|
|
1254
|
+
marketAddress: '',
|
|
1255
|
+
hasSmartCollateral: false,
|
|
1256
|
+
hasSmartDebt: false,
|
|
1257
|
+
collateralAsset: 'WBTC',
|
|
1258
|
+
debtAsset: 'USDC',
|
|
1259
|
+
});
|
|
1260
|
+
exports.WBTC_USDC_12_ARB = WBTC_USDC_12_ARB;
|
|
1261
|
+
const WBTC_USDT_13_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1262
|
+
stableBased: true,
|
|
1263
|
+
btcBased: true,
|
|
1264
|
+
wstETHBased: false,
|
|
1265
|
+
ethBased: false,
|
|
1266
|
+
type: types_1.FluidVaultType.T1,
|
|
1267
|
+
id: 13,
|
|
1268
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1269
|
+
label: 'WBTC / USDT Market 13',
|
|
1270
|
+
shortLabel: 'WBTC/USDT',
|
|
1271
|
+
value: types_1.FluidArbitrumVersion.ARB_USDT_11_ARB,
|
|
1272
|
+
url: 'wbtc_usdc_13_arb',
|
|
1273
|
+
marketAddress: '',
|
|
1274
|
+
hasSmartCollateral: false,
|
|
1275
|
+
hasSmartDebt: false,
|
|
1276
|
+
collateralAsset: 'WBTC',
|
|
1277
|
+
debtAsset: 'USDT',
|
|
1278
|
+
});
|
|
1279
|
+
exports.WBTC_USDT_13_ARB = WBTC_USDT_13_ARB;
|
|
1242
1280
|
const WSTETH_ETH_WSTETH_ETH_16_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1243
1281
|
stableBased: false,
|
|
1244
1282
|
btcBased: false,
|
|
@@ -1263,7 +1301,7 @@ const WEETH_ETH_WSTETH_17_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
|
1263
1301
|
btcBased: false,
|
|
1264
1302
|
wstETHBased: true,
|
|
1265
1303
|
ethBased: true,
|
|
1266
|
-
type: types_1.FluidVaultType.
|
|
1304
|
+
type: types_1.FluidVaultType.T2,
|
|
1267
1305
|
id: 17,
|
|
1268
1306
|
chainIds: [common_1.NetworkNumber.Arb],
|
|
1269
1307
|
label: 'weETH / ETH Market 17',
|
|
@@ -1277,6 +1315,177 @@ const WEETH_ETH_WSTETH_17_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
|
1277
1315
|
debtAsset: 'ETH',
|
|
1278
1316
|
});
|
|
1279
1317
|
exports.WEETH_ETH_WSTETH_17_ARB = WEETH_ETH_WSTETH_17_ARB;
|
|
1318
|
+
const WBTC_ETH_18_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1319
|
+
stableBased: false,
|
|
1320
|
+
btcBased: true,
|
|
1321
|
+
wstETHBased: false,
|
|
1322
|
+
ethBased: true,
|
|
1323
|
+
type: types_1.FluidVaultType.T1,
|
|
1324
|
+
id: 18,
|
|
1325
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1326
|
+
label: 'WBTC / ETH Market 18',
|
|
1327
|
+
shortLabel: 'WBTC/ETH',
|
|
1328
|
+
value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1329
|
+
url: 'wbtc_eth_18_arb',
|
|
1330
|
+
marketAddress: '',
|
|
1331
|
+
hasSmartCollateral: false,
|
|
1332
|
+
hasSmartDebt: false,
|
|
1333
|
+
collateralAsset: 'WBTC',
|
|
1334
|
+
debtAsset: 'ETH',
|
|
1335
|
+
});
|
|
1336
|
+
exports.WBTC_ETH_18_ARB = WBTC_ETH_18_ARB;
|
|
1337
|
+
const ETH_WBTC_19_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1338
|
+
stableBased: false,
|
|
1339
|
+
btcBased: true,
|
|
1340
|
+
wstETHBased: false,
|
|
1341
|
+
ethBased: true,
|
|
1342
|
+
type: types_1.FluidVaultType.T1,
|
|
1343
|
+
id: 19,
|
|
1344
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1345
|
+
label: 'ETH / WBTC Market 19',
|
|
1346
|
+
shortLabel: 'ETH/WBTC',
|
|
1347
|
+
value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1348
|
+
url: 'eth_wbtc_19_arb',
|
|
1349
|
+
marketAddress: '',
|
|
1350
|
+
hasSmartCollateral: false,
|
|
1351
|
+
hasSmartDebt: false,
|
|
1352
|
+
collateralAsset: 'ETH',
|
|
1353
|
+
debtAsset: 'WBTC',
|
|
1354
|
+
});
|
|
1355
|
+
exports.ETH_WBTC_19_ARB = ETH_WBTC_19_ARB;
|
|
1356
|
+
const WSTETH_WBTC_20_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1357
|
+
stableBased: false,
|
|
1358
|
+
btcBased: true,
|
|
1359
|
+
wstETHBased: true,
|
|
1360
|
+
ethBased: true,
|
|
1361
|
+
type: types_1.FluidVaultType.T1,
|
|
1362
|
+
id: 20,
|
|
1363
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1364
|
+
label: 'wstETH / WBTC Market 20',
|
|
1365
|
+
shortLabel: 'wstETH/WBTC',
|
|
1366
|
+
value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1367
|
+
url: 'wsteth_wbtc_20_arb',
|
|
1368
|
+
marketAddress: '',
|
|
1369
|
+
hasSmartCollateral: false,
|
|
1370
|
+
hasSmartDebt: false,
|
|
1371
|
+
collateralAsset: 'wstETH',
|
|
1372
|
+
debtAsset: 'WBTC',
|
|
1373
|
+
});
|
|
1374
|
+
exports.WSTETH_WBTC_20_ARB = WSTETH_WBTC_20_ARB;
|
|
1375
|
+
const WEETH_WBTC_21_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1376
|
+
stableBased: false,
|
|
1377
|
+
btcBased: true,
|
|
1378
|
+
wstETHBased: false,
|
|
1379
|
+
ethBased: true,
|
|
1380
|
+
type: types_1.FluidVaultType.T1,
|
|
1381
|
+
id: 21,
|
|
1382
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1383
|
+
label: 'weETH / WBTC Market 21',
|
|
1384
|
+
shortLabel: 'weETH/WBTC',
|
|
1385
|
+
value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1386
|
+
url: 'weeth_wbtc_21_arb',
|
|
1387
|
+
marketAddress: '',
|
|
1388
|
+
hasSmartCollateral: false,
|
|
1389
|
+
hasSmartDebt: false,
|
|
1390
|
+
collateralAsset: 'weETH',
|
|
1391
|
+
debtAsset: 'WBTC',
|
|
1392
|
+
});
|
|
1393
|
+
exports.WEETH_WBTC_21_ARB = WEETH_WBTC_21_ARB;
|
|
1394
|
+
const USDC_ETH_USDC_ETH_22_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1395
|
+
stableBased: true,
|
|
1396
|
+
btcBased: false,
|
|
1397
|
+
wstETHBased: false,
|
|
1398
|
+
ethBased: true,
|
|
1399
|
+
type: types_1.FluidVaultType.T4,
|
|
1400
|
+
id: 22,
|
|
1401
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1402
|
+
label: 'weETH / WBTC Market 22',
|
|
1403
|
+
shortLabel: 'weETH/WBTC',
|
|
1404
|
+
value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1405
|
+
url: 'usdc_eth_usdc_eth_22_arb',
|
|
1406
|
+
marketAddress: '',
|
|
1407
|
+
hasSmartCollateral: false,
|
|
1408
|
+
hasSmartDebt: false,
|
|
1409
|
+
collateralAsset: 'weETH',
|
|
1410
|
+
debtAsset: 'WBTC',
|
|
1411
|
+
});
|
|
1412
|
+
exports.USDC_ETH_USDC_ETH_22_ARB = USDC_ETH_USDC_ETH_22_ARB;
|
|
1413
|
+
const ETH_USDC_USDT_23_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1414
|
+
stableBased: true,
|
|
1415
|
+
btcBased: false,
|
|
1416
|
+
wstETHBased: false,
|
|
1417
|
+
ethBased: true,
|
|
1418
|
+
type: types_1.FluidVaultType.T3,
|
|
1419
|
+
id: 23,
|
|
1420
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1421
|
+
label: 'ETH / USDC-USDT Market 23',
|
|
1422
|
+
shortLabel: 'ETH/USDC-USDT',
|
|
1423
|
+
value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1424
|
+
url: 'eth_usdc_usdt_23_arb',
|
|
1425
|
+
marketAddress: '',
|
|
1426
|
+
hasSmartCollateral: false,
|
|
1427
|
+
hasSmartDebt: false,
|
|
1428
|
+
collateralAsset: 'weETH',
|
|
1429
|
+
debtAsset: 'WBTC',
|
|
1430
|
+
});
|
|
1431
|
+
exports.ETH_USDC_USDT_23_ARB = ETH_USDC_USDT_23_ARB;
|
|
1432
|
+
const WSTETH_USDC_USDT_24_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1433
|
+
stableBased: true,
|
|
1434
|
+
btcBased: false,
|
|
1435
|
+
wstETHBased: true,
|
|
1436
|
+
ethBased: true,
|
|
1437
|
+
type: types_1.FluidVaultType.T3,
|
|
1438
|
+
id: 23,
|
|
1439
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1440
|
+
label: 'wstETH / USDC-USDT Market 23',
|
|
1441
|
+
shortLabel: 'wstETH/USDC-USDT',
|
|
1442
|
+
value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1443
|
+
url: 'wsteth_usdc_usdt_23_arb',
|
|
1444
|
+
marketAddress: '',
|
|
1445
|
+
hasSmartCollateral: false,
|
|
1446
|
+
hasSmartDebt: false,
|
|
1447
|
+
collateralAsset: 'wstETH',
|
|
1448
|
+
debtAsset: 'WBTC',
|
|
1449
|
+
});
|
|
1450
|
+
exports.WSTETH_USDC_USDT_24_ARB = WSTETH_USDC_USDT_24_ARB;
|
|
1451
|
+
const WEETH_USDC_USDT_25_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1452
|
+
stableBased: true,
|
|
1453
|
+
btcBased: false,
|
|
1454
|
+
wstETHBased: false,
|
|
1455
|
+
ethBased: true,
|
|
1456
|
+
type: types_1.FluidVaultType.T3,
|
|
1457
|
+
id: 25,
|
|
1458
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1459
|
+
label: 'weETH / USDC-USDT Market 25',
|
|
1460
|
+
shortLabel: 'weETH/USDC-USDT',
|
|
1461
|
+
value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1462
|
+
url: 'weeth_usdc_usdt_25_arb',
|
|
1463
|
+
marketAddress: '',
|
|
1464
|
+
hasSmartCollateral: false,
|
|
1465
|
+
hasSmartDebt: false,
|
|
1466
|
+
collateralAsset: 'weETH',
|
|
1467
|
+
debtAsset: 'WBTC',
|
|
1468
|
+
});
|
|
1469
|
+
exports.WEETH_USDC_USDT_25_ARB = WEETH_USDC_USDT_25_ARB;
|
|
1470
|
+
const WBTC_USDC_USDT_26_ARB = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1471
|
+
stableBased: true,
|
|
1472
|
+
btcBased: true,
|
|
1473
|
+
wstETHBased: false,
|
|
1474
|
+
ethBased: false,
|
|
1475
|
+
type: types_1.FluidVaultType.T3,
|
|
1476
|
+
id: 26,
|
|
1477
|
+
chainIds: [common_1.NetworkNumber.Arb],
|
|
1478
|
+
label: 'WBTC / USDC-USDT Market 26',
|
|
1479
|
+
shortLabel: 'WBTC/USDC-USDT',
|
|
1480
|
+
value: types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB,
|
|
1481
|
+
url: 'wbtc_usdc_usdt_26_arb',
|
|
1482
|
+
marketAddress: '',
|
|
1483
|
+
hasSmartCollateral: false,
|
|
1484
|
+
hasSmartDebt: false,
|
|
1485
|
+
collateralAsset: 'WBTC',
|
|
1486
|
+
debtAsset: 'WBTC',
|
|
1487
|
+
});
|
|
1488
|
+
exports.WBTC_USDC_USDT_26_ARB = WBTC_USDC_USDT_26_ARB;
|
|
1280
1489
|
const ETH_USDC_1_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1281
1490
|
stableBased: true,
|
|
1282
1491
|
btcBased: false,
|
|
@@ -1581,6 +1790,63 @@ const WSTETH_CBBTC_16_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
|
1581
1790
|
debtAsset: 'cbBTC',
|
|
1582
1791
|
});
|
|
1583
1792
|
exports.WSTETH_CBBTC_16_BASE = WSTETH_CBBTC_16_BASE;
|
|
1793
|
+
const ETH_SUSDS_17_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1794
|
+
stableBased: true,
|
|
1795
|
+
btcBased: false,
|
|
1796
|
+
wstETHBased: false,
|
|
1797
|
+
ethBased: true,
|
|
1798
|
+
type: types_1.FluidVaultType.T1,
|
|
1799
|
+
id: 17,
|
|
1800
|
+
chainIds: [common_1.NetworkNumber.Base],
|
|
1801
|
+
label: 'ETH / sUSDS Market 17',
|
|
1802
|
+
shortLabel: 'ETH/sUSDS',
|
|
1803
|
+
value: types_1.FluidBaseVersions.ETH_SUSDS_17_BASE,
|
|
1804
|
+
url: 'eth-susds-17-base',
|
|
1805
|
+
marketAddress: '',
|
|
1806
|
+
hasSmartCollateral: false,
|
|
1807
|
+
hasSmartDebt: false,
|
|
1808
|
+
collateralAsset: 'ETH',
|
|
1809
|
+
debtAsset: 'sSUDS',
|
|
1810
|
+
});
|
|
1811
|
+
exports.ETH_SUSDS_17_BASE = ETH_SUSDS_17_BASE;
|
|
1812
|
+
const WSTETH_SUSDS_18_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1813
|
+
stableBased: true,
|
|
1814
|
+
btcBased: false,
|
|
1815
|
+
wstETHBased: true,
|
|
1816
|
+
ethBased: true,
|
|
1817
|
+
type: types_1.FluidVaultType.T1,
|
|
1818
|
+
id: 18,
|
|
1819
|
+
chainIds: [common_1.NetworkNumber.Base],
|
|
1820
|
+
label: 'wstETH / sUSDS Market 18',
|
|
1821
|
+
shortLabel: 'wstETH/sUSDS',
|
|
1822
|
+
value: types_1.FluidBaseVersions.WSTETH_SUSDS_18_BASE,
|
|
1823
|
+
url: 'wsteth-susds-18-base',
|
|
1824
|
+
marketAddress: '',
|
|
1825
|
+
hasSmartCollateral: false,
|
|
1826
|
+
hasSmartDebt: false,
|
|
1827
|
+
collateralAsset: 'wstETH',
|
|
1828
|
+
debtAsset: 'sUSDS',
|
|
1829
|
+
});
|
|
1830
|
+
exports.WSTETH_SUSDS_18_BASE = WSTETH_SUSDS_18_BASE;
|
|
1831
|
+
const CBBTC_SUSDS_19_BASE = (networkId = common_1.NetworkNumber.Eth) => ({
|
|
1832
|
+
stableBased: true,
|
|
1833
|
+
btcBased: false,
|
|
1834
|
+
wstETHBased: false,
|
|
1835
|
+
ethBased: false,
|
|
1836
|
+
type: types_1.FluidVaultType.T1,
|
|
1837
|
+
id: 19,
|
|
1838
|
+
chainIds: [common_1.NetworkNumber.Base],
|
|
1839
|
+
label: 'cbBTC / sUSDS Market 19',
|
|
1840
|
+
shortLabel: 'cbBTC/sUSDS',
|
|
1841
|
+
value: types_1.FluidBaseVersions.CBBTC_SUSDS_19_BASE,
|
|
1842
|
+
url: 'cbbtc-susds-19-base',
|
|
1843
|
+
marketAddress: '',
|
|
1844
|
+
hasSmartCollateral: false,
|
|
1845
|
+
hasSmartDebt: false,
|
|
1846
|
+
collateralAsset: 'cbBTC',
|
|
1847
|
+
debtAsset: 'sUSDS',
|
|
1848
|
+
});
|
|
1849
|
+
exports.CBBTC_SUSDS_19_BASE = CBBTC_SUSDS_19_BASE;
|
|
1584
1850
|
const FluidMarkets = (networkId) => ({
|
|
1585
1851
|
[types_1.FluidMainnetVersion.ETH_USDC_1]: (0, exports.ETH_USDC_1)(networkId),
|
|
1586
1852
|
[types_1.FluidMainnetVersion.ETH_USDT_2]: (0, exports.ETH_USDT_2)(networkId),
|
|
@@ -1648,8 +1914,19 @@ const FluidMarkets = (networkId) => ({
|
|
|
1648
1914
|
[types_1.FluidArbitrumVersion.ETH_ARB_9_ARB]: (0, exports.ETH_ARB_9_ARB)(networkId),
|
|
1649
1915
|
[types_1.FluidArbitrumVersion.ARB_USDC_10_ARB]: (0, exports.ARB_USDC_10_ARB)(networkId),
|
|
1650
1916
|
[types_1.FluidArbitrumVersion.ARB_USDT_11_ARB]: (0, exports.ARB_USDT_11_ARB)(networkId),
|
|
1917
|
+
[types_1.FluidArbitrumVersion.WBTC_USDC_12_ARB]: (0, exports.WBTC_USDC_12_ARB)(networkId),
|
|
1918
|
+
[types_1.FluidArbitrumVersion.WBTC_USDT_13_ARB]: (0, exports.WBTC_USDT_13_ARB)(networkId),
|
|
1651
1919
|
[types_1.FluidArbitrumVersion.WSTETH_ETH_WSTETH_ETH_16_ARB]: (0, exports.WSTETH_ETH_WSTETH_ETH_16_ARB)(networkId),
|
|
1652
1920
|
[types_1.FluidArbitrumVersion.WEETH_ETH_WSTETH_17_ARB]: (0, exports.WEETH_ETH_WSTETH_17_ARB)(networkId),
|
|
1921
|
+
[types_1.FluidArbitrumVersion.WBTC_ETH_18_ARB]: (0, exports.WBTC_ETH_18_ARB)(networkId),
|
|
1922
|
+
[types_1.FluidArbitrumVersion.ETH_WBTC_19_ARB]: (0, exports.ETH_WBTC_19_ARB)(networkId),
|
|
1923
|
+
[types_1.FluidArbitrumVersion.WSTETH_WBTC_20_ARB]: (0, exports.WSTETH_WBTC_20_ARB)(networkId),
|
|
1924
|
+
[types_1.FluidArbitrumVersion.WEETH_WBTC_21_ARB]: (0, exports.WEETH_WBTC_21_ARB)(networkId),
|
|
1925
|
+
[types_1.FluidArbitrumVersion.USDC_ETH_USDC_ETH_22_ARB]: (0, exports.USDC_ETH_USDC_ETH_22_ARB)(networkId),
|
|
1926
|
+
[types_1.FluidArbitrumVersion.ETH_USDC_USDT_23_ARB]: (0, exports.ETH_USDC_USDT_23_ARB)(networkId),
|
|
1927
|
+
[types_1.FluidArbitrumVersion.WSTETH_USDC_USDT_24_ARB]: (0, exports.WSTETH_USDC_USDT_24_ARB)(networkId),
|
|
1928
|
+
[types_1.FluidArbitrumVersion.WEETH_USDC_USDT_25_ARB]: (0, exports.WEETH_USDC_USDT_25_ARB)(networkId),
|
|
1929
|
+
[types_1.FluidArbitrumVersion.WBTC_USDC_USDT_26_ARB]: (0, exports.WBTC_USDC_USDT_26_ARB)(networkId),
|
|
1653
1930
|
// base
|
|
1654
1931
|
[types_1.FluidBaseVersions.ETH_USDC_1_BASE]: (0, exports.ETH_USDC_1_BASE)(networkId),
|
|
1655
1932
|
[types_1.FluidBaseVersions.WSTETH_USDC_2_BASE]: (0, exports.WSTETH_USDC_2_BASE)(networkId),
|
|
@@ -1667,6 +1944,9 @@ const FluidMarkets = (networkId) => ({
|
|
|
1667
1944
|
[types_1.FluidBaseVersions.ETH_CBBTC_14_BASE]: (0, exports.ETH_CBBTC_14_BASE)(networkId),
|
|
1668
1945
|
[types_1.FluidBaseVersions.WEETH_CBBTC_15_BASE]: (0, exports.WEETH_CBBTC_15_BASE)(networkId),
|
|
1669
1946
|
[types_1.FluidBaseVersions.WSTETH_CBBTC_16_BASE]: (0, exports.WSTETH_CBBTC_16_BASE)(networkId),
|
|
1947
|
+
[types_1.FluidBaseVersions.ETH_SUSDS_17_BASE]: (0, exports.ETH_SUSDS_17_BASE)(networkId),
|
|
1948
|
+
[types_1.FluidBaseVersions.WSTETH_SUSDS_18_BASE]: (0, exports.WSTETH_SUSDS_18_BASE)(networkId),
|
|
1949
|
+
[types_1.FluidBaseVersions.CBBTC_SUSDS_19_BASE]: (0, exports.CBBTC_SUSDS_19_BASE)(networkId),
|
|
1670
1950
|
});
|
|
1671
1951
|
exports.FluidMarkets = FluidMarkets;
|
|
1672
1952
|
const getFluidVersionsDataForNetwork = (network) => (Object.values((0, exports.FluidMarkets)(network)).filter(({ chainIds, marketAddress, type }) => !!marketAddress && chainIds.includes(network) && type === types_1.FluidVaultType.T1));
|
package/cjs/types/fluid.d.ts
CHANGED
|
@@ -90,8 +90,19 @@ export declare enum FluidArbitrumVersion {
|
|
|
90
90
|
ETH_ARB_9_ARB = "ETH_ARB_9_ARB",
|
|
91
91
|
ARB_USDC_10_ARB = "ARB_USDC_10_ARB",
|
|
92
92
|
ARB_USDT_11_ARB = "ARB_USDT_11_ARB",
|
|
93
|
+
WBTC_USDC_12_ARB = "WBTC_USDC_12_ARB",
|
|
94
|
+
WBTC_USDT_13_ARB = "WBTC_USDT_13_ARB",
|
|
93
95
|
WSTETH_ETH_WSTETH_ETH_16_ARB = "WSTETH_ETH_WSTETH_ETH_16_ARB",
|
|
94
|
-
WEETH_ETH_WSTETH_17_ARB = "WEETH_ETH_WSTETH_17_ARB"
|
|
96
|
+
WEETH_ETH_WSTETH_17_ARB = "WEETH_ETH_WSTETH_17_ARB",
|
|
97
|
+
WBTC_ETH_18_ARB = "WBTC_ETH_18_ARB",
|
|
98
|
+
ETH_WBTC_19_ARB = "ETH_WBTC_19_ARB",
|
|
99
|
+
WSTETH_WBTC_20_ARB = "WSTETH_WBTC_20_ARB",
|
|
100
|
+
WEETH_WBTC_21_ARB = "WEETH_WBTC_21_ARB",
|
|
101
|
+
USDC_ETH_USDC_ETH_22_ARB = "USDC_ETH_USDC_ETH_22_ARB",
|
|
102
|
+
ETH_USDC_USDT_23_ARB = "ETH_USDC_USDT_23_ARB",
|
|
103
|
+
WSTETH_USDC_USDT_24_ARB = "WSTETH_USDC_USDT_24_ARB",
|
|
104
|
+
WEETH_USDC_USDT_25_ARB = "WEETH_USDC_USDT_25_ARB",
|
|
105
|
+
WBTC_USDC_USDT_26_ARB = "WBTC_USDC_USDT_26_ARB"
|
|
95
106
|
}
|
|
96
107
|
export declare enum FluidBaseVersions {
|
|
97
108
|
ETH_USDC_1_BASE = "ETH_USDC_1_BASE",
|
|
@@ -109,7 +120,10 @@ export declare enum FluidBaseVersions {
|
|
|
109
120
|
CBBTC_ETH_13_BASE = "CBBTC_ETH_13_BASE",
|
|
110
121
|
ETH_CBBTC_14_BASE = "ETH_CBBTC_14_BASE",
|
|
111
122
|
WEETH_CBBTC_15_BASE = "WEETH_CBBTC_15_BASE",
|
|
112
|
-
WSTETH_CBBTC_16_BASE = "WSTETH_CBBTC_16_BASE"
|
|
123
|
+
WSTETH_CBBTC_16_BASE = "WSTETH_CBBTC_16_BASE",
|
|
124
|
+
ETH_SUSDS_17_BASE = "ETH_SUSDS_17_BASE",
|
|
125
|
+
WSTETH_SUSDS_18_BASE = "WSTETH_SUSDS_18_BASE",
|
|
126
|
+
CBBTC_SUSDS_19_BASE = "CBBTC_SUSDS_19_BASE"
|
|
113
127
|
}
|
|
114
128
|
export type FluidVersions = FluidArbitrumVersion | FluidBaseVersions | FluidMainnetVersion;
|
|
115
129
|
export declare enum FluidMainnetDepositToken {
|
|
@@ -194,6 +208,7 @@ export interface InnerFluidMarketData {
|
|
|
194
208
|
minimumBorrowing: string;
|
|
195
209
|
supplyRate: string;
|
|
196
210
|
borrowRate: string;
|
|
211
|
+
liquidationMaxLimit: string;
|
|
197
212
|
}
|
|
198
213
|
export interface FluidMarketData {
|
|
199
214
|
assetsData: FluidAssetsData;
|
package/cjs/types/fluid.js
CHANGED
|
@@ -77,8 +77,19 @@ var FluidArbitrumVersion;
|
|
|
77
77
|
FluidArbitrumVersion["ETH_ARB_9_ARB"] = "ETH_ARB_9_ARB";
|
|
78
78
|
FluidArbitrumVersion["ARB_USDC_10_ARB"] = "ARB_USDC_10_ARB";
|
|
79
79
|
FluidArbitrumVersion["ARB_USDT_11_ARB"] = "ARB_USDT_11_ARB";
|
|
80
|
+
FluidArbitrumVersion["WBTC_USDC_12_ARB"] = "WBTC_USDC_12_ARB";
|
|
81
|
+
FluidArbitrumVersion["WBTC_USDT_13_ARB"] = "WBTC_USDT_13_ARB";
|
|
80
82
|
FluidArbitrumVersion["WSTETH_ETH_WSTETH_ETH_16_ARB"] = "WSTETH_ETH_WSTETH_ETH_16_ARB";
|
|
81
83
|
FluidArbitrumVersion["WEETH_ETH_WSTETH_17_ARB"] = "WEETH_ETH_WSTETH_17_ARB";
|
|
84
|
+
FluidArbitrumVersion["WBTC_ETH_18_ARB"] = "WBTC_ETH_18_ARB";
|
|
85
|
+
FluidArbitrumVersion["ETH_WBTC_19_ARB"] = "ETH_WBTC_19_ARB";
|
|
86
|
+
FluidArbitrumVersion["WSTETH_WBTC_20_ARB"] = "WSTETH_WBTC_20_ARB";
|
|
87
|
+
FluidArbitrumVersion["WEETH_WBTC_21_ARB"] = "WEETH_WBTC_21_ARB";
|
|
88
|
+
FluidArbitrumVersion["USDC_ETH_USDC_ETH_22_ARB"] = "USDC_ETH_USDC_ETH_22_ARB";
|
|
89
|
+
FluidArbitrumVersion["ETH_USDC_USDT_23_ARB"] = "ETH_USDC_USDT_23_ARB";
|
|
90
|
+
FluidArbitrumVersion["WSTETH_USDC_USDT_24_ARB"] = "WSTETH_USDC_USDT_24_ARB";
|
|
91
|
+
FluidArbitrumVersion["WEETH_USDC_USDT_25_ARB"] = "WEETH_USDC_USDT_25_ARB";
|
|
92
|
+
FluidArbitrumVersion["WBTC_USDC_USDT_26_ARB"] = "WBTC_USDC_USDT_26_ARB";
|
|
82
93
|
})(FluidArbitrumVersion || (exports.FluidArbitrumVersion = FluidArbitrumVersion = {}));
|
|
83
94
|
var FluidBaseVersions;
|
|
84
95
|
(function (FluidBaseVersions) {
|
|
@@ -98,6 +109,9 @@ var FluidBaseVersions;
|
|
|
98
109
|
FluidBaseVersions["ETH_CBBTC_14_BASE"] = "ETH_CBBTC_14_BASE";
|
|
99
110
|
FluidBaseVersions["WEETH_CBBTC_15_BASE"] = "WEETH_CBBTC_15_BASE";
|
|
100
111
|
FluidBaseVersions["WSTETH_CBBTC_16_BASE"] = "WSTETH_CBBTC_16_BASE";
|
|
112
|
+
FluidBaseVersions["ETH_SUSDS_17_BASE"] = "ETH_SUSDS_17_BASE";
|
|
113
|
+
FluidBaseVersions["WSTETH_SUSDS_18_BASE"] = "WSTETH_SUSDS_18_BASE";
|
|
114
|
+
FluidBaseVersions["CBBTC_SUSDS_19_BASE"] = "CBBTC_SUSDS_19_BASE";
|
|
101
115
|
})(FluidBaseVersions || (exports.FluidBaseVersions = FluidBaseVersions = {}));
|
|
102
116
|
var FluidMainnetDepositToken;
|
|
103
117
|
(function (FluidMainnetDepositToken) {
|
package/esm/fluid/index.js
CHANGED
|
@@ -15,7 +15,7 @@ import { DFSFeedRegistryContract, FeedRegistryContract, FluidViewContract } from
|
|
|
15
15
|
import { getEthAmountForDecimals, isMainnetNetwork } from '../services/utils';
|
|
16
16
|
import { getFluidAggregatedData } from '../helpers/fluidHelpers';
|
|
17
17
|
import { chunkAndMulticall } from '../multicall';
|
|
18
|
-
import { getFluidMarketInfoById, getFluidVersionsDataForNetwork } from '../markets
|
|
18
|
+
import { getFluidMarketInfoById, getFluidVersionsDataForNetwork } from '../markets';
|
|
19
19
|
import { USD_QUOTE } from '../constants';
|
|
20
20
|
import { getChainlinkAssetAddress, getWstETHPrice } from '../services/priceService';
|
|
21
21
|
export const EMPTY_USED_ASSET = {
|
|
@@ -94,6 +94,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
|
|
|
94
94
|
const totalSupplyVault = getEthAmountForDecimals(data.totalSupplyVault, collAsset.decimals);
|
|
95
95
|
const totalBorrowVault = getEthAmountForDecimals(data.totalBorrowVault, debtAsset.decimals);
|
|
96
96
|
const liqRatio = new Dec(data.liquidationThreshold).div(100).toString();
|
|
97
|
+
const liquidationMaxLimit = new Dec(data.liquidationMaxLimit).div(100).toString();
|
|
97
98
|
const liqFactor = new Dec(data.liquidationThreshold).div(10000).toString();
|
|
98
99
|
const marketData = {
|
|
99
100
|
vaultId: +data.vaultId,
|
|
@@ -114,7 +115,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
|
|
|
114
115
|
totalSupplyVault,
|
|
115
116
|
totalBorrowVault,
|
|
116
117
|
totalSupplyVaultUsd: new Dec(totalSupplyVault).mul(collAssetData.price).toString(),
|
|
117
|
-
totalBorrowVaultUsd: new Dec(
|
|
118
|
+
totalBorrowVaultUsd: new Dec(totalBorrowVault).mul(debtAssetData.price).toString(),
|
|
118
119
|
withdrawalLimit: getEthAmountForDecimals(data.withdrawalLimit, collAsset.decimals),
|
|
119
120
|
withdrawableUntilLimit: getEthAmountForDecimals(data.withdrawableUntilLimit, collAsset.decimals),
|
|
120
121
|
withdrawable: getEthAmountForDecimals(data.withdrawable, collAsset.decimals),
|
|
@@ -125,6 +126,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
|
|
|
125
126
|
maxBorrowLimit: getEthAmountForDecimals(data.maxBorrowLimit, debtAsset.decimals),
|
|
126
127
|
baseBorrowLimit: getEthAmountForDecimals(data.baseBorrowLimit, debtAsset.decimals),
|
|
127
128
|
minimumBorrowing: getEthAmountForDecimals(data.minimumBorrowing, debtAsset.decimals),
|
|
129
|
+
liquidationMaxLimit,
|
|
128
130
|
borrowRate,
|
|
129
131
|
supplyRate,
|
|
130
132
|
};
|
|
@@ -65,8 +65,19 @@ export declare const WEETH_USDT_8_ARB: (networkId?: NetworkNumber) => FluidMarke
|
|
|
65
65
|
export declare const ETH_ARB_9_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
66
66
|
export declare const ARB_USDC_10_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
67
67
|
export declare const ARB_USDT_11_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
68
|
+
export declare const WBTC_USDC_12_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
69
|
+
export declare const WBTC_USDT_13_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
68
70
|
export declare const WSTETH_ETH_WSTETH_ETH_16_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
69
71
|
export declare const WEETH_ETH_WSTETH_17_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
72
|
+
export declare const WBTC_ETH_18_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
73
|
+
export declare const ETH_WBTC_19_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
74
|
+
export declare const WSTETH_WBTC_20_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
75
|
+
export declare const WEETH_WBTC_21_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
76
|
+
export declare const USDC_ETH_USDC_ETH_22_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
77
|
+
export declare const ETH_USDC_USDT_23_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
78
|
+
export declare const WSTETH_USDC_USDT_24_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
79
|
+
export declare const WEETH_USDC_USDT_25_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
80
|
+
export declare const WBTC_USDC_USDT_26_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
70
81
|
export declare const ETH_USDC_1_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
71
82
|
export declare const WSTETH_USDC_2_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
72
83
|
export declare const WSTETH_ETH_3_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
@@ -83,6 +94,9 @@ export declare const CBBTC_ETH_13_BASE: (networkId?: NetworkNumber) => FluidMark
|
|
|
83
94
|
export declare const ETH_CBBTC_14_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
84
95
|
export declare const WEETH_CBBTC_15_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
85
96
|
export declare const WSTETH_CBBTC_16_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
97
|
+
export declare const ETH_SUSDS_17_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
98
|
+
export declare const WSTETH_SUSDS_18_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
99
|
+
export declare const CBBTC_SUSDS_19_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
|
|
86
100
|
export declare const FluidMarkets: (networkId: NetworkNumber) => {
|
|
87
101
|
ETH_USDC_1: FluidMarketInfo;
|
|
88
102
|
ETH_USDT_2: FluidMarketInfo;
|
|
@@ -149,8 +163,19 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
|
|
|
149
163
|
ETH_ARB_9_ARB: FluidMarketInfo;
|
|
150
164
|
ARB_USDC_10_ARB: FluidMarketInfo;
|
|
151
165
|
ARB_USDT_11_ARB: FluidMarketInfo;
|
|
166
|
+
WBTC_USDC_12_ARB: FluidMarketInfo;
|
|
167
|
+
WBTC_USDT_13_ARB: FluidMarketInfo;
|
|
152
168
|
WSTETH_ETH_WSTETH_ETH_16_ARB: FluidMarketInfo;
|
|
153
169
|
WEETH_ETH_WSTETH_17_ARB: FluidMarketInfo;
|
|
170
|
+
WBTC_ETH_18_ARB: FluidMarketInfo;
|
|
171
|
+
ETH_WBTC_19_ARB: FluidMarketInfo;
|
|
172
|
+
WSTETH_WBTC_20_ARB: FluidMarketInfo;
|
|
173
|
+
WEETH_WBTC_21_ARB: FluidMarketInfo;
|
|
174
|
+
USDC_ETH_USDC_ETH_22_ARB: FluidMarketInfo;
|
|
175
|
+
ETH_USDC_USDT_23_ARB: FluidMarketInfo;
|
|
176
|
+
WSTETH_USDC_USDT_24_ARB: FluidMarketInfo;
|
|
177
|
+
WEETH_USDC_USDT_25_ARB: FluidMarketInfo;
|
|
178
|
+
WBTC_USDC_USDT_26_ARB: FluidMarketInfo;
|
|
154
179
|
ETH_USDC_1_BASE: FluidMarketInfo;
|
|
155
180
|
WSTETH_USDC_2_BASE: FluidMarketInfo;
|
|
156
181
|
WSTETH_ETH_3_BASE: FluidMarketInfo;
|
|
@@ -167,6 +192,9 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
|
|
|
167
192
|
ETH_CBBTC_14_BASE: FluidMarketInfo;
|
|
168
193
|
WEETH_CBBTC_15_BASE: FluidMarketInfo;
|
|
169
194
|
WSTETH_CBBTC_16_BASE: FluidMarketInfo;
|
|
195
|
+
ETH_SUSDS_17_BASE: FluidMarketInfo;
|
|
196
|
+
WSTETH_SUSDS_18_BASE: FluidMarketInfo;
|
|
197
|
+
CBBTC_SUSDS_19_BASE: FluidMarketInfo;
|
|
170
198
|
};
|
|
171
199
|
export declare const getFluidVersionsDataForNetwork: (network: NetworkNumber) => FluidMarketInfo[];
|
|
172
200
|
export declare const getFluidMarketInfoById: (vaultId: number, network?: NetworkNumber) => FluidMarketInfo | undefined;
|