@defisaver/positions-sdk 2.1.72-aave-v4-4-dev → 2.1.72-aave-v4-5-dev

package/cjs/aaveV4/index.js

@@ -79,6 +79,7 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
         }, {}),
     };
 });
+// TODO AaveV4: Will be used for after values, onchain data is available when fetching position data
 const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
     const collaterals = [];
     const debts = [];
@@ -151,7 +152,7 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
             description: `Native ${symbol} yield.`,
         });
         if (reserveAsset.borrowable) {
-            // when borrowing assets whose value increases over time
+            // When borrowing assets whose value increases over time
             borrowIncentives.push({
                 apy: new decimal_js_1.default(yieldApy).mul(-1).toString(),
                 token: symbol,
@@ -166,19 +167,23 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
     const totalDebtRaw = (_d = reserveAsset.totalDebt) !== null && _d !== void 0 ? _d : 0;
     const supplyCapRaw = (_e = reserveAsset.supplyCap) !== null && _e !== void 0 ? _e : 0;
     const borrowCapRaw = (_f = reserveAsset.borrowCap) !== null && _f !== void 0 ? _f : 0;
+    const totalSuppliedDec = new decimal_js_1.default(totalSuppliedRaw.toString());
+    const totalDrawnDec = new decimal_js_1.default(totalDrawnRaw.toString());
+    const utilization = totalSuppliedDec.isZero() ? '0' : totalDrawnDec.times(100).div(totalSuppliedDec).toString();
     /** @DEV Hub related calculations */
     const drawnRate = new decimal_js_1.default(hubAsset.drawnRate.toString()).div(new decimal_js_1.default(10).pow(27));
     const borrowApr = drawnRate.mul(100);
     const totalDrawn = new decimal_js_1.default(hubAsset.totalDrawn.toString());
     const liquidity = new decimal_js_1.default(hubAsset.liquidity.toString());
     const swept = new decimal_js_1.default(hubAsset.swept.toString());
-    const hubUtilization = totalDrawn.div(totalDrawn.add(swept).add(liquidity));
+    const hubUtilizationDenominator = totalDrawn.add(swept).add(liquidity);
+    const hubUtilization = hubUtilizationDenominator.isZero() ? new decimal_js_1.default(0) : totalDrawn.div(hubUtilizationDenominator);
     const liquidityFee = new decimal_js_1.default(hubAsset.liquidityFee.toString()).div(new decimal_js_1.default(10).pow(4));
     const totalDrawnShares = new decimal_js_1.default(hubAsset.totalDrawnShares.toString());
     const totalPremiumShares = new decimal_js_1.default(hubAsset.totalPremiumShares.toString());
     // TODO JK@JK premiumMultiplier should be added to supplyApr calculation (.mul(premiumMultiplier)
     // TODO JKJ@JK when we confirm that this is the right way to calculate it
-    const premiumMultiplier = totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
+    const premiumMultiplier = totalDrawnShares.isZero() ? new decimal_js_1.default(1) : totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
     const supplyApr = borrowApr.mul(hubUtilization).mul(new decimal_js_1.default(1).minus(liquidityFee));
     return ({
         symbol,
@@ -211,7 +216,7 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
         canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
         canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
-        utilization: new decimal_js_1.default(reserveAsset.totalDrawn.toString()).times(100).div(new decimal_js_1.default(reserveAsset.totalSupplied.toString())).toString(),
+        utilization,
     });
 });
 function _getAaveV4SpokeData(provider_1, network_1, market_1) {

package/esm/aaveV4/index.js

@@ -36,6 +36,7 @@ const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, voi
         }, {}),
     };
 });
+// TODO AaveV4: Will be used for after values, onchain data is available when fetching position data
 const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
     const collaterals = [];
     const debts = [];
