@defisaver/positions-sdk 1.0.26-dev-portfolio-12 → 1.0.26-dev-portfolio-14

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/portfolio/index.d.ts +1 -1
  2. package/cjs/portfolio/index.js +6 -5
  3. package/esm/portfolio/index.d.ts +1 -1
  4. package/esm/portfolio/index.js +6 -5
  5. package/package.json +1 -1
  6. package/src/portfolio/index.ts +7 -6
package/cjs/portfolio/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
2
2
  import { PortfolioPositionsData, PortfolioPositionsDataSlower } from '../types';
3
- export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[]): Promise<PortfolioPositionsData>;
3
+ export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], summerFiAddresses: EthAddress[]): Promise<PortfolioPositionsData>;
4
4
  export declare function getPortfolioDataSlower(provider: EthereumProvider, network: NetworkNumber, addresses: EthAddress[]): Promise<PortfolioPositionsDataSlower>;
package/cjs/portfolio/index.js CHANGED
@@ -34,7 +34,7 @@ const liquity_1 = require("../liquity");
34
34
  const liquityV2_1 = require("../liquityV2");
35
35
  const fluid_1 = require("../fluid");
36
36
  const eulerHelpers_1 = require("../helpers/eulerHelpers");
37
- function getPortfolioData(provider, network, defaultProvider, addresses) {
37
+ function getPortfolioData(provider, network, defaultProvider, addresses, summerFiAddresses) {
38
38
  return __awaiter(this, void 0, void 0, function* () {
39
39
  const isMainnet = network === common_1.NetworkNumber.Eth;
40
40
  const morphoMarkets = Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network));
@@ -102,8 +102,9 @@ function getPortfolioData(provider, network, defaultProvider, addresses) {
102
102
  compoundV2MarketsData[market.value] = marketData;
103
103
  })),
104
104
  ]);
105
+ const allAddresses = [...addresses, ...summerFiAddresses];
105
106
  const positions = {};
106
- for (const address of addresses) {
107
+ for (const address of allAddresses) {
107
108
  positions[address.toLowerCase()] = {
108
109
  aaveV3: {},
109
110
  morphoBlue: {},
@@ -117,7 +118,7 @@ function getPortfolioData(provider, network, defaultProvider, addresses) {
117
118
  };
118
119
  }
119
120
  yield Promise.all([
120
- ...aaveV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
121
+ ...aaveV3Markets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
121
122
  const accData = yield (0, aaveV3_1._getAaveV3AccountData)(client, network, address, Object.assign({ selectedMarket: market }, aaveV3MarketsData[market.value]));
122
123
  if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
123
124
  positions[address.toLowerCase()].aaveV3[market.value] = accData;
@@ -132,7 +133,7 @@ function getPortfolioData(provider, network, defaultProvider, addresses) {
132
133
  if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
133
134
  positions[address.toLowerCase()].compoundV3[market.value] = accData;
134
135
  }))).flat(),
135
- ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
136
+ ...sparkMarkets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
136
137
  const accData = yield (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData });
137
138
  if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
138
139
  positions[address.toLowerCase()].spark[market.value] = accData;
@@ -221,7 +222,7 @@ function getPortfolioDataSlower(provider, network, addresses) {
221
222
  const userPositions = yield (0, fluid_1._getUserPositions)(client, network, address);
222
223
  for (const position of userPositions) {
223
224
  if (new decimal_js_1.default(position.userData.suppliedUsd).gt(0)) {
224
- positions[address.toLowerCase()].fluid[position.userData.vaultId] = position.userData;
225
+ positions[address.toLowerCase()].fluid[position.userData.nftId] = position.userData;
225
226
  }
226
227
  }
227
228
  })),
package/esm/portfolio/index.d.ts CHANGED
@@ -1,4 +1,4 @@
1
1
  import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
2
2
  import { PortfolioPositionsData, PortfolioPositionsDataSlower } from '../types';
3
- export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[]): Promise<PortfolioPositionsData>;
3
+ export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], summerFiAddresses: EthAddress[]): Promise<PortfolioPositionsData>;
4
4
  export declare function getPortfolioDataSlower(provider: EthereumProvider, network: NetworkNumber, addresses: EthAddress[]): Promise<PortfolioPositionsDataSlower>;
package/esm/portfolio/index.js CHANGED
@@ -27,7 +27,7 @@ import { _getLiquityTroveInfo } from '../liquity';
27
27
  import { _getLiquityV2MarketData, _getLiquityV2TroveData, _getLiquityV2UserTroveIds } from '../liquityV2';
28
28
  import { _getUserPositions } from '../fluid';
29
29
  import { getEulerV2SubAccounts } from '../helpers/eulerHelpers';
30
- export function getPortfolioData(provider, network, defaultProvider, addresses) {
30
+ export function getPortfolioData(provider, network, defaultProvider, addresses, summerFiAddresses) {
31
31
  return __awaiter(this, void 0, void 0, function* () {
32
32
  const isMainnet = network === NetworkNumber.Eth;
33
33
  const morphoMarkets = Object.values(MorphoBlueMarkets(network)).filter((market) => market.chainIds.includes(network));
@@ -95,8 +95,9 @@ export function getPortfolioData(provider, network, defaultProvider, addresses)
95
95
  compoundV2MarketsData[market.value] = marketData;
96
96
  })),
97
97
  ]);
