@defisaver/positions-sdk 1.0.23 → 1.0.25

package/cjs/aaveV3/index.d.ts

@@ -2,7 +2,6 @@ import Web3 from 'web3';
 import { AaveMarketInfo, AaveV3MarketData, AaveV3PositionData, AaveV3UsedAssets, EModeCategoryDataMapping } from '../types/aave';
 import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
 export declare const test: (web3: Web3, network: NetworkNumber) => Promise<string>;
-export declare const aaveV3CalculateDiscountRate: (debtBalance: string, discountTokenBalance: string, discountRate: string, minDiscountTokenBalance: string, minGhoBalanceForDiscount: string, ghoDiscountedPerDiscountToken: string) => string;
 export declare const aaveV3EmodeCategoriesMapping: (extractedState: any, usedAssets: AaveV3UsedAssets) => {
     [key: number]: EModeCategoryDataMapping;
 };

package/cjs/aaveV3/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveV3FullPositionData = exports.getAaveV3AccountData = exports.getAaveV3AccountBalances = exports.EMPTY_AAVE_DATA = exports.getAaveV3MarketData = exports.aaveV3EmodeCategoriesMapping = exports.aaveV3CalculateDiscountRate = exports.test = void 0;
+exports.getAaveV3FullPositionData = exports.getAaveV3AccountData = exports.getAaveV3AccountBalances = exports.EMPTY_AAVE_DATA = exports.getAaveV3MarketData = exports.aaveV3EmodeCategoriesMapping = exports.test = void 0;
 const tokens_1 = require("@defisaver/tokens");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const assets_1 = require("../assets");
@@ -29,23 +29,6 @@ const test = (web3, network) => {
     return contract.methods.AAVE_REFERRAL_CODE().call();
 };
 exports.test = test;
-const aaveV3CalculateDiscountRate = (debtBalance, discountTokenBalance, discountRate, minDiscountTokenBalance, minGhoBalanceForDiscount, ghoDiscountedPerDiscountToken) => {
-    if (new decimal_js_1.default(discountTokenBalance).lt(minDiscountTokenBalance) || new decimal_js_1.default(debtBalance).lt(minGhoBalanceForDiscount)) {
-        return '0';
-    }
-    const discountedBalance = new decimal_js_1.default(// wadMul
-    new decimal_js_1.default(discountTokenBalance).mul(ghoDiscountedPerDiscountToken).add(new decimal_js_1.default(1e18).div(2))).div(1e18).toDP(0);
-    if (new decimal_js_1.default(discountedBalance).gte(debtBalance)) {
-        return new decimal_js_1.default(discountRate).div(10000).toDP(4).toString();
-    }
-    return new decimal_js_1.default(discountedBalance)
-        .mul(discountRate)
-        .div(debtBalance)
-        .div(10000)
-        .toDP(4)
-        .toString();
-};
-exports.aaveV3CalculateDiscountRate = aaveV3CalculateDiscountRate;
 const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     const { assetsData, eModeCategoriesData } = extractedState;
     const usedAssetsValues = Object.values(usedAssets);
@@ -79,43 +62,11 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         const loanInfoContract = (0, contracts_1.AaveV3ViewContract)(web3, network);
         const aaveIncentivesContract = (0, contracts_1.AaveIncentiveDataProviderV3Contract)(web3, network);
         const marketAddress = market.providerAddress;
-        const GhoDiscountRateStrategyAddress = (0, contracts_1.getConfigContractAddress)('GhoDiscountRateStrategy', common_1.NetworkNumber.Eth);
-        const GhoDiscountRateStrategyAbi = (0, contracts_1.getConfigContractAbi)('GhoDiscountRateStrategy');
-        const GhoTokenAbi = (0, contracts_1.getConfigContractAbi)('GHO');
-        const multicallCallsObject = [
-            {
-                target: GhoDiscountRateStrategyAddress,
-                abiItem: (0, utils_1.getAbiItem)(GhoDiscountRateStrategyAbi, 'GHO_DISCOUNTED_PER_DISCOUNT_TOKEN'),
-                params: [],
-            },
-            {
-                target: GhoDiscountRateStrategyAddress,
-                abiItem: (0, utils_1.getAbiItem)(GhoDiscountRateStrategyAbi, 'DISCOUNT_RATE'),
-                params: [],
-            },
-            {
-                target: GhoDiscountRateStrategyAddress,
-                abiItem: (0, utils_1.getAbiItem)(GhoDiscountRateStrategyAbi, 'MIN_DISCOUNT_TOKEN_BALANCE'),
-                params: [],
-            },
-            {
-                target: GhoDiscountRateStrategyAddress,
-                abiItem: (0, utils_1.getAbiItem)(GhoDiscountRateStrategyAbi, 'MIN_DEBT_TOKEN_BALANCE'),
-                params: [],
-            },
-            {
-                target: (0, tokens_1.getAssetInfo)('GHO', network).address,
-                abiItem: (0, utils_1.getAbiItem)(GhoTokenAbi, 'getFacilitatorsList'),
-                params: [],
-            },
-        ];
-        const ghoContract = (0, contracts_1.GhoTokenContract)(web3, network);
         // eslint-disable-next-line prefer-const
