@defisaver/positions-sdk 2.1.9-fluid-plasma → 2.1.9-fluid-plasma2

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 (4) hide show
  1. package/cjs/fluid/index.js +12 -12
  2. package/esm/fluid/index.js +13 -13
  3. package/package.json +1 -1
  4. package/src/fluid/index.ts +13 -12
package/cjs/fluid/index.js CHANGED
@@ -235,8 +235,8 @@ const getTradingApy = (poolAddress) => __awaiter(void 0, void 0, void 0, functio
235
235
  });
236
236
  const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
237
237
  var _a, _b;
238
- const collAsset = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
239
- const debtAsset = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
238
+ const collAsset = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network).symbol), network);
239
+ const debtAsset = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network).symbol), network);
240
240
  const supplyRate = new decimal_js_1.default(data.supplyRateVault).div(100).toString();
241
241
  const borrowRate = new decimal_js_1.default(data.borrowRateVault).div(100).toString();
242
242
  const oracleScaleFactor = new decimal_js_1.default(27).add(debtAsset.decimals).sub(collAsset.decimals).toString();
@@ -345,9 +345,9 @@ const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
345
345
  });
346
346
  const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
347
347
  var _a, _b, _c;
348
- const collAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
349
- const collAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network);
350
- const debtAsset = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
348
+ const collAsset0 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network).symbol), network);
349
+ const collAsset1 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network).symbol), network);
350
+ const debtAsset = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network).symbol), network);
351
351
  // 18 because collateral is represented in shares for which they use 18 decimals
352
352
  const oracleScaleFactor = new decimal_js_1.default(27).add(debtAsset.decimals).sub(18).toString();
353
353
  const oracleScale = new decimal_js_1.default(10).pow(oracleScaleFactor).toString();
@@ -498,9 +498,9 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
498
498
  });
499
499
  const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
500
500
  var _a, _b, _c, _d;
501
- const collAsset = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
502
- const debtAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
503
- const debtAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken1, network);
501
+ const collAsset = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network).symbol), network);
502
+ const debtAsset0 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network).symbol), network);
503
+ const debtAsset1 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.borrowToken1, network).symbol), network);
504
504
  const { borrowableShares, maxBorrowShares, borrowDexFee, utilizationBorrow0, utilizationBorrow1, borrowable0, borrowable1, borrowRate0, borrowRate1, totalBorrowShares, token0PerBorrowShare, token1PerBorrowShare, borrowableToken0, borrowableToken1, totalBorrowToken0, totalBorrowToken1, reservesBorrowToken0, reservesBorrowToken1, } = (0, fluidHelpers_1.parseDexBorrowData)(data.dexBorrowData, debtAsset0.symbol, debtAsset1.symbol);
505
505
  // 18 because debt is represented in shares for which they use 18 decimals
506
506
  const oracleScaleFactor = new decimal_js_1.default(27).add(18).sub(collAsset.decimals).toString();
@@ -647,10 +647,10 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
647
647
  });
648
648
  const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
649
649
  var _a, _b, _c, _d;
650
- const collAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
651
- const collAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network);
652
- const debtAsset0 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
653
- const debtAsset1 = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken1, network);
650
+ const collAsset0 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network).symbol), network);
651
+ const collAsset1 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.supplyToken1, network).symbol), network);
652
+ const debtAsset0 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network).symbol), network);
653
+ const debtAsset1 = (0, tokens_1.getAssetInfo)((0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(data.borrowToken1, network).symbol), network);
654
654
  const quoteToken = (0, tokens_1.getAssetInfoByAddress)(data.dexBorrowData.quoteToken, network);
655
655
  // 27 - 18 + 18
656
656
  const oracleScaleFactor = new decimal_js_1.default(27).toString();
package/esm/fluid/index.js CHANGED
@@ -12,7 +12,7 @@ import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress, } from '@defisav
12
12
  import { IncentiveKind, NetworkNumber, } from '../types/common';
13
13
  import { FluidVaultType, } from '../types';
14
14
  import { BTCPriceFeedContractViem, DFSFeedRegistryContractViem, ETHPriceFeedContractViem, FeedRegistryContractViem, FluidViewContractViem, } from '../contracts';
15
- import { compareAddresses, DEFAULT_TIMEOUT, getEthAmountForDecimals, isMainnetNetwork, } from '../services/utils';
15
+ import { compareAddresses, DEFAULT_TIMEOUT, getEthAmountForDecimals, getNativeAssetFromWrapped, isMainnetNetwork, } from '../services/utils';
16
16
  import { getFluidAggregatedData, mergeAssetData, mergeUsedAssets, parseDexBorrowData, parseDexSupplyData, } from '../helpers/fluidHelpers';
17
17
  import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
18
18
  import { USD_QUOTE, ZERO_ADDRESS } from '../constants';
@@ -229,8 +229,8 @@ const getTradingApy = (poolAddress) => __awaiter(void 0, void 0, void 0, functio
229
229
  });
230
230
  const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
231
231
  var _a, _b;
232
- const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
233
- const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
232
+ const collAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
233
+ const debtAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
234
234
  const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
235
235
  const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
236
236
  const oracleScaleFactor = new Dec(27).add(debtAsset.decimals).sub(collAsset.decimals).toString();