98
+ const allAddresses = [...addresses, ...summerFiAddresses];
98
99
  const positions = {};
99
- for (const address of addresses) {
100
+ for (const address of allAddresses) {
100
101
  positions[address.toLowerCase()] = {
101
102
  aaveV3: {},
102
103
  morphoBlue: {},
@@ -110,7 +111,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses)
110
111
  };
111
112
  }
112
113
  yield Promise.all([
113
- ...aaveV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
114
+ ...aaveV3Markets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
114
115
  const accData = yield _getAaveV3AccountData(client, network, address, Object.assign({ selectedMarket: market }, aaveV3MarketsData[market.value]));
115
116
  if (new Dec(accData.suppliedUsd).gt(0))
116
117
  positions[address.toLowerCase()].aaveV3[market.value] = accData;
@@ -125,7 +126,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses)
125
126
  if (new Dec(accData.suppliedUsd).gt(0))
126
127
  positions[address.toLowerCase()].compoundV3[market.value] = accData;
127
128
  }))).flat(),
128
- ...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
129
+ ...sparkMarkets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
129
130
  const accData = yield _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData });
130
131
  if (new Dec(accData.suppliedUsd).gt(0))
131
132
  positions[address.toLowerCase()].spark[market.value] = accData;
@@ -214,7 +215,7 @@ export function getPortfolioDataSlower(provider, network, addresses) {
214
215
  const userPositions = yield _getUserPositions(client, network, address);
215
216
  for (const position of userPositions) {
216
217
  if (new Dec(position.userData.suppliedUsd).gt(0)) {
217
- positions[address.toLowerCase()].fluid[position.userData.vaultId] = position.userData;
218
+ positions[address.toLowerCase()].fluid[position.userData.nftId] = position.userData;
218
219
  }
219
220
  }
220
221
  })),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "1.0.26-dev-portfolio-12",
3
+ "version": "1.0.26-dev-portfolio-14",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/portfolio/index.ts CHANGED
@@ -16,7 +16,6 @@ import {
16
16
  CrvUSDGlobalMarketData,
17
17
  EulerV2FullMarketData,
18
18
  LiquityV2MarketData,
19
- LiquityV2Versions,
20
19
  LlamaLendGlobalMarketData,
21
20
  MorphoBlueMarketInfo,
22
21
  PortfolioPositionsData,
@@ -39,7 +38,7 @@ import { _getLiquityV2MarketData, _getLiquityV2TroveData, _getLiquityV2UserTrove
39
38
  import { _getUserPositions } from '../fluid';
40
39
  import { getEulerV2SubAccounts } from '../helpers/eulerHelpers';
41
40
 
42
- export async function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[]): Promise<PortfolioPositionsData> {
41
+ export async function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], summerFiAddresses: EthAddress[]): Promise<PortfolioPositionsData> {
43
42
  const isMainnet = network === NetworkNumber.Eth;
44
43
 
45
44
  const morphoMarkets = Object.values(MorphoBlueMarkets(network)).filter((market) => market.chainIds.includes(network));
@@ -110,8 +109,10 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
110
109
  }),
111
110
  ]);
112
111
 
112
+ const allAddresses = [...addresses, ...summerFiAddresses];
113
+
113
114
  const positions: PortfolioPositionsData = {};
114
- for (const address of addresses) {
115
+ for (const address of allAddresses) {
115
116
  positions[address.toLowerCase() as EthAddress] = {
116
117
  aaveV3: {},
117
118
  morphoBlue: {},
@@ -126,7 +127,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
126
127
  }
127
128
 
128
129
  await Promise.all([
129
- ...aaveV3Markets.map((market) => addresses.map(async (address) => {
130
+ ...aaveV3Markets.map((market) => allAddresses.map(async (address) => {
130
131
  const accData = await _getAaveV3AccountData(client, network, address, { selectedMarket: market, ...aaveV3MarketsData[market.value] });
131
132
  if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].aaveV3[market.value] = accData;
132
133
  })).flat(),
@@ -138,7 +139,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
138
139
  const accData = await _getCompoundV3AccountData(client, network, address, ZERO_ADDRESS, { selectedMarket: market, assetsData: compoundV3MarketsData[market.value].assetsData });
139
140
  if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].compoundV3[market.value] = accData;
140
141
  })).flat(),
141
- ...sparkMarkets.map((market) => addresses.map(async (address) => {
142
+ ...sparkMarkets.map((market) => allAddresses.map(async (address) => {
142
143
  const accData = await _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData });
143
144
  if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].spark[market.value] = accData;
144
145
  })).flat(),
@@ -223,7 +224,7 @@ export async function getPortfolioDataSlower(provider: EthereumProvider, network
223
224
  const userPositions = await _getUserPositions(client, network, address);
224
225
  for (const position of userPositions) {
225
226
  if (new Dec(position.userData.suppliedUsd).gt(0)) {
226
- positions[address.toLowerCase() as EthAddress].fluid[position.userData.vaultId] = position.userData;
227
+ positions[address.toLowerCase() as EthAddress].fluid[position.userData.nftId] = position.userData;
227
228
  }
228
229
  }
229
230
  }),