@defisaver/positions-sdk 2.1.79-aave-v4-8-dev → 2.1.79-aave-v4-10-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 (10) hide show
  1. package/cjs/aaveV4/index.js +11 -10
  2. package/cjs/helpers/aaveV4Helpers/index.js +1 -1
  3. package/cjs/types/aaveV4.d.ts +2 -0
  4. package/esm/aaveV4/index.js +11 -10
  5. package/esm/helpers/aaveV4Helpers/index.js +1 -1
  6. package/esm/types/aaveV4.d.ts +2 -0
  7. package/package.json +1 -1
  8. package/src/aaveV4/index.ts +11 -10
  9. package/src/helpers/aaveV4Helpers/index.ts +1 -1
  10. package/src/types/aaveV4.ts +2 -0
package/cjs/aaveV4/index.js CHANGED
@@ -114,8 +114,8 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
114
114
  const totalDebtRaw = (_d = reserveAsset.totalDebt) !== null && _d !== void 0 ? _d : 0;
115
115
  const supplyCapRaw = (_e = reserveAsset.supplyCap) !== null && _e !== void 0 ? _e : 0;
116
116
  const borrowCapRaw = (_f = reserveAsset.borrowCap) !== null && _f !== void 0 ? _f : 0;
117
- const totalSuppliedDec = new decimal_js_1.default(totalSuppliedRaw.toString());
118
- const totalDrawnDec = new decimal_js_1.default(totalDrawnRaw.toString());
117
+ const totalSuppliedDec = (0, utils_1.isMaxUint)(totalSuppliedRaw.toString()) ? new decimal_js_1.default(0) : new decimal_js_1.default(totalSuppliedRaw.toString());
118
+ const totalDrawnDec = (0, utils_1.isMaxUint)(totalDrawnRaw.toString()) ? new decimal_js_1.default(0) : new decimal_js_1.default(totalDrawnRaw.toString());
119
119
  const utilization = totalSuppliedDec.isZero() ? '0' : totalDrawnDec.times(100).div(totalSuppliedDec).toString();
120
120
  /** @DEV Hub related calculations */
121
121
  const drawnRate = new decimal_js_1.default(hubAsset.drawnRate.toString()).div(new decimal_js_1.default(10).pow(27));
@@ -143,11 +143,12 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
143
143
  collateralRisk: new decimal_js_1.default(reserveAsset.collateralRisk).div(10000).toNumber(),
144
144
  collateralFactor: new decimal_js_1.default(reserveAsset.collateralFactor).div(10000).toNumber(),
145
145
  liquidationFee: new decimal_js_1.default(reserveAsset.liquidationFee).div(10000).toNumber(),
146
+ maxLiquidationBonus: new decimal_js_1.default(reserveAsset.maxLiquidationBonus).div(10000).toNumber(),
146
147
  price: new decimal_js_1.default(reserveAsset.price).div(new decimal_js_1.default(10).pow(oracleDecimals)).toString(),
147
- totalSupplied: (0, tokens_1.assetAmountInEth)(totalSuppliedRaw.toString(), symbol),
148
- totalDrawn: (0, tokens_1.assetAmountInEth)(totalDrawnRaw.toString(), symbol),
149
- totalPremium: (0, tokens_1.assetAmountInEth)(totalPremiumRaw.toString(), symbol),
150
- totalDebt: (0, tokens_1.assetAmountInEth)(totalDebtRaw.toString(), symbol),
148
+ totalSupplied: (0, utils_1.isMaxUint)(totalSuppliedRaw.toString()) ? totalSuppliedRaw.toString() : (0, tokens_1.assetAmountInEth)(totalSuppliedRaw.toString(), symbol),
149
+ totalDrawn: (0, utils_1.isMaxUint)(totalDrawnRaw.toString()) ? totalDrawnRaw.toString() : (0, tokens_1.assetAmountInEth)(totalDrawnRaw.toString(), symbol),
150
+ totalPremium: (0, utils_1.isMaxUint)(totalPremiumRaw.toString()) ? totalPremiumRaw.toString() : (0, tokens_1.assetAmountInEth)(totalPremiumRaw.toString(), symbol),
151
+ totalDebt: (0, utils_1.isMaxUint)(totalDebtRaw.toString()) ? totalDebtRaw.toString() : (0, tokens_1.assetAmountInEth)(totalDebtRaw.toString(), symbol),
151
152
  supplyCap: (0, utils_1.isMaxUint)(supplyCapRaw.toString()) ? supplyCapRaw.toString() : (0, tokens_1.assetAmountInEth)(supplyCapRaw.toString(), symbol),
