@defisaver/positions-sdk 2.1.13-dev-plasma-fluid2 → 2.1.13-dev-plasma-fluid4

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 (6) hide show
  1. package/cjs/fluid/index.js +11 -12
  2. package/esm/fluid/index.js +11 -12
  3. package/package.json +1 -1
  4. package/src/fluid/index.ts +12 -12
  5. package/src/markets/fluid/index.ts +8 -8
  6. package/src/types/fluid.ts +1 -1
package/cjs/fluid/index.js CHANGED
@@ -368,7 +368,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
368
368
  const collFirstAssetData = {
369
369
  symbol: collAsset0.symbol,
370
370
  address: collAsset0.address,
371
- price: prices[tokenPrices ? collAsset0.symbol : collAsset0.address],
371
+ price: prices[tokenPrices ? collAsset0.symbol : collAsset0Contract.address],
372
372
  totalSupply: new decimal_js_1.default(totalSupplyShares).mul(token0PerSupplyShare).toString(),
373
373
  canBeSupplied: true,
374
374
  supplyRate: supplyRate0,
@@ -390,7 +390,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
390
390
  const collSecondAssetData = {
391
391
  symbol: collAsset1.symbol,
392
392
  address: collAsset1.address,
393
- price: prices[tokenPrices ? collAsset1.symbol : collAsset1.address],
393
+ price: prices[tokenPrices ? collAsset1.symbol : collAsset1Contract.address],
394
394
  totalSupply: new decimal_js_1.default(totalSupplyShares).mul(token1PerSupplyShare).toString(),
395
395
  canBeSupplied: true,
396
396
  supplyRate: supplyRate1,
@@ -415,7 +415,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
415
415
  const borrowRate = new decimal_js_1.default(data.borrowRateVault).div(100).toString();
416
416
  const debtAssetData = {
417
417
  symbol: debtAsset.symbol,
418
- price: prices[tokenPrices ? debtAsset.symbol : debtAsset.address],
418
+ price: prices[tokenPrices ? debtAsset.symbol : debtAssetContract.address],
419
419
  address: debtAsset.address,
420
420
  totalBorrow: data.totalBorrowVault.toString(),
421
421
  canBeBorrowed: true,
@@ -444,7 +444,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
444
444
  const liquidationMaxLimit = new decimal_js_1.default(data.liquidationMaxLimit).div(100).toString();
445
445
  const liqFactor = new decimal_js_1.default(data.liquidationThreshold).div(10000).toString();
446
446
  const totalSupplySharesInVault = (0, tokens_1.assetAmountInEth)(data.totalSupplyVault.toString());
447
- const collSharePrice = new decimal_js_1.default(oraclePrice).mul(prices[tokenPrices ? debtAsset.symbol : debtAsset.address]).toString();
447
+ const collSharePrice = new decimal_js_1.default(oraclePrice).mul(prices[tokenPrices ? debtAsset.symbol : debtAssetContract.address]).toString();
448
448
  const totalSupplyVaultUsd = new decimal_js_1.default(totalSupplySharesInVault).mul(collSharePrice).toString();
449
449
  const maxSupplySharesUsd = new decimal_js_1.default(maxSupplyShares).mul(collSharePrice).toString();
450
450
  const withdrawableUSD = new decimal_js_1.default(withdrawableShares).mul(collSharePrice).toString();
@@ -525,7 +525,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
525
525
  const collAssetData = {
526
526
  symbol: collAsset.symbol,
527
527
  address: collAsset.address,
528
- price: prices[tokenPrices ? collAsset.symbol : collAsset.address],
528
+ price: prices[tokenPrices ? collAsset.symbol : collAssetContract.address],
529
529
  totalSupply: data.totalSupplyVault.toString(),
530
530
  canBeSupplied: true,
531
531
  supplyRate,
@@ -544,7 +544,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
544
544
  const debtAsset0Data = {
545
545
  symbol: debtAsset0.symbol,
546
546
  address: debtAsset0.address,
547
- price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0.address],
547
+ price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0Contract.address],
548
548
  totalBorrow: new decimal_js_1.default(totalBorrowShares).mul(token0PerBorrowShare).toString(),
549
549
  canBeBorrowed: true,
550
550
  borrowRate: borrowRate0,
@@ -566,7 +566,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
566
566
  const debtAsset1Data = {
567
567
  symbol: debtAsset1.symbol,
568
568
  address: debtAsset1.address,
569
- price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1.address],
569
+ price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1Contract.address],
570
570
  totalBorrow: new decimal_js_1.default(totalBorrowShares).mul(token1PerBorrowShare).toString(),
571
571
  canBeBorrowed: true,
572
572
  borrowRate: borrowRate1,
@@ -680,7 +680,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
680
680
  const collAsset0Data = {
681
681
  symbol: collAsset0.symbol,
682
682
  address: collAsset0.address,
683
- price: prices[tokenPrices ? collAsset0.symbol : collAsset0.address],
683
+ price: prices[tokenPrices ? collAsset0.symbol : collAsset0Contract.address],
684
684
  totalSupply: new decimal_js_1.default(totalSupplyShares).mul(token0PerSupplyShare).toString(),
685
685
  canBeSupplied: true,
686
686
  supplyRate: supplyRate0,
@@ -702,7 +702,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
702
702
  const collAsset1Data = {
703
703
  symbol: collAsset1.symbol,
704
704
  address: collAsset1.address,
705
- price: prices[tokenPrices ? collAsset1.symbol : collAsset1.address],
705
+ price: prices[tokenPrices ? collAsset1.symbol : collAsset1Contract.address],
706
706
  totalSupply: new decimal_js_1.default(totalSupplyShares).mul(token1PerSupplyShare).toString(),
707
707
  canBeSupplied: true,
708
708
  supplyRate: supplyRate1,
@@ -724,7 +724,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
724
724
  const debtAsset0Data = {
725
725
  symbol: debtAsset0.symbol,
726
726
  address: debtAsset0.address,
727
- price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0.address],
727
+ price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0Contract.address],
728
728
  totalBorrow: new decimal_js_1.default(totalBorrowShares).mul(token0PerBorrowShare).toString(),
729
729
  canBeBorrowed: true,
730
730
  borrowRate: borrowRate0,
@@ -746,7 +746,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
746
746
  const debtAsset1Data = {
747
747
  symbol: debtAsset1.symbol,
748
748
  address: debtAsset1.address,
749
- price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1.address],
749
+ price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1Contract.address],
750
750
  totalBorrow: new decimal_js_1.default(totalBorrowShares).mul(token1PerBorrowShare).toString(),
751
751
  canBeBorrowed: true,
752
752
  borrowRate: borrowRate1,
@@ -1206,7 +1206,6 @@ const _getUserPositions = (provider, network, user) => __awaiter(void 0, void 0,
1206
1206
  const view = (0, contracts_1.FluidViewContractViem)(provider, network);
1207
1207
  const data = yield view.read.getUserPositions([user]);
1208
1208
  const parsedMarketData = yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); })));