-        let [loanInfo, eModesInfo, isBorrowAllowed, multiRes] = yield Promise.all([
+        let [loanInfo, eModesInfo, isBorrowAllowed] = yield Promise.all([
             loanInfoContract.methods.getFullTokensInfo(marketAddress, _addresses).call(),
             loanInfoContract.methods.getAllEmodes(marketAddress).call(),
-            loanInfoContract.methods.isBorrowAllowed(marketAddress).call(),
-            isL2 ? [{ 0: null }, { 0: null }, { 0: null }, { 0: null }, { 0: null }] : (0, multicall_1.multicall)(multicallCallsObject, web3, network),
+            loanInfoContract.methods.isBorrowAllowed(marketAddress).call(), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
         ]);
         isBorrowAllowed = (0, utils_1.isLayer2Network)(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
@@ -134,7 +85,6 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 collateralAssets: [],
             };
         }
-        const [{ 0: ghoDiscountedPerDiscountToken }, { 0: discountRate }, { 0: minDiscountTokenBalance }, { 0: minGhoBalanceForDiscount }, { 0: facilitatorsList },] = multiRes;
         let rewardInfo = null;
         const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt];
         if (networksWithIncentives.includes(network)) {
@@ -148,7 +98,6 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
         const assetsData = yield Promise.all(loanInfo
             .map((tokenMarket, i) => __awaiter(this, void 0, void 0, function* () {
             const symbol = market.assets[i];
-            const nativeAsset = symbol === 'GHO' && network === common_1.NetworkNumber.Eth && market.value === 'v3default';
             // eslint-disable-next-line guard-for-in
             for (const eModeIndex in eModeCategoriesData) {
                 if ((0, utils_1.isEnabledOnBitmap)(Number(eModeCategoriesData[eModeIndex].collateralBitmap), Number(tokenMarket.assetId)))
@@ -156,16 +105,9 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                 if ((0, utils_1.isEnabledOnBitmap)(Number(eModeCategoriesData[eModeIndex].borrowableBitmap), Number(tokenMarket.assetId)))
                     eModeCategoriesData[eModeIndex].borrowAssets.push(symbol);
             }
-            let borrowCap = tokenMarket.borrowCap;
-            let discountRateOnBorrow = '0';
-            if (nativeAsset && facilitatorsList && discountRate && minDiscountTokenBalance && minGhoBalanceForDiscount && ghoDiscountedPerDiscountToken) {
-                const facilitatorBucket = yield ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call();
-                borrowCap = decimal_js_1.default.min(borrowCap, (0, tokens_1.assetAmountInEth)(facilitatorBucket[0], 'GHO')).toString();
-                discountRateOnBorrow = (0, exports.aaveV3CalculateDiscountRate)(tokenMarket.totalBorrow.toString(), '3160881469228662060510133', // stkAAVE total supply
-                discountRate, minDiscountTokenBalance, minGhoBalanceForDiscount, ghoDiscountedPerDiscountToken);
-            }
+            const borrowCap = tokenMarket.borrowCap;
             const borrowCapInWei = new decimal_js_1.default((0, tokens_1.assetAmountInWei)(borrowCap.toString(), symbol));
-            let marketLiquidity = borrowCapInWei.lt(new decimal_js_1.default(tokenMarket.totalSupply)) || nativeAsset
+            let marketLiquidity = borrowCapInWei.lt(new decimal_js_1.default(tokenMarket.totalSupply))
                 ? (0, tokens_1.assetAmountInEth)(borrowCapInWei
                     .sub(tokenMarket.totalBorrow.toString())
                     .toString(), symbol)
@@ -175,14 +117,41 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
             if (new decimal_js_1.default(marketLiquidity).lt(0)) {
                 marketLiquidity = '0';
             }
-            return (Object.assign(Object.assign({ nativeAsset }, (0, utils_1.addToObjectIf)(nativeAsset, {
-                discountData: {
-                    ghoDiscountedPerDiscountToken,
-                    discountRate,
-                    minDiscountTokenBalance,
-                    minGhoBalanceForDiscount,
-                },
-            })), { symbol, isIsolated: new decimal_js_1.default(tokenMarket.debtCeilingForIsolationMode).gt(0), debtCeilingForIsolationMode: new decimal_js_1.default(tokenMarket.debtCeilingForIsolationMode).div(100).toString(), isSiloed: tokenMarket.isSiloedForBorrowing, isolationModeTotalDebt: new decimal_js_1.default(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenMarket.supplyRate.toString()).div(1e25).toString()), borrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).toString()), borrowRateDiscounted: (0, moneymarket_1.aprToApy)(nativeAsset ? new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0'), borrowRateStable: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenMarket.borrowRateStable.toString()).div(1e25).toString()), collateralFactor: new decimal_js_1.default(tokenMarket.collateralFactor.toString()).div(10000).toString(), liquidationBonus: new decimal_js_1.default(tokenMarket.liquidationBonus.toString()).div(10000).toString(), liquidationRatio: new decimal_js_1.default(tokenMarket.liquidationRatio.toString()).div(10000).toString(), marketLiquidity, utilization: new decimal_js_1.default(tokenMarket.totalBorrow.toString()).times(100).div(new decimal_js_1.default(tokenMarket.totalSupply.toString())).toString(), usageAsCollateralEnabled: tokenMarket.usageAsCollateralEnabled, supplyCap: tokenMarket.supplyCap, borrowCap, totalSupply: (0, tokens_1.assetAmountInEth)(tokenMarket.totalSupply.toString(), symbol), isInactive: !tokenMarket.isActive, isFrozen: tokenMarket.isFrozen, isPaused: tokenMarket.isPaused, canBeBorrowed: tokenMarket.isActive && !tokenMarket.isPaused && !tokenMarket.isFrozen && tokenMarket.borrowingEnabled && isBorrowAllowed, canBeSupplied: !nativeAsset && tokenMarket.isActive && !tokenMarket.isPaused && !tokenMarket.isFrozen, canBeWithdrawn: tokenMarket.isActive && !tokenMarket.isPaused, canBePayBacked: tokenMarket.isActive && !tokenMarket.isPaused, disabledStableBorrowing: !tokenMarket.stableBorrowRateEnabled, totalBorrow: (0, tokens_1.assetAmountInEth)(tokenMarket.totalBorrow.toString(), symbol), totalBorrowVar: (0, tokens_1.assetAmountInEth)(tokenMarket.totalBorrowVar.toString(), symbol), price: new decimal_js_1.default(tokenMarket.price.toString()).div(1e8).toString(), isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled, isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled, aTokenAddress: tokenMarket.aTokenAddress }));
+            return ({
+                symbol,
+                isIsolated: new decimal_js_1.default(tokenMarket.debtCeilingForIsolationMode).gt(0),
+                debtCeilingForIsolationMode: new decimal_js_1.default(tokenMarket.debtCeilingForIsolationMode).div(100).toString(),
+                isSiloed: tokenMarket.isSiloedForBorrowing,
+                isolationModeTotalDebt: new decimal_js_1.default(tokenMarket.isolationModeTotalDebt).div(100).toString(),
+                assetId: Number(tokenMarket.assetId),
+                underlyingTokenAddress: tokenMarket.underlyingTokenAddress,
+                supplyRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenMarket.supplyRate.toString()).div(1e25).toString()),
+                borrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).toString()),
+                borrowRateStable: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenMarket.borrowRateStable.toString()).div(1e25).toString()),
+                collateralFactor: new decimal_js_1.default(tokenMarket.collateralFactor.toString()).div(10000).toString(),
+                liquidationBonus: new decimal_js_1.default(tokenMarket.liquidationBonus.toString()).div(10000).toString(),
+                liquidationRatio: new decimal_js_1.default(tokenMarket.liquidationRatio.toString()).div(10000).toString(),
+                marketLiquidity,
+                utilization: new decimal_js_1.default(tokenMarket.totalBorrow.toString()).times(100).div(new decimal_js_1.default(tokenMarket.totalSupply.toString())).toString(),
+                usageAsCollateralEnabled: tokenMarket.usageAsCollateralEnabled,
+                supplyCap: tokenMarket.supplyCap,
+                borrowCap,
+                totalSupply: (0, tokens_1.assetAmountInEth)(tokenMarket.totalSupply.toString(), symbol),
+                isInactive: !tokenMarket.isActive,
+                isFrozen: tokenMarket.isFrozen,
+                isPaused: tokenMarket.isPaused,
+                canBeBorrowed: tokenMarket.isActive && !tokenMarket.isPaused && !tokenMarket.isFrozen && tokenMarket.borrowingEnabled && isBorrowAllowed,
+                canBeSupplied: tokenMarket.isActive && !tokenMarket.isPaused && !tokenMarket.isFrozen,
+                canBeWithdrawn: tokenMarket.isActive && !tokenMarket.isPaused,
+                canBePayBacked: tokenMarket.isActive && !tokenMarket.isPaused,
+                disabledStableBorrowing: !tokenMarket.stableBorrowRateEnabled,
+                totalBorrow: (0, tokens_1.assetAmountInEth)(tokenMarket.totalBorrow.toString(), symbol),
+                totalBorrowVar: (0, tokens_1.assetAmountInEth)(tokenMarket.totalBorrowVar.toString(), symbol),
+                price: new decimal_js_1.default(tokenMarket.price.toString()).div(1e8).toString(),
+                isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled,
+                isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled,
+                aTokenAddress: tokenMarket.aTokenAddress,
+            });
         })));
         // Get incentives data
         yield Promise.all(assetsData.map((_market) => __awaiter(this, void 0, void 0, function* () {
@@ -423,13 +392,8 @@ const getAaveV3AccountData = (web3, network, address, extractedState) => __await
         }
         if (!usedAssets[asset])
             usedAssets[asset] = {};
-        const nativeAsset = asset === 'GHO' && network === common_1.NetworkNumber.Eth && market.value === 'v3default';
-        let discountRateOnBorrow = '0';
         const borrowed = new decimal_js_1.default(borrowedStable).add(borrowedVariable).toString();
-        if (nativeAsset && new decimal_js_1.default(borrowed).gt(0) && new decimal_js_1.default(stkAaveBalance).gt(0)) {
-            discountRateOnBorrow = (0, exports.aaveV3CalculateDiscountRate)((0, tokens_1.assetAmountInWei)(borrowed, 'GHO'), (0, tokens_1.assetAmountInWei)(stkAaveBalance, 'stkAAVE'), assetsData[asset].discountData.discountRate, assetsData[asset].discountData.minDiscountTokenBalance, assetsData[asset].discountData.minGhoBalanceForDiscount, assetsData[asset].discountData.ghoDiscountedPerDiscountToken);
-        }
-        usedAssets[asset] = Object.assign(Object.assign({}, usedAssets[asset]), { symbol: asset, supplied, suppliedUsd: new decimal_js_1.default(supplied).mul(assetsData[asset].price).toString(), isSupplied, collateral: enabledAsCollateral, stableBorrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenInfo.stableBorrowRate).div(1e25).toString()), discountedBorrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(assetsData[asset].borrowRate).mul(1 - parseFloat(discountRateOnBorrow)).toString()), borrowedStable,
+        usedAssets[asset] = Object.assign(Object.assign({}, usedAssets[asset]), { symbol: asset, supplied, suppliedUsd: new decimal_js_1.default(supplied).mul(assetsData[asset].price).toString(), isSupplied, collateral: enabledAsCollateral, stableBorrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(tokenInfo.stableBorrowRate).div(1e25).toString()), borrowedStable,
             borrowedVariable, borrowedUsdStable: new decimal_js_1.default(borrowedStable).mul(assetsData[asset].price).toString(), borrowedUsdVariable: new decimal_js_1.default(borrowedVariable).mul(assetsData[asset].price).toString(), borrowed, borrowedUsd: new decimal_js_1.default(new decimal_js_1.default(borrowedVariable).add(borrowedStable)).mul(assetsData[asset].price).toString(), isBorrowed,
             interestMode });
     }));