152
153
  borrowCap: (0, utils_1.isMaxUint)(borrowCapRaw.toString()) ? borrowCapRaw.toString() : (0, tokens_1.assetAmountInEth)(borrowCapRaw.toString(), symbol),
153
154
  spokeActive: reserveAsset.spokeActive,
@@ -201,10 +202,10 @@ function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
201
202
  const identifier = `${(0, utils_1.wethToEth)((0, tokens_1.getAssetInfoByAddress)(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
202
203
  const reserveData = spokeData.assetsData[identifier];
203
204
  const price = reserveData.price;
204
- const supplied = (0, tokens_1.assetAmountInEth)(usedReserveAsset.supplied.toString(), reserveData.symbol);
205
- const drawn = (0, tokens_1.assetAmountInEth)(usedReserveAsset.drawn.toString(), reserveData.symbol);
206
- const premium = (0, tokens_1.assetAmountInEth)(usedReserveAsset.premium.toString(), reserveData.symbol);
207
- const borrowed = (0, tokens_1.assetAmountInEth)(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
205
+ const supplied = (0, utils_1.isMaxUint)(usedReserveAsset.supplied.toString()) ? usedReserveAsset.supplied.toString() : (0, tokens_1.assetAmountInEth)(usedReserveAsset.supplied.toString(), reserveData.symbol);
206
+ const drawn = (0, utils_1.isMaxUint)(usedReserveAsset.drawn.toString()) ? usedReserveAsset.drawn.toString() : (0, tokens_1.assetAmountInEth)(usedReserveAsset.drawn.toString(), reserveData.symbol);
207
+ const premium = (0, utils_1.isMaxUint)(usedReserveAsset.premium.toString()) ? usedReserveAsset.premium.toString() : (0, tokens_1.assetAmountInEth)(usedReserveAsset.premium.toString(), reserveData.symbol);
208
+ const borrowed = (0, utils_1.isMaxUint)(usedReserveAsset.totalDebt.toString()) ? usedReserveAsset.totalDebt.toString() : (0, tokens_1.assetAmountInEth)(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
208
209
  acc[identifier] = {
209
210
  symbol: reserveData.symbol,
210
211
  hubName: reserveData.hubName,
package/cjs/helpers/aaveV4Helpers/index.js CHANGED
@@ -221,7 +221,7 @@ const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, useU
221
221
  }
222
222
  payload.minCollRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
223
223
  payload.collLiquidationRatio = new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
224
- // payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
224
+ payload.healthRatio = new decimal_js_1.default(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
225
225
  payload.minHealthRatio = new decimal_js_1.default(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
226
226
  const { netApy, incentiveUsd, totalInterestUsd } = (0, exports.calculateNetApyAaveV4)({ usedAssets, assetsData });
227
227
  payload.netApy = netApy;
package/cjs/types/aaveV4.d.ts CHANGED
@@ -85,6 +85,7 @@ export interface AaveV4ReserveAssetData {
85
85
  collateralRisk: number;
86
86
  collateralFactor: number;
87
87
  liquidationFee: number;
88
+ maxLiquidationBonus: number;
88
89
  price: string;
89
90
  totalSupplied: string;
90
91
  totalDrawn: string;
@@ -143,6 +144,7 @@ export interface AaveV4AggregatedPositionData {
143
144
  minCollRatio: string;
144
145
  collLiquidationRatio: string;
145
146
  minHealthRatio: string;
147
+ healthRatio: string;
146
148
  netApy: string;
147
149
  incentiveUsd: string;
148
150
  totalInterestUsd: string;
package/esm/aaveV4/index.js CHANGED
@@ -71,8 +71,8 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
71
71
  const totalDebtRaw = (_d = reserveAsset.totalDebt) !== null && _d !== void 0 ? _d : 0;
72
72
  const supplyCapRaw = (_e = reserveAsset.supplyCap) !== null && _e !== void 0 ? _e : 0;
73
73
  const borrowCapRaw = (_f = reserveAsset.borrowCap) !== null && _f !== void 0 ? _f : 0;
74
- const totalSuppliedDec = new Dec(totalSuppliedRaw.toString());
75
- const totalDrawnDec = new Dec(totalDrawnRaw.toString());
74
+ const totalSuppliedDec = isMaxUint(totalSuppliedRaw.toString()) ? new Dec(0) : new Dec(totalSuppliedRaw.toString());
75
+ const totalDrawnDec = isMaxUint(totalDrawnRaw.toString()) ? new Dec(0) : new Dec(totalDrawnRaw.toString());
76
76
  const utilization = totalSuppliedDec.isZero() ? '0' : totalDrawnDec.times(100).div(totalSuppliedDec).toString();
77
77
  /** @DEV Hub related calculations */
78
78
  const drawnRate = new Dec(hubAsset.drawnRate.toString()).div(new Dec(10).pow(27));
@@ -100,11 +100,12 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
100
100
  collateralRisk: new Dec(reserveAsset.collateralRisk).div(10000).toNumber(),
101
101
  collateralFactor: new Dec(reserveAsset.collateralFactor).div(10000).toNumber(),
102
102
  liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
103
+ maxLiquidationBonus: new Dec(reserveAsset.maxLiquidationBonus).div(10000).toNumber(),
103
104
  price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
104
- totalSupplied: assetAmountInEth(totalSuppliedRaw.toString(), symbol),
105
- totalDrawn: assetAmountInEth(totalDrawnRaw.toString(), symbol),
106
- totalPremium: assetAmountInEth(totalPremiumRaw.toString(), symbol),
107
- totalDebt: assetAmountInEth(totalDebtRaw.toString(), symbol),
105
+ totalSupplied: isMaxUint(totalSuppliedRaw.toString()) ? totalSuppliedRaw.toString() : assetAmountInEth(totalSuppliedRaw.toString(), symbol),
106
+ totalDrawn: isMaxUint(totalDrawnRaw.toString()) ? totalDrawnRaw.toString() : assetAmountInEth(totalDrawnRaw.toString(), symbol),
107
+ totalPremium: isMaxUint(totalPremiumRaw.toString()) ? totalPremiumRaw.toString() : assetAmountInEth(totalPremiumRaw.toString(), symbol),
108
+ totalDebt: isMaxUint(totalDebtRaw.toString()) ? totalDebtRaw.toString() : assetAmountInEth(totalDebtRaw.toString(), symbol),
108
109
  supplyCap: isMaxUint(supplyCapRaw.toString()) ? supplyCapRaw.toString() : assetAmountInEth(supplyCapRaw.toString(), symbol),
109
110
  borrowCap: isMaxUint(borrowCapRaw.toString()) ? borrowCapRaw.toString() : assetAmountInEth(borrowCapRaw.toString(), symbol),
110
111
  spokeActive: reserveAsset.spokeActive,
@@ -158,10 +159,10 @@ export function _getAaveV4AccountData(provider_1, network_1, spokeData_1, addres
158
159
  const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
159
160
  const reserveData = spokeData.assetsData[identifier];
160
161
  const price = reserveData.price;
161
- const supplied = assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
162
- const drawn = assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
163
- const premium = assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
164
- const borrowed = assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
162
+ const supplied = isMaxUint(usedReserveAsset.supplied.toString()) ? usedReserveAsset.supplied.toString() : assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
163
+ const drawn = isMaxUint(usedReserveAsset.drawn.toString()) ? usedReserveAsset.drawn.toString() : assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
164
+ const premium = isMaxUint(usedReserveAsset.premium.toString()) ? usedReserveAsset.premium.toString() : assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
165
+ const borrowed = isMaxUint(usedReserveAsset.totalDebt.toString()) ? usedReserveAsset.totalDebt.toString() : assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
165
166
  acc[identifier] = {
166
167
  symbol: reserveData.symbol,
167
168
  hubName: reserveData.hubName,
package/esm/helpers/aaveV4Helpers/index.js CHANGED
@@ -210,7 +210,7 @@ export const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, networ
210
210
  }
211
211
  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
212
212
  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
213
- // payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
213
+ payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
214
214
  payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
215
215
  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApyAaveV4({ usedAssets, assetsData });
216
216
  payload.netApy = netApy;
package/esm/types/aaveV4.d.ts CHANGED
@@ -85,6 +85,7 @@ export interface AaveV4ReserveAssetData {
85
85
  collateralRisk: number;
86
86
  collateralFactor: number;
87
87
  liquidationFee: number;
88
+ maxLiquidationBonus: number;
88
89
  price: string;
89
90
  totalSupplied: string;
90
91
  totalDrawn: string;
@@ -143,6 +144,7 @@ export interface AaveV4AggregatedPositionData {
143
144
  minCollRatio: string;
144
145
  collLiquidationRatio: string;
145
146
  minHealthRatio: string;
147
+ healthRatio: string;
146
148
  netApy: string;
147
149
  incentiveUsd: string;
148
150
  totalInterestUsd: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@defisaver/positions-sdk",
3
- "version": "2.1.79-aave-v4-8-dev",
3
+ "version": "2.1.79-aave-v4-10-dev",
4
4
  "description": "",
5
5
  "main": "./cjs/index.js",
6
6
  "module": "./esm/index.js",
package/src/aaveV4/index.ts CHANGED
@@ -83,8 +83,8 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
83
83
  const totalDebtRaw = reserveAsset.totalDebt ?? 0;
84
84
  const supplyCapRaw = reserveAsset.supplyCap ?? 0;
85
85
  const borrowCapRaw = reserveAsset.borrowCap ?? 0;
86
- const totalSuppliedDec = new Dec(totalSuppliedRaw.toString());
87
- const totalDrawnDec = new Dec(totalDrawnRaw.toString());
86
+ const totalSuppliedDec = isMaxUint(totalSuppliedRaw.toString()) ? new Dec(0) : new Dec(totalSuppliedRaw.toString());
87
+ const totalDrawnDec = isMaxUint(totalDrawnRaw.toString()) ? new Dec(0) : new Dec(totalDrawnRaw.toString());
88
88
  const utilization = totalSuppliedDec.isZero() ? '0' : totalDrawnDec.times(100).div(totalSuppliedDec).toString();
89
89
 
90
90
  /** @DEV Hub related calculations */
@@ -114,11 +114,12 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
114
114
  collateralRisk: new Dec(reserveAsset.collateralRisk).div(10000).toNumber(),
115
115
  collateralFactor: new Dec(reserveAsset.collateralFactor).div(10000).toNumber(),
116
116
  liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
117
+ maxLiquidationBonus: new Dec(reserveAsset.maxLiquidationBonus).div(10000).toNumber(),
117
118
  price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
118
- totalSupplied: assetAmountInEth(totalSuppliedRaw.toString(), symbol),
119
- totalDrawn: assetAmountInEth(totalDrawnRaw.toString(), symbol),
120
- totalPremium: assetAmountInEth(totalPremiumRaw.toString(), symbol),
121
- totalDebt: assetAmountInEth(totalDebtRaw.toString(), symbol),
119
+ totalSupplied: isMaxUint(totalSuppliedRaw.toString()) ? totalSuppliedRaw.toString() : assetAmountInEth(totalSuppliedRaw.toString(), symbol),
120
+ totalDrawn: isMaxUint(totalDrawnRaw.toString()) ? totalDrawnRaw.toString() : assetAmountInEth(totalDrawnRaw.toString(), symbol),
121
+ totalPremium: isMaxUint(totalPremiumRaw.toString()) ? totalPremiumRaw.toString() : assetAmountInEth(totalPremiumRaw.toString(), symbol),
122
+ totalDebt: isMaxUint(totalDebtRaw.toString()) ? totalDebtRaw.toString() : assetAmountInEth(totalDebtRaw.toString(), symbol),
122
123
  supplyCap: isMaxUint(supplyCapRaw.toString()) ? supplyCapRaw.toString() : assetAmountInEth(supplyCapRaw.toString(), symbol),
123
124
  borrowCap: isMaxUint(borrowCapRaw.toString()) ? borrowCapRaw.toString() : assetAmountInEth(borrowCapRaw.toString(), symbol),
124
125
  spokeActive: reserveAsset.spokeActive,
@@ -175,10 +176,10 @@ export async function _getAaveV4AccountData(provider: Client, network: NetworkNu
175
176
  const identifier = `${wethToEth(getAssetInfoByAddress(usedReserveAsset.underlying, network).symbol)}-${+usedReserveAsset.reserveId.toString()}`;
176
177
  const reserveData = spokeData.assetsData[identifier];
177
178
  const price = reserveData.price;
178
- const supplied = assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
179
- const drawn = assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
180
- const premium = assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
181
- const borrowed = assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
179
+ const supplied = isMaxUint(usedReserveAsset.supplied.toString()) ? usedReserveAsset.supplied.toString() : assetAmountInEth(usedReserveAsset.supplied.toString(), reserveData.symbol);
180
+ const drawn = isMaxUint(usedReserveAsset.drawn.toString()) ? usedReserveAsset.drawn.toString() : assetAmountInEth(usedReserveAsset.drawn.toString(), reserveData.symbol);
181
+ const premium = isMaxUint(usedReserveAsset.premium.toString()) ? usedReserveAsset.premium.toString() : assetAmountInEth(usedReserveAsset.premium.toString(), reserveData.symbol);
182
+ const borrowed = isMaxUint(usedReserveAsset.totalDebt.toString()) ? usedReserveAsset.totalDebt.toString() : assetAmountInEth(usedReserveAsset.totalDebt.toString(), reserveData.symbol);
182
183
  acc[identifier] = {
183
184
  symbol: reserveData.symbol,
184
185
  hubName: reserveData.hubName,
package/src/helpers/aaveV4Helpers/index.ts CHANGED
@@ -279,7 +279,7 @@ export const aaveV4GetAggregatedPositionData = ({
279
279
  }
280
280
  payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
281
281
  payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
282
- // payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
282
+ payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
283
283
  payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
284
284
 
285
285
  const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApyAaveV4({ usedAssets, assetsData });
package/src/types/aaveV4.ts CHANGED
@@ -96,6 +96,7 @@ export interface AaveV4ReserveAssetData {
96
96
  collateralRisk: number,
97
97
  collateralFactor: number,
98
98
  liquidationFee: number,
99
+ maxLiquidationBonus: number,
99
100
  price: string,
100
101
  totalSupplied: string,
101
102
  totalDrawn: string,
@@ -157,6 +158,7 @@ export interface AaveV4AggregatedPositionData {
157
158
  minCollRatio: string,
158
159
  collLiquidationRatio: string,
159
160
  minHealthRatio: string,
161
+ healthRatio: string,
160
162
  netApy: string,
161
163
  incentiveUsd: string,
162
164
  totalInterestUsd: string,