@defisaver/positions-sdk 2.1.43-dev-stats-test-1-dev → 2.1.43-dev-stats-test-2-dev

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/aaveV3/index.js +10 -19
  2. package/esm/aaveV3/index.js +10 -19
  3. package/package.json +1 -1
  4. package/src/aaveV3/index.ts +11 -24
package/cjs/aaveV3/index.js CHANGED
@@ -65,25 +65,16 @@ function _getAaveV3MarketData(provider_1, network_1, market_1) {
65
65
  const aaveIncentivesContract = (0, contracts_1.AaveIncentiveDataProviderV3ContractViem)(provider, network);
66
66
  const marketAddress = market.providerAddress;
67
67
  const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt, common_1.NetworkNumber.Linea, common_1.NetworkNumber.Plasma];
68
- console.log({ marketAddress, blockNumber });
69
- console.log('Fetching loan info...');
70
- const loanInfo = yield loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], (0, viem_1.setViemBlockNumber)(blockNumber));
71
- console.log('Fetched loan info');
72
- console.log('Fetching eModes info...');
73
- const eModesInfo = yield loanInfoContract.read.getAllEmodes([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber));
74
- console.log('Fetched eModes info');
75
- console.log('Fetching borrow allowed status...');
76
- let isBorrowAllowed = yield loanInfoContract.read.isBorrowAllowed([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)); // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
77
- console.log('Fetched borrow allowed status');
78
- console.log('Fetching reward info...');
79
- let rewardInfo = networksWithIncentives.includes(network) ? yield aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)) : null;
80
- console.log('Fetched reward info');
81
- console.log('Fetching Merkle campaigns...');
82
- const merkleRewardsMap = yield (0, merkl_1.getMerkleCampaigns)(network);
83
- console.log('Fetched Merkle campaigns');
84
- console.log('Fetching Merit campaigns...');
85
- const meritRewardsMap = yield (0, merit_1.getMeritCampaigns)(network, market.value);
86
- console.log('Fetched Merit campaigns');
68
+ // eslint-disable-next-line prefer-const
69
+ let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap, meritRewardsMap] = yield Promise.all([
70
+ loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], (0, viem_1.setViemBlockNumber)(blockNumber)),
71
+ loanInfoContract.read.getAllEmodes([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
72
+ loanInfoContract.read.isBorrowAllowed([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
73
+ networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)) : null,
74
+ (0, merkl_1.getMerkleCampaigns)(network),
75
+ (0, merit_1.getMeritCampaigns)(network, market.value),
76
+ ]);
77
+ console.log('Fetched tokens, emodes, campaigns, incentives');
87
78
  isBorrowAllowed = (0, utils_1.isLayer2Network)(network) ? isBorrowAllowed : true;
88
79
  const eModeCategoriesData = {};
89
80
  for (let i = 0; i < eModesInfo.length; i++) {
package/esm/aaveV3/index.js CHANGED
@@ -54,25 +54,16 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
54
54
  const aaveIncentivesContract = AaveIncentiveDataProviderV3ContractViem(provider, network);
55
55
  const marketAddress = market.providerAddress;
56
56
  const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt, NetworkNumber.Linea, NetworkNumber.Plasma];
