@defisaver/positions-sdk 0.0.113 → 0.0.115

package/src/helpers/aaveHelpers/index.ts

@@ -1,11 +1,20 @@
 import Dec from 'decimal.js';
+import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import Web3 from 'web3';
 import {
   AaveAssetData, AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAssets, AaveVersions,
 } from '../../types';
-import { wethToEth } from '../../services/utils';
-import { calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos } from '../../moneymarket';
+import { ethToWeth, wethToEth } from '../../services/utils';
+import {
+  aprToApy, calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos,
+} from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
+import { borrowOperations } from '../../constants';
+import { EthAddress, NetworkNumber } from '../../types/common';
+import { AaveLoanInfoV2Contract, AaveV3ViewContract } from '../../contracts';
+import { BaseContract } from '../../types/contracts/generated/types';
 
+export const isAaveV2 = ({ selectedMarket }: { selectedMarket: Partial<AaveMarketInfo> }) => selectedMarket.value === AaveVersions.AaveV2;
 export const isAaveV3 = ({ selectedMarket }: { selectedMarket: Partial<AaveMarketInfo> }) => selectedMarket.value === AaveVersions.AaveV3;
 export const isMorphoAaveV2 = ({ selectedMarket }: { selectedMarket: Partial<AaveMarketInfo> }) => selectedMarket.value === AaveVersions.MorphoAaveV2;
 export const isMorphoAaveV3 = ({ selectedMarket }: { selectedMarket: Partial<AaveMarketInfo> }) => selectedMarket.value === AaveVersions.MorphoAaveV3Eth;
@@ -132,4 +141,51 @@ export const aaveAnyGetAggregatedPositionData = ({
     payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
   }
   return payload;
+};
+
+const getApyAfterValuesEstimationInner = async (selectedMarket: AaveMarketInfo, actions: [{ action: string, amount: string, asset: string }], viewContract: BaseContract, network: NetworkNumber) => {
+  const params = actions.map(({ action, asset, amount }) => {
+    const isDebtAsset = borrowOperations.includes(action);
+    const amountInWei = assetAmountInWei(amount, asset);
+    const assetInfo = getAssetInfo(ethToWeth(asset), network);
+    let liquidityAdded;
+    let liquidityTaken;
+    if (isDebtAsset) {
+      liquidityAdded = action === 'payback' ? amountInWei : '0';
+      liquidityTaken = action === 'borrow' ? amountInWei : '0';
+    } else {
+      liquidityAdded = action === 'collateral' ? amountInWei : '0';
+      liquidityTaken = action === 'withdraw' ? amountInWei : '0';
+    }
+    return {
+      reserveAddress: assetInfo.address,
+      liquidityAdded,
+      liquidityTaken,
+      isDebtAsset,
+    };
+  });
+  const data = await viewContract.methods.getApyAfterValuesEstimation(
+    selectedMarket.providerAddress,
+    params,
+  ).call();
+  const rates: { [key: string]: { supplyRate: string, borrowRate: string } } = {};
+  data.forEach((d: { reserveAddress: EthAddress, supplyRate: string, variableBorrowRate: string }) => {
+    const asset = wethToEth(getAssetInfoByAddress(d.reserveAddress, network).symbol);
+    rates[asset] = {
+      supplyRate: aprToApy(new Dec(d.supplyRate.toString()).div(1e25).toString()),
+      borrowRate: aprToApy(new Dec(d.variableBorrowRate.toString()).div(1e25).toString()),
+    };
+  });
+  return rates;
+};
+
+export const getApyAfterValuesEstimation = async (selectedMarket: AaveMarketInfo, actions: [{ action: string, amount: string, asset: string }], web3: Web3, network: NetworkNumber) => {
+  if (isAaveV2({ selectedMarket })) {
+    return getApyAfterValuesEstimationInner(selectedMarket, actions, AaveLoanInfoV2Contract(web3, network), network);
+  }
+  if (isAaveV3({ selectedMarket })) {
+    return getApyAfterValuesEstimationInner(selectedMarket, actions, AaveV3ViewContract(web3, network), network);
+  }
+
+  return {};
 };

