@defisaver/positions-sdk 2.1.22-dev-savings-3 → 2.1.22-dev-savings-4

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.
@@ -1,6 +1,6 @@
1
- import { SavingsData } from '../types';
1
+ import { MorphoVaultType, YearnVaultType } from '../types';
2
2
  import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
3
3
  import * as morphoVaults from './morphoVaults';
4
4
  import * as yearnVaults from './yearnVaults';
5
5
  export { morphoVaults, yearnVaults, };
6
- export declare const getSavingsData: (provider: EthereumProvider, network: NetworkNumber, accounts: EthAddress[]) => Promise<SavingsData>;
6
+ export declare const getSavingsData: (provider: EthereumProvider, network: NetworkNumber, accounts: EthAddress[]) => Promise<Partial<Record<MorphoVaultType | YearnVaultType, import("../types").SavingsVaultData>>>;
@@ -50,20 +50,17 @@ exports.yearnVaults = yearnVaults;
50
50
  const getSavingsData = (provider, network, accounts) => __awaiter(void 0, void 0, void 0, function* () {
51
51
  const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS);
52
52
  const yearnVaultsList = Object.keys(yearnVaults.yearnVaultsOptions.YEARN_VAULTS);
53
- const savingsData = {
54
- morphoVaults: {},
55
- yearnVaults: {},
56
- };
53
+ const savingsData = {};
57
54
  yield Promise.all([
58
55
  ...morphoVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
59
56
  const vault = morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey);
60
57
  const data = yield morphoVaults.getMorphoVaultData(provider, network, vault, accounts);
61
- savingsData.morphoVaults[vaultKey] = data;
58
+ savingsData[vaultKey] = data;
62
59
  })),
63
60
  ...yearnVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
64
61
  const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);
65
62
  const data = yield yearnVaults.getYearnVaultData(provider, network, vault, accounts);
66
- savingsData.yearnVaults[vaultKey] = data;
63
+ savingsData[vaultKey] = data;
67
64
  })),
68
65
  ]);
69
66
  return savingsData;
@@ -101,6 +101,7 @@ const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awai
101
101
  supplied,
102
102
  liquidity,
103
103
  asset: morphoVault.asset,
104
+ optionType: morphoVault.type,
104
105
  };
105
106
  });
106
107
  exports._getMorphoVaultData = _getMorphoVaultData;
@@ -80,6 +80,7 @@ const _getYearnVaultData = (provider, network, yearnVault, accounts) => __awaite
80
80
  liquidity,
81
81
  supplied,
82
82
  asset: yearnVault.asset,
83
+ optionType: yearnVault.type,
83
84
  };
84
85
  });
85
86
  exports._getYearnVaultData = _getYearnVaultData;
@@ -8,12 +8,6 @@ export interface SavingsVaultData {
8
8
  liquidity: string;
9
9
  supplied: Record<EthAddress, string>;
10
10
  asset: string;
11
+ optionType: string;
11
12
  }
12
- export interface SavingsData {
13
- morphoVaults: {
14
- [key in MorphoVaultType]?: SavingsVaultData;
15
- };
16
- yearnVaults: {
17
- [key in YearnVaultType]?: SavingsVaultData;
18
- };
19
- }
13
+ export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType, SavingsVaultData>>;
@@ -1,6 +1,6 @@
1
- import { SavingsData } from '../types';
1
+ import { MorphoVaultType, YearnVaultType } from '../types';
2
2
  import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
3
3
  import * as morphoVaults from './morphoVaults';
4
4
  import * as yearnVaults from './yearnVaults';
5
5
  export { morphoVaults, yearnVaults, };
6
- export declare const getSavingsData: (provider: EthereumProvider, network: NetworkNumber, accounts: EthAddress[]) => Promise<SavingsData>;
6
+ export declare const getSavingsData: (provider: EthereumProvider, network: NetworkNumber, accounts: EthAddress[]) => Promise<Partial<Record<MorphoVaultType | YearnVaultType, import("../types").SavingsVaultData>>>;
@@ -13,20 +13,17 @@ export { morphoVaults, yearnVaults, };
13
13
  export const getSavingsData = (provider, network, accounts) => __awaiter(void 0, void 0, void 0, function* () {
14
14
  const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS);
15
15
  const yearnVaultsList = Object.keys(yearnVaults.yearnVaultsOptions.YEARN_VAULTS);
16
- const savingsData = {
17
- morphoVaults: {},
18
- yearnVaults: {},
19
- };
16
+ const savingsData = {};
20
17
  yield Promise.all([
21
18
  ...morphoVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
22
19
  const vault = morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey);
23
20
  const data = yield morphoVaults.getMorphoVaultData(provider, network, vault, accounts);
24
- savingsData.morphoVaults[vaultKey] = data;
21
+ savingsData[vaultKey] = data;
25
22
  })),