@@ -108,7 +109,7 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
             description: `Native ${symbol} yield.`,
         });
         if (reserveAsset.borrowable) {
-            // when borrowing assets whose value increases over time
+            // When borrowing assets whose value increases over time
             borrowIncentives.push({
                 apy: new Dec(yieldApy).mul(-1).toString(),
                 token: symbol,
@@ -123,19 +124,23 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
     const totalDebtRaw = (_d = reserveAsset.totalDebt) !== null && _d !== void 0 ? _d : 0;
     const supplyCapRaw = (_e = reserveAsset.supplyCap) !== null && _e !== void 0 ? _e : 0;
     const borrowCapRaw = (_f = reserveAsset.borrowCap) !== null && _f !== void 0 ? _f : 0;
+    const totalSuppliedDec = new Dec(totalSuppliedRaw.toString());
+    const totalDrawnDec = new Dec(totalDrawnRaw.toString());
+    const utilization = totalSuppliedDec.isZero() ? '0' : totalDrawnDec.times(100).div(totalSuppliedDec).toString();
     /** @DEV Hub related calculations */
     const drawnRate = new Dec(hubAsset.drawnRate.toString()).div(new Dec(10).pow(27));
     const borrowApr = drawnRate.mul(100);
     const totalDrawn = new Dec(hubAsset.totalDrawn.toString());
     const liquidity = new Dec(hubAsset.liquidity.toString());
     const swept = new Dec(hubAsset.swept.toString());
-    const hubUtilization = totalDrawn.div(totalDrawn.add(swept).add(liquidity));
+    const hubUtilizationDenominator = totalDrawn.add(swept).add(liquidity);
+    const hubUtilization = hubUtilizationDenominator.isZero() ? new Dec(0) : totalDrawn.div(hubUtilizationDenominator);
     const liquidityFee = new Dec(hubAsset.liquidityFee.toString()).div(new Dec(10).pow(4));
     const totalDrawnShares = new Dec(hubAsset.totalDrawnShares.toString());
     const totalPremiumShares = new Dec(hubAsset.totalPremiumShares.toString());
     // TODO JK@JK premiumMultiplier should be added to supplyApr calculation (.mul(premiumMultiplier)
     // TODO JKJ@JK when we confirm that this is the right way to calculate it
-    const premiumMultiplier = totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
+    const premiumMultiplier = totalDrawnShares.isZero() ? new Dec(1) : totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
     const supplyApr = borrowApr.mul(hubUtilization).mul(new Dec(1).minus(liquidityFee));
     return ({
         symbol,
@@ -168,7 +173,7 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
         canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
         canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
-        utilization: new Dec(reserveAsset.totalDrawn.toString()).times(100).div(new Dec(reserveAsset.totalSupplied.toString())).toString(),
+        utilization,
     });
 });
 export function _getAaveV4SpokeData(provider_1, network_1, market_1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.72-aave-v4-4-dev",
+  "version": "2.1.72-aave-v4-5-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.7.26",
+    "@defisaver/tokens": "1.7.26-aave-v4-dev",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

package/src/aaveV4/index.ts

@@ -46,6 +46,7 @@ const fetchHubData = async (viewContract: ReturnType<typeof AaveV4ViewContractVi
   };
 };
 
+// TODO AaveV4: Will be used for after values, onchain data is available when fetching position data
 const calcUserRiskPremiumBps = (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData): number => {
   type CollateralInfo = { riskBps: number; valueUsd: Dec };
   type DebtInfo = { valueUsd: Dec };
@@ -134,7 +135,7 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
       description: `Native ${symbol} yield.`,
     });
     if (reserveAsset.borrowable) {
-      // when borrowing assets whose value increases over time
+      // When borrowing assets whose value increases over time
       borrowIncentives.push({
         apy: new Dec(yieldApy).mul(-1).toString(),
         token: symbol,
@@ -150,6 +151,9 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
   const totalDebtRaw = reserveAsset.totalDebt ?? 0;
   const supplyCapRaw = reserveAsset.supplyCap ?? 0;
   const borrowCapRaw = reserveAsset.borrowCap ?? 0;
+  const totalSuppliedDec = new Dec(totalSuppliedRaw.toString());
+  const totalDrawnDec = new Dec(totalDrawnRaw.toString());
+  const utilization = totalSuppliedDec.isZero() ? '0' : totalDrawnDec.times(100).div(totalSuppliedDec).toString();
 
   /** @DEV Hub related calculations */
   const drawnRate = new Dec(hubAsset.drawnRate.toString()).div(new Dec(10).pow(27));
@@ -157,13 +161,14 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
   const totalDrawn = new Dec(hubAsset.totalDrawn.toString());
   const liquidity = new Dec(hubAsset.liquidity.toString());
   const swept = new Dec(hubAsset.swept.toString());
-  const hubUtilization = totalDrawn.div(totalDrawn.add(swept).add(liquidity));
+  const hubUtilizationDenominator = totalDrawn.add(swept).add(liquidity);
+  const hubUtilization = hubUtilizationDenominator.isZero() ? new Dec(0) : totalDrawn.div(hubUtilizationDenominator);
   const liquidityFee = new Dec(hubAsset.liquidityFee.toString()).div(new Dec(10).pow(4));
   const totalDrawnShares = new Dec(hubAsset.totalDrawnShares.toString());
   const totalPremiumShares = new Dec(hubAsset.totalPremiumShares.toString());
   // TODO JK@JK premiumMultiplier should be added to supplyApr calculation (.mul(premiumMultiplier)
   // TODO JKJ@JK when we confirm that this is the right way to calculate it
-  const premiumMultiplier = totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
+  const premiumMultiplier = totalDrawnShares.isZero() ? new Dec(1) : totalDrawnShares.add(totalPremiumShares).div(totalDrawnShares);
   const supplyApr = borrowApr.mul(hubUtilization).mul(new Dec(1).minus(liquidityFee));
 
   return ({
@@ -197,7 +202,7 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
     canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused && !reserveAsset.frozen,
     canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
     canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
-    utilization: new Dec(reserveAsset.totalDrawn.toString()).times(100).div(new Dec(reserveAsset.totalSupplied.toString())).toString(),
+    utilization,
   });
 };