@defisaver/positions-sdk 0.0.201-fluid-dev-12 → 0.0.201-fluid-dev-13

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.d.ts +4 -4
  2. package/cjs/fluid/index.js +14 -9
  3. package/esm/fluid/index.d.ts +4 -4
  4. package/esm/fluid/index.js +14 -9
  5. package/package.json +1 -1
  6. package/src/fluid/index.ts +15 -9
package/cjs/fluid/index.d.ts CHANGED
@@ -26,17 +26,17 @@ export declare const EMPTY_FLUID_DATA: {
26
26
  automationResubscribeRequired: boolean;
27
27
  lastUpdated: number;
28
28
  };
29
- export declare const getFluidMarketData: (web3: Web3, network: NetworkNumber, market: FluidMarketInfo) => Promise<FluidMarketData>;
29
+ export declare const getFluidMarketData: (web3: Web3, network: NetworkNumber, market: FluidMarketInfo, mainnetWeb3: Web3) => Promise<FluidMarketData>;
30
30
  export declare const getFluidVaultIdsForUser: (web3: Web3, network: NetworkNumber, user: EthAddress) => Promise<string[]>;
31
31
  export declare const getFluidPosition: (web3: Web3, network: NetworkNumber, vaultId: string, extractedState: {
32
32
  assetsData: FluidAssetsData;
33
33
  marketData: InnerFluidMarketData;
34
34
  }) => Promise<FluidVaultData>;
35
- export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNumber, vaultId: string) => Promise<{
35
+ export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNumber, vaultId: string, mainnetWeb3: Web3) => Promise<{
36
36
  userData: FluidVaultData;
37
37
  marketData: FluidMarketData;
38
38
  }>;
39
- export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3) => Promise<FluidMarketData[]>;
39
+ export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3, mainnetWeb3: Web3) => Promise<FluidMarketData[]>;
40
40
  export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, token: string) => Promise<{
41
41
  fTokenAddress: any;
42
42
  fTokenSymbol: string;
@@ -59,7 +59,7 @@ export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, t
59
59
  deposited: string;
60
60
  depositedShares: string;
61
61
  }>;
62
- export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress) => Promise<{
62
+ export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress, mainnetWeb3: Web3) => Promise<{
63
63
  marketData: FluidMarketData;
64
64
  userData: {
65
65
  nftId: string;
package/cjs/fluid/index.js CHANGED
@@ -24,6 +24,7 @@ const multicall_1 = require("../multicall");
24
24
  const markets_1 = require("../markets");
25
25
  const constants_1 = require("../constants");
26
26
  const priceService_1 = require("../services/priceService");
27
+ const staking_1 = require("../staking");
27
28
  exports.EMPTY_USED_ASSET = {
28
29
  isSupplied: false,
29
30
  isBorrowed: false,
@@ -43,7 +44,7 @@ const parseVaultType = (vaultType) => {
43
44
  default: return types_1.FluidVaultType.Unknown;
44
45
  }
45
46
  };
46
- const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void 0, function* () {
47
+ const parseMarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
47
48
  const collAsset = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
48
49
  const debtAsset = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
49
50
  const supplyRate = new decimal_js_1.default(data.supplyRateVault).div(100).toString();
@@ -81,6 +82,10 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
81
82
  supplyRate,
82
83
  borrowRate: '0',
83
84
  };
85
+ if (staking_1.STAKING_ASSETS.includes(collAsset.symbol)) {
86
+ collAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset.symbol, mainnetWeb3);
87
+ collAssetData.incentiveSupplyToken = collAsset.symbol;
88
+ }
84
89
  const debtAssetData = {
85
90
  symbol: debtAsset.symbol,
86
91
  address: debtAsset.address,
@@ -175,10 +180,10 @@ const parseUserData = (userPositionData, vaultData) => {
175
180
  marketData,
176
181
  }));
177
182
  };
