@defisaver/positions-sdk 2.1.161-portfolio-api-2-dev → 2.1.162-npm-token-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 (101) hide show
  1. package/cjs/aaveV3/index.d.ts +12 -2
  2. package/cjs/aaveV3/index.js +7 -1
  3. package/cjs/aaveV3/sgho.d.ts +16 -2
  4. package/cjs/claiming/aaveV3.d.ts +2 -2
  5. package/cjs/claiming/ethena.d.ts +1 -2
  6. package/cjs/claiming/king.d.ts +1 -2
  7. package/cjs/claiming/spark.d.ts +2 -2
  8. package/cjs/fluid/index.d.ts +49 -5
  9. package/cjs/helpers/aaveHelpers/index.d.ts +9 -1
  10. package/cjs/helpers/aaveHelpers/index.js +23 -6
  11. package/cjs/liquity/index.d.ts +12 -2
  12. package/cjs/liquityV2/index.d.ts +23 -3
  13. package/cjs/portfolio/index.d.ts +5 -5
  14. package/cjs/portfolio/index.js +36 -51
  15. package/cjs/savings/index.js +5 -2
  16. package/cjs/savings/morphoVaults/index.d.ts +1 -1
  17. package/cjs/savings/morphoVaults/index.js +56 -18
  18. package/cjs/savings/morphoVaults/options.d.ts +2 -0
  19. package/cjs/savings/morphoVaults/options.js +61 -1
  20. package/cjs/spark/index.js +1 -0
  21. package/cjs/types/aave.d.ts +3 -98
  22. package/cjs/types/compound.d.ts +2 -26
  23. package/cjs/types/curveUsd.d.ts +1 -9
  24. package/cjs/types/fluid.d.ts +0 -13
  25. package/cjs/types/index.d.ts +0 -1
  26. package/cjs/types/index.js +0 -1
  27. package/cjs/types/liquity.d.ts +0 -12
  28. package/cjs/types/liquityV2.d.ts +0 -24
  29. package/cjs/types/llamaLend.d.ts +1 -12
  30. package/cjs/types/morphoBlue.d.ts +0 -2
  31. package/cjs/types/portfolio.d.ts +10 -88
  32. package/cjs/types/savings/morphoVaults.d.ts +10 -2
  33. package/cjs/types/savings/morphoVaults.js +9 -1
  34. package/cjs/types/spark.d.ts +1 -21
  35. package/cjs/umbrella/index.d.ts +3 -2
  36. package/esm/aaveV3/index.d.ts +12 -2
  37. package/esm/aaveV3/index.js +7 -1
  38. package/esm/aaveV3/sgho.d.ts +16 -2
  39. package/esm/claiming/aaveV3.d.ts +2 -2
  40. package/esm/claiming/aaveV3.js +1 -1
  41. package/esm/claiming/ethena.d.ts +1 -2
  42. package/esm/claiming/king.d.ts +1 -2
  43. package/esm/claiming/spark.d.ts +2 -2
  44. package/esm/claiming/spark.js +1 -1
  45. package/esm/fluid/index.d.ts +49 -5
  46. package/esm/helpers/aaveHelpers/index.d.ts +9 -1
  47. package/esm/helpers/aaveHelpers/index.js +20 -5
  48. package/esm/liquity/index.d.ts +12 -2
  49. package/esm/liquityV2/index.d.ts +23 -3
  50. package/esm/portfolio/index.d.ts +5 -5
  51. package/esm/portfolio/index.js +36 -51
  52. package/esm/savings/index.js +5 -2
  53. package/esm/savings/morphoVaults/index.d.ts +1 -1
  54. package/esm/savings/morphoVaults/index.js +57 -19
  55. package/esm/savings/morphoVaults/options.d.ts +2 -0
  56. package/esm/savings/morphoVaults/options.js +61 -1
  57. package/esm/spark/index.js +1 -0
  58. package/esm/types/aave.d.ts +3 -98
  59. package/esm/types/compound.d.ts +2 -26
  60. package/esm/types/curveUsd.d.ts +1 -9
  61. package/esm/types/fluid.d.ts +0 -13
  62. package/esm/types/index.d.ts +0 -1
  63. package/esm/types/index.js +0 -1
  64. package/esm/types/liquity.d.ts +0 -12
  65. package/esm/types/liquityV2.d.ts +0 -24
  66. package/esm/types/llamaLend.d.ts +1 -12
  67. package/esm/types/morphoBlue.d.ts +0 -2
  68. package/esm/types/portfolio.d.ts +10 -88
  69. package/esm/types/savings/morphoVaults.d.ts +10 -2
  70. package/esm/types/savings/morphoVaults.js +8 -0
  71. package/esm/types/spark.d.ts +1 -21
  72. package/esm/umbrella/index.d.ts +3 -2
  73. package/package.json +3 -2
  74. package/src/aaveV3/index.ts +7 -3
  75. package/src/aaveV3/sgho.ts +17 -2
  76. package/src/claiming/aaveV3.ts +2 -4
  77. package/src/claiming/ethena.ts +5 -5
  78. package/src/claiming/king.ts +3 -3
  79. package/src/claiming/spark.ts +4 -6
  80. package/src/fluid/index.ts +3 -4
  81. package/src/helpers/aaveHelpers/index.ts +24 -7
  82. package/src/liquity/index.ts +2 -2
  83. package/src/liquityV2/index.ts +3 -3
  84. package/src/portfolio/index.ts +57 -76
  85. package/src/savings/index.ts +5 -2
  86. package/src/savings/morphoVaults/index.ts +73 -21
  87. package/src/savings/morphoVaults/options.ts +67 -1
  88. package/src/spark/index.ts +1 -0
  89. package/src/types/aave.ts +2 -104
  90. package/src/types/compound.ts +2 -38
  91. package/src/types/curveUsd.ts +1 -17
  92. package/src/types/fluid.ts +0 -14
  93. package/src/types/index.ts +1 -2
  94. package/src/types/liquity.ts +1 -13
  95. package/src/types/liquityV2.ts +1 -26
  96. package/src/types/llamaLend.ts +1 -19
  97. package/src/types/morphoBlue.ts +0 -3
  98. package/src/types/portfolio.ts +11 -111
  99. package/src/types/savings/morphoVaults.ts +11 -1
  100. package/src/types/spark.ts +1 -25
  101. package/src/umbrella/index.ts +1 -2