1209
- console.log(parsedMarketData);
1210
1209
  const userData = data[0].map((position, i) => (Object.assign({}, parseUserData(position, parsedMarketData[i]))));
1211
1210
  return parsedMarketData.map((market, i) => ({
1212
1211
  marketData: market,
package/esm/fluid/index.js CHANGED
@@ -362,7 +362,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
362
362
  const collFirstAssetData = {
363
363
  symbol: collAsset0.symbol,
364
364
  address: collAsset0.address,
365
- price: prices[tokenPrices ? collAsset0.symbol : collAsset0.address],
365
+ price: prices[tokenPrices ? collAsset0.symbol : collAsset0Contract.address],
366
366
  totalSupply: new Dec(totalSupplyShares).mul(token0PerSupplyShare).toString(),
367
367
  canBeSupplied: true,
368
368
  supplyRate: supplyRate0,
@@ -384,7 +384,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
384
384
  const collSecondAssetData = {
385
385
  symbol: collAsset1.symbol,
386
386
  address: collAsset1.address,
387
- price: prices[tokenPrices ? collAsset1.symbol : collAsset1.address],
387
+ price: prices[tokenPrices ? collAsset1.symbol : collAsset1Contract.address],
388
388
  totalSupply: new Dec(totalSupplyShares).mul(token1PerSupplyShare).toString(),
389
389
  canBeSupplied: true,
390
390
  supplyRate: supplyRate1,
@@ -409,7 +409,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
409
409
  const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
410
410
  const debtAssetData = {
411
411
  symbol: debtAsset.symbol,
412
- price: prices[tokenPrices ? debtAsset.symbol : debtAsset.address],
412
+ price: prices[tokenPrices ? debtAsset.symbol : debtAssetContract.address],
413
413
  address: debtAsset.address,
414
414
  totalBorrow: data.totalBorrowVault.toString(),
415
415
  canBeBorrowed: true,
@@ -438,7 +438,7 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
438
438
  const liquidationMaxLimit = new Dec(data.liquidationMaxLimit).div(100).toString();
439
439
  const liqFactor = new Dec(data.liquidationThreshold).div(10000).toString();
440
440
  const totalSupplySharesInVault = assetAmountInEth(data.totalSupplyVault.toString());
441
- const collSharePrice = new Dec(oraclePrice).mul(prices[tokenPrices ? debtAsset.symbol : debtAsset.address]).toString();
441
+ const collSharePrice = new Dec(oraclePrice).mul(prices[tokenPrices ? debtAsset.symbol : debtAssetContract.address]).toString();
442
442
  const totalSupplyVaultUsd = new Dec(totalSupplySharesInVault).mul(collSharePrice).toString();
443
443
  const maxSupplySharesUsd = new Dec(maxSupplyShares).mul(collSharePrice).toString();
444
444
  const withdrawableUSD = new Dec(withdrawableShares).mul(collSharePrice).toString();
@@ -519,7 +519,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
519
519
  const collAssetData = {
520
520
  symbol: collAsset.symbol,
521
521
  address: collAsset.address,
522
- price: prices[tokenPrices ? collAsset.symbol : collAsset.address],
522
+ price: prices[tokenPrices ? collAsset.symbol : collAssetContract.address],
523
523
  totalSupply: data.totalSupplyVault.toString(),
524
524
  canBeSupplied: true,
525
525
  supplyRate,
@@ -538,7 +538,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
538
538
  const debtAsset0Data = {
539
539
  symbol: debtAsset0.symbol,
540
540
  address: debtAsset0.address,
541
- price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0.address],
541
+ price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0Contract.address],
542
542
  totalBorrow: new Dec(totalBorrowShares).mul(token0PerBorrowShare).toString(),
543
543
  canBeBorrowed: true,
544
544
  borrowRate: borrowRate0,
@@ -560,7 +560,7 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
560
560
  const debtAsset1Data = {
561
561
  symbol: debtAsset1.symbol,
562
562
  address: debtAsset1.address,
563
- price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1.address],
563
+ price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1Contract.address],
564
564
  totalBorrow: new Dec(totalBorrowShares).mul(token1PerBorrowShare).toString(),
565
565
  canBeBorrowed: true,
566
566
  borrowRate: borrowRate1,
@@ -674,7 +674,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
674
674
  const collAsset0Data = {
675
675
  symbol: collAsset0.symbol,
676
676
  address: collAsset0.address,
677
- price: prices[tokenPrices ? collAsset0.symbol : collAsset0.address],
677
+ price: prices[tokenPrices ? collAsset0.symbol : collAsset0Contract.address],
678
678
  totalSupply: new Dec(totalSupplyShares).mul(token0PerSupplyShare).toString(),
679
679
  canBeSupplied: true,
680
680
  supplyRate: supplyRate0,
@@ -696,7 +696,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
696
696
  const collAsset1Data = {
697
697
  symbol: collAsset1.symbol,
698
698
  address: collAsset1.address,
699
- price: prices[tokenPrices ? collAsset1.symbol : collAsset1.address],
699
+ price: prices[tokenPrices ? collAsset1.symbol : collAsset1Contract.address],
700
700
  totalSupply: new Dec(totalSupplyShares).mul(token1PerSupplyShare).toString(),
701
701
  canBeSupplied: true,
702
702
  supplyRate: supplyRate1,
@@ -718,7 +718,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
718
718
  const debtAsset0Data = {
719
719
  symbol: debtAsset0.symbol,
720
720
  address: debtAsset0.address,
721
- price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0.address],
721
+ price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0Contract.address],
722
722
  totalBorrow: new Dec(totalBorrowShares).mul(token0PerBorrowShare).toString(),
723
723
  canBeBorrowed: true,
724
724
  borrowRate: borrowRate0,
@@ -740,7 +740,7 @@ const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
740
740
  const debtAsset1Data = {
741
741
  symbol: debtAsset1.symbol,
742
742
  address: debtAsset1.address,
743
- price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1.address],
743
+ price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1Contract.address],
744
744
  totalBorrow: new Dec(totalBorrowShares).mul(token1PerBorrowShare).toString(),
745
745
  canBeBorrowed: true,
746
746
  borrowRate: borrowRate1,
@@ -1184,7 +1184,6 @@ export const _getUserPositions = (provider, network, user) => __awaiter(void 0,
1184
1184
  const view = FluidViewContractViem(provider, network);
1185
1185
  const data = yield view.read.getUserPositions([user]);
1186
1186
  const parsedMarketData = yield Promise.all(data[1].map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network); })));
1187
- console.log(parsedMarketData);
1188
1187
  const userData = data[0].map((position, i) => (Object.assign({}, parseUserData(position, parsedMarketData[i]))));
1189
1188
  return parsedMarketData.map((market, i) => ({
1190
1189
  marketData: market,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "2.1.13-dev-plasma-fluid2",
3
+ "version": "2.1.13-dev-plasma-fluid4",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/fluid/index.ts CHANGED
@@ -463,7 +463,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
463
463
  const collFirstAssetData: Partial<FluidAssetData> = {
464
464
  symbol: collAsset0.symbol,
465
465
  address: collAsset0.address,
466
- price: prices[tokenPrices ? collAsset0.symbol : collAsset0.address],
466
+ price: prices[tokenPrices ? collAsset0.symbol : collAsset0Contract.address],
467
467
  totalSupply: new Dec(totalSupplyShares).mul(token0PerSupplyShare).toString(),
468
468
  canBeSupplied: true,
469
469
  supplyRate: supplyRate0,
@@ -486,7 +486,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
486
486
  const collSecondAssetData: Partial<FluidAssetData> = {
487
487
  symbol: collAsset1.symbol,
488
488
  address: collAsset1.address,
489
- price: prices[tokenPrices ? collAsset1.symbol : collAsset1.address],
489
+ price: prices[tokenPrices ? collAsset1.symbol : collAsset1Contract.address],
490
490
  totalSupply: new Dec(totalSupplyShares).mul(token1PerSupplyShare).toString(),
491
491
  canBeSupplied: true,
492
492
  supplyRate: supplyRate1,
@@ -513,7 +513,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
513
513
  const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
514
514
  const debtAssetData: Partial<FluidAssetData> = {
515
515
  symbol: debtAsset.symbol,
516
- price: prices[tokenPrices ? debtAsset.symbol : debtAsset.address],
516
+ price: prices[tokenPrices ? debtAsset.symbol : debtAssetContract.address],
517
517
  address: debtAsset.address,
518
518
  totalBorrow: data.totalBorrowVault.toString(),
519
519
  canBeBorrowed: true,
@@ -551,7 +551,7 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
551
551
  const liqFactor = new Dec(data.liquidationThreshold).div(10_000).toString();
552
552
 
553
553
  const totalSupplySharesInVault = assetAmountInEth(data.totalSupplyVault.toString());
554
- const collSharePrice = new Dec(oraclePrice).mul(prices[tokenPrices ? debtAsset.symbol : debtAsset.address]).toString();
554
+ const collSharePrice = new Dec(oraclePrice).mul(prices[tokenPrices ? debtAsset.symbol : debtAssetContract.address]).toString();
555
555
  const totalSupplyVaultUsd = new Dec(totalSupplySharesInVault).mul(collSharePrice).toString();
556
556
  const maxSupplySharesUsd = new Dec(maxSupplyShares).mul(collSharePrice).toString();
557
557
 
@@ -657,7 +657,7 @@ const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStr
657
657
  const collAssetData: Partial<FluidAssetData> = {
658
658
  symbol: collAsset.symbol,
659
659
  address: collAsset.address,
660
- price: prices[tokenPrices ? collAsset.symbol : collAsset.address],
660
+ price: prices[tokenPrices ? collAsset.symbol : collAssetContract.address],
661
661
  totalSupply: data.totalSupplyVault.toString(),
662
662
  canBeSupplied: true,
663
663
  supplyRate,
@@ -678,7 +678,7 @@ const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStr
678
678
  const debtAsset0Data: Partial<FluidAssetData> = {
679
679
  symbol: debtAsset0.symbol,
680
680
  address: debtAsset0.address,
681
- price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0.address],
681
+ price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0Contract.address],
682
682
  totalBorrow: new Dec(totalBorrowShares).mul(token0PerBorrowShare).toString(),
683
683
  canBeBorrowed: true,
684
684
  borrowRate: borrowRate0,
@@ -701,7 +701,7 @@ const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStr
701
701
  const debtAsset1Data: Partial<FluidAssetData> = {
702
702
  symbol: debtAsset1.symbol,
703
703
  address: debtAsset1.address,
704
- price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1.address],
704
+ price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1Contract.address],
705
705
  totalBorrow: new Dec(totalBorrowShares).mul(token1PerBorrowShare).toString(),
706
706
  canBeBorrowed: true,
707
707
  borrowRate: borrowRate1,
@@ -873,7 +873,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
873
873
  const collAsset0Data: Partial<FluidAssetData> = {
874
874
  symbol: collAsset0.symbol,
875
875
  address: collAsset0.address,
876
- price: prices[tokenPrices ? collAsset0.symbol : collAsset0.address],
876
+ price: prices[tokenPrices ? collAsset0.symbol : collAsset0Contract.address],
877
877
  totalSupply: new Dec(totalSupplyShares).mul(token0PerSupplyShare).toString(),
878
878
  canBeSupplied: true,
879
879
  supplyRate: supplyRate0,
@@ -896,7 +896,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
896
896
  const collAsset1Data: Partial<FluidAssetData> = {
897
897
  symbol: collAsset1.symbol,
898
898
  address: collAsset1.address,
899
- price: prices[tokenPrices ? collAsset1.symbol : collAsset1.address],
899
+ price: prices[tokenPrices ? collAsset1.symbol : collAsset1Contract.address],
900
900
  totalSupply: new Dec(totalSupplyShares).mul(token1PerSupplyShare).toString(),
901
901
  canBeSupplied: true,
902
902
  supplyRate: supplyRate1,
@@ -919,7 +919,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
919
919
  const debtAsset0Data: Partial<FluidAssetData> = {
920
920
  symbol: debtAsset0.symbol,
921
921
  address: debtAsset0.address,
922
- price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0.address],
922
+ price: prices[tokenPrices ? debtAsset0.symbol : debtAsset0Contract.address],
923
923
  totalBorrow: new Dec(totalBorrowShares).mul(token0PerBorrowShare).toString(),
924
924
  canBeBorrowed: true,
925
925
  borrowRate: borrowRate0,
@@ -942,7 +942,7 @@ const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStr
942
942
  const debtAsset1Data: Partial<FluidAssetData> = {
943
943
  symbol: debtAsset1.symbol,
944
944
  address: debtAsset1.address,
945
- price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1.address],
945
+ price: prices[tokenPrices ? debtAsset1.symbol : debtAsset1Contract.address],
946
946
  totalBorrow: new Dec(totalBorrowShares).mul(token1PerBorrowShare).toString(),
947
947
  canBeBorrowed: true,
948
948
  borrowRate: borrowRate1,
@@ -1591,7 +1591,7 @@ export const _getUserPositions = async (provider: PublicClient, network: Network
1591
1591
  const data = await view.read.getUserPositions([user]);
1592
1592
 
1593
1593
  const parsedMarketData = await Promise.all(data[1].map(async (vaultData) => parseMarketData(provider, vaultData, network)));
1594
- console.log(parsedMarketData);
1594
+
1595
1595
  const userData = data[0].map((position, i) => ({ ...parseUserData(position, parsedMarketData[i]) }));
1596
1596
 
1597
1597
  return parsedMarketData.map((market, i) => ({
package/src/markets/fluid/index.ts CHANGED
@@ -2475,7 +2475,7 @@ export const FLUID_USDAI_USDT_10_PLASMA = (networkId: NetworkNumber = NetworkNum
2475
2475
  debtAsset0: 'USDT',
2476
2476
  });
2477
2477
 
2478
- export const FLUID_WEETH_ETH_ETH_11_PLASMA = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
2478
+ export const FLUID_ETH_WEETH_ETH_11_PLASMA = (networkId: NetworkNumber = NetworkNumber.Eth): FluidMarketInfo => ({
2479
2479
  stableBased: false,
2480
2480
  btcBased: false,
2481
2481
  wstETHBased: false,
@@ -2483,15 +2483,15 @@ export const FLUID_WEETH_ETH_ETH_11_PLASMA = (networkId: NetworkNumber = Network
2483
2483
  type: FluidVaultType.T2,
2484
2484
  id: 11,
2485
2485
  chainIds: [NetworkNumber.Plasma],
2486
- label: '#11 (weETH-ETH / ETH)',
2487
- shortLabel: 'weETH-ETH/ETH',
2488
- value: FluidPlasmaVersions.FLUID_WEETH_ETH_ETH_11_PLASMA,
2489
- url: 'weeth-eth-eth-11-plasma',
2486
+ label: '#11 (ETH-weETH / ETH)',
2487
+ shortLabel: 'ETH-weETH/ETH',
2488
+ value: FluidPlasmaVersions.FLUID_ETH_WEETH_ETH_11_PLASMA,
2489
+ url: 'eth-weeth-eth-11-plasma',
2490
2490
  marketAddress: '0x0C8C77B7FF4c2aF7F6CEBbe67350A490E3DD6cB3',
2491
2491
  hasSmartCollateral: true,
2492
2492
  hasSmartDebt: false,
2493
- collateralAsset0: 'weETH',
2494
- collateralAsset1: 'ETH',
2493
+ collateralAsset0: 'ETH',
2494
+ collateralAsset1: 'weETH',
2495
2495
  debtAsset0: 'ETH',
2496
2496
  });
2497
2497
 
@@ -2827,7 +2827,7 @@ export const FluidMarkets = (networkId: NetworkNumber) => ({
2827
2827
  [FluidPlasmaVersions.FLUID_XAUT_USDE_8_PLASMA]: FLUID_XAUT_USDE_8_PLASMA(networkId),
2828
2828
  [FluidPlasmaVersions.FLUID_USDE_USDT_9_PLASMA]: FLUID_USDE_USDT_9_PLASMA(networkId),
2829
2829
  [FluidPlasmaVersions.FLUID_USDAI_USDT_10_PLASMA]: FLUID_USDAI_USDT_10_PLASMA(networkId),
2830
- [FluidPlasmaVersions.FLUID_WEETH_ETH_ETH_11_PLASMA]: FLUID_WEETH_ETH_ETH_11_PLASMA(networkId),
2830
+ [FluidPlasmaVersions.FLUID_ETH_WEETH_ETH_11_PLASMA]: FLUID_ETH_WEETH_ETH_11_PLASMA(networkId),
2831
2831
  [FluidPlasmaVersions.FLUID_SUSDE_USDT_USDT_12_PLASMA]: FLUID_SUSDE_USDT_USDT_12_PLASMA(networkId),
2832
2832
  [FluidPlasmaVersions.FLUID_USDE_USDT_USDT_13_PLASMA]: FLUID_USDE_USDT_USDT_13_PLASMA(networkId),
2833
2833
  [FluidPlasmaVersions.FLUID_USDAI_USDT_USDT_14_PLASMA]: FLUID_USDAI_USDT_USDT_14_PLASMA(networkId),
package/src/types/fluid.ts CHANGED
@@ -159,7 +159,7 @@ export enum FluidPlasmaVersions {
159
159
  FLUID_XAUT_USDE_8_PLASMA = 'FLUID_XAUT_USDE_8_PLASMA',
160
160
  FLUID_USDE_USDT_9_PLASMA = 'FLUID_USDE_USDT_9_PLASMA',
161
161
  FLUID_USDAI_USDT_10_PLASMA = 'FLUID_USDAI_USDT_10_PLASMA',
162
- FLUID_WEETH_ETH_ETH_11_PLASMA = 'FLUID_WEETH_ETH_ETH_11_PLASMA',
162
+ FLUID_ETH_WEETH_ETH_11_PLASMA = 'FLUID_ETH_WEETH_ETH_11_PLASMA',
163
163
  FLUID_SUSDE_USDT_USDT_12_PLASMA = 'FLUID_SUSDE_USDT_USDT_12_PLASMA',
164
164
  FLUID_USDE_USDT_USDT_13_PLASMA = 'FLUID_USDE_USDT_USDT_13_PLASMA',
165
165
  FLUID_USDAI_USDT_USDT_14_PLASMA = 'FLUID_USDAI_USDT_USDT_14_PLASMA',