@defisaver/positions-sdk 2.1.51 → 2.1.52-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 (120) hide show
  1. package/.mocharc.json +4 -4
  2. package/.nvmrc +1 -1
  3. package/README.md +64 -64
  4. package/cjs/helpers/aaveHelpers/index.d.ts +2 -2
  5. package/cjs/helpers/aaveHelpers/index.js +6 -0
  6. package/cjs/helpers/morphoBlueHelpers/index.js +66 -66
  7. package/cjs/moneymarket/moneymarketCommonService.js +8 -1
  8. package/cjs/savings/morphoVaults/index.js +17 -17
  9. package/cjs/types/aave.d.ts +1 -0
  10. package/cjs/types/common.d.ts +1 -1
  11. package/cjs/types/common.js +1 -1
  12. package/esm/helpers/aaveHelpers/index.d.ts +2 -2
  13. package/esm/helpers/aaveHelpers/index.js +6 -0
  14. package/esm/helpers/morphoBlueHelpers/index.js +66 -66
  15. package/esm/moneymarket/moneymarketCommonService.js +8 -1
  16. package/esm/savings/morphoVaults/index.js +17 -17
  17. package/esm/types/aave.d.ts +1 -0
  18. package/esm/types/common.d.ts +1 -1
  19. package/esm/types/common.js +1 -1
  20. package/package.json +48 -48
  21. package/src/aaveV2/index.ts +240 -240
  22. package/src/aaveV3/index.ts +635 -635
  23. package/src/aaveV3/merit.ts +97 -97
  24. package/src/aaveV3/merkl.ts +74 -74
  25. package/src/claiming/aaveV3.ts +154 -154
  26. package/src/claiming/compV3.ts +22 -22
  27. package/src/claiming/ethena.ts +61 -61
  28. package/src/claiming/index.ts +12 -12
  29. package/src/claiming/king.ts +66 -66
  30. package/src/claiming/morphoBlue.ts +118 -118
  31. package/src/claiming/spark.ts +225 -225
  32. package/src/compoundV2/index.ts +244 -244
  33. package/src/compoundV3/index.ts +274 -274
  34. package/src/config/contracts.ts +1320 -1320
  35. package/src/constants/index.ts +10 -10
  36. package/src/contracts.ts +171 -171
  37. package/src/curveUsd/index.ts +254 -254
  38. package/src/eulerV2/index.ts +324 -324
  39. package/src/exchange/index.ts +25 -25
  40. package/src/fluid/index.ts +1800 -1800
  41. package/src/helpers/aaveHelpers/index.ts +197 -191
  42. package/src/helpers/compoundHelpers/index.ts +283 -283
  43. package/src/helpers/curveUsdHelpers/index.ts +40 -40
  44. package/src/helpers/eulerHelpers/index.ts +222 -222
  45. package/src/helpers/fluidHelpers/index.ts +326 -326
  46. package/src/helpers/index.ts +10 -10
  47. package/src/helpers/liquityV2Helpers/index.ts +82 -82
  48. package/src/helpers/llamaLendHelpers/index.ts +53 -53
  49. package/src/helpers/makerHelpers/index.ts +52 -52
  50. package/src/helpers/morphoBlueHelpers/index.ts +396 -396
  51. package/src/helpers/sparkHelpers/index.ts +158 -158
  52. package/src/index.ts +49 -49
  53. package/src/liquity/index.ts +159 -159
  54. package/src/liquityV2/index.ts +703 -703
  55. package/src/llamaLend/index.ts +305 -305
  56. package/src/maker/index.ts +223 -223
  57. package/src/markets/aave/index.ts +118 -118
  58. package/src/markets/aave/marketAssets.ts +54 -54
  59. package/src/markets/compound/index.ts +243 -243
  60. package/src/markets/compound/marketsAssets.ts +97 -97
  61. package/src/markets/curveUsd/index.ts +69 -69
  62. package/src/markets/euler/index.ts +26 -26
  63. package/src/markets/fluid/index.ts +2900 -2900
  64. package/src/markets/index.ts +25 -25
  65. package/src/markets/liquityV2/index.ts +102 -102
  66. package/src/markets/llamaLend/contractAddresses.ts +141 -141
  67. package/src/markets/llamaLend/index.ts +235 -235
  68. package/src/markets/morphoBlue/index.ts +988 -988
  69. package/src/markets/spark/index.ts +29 -29
  70. package/src/markets/spark/marketAssets.ts +12 -12
  71. package/src/moneymarket/moneymarketCommonService.ts +92 -85
  72. package/src/morphoBlue/index.ts +274 -274
  73. package/src/portfolio/index.ts +586 -586
  74. package/src/savings/index.ts +95 -95
  75. package/src/savings/makerDsr/index.ts +53 -53
  76. package/src/savings/makerDsr/options.ts +9 -9
  77. package/src/savings/morphoVaults/index.ts +80 -80
  78. package/src/savings/morphoVaults/options.ts +193 -193
  79. package/src/savings/skyOptions/index.ts +95 -95
  80. package/src/savings/skyOptions/options.ts +10 -10
  81. package/src/savings/sparkSavingsVaults/index.ts +60 -60
  82. package/src/savings/sparkSavingsVaults/options.ts +35 -35
  83. package/src/savings/yearnV3Vaults/index.ts +61 -61
  84. package/src/savings/yearnV3Vaults/options.ts +55 -55
  85. package/src/savings/yearnVaults/index.ts +73 -73
  86. package/src/savings/yearnVaults/options.ts +32 -32
  87. package/src/services/priceService.ts +278 -278
  88. package/src/services/utils.ts +115 -115
  89. package/src/services/viem.ts +57 -57
  90. package/src/setup.ts +8 -8
  91. package/src/spark/index.ts +459 -459
  92. package/src/staking/eligibility.ts +53 -53
  93. package/src/staking/index.ts +1 -1
  94. package/src/staking/staking.ts +192 -192
  95. package/src/types/aave.ts +199 -198
  96. package/src/types/claiming.ts +114 -114
  97. package/src/types/common.ts +107 -107
  98. package/src/types/compound.ts +144 -144
  99. package/src/types/curveUsd.ts +123 -123
  100. package/src/types/euler.ts +175 -175
  101. package/src/types/fluid.ts +483 -483
  102. package/src/types/index.ts +14 -14
  103. package/src/types/liquity.ts +30 -30
  104. package/src/types/liquityV2.ts +126 -126
  105. package/src/types/llamaLend.ts +159 -159
  106. package/src/types/maker.ts +63 -63
  107. package/src/types/merit.ts +1 -1
  108. package/src/types/merkl.ts +70 -70
  109. package/src/types/morphoBlue.ts +202 -202
  110. package/src/types/portfolio.ts +60 -60
  111. package/src/types/savings/index.ts +23 -23
  112. package/src/types/savings/makerDsr.ts +13 -13
  113. package/src/types/savings/morphoVaults.ts +32 -32
  114. package/src/types/savings/sky.ts +14 -14
  115. package/src/types/savings/sparkSavingsVaults.ts +15 -15
  116. package/src/types/savings/yearnV3Vaults.ts +17 -17
  117. package/src/types/savings/yearnVaults.ts +14 -14
  118. package/src/types/spark.ts +134 -134
  119. package/src/umbrella/index.ts +69 -69
  120. package/src/umbrella/umbrellaUtils.ts +29 -29