26
23
  ...yearnVaultsList.map((vaultKey) => __awaiter(void 0, void 0, void 0, function* () {
27
24
  const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);
28
25
  const data = yield yearnVaults.getYearnVaultData(provider, network, vault, accounts);
29
- savingsData.yearnVaults[vaultKey] = data;
26
+ savingsData[vaultKey] = data;
30
27
  })),
31
28
  ]);
32
29
  return savingsData;
@@ -61,6 +61,7 @@ export const _getMorphoVaultData = (provider, network, morphoVault, accounts) =>
61
61
  supplied,
62
62
  liquidity,
63
63
  asset: morphoVault.asset,
64
+ optionType: morphoVault.type,
64
65
  };
65
66
  });
66
67
  export function getMorphoVaultData(provider, network, morphoVault, accounts) {
@@ -40,6 +40,7 @@ export const _getYearnVaultData = (provider, network, yearnVault, accounts) => _
40
40
  liquidity,
41
41
  supplied,
42
42
  asset: yearnVault.asset,
43
+ optionType: yearnVault.type,
43
44
  };
44
45
  });
45
46
  export function getYearnVaultData(provider, network, yearnVault, accounts) {
@@ -8,12 +8,6 @@ export interface SavingsVaultData {
8
8
  liquidity: string;
9
9
  supplied: Record<EthAddress, string>;
10
10
  asset: string;
11
+ optionType: string;
11
12
  }
12
- export interface SavingsData {
13
- morphoVaults: {
14
- [key in MorphoVaultType]?: SavingsVaultData;
15
- };
16
- yearnVaults: {
17
- [key in YearnVaultType]?: SavingsVaultData;
18
- };
19
- }
13
+ export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType, SavingsVaultData>>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "2.1.22-dev-savings-3",
3
+ "version": "2.1.22-dev-savings-4",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
@@ -16,21 +16,18 @@ export const getSavingsData = async (
16
16
  const morphoVaultsList = Object.keys(morphoVaults.morphoVaultsOptions.MORPHO_VAULTS) as MorphoVaultType[];
17
17
  const yearnVaultsList = Object.keys(yearnVaults.yearnVaultsOptions.YEARN_VAULTS) as YearnVaultType[];
18
18
 
19
- const savingsData: SavingsData = {
20
- morphoVaults: {},
21
- yearnVaults: {},
22
- };
19
+ const savingsData: SavingsData = {};
23
20
 
24
21
  await Promise.all([
25
22
  ...morphoVaultsList.map(async (vaultKey) => {
26
23
  const vault = morphoVaults.morphoVaultsOptions.getMorphoVault(vaultKey);
27
24
  const data = await morphoVaults.getMorphoVaultData(provider, network, vault, accounts);
28
- savingsData.morphoVaults[vaultKey] = data;
25
+ savingsData[vaultKey] = data;
29
26
  }),
30
27
  ...yearnVaultsList.map(async (vaultKey) => {
31
28
  const vault = yearnVaults.yearnVaultsOptions.getYearnVault(vaultKey);
32
29
  const data = await yearnVaults.getYearnVaultData(provider, network, vault, accounts);
33
- savingsData.yearnVaults[vaultKey] = data;
30
+ savingsData[vaultKey] = data;
34
31
  }),
35
32
  ]);
36
33
 
@@ -66,6 +66,7 @@ export const _getMorphoVaultData = async (provider: Client, network: NetworkNumb
66
66
  supplied,
67
67
  liquidity,
68
68
  asset: morphoVault.asset,
69
+ optionType: morphoVault.type,
69
70
  };
70
71
  };
71
72
 
@@ -43,6 +43,7 @@ export const _getYearnVaultData = async (provider: Client, network: NetworkNumbe
43
43
  liquidity,
44
44
  supplied,
45
45
  asset: yearnVault.asset,
46
+ optionType: yearnVault.type,
46
47
  };
47
48
  };
48
49
 
@@ -10,13 +10,7 @@ export interface SavingsVaultData {
10
10
  liquidity: string,
11
11
  supplied: Record<EthAddress, string>,
12
12
  asset: string,
13
+ optionType: string,
13
14
  }
14
15
 
15
- export interface SavingsData {
16
- morphoVaults: {
17
- [key in MorphoVaultType]?: SavingsVaultData;
18
- };
19
- yearnVaults: {
20
- [key in YearnVaultType]?: SavingsVaultData;
21
- };
22
- }
16
+ export type SavingsData = Partial<Record<MorphoVaultType | YearnVaultType, SavingsVaultData>>;