@@ -339,9 +339,9 @@ const parseT1MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
339
339
  });
340
340
  const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
341
341
  var _a, _b, _c;
342
- const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
343
- const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
344
- const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
342
+ const collAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
343
+ const collAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken1, network).symbol), network);
344
+ const debtAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
345
345
  // 18 because collateral is represented in shares for which they use 18 decimals
346
346
  const oracleScaleFactor = new Dec(27).add(debtAsset.decimals).sub(18).toString();
347
347
  const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
@@ -492,9 +492,9 @@ const parseT2MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
492
492
  });
493
493
  const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
494
494
  var _a, _b, _c, _d;
495
- const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
496
- const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
497
- const debtAsset1 = getAssetInfoByAddress(data.borrowToken1, network);
495
+ const collAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
496
+ const debtAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
497
+ const debtAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken1, network).symbol), network);
498
498
  const { borrowableShares, maxBorrowShares, borrowDexFee, utilizationBorrow0, utilizationBorrow1, borrowable0, borrowable1, borrowRate0, borrowRate1, totalBorrowShares, token0PerBorrowShare, token1PerBorrowShare, borrowableToken0, borrowableToken1, totalBorrowToken0, totalBorrowToken1, reservesBorrowToken0, reservesBorrowToken1, } = parseDexBorrowData(data.dexBorrowData, debtAsset0.symbol, debtAsset1.symbol);
499
499
  // 18 because debt is represented in shares for which they use 18 decimals
500
500
  const oracleScaleFactor = new Dec(27).add(18).sub(collAsset.decimals).toString();
@@ -641,10 +641,10 @@ const parseT3MarketData = (provider_1, data_1, network_1, ...args_1) => __awaite
641
641
  });
642
642
  const parseT4MarketData = (provider_1, data_1, network_1, ...args_1) => __awaiter(void 0, [provider_1, data_1, network_1, ...args_1], void 0, function* (provider, data, network, tokenPrices = null) {
643
643
  var _a, _b, _c, _d;
644
- const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
645
- const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
646
- const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
647
- const debtAsset1 = getAssetInfoByAddress(data.borrowToken1, network);
644
+ const collAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
645
+ const collAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken1, network).symbol), network);
646
+ const debtAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
647
+ const debtAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken1, network).symbol), network);
648
648
  const quoteToken = getAssetInfoByAddress(data.dexBorrowData.quoteToken, network);
649
649
  // 27 - 18 + 18
650
650
  const oracleScaleFactor = new Dec(27).toString();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "2.1.9-fluid-plasma",
3
+ "version": "2.1.9-fluid-plasma2",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/fluid/index.ts CHANGED
@@ -33,6 +33,7 @@ import {
33
33
  compareAddresses,
34
34
  DEFAULT_TIMEOUT,
35
35
  getEthAmountForDecimals,
36
+ getNativeAssetFromWrapped,
36
37
  isMainnetNetwork,
37
38
  } from '../services/utils';
38
39
  import {
@@ -299,8 +300,8 @@ const getTradingApy = async (poolAddress: EthAddress) => {
299
300
  };
300
301
 
301
302
  const parseT1MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
302
- const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
303
- const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
303
+ const collAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
304
+ const debtAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
304
305
 
305
306
  const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
306
307
  const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
@@ -417,9 +418,9 @@ const parseT1MarketData = async (provider: PublicClient, data: FluidVaultDataStr
417
418
  };
418
419
 
419
420
  const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
420
- const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
421
- const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
422
- const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
421
+ const collAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
422
+ const collAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken1, network).symbol), network);
423
+ const debtAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
423
424
 
424
425
  // 18 because collateral is represented in shares for which they use 18 decimals
425
426
  const oracleScaleFactor = new Dec(27).add(debtAsset.decimals).sub(18).toString();
@@ -607,9 +608,9 @@ const parseT2MarketData = async (provider: PublicClient, data: FluidVaultDataStr
607
608
  };
608
609
 
609
610
  const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
610
- const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
611
- const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
612
- const debtAsset1 = getAssetInfoByAddress(data.borrowToken1, network);
611
+ const collAsset = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
612
+ const debtAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
613
+ const debtAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken1, network).symbol), network);
613
614
 
614
615
  const {
615
616
  borrowableShares,
@@ -794,10 +795,10 @@ const parseT3MarketData = async (provider: PublicClient, data: FluidVaultDataStr
794
795
  };
795
796
 
796
797
  const parseT4MarketData = async (provider: PublicClient, data: FluidVaultDataStructOutputStruct, network: NetworkNumber, tokenPrices: Record<string, string> | null = null) => {
797
- const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
798
- const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
799
- const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
800
- const debtAsset1 = getAssetInfoByAddress(data.borrowToken1, network);
798
+ const collAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken0, network).symbol), network);
799
+ const collAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.supplyToken1, network).symbol), network);
800
+ const debtAsset0 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken0, network).symbol), network);
801
+ const debtAsset1 = getAssetInfo(getNativeAssetFromWrapped(getAssetInfoByAddress(data.borrowToken1, network).symbol), network);
801
802
  const quoteToken = getAssetInfoByAddress(data.dexBorrowData.quoteToken, network);
802
803
 
803
804
  // 27 - 18 + 18