package/.mocharc.json CHANGED
@@ -1,4 +1,4 @@
1
- {
2
- "require": "ts-node/register",
3
- "extension": ["ts"]
4
- }
1
+ {
2
+ "require": "ts-node/register",
3
+ "extension": ["ts"]
4
+ }
package/.nvmrc CHANGED
@@ -1 +1 @@
1
- v20.17.0
1
+ v20.17.0
package/README.md CHANGED
@@ -1,64 +1,64 @@
1
- # DeFi Saver Positions SDK
2
-
3
- Supported protocols:
4
- - [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
5
- - [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
6
- - [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
7
- - [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
8
- - [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
9
- - [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
10
- - [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
11
- - [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
12
-
13
- ## Setup
14
- Supported Node version is v10.
15
-
16
- - run `npm install` (first time)
17
- - run `npm run build`
18
-
19
- `build` command will generate contracts and build ejs and esm folders
20
-
21
- ## How to use
22
- [All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
23
-
24
- This is a Compound V3 example, and every other protocol is similar
25
- ```js
26
- import { compoundV3 } from '@defisaver/positions-sdk';
27
-
28
-
29
- // every protocol has market data and user data getters
30
- const {
31
- getCompoundV3MarketsData,
32
- getCompoundV3AccountData,
33
- } = compoundV3;
34
-
35
- const provider = 'Your RPC provider';
36
-
37
- const user = '0x123...';
38
-
39
- const { assetsData } = await getCompoundV3MarketsData(
40
- provider, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
41
- 1, // network
42
- selectedMarket, // market object like in /src/markets/compound/index.ts
43
- provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
44
- );
45
-
46
- const userData = await getCompoundV3AccountData(
47
- provider,
48
- 1, // network
49
- userAddress, // EOA or DSProxy
50
- '', // proxy address of the user, or just empty string if checking for EOA
51
- {
52
- selectedMarket, // market object as in /src/markets/compound/index.ts
53
- assetsData,
54
- }
55
- );
56
- ```
57
-
58
- More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
59
-
60
- ## Testing
61
-
62
- `npm run test` - Run all tests
63
-
64
- `npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
1
+ # DeFi Saver Positions SDK
2
+
3
+ Supported protocols:
4
+ - [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
5
+ - [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
6
+ - [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
7
+ - [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
8
+ - [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
9
+ - [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
10
+ - [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
11
+ - [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
12
+
13
+ ## Setup
14
+ Supported Node version is v10.
15
+
16
+ - run `npm install` (first time)
17
+ - run `npm run build`
18
+
19
+ `build` command will generate contracts and build ejs and esm folders
20
+
21
+ ## How to use
22
+ [All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
23
+
24
+ This is a Compound V3 example, and every other protocol is similar
25
+ ```js
26
+ import { compoundV3 } from '@defisaver/positions-sdk';
27
+
28
+
29
+ // every protocol has market data and user data getters
30
+ const {
31
+ getCompoundV3MarketsData,
32
+ getCompoundV3AccountData,
33
+ } = compoundV3;
34
+
35
+ const provider = 'Your RPC provider';
36
+
37
+ const user = '0x123...';
38
+
39
+ const { assetsData } = await getCompoundV3MarketsData(
40
+ provider, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
41
+ 1, // network
42
+ selectedMarket, // market object like in /src/markets/compound/index.ts
43
+ provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
44
+ );
45
+
46
+ const userData = await getCompoundV3AccountData(
47
+ provider,
48
+ 1, // network
49
+ userAddress, // EOA or DSProxy
50
+ '', // proxy address of the user, or just empty string if checking for EOA
51
+ {
52
+ selectedMarket, // market object as in /src/markets/compound/index.ts
53
+ assetsData,
54
+ }
55
+ );
56
+ ```
57
+
58
+ More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
59
+
60
+ ## Testing
61
+
62
+ `npm run test` - Run all tests
63
+
64
+ `npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
@@ -1,4 +1,4 @@
1
- import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAssets, AaveVersions } from '../../types';
1
+ import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions } from '../../types';
2
2
  import { EthereumProvider, NetworkNumber } from '../../types/common';
3
3
  export declare const AAVE_V3_MARKETS: AaveVersions[];
4
4
  export declare const isAaveV2: ({ selectedMarket }: {
@@ -17,7 +17,7 @@ export declare const aaveV3IsInSiloedMode: ({ usedAssets, assetsData }: {
17
17
  }) => boolean;
18
18
  export declare const aaveAnyGetCollSuppliedAssets: ({ usedAssets }: {
19
19
  usedAssets: AaveV3UsedAssets;
20
- }) => import("../../types").AaveV3UsedAsset[];
20
+ }) => AaveV3UsedAsset[];
21
21
  export declare const aaveAnyGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
22
22
  symbol: string;
23
23
  canBeCollateral: boolean;
@@ -108,6 +108,12 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
108
108
  payload.leveragedLsdAssetRatio = new decimal_js_1.default(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
109
109
  assetPrice = new decimal_js_1.default(assetPrice).div(assetsData.ETH.price).toString();
110
110
  }
111
+ if (leveragedType === 'volatile-pair') {
112
+ const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
113
+ const borrowedAssetPrice = data.assetsData[borrowedAsset.symbol].price;
114
+ assetPrice = new decimal_js_1.default(assetPrice).div(borrowedAssetPrice).toString();
115
+ payload.currentVolatilePairRatio = new decimal_js_1.default(assetsData[leveragedAsset].price).div(borrowedAssetPrice).toDP(18).toString();
116
+ }
111
117
  payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
112
118
  }
113
119
  payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
@@ -128,73 +128,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, network)
128
128
  });
129
129
  exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
130
130
  const API_URL = 'https://blue-api.morpho.org/graphql';
131
- const MARKET_QUERY = `
132
- query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
133
- marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
134
- reallocatableLiquidityAssets
135
- targetBorrowUtilization
136
- loanAsset {
137
- address
138
- decimals
139
- priceUsd
140
- }
141
- state {
142
- liquidityAssets
143
- borrowAssets
144
- supplyAssets
145
- }
146
- publicAllocatorSharedLiquidity {
147
- assets
148
- vault {
149
- address
150
- name
151
- }
152
- allocationMarket {
153
- uniqueKey
154
- loanAsset {
155
- address
156
- }
157
- collateralAsset {
158
- address
159
- }
160
- irmAddress
161
- oracle {
162
- address
163
- }
164
- lltv
165
- }
166
- }
167
- loanAsset {
168
- address
169
- }
170
- collateralAsset {
171
- address
172
- }
173
- oracle {
174
- address
175
- }
176
- irmAddress
177
- lltv
178
- }
179
- }
131
+ const MARKET_QUERY = `
132
+ query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
133
+ marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
134
+ reallocatableLiquidityAssets
135
+ targetBorrowUtilization
136
+ loanAsset {
137
+ address
138
+ decimals
139
+ priceUsd
140
+ }
141
+ state {
142
+ liquidityAssets
143
+ borrowAssets
144
+ supplyAssets
145
+ }
146
+ publicAllocatorSharedLiquidity {
147
+ assets
148
+ vault {
149
+ address
150
+ name
151
+ }
152
+ allocationMarket {
153
+ uniqueKey
154
+ loanAsset {
155
+ address
156
+ }
157
+ collateralAsset {
158
+ address
159
+ }
160
+ irmAddress
161
+ oracle {
162
+ address
163
+ }
164
+ lltv
165
+ }
166
+ }
167
+ loanAsset {
168
+ address
169
+ }
170
+ collateralAsset {
171
+ address
172
+ }
173
+ oracle {
174
+ address
175
+ }
176
+ irmAddress
177
+ lltv
178
+ }
179
+ }
180
180
  `;
181
- const REWARDS_QUERY = `
182
- query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
183
- marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
184
- uniqueKey
185
- state {
186
- rewards {
187
- amountPerSuppliedToken
188
- supplyApr
189
- amountPerBorrowedToken
190
- borrowApr
191
- asset {
192
- address
193
- }
194
- }
195
- }
196
- }
197
- }
181
+ const REWARDS_QUERY = `
182
+ query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
183
+ marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
184
+ uniqueKey
185
+ state {
186
+ rewards {
187
+ amountPerSuppliedToken
188
+ supplyApr
189
+ amountPerBorrowedToken
190
+ borrowApr
191
+ asset {
192
+ address
193
+ }
194
+ }
195
+ }
196
+ }
197
+ }
198
198
  `;
