@defisaver/positions-sdk 2.1.43-aave-v4-dev-4 → 2.1.43-aave-v4-dev-6

package/cjs/aaveV4/index.js

@@ -85,6 +85,10 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         supplyRate: '0', // To be implemented
         supplyIncentives,
         borrowIncentives,
+        canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused && !reserveAsset.frozen,
+        canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused && !reserveAsset.frozen,
+        canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused,
+        canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused,
     });
 });
 function _getAaveV4SpokeData(provider_1, network_1, market_1) {
@@ -142,6 +146,7 @@ function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
                 isSupplied: !new decimal_js_1.default(supplied).eq(0),
                 isBorrowed: usedReserveAsset.isBorrowing,
                 collateral: usedReserveAsset.isUsingAsCollateral,
+                collateralFactor: new decimal_js_1.default(usedReserveAsset.collateralFactor).div(10000).toNumber(),
             };
             return acc;
         }, {});
@@ -150,6 +155,7 @@ function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
             usedAssets,
             assetsData: spokeData.assetsData,
             network,
+            useUserCollateralFactor: true,
         }));
     });
 }

package/cjs/helpers/aaveV4Helpers/index.d.ts

@@ -1,7 +1,9 @@
-import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4UsedReserveAssets } from '../../types';
+import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets } from '../../types';
 import { NetworkNumber } from '../../types/common';
-export declare const aaveV4GetAggregatedPositionData: ({ usedAssets, assetsData, network, }: {
+export declare const aaveV4GetCollateralFactor: (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor?: boolean) => number;
+export declare const aaveV4GetAggregatedPositionData: ({ usedAssets, assetsData, network, useUserCollateralFactor, }: {
     usedAssets: AaveV4UsedReserveAssets;
     assetsData: AaveV4AssetsData;
     network: NetworkNumber;
+    useUserCollateralFactor?: boolean;
 }) => AaveV4AggregatedPositionData;

package/cjs/helpers/aaveV4Helpers/index.js

@@ -3,18 +3,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aaveV4GetAggregatedPositionData = void 0;
+exports.aaveV4GetAggregatedPositionData = exports.aaveV4GetCollateralFactor = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const moneymarket_1 = require("../../moneymarket");
-const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, }) => {
+const aaveV4GetCollateralFactor = (assetData, usedAssetData, useUserCollateralFactor = false) => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
+exports.aaveV4GetCollateralFactor = aaveV4GetCollateralFactor;
+const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, useUserCollateralFactor = false, }) => {
     var _a;
     const payload = {};
     payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
-    payload.borrowLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd, reserveId }) => new decimal_js_1.default(suppliedUsd).mul(assetsData[`${symbol}-${reserveId}`].collateralFactor));
-    payload.liquidationLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, 
-    // TODO: Verify if liquidation factor is available in Aave V4, currently using collateralFactor as placeholder
-    ({ symbol, suppliedUsd, reserveId }) => new decimal_js_1.default(suppliedUsd).mul(assetsData[`${symbol}-${reserveId}`].collateralFactor));
+    payload.borrowLimitUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd, reserveId }) => new decimal_js_1.default(suppliedUsd).mul((0, exports.aaveV4GetCollateralFactor)(assetsData[`${symbol}-${reserveId}`], usedAssets[`${symbol}-${reserveId}`], useUserCollateralFactor)));
+    payload.liquidationLimitUsd = payload.borrowLimitUsd;
     payload.borrowedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
     payload.drawnUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ drawnUsd }) => drawnUsd);
     payload.premiumUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ premiumUsd }) => premiumUsd);

package/cjs/types/aaveV4.d.ts