178
- const getFluidMarketData = (web3, network, market) => __awaiter(void 0, void 0, void 0, function* () {
183
+ const getFluidMarketData = (web3, network, market, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
179
184
  const view = (0, contracts_1.FluidViewContract)(web3, network);
180
185
  const data = yield view.methods.getVaultData(market.marketAddress).call();
181
- return parseMarketData(web3, data, network);
186
+ return parseMarketData(web3, data, network, mainnetWeb3);
182
187
  });
183
188
  exports.getFluidMarketData = getFluidMarketData;
184
189
  const getFluidVaultIdsForUser = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
@@ -193,10 +198,10 @@ const getFluidPosition = (web3, network, vaultId, extractedState) => __awaiter(v
193
198
  return parseUserData(userPositionData, extractedState);
194
199
  });
195
200
  exports.getFluidPosition = getFluidPosition;
196
- const getFluidPositionWithMarket = (web3, network, vaultId) => __awaiter(void 0, void 0, void 0, function* () {
201
+ const getFluidPositionWithMarket = (web3, network, vaultId, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
197
202
  const view = (0, contracts_1.FluidViewContract)(web3, network);
198
203
  const data = yield view.methods.getPositionByNftId(vaultId).call();
199
- const marketData = yield parseMarketData(web3, data.vault, network);
204
+ const marketData = yield parseMarketData(web3, data.vault, network, mainnetWeb3);
200
205
  const userData = parseUserData(data.position, marketData);
201
206
  return {
202
207
  userData,
@@ -204,7 +209,7 @@ const getFluidPositionWithMarket = (web3, network, vaultId) => __awaiter(void 0,
204
209
  };
205
210
  });
206
211
  exports.getFluidPositionWithMarket = getFluidPositionWithMarket;
207
- const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0, void 0, function* () {
212
+ const getAllFluidMarketDataChunked = (network, web3, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
208
213
  const versions = (0, markets_1.getFluidVersionsDataForNetwork)(network);
209
214
  const view = (0, contracts_1.FluidViewContract)(web3, network);
210
215
  const calls = versions.map((version) => ({
@@ -214,7 +219,7 @@ const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0
214
219
  }));
215
220
  const data = yield (0, multicall_1.chunkAndMulticall)(calls, 10, 'latest', web3, network);
216
221
  // @ts-ignore
217
- return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network); })));
222
+ return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network, mainnetWeb3); })));
218
223
  });
219
224
  exports.getAllFluidMarketDataChunked = getAllFluidMarketDataChunked;
220
225
  const getFluidTokenData = (web3, network, token) => __awaiter(void 0, void 0, void 0, function* () {
@@ -261,10 +266,10 @@ const getFluidDepositData = (web3, network, token, address) => __awaiter(void 0,
261
266
  };
262
267
  });
263
268
  exports.getFluidDepositData = getFluidDepositData;
264
- const getUserPositions = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
269
+ const getUserPositions = (web3, network, user, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
265
270
  const view = (0, contracts_1.FluidViewContract)(web3, network);
266
271
  const data = yield view.methods.getUserPositions(user).call();
267
- const parsedMarketData = yield Promise.all(data.vaults.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, vaultData, network); })));
272
+ const parsedMarketData = yield Promise.all(data.vaults.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, vaultData, network, mainnetWeb3); })));
268
273
  const userData = data.positions.map((position, i) => (Object.assign(Object.assign({}, parseUserData(position, parsedMarketData[i])), { nftId: position.nftId })));