package/src/types/contracts/generated/AaveLoanInfoV2.ts

@@ -22,6 +22,48 @@ export interface EventOptions {
 }
 
 export declare namespace AaveView {
+  export type LiquidityChangeParamsStruct =
+    | [string, number | string | BN, number | string | BN, boolean]
+    | {
+        reserveAddress: string;
+        liquidityAdded: number | string | BN;
+        liquidityTaken: number | string | BN;
+        isDebtAsset: boolean;
+      };
+
+  export type LiquidityChangeParamsStructOutputArray = [
+    string,
+    string,
+    string,
+    boolean
+  ];
+  export type LiquidityChangeParamsStructOutputStruct = {
+    reserveAddress: string;
+    liquidityAdded: string;
+    liquidityTaken: string;
+    isDebtAsset: boolean;
+  };
+  export type LiquidityChangeParamsStructOutput =
+    LiquidityChangeParamsStructOutputArray &
+      LiquidityChangeParamsStructOutputStruct;
+
+  export type EstimatedRatesStruct =
+    | [string, number | string | BN, number | string | BN]
+    | {
+        reserveAddress: string;
+        supplyRate: number | string | BN;
+        variableBorrowRate: number | string | BN;
+      };
+
+  export type EstimatedRatesStructOutputArray = [string, string, string];
+  export type EstimatedRatesStructOutputStruct = {
+    reserveAddress: string;
+    supplyRate: string;
+    variableBorrowRate: string;
+  };
+  export type EstimatedRatesStructOutput = EstimatedRatesStructOutputArray &
+    EstimatedRatesStructOutputStruct;
+
   export type TokenInfoFullStruct =
     | [
         string,
@@ -107,6 +149,51 @@ export declare namespace AaveView {
   export type TokenInfoFullStructOutput = TokenInfoFullStructOutputArray &
     TokenInfoFullStructOutputStruct;
 
+  export type LoanDataStruct =
+    | [
+        string,
+        number | string | BN,
+        string[],
+        boolean[],
+        string[],
+        number | string | BN[],
+        number | string | BN[],
+        number | string | BN[]
+      ]
+    | {
+        user: string;
+        ratio: number | string | BN;
+        collAddr: string[];
+        enabledAsColl: boolean[];
+        borrowAddr: string[];
+        collAmounts: number | string | BN[];
+        borrowStableAmounts: number | string | BN[];
+        borrowVariableAmounts: number | string | BN[];
+      };
+
+  export type LoanDataStructOutputArray = [
+    string,
+    string,
+    string[],
+    boolean[],
+    string[],
+    string[],
+    string[],
+    string[]
+  ];
+  export type LoanDataStructOutputStruct = {
+    user: string;
+    ratio: string;
+    collAddr: string[];
+    enabledAsColl: boolean[];
+    borrowAddr: string[];
+    collAmounts: string[];
+    borrowStableAmounts: string[];
+    borrowVariableAmounts: string[];
+  };
+  export type LoanDataStructOutput = LoanDataStructOutputArray &
+    LoanDataStructOutputStruct;
+
   export type UserTokenStruct =
     | [
         string,
@@ -143,6 +230,25 @@ export declare namespace AaveView {
   };
   export type UserTokenStructOutput = UserTokenStructOutputArray &
     UserTokenStructOutputStruct;
+
+  export type TokenInfoStruct =
+    | [string, string, number | string | BN, number | string | BN]
+    | {
+        aTokenAddress: string;
+        underlyingTokenAddress: string;
+        collateralFactor: number | string | BN;
+        price: number | string | BN;
+      };
+
+  export type TokenInfoStructOutputArray = [string, string, string, string];
+  export type TokenInfoStructOutputStruct = {
+    aTokenAddress: string;
+    underlyingTokenAddress: string;
+    collateralFactor: string;
+    price: string;
+  };
+  export type TokenInfoStructOutput = TokenInfoStructOutputArray &
+    TokenInfoStructOutputStruct;
 }
 
 export interface AaveLoanInfoV2 extends BaseContract {
@@ -153,21 +259,98 @@ export interface AaveLoanInfoV2 extends BaseContract {
   ): AaveLoanInfoV2;
   clone(): AaveLoanInfoV2;
   methods: {
+    AAVE_REFERRAL_CODE(): NonPayableTransactionObject<string>;
+
+    AaveIncentivesController(): NonPayableTransactionObject<string>;
+
+    DATA_PROVIDER_ID(): NonPayableTransactionObject<string>;
+
+    StakedToken(): NonPayableTransactionObject<string>;
+
+    enableAsCollateral(
+      _market: string,
+      _tokenAddr: string,
+      _useAsCollateral: boolean
+    ): NonPayableTransactionObject<void>;
+
+    getApyAfterValuesEstimation(
+      _market: string,
+      _reserveParams: AaveView.LiquidityChangeParamsStruct[]
+    ): NonPayableTransactionObject<AaveView.EstimatedRatesStructOutput[]>;
+
+    getCollFactors(
+      _market: string,
+      _tokens: string[]
+    ): NonPayableTransactionObject<string[]>;
+
     getFullTokensInfo(
       _market: string,
       _tokenAddresses: string[]
     ): NonPayableTransactionObject<AaveView.TokenInfoFullStructOutput[]>;
 
+    getIncentivesRewardsBalance(
+      _assets: string[],
+      _user: string
+    ): NonPayableTransactionObject<string>;
+
+    getLoanData(
+      _market: string,
+      _user: string
+    ): NonPayableTransactionObject<AaveView.LoanDataStructOutput>;
+
+    getLoanDataArr(
+      _market: string,
+      _users: string[]
+    ): NonPayableTransactionObject<AaveView.LoanDataStructOutput[]>;
+
     getPrices(
       _market: string,
       _tokens: string[]
     ): NonPayableTransactionObject<string[]>;
 
+    getRatio(
+      _market: string,
+      _user: string
+    ): NonPayableTransactionObject<string>;
+
+    getRatios(
+      _market: string,
+      _users: string[]
+    ): NonPayableTransactionObject<string[]>;
+
+    getSafetyRatio(
+      _market: string,
+      _user: string
+    ): NonPayableTransactionObject<string>;
+
+    getStakingRewardsBalance(
+      _staker: string
+    ): NonPayableTransactionObject<string>;
+
     getTokenBalances(
       _market: string,
       _user: string,
       _tokens: string[]
     ): NonPayableTransactionObject<AaveView.UserTokenStructOutput[]>;
+
+    getTokenInfoFull(
+      _dataProvider: string,
+      _priceOracleAddress: string,
+      _token: string
+    ): NonPayableTransactionObject<AaveView.TokenInfoFullStructOutput>;
+
+    getTokensInfo(
+      _market: string,
+      _tokenAddresses: string[]
+    ): NonPayableTransactionObject<AaveView.TokenInfoStructOutput[]>;
+
+    getUserUnclaimedRewards(_user: string): NonPayableTransactionObject<string>;
+
+    switchRateMode(
+      _market: string,
+      _tokenAddr: string,
+      _rateMode: number | string | BN
+    ): NonPayableTransactionObject<void>;
   };
   events: {
     allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;

package/src/types/contracts/generated/AaveV3View.ts

@@ -23,18 +23,25 @@ export interface EventOptions {
 
 export declare namespace AaveV3View {
   export type LiquidityChangeParamsStruct =
-    | [string, number | string | BN, number | string | BN]
+    | [string, number | string | BN, number | string | BN, boolean]
     | {
         reserveAddress: string;
         liquidityAdded: number | string | BN;
         liquidityTaken: number | string | BN;
+        isDebtAsset: boolean;
       };
 
-  export type LiquidityChangeParamsStructOutputArray = [string, string, string];
+  export type LiquidityChangeParamsStructOutputArray = [
+    string,
+    string,
+    string,
+    boolean
+  ];
   export type LiquidityChangeParamsStructOutputStruct = {
     reserveAddress: string;
     liquidityAdded: string;
     liquidityTaken: string;
+    isDebtAsset: boolean;
   };
   export type LiquidityChangeParamsStructOutput =
     LiquidityChangeParamsStructOutputArray &