@@ -68,6 +68,10 @@ export interface AaveV4ReserveAssetData {
     supplyRate: string;
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
+    canBeBorrowed: boolean;
+    canBeSupplied: boolean;
+    canBeWithdrawn: boolean;
+    canBePayBacked: boolean;
 }
 export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
 export interface AaveV4SpokeData {
@@ -91,6 +95,7 @@ export interface AaveV4UsedReserveAsset {
     isSupplied: boolean;
     isBorrowed: boolean;
     collateral: boolean;
+    collateralFactor: number;
 }
 export interface AaveV4AggregatedPositionData {
     suppliedUsd: string;

package/esm/aaveV4/index.js

@@ -76,6 +76,10 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         supplyRate: '0', // To be implemented
         supplyIncentives,
         borrowIncentives,
+        canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused && !reserveAsset.frozen,
+        canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused && !reserveAsset.frozen,
+        canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused,
+        canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused,
     });
 });
 export function _getAaveV4SpokeData(provider_1, network_1, market_1) {
@@ -133,6 +137,7 @@ export function _getAaveV4AccountData(provider_1, network_1, spokeData_1, addres
                 isSupplied: !new Dec(supplied).eq(0),
                 isBorrowed: usedReserveAsset.isBorrowing,
                 collateral: usedReserveAsset.isUsingAsCollateral,
+                collateralFactor: new Dec(usedReserveAsset.collateralFactor).div(10000).toNumber(),
             };
             return acc;
         }, {});
@@ -141,6 +146,7 @@ export function _getAaveV4AccountData(provider_1, network_1, spokeData_1, addres
             usedAssets,
             assetsData: spokeData.assetsData,
             network,
+            useUserCollateralFactor: true,
         }));
     });
 }

package/esm/helpers/aaveV4Helpers/index.d.ts

@@ -1,7 +1,9 @@
-import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4UsedReserveAssets } from '../../types';
+import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets } from '../../types';
 import { NetworkNumber } from '../../types/common';
-export declare const aaveV4GetAggregatedPositionData: ({ usedAssets, assetsData, network, }: {
+export declare const aaveV4GetCollateralFactor: (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor?: boolean) => number;
+export declare const aaveV4GetAggregatedPositionData: ({ usedAssets, assetsData, network, useUserCollateralFactor, }: {
     usedAssets: AaveV4UsedReserveAssets;
     assetsData: AaveV4AssetsData;
     network: NetworkNumber;
+    useUserCollateralFactor?: boolean;
 }) => AaveV4AggregatedPositionData;

package/esm/helpers/aaveV4Helpers/index.js

@@ -1,14 +1,13 @@
 import Dec from 'decimal.js';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
-export const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, }) => {
+export const aaveV4GetCollateralFactor = (assetData, usedAssetData, useUserCollateralFactor = false) => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
+export const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, useUserCollateralFactor = false, }) => {
     var _a;
     const payload = {};
     payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
-    payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd, reserveId }) => new Dec(suppliedUsd).mul(assetsData[`${symbol}-${reserveId}`].collateralFactor));
-    payload.liquidationLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, 
-    // TODO: Verify if liquidation factor is available in Aave V4, currently using collateralFactor as placeholder
-    ({ symbol, suppliedUsd, reserveId }) => new Dec(suppliedUsd).mul(assetsData[`${symbol}-${reserveId}`].collateralFactor));
+    payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd, reserveId }) => new Dec(suppliedUsd).mul(aaveV4GetCollateralFactor(assetsData[`${symbol}-${reserveId}`], usedAssets[`${symbol}-${reserveId}`], useUserCollateralFactor)));
+    payload.liquidationLimitUsd = payload.borrowLimitUsd;
     payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
     payload.drawnUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ drawnUsd }) => drawnUsd);
     payload.premiumUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ premiumUsd }) => premiumUsd);

package/esm/types/aaveV4.d.ts

@@ -68,6 +68,10 @@ export interface AaveV4ReserveAssetData {
     supplyRate: string;
     supplyIncentives: IncentiveData[];
     borrowIncentives: IncentiveData[];
+    canBeBorrowed: boolean;
+    canBeSupplied: boolean;
+    canBeWithdrawn: boolean;
+    canBePayBacked: boolean;
 }
 export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
 export interface AaveV4SpokeData {
@@ -91,6 +95,7 @@ export interface AaveV4UsedReserveAsset {
     isSupplied: boolean;
     isBorrowed: boolean;
     collateral: boolean;
+    collateralFactor: number;
 }
 export interface AaveV4AggregatedPositionData {
     suppliedUsd: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.43-aave-v4-dev-4",
+  "version": "2.1.43-aave-v4-dev-6",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV4/index.ts

@@ -82,6 +82,10 @@ const formatReserveAsset = async (reserveAsset: AaveV4ReserveAssetOnChain, hubAs
     supplyRate: '0', // To be implemented
     supplyIncentives,
     borrowIncentives,
+    canBeBorrowed: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused && !reserveAsset.frozen,
+    canBeSupplied: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused && !reserveAsset.frozen,
+    canBeWithdrawn: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused,
+    canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokePaused && !reserveAsset.paused,
   });
 };
 