199
199
  /**
200
200
  * Get reallocatable liquidity to a given market and target borrow utilization
@@ -19,7 +19,7 @@ exports.calcShortLiqPrice = calcShortLiqPrice;
19
19
  const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimitUsd) => {
20
20
  if (leverageType === 'short')
21
21
  return (0, exports.calcShortLiqPrice)(assetPrice, borrowedUsd, borrowLimitUsd);
22
- if (leverageType === 'long' || leverageType === 'lsd-leverage')
22
+ if (leverageType === 'long' || leverageType === 'lsd-leverage' || leverageType === 'volatile-pair')
23
23
  return (0, exports.calcLongLiqPrice)(assetPrice, borrowedUsd, borrowLimitUsd);
24
24
  console.error('invalid leverageType', leverageType);
25
25
  return '0';
@@ -60,6 +60,7 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
60
60
  const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
61
61
  // lsd -> liquid staking derivative
62
62
  const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH', 'ezETH', 'weETH'].includes(longAsset);
63
+ const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
63
64
  if (isLong) {
64
65
  return {
65
66
  leveragedType: 'long',
@@ -78,6 +79,12 @@ const isLeveragedPos = (usedAssets, dustLimit = 5) => {
78
79
  leveragedAsset: longAsset,
79
80
  };
80
81
  }
82
+ if (isVolatilePair) {
83
+ return {
84
+ leveragedType: 'volatile-pair',
85
+ leveragedAsset: longAsset,
86
+ };
87
+ }
81
88
  return {
82
89
  leveragedType: '',
83
90
  leveragedAsset: '',
@@ -54,23 +54,23 @@ const morphoVaultsOptions = __importStar(require("./options"));
54
54
  exports.morphoVaultsOptions = morphoVaultsOptions;
55
55
  const viem_1 = require("../../services/viem");
56
56
  const contracts_1 = require("../../contracts");
57
- const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
58
- vaultByAddress(chainId: 1, address: "${vaultAddress}") {
59
- id,
60
- dailyApy,
61
- dailyApys {
62
- apy, netApy
63
- },
64
- monthlyApys {
65
- apy, netApy
66
- },
67
- liquidity {
68
- underlying, usd,
69
- },
70
- asset {
71
- priceUsd
72
- }
73
- }
57
+ const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
58
+ vaultByAddress(chainId: 1, address: "${vaultAddress}") {
59
+ id,
60
+ dailyApy,
61
+ dailyApys {
62
+ apy, netApy
63
+ },
64
+ monthlyApys {
65
+ apy, netApy
66
+ },
67
+ liquidity {
68
+ underlying, usd,
69
+ },
70
+ asset {
71
+ priceUsd
72
+ }
73
+ }
74
74
  }`;
75
75
  const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
76
76
  const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {
@@ -169,6 +169,7 @@ export interface AaveV3AggregatedPositionData {
169
169
  collLiquidationRatio?: string;
170
170
  healthRatio?: string;
171
171
  minHealthRatio?: string;
172
+ currentVolatilePairRatio?: string;
172
173
  }
173
174
  export interface AaveHelperCommon {
174
175
  usedAssets: any;
@@ -3,7 +3,7 @@ export declare enum IncentiveKind {
3
3
  Reward = "reward"
4
4
  }
5
5
  export declare enum IncentiveEligibilityId {
6
- AaveV3EthenaLiquidLeverage = "0x7361e6f04060154e0268a8402b073cbf97e11ae3BORROW_BL",
6
+ AaveV3EthenaLiquidLeverage = "0x8014e0076e5393e62c49a7134070d8fccc922e46BORROW_BL",
7
7
  AaveV3ArbitrumEthSupply = "0x5d16261c6715a653248269861bbacf68a9774cde",
8
8
  AaveV3ArbitrumETHLSBorrow = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351",
9
9
  AaveV3EthenaLiquidLeveragePlasma = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL"
@@ -8,7 +8,7 @@ var IncentiveKind;
8
8
  })(IncentiveKind || (exports.IncentiveKind = IncentiveKind = {}));
9
9
  var IncentiveEligibilityId;
10
10
  (function (IncentiveEligibilityId) {
11
- IncentiveEligibilityId["AaveV3EthenaLiquidLeverage"] = "0x7361e6f04060154e0268a8402b073cbf97e11ae3BORROW_BL";
11
+ IncentiveEligibilityId["AaveV3EthenaLiquidLeverage"] = "0x8014e0076e5393e62c49a7134070d8fccc922e46BORROW_BL";
12
12
  IncentiveEligibilityId["AaveV3ArbitrumEthSupply"] = "0x5d16261c6715a653248269861bbacf68a9774cde";
13
13
  IncentiveEligibilityId["AaveV3ArbitrumETHLSBorrow"] = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351";
14
14
  IncentiveEligibilityId["AaveV3EthenaLiquidLeveragePlasma"] = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL";
@@ -1,4 +1,4 @@
1
- import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAssets, AaveVersions } from '../../types';
1
+ import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions } from '../../types';
2
2
  import { EthereumProvider, NetworkNumber } from '../../types/common';
3
3
  export declare const AAVE_V3_MARKETS: AaveVersions[];
4
4
  export declare const isAaveV2: ({ selectedMarket }: {
@@ -17,7 +17,7 @@ export declare const aaveV3IsInSiloedMode: ({ usedAssets, assetsData }: {
17
17
  }) => boolean;
18
18
  export declare const aaveAnyGetCollSuppliedAssets: ({ usedAssets }: {
19
19
  usedAssets: AaveV3UsedAssets;
20
- }) => import("../../types").AaveV3UsedAsset[];
20
+ }) => AaveV3UsedAsset[];
21
21
  export declare const aaveAnyGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
22
22
  symbol: string;
23
23
  canBeCollateral: boolean;
@@ -94,6 +94,12 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
94
94
  payload.leveragedLsdAssetRatio = new Dec(assetsData[leveragedAsset].price).div(assetsData.ETH.price).toDP(18).toString();
95
95
  assetPrice = new Dec(assetPrice).div(assetsData.ETH.price).toString();
96
96
  }
97
+ if (leveragedType === 'volatile-pair') {
98
+ const borrowedAsset = Object.values(usedAssets).find(({ borrowedUsd }) => +borrowedUsd > 0);
99
+ const borrowedAssetPrice = data.assetsData[borrowedAsset.symbol].price;
100
+ assetPrice = new Dec(assetPrice).div(borrowedAssetPrice).toString();
101
+ payload.currentVolatilePairRatio = new Dec(assetsData[leveragedAsset].price).div(borrowedAssetPrice).toDP(18).toString();
102
+ }
97
103
  payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
98
104
  }
99
105
  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
@@ -118,73 +118,73 @@ export const getApyAfterValuesEstimation = (selectedMarket, actions, provider, n
118
118
  return { borrowRate, supplyRate };
119
119
  });
120
120
  const API_URL = 'https://blue-api.morpho.org/graphql';
121
- const MARKET_QUERY = `
122
- query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
123
- marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
124
- reallocatableLiquidityAssets
125
- targetBorrowUtilization
126
- loanAsset {
127
- address
128
- decimals
129
- priceUsd
130
- }
131
- state {
132
- liquidityAssets
133
- borrowAssets
134
- supplyAssets
135
- }
136
- publicAllocatorSharedLiquidity {
137
- assets
138
- vault {
139
- address
140
- name
141
- }
142
- allocationMarket {
143
- uniqueKey
144
- loanAsset {
145
- address
146
- }
147
- collateralAsset {
148
- address
149
- }
150
- irmAddress
151
- oracle {
152
- address
153
- }
154
- lltv
155
- }
156
- }
157
- loanAsset {
158
- address
159
- }
160
- collateralAsset {
161
- address
162
- }
163
- oracle {
164
- address
165
- }
166
- irmAddress
167
- lltv
168
- }
169
- }
121
+ const MARKET_QUERY = `
122
+ query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
123
+ marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
124
+ reallocatableLiquidityAssets
125
+ targetBorrowUtilization
126
+ loanAsset {
127
+ address
128
+ decimals
129
+ priceUsd
130
+ }
131
+ state {
132
+ liquidityAssets
133
+ borrowAssets
134
+ supplyAssets
135
+ }
136
+ publicAllocatorSharedLiquidity {
137
+ assets
138
+ vault {
139
+ address
140
+ name
141
+ }
142
+ allocationMarket {
143
+ uniqueKey
144
+ loanAsset {
145
+ address
146
+ }
147
+ collateralAsset {
148
+ address
149
+ }
150
+ irmAddress
151
+ oracle {
152
+ address
153
+ }
154
+ lltv
155
+ }
156
+ }
157
+ loanAsset {
158
+ address
159
+ }
160
+ collateralAsset {
161
+ address
162
+ }
163
+ oracle {
164
+ address
165
+ }
166
+ irmAddress
167
+ lltv
168
+ }
169
+ }
170
170
  `;
171
- const REWARDS_QUERY = `
172
- query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
173
- marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
174
- uniqueKey
175
- state {
176
- rewards {
177
- amountPerSuppliedToken
178
- supplyApr
179
- amountPerBorrowedToken
180
- borrowApr
181
- asset {
182
- address
183
- }
184
- }
185
- }
186
- }
187
- }
171
+ const REWARDS_QUERY = `
172
+ query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
173
+ marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
174
+ uniqueKey
175
+ state {
176
+ rewards {
177
+ amountPerSuppliedToken
178
+ supplyApr
179
+ amountPerBorrowedToken
180
+ borrowApr
181
+ asset {
182
+ address
183
+ }
184
+ }
185
+ }
186
+ }
187
+ }
188
188
  `;
189
189
  /**
190
190
  * Get reallocatable liquidity to a given market and target borrow utilization
@@ -10,7 +10,7 @@ export const calcShortLiqPrice = (assetPrice, borrowedUsd, borrowLimitUsd) => ne
10
10
  export const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimitUsd) => {
11
11
  if (leverageType === 'short')
12
12
  return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
13
- if (leverageType === 'long' || leverageType === 'lsd-leverage')
13
+ if (leverageType === 'long' || leverageType === 'lsd-leverage' || leverageType === 'volatile-pair')
14
14
  return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
15
15
  console.error('invalid leverageType', leverageType);
16
16
  return '0';
@@ -49,6 +49,7 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
49
49
  const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
50
50
  // lsd -> liquid staking derivative
51
51
  const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH', 'ezETH', 'weETH'].includes(longAsset);
52
+ const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
52
53
  if (isLong) {
53
54
  return {
54
55
  leveragedType: 'long',
@@ -67,6 +68,12 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
67
68
  leveragedAsset: longAsset,
68
69
  };
69
70
  }
71
+ if (isVolatilePair) {
72
+ return {
73
+ leveragedType: 'volatile-pair',
74
+ leveragedAsset: longAsset,
75
+ };
76
+ }
70
77
  return {
71
78
  leveragedType: '',
72
79
  leveragedAsset: '',
@@ -14,23 +14,23 @@ import * as morphoVaultsOptions from './options';
14
14
  import { getViemProvider } from '../../services/viem';
15
15
  import { getMorphoVaultContractViem } from '../../contracts';
16
16
  export { morphoVaultsOptions, };
17
- const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
18
- vaultByAddress(chainId: 1, address: "${vaultAddress}") {
19
- id,
20
- dailyApy,
21
- dailyApys {
22
- apy, netApy
23
- },
24
- monthlyApys {
25
- apy, netApy
26
- },
27
- liquidity {
28
- underlying, usd,
29
- },
30
- asset {
31
- priceUsd
32
- }
33
- }
17
+ const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
18
+ vaultByAddress(chainId: 1, address: "${vaultAddress}") {
19
+ id,
20
+ dailyApy,
21
+ dailyApys {
22
+ apy, netApy
23
+ },
24
+ monthlyApys {
25
+ apy, netApy
26
+ },
27
+ liquidity {
28
+ underlying, usd,
29
+ },
30
+ asset {
31
+ priceUsd
32
+ }
33
+ }
34
34
  }`;
35
35
  const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
36
36
  export const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {