@defisaver/positions-sdk 2.1.9-dev-spark-2 → 2.1.9-fluid-plasma
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/.mocharc.json +4 -4
- package/.nvmrc +1 -1
- package/CLAUDE.md +32 -0
- package/README.md +64 -64
- package/cjs/config/contracts.d.ts +12 -0
- package/cjs/config/contracts.js +7 -3
- package/cjs/fluid/index.js +32 -11
- package/cjs/helpers/morphoBlueHelpers/index.js +66 -66
- package/cjs/helpers/sparkHelpers/index.d.ts +4 -4
- package/cjs/helpers/sparkHelpers/index.js +12 -12
- package/cjs/markets/fluid/index.d.ts +46 -0
- package/cjs/markets/fluid/index.js +436 -1
- package/cjs/portfolio/index.js +1 -1
- package/cjs/services/priceService.js +1 -1
- package/cjs/spark/index.d.ts +1 -3
- package/cjs/spark/index.js +24 -24
- package/cjs/types/fluid.d.ts +30 -1
- package/cjs/types/fluid.js +31 -1
- package/cjs/types/spark.d.ts +4 -3
- package/esm/config/contracts.d.ts +12 -0
- package/esm/config/contracts.js +7 -3
- package/esm/fluid/index.js +32 -11
- package/esm/helpers/morphoBlueHelpers/index.js +66 -66
- package/esm/helpers/sparkHelpers/index.d.ts +4 -4
- package/esm/helpers/sparkHelpers/index.js +13 -13
- package/esm/markets/fluid/index.d.ts +46 -0
- package/esm/markets/fluid/index.js +415 -1
- package/esm/portfolio/index.js +1 -1
- package/esm/services/priceService.js +2 -2
- package/esm/spark/index.d.ts +1 -3
- package/esm/spark/index.js +25 -25
- package/esm/types/fluid.d.ts +30 -1
- package/esm/types/fluid.js +30 -0
- package/esm/types/spark.d.ts +4 -3
- package/package.json +47 -47
- package/src/aaveV2/index.ts +240 -240
- package/src/aaveV3/index.ts +614 -614
- package/src/aaveV3/merit.ts +97 -97
- package/src/aaveV3/merkl.ts +74 -74
- package/src/claiming/aaveV3.ts +154 -154
- package/src/claiming/compV3.ts +22 -22
- package/src/claiming/index.ts +12 -12
- package/src/claiming/king.ts +66 -66
- package/src/claiming/morphoBlue.ts +118 -118
- package/src/claiming/spark.ts +225 -225
- package/src/compoundV2/index.ts +244 -244
- package/src/compoundV3/index.ts +274 -274
- package/src/config/contracts.ts +1255 -1251
- package/src/constants/index.ts +10 -10
- package/src/contracts.ts +120 -120
- package/src/curveUsd/index.ts +254 -254
- package/src/eulerV2/index.ts +324 -324
- package/src/exchange/index.ts +25 -25
- package/src/fluid/index.ts +1693 -1668
- package/src/helpers/aaveHelpers/index.ts +187 -187
- package/src/helpers/compoundHelpers/index.ts +283 -283
- package/src/helpers/curveUsdHelpers/index.ts +40 -40
- package/src/helpers/eulerHelpers/index.ts +222 -222
- package/src/helpers/fluidHelpers/index.ts +326 -326
- package/src/helpers/index.ts +10 -10
- package/src/helpers/liquityV2Helpers/index.ts +82 -82
- package/src/helpers/llamaLendHelpers/index.ts +53 -53
- package/src/helpers/makerHelpers/index.ts +52 -52
- package/src/helpers/morphoBlueHelpers/index.ts +396 -396
- package/src/helpers/sparkHelpers/index.ts +155 -158
- package/src/index.ts +47 -47
- package/src/liquity/index.ts +159 -159
- package/src/liquityV2/index.ts +657 -657
- package/src/llamaLend/index.ts +305 -305
- package/src/maker/index.ts +223 -223
- package/src/markets/aave/index.ts +116 -116
- package/src/markets/aave/marketAssets.ts +54 -54
- package/src/markets/compound/index.ts +238 -238
- package/src/markets/compound/marketsAssets.ts +97 -97
- package/src/markets/curveUsd/index.ts +69 -69
- package/src/markets/euler/index.ts +26 -26
- package/src/markets/fluid/index.ts +2900 -2460
- package/src/markets/index.ts +25 -25
- package/src/markets/liquityV2/index.ts +102 -102
- package/src/markets/llamaLend/contractAddresses.ts +141 -141
- package/src/markets/llamaLend/index.ts +235 -235
- package/src/markets/morphoBlue/index.ts +895 -895
- package/src/markets/spark/index.ts +29 -29
- package/src/markets/spark/marketAssets.ts +12 -12
- package/src/moneymarket/moneymarketCommonService.ts +80 -80
- package/src/morphoBlue/index.ts +274 -274
- package/src/portfolio/index.ts +570 -570
- package/src/services/priceService.ts +159 -159
- package/src/services/utils.ts +115 -115
- package/src/services/viem.ts +34 -34
- package/src/setup.ts +8 -8
- package/src/spark/index.ts +445 -456
- package/src/staking/eligibility.ts +53 -53
- package/src/staking/index.ts +1 -1
- package/src/staking/staking.ts +170 -170
- package/src/types/aave.ts +189 -189
- package/src/types/claiming.ts +109 -109
- package/src/types/common.ts +107 -107
- package/src/types/compound.ts +136 -136
- package/src/types/curveUsd.ts +123 -123
- package/src/types/euler.ts +175 -175
- package/src/types/fluid.ts +483 -452
- package/src/types/index.ts +13 -13
- package/src/types/liquity.ts +30 -30
- package/src/types/liquityV2.ts +126 -126
- package/src/types/llamaLend.ts +159 -159
- package/src/types/maker.ts +63 -63
- package/src/types/merit.ts +1 -1
- package/src/types/merkl.ts +70 -70
- package/src/types/morphoBlue.ts +194 -194
- package/src/types/portfolio.ts +60 -60
- package/src/types/spark.ts +135 -133
- package/src/umbrella/index.ts +69 -69
- package/src/umbrella/umbrellaUtils.ts +29 -29
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { NetworkNumber } from '../../types/common';
|
|
2
|
-
import { FluidArbitrumDepositToken, FluidArbitrumVersion, FluidBaseDepositToken, FluidBaseVersions, FluidMainnetDepositToken, FluidMainnetVersion, FluidVaultType, } from '../../types';
|
|
2
|
+
import { FluidArbitrumDepositToken, FluidArbitrumVersion, FluidBaseDepositToken, FluidBaseVersions, FluidMainnetDepositToken, FluidMainnetVersion, FluidPlasmaDepositToken, FluidPlasmaVersions, FluidVaultType, } from '../../types';
|
|
3
3
|
import { compareAddresses } from '../../services/utils';
|
|
4
4
|
export const FLUID_ETH_USDC_1 = (networkId = NetworkNumber.Eth) => ({
|
|
5
5
|
btcBased: false,
|
|
@@ -2159,6 +2159,391 @@ export const FLUID_LBTC_SUSDS_22_BASE = (networkId = NetworkNumber.Eth) => ({
|
|
|
2159
2159
|
collateralAsset0: 'LBTC',
|
|
2160
2160
|
debtAsset0: 'sUSDS',
|
|
2161
2161
|
});
|
|
2162
|
+
export const FLUID_ETH_USDT_1_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2163
|
+
stableBased: true,
|
|
2164
|
+
btcBased: false,
|
|
2165
|
+
wstETHBased: false,
|
|
2166
|
+
ethBased: true,
|
|
2167
|
+
type: FluidVaultType.T1,
|
|
2168
|
+
id: 1,
|
|
2169
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2170
|
+
label: '#1 (ETH / USDT)',
|
|
2171
|
+
shortLabel: 'ETH/USDT',
|
|
2172
|
+
value: FluidPlasmaVersions.FLUID_ETH_USDT_1_PLASMA,
|
|
2173
|
+
url: 'eth-usdt-1-plasma',
|
|
2174
|
+
marketAddress: '0xeAbBfca72F8a8bf14C4ac59e69ECB2eB69F0811C',
|
|
2175
|
+
hasSmartCollateral: false,
|
|
2176
|
+
hasSmartDebt: false,
|
|
2177
|
+
collateralAsset0: 'ETH',
|
|
2178
|
+
debtAsset0: 'USDT',
|
|
2179
|
+
});
|
|
2180
|
+
export const FLUID_ETH_USDE_2_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2181
|
+
stableBased: true,
|
|
2182
|
+
btcBased: false,
|
|
2183
|
+
wstETHBased: false,
|
|
2184
|
+
ethBased: true,
|
|
2185
|
+
type: FluidVaultType.T1,
|
|
2186
|
+
id: 2,
|
|
2187
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2188
|
+
label: '#2 (ETH / USDe)',
|
|
2189
|
+
shortLabel: 'ETH/USDe',
|
|
2190
|
+
value: FluidPlasmaVersions.FLUID_ETH_USDE_2_PLASMA,
|
|
2191
|
+
url: 'eth-usde-2-plasma',
|
|
2192
|
+
marketAddress: '0xbEC491FeF7B4f666b270F9D5E5C3f443cBf20991',
|
|
2193
|
+
hasSmartCollateral: false,
|
|
2194
|
+
hasSmartDebt: false,
|
|
2195
|
+
collateralAsset0: 'ETH',
|
|
2196
|
+
debtAsset0: 'USDe',
|
|
2197
|
+
});
|
|
2198
|
+
export const FLUID_WEETH_ETH_3_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2199
|
+
stableBased: false,
|
|
2200
|
+
btcBased: false,
|
|
2201
|
+
wstETHBased: false,
|
|
2202
|
+
ethBased: true,
|
|
2203
|
+
type: FluidVaultType.T1,
|
|
2204
|
+
id: 3,
|
|
2205
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2206
|
+
label: '#3 (weETH / ETH)',
|
|
2207
|
+
shortLabel: 'weETH/ETH',
|
|
2208
|
+
value: FluidPlasmaVersions.FLUID_WEETH_ETH_3_PLASMA,
|
|
2209
|
+
url: 'weeth-eth-3-plasma',
|
|
2210
|
+
marketAddress: '0xA0F83Fc5885cEBc0420ce7C7b139Adc80c4F4D91',
|
|
2211
|
+
hasSmartCollateral: false,
|
|
2212
|
+
hasSmartDebt: false,
|
|
2213
|
+
collateralAsset0: 'weETH',
|
|
2214
|
+
debtAsset0: 'ETH',
|
|
2215
|
+
});
|
|
2216
|
+
export const FLUID_SUSDE_USDT_4_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2217
|
+
stableBased: true,
|
|
2218
|
+
btcBased: false,
|
|
2219
|
+
wstETHBased: false,
|
|
2220
|
+
ethBased: false,
|
|
2221
|
+
type: FluidVaultType.T1,
|
|
2222
|
+
id: 4,
|
|
2223
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2224
|
+
label: '#4 (sUSDe / USDT)',
|
|
2225
|
+
shortLabel: 'sUSDe/USDT',
|
|
2226
|
+
value: FluidPlasmaVersions.FLUID_SUSDE_USDT_4_PLASMA,
|
|
2227
|
+
url: 'susde-usdt-4-plasma',
|
|
2228
|
+
marketAddress: '0x51197586F6A9e2571868b6ffaef308f3bdfEd3aE',
|
|
2229
|
+
hasSmartCollateral: false,
|
|
2230
|
+
hasSmartDebt: false,
|
|
2231
|
+
collateralAsset0: 'sUSDe',
|
|
2232
|
+
debtAsset0: 'USDT',
|
|
2233
|
+
});
|
|
2234
|
+
export const FLUID_WEETH_USDT_5_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2235
|
+
stableBased: true,
|
|
2236
|
+
btcBased: false,
|
|
2237
|
+
wstETHBased: false,
|
|
2238
|
+
ethBased: true,
|
|
2239
|
+
type: FluidVaultType.T1,
|
|
2240
|
+
id: 5,
|
|
2241
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2242
|
+
label: '#5 (weETH / USDT)',
|
|
2243
|
+
shortLabel: 'weETH/USDT',
|
|
2244
|
+
value: FluidPlasmaVersions.FLUID_WEETH_USDT_5_PLASMA,
|
|
2245
|
+
url: 'weeth-usdt-5-plasma',
|
|
2246
|
+
marketAddress: '0x1c2bB46f36561bc4F05A94BD50916496aa501078',
|
|
2247
|
+
hasSmartCollateral: false,
|
|
2248
|
+
hasSmartDebt: false,
|
|
2249
|
+
collateralAsset0: 'weETH',
|
|
2250
|
+
debtAsset0: 'USDT',
|
|
2251
|
+
});
|
|
2252
|
+
export const FLUID_WEETH_USDE_6_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2253
|
+
stableBased: true,
|
|
2254
|
+
btcBased: false,
|
|
2255
|
+
wstETHBased: false,
|
|
2256
|
+
ethBased: true,
|
|
2257
|
+
type: FluidVaultType.T1,
|
|
2258
|
+
id: 6,
|
|
2259
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2260
|
+
label: '#6 (weETH / USDe)',
|
|
2261
|
+
shortLabel: 'weETH/USDe',
|
|
2262
|
+
value: FluidPlasmaVersions.FLUID_WEETH_USDE_6_PLASMA,
|
|
2263
|
+
url: 'weeth-usde-6-plasma',
|
|
2264
|
+
marketAddress: '0x40D9b8417E6E1DcD358f04E3328bCEd061018A82',
|
|
2265
|
+
hasSmartCollateral: false,
|
|
2266
|
+
hasSmartDebt: false,
|
|
2267
|
+
collateralAsset0: 'weETH',
|
|
2268
|
+
debtAsset0: 'USDe',
|
|
2269
|
+
});
|
|
2270
|
+
export const FLUID_XAUT_USDT_7_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2271
|
+
stableBased: true,
|
|
2272
|
+
btcBased: false,
|
|
2273
|
+
wstETHBased: false,
|
|
2274
|
+
ethBased: false,
|
|
2275
|
+
type: FluidVaultType.T1,
|
|
2276
|
+
id: 7,
|
|
2277
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2278
|
+
label: '#7 (XAUt / USDT)',
|
|
2279
|
+
shortLabel: 'XAUt/USDT',
|
|
2280
|
+
value: FluidPlasmaVersions.FLUID_XAUT_USDT_7_PLASMA,
|
|
2281
|
+
url: 'xaut-usdt-7-plasma',
|
|
2282
|
+
marketAddress: '0x4045720a33193b4Fe66c94DFbc8D37B0b4D9B469',
|
|
2283
|
+
hasSmartCollateral: false,
|
|
2284
|
+
hasSmartDebt: false,
|
|
2285
|
+
collateralAsset0: 'XAUt',
|
|
2286
|
+
debtAsset0: 'USDT',
|
|
2287
|
+
});
|
|
2288
|
+
export const FLUID_XAUT_USDE_8_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2289
|
+
stableBased: true,
|
|
2290
|
+
btcBased: false,
|
|
2291
|
+
wstETHBased: false,
|
|
2292
|
+
ethBased: false,
|
|
2293
|
+
type: FluidVaultType.T1,
|
|
2294
|
+
id: 8,
|
|
2295
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2296
|
+
label: '#8 (XAUt / USDe)',
|
|
2297
|
+
shortLabel: 'XAUt/USDe',
|
|
2298
|
+
value: FluidPlasmaVersions.FLUID_XAUT_USDE_8_PLASMA,
|
|
2299
|
+
url: 'xaut-usde-8-plasma',
|
|
2300
|
+
marketAddress: '0xBFADEA65591235f38809076e14803Ac84AcF3F97',
|
|
2301
|
+
hasSmartCollateral: false,
|
|
2302
|
+
hasSmartDebt: false,
|
|
2303
|
+
collateralAsset0: 'XAUt',
|
|
2304
|
+
debtAsset0: 'USDe',
|
|
2305
|
+
});
|
|
2306
|
+
export const FLUID_USDE_USDT_9_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2307
|
+
stableBased: true,
|
|
2308
|
+
btcBased: false,
|
|
2309
|
+
wstETHBased: false,
|
|
2310
|
+
ethBased: false,
|
|
2311
|
+
type: FluidVaultType.T1,
|
|
2312
|
+
id: 9,
|
|
2313
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2314
|
+
label: '#9 (USDe / USDT)',
|
|
2315
|
+
shortLabel: 'USDe/USDT',
|
|
2316
|
+
value: FluidPlasmaVersions.FLUID_USDE_USDT_9_PLASMA,
|
|
2317
|
+
url: 'usde-usdt-9-plasma',
|
|
2318
|
+
marketAddress: '0xf55B8e9F0c51Ace009f4b41d03321675d4C643b3',
|
|
2319
|
+
hasSmartCollateral: false,
|
|
2320
|
+
hasSmartDebt: false,
|
|
2321
|
+
collateralAsset0: 'USDe',
|
|
2322
|
+
debtAsset0: 'USDT',
|
|
2323
|
+
});
|
|
2324
|
+
export const FLUID_USDAI_USDT_10_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2325
|
+
stableBased: true,
|
|
2326
|
+
btcBased: false,
|
|
2327
|
+
wstETHBased: false,
|
|
2328
|
+
ethBased: false,
|
|
2329
|
+
type: FluidVaultType.T1,
|
|
2330
|
+
id: 10,
|
|
2331
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2332
|
+
label: '#10 (USDai / USDT)',
|
|
2333
|
+
shortLabel: 'USDai/USDT',
|
|
2334
|
+
value: FluidPlasmaVersions.FLUID_USDE_USDT_10_PLASMA,
|
|
2335
|
+
url: 'usdai-usdt-10-plasma',
|
|
2336
|
+
marketAddress: '0xdF16AdaF80584b2723F3BA1Eb7a601338Ba18c4e',
|
|
2337
|
+
hasSmartCollateral: false,
|
|
2338
|
+
hasSmartDebt: false,
|
|
2339
|
+
collateralAsset0: 'USDai',
|
|
2340
|
+
debtAsset0: 'USDT',
|
|
2341
|
+
});
|
|
2342
|
+
export const FLUID_WEETH_ETH_ETH_11_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2343
|
+
stableBased: false,
|
|
2344
|
+
btcBased: false,
|
|
2345
|
+
wstETHBased: false,
|
|
2346
|
+
ethBased: true,
|
|
2347
|
+
type: FluidVaultType.T2,
|
|
2348
|
+
id: 11,
|
|
2349
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2350
|
+
label: '#11 (weETH-ETH / ETH)',
|
|
2351
|
+
shortLabel: 'weETH-ETH/ETH',
|
|
2352
|
+
value: FluidPlasmaVersions.FLUID_WEETH_ETH_ETH_11_PLASMA,
|
|
2353
|
+
url: 'weeth-eth-eth-11-plasma',
|
|
2354
|
+
marketAddress: '0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3',
|
|
2355
|
+
hasSmartCollateral: true,
|
|
2356
|
+
hasSmartDebt: false,
|
|
2357
|
+
collateralAsset0: 'weETH',
|
|
2358
|
+
collateralAsset1: 'ETH',
|
|
2359
|
+
debtAsset0: 'ETH',
|
|
2360
|
+
});
|
|
2361
|
+
export const FLUID_SUSDE_USDT_USDT_12_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2362
|
+
stableBased: true,
|
|
2363
|
+
btcBased: false,
|
|
2364
|
+
wstETHBased: false,
|
|
2365
|
+
ethBased: false,
|
|
2366
|
+
type: FluidVaultType.T2,
|
|
2367
|
+
id: 12,
|
|
2368
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2369
|
+
label: '#12 (sUSDe-USDT / USDT)',
|
|
2370
|
+
shortLabel: 'sUSDe-USDT/USDT',
|
|
2371
|
+
value: FluidPlasmaVersions.FLUID_SUSDE_USDT_USDT_12_PLASMA,
|
|
2372
|
+
url: 'susde-usdt-usdt-12-plasma',
|
|
2373
|
+
marketAddress: '0xE16A6f5359ABB1f61cE71e25dD0932e3E00B00eB',
|
|
2374
|
+
hasSmartCollateral: true,
|
|
2375
|
+
hasSmartDebt: false,
|
|
2376
|
+
collateralAsset0: 'sUSDe',
|
|
2377
|
+
collateralAsset1: 'USDT',
|
|
2378
|
+
debtAsset0: 'USDT',
|
|
2379
|
+
});
|
|
2380
|
+
export const FLUID_USDE_USDT_USDT_13_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2381
|
+
stableBased: true,
|
|
2382
|
+
btcBased: false,
|
|
2383
|
+
wstETHBased: false,
|
|
2384
|
+
ethBased: false,
|
|
2385
|
+
type: FluidVaultType.T2,
|
|
2386
|
+
id: 13,
|
|
2387
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2388
|
+
label: '#13 (USDe-USDT / USDT)',
|
|
2389
|
+
shortLabel: 'USDe-USDT/USDT',
|
|
2390
|
+
value: FluidPlasmaVersions.FLUID_USDE_USDT_USDT_13_PLASMA,
|
|
2391
|
+
url: 'usde-usdt-usdt-13-plasma',
|
|
2392
|
+
marketAddress: '0x82B27fA821419F5689381b565a8B0786aA2548De',
|
|
2393
|
+
hasSmartCollateral: true,
|
|
2394
|
+
hasSmartDebt: false,
|
|
2395
|
+
collateralAsset0: 'USDe',
|
|
2396
|
+
collateralAsset1: 'USDT',
|
|
2397
|
+
debtAsset0: 'USDT',
|
|
2398
|
+
});
|
|
2399
|
+
export const FLUID_USDAI_USDT_USDT_14_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2400
|
+
stableBased: true,
|
|
2401
|
+
btcBased: false,
|
|
2402
|
+
wstETHBased: false,
|
|
2403
|
+
ethBased: false,
|
|
2404
|
+
type: FluidVaultType.T2,
|
|
2405
|
+
id: 14,
|
|
2406
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2407
|
+
label: '#14 (USDai-USDT / USDT)',
|
|
2408
|
+
shortLabel: 'USDai-USDT/USDT',
|
|
2409
|
+
value: FluidPlasmaVersions.FLUID_USDAI_USDT_USDT_14_PLASMA,
|
|
2410
|
+
url: 'usdai-usdt-usdt-14-plasma',
|
|
2411
|
+
marketAddress: '0x1982CC7b1570C2503282d0A0B41F69b3B28fdcc3',
|
|
2412
|
+
hasSmartCollateral: true,
|
|
2413
|
+
hasSmartDebt: false,
|
|
2414
|
+
collateralAsset0: 'USDai',
|
|
2415
|
+
collateralAsset1: 'USDT',
|
|
2416
|
+
debtAsset0: 'USDT',
|
|
2417
|
+
});
|
|
2418
|
+
export const FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2419
|
+
stableBased: true,
|
|
2420
|
+
btcBased: false,
|
|
2421
|
+
wstETHBased: false,
|
|
2422
|
+
ethBased: false,
|
|
2423
|
+
type: FluidVaultType.T2,
|
|
2424
|
+
id: 15,
|
|
2425
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2426
|
+
label: '#15 (USDT-syrupUSDT / USDT)',
|
|
2427
|
+
shortLabel: 'USDT-syrupUSDT/USDT',
|
|
2428
|
+
value: FluidPlasmaVersions.FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA,
|
|
2429
|
+
url: 'usdt-syrupusdt-usdt-15-plasma',
|
|
2430
|
+
marketAddress: '0xb4F3bf2d96139563777C0231899cE06EE95Cc946',
|
|
2431
|
+
hasSmartCollateral: true,
|
|
2432
|
+
hasSmartDebt: false,
|
|
2433
|
+
collateralAsset0: 'USDT',
|
|
2434
|
+
collateralAsset1: 'syrupUSDT',
|
|
2435
|
+
debtAsset0: 'USDT',
|
|
2436
|
+
});
|
|
2437
|
+
export const FLUID_XPL_USDT_16_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2438
|
+
stableBased: true,
|
|
2439
|
+
btcBased: false,
|
|
2440
|
+
wstETHBased: false,
|
|
2441
|
+
ethBased: false,
|
|
2442
|
+
type: FluidVaultType.T1,
|
|
2443
|
+
id: 16,
|
|
2444
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2445
|
+
label: '#16 (XPL / USDT)',
|
|
2446
|
+
shortLabel: 'XPL/USDT',
|
|
2447
|
+
value: FluidPlasmaVersions.FLUID_XPL_USDT_16_PLASMA,
|
|
2448
|
+
url: 'xpl-usdt-16-plasma',
|
|
2449
|
+
marketAddress: '0xeAEf563015634a9d0EE6CF1357A3b205C35e028D',
|
|
2450
|
+
hasSmartCollateral: false,
|
|
2451
|
+
hasSmartDebt: false,
|
|
2452
|
+
collateralAsset0: 'XPL',
|
|
2453
|
+
debtAsset0: 'USDT',
|
|
2454
|
+
});
|
|
2455
|
+
export const FLUID_XPL_USDE_17_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2456
|
+
stableBased: true,
|
|
2457
|
+
btcBased: false,
|
|
2458
|
+
wstETHBased: false,
|
|
2459
|
+
ethBased: false,
|
|
2460
|
+
type: FluidVaultType.T1,
|
|
2461
|
+
id: 17,
|
|
2462
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2463
|
+
label: '#17 (XPL / USDe)',
|
|
2464
|
+
shortLabel: 'XPL/USDe',
|
|
2465
|
+
value: FluidPlasmaVersions.FLUID_XPL_USDE_17_PLASMA,
|
|
2466
|
+
url: 'xpl-usde-17-plasma',
|
|
2467
|
+
marketAddress: '0x3996464c0fCCa8183e13ea5E5e74375e2c8744Dd',
|
|
2468
|
+
hasSmartCollateral: false,
|
|
2469
|
+
hasSmartDebt: false,
|
|
2470
|
+
collateralAsset0: 'XPL',
|
|
2471
|
+
debtAsset0: 'USDe',
|
|
2472
|
+
});
|
|
2473
|
+
export const FLUID_WSTUSR_USDT_18_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2474
|
+
stableBased: true,
|
|
2475
|
+
btcBased: false,
|
|
2476
|
+
wstETHBased: false,
|
|
2477
|
+
ethBased: false,
|
|
2478
|
+
type: FluidVaultType.T1,
|
|
2479
|
+
id: 18,
|
|
2480
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2481
|
+
label: '#18 (wstUSR / USDT)',
|
|
2482
|
+
shortLabel: 'wstUSR/USDT',
|
|
2483
|
+
value: FluidPlasmaVersions.FLUID_WSTUSR_USDT_18_PLASMA,
|
|
2484
|
+
url: 'wstusr-usdt-18-plasma',
|
|
2485
|
+
marketAddress: '0xBc345229C1b52e4c30530C614BB487323BA38Da5',
|
|
2486
|
+
hasSmartCollateral: false,
|
|
2487
|
+
hasSmartDebt: false,
|
|
2488
|
+
collateralAsset0: 'wstUSR',
|
|
2489
|
+
debtAsset0: 'USDT',
|
|
2490
|
+
});
|
|
2491
|
+
export const FLUID_WSTUSR_USDT_USDT_19_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2492
|
+
stableBased: true,
|
|
2493
|
+
btcBased: false,
|
|
2494
|
+
wstETHBased: false,
|
|
2495
|
+
ethBased: false,
|
|
2496
|
+
type: FluidVaultType.T2,
|
|
2497
|
+
id: 19,
|
|
2498
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2499
|
+
label: '#19 (wstUSR-USDT / USDT)',
|
|
2500
|
+
shortLabel: 'wstUSR-USDT/USDT',
|
|
2501
|
+
value: FluidPlasmaVersions.FLUID_WSTUSR_USDT_USDT_19_PLASMA,
|
|
2502
|
+
url: 'wstusr-usdt-usdt-19-plasma',
|
|
2503
|
+
marketAddress: '0xF2c8F54447cbd591C396b0Dd7ac15FAF552d0FA4',
|
|
2504
|
+
hasSmartCollateral: true,
|
|
2505
|
+
hasSmartDebt: false,
|
|
2506
|
+
collateralAsset0: 'wstUSR',
|
|
2507
|
+
collateralAsset1: 'USDT',
|
|
2508
|
+
debtAsset0: 'USDT',
|
|
2509
|
+
});
|
|
2510
|
+
export const FLUID_SYRUPUSDT_USDT_20_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2511
|
+
stableBased: true,
|
|
2512
|
+
btcBased: false,
|
|
2513
|
+
wstETHBased: false,
|
|
2514
|
+
ethBased: false,
|
|
2515
|
+
type: FluidVaultType.T1,
|
|
2516
|
+
id: 20,
|
|
2517
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2518
|
+
label: '#20 (syrupUSDT / USDT)',
|
|
2519
|
+
shortLabel: 'syrupUSDT/USDT',
|
|
2520
|
+
value: FluidPlasmaVersions.FLUID_SYRUPUSDT_USDT_20_PLASMA,
|
|
2521
|
+
url: 'syrupusdt-usdt-20-plasma',
|
|
2522
|
+
marketAddress: '0x92643E964CA4b2c165a95CA919b0A819acA6D5F1',
|
|
2523
|
+
hasSmartCollateral: false,
|
|
2524
|
+
hasSmartDebt: false,
|
|
2525
|
+
collateralAsset0: 'syrupUSDT',
|
|
2526
|
+
debtAsset0: 'USDT',
|
|
2527
|
+
});
|
|
2528
|
+
export const FLUID_ETH_WRSETH_ETH_21_PLASMA = (networkId = NetworkNumber.Eth) => ({
|
|
2529
|
+
stableBased: false,
|
|
2530
|
+
btcBased: false,
|
|
2531
|
+
wstETHBased: false,
|
|
2532
|
+
ethBased: true,
|
|
2533
|
+
type: FluidVaultType.T2,
|
|
2534
|
+
id: 21,
|
|
2535
|
+
chainIds: [NetworkNumber.Plasma],
|
|
2536
|
+
label: '#21 (ETH-wrsETH / ETH)',
|
|
2537
|
+
shortLabel: 'ETH-wrsETH/ETH',
|
|
2538
|
+
value: FluidPlasmaVersions.FLUID_ETH_WRSETH_ETH_21_PLASMA,
|
|
2539
|
+
url: 'eth-wrseth-eth-plasma',
|
|
2540
|
+
marketAddress: '0x6F72895Cf6904489Bcd862c941c3D02a3eE4f03e',
|
|
2541
|
+
hasSmartCollateral: true,
|
|
2542
|
+
hasSmartDebt: false,
|
|
2543
|
+
collateralAsset0: 'ETH',
|
|
2544
|
+
collateralAsset1: 'wrsETH',
|
|
2545
|
+
debtAsset0: 'ETH',
|
|
2546
|
+
});
|
|
2162
2547
|
export const FluidMarkets = (networkId) => ({
|
|
2163
2548
|
[FluidMainnetVersion.FLUID_ETH_USDC_1]: FLUID_ETH_USDC_1(networkId),
|
|
2164
2549
|
[FluidMainnetVersion.FLUID_ETH_USDT_2]: FLUID_ETH_USDT_2(networkId),
|
|
@@ -2279,6 +2664,28 @@ export const FluidMarkets = (networkId) => ({
|
|
|
2279
2664
|
[FluidBaseVersions.FLUID_CBBTC_SUSDS_19_BASE]: FLUID_CBBTC_SUSDS_19_BASE(networkId),
|
|
2280
2665
|
[FluidBaseVersions.FLUID_LBTC_USDC_21_BASE]: FLUID_LBTC_USDC_21_BASE(networkId),
|
|
2281
2666
|
[FluidBaseVersions.FLUID_LBTC_SUSDS_22_BASE]: FLUID_LBTC_SUSDS_22_BASE(networkId),
|
|
2667
|
+
// plasma
|
|
2668
|
+
[FluidPlasmaVersions.FLUID_ETH_USDT_1_PLASMA]: FLUID_ETH_USDT_1_PLASMA(networkId),
|
|
2669
|
+
[FluidPlasmaVersions.FLUID_ETH_USDE_2_PLASMA]: FLUID_ETH_USDE_2_PLASMA(networkId),
|
|
2670
|
+
[FluidPlasmaVersions.FLUID_WEETH_ETH_3_PLASMA]: FLUID_WEETH_ETH_3_PLASMA(networkId),
|
|
2671
|
+
[FluidPlasmaVersions.FLUID_SUSDE_USDT_4_PLASMA]: FLUID_SUSDE_USDT_4_PLASMA(networkId),
|
|
2672
|
+
[FluidPlasmaVersions.FLUID_WEETH_USDT_5_PLASMA]: FLUID_WEETH_USDT_5_PLASMA(networkId),
|
|
2673
|
+
[FluidPlasmaVersions.FLUID_WEETH_USDE_6_PLASMA]: FLUID_WEETH_USDE_6_PLASMA(networkId),
|
|
2674
|
+
[FluidPlasmaVersions.FLUID_XAUT_USDT_7_PLASMA]: FLUID_XAUT_USDT_7_PLASMA(networkId),
|
|
2675
|
+
[FluidPlasmaVersions.FLUID_XAUT_USDE_8_PLASMA]: FLUID_XAUT_USDE_8_PLASMA(networkId),
|
|
2676
|
+
[FluidPlasmaVersions.FLUID_USDE_USDT_9_PLASMA]: FLUID_USDE_USDT_9_PLASMA(networkId),
|
|
2677
|
+
[FluidPlasmaVersions.FLUID_USDE_USDT_10_PLASMA]: FLUID_USDAI_USDT_10_PLASMA(networkId),
|
|
2678
|
+
[FluidPlasmaVersions.FLUID_WEETH_ETH_ETH_11_PLASMA]: FLUID_WEETH_ETH_ETH_11_PLASMA(networkId),
|
|
2679
|
+
[FluidPlasmaVersions.FLUID_SUSDE_USDT_USDT_12_PLASMA]: FLUID_SUSDE_USDT_USDT_12_PLASMA(networkId),
|
|
2680
|
+
[FluidPlasmaVersions.FLUID_USDE_USDT_USDT_13_PLASMA]: FLUID_USDE_USDT_USDT_13_PLASMA(networkId),
|
|
2681
|
+
[FluidPlasmaVersions.FLUID_USDAI_USDT_USDT_14_PLASMA]: FLUID_USDAI_USDT_USDT_14_PLASMA(networkId),
|
|
2682
|
+
[FluidPlasmaVersions.FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA]: FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA(networkId),
|
|
2683
|
+
[FluidPlasmaVersions.FLUID_XPL_USDT_16_PLASMA]: FLUID_XPL_USDT_16_PLASMA(networkId),
|
|
2684
|
+
[FluidPlasmaVersions.FLUID_XPL_USDE_17_PLASMA]: FLUID_XPL_USDE_17_PLASMA(networkId),
|
|
2685
|
+
[FluidPlasmaVersions.FLUID_WSTUSR_USDT_18_PLASMA]: FLUID_WSTUSR_USDT_18_PLASMA(networkId),
|
|
2686
|
+
[FluidPlasmaVersions.FLUID_WSTUSR_USDT_USDT_19_PLASMA]: FLUID_WSTUSR_USDT_USDT_19_PLASMA(networkId),
|
|
2687
|
+
[FluidPlasmaVersions.FLUID_SYRUPUSDT_USDT_20_PLASMA]: FLUID_SYRUPUSDT_USDT_20_PLASMA(networkId),
|
|
2688
|
+
[FluidPlasmaVersions.FLUID_ETH_WRSETH_ETH_21_PLASMA]: FLUID_ETH_WRSETH_ETH_21_PLASMA(networkId),
|
|
2282
2689
|
});
|
|
2283
2690
|
export const getFluidVersionsDataForNetwork = (network) => (Object.values(FluidMarkets(network)).filter(({ chainIds, marketAddress }) => !!marketAddress && chainIds.includes(network)));
|
|
2284
2691
|
export const getFluidMarketInfoById = (vaultId, network = 1) => getFluidVersionsDataForNetwork(network).find(({ id }) => id === vaultId);
|
|
@@ -2309,6 +2716,11 @@ const FluidBaseFTokenAddresses = {
|
|
|
2309
2716
|
[FluidBaseDepositToken.sUSDS]: '0xf62e339f21d8018940f188F6987Bcdf02A849619',
|
|
2310
2717
|
[FluidBaseDepositToken.GHO]: '0x8DdbfFA3CFda2355a23d6B11105AC624BDbE3631',
|
|
2311
2718
|
};
|
|
2719
|
+
const FluidPlasmaFTokenAddresses = {
|
|
2720
|
+
[FluidPlasmaDepositToken.ETH]: '0x5E494e8912319cefb1d4Fa516807bB65A8CB9E40',
|
|
2721
|
+
[FluidPlasmaDepositToken.USDT]: '0x1DD4b13fcAE900C60a350589BE8052959D2Ed27B',
|
|
2722
|
+
[FluidPlasmaDepositToken.USDe]: '0xd8f824d4252caE7d5E49B95d47B0EfAfe6f2d570',
|
|
2723
|
+
};
|
|
2312
2724
|
export const FluidFTokens = (networkId) => {
|
|
2313
2725
|
switch (networkId) {
|
|
2314
2726
|
case NetworkNumber.Eth:
|
|
@@ -2317,6 +2729,8 @@ export const FluidFTokens = (networkId) => {
|
|
|
2317
2729
|
return FluidArbitrumFTokenAddresses;
|
|
2318
2730
|
case NetworkNumber.Base:
|
|
2319
2731
|
return FluidBaseFTokenAddresses;
|
|
2732
|
+
case NetworkNumber.Plasma:
|
|
2733
|
+
return FluidPlasmaFTokenAddresses;
|
|
2320
2734
|
default:
|
|
2321
2735
|
throw new Error('Invalid network id');
|
|
2322
2736
|
}
|
package/esm/portfolio/index.js
CHANGED
|
@@ -446,7 +446,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
|
|
|
446
446
|
}))).flat(),
|
|
447
447
|
...sparkMarkets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
448
448
|
try {
|
|
449
|
-
const accData = yield _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData
|
|
449
|
+
const accData = yield _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData });
|
|
450
450
|
if (new Dec(accData.suppliedUsd).gt(0))
|
|
451
451
|
positions[address.toLowerCase()].spark[market.value] = { error: '', data: accData };
|
|
452
452
|
}
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import Dec from 'decimal.js';
|
|
11
11
|
import { getAssetInfo } from '@defisaver/tokens';
|
|
12
|
-
import {
|
|
12
|
+
import { BTCPriceFeedContractViem, COMPPriceFeedContractViem, ETHPriceFeedContractViem, USDCPriceFeedContractViem, WeETHPriceFeedContractViem, WstETHPriceFeedContractViem, } from '../contracts';
|
|
13
13
|
import { NetworkNumber } from '../types/common';
|
|
14
14
|
import { getEthAmountForDecimals } from './utils';
|
|
15
15
|
export const getEthPrice = (client) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -134,7 +134,7 @@ export const getChainlinkAssetAddress = (symbol, network) => {
|
|
|
134
134
|
// Chainlink only has BTC/USD feed so we use that for BTC derivatives
|
|
135
135
|
if (['WBTC', 'RENBTC'].includes(symbol === null || symbol === void 0 ? void 0 : symbol.toUpperCase()))
|
|
136
136
|
return '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB';
|
|
137
|
-
if ((symbol === null || symbol === void 0 ? void 0 : symbol.toUpperCase()) === 'WETH')
|
|
137
|
+
if ((symbol === null || symbol === void 0 ? void 0 : symbol.toUpperCase()) === 'WETH' && network !== NetworkNumber.Plasma)
|
|
138
138
|
return getAssetInfo('ETH').addresses[network];
|
|
139
139
|
return getAssetInfo(symbol).addresses[network];
|
|
140
140
|
};
|
package/esm/spark/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Client } from 'viem';
|
|
2
2
|
import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
|
|
3
|
-
import { SparkEModeCategoryDataMapping, SparkAssetsData, SparkMarketData, SparkMarketsData, SparkPositionData, SparkUsedAssets
|
|
3
|
+
import { SparkEModeCategoryDataMapping, SparkAssetsData, SparkMarketData, SparkMarketsData, SparkPositionData, SparkUsedAssets } from '../types';
|
|
4
4
|
export declare const sparkEmodeCategoriesMapping: (extractedState: {
|
|
5
5
|
assetsData: SparkAssetsData;
|
|
6
6
|
}, usedAssets: SparkUsedAssets) => {
|
|
@@ -32,11 +32,9 @@ export declare const getSparkAccountBalances: (provider: EthereumProvider, netwo
|
|
|
32
32
|
export declare const _getSparkAccountData: (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: {
|
|
33
33
|
selectedMarket: SparkMarketData;
|
|
34
34
|
assetsData: SparkAssetsData;
|
|
35
|
-
eModeCategoriesData: EModeCategoriesData;
|
|
36
35
|
}) => Promise<SparkPositionData>;
|
|
37
36
|
export declare const getSparkAccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: {
|
|
38
37
|
selectedMarket: SparkMarketData;
|
|
39
38
|
assetsData: SparkAssetsData;
|
|
40
|
-
eModeCategoriesData: EModeCategoriesData;
|
|
41
39
|
}) => Promise<SparkPositionData>;
|
|
42
40
|
export declare const getSparkFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: SparkMarketData) => Promise<SparkPositionData>;
|
package/esm/spark/index.js
CHANGED
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import Dec from 'decimal.js';
|
|
11
11
|
import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
|
|
12
|
-
import { IncentiveKind, } from '../types/common';
|
|
12
|
+
import { IncentiveKind, NetworkNumber, } from '../types/common';
|
|
13
13
|
import { ethToWeth, wethToEth, wethToEthByAddress, } from '../services/utils';
|
|
14
14
|
import { calculateNetApy, getStakingApy, STAKING_ASSETS, } from '../staking';
|
|
15
15
|
import { SparkViewContractViem, SparkIncentiveDataProviderContractViem, createViemContractFromConfigFunc, } from '../contracts';
|
|
@@ -22,6 +22,7 @@ export const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
|
|
|
22
22
|
const usedAssetsValues = Object.values(usedAssets);
|
|
23
23
|
const categoriesMapping = {};
|
|
24
24
|
Object.values(assetsData).forEach((a) => {
|
|
25
|
+
var _a;
|
|
25
26
|
const borrowingOnlyFromCategory = a.eModeCategory === 0
|
|
26
27
|
? true
|
|
27
28
|
: !usedAssetsValues.filter(u => u.isBorrowed && u.eModeCategory !== a.eModeCategory).length;
|
|
@@ -32,6 +33,8 @@ export const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
|
|
|
32
33
|
enteringTerms,
|
|
33
34
|
canEnterCategory: !enteringTerms.includes(false),
|
|
34
35
|
id: a.eModeCategory,
|
|
36
|
+
data: a.eModeCategoryData,
|
|
37
|
+
assets: a.eModeCategory === 0 ? [] : [...(((_a = categoriesMapping[a.eModeCategory]) === null || _a === void 0 ? void 0 : _a.assets) || []), a.symbol],
|
|
35
38
|
enabledData: {
|
|
36
39
|
ratio: afterEnteringCategory.ratio,
|
|
37
40
|
liqRatio: afterEnteringCategory.liqRatio,
|
|
@@ -46,17 +49,18 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
|
|
|
46
49
|
const marketAddress = selectedMarket.providerAddress;
|
|
47
50
|
const loanInfoContract = SparkViewContractViem(provider, network);
|
|
48
51
|
const sparkIncentivesContract = SparkIncentiveDataProviderContractViem(provider, network);
|
|
49
|
-
|
|
50
|
-
let [loanInfo, rewardInfo] = yield Promise.all([
|
|
52
|
+
const [loanInfo, _rewardInfo] = yield Promise.all([
|
|
51
53
|
loanInfoContract.read.getFullTokensInfo([marketAddress, selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address)]),
|
|
52
|
-
sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]),
|
|
54
|
+
network === NetworkNumber.Opt ? sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]) : [],
|
|
53
55
|
]);
|
|
54
|
-
rewardInfo =
|
|
55
|
-
|
|
56
|
-
all
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
56
|
+
let rewardInfo = [];
|
|
57
|
+
if (network === NetworkNumber.Opt) {
|
|
58
|
+
rewardInfo = rewardInfo.reduce((all, market) => {
|
|
59
|
+
// eslint-disable-next-line no-param-reassign
|
|
60
|
+
all[market.underlyingAsset] = market;
|
|
61
|
+
return all;
|
|
62
|
+
}, {});
|
|
63
|
+
}
|
|
60
64
|
const assetsData = yield Promise.all(loanInfo
|
|
61
65
|
.map((market, i) => __awaiter(void 0, void 0, void 0, function* () {
|
|
62
66
|
const symbol = selectedMarket.assets[i];
|
|
@@ -71,15 +75,6 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
|
|
|
71
75
|
if (new Dec(marketLiquidity).lt(0)) {
|
|
72
76
|
marketLiquidity = '0';
|
|
73
77
|
}
|
|
74
|
-
eModeCategoriesData[+market.emodeCategory.toString()] = {
|
|
75
|
-
id: +market.emodeCategory.toString(),
|
|
76
|
-
label: market.label,
|
|
77
|
-
liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
|
|
78
|
-
liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
|
|
79
|
-
collateralFactor: new Dec(market.ltv).div(10000).toString(),
|
|
80
|
-
collateralAssets: eModeCategoriesData[+market.emodeCategory.toString()] ? [...eModeCategoriesData[+market.emodeCategory.toString()].collateralAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
|
|
81
|
-
borrowAssets: eModeCategoriesData[+market.emodeCategory.toString()] ? [...eModeCategoriesData[+market.emodeCategory.toString()].borrowAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
|
|
82
|
-
};
|
|
83
78
|
return ({
|
|
84
79
|
symbol: selectedMarket.assets[i],
|
|
85
80
|
isIsolated: new Dec(market.debtCeilingForIsolationMode.toString()).gt(0),
|
|
@@ -114,6 +109,13 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
|
|
|
114
109
|
isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
|
|
115
110
|
isFlashLoanEnabled: market.isFlashLoanEnabled,
|
|
116
111
|
aTokenAddress: market.aTokenAddress,
|
|
112
|
+
eModeCategoryData: {
|
|
113
|
+
label: market.label,
|
|
114
|
+
liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
|
|
115
|
+
liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
|
|
116
|
+
collateralFactor: new Dec(market.ltv).div(10000).toString(),
|
|
117
|
+
priceSource: market.priceSource,
|
|
118
|
+
},
|
|
117
119
|
supplyIncentives: [],
|
|
118
120
|
borrowIncentives: [],
|
|
119
121
|
});
|
|
@@ -145,7 +147,7 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
|
|
|
145
147
|
return;
|
|
146
148
|
rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
|
|
147
149
|
if (supplyRewardData) {
|
|
148
|
-
if (
|
|
150
|
+
if (supplyRewardData.emissionEndTimestamp * 1000 < Date.now())
|
|
149
151
|
return;
|
|
150
152
|
const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
|
|
151
153
|
const supplyRewardPrice = new Dec(supplyRewardData.rewardPriceFeed).div(Math.pow(10, supplyRewardData.priceFeedDecimals))
|
|
@@ -166,7 +168,7 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
|
|
|
166
168
|
});
|
|
167
169
|
rewardForMarket.vIncentiveData.rewardsTokenInformation.forEach(borrowRewardData => {
|
|
168
170
|
if (borrowRewardData) {
|
|
169
|
-
if (
|
|
171
|
+
if (borrowRewardData.emissionEndTimestamp * 1000 < Date.now())
|
|
170
172
|
return;
|
|
171
173
|
const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
|
|
172
174
|
const supplyRewardPrice = new Dec(borrowRewardData.rewardPriceFeed).div(Math.pow(10, borrowRewardData.priceFeedDecimals))
|
|
@@ -198,9 +200,7 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
|
|
|
198
200
|
.forEach((assetData, i) => {
|
|
199
201
|
payload[assetData.symbol] = Object.assign(Object.assign({}, assetData), { sortIndex: i });
|
|
200
202
|
});
|
|
201
|
-
|
|
202
|
-
eModeCategoriesData[0].borrowAssets = Object.values(payload).map(a => a.symbol);
|
|
203
|
-
return { assetsData: payload, eModeCategoriesData };
|
|
203
|
+
return { assetsData: payload };
|
|
204
204
|
});
|
|
205
205
|
export const getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return _getSparkMarketsData(getViemProvider(provider, network), network, selectedMarket); });
|
|
206
206
|
export const EMPTY_SPARK_DATA = {
|
|
@@ -336,6 +336,6 @@ export const _getSparkAccountData = (provider, network, address, extractedState)
|
|
|
336
336
|
export const getSparkAccountData = (provider, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () { return _getSparkAccountData(getViemProvider(provider, network), network, address, extractedState); });
|
|
337
337
|
export const getSparkFullPositionData = (provider, network, address, market) => __awaiter(void 0, void 0, void 0, function* () {
|
|
338
338
|
const marketData = yield getSparkMarketsData(provider, network, market);
|
|
339
|
-
const positionData = yield getSparkAccountData(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market
|
|
339
|
+
const positionData = yield getSparkAccountData(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market });
|
|
340
340
|
return positionData;
|
|
341
341
|
});
|
package/esm/types/fluid.d.ts
CHANGED
|
@@ -142,7 +142,30 @@ export declare enum FluidBaseVersions {
|
|
|
142
142
|
FLUID_LBTC_USDC_21_BASE = "FLUID_LBTC_USDC_21_BASE",
|
|
143
143
|
FLUID_LBTC_SUSDS_22_BASE = "FLUID_LBTC_SUSDS_22_BASE"
|
|
144
144
|
}
|
|
145
|
-
export
|
|
145
|
+
export declare enum FluidPlasmaVersions {
|
|
146
|
+
FLUID_ETH_USDT_1_PLASMA = "FLUID_ETH_USDT_1_PLASMA",
|
|
147
|
+
FLUID_ETH_USDE_2_PLASMA = "FLUID_ETH_USDE_2_PLASMA",
|
|
148
|
+
FLUID_WEETH_ETH_3_PLASMA = "FLUID_WEETH_ETH_3_PLASMA",
|
|
149
|
+
FLUID_SUSDE_USDT_4_PLASMA = "FLUID_SUSDE_USDT_4_PLASMA",
|
|
150
|
+
FLUID_WEETH_USDT_5_PLASMA = "FLUID_WEETH_USDT_5_PLASMA",
|
|
151
|
+
FLUID_WEETH_USDE_6_PLASMA = "FLUID_WEETH_USDE_6_PLASMA",
|
|
152
|
+
FLUID_XAUT_USDT_7_PLASMA = "FLUID_XAUT_USDT_7_PLASMA",
|
|
153
|
+
FLUID_XAUT_USDE_8_PLASMA = "FLUID_XAUT_USDE_8_PLASMA",
|
|
154
|
+
FLUID_USDE_USDT_9_PLASMA = "FLUID_USDE_USDT_9_PLASMA",
|
|
155
|
+
FLUID_USDE_USDT_10_PLASMA = "FLUID_USDE_USDT_10_PLASMA",
|
|
156
|
+
FLUID_WEETH_ETH_ETH_11_PLASMA = "FLUID_WEETH_ETH_ETH_11_PLASMA",
|
|
157
|
+
FLUID_SUSDE_USDT_USDT_12_PLASMA = "FLUID_SUSDE_USDT_USDT_12_PLASMA",
|
|
158
|
+
FLUID_USDE_USDT_USDT_13_PLASMA = "FLUID_USDE_USDT_USDT_13_PLASMA",
|
|
159
|
+
FLUID_USDAI_USDT_USDT_14_PLASMA = "FLUID_USDAI_USDT_USDT_14_PLASMA",
|
|
160
|
+
FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA = "FLUID_USDT_SYRUPUSDT_USDT_15_PLASMA",
|
|
161
|
+
FLUID_XPL_USDT_16_PLASMA = "FLUID_XPL_USDT_16_PLASMA",
|
|
162
|
+
FLUID_XPL_USDE_17_PLASMA = "FLUID_XPL_USDE_17_PLASMA",
|
|
163
|
+
FLUID_WSTUSR_USDT_18_PLASMA = "FLUID_WSTUSR_USDT_18_PLASMA",
|
|
164
|
+
FLUID_WSTUSR_USDT_USDT_19_PLASMA = "FLUID_WSTUSR_USDT_USDT_19_PLASMA",
|
|
165
|
+
FLUID_SYRUPUSDT_USDT_20_PLASMA = "FLUID_SYRUPUSDT_USDT_20_PLASMA",
|
|
166
|
+
FLUID_ETH_WRSETH_ETH_21_PLASMA = "FLUID_ETH_WRSETH_ETH_21_PLASMA"
|
|
167
|
+
}
|
|
168
|
+
export type FluidVersions = FluidArbitrumVersion | FluidBaseVersions | FluidMainnetVersion | FluidPlasmaVersions;
|
|
146
169
|
export declare enum FluidMainnetDepositToken {
|
|
147
170
|
ETH = "ETH",
|
|
148
171
|
wstETH = "wstETH",
|
|
@@ -169,10 +192,16 @@ export declare enum FluidBaseDepositToken {
|
|
|
169
192
|
sUSDS = "sUSDS",
|
|
170
193
|
GHO = "GHO"
|
|
171
194
|
}
|
|
195
|
+
export declare enum FluidPlasmaDepositToken {
|
|
196
|
+
USDe = "USDe",
|
|
197
|
+
USDT = "USDT",
|
|
198
|
+
ETH = "ETH"
|
|
199
|
+
}
|
|
172
200
|
export type FluidDepositTokenByNetwork = {
|
|
173
201
|
[NetworkNumber.Eth]: FluidMainnetDepositToken;
|
|
174
202
|
[NetworkNumber.Arb]: FluidArbitrumDepositToken;
|
|
175
203
|
[NetworkNumber.Base]: FluidBaseDepositToken;
|
|
204
|
+
[NetworkNumber.Plasma]: FluidPlasmaDepositToken;
|
|
176
205
|
};
|
|
177
206
|
export declare enum FluidVaultType {
|
|
178
207
|
T1 = "T1",
|