@@ -142,6 +146,7 @@ export async function _getAaveV4AccountData(provider: Client, network: NetworkNu
       isSupplied: !new Dec(supplied).eq(0),
       isBorrowed: usedReserveAsset.isBorrowing,
       collateral: usedReserveAsset.isUsingAsCollateral,
+      collateralFactor: new Dec(usedReserveAsset.collateralFactor).div(10000).toNumber(),
     };
     return acc;
   }, {});
@@ -153,6 +158,7 @@ export async function _getAaveV4AccountData(provider: Client, network: NetworkNu
       usedAssets,
       assetsData: spokeData.assetsData,
       network,
+      useUserCollateralFactor: true,
     }),
   };
 }

package/src/helpers/aaveV4Helpers/index.ts

@@ -1,16 +1,22 @@
 import Dec from 'decimal.js';
 import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
-import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4UsedReserveAssets } from '../../types';
+import {
+  AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets,
+} from '../../types';
 import { NetworkNumber } from '../../types/common';
 
+export const aaveV4GetCollateralFactor = (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor: boolean = false): number => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
+
 export const aaveV4GetAggregatedPositionData = ({
   usedAssets,
   assetsData,
   network,
+  useUserCollateralFactor = false,
 }: {
   usedAssets: AaveV4UsedReserveAssets,
   assetsData: AaveV4AssetsData,
   network: NetworkNumber,
+  useUserCollateralFactor?: boolean,
 }): AaveV4AggregatedPositionData => {
   const payload = {} as AaveV4AggregatedPositionData;
   payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);
@@ -18,14 +24,9 @@ export const aaveV4GetAggregatedPositionData = ({
   payload.borrowLimitUsd = getAssetsTotal(
     usedAssets,
     ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
-    ({ symbol, suppliedUsd, reserveId }: { symbol: string, suppliedUsd: string, reserveId: number }) => new Dec(suppliedUsd).mul(assetsData[`${symbol}-${reserveId}`].collateralFactor),
-  );
-  payload.liquidationLimitUsd = getAssetsTotal(
-    usedAssets,
-    ({ isSupplied, collateral }: { isSupplied: boolean, collateral: string }) => isSupplied && collateral,
-    // TODO: Verify if liquidation factor is available in Aave V4, currently using collateralFactor as placeholder
-    ({ symbol, suppliedUsd, reserveId }: { symbol: string, suppliedUsd: string, reserveId: number }) => new Dec(suppliedUsd).mul(assetsData[`${symbol}-${reserveId}`].collateralFactor),
+    ({ symbol, suppliedUsd, reserveId }: { symbol: string, suppliedUsd: string, reserveId: number }) => new Dec(suppliedUsd).mul(aaveV4GetCollateralFactor(assetsData[`${symbol}-${reserveId}`], usedAssets[`${symbol}-${reserveId}`], useUserCollateralFactor)),
   );
+  payload.liquidationLimitUsd = payload.borrowLimitUsd;
   payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ borrowedUsd }: { borrowedUsd: string }) => borrowedUsd);
   payload.drawnUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ drawnUsd }: { drawnUsd: string }) => drawnUsd);
   payload.premiumUsd = getAssetsTotal(usedAssets, ({ isBorrowed }: { isBorrowed: boolean }) => isBorrowed, ({ premiumUsd }: { premiumUsd: string }) => premiumUsd);

package/src/types/aaveV4.ts

@@ -75,6 +75,10 @@ export interface AaveV4ReserveAssetData {
   supplyRate: string,
   supplyIncentives: IncentiveData[];
   borrowIncentives: IncentiveData[];
+  canBeBorrowed: boolean;
+  canBeSupplied: boolean;
+  canBeWithdrawn: boolean;
+  canBePayBacked: boolean;
 }
 
 export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
@@ -101,6 +105,7 @@ export interface AaveV4UsedReserveAsset {
   isSupplied: boolean,
   isBorrowed: boolean,
   collateral: boolean,
+  collateralFactor: number,
 }
 
 export interface AaveV4AggregatedPositionData {