269
274
  return parsedMarketData.map((market, i) => ({
270
275
  marketData: market,
package/esm/fluid/index.d.ts CHANGED
@@ -26,17 +26,17 @@ export declare const EMPTY_FLUID_DATA: {
26
26
  automationResubscribeRequired: boolean;
27
27
  lastUpdated: number;
28
28
  };
29
- export declare const getFluidMarketData: (web3: Web3, network: NetworkNumber, market: FluidMarketInfo) => Promise<FluidMarketData>;
29
+ export declare const getFluidMarketData: (web3: Web3, network: NetworkNumber, market: FluidMarketInfo, mainnetWeb3: Web3) => Promise<FluidMarketData>;
30
30
  export declare const getFluidVaultIdsForUser: (web3: Web3, network: NetworkNumber, user: EthAddress) => Promise<string[]>;
31
31
  export declare const getFluidPosition: (web3: Web3, network: NetworkNumber, vaultId: string, extractedState: {
32
32
  assetsData: FluidAssetsData;
33
33
  marketData: InnerFluidMarketData;
34
34
  }) => Promise<FluidVaultData>;
35
- export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNumber, vaultId: string) => Promise<{
35
+ export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNumber, vaultId: string, mainnetWeb3: Web3) => Promise<{
36
36
  userData: FluidVaultData;
37
37
  marketData: FluidMarketData;
38
38
  }>;
39
- export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3) => Promise<FluidMarketData[]>;
39
+ export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3, mainnetWeb3: Web3) => Promise<FluidMarketData[]>;
40
40
  export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, token: string) => Promise<{
41
41
  fTokenAddress: any;
42
42
  fTokenSymbol: string;
@@ -59,7 +59,7 @@ export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, t
59
59
  deposited: string;
60
60
  depositedShares: string;
61
61
  }>;
62
- export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress) => Promise<{
62
+ export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress, mainnetWeb3: Web3) => Promise<{
63
63
  marketData: FluidMarketData;
64
64
  userData: {
65
65
  nftId: string;
package/esm/fluid/index.js CHANGED
@@ -18,6 +18,7 @@ import { chunkAndMulticall } from '../multicall';
18
18
  import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
19
19
  import { USD_QUOTE } from '../constants';
20
20
  import { getChainlinkAssetAddress, getWstETHPriceFluid } from '../services/priceService';
21
+ import { getStakingApy, STAKING_ASSETS } from '../staking';
21
22
  export const EMPTY_USED_ASSET = {
22
23
  isSupplied: false,
23
24
  isBorrowed: false,
@@ -37,7 +38,7 @@ const parseVaultType = (vaultType) => {
37
38
  default: return FluidVaultType.Unknown;
38
39
  }
39
40
  };
40
- const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void 0, function* () {
41
+ const parseMarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
41
42
  const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
42
43
  const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
43
44
  const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
@@ -75,6 +76,10 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
75
76
  supplyRate,
76
77
  borrowRate: '0',
77
78
  };
79
+ if (STAKING_ASSETS.includes(collAsset.symbol)) {
80
+ collAssetData.incentiveSupplyApy = yield getStakingApy(collAsset.symbol, mainnetWeb3);
81
+ collAssetData.incentiveSupplyToken = collAsset.symbol;
82
+ }
78
83
  const debtAssetData = {
79
84
  symbol: debtAsset.symbol,
80
85
  address: debtAsset.address,
@@ -169,10 +174,10 @@ const parseUserData = (userPositionData, vaultData) => {
169
174
  marketData,
170
175
  }));
171
176
  };
172
- export const getFluidMarketData = (web3, network, market) => __awaiter(void 0, void 0, void 0, function* () {
177
+ export const getFluidMarketData = (web3, network, market, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
173
178
  const view = FluidViewContract(web3, network);
174
179
  const data = yield view.methods.getVaultData(market.marketAddress).call();
175
- return parseMarketData(web3, data, network);
180
+ return parseMarketData(web3, data, network, mainnetWeb3);
176
181
  });
177
182
  export const getFluidVaultIdsForUser = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
178
183
  const view = FluidViewContract(web3, network);
@@ -184,17 +189,17 @@ export const getFluidPosition = (web3, network, vaultId, extractedState) => __aw
184
189
  const userPositionData = data[0];
185
190
  return parseUserData(userPositionData, extractedState);
186
191
  });