@@ -11,43 +11,51 @@ import Dec from 'decimal.js';
11
11
  import { request as graphqlRequest } from 'graphql-request';
12
12
  import { assetAmountInEth } from '@defisaver/tokens';
13
13
  import * as morphoVaultsOptions from './options';
14
+ import { MorphoVaultVersion, } from '../../types';
14
15
  import { getViemProvider } from '../../services/viem';
15
- import { getMorphoVaultContractViem } from '../../contracts';
16
+ import { getErc4626ContractViem, getMorphoVaultContractViem } from '../../contracts';
16
17
  import { MORPHO_API_URL } from '../../constants';
17
18
  export { morphoVaultsOptions, };
18
19
  // Morpho API caps list page size at 100 items
19
20
  const MORPHO_API_PAGE_SIZE = 100;
20
- const vaultsLiquidityQuery = `
21
+ const buildLiquidityQuery = (listField) => `
21
22
  query VaultsLiquidity($addresses: [String!], $chainIds: [Int!]) {
22
- vaults(first: ${MORPHO_API_PAGE_SIZE}, where: { address_in: $addresses, chainId_in: $chainIds }) {
23
+ ${listField}(first: ${MORPHO_API_PAGE_SIZE}, where: { address_in: $addresses, chainId_in: $chainIds }) {
23
24
  items {
24
25
  address
25
- liquidity {
26
- underlying
27
- }
26
+ liquidity${listField === 'vaults' ? ' {\n underlying\n }' : ''}
28
27
  }
29
28
  }
30
29
  }`;
30
+ const liquidityQueries = {
31
+ [MorphoVaultVersion.V1]: { field: 'vaults', query: buildLiquidityQuery('vaults') },
32
+ [MorphoVaultVersion.V2]: { field: 'vaultV2s', query: buildLiquidityQuery('vaultV2s') },
33
+ };
31
34
  /**
32
- * Fetches liquidity for all given vaults in a single API request (chunked if over the page cap),
35
+ * Fetches liquidity for all given vaults, one API request per vault version (chunked if over the page cap),
33
36
  * returned as a map keyed by lowercased vault address. A vault missing from the API response is
34
37
  * absent from the map.
35
38
  */
36
39
  export const fetchMorphoVaultsLiquidity = (network, vaults) => __awaiter(void 0, void 0, void 0, function* () {
37
- const chunks = [];
38
- for (let i = 0; i < vaults.length; i += MORPHO_API_PAGE_SIZE)
39
- chunks.push(vaults.slice(i, i + MORPHO_API_PAGE_SIZE));
40
+ const requests = [];
41
+ [MorphoVaultVersion.V1, MorphoVaultVersion.V2].forEach((version) => {
42
+ const versionVaults = vaults.filter((vault) => vault.version === version);
43
+ for (let i = 0; i < versionVaults.length; i += MORPHO_API_PAGE_SIZE)
44
+ requests.push({ version, chunk: versionVaults.slice(i, i + MORPHO_API_PAGE_SIZE) });
45
+ });
40
46
  const liquidityByAddress = {};
41
- yield Promise.all(chunks.map((chunk) => __awaiter(void 0, void 0, void 0, function* () {
42
- const data = yield graphqlRequest(MORPHO_API_URL, vaultsLiquidityQuery, {
47
+ yield Promise.all(requests.map((_a) => __awaiter(void 0, [_a], void 0, function* ({ version, chunk }) {
48
+ const { field, query } = liquidityQueries[version];
49
+ const data = yield graphqlRequest(MORPHO_API_URL, query, {
43
50
  addresses: chunk.map((vault) => vault.address),
44
51
  chainIds: [network],
45
52
  // the BigInt scalar serializes as a JSON number when it fits in Number.MAX_SAFE_INTEGER, a string otherwise
46
53
  });
47
- (data.vaults.items || []).forEach((item) => {
48
- var _a, _b;
49
- if (((_a = item === null || item === void 0 ? void 0 : item.liquidity) === null || _a === void 0 ? void 0 : _a.underlying) !== undefined && ((_b = item.liquidity) === null || _b === void 0 ? void 0 : _b.underlying) !== null) {
50
- liquidityByAddress[item.address.toLowerCase()] = String(item.liquidity.underlying);
54
+ (data[field].items || []).forEach((item) => {
55
+ // V1 exposes liquidity as { underlying }, V2 as a plain BigInt scalar
56
+ const underlying = (item === null || item === void 0 ? void 0 : item.liquidity) !== null && typeof (item === null || item === void 0 ? void 0 : item.liquidity) === 'object' ? item.liquidity.underlying : item === null || item === void 0 ? void 0 : item.liquidity;
57
+ if (underlying !== undefined && underlying !== null) {
58
+ liquidityByAddress[item.address.toLowerCase()] = String(underlying);
51
59
  }
52
60
  });
53
61
  })));
@@ -60,7 +68,19 @@ const getBatchedViemProvider = (provider, network) => getViemProvider(provider,
60
68
  },
61
69
  },
62
70
  });
63
- const getMorphoVaultChainData = (provider, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
71
+ // Vault V2 is ERC-4626 but has no decimals offset, so shares are converted with convertToAssets
72
+ const getMorphoVaultV2ChainData = (provider, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
73
+ const vaultContract = getErc4626ContractViem(provider, morphoVault.address);
74
+ const [totalAssets, suppliedAssets] = yield Promise.all([
75
+ vaultContract.read.totalAssets(),
76
+ Promise.all(accounts.map((account) => __awaiter(void 0, void 0, void 0, function* () {
77
+ const share = yield vaultContract.read.balanceOf([account]);
78
+ return share === BigInt(0) ? BigInt(0) : vaultContract.read.convertToAssets([share]);
79
+ }))),
80
+ ]);
81
+ return { totalAssets, suppliedAssets };
82
+ });
83
+ const getMorphoVaultV1ChainData = (provider, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
64
84
  const morphoVaultContract = getMorphoVaultContractViem(provider, morphoVault.address);
65
85
  const shares = {};
66
86
  const [totalAssets, totalSupply, decimals, decimalsOffset] = yield Promise.all([
@@ -77,11 +97,29 @@ const getMorphoVaultChainData = (provider, morphoVault, accounts) => __awaiter(v
77
97
  totalAssets, totalSupply, decimals, decimalsOffset, shares,
78
98
  };
79
99
  });
100
+ const getMorphoVaultChainData = (provider, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
101
+ return (morphoVault.version === MorphoVaultVersion.V2
102
+ ? { v2: yield getMorphoVaultV2ChainData(provider, morphoVault, accounts) }
103
+ : { v1: yield getMorphoVaultV1ChainData(provider, morphoVault, accounts) });
104
+ });
80
105
  const formatMorphoVaultData = (morphoVault, chainData, liquidityUnderlying, accounts) => {
81
- const { totalAssets, totalSupply, decimals, decimalsOffset, shares, } = chainData;
82
- const poolSize = assetAmountInEth(totalAssets.toString(), morphoVault.asset);
83
106
  const liquidity = assetAmountInEth(liquidityUnderlying, morphoVault.asset);
84
107
  const supplied = {};
108
+ if (chainData.v2) {
109
+ const { totalAssets, suppliedAssets } = chainData.v2;
110
+ accounts.forEach((account, i) => {
111
+ supplied[account.toLowerCase()] = assetAmountInEth(suppliedAssets[i].toString(), morphoVault.asset);
112
+ });
113
+ return {
114
+ poolSize: assetAmountInEth(totalAssets.toString(), morphoVault.asset),
115
+ supplied,
116
+ liquidity,
117
+ asset: morphoVault.asset,
118
+ optionType: morphoVault.type,
119
+ };
120
+ }
121
+ const { totalAssets, totalSupply, decimals, decimalsOffset, shares, } = chainData.v1;
122
+ const poolSize = assetAmountInEth(totalAssets.toString(), morphoVault.asset);
85
123
  accounts.forEach((account) => {
86
124
  const share = shares[account] || BigInt(0);
87
125
  supplied[account.toLowerCase()] = new Dec(new Dec(share.toString()).mul(new Dec(totalAssets.toString()).add(1)).div(new Dec(totalSupply.toString()).add(Math.pow(10, decimalsOffset))).div(Math.pow(10, 18))
@@ -17,5 +17,7 @@ export declare const MORPHO_VAULT_STEAKHOUSE_PYUSD: MorphoVault;
17
17
  export declare const MORPHO_VAULT_SMOKEHOUSE_USDT: MorphoVault;
18
18
  export declare const MORPHO_VAULT_SMOKEHOUSE_USDC: MorphoVault;
19
19
  export declare const MORPHO_VAULT_SMOKEHOUSE_DAI: MorphoVault;
20
+ export declare const MORPHO_VAULT_GAUNTLET_USDG_PREMIUM: MorphoVault;
21
+ export declare const MORPHO_VAULT_STEAKHOUSE_USDG_PRO: MorphoVault;
20
22
  export declare const MORPHO_VAULTS: Record<MorphoVaultType, MorphoVault>;
21
23
  export declare const getMorphoVault: (type: MorphoVaultType) => MorphoVault;
@@ -1,9 +1,11 @@
1
- import { MorphoVaultType } from '../../types';
1
+ import { MorphoVaultType, MorphoVaultVersion, NetworkNumber, } from '../../types';
2
2
  export const MORPHO_VAULT_FLAGSHIP_ETH = {
3
3
  type: MorphoVaultType.MorphoVaultFlagshipEth,
4
4
  name: 'Flagship ETH',
5
5
  address: '0x38989BBA00BDF8181F4082995b3DEAe96163aC5D',
6
6
  asset: 'WETH',
7
+ network: NetworkNumber.Eth,
8
+ version: MorphoVaultVersion.V1,
7
9
  deploymentBlock: 18927491,
8
10
  isLegacy: true,
9
11
  };
@@ -12,6 +14,8 @@ export const MORPHO_VAULT_GAUNTLET_USDC_CORE = {
12
14
  name: 'Gauntlet USDC Core',
13
15
  address: '0x8eB67A509616cd6A7c1B3c8C21D48FF57df3d458',
14
16
  asset: 'USDC',
17
+ network: NetworkNumber.Eth,
18
+ version: MorphoVaultVersion.V1,
15
19
  deploymentBlock: 19777569,
16
20
  isLegacy: true,
17
21
  };
@@ -20,6 +24,8 @@ export const MORPHO_VAULT_GAUNTLET_USDC_PRIME = {
20
24
  name: 'Gauntlet USDC Prime',
21
25
  address: '0xdd0f28e19C1780eb6396170735D45153D261490d',
22
26
  asset: 'USDC',
27
+ network: NetworkNumber.Eth,
28
+ version: MorphoVaultVersion.V1,
23
29
  deploymentBlock: 19777569,
24
30
  isLegacy: true,
25
31
  };
@@ -28,6 +34,8 @@ export const MORPHO_VAULT_RE7_WETH = {
28
34
  name: 'RE7 WETH',
29
35
  address: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0',
30
36
  asset: 'WETH',
37
+ network: NetworkNumber.Eth,
38
+ version: MorphoVaultVersion.V1,
31
39
  deploymentBlock: 19121118,
32
40
  isLegacy: true,
33
41
  };
@@ -36,6 +44,8 @@ export const MORPHO_VAULT_GAUNTLET_WETH_CORE = {
36
44
  name: 'Gauntlet WETH Core',
37
45
  address: '0x4881Ef0BF6d2365D3dd6499ccd7532bcdBCE0658',
38
46
  asset: 'WETH',
47
+ network: NetworkNumber.Eth,
48
+ version: MorphoVaultVersion.V1,
39
49
  deploymentBlock: 19541126,
40
50
  isLegacy: true,
41
51
  };
@@ -44,6 +54,8 @@ export const MORPHO_VAULT_GAUNTLET_WETH_PRIME = {
44
54
  name: 'Gauntlet WETH Prime',
45
55
  address: '0x2371e134e3455e0593363cBF89d3b6cf53740618',
46
56
  asset: 'WETH',
57
+ network: NetworkNumber.Eth,
58
+ version: MorphoVaultVersion.V1,
47
59
  deploymentBlock: 19372149,
48
60
  isLegacy: true,
49
61
  };
@@ -52,6 +64,8 @@ export const MORPHO_VAULT_BOOSTED_USDC = {
52
64
  name: 'Boosted USDC',
53
65
  address: '0xd63070114470f685b75B74D60EEc7c1113d33a3D',
54
66
  asset: 'USDC',
67
+ network: NetworkNumber.Eth,
68
+ version: MorphoVaultVersion.V1,
55
69
  deploymentBlock: 20377233,
56
70
  isLegacy: true,
57
71
  };
@@ -60,6 +74,8 @@ export const MORPHO_VAULT_FLAGSHIP_USDT = {
60
74
  name: 'Flagship USDT',
61
75
  address: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1',
62
76
  asset: 'USDT',
77
+ network: NetworkNumber.Eth,
78
+ version: MorphoVaultVersion.V1,
63
79
  deploymentBlock: 19127039,
64
80
  isLegacy: true,
65
81
  };
@@ -68,6 +84,8 @@ export const MORPHO_VAULT_GAUNTLET_USDA_CORE = {
68
84
  name: 'Gauntlet USDA Core',
69
85
  address: '0x125D41A6e5dbf455cD9Df8F80BCC6fd172D52Cc6',
70
86
  asset: 'USDA',
87
+ network: NetworkNumber.Eth,
88
+ version: MorphoVaultVersion.V1,
71
89
  deploymentBlock: 19633608,
72
90
  isLegacy: true,
73
91
  };
@@ -76,6 +94,8 @@ export const MORPHO_VAULT_GAUNTLET_USDT_PRIME = {
76
94
  name: 'Gauntlet USDT Prime',
77
95
  address: '0x8CB3649114051cA5119141a34C200D65dc0Faa73',
78
96
  asset: 'USDT',
97
+ network: NetworkNumber.Eth,
98
+ version: MorphoVaultVersion.V1,
79
99
  deploymentBlock: 19486541,
80
100
  isLegacy: true,
81
101
  };
@@ -84,6 +104,8 @@ export const MORPHO_VAULT_GAUNTLET_RESOLV_USDC = {
84
104
  name: 'Gauntlet Resolv USDC',
85
105
  address: '0x132E6C9C33A62D7727cd359b1f51e5B566E485Eb',
86
106
  asset: 'USDC',
107
+ network: NetworkNumber.Eth,
108
+ version: MorphoVaultVersion.V1,
87
109
  deploymentBlock: 21487882,
88
110
  isLegacy: true,
89
111
  };
@@ -93,6 +115,8 @@ export const MORPHO_VAULT_STEAKHOUSE_USDT = {
93
115
  name: 'Steakhouse USDT',
94
116
  address: '0xbEef047a543E45807105E51A8BBEFCc5950fcfBa',
95
117
  asset: 'USDT',
118
+ network: NetworkNumber.Eth,
119
+ version: MorphoVaultVersion.V1,
96
120
  deploymentBlock: 19043398,
97
121
  isLegacy: false,
98
122
  };
@@ -101,6 +125,8 @@ export const MORPHO_VAULT_STEAKHOUSE_USDC = {
101
125
  name: 'Steakhouse USDC',
102
126
  address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
103
127
  asset: 'USDC',
128
+ network: NetworkNumber.Eth,
129
+ version: MorphoVaultVersion.V1,
104
130
  deploymentBlock: 18928285,
105
131
  isLegacy: false,
106
132
  };
@@ -109,6 +135,8 @@ export const MORPHO_VAULT_STEAKHOUSE_ETH = {
109
135
  name: 'Steakhouse WETH',
110
136
  address: '0xBEEf050ecd6a16c4e7bfFbB52Ebba7846C4b8cD4',
111
137
  asset: 'WETH',
138
+ network: NetworkNumber.Eth,
139
+ version: MorphoVaultVersion.V1,
112
140
  deploymentBlock: 19380443,
113
141
  isLegacy: false,
114
142
  };
@@ -117,6 +145,8 @@ export const MORPHO_VAULT_STEAKHOUSE_PYUSD = {
117
145
  name: 'Steakhouse PYUSD',
118
146
  address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
119
147
  asset: 'PYUSD',
148
+ network: NetworkNumber.Eth,
149
+ version: MorphoVaultVersion.V1,
120
150
  deploymentBlock: 19043398,
121
151
  isLegacy: false,
122
152
  };
@@ -126,6 +156,8 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDT = {
126
156
  name: 'Smokehouse USDT',
127
157
  address: '0xA0804346780b4c2e3bE118ac957D1DB82F9d7484',
128
158
  asset: 'USDT',
159
+ network: NetworkNumber.Eth,
160
+ version: MorphoVaultVersion.V1,
129
161
  deploymentBlock: 21522238,
130
162
  isLegacy: false,
131
163
  };
@@ -134,6 +166,8 @@ export const MORPHO_VAULT_SMOKEHOUSE_USDC = {
134
166
  name: 'Smokehouse USDC',
135
167
  address: '0xBEeFFF209270748ddd194831b3fa287a5386f5bC',
136
168
  asset: 'USDC',
169
+ network: NetworkNumber.Eth,
170
+ version: MorphoVaultVersion.V1,
137
171
  deploymentBlock: 21337719,
138
172
  isLegacy: false,
139
173
  };
@@ -142,9 +176,32 @@ export const MORPHO_VAULT_SMOKEHOUSE_DAI = {
142
176
  name: 'Smokehouse DAI',
143
177
  address: '0xbeeFfF68CC520D68f82641EFF84330C631E2490E',
144
178
  asset: 'DAI',
179
+ network: NetworkNumber.Eth,
180
+ version: MorphoVaultVersion.V1,
145
181
  deploymentBlock: 21343808,
146
182
  isLegacy: false,
147
183
  };
184
+ // Vault V2
185
+ export const MORPHO_VAULT_GAUNTLET_USDG_PREMIUM = {
186
+ type: MorphoVaultType.MorphoVaultGauntletUSDGPremium,
187
+ name: 'Gauntlet USDG Premium',
188
+ address: '0x390c1bb01F3F627144a40617e287d4cE3D5aBCfa',
189
+ asset: 'USDG',
190
+ network: NetworkNumber.Arb,
191
+ version: MorphoVaultVersion.V2,
192
+ deploymentBlock: 510799903,
193
+ isLegacy: false,
194
+ };
195
+ export const MORPHO_VAULT_STEAKHOUSE_USDG_PRO = {
196
+ type: MorphoVaultType.MorphoVaultSteakhouseUSDGPro,
197
+ name: 'Steakhouse USDG Pro',
198
+ address: '0xbeeFf72B77e7584a450E887125F25E8D8819016a',
199
+ asset: 'USDG',
200
+ network: NetworkNumber.Arb,
201
+ version: MorphoVaultVersion.V2,
202
+ deploymentBlock: 512247107,
203
+ isLegacy: false,
204
+ };
148
205
  export const MORPHO_VAULTS = {
149
206
  [MorphoVaultType.MorphoVaultFlagshipEth]: MORPHO_VAULT_FLAGSHIP_ETH,
150
207
  [MorphoVaultType.MorphoVaultGauntletUSDCCore]: MORPHO_VAULT_GAUNTLET_USDC_CORE,
@@ -166,5 +223,8 @@ export const MORPHO_VAULTS = {
166
223
  [MorphoVaultType.MorphoVaultSmokehouseUSDT]: MORPHO_VAULT_SMOKEHOUSE_USDT,
167
224
  [MorphoVaultType.MorphoVaultSmokehouseUSDC]: MORPHO_VAULT_SMOKEHOUSE_USDC,
168
225
  [MorphoVaultType.MorphoVaultSmokehouseDAI]: MORPHO_VAULT_SMOKEHOUSE_DAI,
226
+ // Vault V2
227
+ [MorphoVaultType.MorphoVaultGauntletUSDGPremium]: MORPHO_VAULT_GAUNTLET_USDG_PREMIUM,
228
+ [MorphoVaultType.MorphoVaultSteakhouseUSDGPro]: MORPHO_VAULT_STEAKHOUSE_USDG_PRO,
169
229
  };
170
230
  export const getMorphoVault = (type) => MORPHO_VAULTS[type];
@@ -81,6 +81,7 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
81
81
  collateralAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].collateralAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
82
82
  borrowAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].borrowAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
83
83
  ltvZeroAssets: [],
84
+ isolated: false,
84
85
  };
85
86
  return ({
86
87
  symbol: selectedMarket.assets[i],
@@ -1,4 +1,4 @@
1
- import { EthAddress, IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
1
+ import { IncentiveData, LeverageType, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
2
2
  export declare enum AaveVersions {
3
3
  AaveV1 = "v1",
4
4
  AaveV2 = "v2default",
@@ -40,6 +40,7 @@ export interface EModeCategoryData {
40
40
  borrowAssets: string[];
41
41
  ltvzeroBitmap?: string;
42
42
  ltvZeroAssets: string[];
43
+ isolated: boolean;
43
44
  }
44
45
  export interface EModeCategoryDataMapping {
45
46
  enteringTerms: boolean[];
@@ -84,8 +85,6 @@ export interface AaveV3AssetData extends AaveAssetData {
84
85
  liquidationBonus: string;
85
86
  supplyIncentives: IncentiveData[];
86
87
  borrowIncentives: IncentiveData[];
87
- aTokenAddress?: EthAddress;
88
- vTokenAddress?: EthAddress;
89
88
  }
90
89
  export type EModeCategoriesData = Record<number, EModeCategoryData>;
91
90
  export type AaveAssetsData<T> = {
@@ -123,12 +122,7 @@ export type AaveUsedAssets<T> = {
123
122
  };
124
123
  export type AaveV2UsedAssets = AaveUsedAssets<AaveV2UsedAsset>;
125
124
  export type AaveV3UsedAssets = AaveUsedAssets<AaveV3UsedAsset>;
126
- /**
127
- * Fields aaveAnyGetAggregatedPositionData adds to every Aave V2/V3 position at runtime, on top of those declared
128
- * below. Optional, so code that builds a position by hand keeps compiling.
129
- */
130
- export type AavePositionAggregatedFields = Partial<Omit<AaveV3AggregatedPositionData, keyof MMPositionData | 'ratio' | 'collRatio' | 'safetyRatioWithLtvZeroFallback' | 'suppliedUsd' | 'borrowedUsd' | 'borrowLimitUsd' | 'suppliedCollateralUsd' | 'incentiveUsd' | 'totalInterestUsd'>>;
131
- export interface AavePositionData extends MMPositionData, AavePositionAggregatedFields {
125
+ export interface AavePositionData extends MMPositionData {
132
126
  ratio: string;
133
127
  minRatio: string;
134
128
  collRatio: string;
@@ -145,12 +139,6 @@ export interface AavePositionData extends MMPositionData, AavePositionAggregated
145
139
  }
146
140
  export interface AaveV2PositionData extends AavePositionData {
147
141
  usedAssets: AaveV2UsedAssets;
148
- eModeCategory?: number;
149
- isInIsolationMode?: boolean;
150
- isInSiloedMode?: boolean;
151
- eModeCategories?: {
152
- [key: number]: EModeCategoryDataMapping;
153
- };
154
142
  }
155
143
  export interface AaveV3PositionData extends AavePositionData {
156
144
  usedAssets: AaveV3UsedAssets;
@@ -198,86 +186,3 @@ export interface AaveHelperCommon {
198
186
  selectedMarket: Partial<AaveMarketInfo>;
199
187
  network?: NetworkNumber;
200
188
  }
201
- export interface SghoUserData {
202
- shares: string;
203
- balance: string;
204
- maxDeposit: string;
205
- maxWithdraw: string;
206
- underlyingBalance: string;
207
- }
208
- export interface SghoData {
209
- totalAssets: string;
210
- totalSupply: string;
211
- supplyCap: string;
212
- /** Target savings rate as an APY percent (e.g. "4.25" for 4.25%). */
213
- targetRate: string;
214
- paused: boolean;
215
- user: SghoUserData;
216
- }
217
- /** stkAAVE, stkGHO and sGHO of an address, from getStakeAaveData. */
218
- export interface StakeAaveData {
219
- activatedCooldown: string;
220
- activatedCooldownAmount: string;
221
- stkAaveRewardsBalance: string;
222
- aaveRewardsBalance: string;
223
- stkAaveBalance: string;
224
- stkGhoBalance: string;
225
- ghoMeritApy: string;
226
- stkAaveApy: string;
227
- sgho: SghoData;
228
- }
229
- export interface UmbrellaTokenInfo {
230
- token: EthAddress;
231
- /** USD, converted from the oracle's 8 decimals. */
232
- price: string;
233
- name: string;
234
- symbol: string;
235
- decimals: number;
236
- }
237
- export interface UmbrellaRewardTokenData {
238
- rewardTokenData: UmbrellaTokenInfo;
239
- maxEmissionPerSecond: bigint;
240
- distributionEnd: bigint;
241
- }
242
- export interface UmbrellaStakingAccountData {
243
- stakeUserBalance: string;
244
- rewardsTokenUserData: {
245
- reward: EthAddress;
246
- currentReward: string;
247
- }[];
248
- userCooldownAmount: string;
249
- userEndOfCooldown: bigint | string;
250
- userWithdrawalWindow: bigint | string;
251
- }
252
- /**
253
- * One Umbrella stake token of an address, from getUmbrellaData: the view contracts' structs merged, with the amounts
254
- * the app reads converted to decimal strings. The bigint fields are the views' raw values, as the SDK passes them.
255
- */
256
- export interface UmbrellaStakingTokenData {
257
- stakeTokenData: UmbrellaTokenInfo;
258
- totalAssets: string;
259
- targetLiquidity: string;
260
- isStakeConfigured: boolean;
261
- rewardsTokenData: UmbrellaRewardTokenData[];
262
- stakeToken: EthAddress;
263
- stakeUserBalance: bigint;
264
- rewardsTokenUserData: {
265
- reward: EthAddress;
266
- currentReward: bigint;
267
- }[];
268
- stkToken: EthAddress;
269
- totalShares: string;
270
- stkUnderlyingToken: EthAddress;
271
- aToken: EthAddress;
272
- cooldownPeriod: bigint;
273
- unstakeWindow: bigint;
274
- stkTokenToWaTokenRate: string;
275
- waTokenToATokenRate: string;
276
- rewardsEmissionRates: string[];
277
- userCooldownAmount: bigint;
278
- userEndOfCooldown: bigint;
279
- userWithdrawalWindow: bigint;
280
- account: UmbrellaStakingAccountData;
281
- }
282
- /** Keyed by Umbrella stake (UmbrellaGHO, UmbrellaUSDC, UmbrellaUSDT, UmbrellaETH). */
283
- export type UmbrellaStakingData = Record<string, UmbrellaStakingTokenData>;
@@ -52,7 +52,6 @@ export interface CompoundAssetData extends MMAssetData {
52
52
  sortIndex?: number;
53
53
  }
54
54
  export interface CompoundV2AssetData extends CompoundAssetData {
55
- exchangeRate?: string;
56
55
  }
57
56
  export interface CompoundV3AssetData extends CompoundAssetData {
58
57
  borrowCollateralFactor: string;
@@ -64,17 +63,6 @@ export interface CompoundV3AssetData extends CompoundAssetData {
64
63
  supplyCap: string;
65
64
  priceInBaseAsset: string;
66
65
  canBeWithdrawn: boolean;
67
- tokenAddr?: EthAddress;
68
- isBase?: boolean;
69
- baseBorrowMin?: string;
70
- baseTrackingBorrowRewardsSpeed?: string;
71
- baseTrackingSupplyRewardsSpeed?: string;
72
- borrowIndex?: string;
73
- supplyIndex?: string;
74
- trackingBorrowIndex?: string;
75
- trackingSupplyIndex?: string;
76
- rewardSupplySpeed?: string;
77
- rewardBorrowSpeed?: string;
78
66
  }
79
67
  export interface CompoundAssetsData<T> {
80
68
  [token: string]: T;
@@ -135,21 +123,9 @@ export interface CompoundPositionData extends MMPositionData {
135
123
  isSubscribedToAutomation?: boolean;
136
124
  automationResubscribeRequired?: boolean;
137
125
  }
138
- /**
139
- * Fields getCompoundV2AggregatedData adds to every Compound V2 position at runtime — a subset of
140
- * CompoundAggregatedPositionData. Optional, so code that builds a position by hand keeps compiling.
141
- */
142
- export type CompoundV2PositionAggregatedFields = Partial<Pick<CompoundAggregatedPositionData, 'suppliedCollateralUsd' | 'liquidationLimitUsd' | 'leftToBorrowUsd' | 'collRatio' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice'>>;
143
- /**
144
- * Fields getCompoundV3AggregatedData adds to every Compound V3 position at runtime, on top of those declared in
145
- * CompoundPositionData. Optional, so code that builds a position by hand keeps compiling.
146
- */
147
- export type CompoundV3PositionAggregatedFields = Partial<Omit<CompoundAggregatedPositionData, keyof MMPositionData | 'ratio' | 'minRatio' | 'suppliedUsd' | 'borrowedUsd' | 'borrowLimitUsd' | 'incentiveUsd' | 'totalInterestUsd'>>;
148
- export interface CompoundV2PositionData extends CompoundPositionData, CompoundV2PositionAggregatedFields {
126
+ export interface CompoundV2PositionData extends CompoundPositionData {
149
127
  usedAssets: CompoundV2UsedAssets;
150
- borrowStableSupplyUnstable?: boolean;
151
128
  }
152
- export interface CompoundV3PositionData extends CompoundPositionData, CompoundV3PositionAggregatedFields {
129
+ export interface CompoundV3PositionData extends CompoundPositionData {
153
130
  usedAssets: CompoundV3UsedAssets;
154
- isAllowed?: boolean;
155
131
  }
@@ -60,7 +60,6 @@ export interface CrvUSDGlobalMarketData {
60
60
  leftToBorrow: string;
61
61
  bands: BandData[];
62
62
  loanDiscount: string;
63
- A?: bigint;
64
63
  }
65
64
  export interface CrvUSDAggregatedPositionData {
66
65
  ratio: string;
@@ -92,8 +91,7 @@ export interface CrvUSDUsedAsset {
92
91
  export interface CrvUSDUsedAssets {
93
92
  [key: string]: CrvUSDUsedAsset;
94
93
  }
95
- export type CrvUSDPositionAggregatedFields = Partial<Pick<CrvUSDAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice'>>;
96
- export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
94
+ export interface CrvUSDUserData {
97
95
  debtAmount: string;
98
96
  health: string;
99
97
  healthPercent: string;
@@ -115,10 +113,4 @@ export interface CrvUSDUserData extends CrvUSDPositionAggregatedFields {
115
113
  collateralPrice: string;
116
114
  collRatio: string;
117
115
  exposure: string;
118
- marketCollateralAmount?: bigint;
119
- curveUsdCollateralAmount?: bigint;
120
- N?: bigint;
121
- bandRange?: readonly [bigint, bigint];
122
- usersBands?: readonly [readonly bigint[], readonly bigint[]];
123
- isInSoftLiquidation?: boolean;
124
116
  }
@@ -458,16 +458,3 @@ export interface FluidFTokenDataStructOutput {
458
458
  rewardsRate: bigint;
459
459
  withdrawable: bigint;
460
460
  }
461
- /** One Fluid lending (fToken) deposit of an address, from getAllUserEarnPositionsWithFTokens and getFluidDepositData. */
462
- export interface FluidEarnPositionData {
463
- fTokenAddress: string | undefined;
464
- fTokenSymbol: string;
465
- decimals: string;
466
- totalDeposited: string;
467
- withdrawable: string;
468
- apy: string;
469
- depositRate: string;
470
- withdrawRate: string;
471
- deposited: string;
472
- depositedShares: string;
473
- }
@@ -15,4 +15,3 @@ export * from './merkl';
15
15
  export * from './savings';
16
16
  export * from './common';
17
17
  export * from './aaveV4';
18
- export * from './claiming';
@@ -15,4 +15,3 @@ export * from './merkl';
15
15
  export * from './savings';
16
16
  export * from './common';
17
17
  export * from './aaveV4';
18
- export * from './claiming';
@@ -28,15 +28,3 @@ export interface LiquityTroveInfo {
28
28
  debtInFront: string;
29
29
  exposure: string;
30
30
  }
31
- /** LQTY staking and the LUSD stability pool deposit of an address, from getLiquityStakingData. */
32
- export interface LiquityStakingData {
33
- totalLUSDDeposited: string;
34
- totalLQTYStaked: string;
35
- stakedLQTY: string;
36
- stakedLUSDBalance: string;
37
- rewardETH: string;
38
- rewardLUSD: string;
39
- stabilityRewardETH: string;
40
- stabilityRewardLQTY: string;
41
- showStakingBalances: boolean;
42
- }
@@ -121,27 +121,3 @@ export interface LiquityV2TroveData {
121
121
  lastInterestRateAdjTime: string;
122
122
  exposure: string;
123
123
  }
124
- /** The stability pool deposit of an address in one market, from getLiquityV2Staking. */
125
- export interface LiquityV2StakingData {
126
- totalBOLDDeposited: string;
127
- stakedBOLDBalance: string;
128
- stabilityRewardColl: string;
129
- stabilityRewardYield: string;
130
- showStakingBalances: boolean;
131
- debtTokenBalance: string;
132
- stabilityPoolApy: string;
133
- }
134
- /** sBOLD, yBOLD and stYBOLD of an address, from getLiquitySAndYBold. */
135
- export interface LiquityV2SBoldYBoldData {
136
- spApy: string;
137
- yBoldApy: string;
138
- totalBoldDepositedSBold: string;
139
- boldRateSBold: string;
140
- maxWithdrawSBold: string;
141
- totalBoldDepositedYBold: string;
142
- boldRateYBold: string;
143
- maxWithdrawYBold: string;
144
- sBoldBalance: string;
145
- yBoldBalance: string;
146
- stYBoldBalance: string;
147
- }
@@ -138,8 +138,7 @@ export interface LlamaLendUsedAsset {
138
138
  export interface LlamaLendUsedAssets {
139
139
  [key: string]: LlamaLendUsedAsset;
140
140
  }
141
- export type LlamaLendPositionAggregatedFields = Partial<Pick<LlamaLendAggregatedPositionData, 'borrowLimitUsd' | 'minAllowedRatio' | 'collFactor' | 'leveragedType' | 'leveragedAsset' | 'liquidationPrice' | 'netApy' | 'incentiveUsd' | 'totalInterestUsd'>>;
142
- export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
141
+ export interface LlamaLendUserData {
143
142
  debtAmount: string;
144
143
  health: string;
145
144
  healthPercent: string;
@@ -158,14 +157,4 @@ export interface LlamaLendUserData extends LlamaLendPositionAggregatedFields {
158
157
  loanExists: boolean;
159
158
  borrowRate?: string;
160
159
  exposure: string;
161
- collateralPrice?: bigint;
162
- marketCollateralAmount?: bigint;
163
- debtTokenCollateralAmount?: bigint;
164
- N?: bigint;
165
- bandRange?: readonly [bigint, bigint];
166
- usersBands?: readonly [readonly bigint[], readonly bigint[]];
167
- collRatio?: bigint;
168
- isInSoftLiquidation?: boolean;
169
- debtTokenSuppliedShares?: bigint;
170
- debtTokenSuppliedAssets?: bigint;
171
160
  }
@@ -214,8 +214,6 @@ export interface MorphoBluePositionData {
214
214
  supplyShares: string;
215
215
  borrowShares: string;
216
216
  exposure: string;
217
- minCollRatio?: string;
218
- collLiquidationRatio?: string;
219
217
  }
220
218
  export interface MorphoBlueEarnData {
221
219
  apy: string;