@defisaver/positions-sdk 0.0.80 → 0.0.83

package/cjs/aaveV3/index.js

@@ -139,13 +139,13 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
             let discountRateOnBorrow = '0';
             if (nativeAsset && facilitatorsList && discountRate && minDiscountTokenBalance && minGhoBalanceForDiscount && ghoDiscountedPerDiscountToken) {
                 const facilitatorBucket = yield ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call();
-                const availableFacilitatorCap = (0, tokens_1.assetAmountInEth)(new decimal_js_1.default(facilitatorBucket[0]).sub(facilitatorBucket[1]).toString(), 'GHO');
                 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);
             }
-            let marketLiquidity = nativeAsset
-                ? (0, tokens_1.assetAmountInEth)(new decimal_js_1.default((0, tokens_1.assetAmountInWei)(borrowCap.toString(), 'GHO'))
+            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
+                ? (0, tokens_1.assetAmountInEth)(borrowCapInWei
                     .sub(tokenMarket.totalBorrow.toString())
                     .toString(), symbol)
                 : (0, tokens_1.assetAmountInEth)(new decimal_js_1.default(tokenMarket.totalSupply.toString())
@@ -161,10 +161,7 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     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, eModeCategory: +tokenMarket.emodeCategory, isolationModeTotalDebt: new decimal_js_1.default(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: new decimal_js_1.default(tokenMarket.supplyRate.toString()).div(1e25).toString(), borrowRate: new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).toString(), borrowRateDiscounted: nativeAsset ? new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0', borrowRateStable: new decimal_js_1.default(tokenMarket.borrowRateStable.toString()).div(1e25).toString(), collateralFactor: new decimal_js_1.default(tokenMarket.collateralFactor.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())
-                    .div(new decimal_js_1.default(tokenMarket.totalSupply.toString()))
-                    .times(100)
-                    .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, eModeCategoryData: {
+            })), { 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, eModeCategory: +tokenMarket.emodeCategory, isolationModeTotalDebt: new decimal_js_1.default(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: new decimal_js_1.default(tokenMarket.supplyRate.toString()).div(1e25).toString(), borrowRate: new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).toString(), borrowRateDiscounted: nativeAsset ? new decimal_js_1.default(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0', borrowRateStable: new decimal_js_1.default(tokenMarket.borrowRateStable.toString()).div(1e25).toString(), collateralFactor: new decimal_js_1.default(tokenMarket.collateralFactor.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, eModeCategoryData: {
                     label: tokenMarket.label,
                     liquidationBonus: new decimal_js_1.default(tokenMarket.liquidationBonus).div(10000).toString(),
                     liquidationRatio: new decimal_js_1.default(tokenMarket.liquidationThreshold).div(10000).toString(),

package/cjs/markets/aave/marketAssets.js

@@ -14,7 +14,7 @@ exports.aaveV3AssetsDefaultMarketOpt = [
 exports.aaveV3AssetsDefaultMarketArb = [
     'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB', 'weETH',
 ];
-exports.aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC'];
+exports.aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 exports.aaveV3AssetsDefaultMarket = {
     [common_1.NetworkNumber.Eth]: exports.aaveV3AssetsDefaultMarketEth,

package/cjs/spark/index.js

@@ -66,54 +66,63 @@ const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3) => __aw
     }
     const loanInfoContract = (0, contracts_1.SparkViewContract)(web3, network);
     const loanInfo = yield loanInfoContract.methods.getFullTokensInfo(marketAddress, selectedMarket.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address)).call();
-    const assetsData = loanInfo
-        .map((market, i) => ({
-        symbol: selectedMarket.assets[i],
-        isIsolated: new decimal_js_1.default(market.debtCeilingForIsolationMode).gt(0),
-        debtCeilingForIsolationMode: new decimal_js_1.default(market.debtCeilingForIsolationMode).div(100).toString(),
-        isSiloed: market.isSiloedForBorrowing,
-        eModeCategory: +market.emodeCategory,
-        isolationModeTotalDebt: new decimal_js_1.default(market.isolationModeTotalDebt).div(100).toString(),
-        assetId: Number(market.assetId),
-        underlyingTokenAddress: market.underlyingTokenAddress,
-        supplyRate: new decimal_js_1.default(market.supplyRate.toString()).div(1e25).toString(),
-        borrowRate: new decimal_js_1.default(market.borrowRateVariable.toString()).div(1e25).toString(),
-        borrowRateStable: new decimal_js_1.default(market.borrowRateStable.toString()).div(1e25).toString(),
-        collateralFactor: new decimal_js_1.default(market.collateralFactor.toString()).div(10000).toString(),
-        liquidationRatio: new decimal_js_1.default(market.liquidationRatio.toString()).div(10000).toString(),
-        marketLiquidity: (0, tokens_1.assetAmountInEth)(new decimal_js_1.default(market.totalSupply.toString())
-            .sub(market.totalBorrow.toString())
-            .toString(), selectedMarket.assets[i]),
-        utilization: new decimal_js_1.default(market.totalBorrow.toString())
-            .div(new decimal_js_1.default(market.totalSupply.toString()))
-            .times(100)
-            .toString(),
-        usageAsCollateralEnabled: market.usageAsCollateralEnabled,
-        supplyCap: market.supplyCap,
-        borrowCap: market.borrowCap,
-        totalSupply: (0, tokens_1.assetAmountInEth)(market.totalSupply.toString(), selectedMarket.assets[i]),
-        isInactive: !market.isActive,
-        isFrozen: market.isFrozen,
-        isPaused: market.isPaused,
-        canBeBorrowed: market.isActive && !market.isPaused && !market.isFrozen && market.borrowingEnabled,
-        canBeSupplied: market.isActive && !market.isPaused && !market.isFrozen,
-        canBeWithdrawn: market.isActive && !market.isPaused,
-        canBePayBacked: market.isActive && !market.isPaused,
-        disabledStableBorrowing: !market.stableBorrowRateEnabled,
-        totalBorrow: (0, tokens_1.assetAmountInEth)(market.totalBorrow.toString(), selectedMarket.assets[i]),
-        totalBorrowVar: (0, tokens_1.assetAmountInEth)(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
-        price: new decimal_js_1.default(market.price.toString()).div(1e8).toString(),
-        isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
-        isFlashLoanEnabled: market.isFlashLoanEnabled,
-        aTokenAddress: market.aTokenAddress,
-        eModeCategoryData: {
-            label: market.label,
-            liquidationBonus: new decimal_js_1.default(market.liquidationBonus).div(10000).toString(),
-            liquidationRatio: new decimal_js_1.default(market.liquidationThreshold).div(10000).toString(),
-            collateralFactor: new decimal_js_1.default(market.ltv).div(10000).toString(),
-            priceSource: market.priceSource,
-        },
-    }));
+    const assetsData = yield Promise.all(loanInfo
+        .map((market, i) => __awaiter(void 0, void 0, void 0, function* () {
+        const symbol = selectedMarket.assets[i];
+        const borrowCapInWei = new decimal_js_1.default((0, tokens_1.assetAmountInWei)(market.borrowCap.toString(), symbol));
+        let marketLiquidity = borrowCapInWei.lt(new decimal_js_1.default(market.totalSupply))
+            ? (0, tokens_1.assetAmountInEth)(borrowCapInWei
+                .sub(market.totalBorrow.toString())
+                .toString(), symbol)
+            : (0, tokens_1.assetAmountInEth)(new decimal_js_1.default(market.totalSupply.toString())
+                .sub(market.totalBorrow.toString())
+                .toString(), symbol);
+        if (new decimal_js_1.default(marketLiquidity).lt(0)) {
+            marketLiquidity = '0';
+        }
+        return ({
+            symbol: selectedMarket.assets[i],
+            isIsolated: new decimal_js_1.default(market.debtCeilingForIsolationMode).gt(0),
+            debtCeilingForIsolationMode: new decimal_js_1.default(market.debtCeilingForIsolationMode).div(100).toString(),
+            isSiloed: market.isSiloedForBorrowing,
+            eModeCategory: +market.emodeCategory,
+            isolationModeTotalDebt: new decimal_js_1.default(market.isolationModeTotalDebt).div(100).toString(),
+            assetId: Number(market.assetId),
+            underlyingTokenAddress: market.underlyingTokenAddress,
+            supplyRate: new decimal_js_1.default(market.supplyRate.toString()).div(1e25).toString(),
+            borrowRate: new decimal_js_1.default(market.borrowRateVariable.toString()).div(1e25).toString(),
+            borrowRateStable: new decimal_js_1.default(market.borrowRateStable.toString()).div(1e25).toString(),
+            collateralFactor: new decimal_js_1.default(market.collateralFactor.toString()).div(10000).toString(),
+            liquidationRatio: new decimal_js_1.default(market.liquidationRatio.toString()).div(10000).toString(),
+            marketLiquidity,
+            utilization: new decimal_js_1.default(market.totalBorrow.toString()).times(100).div(new decimal_js_1.default(market.totalSupply.toString())).toString(),
+            usageAsCollateralEnabled: market.usageAsCollateralEnabled,
+            supplyCap: market.supplyCap,
+            borrowCap: market.borrowCap,
+            totalSupply: (0, tokens_1.assetAmountInEth)(market.totalSupply.toString(), selectedMarket.assets[i]),
+            isInactive: !market.isActive,
+            isFrozen: market.isFrozen,
+            isPaused: market.isPaused,
+            canBeBorrowed: market.isActive && !market.isPaused && !market.isFrozen && market.borrowingEnabled,
+            canBeSupplied: market.isActive && !market.isPaused && !market.isFrozen,
+            canBeWithdrawn: market.isActive && !market.isPaused,
+            canBePayBacked: market.isActive && !market.isPaused,
+            disabledStableBorrowing: !market.stableBorrowRateEnabled,
+            totalBorrow: (0, tokens_1.assetAmountInEth)(market.totalBorrow.toString(), selectedMarket.assets[i]),
+            totalBorrowVar: (0, tokens_1.assetAmountInEth)(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
+            price: new decimal_js_1.default(market.price.toString()).div(1e8).toString(),
+            isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
+            isFlashLoanEnabled: market.isFlashLoanEnabled,
+            aTokenAddress: market.aTokenAddress,
+            eModeCategoryData: {
+                label: market.label,
+                liquidationBonus: new decimal_js_1.default(market.liquidationBonus).div(10000).toString(),
+                liquidationRatio: new decimal_js_1.default(market.liquidationThreshold).div(10000).toString(),
+                collateralFactor: new decimal_js_1.default(market.ltv).div(10000).toString(),
+                priceSource: market.priceSource,
+            },
+        });
+    })));
     yield Promise.all(assetsData.map((market) => __awaiter(void 0, void 0, void 0, function* () {
         /* eslint-disable no-param-reassign */
         const rewardForMarket = rewardInfo[market.underlyingTokenAddress];

package/esm/aaveV3/index.js

@@ -130,13 +130,13 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
             let discountRateOnBorrow = '0';
             if (nativeAsset && facilitatorsList && discountRate && minDiscountTokenBalance && minGhoBalanceForDiscount && ghoDiscountedPerDiscountToken) {
                 const facilitatorBucket = yield ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call();
-                const availableFacilitatorCap = assetAmountInEth(new Dec(facilitatorBucket[0]).sub(facilitatorBucket[1]).toString(), 'GHO');
                 borrowCap = Dec.min(borrowCap, assetAmountInEth(facilitatorBucket[0], 'GHO')).toString();
                 discountRateOnBorrow = aaveV3CalculateDiscountRate(tokenMarket.totalBorrow.toString(), '3160881469228662060510133', // stkAAVE total supply
                 discountRate, minDiscountTokenBalance, minGhoBalanceForDiscount, ghoDiscountedPerDiscountToken);
             }
-            let marketLiquidity = nativeAsset
-                ? assetAmountInEth(new Dec(assetAmountInWei(borrowCap.toString(), 'GHO'))
+            const borrowCapInWei = new Dec(assetAmountInWei(borrowCap.toString(), symbol));
+            let marketLiquidity = borrowCapInWei.lt(new Dec(tokenMarket.totalSupply)) || nativeAsset
+                ? assetAmountInEth(borrowCapInWei
                     .sub(tokenMarket.totalBorrow.toString())
                     .toString(), symbol)
                 : assetAmountInEth(new Dec(tokenMarket.totalSupply.toString())
@@ -152,10 +152,7 @@ export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
                     minDiscountTokenBalance,
                     minGhoBalanceForDiscount,
                 },
-            })), { symbol, isIsolated: new Dec(tokenMarket.debtCeilingForIsolationMode).gt(0), debtCeilingForIsolationMode: new Dec(tokenMarket.debtCeilingForIsolationMode).div(100).toString(), isSiloed: tokenMarket.isSiloedForBorrowing, eModeCategory: +tokenMarket.emodeCategory, isolationModeTotalDebt: new Dec(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: new Dec(tokenMarket.supplyRate.toString()).div(1e25).toString(), borrowRate: new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).toString(), borrowRateDiscounted: nativeAsset ? new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0', borrowRateStable: new Dec(tokenMarket.borrowRateStable.toString()).div(1e25).toString(), collateralFactor: new Dec(tokenMarket.collateralFactor.toString()).div(10000).toString(), liquidationRatio: new Dec(tokenMarket.liquidationRatio.toString()).div(10000).toString(), marketLiquidity, utilization: new Dec(tokenMarket.totalBorrow.toString())
-                    .div(new Dec(tokenMarket.totalSupply.toString()))
-                    .times(100)
-                    .toString(), usageAsCollateralEnabled: tokenMarket.usageAsCollateralEnabled, supplyCap: tokenMarket.supplyCap, borrowCap, totalSupply: 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: assetAmountInEth(tokenMarket.totalBorrow.toString(), symbol), totalBorrowVar: assetAmountInEth(tokenMarket.totalBorrowVar.toString(), symbol), price: new Dec(tokenMarket.price.toString()).div(1e8).toString(), isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled, isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled, eModeCategoryData: {
+            })), { symbol, isIsolated: new Dec(tokenMarket.debtCeilingForIsolationMode).gt(0), debtCeilingForIsolationMode: new Dec(tokenMarket.debtCeilingForIsolationMode).div(100).toString(), isSiloed: tokenMarket.isSiloedForBorrowing, eModeCategory: +tokenMarket.emodeCategory, isolationModeTotalDebt: new Dec(tokenMarket.isolationModeTotalDebt).div(100).toString(), assetId: Number(tokenMarket.assetId), underlyingTokenAddress: tokenMarket.underlyingTokenAddress, supplyRate: new Dec(tokenMarket.supplyRate.toString()).div(1e25).toString(), borrowRate: new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).toString(), borrowRateDiscounted: nativeAsset ? new Dec(tokenMarket.borrowRateVariable.toString()).div(1e25).mul(1 - parseFloat(discountRateOnBorrow)).toString() : '0', borrowRateStable: new Dec(tokenMarket.borrowRateStable.toString()).div(1e25).toString(), collateralFactor: new Dec(tokenMarket.collateralFactor.toString()).div(10000).toString(), liquidationRatio: new Dec(tokenMarket.liquidationRatio.toString()).div(10000).toString(), marketLiquidity, utilization: new Dec(tokenMarket.totalBorrow.toString()).times(100).div(new Dec(tokenMarket.totalSupply.toString())).toString(), usageAsCollateralEnabled: tokenMarket.usageAsCollateralEnabled, supplyCap: tokenMarket.supplyCap, borrowCap, totalSupply: 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: assetAmountInEth(tokenMarket.totalBorrow.toString(), symbol), totalBorrowVar: assetAmountInEth(tokenMarket.totalBorrowVar.toString(), symbol), price: new Dec(tokenMarket.price.toString()).div(1e8).toString(), isolationModeBorrowingEnabled: tokenMarket.isolationModeBorrowingEnabled, isFlashLoanEnabled: tokenMarket.isFlashLoanEnabled, eModeCategoryData: {
                     label: tokenMarket.label,
                     liquidationBonus: new Dec(tokenMarket.liquidationBonus).div(10000).toString(),
                     liquidationRatio: new Dec(tokenMarket.liquidationThreshold).div(10000).toString(),

package/esm/markets/aave/marketAssets.js

@@ -11,7 +11,7 @@ export const aaveV3AssetsDefaultMarketOpt = [
 export const aaveV3AssetsDefaultMarketArb = [
     'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB', 'weETH',
 ];
-export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC'];
+export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH'];
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const aaveV3AssetsDefaultMarket = {
     [NetworkNumber.Eth]: aaveV3AssetsDefaultMarketEth,

package/esm/spark/index.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
+import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
 import { ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { calculateNetApy, getCbETHApr, getREthApr, getStETHApr, } from '../staking';
 import { getDsrApy } from '../services/dsrService';
@@ -59,54 +59,63 @@ export const getSparkMarketsData = (web3, network, selectedMarket, mainnetWeb3)
     }
     const loanInfoContract = SparkViewContract(web3, network);
     const loanInfo = yield loanInfoContract.methods.getFullTokensInfo(marketAddress, selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address)).call();
-    const assetsData = loanInfo
-        .map((market, i) => ({
-        symbol: selectedMarket.assets[i],
-        isIsolated: new Dec(market.debtCeilingForIsolationMode).gt(0),
-        debtCeilingForIsolationMode: new Dec(market.debtCeilingForIsolationMode).div(100).toString(),
-        isSiloed: market.isSiloedForBorrowing,
-        eModeCategory: +market.emodeCategory,
-        isolationModeTotalDebt: new Dec(market.isolationModeTotalDebt).div(100).toString(),
-        assetId: Number(market.assetId),
-        underlyingTokenAddress: market.underlyingTokenAddress,
-        supplyRate: new Dec(market.supplyRate.toString()).div(1e25).toString(),
-        borrowRate: new Dec(market.borrowRateVariable.toString()).div(1e25).toString(),
-        borrowRateStable: new Dec(market.borrowRateStable.toString()).div(1e25).toString(),
-        collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
-        liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
-        marketLiquidity: assetAmountInEth(new Dec(market.totalSupply.toString())
-            .sub(market.totalBorrow.toString())
-            .toString(), selectedMarket.assets[i]),
-        utilization: new Dec(market.totalBorrow.toString())
-            .div(new Dec(market.totalSupply.toString()))
-            .times(100)
-            .toString(),
-        usageAsCollateralEnabled: market.usageAsCollateralEnabled,
-        supplyCap: market.supplyCap,
-        borrowCap: market.borrowCap,
-        totalSupply: assetAmountInEth(market.totalSupply.toString(), selectedMarket.assets[i]),
-        isInactive: !market.isActive,
-        isFrozen: market.isFrozen,
-        isPaused: market.isPaused,
-        canBeBorrowed: market.isActive && !market.isPaused && !market.isFrozen && market.borrowingEnabled,
-        canBeSupplied: market.isActive && !market.isPaused && !market.isFrozen,
-        canBeWithdrawn: market.isActive && !market.isPaused,
-        canBePayBacked: market.isActive && !market.isPaused,
-        disabledStableBorrowing: !market.stableBorrowRateEnabled,
-        totalBorrow: assetAmountInEth(market.totalBorrow.toString(), selectedMarket.assets[i]),
-        totalBorrowVar: assetAmountInEth(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
-        price: new Dec(market.price.toString()).div(1e8).toString(),
-        isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
-        isFlashLoanEnabled: market.isFlashLoanEnabled,
-        aTokenAddress: market.aTokenAddress,
-        eModeCategoryData: {
-            label: market.label,
-            liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
-            liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
-            collateralFactor: new Dec(market.ltv).div(10000).toString(),
-            priceSource: market.priceSource,
-        },
-    }));
+    const assetsData = yield Promise.all(loanInfo
+        .map((market, i) => __awaiter(void 0, void 0, void 0, function* () {
+        const symbol = selectedMarket.assets[i];
+        const borrowCapInWei = new Dec(assetAmountInWei(market.borrowCap.toString(), symbol));
+        let marketLiquidity = borrowCapInWei.lt(new Dec(market.totalSupply))
+            ? assetAmountInEth(borrowCapInWei
+                .sub(market.totalBorrow.toString())
+                .toString(), symbol)
+            : assetAmountInEth(new Dec(market.totalSupply.toString())
+                .sub(market.totalBorrow.toString())
+                .toString(), symbol);
+        if (new Dec(marketLiquidity).lt(0)) {
+            marketLiquidity = '0';
+        }
+        return ({
+            symbol: selectedMarket.assets[i],
+            isIsolated: new Dec(market.debtCeilingForIsolationMode).gt(0),
+            debtCeilingForIsolationMode: new Dec(market.debtCeilingForIsolationMode).div(100).toString(),
+            isSiloed: market.isSiloedForBorrowing,
+            eModeCategory: +market.emodeCategory,
+            isolationModeTotalDebt: new Dec(market.isolationModeTotalDebt).div(100).toString(),
+            assetId: Number(market.assetId),
+            underlyingTokenAddress: market.underlyingTokenAddress,
+            supplyRate: new Dec(market.supplyRate.toString()).div(1e25).toString(),
+            borrowRate: new Dec(market.borrowRateVariable.toString()).div(1e25).toString(),
+            borrowRateStable: new Dec(market.borrowRateStable.toString()).div(1e25).toString(),
+            collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
+            liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
+            marketLiquidity,
+            utilization: new Dec(market.totalBorrow.toString()).times(100).div(new Dec(market.totalSupply.toString())).toString(),
+            usageAsCollateralEnabled: market.usageAsCollateralEnabled,
+            supplyCap: market.supplyCap,
+            borrowCap: market.borrowCap,
+            totalSupply: assetAmountInEth(market.totalSupply.toString(), selectedMarket.assets[i]),
+            isInactive: !market.isActive,
+            isFrozen: market.isFrozen,
+            isPaused: market.isPaused,
+            canBeBorrowed: market.isActive && !market.isPaused && !market.isFrozen && market.borrowingEnabled,
+            canBeSupplied: market.isActive && !market.isPaused && !market.isFrozen,
+            canBeWithdrawn: market.isActive && !market.isPaused,
+            canBePayBacked: market.isActive && !market.isPaused,
+            disabledStableBorrowing: !market.stableBorrowRateEnabled,
+            totalBorrow: assetAmountInEth(market.totalBorrow.toString(), selectedMarket.assets[i]),
+            totalBorrowVar: assetAmountInEth(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
+            price: new Dec(market.price.toString()).div(1e8).toString(),
+            isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
+            isFlashLoanEnabled: market.isFlashLoanEnabled,
+            aTokenAddress: market.aTokenAddress,
+            eModeCategoryData: {
+                label: market.label,
+                liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
+                liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
+                collateralFactor: new Dec(market.ltv).div(10000).toString(),
+                priceSource: market.priceSource,
+            },
+        });
+    })));
     yield Promise.all(assetsData.map((market) => __awaiter(void 0, void 0, void 0, function* () {
         /* eslint-disable no-param-reassign */
         const rewardForMarket = rewardInfo[market.underlyingTokenAddress];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.80",
+  "version": "0.0.83",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -19,7 +19,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.5.22",
+    "@defisaver/tokens": "^1.5.23",
     "@ethersproject/bignumber": "^5.7.0",
     "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
     "@stakewise/v3-sdk": "^1.3.0",

package/src/aaveV3/index.ts

@@ -181,9 +181,8 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
 
       if (nativeAsset && facilitatorsList && discountRate && minDiscountTokenBalance && minGhoBalanceForDiscount && ghoDiscountedPerDiscountToken) {
         const facilitatorBucket = await ghoContract.methods.getFacilitatorBucket(facilitatorsList[0]).call();
-        const availableFacilitatorCap = assetAmountInEth(new Dec(facilitatorBucket[0]).sub(facilitatorBucket[1]).toString(), 'GHO');
 
-        borrowCap = Dec.min(borrowCap, assetAmountInEth(facilitatorBucket[0],'GHO')).toString();
+        borrowCap = Dec.min(borrowCap, assetAmountInEth(facilitatorBucket[0], 'GHO')).toString();
 
         discountRateOnBorrow = aaveV3CalculateDiscountRate(
           tokenMarket.totalBorrow.toString(),
@@ -195,8 +194,9 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         );
       }
 
-      let marketLiquidity = nativeAsset
-        ? assetAmountInEth(new Dec(assetAmountInWei(borrowCap.toString(), 'GHO'))
+      const borrowCapInWei = new Dec(assetAmountInWei(borrowCap.toString(), symbol));
+      let marketLiquidity = borrowCapInWei.lt(new Dec(tokenMarket.totalSupply)) || nativeAsset
+        ? assetAmountInEth(borrowCapInWei
           .sub(tokenMarket.totalBorrow.toString())
           .toString(), symbol)
         : assetAmountInEth(new Dec(tokenMarket.totalSupply.toString())
@@ -232,10 +232,7 @@ export async function getAaveV3MarketData(web3: Web3, network: NetworkNumber, ma
         collateralFactor: new Dec(tokenMarket.collateralFactor.toString()).div(10000).toString(),
         liquidationRatio: new Dec(tokenMarket.liquidationRatio.toString()).div(10000).toString(),
         marketLiquidity,
-        utilization: new Dec(tokenMarket.totalBorrow.toString())
-          .div(new Dec(tokenMarket.totalSupply.toString()))
-          .times(100)
-          .toString(),
+        utilization: new Dec(tokenMarket.totalBorrow.toString()).times(100).div(new Dec(tokenMarket.totalSupply.toString())).toString(),
         usageAsCollateralEnabled: tokenMarket.usageAsCollateralEnabled,
         supplyCap: tokenMarket.supplyCap,
         borrowCap,

package/src/markets/aave/marketAssets.ts

@@ -14,7 +14,7 @@ export const aaveV3AssetsDefaultMarketOpt = [
 export const aaveV3AssetsDefaultMarketArb = [
   'ETH', 'DAI', 'EURS', 'USDC', 'USDT', 'AAVE', 'LINK', 'WBTC', 'wstETH', 'MAI', 'rETH', 'LUSD', 'USDC.e', 'FRAX', 'ARB', 'weETH',
 ];
-export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC'];
+export const aaveV3AssetsDefaultMarketBase = ['ETH', 'cbETH', 'USDbC', 'wstETH', 'USDC', 'weETH'];
 
 // @dev Keep assets in array, do not assign directly, so we can parse it and edit it programmatically with `scripts/updateMarkets`
 export const aaveV3AssetsDefaultMarket = {

package/src/spark/index.ts

@@ -1,6 +1,6 @@
 import Web3 from 'web3';
 import Dec from 'decimal.js';
-import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
+import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
 import {
   Blockish, EthAddress, NetworkNumber, PositionBalances,
 } from '../types/common';
@@ -85,53 +85,64 @@ export const getSparkMarketsData = async (web3: Web3, network: NetworkNumber, se
     selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address),
   ).call();
 
-  const assetsData: SparkAssetData[] = loanInfo
-    .map((market, i) => ({
-      symbol: selectedMarket.assets[i],
-      isIsolated: new Dec(market.debtCeilingForIsolationMode).gt(0),
-      debtCeilingForIsolationMode: new Dec(market.debtCeilingForIsolationMode).div(100).toString(),
-      isSiloed: market.isSiloedForBorrowing,
-      eModeCategory: +market.emodeCategory,
-      isolationModeTotalDebt: new Dec(market.isolationModeTotalDebt).div(100).toString(),
-      assetId: Number(market.assetId),
-      underlyingTokenAddress: market.underlyingTokenAddress,
-      supplyRate: new Dec(market.supplyRate.toString()).div(1e25).toString(),
-      borrowRate: new Dec(market.borrowRateVariable.toString()).div(1e25).toString(),
-      borrowRateStable: new Dec(market.borrowRateStable.toString()).div(1e25).toString(),
-      collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
-      liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
-      marketLiquidity: assetAmountInEth(new Dec(market.totalSupply.toString())
-        .sub(market.totalBorrow.toString())
-        .toString(), selectedMarket.assets[i]),
-      utilization: new Dec(market.totalBorrow.toString())
-        .div(new Dec(market.totalSupply.toString()))
-        .times(100)
-        .toString(),
-      usageAsCollateralEnabled: market.usageAsCollateralEnabled,
-      supplyCap: market.supplyCap,
-      borrowCap: market.borrowCap,
-      totalSupply: assetAmountInEth(market.totalSupply.toString(), selectedMarket.assets[i]),
-      isInactive: !market.isActive,
-      isFrozen: market.isFrozen,
-      isPaused: market.isPaused,
-      canBeBorrowed: market.isActive && !market.isPaused && !market.isFrozen && market.borrowingEnabled,
-      canBeSupplied: market.isActive && !market.isPaused && !market.isFrozen,
-      canBeWithdrawn: market.isActive && !market.isPaused,
-      canBePayBacked: market.isActive && !market.isPaused,
-      disabledStableBorrowing: !market.stableBorrowRateEnabled,
-      totalBorrow: assetAmountInEth(market.totalBorrow.toString(), selectedMarket.assets[i]),
-      totalBorrowVar: assetAmountInEth(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
-      price: new Dec(market.price.toString()).div(1e8).toString(), // is actually price in USD
-      isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
-      isFlashLoanEnabled: market.isFlashLoanEnabled,
-      aTokenAddress: market.aTokenAddress,
-      eModeCategoryData: {
-        label: market.label,
-        liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
-        liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
-        collateralFactor: new Dec(market.ltv).div(10000).toString(),
-        priceSource: market.priceSource,
-      },
+  const assetsData: SparkAssetData[] = await Promise.all(loanInfo
+    .map(async (market, i) => {
+      const symbol = selectedMarket.assets[i];
+
+      const borrowCapInWei = new Dec(assetAmountInWei(market.borrowCap.toString(), symbol));
+      let marketLiquidity = borrowCapInWei.lt(new Dec(market.totalSupply))
+        ? assetAmountInEth(borrowCapInWei
+          .sub(market.totalBorrow.toString())
+          .toString(), symbol)
+        : assetAmountInEth(new Dec(market.totalSupply.toString())
+          .sub(market.totalBorrow.toString())
+          .toString(), symbol);
+
+      if (new Dec(marketLiquidity).lt(0)) {
+        marketLiquidity = '0';
+      }
+      return ({
+        symbol: selectedMarket.assets[i],
+        isIsolated: new Dec(market.debtCeilingForIsolationMode).gt(0),
+        debtCeilingForIsolationMode: new Dec(market.debtCeilingForIsolationMode).div(100).toString(),
+        isSiloed: market.isSiloedForBorrowing,
+        eModeCategory: +market.emodeCategory,
+        isolationModeTotalDebt: new Dec(market.isolationModeTotalDebt).div(100).toString(),
+        assetId: Number(market.assetId),
+        underlyingTokenAddress: market.underlyingTokenAddress,
+        supplyRate: new Dec(market.supplyRate.toString()).div(1e25).toString(),
+        borrowRate: new Dec(market.borrowRateVariable.toString()).div(1e25).toString(),
+        borrowRateStable: new Dec(market.borrowRateStable.toString()).div(1e25).toString(),
+        collateralFactor: new Dec(market.collateralFactor.toString()).div(10000).toString(),
+        liquidationRatio: new Dec(market.liquidationRatio.toString()).div(10000).toString(),
+        marketLiquidity,
+        utilization: new Dec(market.totalBorrow.toString()).times(100).div(new Dec(market.totalSupply.toString())).toString(),
+        usageAsCollateralEnabled: market.usageAsCollateralEnabled,
+        supplyCap: market.supplyCap,
+        borrowCap: market.borrowCap,
+        totalSupply: assetAmountInEth(market.totalSupply.toString(), selectedMarket.assets[i]),
+        isInactive: !market.isActive,
+        isFrozen: market.isFrozen,
+        isPaused: market.isPaused,
+        canBeBorrowed: market.isActive && !market.isPaused && !market.isFrozen && market.borrowingEnabled,
+        canBeSupplied: market.isActive && !market.isPaused && !market.isFrozen,
+        canBeWithdrawn: market.isActive && !market.isPaused,
+        canBePayBacked: market.isActive && !market.isPaused,
+        disabledStableBorrowing: !market.stableBorrowRateEnabled,
+        totalBorrow: assetAmountInEth(market.totalBorrow.toString(), selectedMarket.assets[i]),
+        totalBorrowVar: assetAmountInEth(market.totalBorrowVar.toString(), selectedMarket.assets[i]),
+        price: new Dec(market.price.toString()).div(1e8).toString(), // is actually price in USD
+        isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
+        isFlashLoanEnabled: market.isFlashLoanEnabled,
+        aTokenAddress: market.aTokenAddress,
+        eModeCategoryData: {
+          label: market.label,
+          liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
+          liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
+          collateralFactor: new Dec(market.ltv).div(10000).toString(),
+          priceSource: market.priceSource,
+        },
+      });
     }));
 
   await Promise.all(assetsData.map(async (market) => {

package/yarn-error.log

@@ -1,64 +0,0 @@
-Arguments: 
-  /Users/stefan/.nvm/versions/node/v14.19.0/bin/node /usr/local/Cellar/yarn/1.22.19/libexec/bin/yarn.js
-
-PATH: 
-  /Users/stefan/.nvm/versions/node/v14.19.0/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Applications/VMware Fusion.app/Contents/Public:/usr/local/go/bin:/Users/stefan/WebstormProjects/defisaver-positions-sdk/node_modules/.bin:/usr/local/go
-
-Yarn version: 
-  1.22.19
-
-Node version: 
-  14.19.0
-
-Platform: 
-  darwin x64
-
-Trace: 
-  Error: incorrect data check
-      at Zlib.zlibOnError [as onerror] (zlib.js:187:17)
-
-npm manifest: 
-  {
-    "name": "defisaver-positions-sdk",
-    "version": "0.0.1",
-    "description": "",
-    "main": "./cjs/index.js",
-    "module": "./esm/src/index.js",
-    "types": "./esm/src/index.d.ts",
-    "scripts": {
-      "build:esm": "rm -rf esm && tsc -p tsconfig.json",
-      "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json",
-      "build": "npm run build:cjs && npm run build:esm",
-      "dev": "tsc -p tsconfig.cjs.json --watch",
-      "lint": "eslint src/ --fix",
-      "generate-contracts": "node scripts/generateContracts.js",
-      "test": "mocha tests/*",
-      "build-test": "npm run build && mocha tests/*"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-      "@defisaver/tokens": "^1.4.56",
-      "decimal.js": "^10.4.3"
-    },
-    "devDependencies": {
-      "@defisaver/eslint-config": "^1.0.1",
-      "chai": "^4.3.8",
-      "dotenv": "^16.3.1",
-      "eslint": "^8.49.0",
-      "mocha": "^10.2.0",
-      "typechain": "^8.3.1",
-      "typechain-target-web3-v1-3mihai3": "^6.0.2",
-      "typescript": "^5.2.2"
-    },
-    "peerDependencies": {
-      "web3": "^1.10.2"
-    }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  No lockfile