187
- export const getFluidPositionWithMarket = (web3, network, vaultId) => __awaiter(void 0, void 0, void 0, function* () {
192
+ export const getFluidPositionWithMarket = (web3, network, vaultId, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
188
193
  const view = FluidViewContract(web3, network);
189
194
  const data = yield view.methods.getPositionByNftId(vaultId).call();
190
- const marketData = yield parseMarketData(web3, data.vault, network);
195
+ const marketData = yield parseMarketData(web3, data.vault, network, mainnetWeb3);
191
196
  const userData = parseUserData(data.position, marketData);
192
197
  return {
193
198
  userData,
194
199
  marketData,
195
200
  };
196
201
  });
197
- export const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0, void 0, function* () {
202
+ export const getAllFluidMarketDataChunked = (network, web3, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
198
203
  const versions = getFluidVersionsDataForNetwork(network);
199
204
  const view = FluidViewContract(web3, network);
200
205
  const calls = versions.map((version) => ({
@@ -204,7 +209,7 @@ export const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0,
204
209
  }));
205
210
  const data = yield chunkAndMulticall(calls, 10, 'latest', web3, network);
206
211
  // @ts-ignore
207
- return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network); })));
212
+ return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network, mainnetWeb3); })));
208
213
  });
209
214
  export const getFluidTokenData = (web3, network, token) => __awaiter(void 0, void 0, void 0, function* () {
210
215
  const view = FluidViewContract(web3, network);
@@ -248,10 +253,10 @@ export const getFluidDepositData = (web3, network, token, address) => __awaiter(
248
253
  depositedShares: getEthAmountForDecimals(userPosition.fTokenShares, decimals),
249
254
  };
250
255
  });
251
- export const getUserPositions = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
256
+ export const getUserPositions = (web3, network, user, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
252
257
  const view = FluidViewContract(web3, network);
253
258
  const data = yield view.methods.getUserPositions(user).call();
254
- const parsedMarketData = yield Promise.all(data.vaults.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, vaultData, network); })));
259
+ const parsedMarketData = yield Promise.all(data.vaults.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, vaultData, network, mainnetWeb3); })));
255
260
  const userData = data.positions.map((position, i) => (Object.assign(Object.assign({}, parseUserData(position, parsedMarketData[i])), { nftId: position.nftId })));