57
- console.log({ marketAddress, blockNumber });
58
- console.log('Fetching loan info...');
59
- const loanInfo = yield loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], setViemBlockNumber(blockNumber));
60
- console.log('Fetched loan info');
61
- console.log('Fetching eModes info...');
62
- const eModesInfo = yield loanInfoContract.read.getAllEmodes([marketAddress], setViemBlockNumber(blockNumber));
63
- console.log('Fetched eModes info');
64
- console.log('Fetching borrow allowed status...');
65
- let isBorrowAllowed = yield loanInfoContract.read.isBorrowAllowed([marketAddress], setViemBlockNumber(blockNumber)); // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
66
- console.log('Fetched borrow allowed status');
67
- console.log('Fetching reward info...');
68
- let rewardInfo = networksWithIncentives.includes(network) ? yield aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], setViemBlockNumber(blockNumber)) : null;
69
- console.log('Fetched reward info');
70
- console.log('Fetching Merkle campaigns...');
71
- const merkleRewardsMap = yield getMerkleCampaigns(network);
72
- console.log('Fetched Merkle campaigns');
73
- console.log('Fetching Merit campaigns...');
74
- const meritRewardsMap = yield getMeritCampaigns(network, market.value);
75
- console.log('Fetched Merit campaigns');
57
+ // eslint-disable-next-line prefer-const
58
+ let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap, meritRewardsMap] = yield Promise.all([
59
+ loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], setViemBlockNumber(blockNumber)),
60
+ loanInfoContract.read.getAllEmodes([marketAddress], setViemBlockNumber(blockNumber)),
61
+ loanInfoContract.read.isBorrowAllowed([marketAddress], setViemBlockNumber(blockNumber)), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
62
+ networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], setViemBlockNumber(blockNumber)) : null,
63
+ getMerkleCampaigns(network),
64
+ getMeritCampaigns(network, market.value),
65
+ ]);
66
+ console.log('Fetched tokens, emodes, campaigns, incentives');
76
67
  isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
77
68
  const eModeCategoriesData = {};
78
69
  for (let i = 0; i < eModesInfo.length; i++) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "2.1.43-dev-stats-test-1-dev",
3
+ "version": "2.1.43-dev-stats-test-2-dev",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/aaveV3/index.ts CHANGED
@@ -86,30 +86,17 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
86
86
  const marketAddress = market.providerAddress;
87
87
  const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt, NetworkNumber.Linea, NetworkNumber.Plasma];
88
88
 
89
- console.log({ marketAddress, blockNumber });
90
- console.log('Fetching loan info...');
91
- const loanInfo = await loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses as EthAddress[]], setViemBlockNumber(blockNumber));
92
- console.log('Fetched loan info');
93
-
94
- console.log('Fetching eModes info...');
95
- const eModesInfo = await loanInfoContract.read.getAllEmodes([marketAddress], setViemBlockNumber(blockNumber));
96
- console.log('Fetched eModes info');
97
-
98
- console.log('Fetching borrow allowed status...');
99
- let isBorrowAllowed = await loanInfoContract.read.isBorrowAllowed([marketAddress], setViemBlockNumber(blockNumber)); // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
100
- console.log('Fetched borrow allowed status');
101
-
102
- console.log('Fetching reward info...');
103
- let rewardInfo = networksWithIncentives.includes(network) ? await aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], setViemBlockNumber(blockNumber)) : null;
104
- console.log('Fetched reward info');
105
-
106
- console.log('Fetching Merkle campaigns...');
107
- const merkleRewardsMap = await getMerkleCampaigns(network);
108
- console.log('Fetched Merkle campaigns');
109
-
110
- console.log('Fetching Merit campaigns...');
111
- const meritRewardsMap = await getMeritCampaigns(network, market.value);
112
- console.log('Fetched Merit campaigns');
89
+ // eslint-disable-next-line prefer-const
90
+ let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap, meritRewardsMap] = await Promise.all([
91
+ loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses as EthAddress[]], setViemBlockNumber(blockNumber)),
92
+ loanInfoContract.read.getAllEmodes([marketAddress], setViemBlockNumber(blockNumber)),
93
+ loanInfoContract.read.isBorrowAllowed([marketAddress], setViemBlockNumber(blockNumber)), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
94
+ networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], setViemBlockNumber(blockNumber)) : null,
95
+ getMerkleCampaigns(network),
96
+ getMeritCampaigns(network, market.value),
97
+ ]);
98
+ console.log('Fetched tokens, emodes, campaigns, incentives');
99
+
113
100
  isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
114
101
 
115
102
  const eModeCategoriesData: EModeCategoriesData = {};