@defisaver/positions-sdk 0.0.113 → 0.0.115

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

@@ -1,4 +1,9 @@
+import Web3 from 'web3';
 import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAssets } from '../../types';
+import { NetworkNumber } from '../../types/common';
+export declare const isAaveV2: ({ selectedMarket }: {
+    selectedMarket: Partial<AaveMarketInfo>;
+}) => boolean;
 export declare const isAaveV3: ({ selectedMarket }: {
     selectedMarket: Partial<AaveMarketInfo>;
 }) => boolean;
@@ -35,3 +40,13 @@ export declare const aaveAnyGetEmodeMutableProps: ({ eModeCategory, assetsData,
     collateralFactor: any;
 };
 export declare const aaveAnyGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => AaveV3AggregatedPositionData;
+export declare const getApyAfterValuesEstimation: (selectedMarket: AaveMarketInfo, actions: [{
+    action: string;
+    amount: string;
+    asset: string;
+}], web3: Web3, network: NetworkNumber) => Promise<{
+    [key: string]: {
+        supplyRate: string;
+        borrowRate: string;
+    };
+}>;

package/esm/helpers/aaveHelpers/index.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -10,10 +19,14 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import Dec from 'decimal.js';
+import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { 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 { AaveLoanInfoV2Contract, AaveV3ViewContract } from '../../contracts';
+export const isAaveV2 = ({ selectedMarket }) => selectedMarket.value === AaveVersions.AaveV2;
 export const isAaveV3 = ({ selectedMarket }) => selectedMarket.value === AaveVersions.AaveV3;
 export const isMorphoAaveV2 = ({ selectedMarket }) => selectedMarket.value === AaveVersions.MorphoAaveV2;
 export const isMorphoAaveV3 = ({ selectedMarket }) => selectedMarket.value === AaveVersions.MorphoAaveV3Eth;
@@ -100,3 +113,45 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
     }
     return payload;
 };
+const getApyAfterValuesEstimationInner = (selectedMarket, actions, viewContract, network) => __awaiter(void 0, void 0, void 0, function* () {
+    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 = yield viewContract.methods.getApyAfterValuesEstimation(selectedMarket.providerAddress, params).call();
+    const rates = {};
+    data.forEach((d) => {
+        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 = (selectedMarket, actions, web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    if (isAaveV2({ selectedMarket })) {
+        return getApyAfterValuesEstimationInner(selectedMarket, actions, AaveLoanInfoV2Contract(web3, network), network);
+    }
+    if (isAaveV3({ selectedMarket })) {
+        return getApyAfterValuesEstimationInner(selectedMarket, actions, AaveV3ViewContract(web3, network), network);
+    }
+    return {};
+});

package/esm/types/contracts/generated/AaveLoanInfoV2.d.ts

@@ -10,6 +10,37 @@ export interface EventOptions {
     topics?: string[];
 }
 export declare namespace AaveView {
+    type LiquidityChangeParamsStruct = [string, number | string | BN, number | string | BN, boolean] | {
+        reserveAddress: string;
+        liquidityAdded: number | string | BN;
+        liquidityTaken: number | string | BN;
+        isDebtAsset: boolean;
+    };
+    type LiquidityChangeParamsStructOutputArray = [
+        string,
+        string,
+        string,
+        boolean
+    ];
+    type LiquidityChangeParamsStructOutputStruct = {
+        reserveAddress: string;
+        liquidityAdded: string;
+        liquidityTaken: string;
+        isDebtAsset: boolean;
+    };
+    type LiquidityChangeParamsStructOutput = LiquidityChangeParamsStructOutputArray & LiquidityChangeParamsStructOutputStruct;
+    type EstimatedRatesStruct = [string, number | string | BN, number | string | BN] | {
+        reserveAddress: string;
+        supplyRate: number | string | BN;
+        variableBorrowRate: number | string | BN;
+    };
+    type EstimatedRatesStructOutputArray = [string, string, string];
+    type EstimatedRatesStructOutputStruct = {
+        reserveAddress: string;
+        supplyRate: string;
+        variableBorrowRate: string;
+    };
+    type EstimatedRatesStructOutput = EstimatedRatesStructOutputArray & EstimatedRatesStructOutputStruct;
     type TokenInfoFullStruct = [
         string,
         string,
@@ -90,6 +121,46 @@ export declare namespace AaveView {
         stableBorrowRateEnabled: boolean;
     };
     type TokenInfoFullStructOutput = TokenInfoFullStructOutputArray & TokenInfoFullStructOutputStruct;
+    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[];
+    };
+    type LoanDataStructOutputArray = [
+        string,
+        string,
+        string[],
+        boolean[],
+        string[],
+        string[],
+        string[],
+        string[]
+    ];
+    type LoanDataStructOutputStruct = {
+        user: string;
+        ratio: string;
+        collAddr: string[];
+        enabledAsColl: boolean[];
+        borrowAddr: string[];
+        collAmounts: string[];
+        borrowStableAmounts: string[];
+        borrowVariableAmounts: string[];
+    };
+    type LoanDataStructOutput = LoanDataStructOutputArray & LoanDataStructOutputStruct;
     type UserTokenStruct = [
         string,
         number | string | BN,
@@ -122,14 +193,46 @@ export declare namespace AaveView {
         enabledAsCollateral: boolean;
     };
     type UserTokenStructOutput = UserTokenStructOutputArray & UserTokenStructOutputStruct;
+    type TokenInfoStruct = [string, string, number | string | BN, number | string | BN] | {
+        aTokenAddress: string;
+        underlyingTokenAddress: string;
+        collateralFactor: number | string | BN;
+        price: number | string | BN;
+    };
+    type TokenInfoStructOutputArray = [string, string, string, string];
+    type TokenInfoStructOutputStruct = {
+        aTokenAddress: string;
+        underlyingTokenAddress: string;
+        collateralFactor: string;
+        price: string;
+    };
+    type TokenInfoStructOutput = TokenInfoStructOutputArray & TokenInfoStructOutputStruct;
 }
 export interface AaveLoanInfoV2 extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): 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/esm/types/contracts/generated/AaveV3View.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.113",
+  "version": "0.0.115",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",