256
261
  return parsedMarketData.map((market, i) => ({
257
262
  marketData: market,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "0.0.201-fluid-dev-12",
3
+ "version": "0.0.201-fluid-dev-13",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/fluid/index.ts CHANGED
@@ -20,6 +20,7 @@ import { chunkAndMulticall } from '../multicall';
20
20
  import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
21
21
  import { USD_QUOTE } from '../constants';
22
22
  import { getChainlinkAssetAddress, getWstETHPriceFluid } from '../services/priceService';
23
+ import { getStakingApy, STAKING_ASSETS } from '../staking';
23
24
 
24
25
  export const EMPTY_USED_ASSET = {
25
26
  isSupplied: false,
@@ -42,7 +43,7 @@ const parseVaultType = (vaultType: number) => {
42
43
  }
43
44
  };
44
45
 
45
- const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutputStruct, network: NetworkNumber) => {
46
+ const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutputStruct, network: NetworkNumber, mainnetWeb3: Web3) => {
46
47
  const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
47
48
  const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
48
49
 
@@ -85,6 +86,11 @@ const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutput
85
86
  borrowRate: '0',
86
87
  };
87
88
 
89
+ if (STAKING_ASSETS.includes(collAsset.symbol)) {
90
+ collAssetData.incentiveSupplyApy = await getStakingApy(collAsset.symbol, mainnetWeb3);
91
+ collAssetData.incentiveSupplyToken = collAsset.symbol;
92
+ }
93
+
88
94
  const debtAssetData: FluidAssetData = {
89
95
  symbol: debtAsset.symbol,
90
96
  address: debtAsset.address,
@@ -218,12 +224,12 @@ const parseUserData = (userPositionData: FluidView.UserPositionStructOutputStruc
218
224
  };
219
225
  };
220
226
 
221
- export const getFluidMarketData = async (web3: Web3, network: NetworkNumber, market: FluidMarketInfo) => {
227
+ export const getFluidMarketData = async (web3: Web3, network: NetworkNumber, market: FluidMarketInfo, mainnetWeb3: Web3) => {
222
228
  const view = FluidViewContract(web3, network);
223
229
 
224
230
  const data = await view.methods.getVaultData(market.marketAddress).call();
225
231
 
226
- return parseMarketData(web3, data, network);
232
+ return parseMarketData(web3, data, network, mainnetWeb3);
227
233
  };
228
234
 
229
235
  export const getFluidVaultIdsForUser = async (web3: Web3,
@@ -253,10 +259,10 @@ export const getFluidPosition = async (
253
259
  return parseUserData(userPositionData, extractedState);
254
260
  };
255
261
 
256
- export const getFluidPositionWithMarket = async (web3: Web3, network: NetworkNumber, vaultId: string) => {
262
+ export const getFluidPositionWithMarket = async (web3: Web3, network: NetworkNumber, vaultId: string, mainnetWeb3: Web3) => {
257
263
  const view = FluidViewContract(web3, network);
258
264
  const data = await view.methods.getPositionByNftId(vaultId).call();
259
- const marketData = await parseMarketData(web3, data.vault, network);
265
+ const marketData = await parseMarketData(web3, data.vault, network, mainnetWeb3);
260
266
  const userData = parseUserData(data.position, marketData);
261
267
 
262
268
  return {
@@ -265,7 +271,7 @@ export const getFluidPositionWithMarket = async (web3: Web3, network: NetworkNum
265
271
  };
266
272
  };
267
273
 
268
- export const getAllFluidMarketDataChunked = async (network: NetworkNumber, web3: Web3) => {
274
+ export const getAllFluidMarketDataChunked = async (network: NetworkNumber, web3: Web3, mainnetWeb3: Web3) => {
269
275
  const versions = getFluidVersionsDataForNetwork(network);
270
276
  const view = FluidViewContract(web3, network);
271
277
  const calls = versions.map((version) => ({
@@ -276,7 +282,7 @@ export const getAllFluidMarketDataChunked = async (network: NetworkNumber, web3:
276
282
 
277
283
  const data = await chunkAndMulticall(calls, 10, 'latest', web3, network);
278
284
  // @ts-ignore
279
- return Promise.all(data.map(async (item, i) => parseMarketData(web3, item.vaultData, network)));
285
+ return Promise.all(data.map(async (item, i) => parseMarketData(web3, item.vaultData, network, mainnetWeb3)));
280
286
  };
281
287
 
282
288
  export const getFluidTokenData = async (web3: Web3, network: NetworkNumber, token: string) => {
@@ -328,12 +334,12 @@ export const getFluidDepositData = async (web3: Web3, network: NetworkNumber, to
328
334
  };
329
335
  };
330
336
 
331
- export const getUserPositions = async (web3: Web3, network: NetworkNumber, user: EthAddress) => {
337
+ export const getUserPositions = async (web3: Web3, network: NetworkNumber, user: EthAddress, mainnetWeb3: Web3) => {
332
338
  const view = FluidViewContract(web3, network);
333
339
 
334
340
  const data = await view.methods.getUserPositions(user).call();
335
341
 
336
- const parsedMarketData = await Promise.all(data.vaults.map(async (vaultData) => parseMarketData(web3, vaultData, network)));
342
+ const parsedMarketData = await Promise.all(data.vaults.map(async (vaultData) => parseMarketData(web3, vaultData, network, mainnetWeb3)));
337
343
 
338
344
  const userData = data.positions.map((position, i) => ({ ...parseUserData(position, parsedMarketData[i]), nftId: position.nftId }));
339
345