@evaafi/sdk 0.5.4 → 0.5.5

package/dist/api/math.d.ts

@@ -3,6 +3,7 @@ import { Dictionary } from '@ton/core';
 import { LiquidationData, PredictHealthFactorArgs, UserBalance } from '../types/User';
 export declare function mulFactor(decimal: bigint, a: bigint, b: bigint): bigint;
 export declare function mulDiv(x: bigint, y: bigint, z: bigint): bigint;
+export declare function mulDivC(x: bigint, y: bigint, z: bigint): bigint;
 export declare function bigIntMax(...args: bigint[]): bigint;
 export declare function bigIntMin(...args: bigint[]): bigint;
 export declare function calculatePresentValue(index: bigint, principalValue: bigint, masterConstants: MasterConstants): bigint;
@@ -15,6 +16,8 @@ export declare function calculateCurrentRates(assetConfig: AssetConfig, assetDat
 };
 export declare function calculateAssetData(assetsConfigDict: ExtendedAssetsConfig, assetsDataDict: Dictionary<bigint, AssetData>, assetId: bigint, masterConstants: MasterConstants): ExtendedAssetData;
 export declare function calculateAssetInterest(assetConfig: AssetConfig, assetData: AssetData, masterConstants: MasterConstants): AssetInterest;
+export declare function checkNotInDebtAtAll(principals: Dictionary<bigint, bigint>): boolean;
+export declare function calculateMaximumWithdrawAmount(assetsConfig: ExtendedAssetsConfig, assetsData: ExtendedAssetsData, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants, assetId: bigint): bigint;
 export declare function getAvailableToBorrow(assetsConfig: ExtendedAssetsConfig, assetsData: ExtendedAssetsData, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants): bigint;
 export declare function presentValue(sRate: bigint, bRate: bigint, principalValue: bigint, masterConstants: MasterConstants): UserBalance;
 export declare function calculateLiquidationData(assetsConfig: ExtendedAssetsConfig, assetsData: ExtendedAssetsData, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants): LiquidationData;

package/dist/api/math.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.predictHealthFactor = exports.calculateLiquidationData = exports.presentValue = exports.getAvailableToBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMin = exports.bigIntMax = exports.mulDiv = exports.mulFactor = void 0;
+exports.predictHealthFactor = exports.calculateLiquidationData = exports.presentValue = exports.getAvailableToBorrow = exports.calculateMaximumWithdrawAmount = exports.checkNotInDebtAtAll = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMin = exports.bigIntMax = exports.mulDivC = exports.mulDiv = exports.mulFactor = void 0;
 const User_1 = require("../types/User");
 const sha256BigInt_1 = require("../utils/sha256BigInt");
 function mulFactor(decimal, a, b) {
@@ -11,6 +11,11 @@ function mulDiv(x, y, z) {
     return (x * y) / z;
 }
 exports.mulDiv = mulDiv;
+function mulDivC(x, y, z) {
+    const mul = x * y;
+    return mul / z + (mul % z ? 1n : 0n);
+}
+exports.mulDivC = mulDivC;
 function bigIntMax(...args) {
     return args.reduce((m, e) => (e > m ? e : m));
 }
@@ -93,6 +98,47 @@ function calculateAssetInterest(assetConfig, assetData, masterConstants) {
     };
 }
 exports.calculateAssetInterest = calculateAssetInterest;
+function checkNotInDebtAtAll(principals) {
+    return principals.values().every(x => x >= 0n);
+}
+exports.checkNotInDebtAtAll = checkNotInDebtAtAll;
+function calculateMaximumWithdrawAmount(assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
+    let withdrawAmountMax = 0n;
+    const assetConfig = assetsConfig.get(assetId);
+    const assetData = assetsData.get(assetId);
+    const oldPrincipal = principals.get(assetId);
+    if (oldPrincipal > assetConfig.dust) {
+        const oldPresentValue = presentValue(assetData.sRate, assetData.bRate, oldPrincipal, masterConstants);
+        if (checkNotInDebtAtAll(principals)) {
+            withdrawAmountMax = oldPresentValue.amount;
+        }
+        else {
+            if (!prices.has(assetId)) {
+                return 0n;
+            }
+            const borrowable = getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants);
+            const price = prices.get(assetId);
+            let maxAmountToReclaim = 0n;
+            if (assetConfig.collateralFactor == 0n) {
+                maxAmountToReclaim = oldPresentValue.amount;
+            }
+            else if (price > 0) {
+                maxAmountToReclaim =
+                    mulDiv(mulDivC(borrowable, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor), 10n ** assetConfig.decimals, price);
+            }
+            withdrawAmountMax = bigIntMin(maxAmountToReclaim, oldPresentValue.amount);
+        }
+    }
+    else {
+        if (!prices.has(assetId)) {
+            return 0n;
+        }
+        const price = prices.get(assetId);
+        return getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants) * (10n ** assetConfig.decimals) / price;
+    }
+    return withdrawAmountMax;
+}
+exports.calculateMaximumWithdrawAmount = calculateMaximumWithdrawAmount;
 function getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants) {
     let borrowLimit = 0n;
     let borrowAmount = 0n;
@@ -106,9 +152,7 @@ function getAvailableToBorrow(assetsConfig, assetsData, principals, prices, mast
         }
         else if (principal > 0) {
             borrowLimit +=
-                (calculatePresentValue(assetData.sRate, principal, masterConstants) * price * assetConfig.collateralFactor) /
-                    10n ** assetConfig.decimals /
-                    masterConstants.ASSET_COEFFICIENT_SCALE;
+                mulDivC(mulDivC(calculatePresentValue(assetData.sRate, principal, masterConstants), price, 10n ** assetConfig.decimals), assetConfig.collateralFactor, masterConstants.ASSET_COEFFICIENT_SCALE);
         }
     }
     return borrowLimit - borrowAmount;

package/dist/api/parser.js

@@ -218,11 +218,11 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolAssetsConf
         const assetData = assetsData.get(asset.assetId);
         const assetConfig = assetsConfig.get(asset.assetId);
         let principals = principalsDict.get(asset.assetId) || 0n;
-        if (applyDust && (principals > -assetConfig.dust && principals < assetConfig.dust)) { // abs(principals) < dust
+        const balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principals, masterConstants);
+        if (applyDust && (principals > -assetConfig.dust && balance.amount < assetConfig.dust)) { // v6 will be abs(principals) < dust
             principals = 0n;
             principalsDict.set(asset.assetId, 0n);
         }
-        const balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principals, masterConstants);
         userBalances.set(asset.assetId, balance);
     }
     return {
@@ -253,11 +253,11 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolAsset
         const assetData = assetsData.get(asset.assetId);
         const assetConfig = assetsConfig.get(asset.assetId);
         let principals = userLiteData.principals.get(asset.assetId) || 0n;
-        if (applyDust && (principals > -assetConfig.dust && principals < assetConfig.dust)) { // abs(principals) < dust
+        const balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principals, masterConstants);
+        if (applyDust && (principals > -assetConfig.dust && balance.amount < assetConfig.dust)) { // v6 will be abs(principals) < dust
             principals = 0n;
             userLiteData.principals.set(asset.assetId, 0n);
         }
-        const balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principals, masterConstants);
         userLiteData.balances.set(asset.assetId, balance);
     }
     for (const [_, asset] of Object.entries(poolAssetConfig)) {
@@ -276,11 +276,7 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolAsset
         const assetData = assetsData.get(asset.assetId);
         const balance = userLiteData.balances.get(asset.assetId);
         if (balance.type === User_1.BalanceType.supply) {
-            withdrawalLimits.set(asset.assetId, (0, math_1.bigIntMax)((0, math_1.bigIntMin)(assetData.balance, ((supplyBalance -
-                (borrowBalance * masterConstants.ASSET_COEFFICIENT_SCALE) / assetConfig.collateralFactor) *
-                10n ** assetConfig.decimals) /
-                prices.get(asset.assetId) -
-                5n, balance.amount), 0n));
+            withdrawalLimits.set(asset.assetId, (0, math_1.calculateMaximumWithdrawAmount)(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId));
         }
         borrowLimits.set(asset.assetId, (0, math_1.bigIntMin)((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId), assetData.balance));
     }

package/dist/api/prices.d.ts

@@ -1,2 +1,2 @@
 import { PriceData } from '../types/Common';
-export declare function getPricesByNft(nftId: string, endpoints?: string[]): Promise<PriceData>;
+export declare function getPrices(endpoints?: string[], nftId?: string): Promise<PriceData>;

package/dist/api/prices.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPricesByNft = void 0;
+exports.getPrices = void 0;
 const core_1 = require("@ton/core");
-async function getPricesByNft(nftId, endpoints = ["api.stardust-mainnet.iotaledger.net"]) {
+const general_1 = require("../constants/general");
+async function getPrices(endpoints = ["api.stardust-mainnet.iotaledger.net"], nftId = general_1.MAIN_POOL_NFT_ID) {
     return await Promise.any(endpoints.map(x => loadPrices(nftId, x)));
 }
-exports.getPricesByNft = getPricesByNft;
+exports.getPrices = getPrices;
 async function loadPrices(nftId, endpoint = "api.stardust-mainnet.iotaledger.net") {
     let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${nftId}`, {
         headers: { accept: 'application/json' },

package/dist/contracts/MasterContract.js

@@ -235,10 +235,10 @@ class Evaa {
     }
     async getPrices(provider, endpoints) {
         if ((endpoints?.length ?? 0) > 0) {
-            return await (0, __1.getPricesByNft)(this.poolConfig.nftId, endpoints);
+            return await (0, __1.getPrices)(endpoints, this.poolConfig.nftId);
         }
         else {
-            return await (0, __1.getPricesByNft)(this.poolConfig.nftId);
+            return await (0, __1.getPrices)(undefined, this.poolConfig.nftId);
         }
     }
 }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-export { mulFactor, mulDiv, bigIntMin, bigIntMax, calculatePresentValue, calculateCurrentRates, calculateAssetData, calculateAssetInterest, getAvailableToBorrow, presentValue, calculateLiquidationData, } from './api/math';
+export { mulFactor, mulDiv, bigIntMin, bigIntMax, calculatePresentValue, calculateCurrentRates, calculateAssetData, calculateAssetInterest, getAvailableToBorrow, calculateMaximumWithdrawAmount, presentValue, calculateLiquidationData, } from './api/math';
 export { createAssetData, createAssetConfig, parseMasterData, parseUserData, parseUserLiteData } from './api/parser';
-export { getPricesByNft } from './api/prices';
+export { getPrices } from './api/prices';
 export { JettonWallet } from './contracts/JettonWallet';
 export { EvaaParameters, JettonMessageParameters, TonSupplyParameters, JettonSupplyParameters, WithdrawParameters, LiquidationBaseData, TonLiquidationParameters, JettonLiquidationParameters, Evaa, } from './contracts/MasterContract';
 export { EvaaUser } from './contracts/UserContract';

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserJettonWallet = exports.getTonConnectSender = exports.getLastSentBoc = exports.STTON_TESTNET = exports.JUSDC_TESTNET = exports.JUSDT_TESTNET = exports.TSTON_MAINNET = exports.STTON_MAINNET = exports.JUSDC_MAINNET = exports.JUSDT_MAINNET = exports.USDT_STORM_MAINNET = exports.TON_STORM_MAINNET = exports.TONUSDT_DEDUST_MAINNET = exports.USDT_MAINNET = exports.TON_MAINNET = exports.TESTNET_LP_POOL_CONFIG = exports.MAINNET_LP_POOL_CONFIG = exports.TESTNET_POOL_CONFIG = exports.MAINNET_POOL_CONFIG = exports.MASTER_CONSTANTS = exports.FEES = exports.OPCODES = exports.LENDING_CODE = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = exports.BalanceChangeType = exports.BalanceType = exports.EvaaUser = exports.Evaa = exports.JettonWallet = exports.getPricesByNft = exports.parseUserLiteData = exports.parseUserData = exports.parseMasterData = exports.createAssetConfig = exports.createAssetData = exports.calculateLiquidationData = exports.presentValue = exports.getAvailableToBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMax = exports.bigIntMin = exports.mulDiv = exports.mulFactor = void 0;
+exports.getUserJettonWallet = exports.getTonConnectSender = exports.getLastSentBoc = exports.STTON_TESTNET = exports.JUSDC_TESTNET = exports.JUSDT_TESTNET = exports.TSTON_MAINNET = exports.STTON_MAINNET = exports.JUSDC_MAINNET = exports.JUSDT_MAINNET = exports.USDT_STORM_MAINNET = exports.TON_STORM_MAINNET = exports.TONUSDT_DEDUST_MAINNET = exports.USDT_MAINNET = exports.TON_MAINNET = exports.TESTNET_LP_POOL_CONFIG = exports.MAINNET_LP_POOL_CONFIG = exports.TESTNET_POOL_CONFIG = exports.MAINNET_POOL_CONFIG = exports.MASTER_CONSTANTS = exports.FEES = exports.OPCODES = exports.LENDING_CODE = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = exports.BalanceChangeType = exports.BalanceType = exports.EvaaUser = exports.Evaa = exports.JettonWallet = exports.getPrices = exports.parseUserLiteData = exports.parseUserData = exports.parseMasterData = exports.createAssetConfig = exports.createAssetData = exports.calculateLiquidationData = exports.presentValue = exports.calculateMaximumWithdrawAmount = exports.getAvailableToBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMax = exports.bigIntMin = exports.mulDiv = exports.mulFactor = void 0;
 // Math
 var math_1 = require("./api/math");
 Object.defineProperty(exports, "mulFactor", { enumerable: true, get: function () { return math_1.mulFactor; } });
@@ -26,6 +26,7 @@ Object.defineProperty(exports, "calculateCurrentRates", { enumerable: true, get:
 Object.defineProperty(exports, "calculateAssetData", { enumerable: true, get: function () { return math_1.calculateAssetData; } });
 Object.defineProperty(exports, "calculateAssetInterest", { enumerable: true, get: function () { return math_1.calculateAssetInterest; } });
 Object.defineProperty(exports, "getAvailableToBorrow", { enumerable: true, get: function () { return math_1.getAvailableToBorrow; } });
+Object.defineProperty(exports, "calculateMaximumWithdrawAmount", { enumerable: true, get: function () { return math_1.calculateMaximumWithdrawAmount; } });
 Object.defineProperty(exports, "presentValue", { enumerable: true, get: function () { return math_1.presentValue; } });
 Object.defineProperty(exports, "calculateLiquidationData", { enumerable: true, get: function () { return math_1.calculateLiquidationData; } });
 // Parser
@@ -37,7 +38,7 @@ Object.defineProperty(exports, "parseUserData", { enumerable: true, get: functio
 Object.defineProperty(exports, "parseUserLiteData", { enumerable: true, get: function () { return parser_1.parseUserLiteData; } });
 // Prices
 var prices_1 = require("./api/prices");
-Object.defineProperty(exports, "getPricesByNft", { enumerable: true, get: function () { return prices_1.getPricesByNft; } });
+Object.defineProperty(exports, "getPrices", { enumerable: true, get: function () { return prices_1.getPrices; } });
 // Contracts' wrappers
 var JettonWallet_1 = require("./contracts/JettonWallet");
 Object.defineProperty(exports, "JettonWallet", { enumerable: true, get: function () { return JettonWallet_1.JettonWallet; } });

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@evaafi/sdk",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "SDK for EVAA contracts",
   "main": "dist/index.js",
+  "types": "src/index.ts",
   "files": [
     "dist",
     "src"

package/src/api/math.ts

@@ -11,6 +11,11 @@ export function mulDiv(x: bigint, y: bigint, z: bigint): bigint {
     return (x * y) / z;
 }
 
+export function mulDivC(x: bigint, y: bigint, z: bigint): bigint {
+    const mul = x * y;
+    return mul / z + (mul % z ? 1n : 0n);
+}
+
 export function bigIntMax(...args: bigint[]): bigint {
     return args.reduce((m, e) => (e > m ? e : m));
 }
@@ -116,6 +121,66 @@ export function calculateAssetInterest(assetConfig: AssetConfig, assetData: Asse
     };
 }
 
+export function checkNotInDebtAtAll(principals: Dictionary<bigint, bigint>): boolean {
+    return principals.values().every(x => x >= 0n);
+}
+
+export function calculateMaximumWithdrawAmount(
+    assetsConfig: ExtendedAssetsConfig,
+    assetsData: ExtendedAssetsData,
+    principals: Dictionary<bigint, bigint>,
+    prices: Dictionary<bigint, bigint>,
+    masterConstants: MasterConstants,
+    assetId: bigint
+): bigint {
+    let withdrawAmountMax = 0n;
+
+    const assetConfig = assetsConfig.get(assetId) as AssetConfig;
+    const assetData = assetsData.get(assetId) as ExtendedAssetData;
+    const oldPrincipal = principals.get(assetId) as bigint;
+
+    if (oldPrincipal > assetConfig.dust) {
+        const oldPresentValue = presentValue(assetData.sRate, assetData.bRate, oldPrincipal, masterConstants);
+        if(checkNotInDebtAtAll(principals)) {
+            withdrawAmountMax = oldPresentValue.amount; 
+        } else {
+            if (!prices.has(assetId)) {
+                return 0n;
+            }
+
+            const borrowable = getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants);
+            const price = prices.get(assetId) as bigint;
+
+            let maxAmountToReclaim = 0n;
+            if (assetConfig.collateralFactor == 0n) {
+                maxAmountToReclaim = oldPresentValue.amount;
+            }
+            else if (price > 0) {
+                maxAmountToReclaim =
+                    mulDiv(
+                        mulDivC(borrowable, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor),
+                        10n ** assetConfig.decimals, price
+                    );
+            }
+          
+            withdrawAmountMax = bigIntMin(
+                maxAmountToReclaim,
+                oldPresentValue.amount
+            );
+        }
+    } else {
+        if (!prices.has(assetId)) {
+            return 0n;
+        }
+
+        const price = prices.get(assetId) as bigint;
+
+        return getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants) * (10n ** assetConfig.decimals) / price;
+    }
+
+    return withdrawAmountMax;
+}
+
 export function getAvailableToBorrow(
     assetsConfig: ExtendedAssetsConfig,
     assetsData: ExtendedAssetsData,
@@ -136,9 +201,10 @@ export function getAvailableToBorrow(
             borrowAmount += (calculatePresentValue(assetData.bRate, -principal, masterConstants) * price) / 10n ** assetConfig.decimals;
         } else if (principal > 0) {
             borrowLimit +=
-                (calculatePresentValue(assetData.sRate, principal, masterConstants) * price * assetConfig.collateralFactor) /
-                10n ** assetConfig.decimals /
-                masterConstants.ASSET_COEFFICIENT_SCALE;
+            mulDivC(
+                mulDivC(calculatePresentValue(assetData.sRate, principal, masterConstants), price, 10n ** assetConfig.decimals),
+                assetConfig.collateralFactor,
+                masterConstants.ASSET_COEFFICIENT_SCALE);
         }
     }
 

package/src/api/parser.ts

@@ -5,6 +5,7 @@ import {
     bigIntMin,
     calculateAssetData,
     calculateLiquidationData,
+    calculateMaximumWithdrawAmount,
     calculatePresentValue,
     getAvailableToBorrow,
     presentValue,
@@ -246,12 +247,12 @@ export function parseUserLiteData(
         const assetData = assetsData.get(asset.assetId) as ExtendedAssetData;
         const assetConfig = assetsConfig.get(asset.assetId) as AssetConfig;
         let principals = principalsDict.get(asset.assetId) || 0n;
+        const balance = presentValue(assetData.sRate, assetData.bRate, principals, masterConstants);
 
-        if (applyDust && (principals > -assetConfig.dust && principals < assetConfig.dust)) {  // abs(principals) < dust
+        if (applyDust && (principals > -assetConfig.dust && balance.amount < assetConfig.dust)) {  // v6 will be abs(principals) < dust
             principals = 0n;
             principalsDict.set(asset.assetId, 0n);
         }
-        const balance = presentValue(assetData.sRate, assetData.bRate, principals, masterConstants);
         userBalances.set(asset.assetId, balance);
     }
 
@@ -292,13 +293,13 @@ export function parseUserData(
         const assetData = assetsData.get(asset.assetId) as ExtendedAssetData;
         const assetConfig = assetsConfig.get(asset.assetId) as AssetConfig;
         let principals = userLiteData.principals.get(asset.assetId) || 0n;
+        const balance = presentValue(assetData.sRate, assetData.bRate, principals, masterConstants);
 
-        if (applyDust && (principals > -assetConfig.dust && principals < assetConfig.dust )) {  // abs(principals) < dust
+        if (applyDust && (principals > -assetConfig.dust && balance.amount < assetConfig.dust )) {  // v6 will be abs(principals) < dust
             principals = 0n;
             userLiteData.principals.set(asset.assetId, 0n);
         }
 
-        const balance = presentValue(assetData.sRate, assetData.bRate, principals, masterConstants);
         userLiteData.balances.set(asset.assetId, balance);
     }
 
@@ -319,22 +320,11 @@ export function parseUserData(
         const assetConfig = assetsConfig.get(asset.assetId) as AssetConfig;
         const assetData = assetsData.get(asset.assetId) as ExtendedAssetData;
         const balance = userLiteData.balances.get(asset.assetId) as UserBalance;
-
+        
         if (balance.type === BalanceType.supply) {
             withdrawalLimits.set(
                 asset.assetId,
-                bigIntMax(
-                    bigIntMin(
-                        assetData.balance,
-                        ((supplyBalance -
-                            (borrowBalance * masterConstants.ASSET_COEFFICIENT_SCALE) / assetConfig.collateralFactor) *
-                            10n ** assetConfig.decimals) /
-                            prices.get(asset.assetId)! -
-                            5n,
-                        balance.amount,
-                    ),
-                    0n,
-                ),
+                calculateMaximumWithdrawAmount(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId)
             );
         }
         borrowLimits.set(

package/src/api/prices.ts

@@ -1,5 +1,6 @@
 import { beginCell, Cell, Dictionary } from '@ton/core';
 import { PriceData } from '../types/Common';
+import { MAIN_POOL_NFT_ID } from '../constants/general';
 
 type NftData = {
     ledgerIndex: number;
@@ -38,7 +39,7 @@ type OutputData = {
     };
 }
 
-export async function getPricesByNft(nftId: string, endpoints: string[] = ["api.stardust-mainnet.iotaledger.net"]) {
+export async function getPrices(endpoints: string[] = ["api.stardust-mainnet.iotaledger.net"], nftId: string = MAIN_POOL_NFT_ID) {
     return await Promise.any(endpoints.map(x => loadPrices(nftId, x)));
 }
 

package/src/contracts/MasterContract.ts

@@ -19,7 +19,7 @@ import { parseMasterData } from '../api/parser';
 import { MasterData, PoolAssetConfig, PoolConfig, PoolJettonAssetConfig, PoolTonAssetConfig } from '../types/Master';
 import { JettonWallet } from './JettonWallet';
 import { getUserJettonWallet } from '../utils/userJettonWallet';
-import { getPricesByNft, MAINNET_POOL_CONFIG } from '..';
+import { getPrices, MAINNET_POOL_CONFIG } from '..';
 
 /**
  * Parameters for the Evaa contract
@@ -424,9 +424,9 @@ export class Evaa implements Contract {
 
     async getPrices(provider: ContractProvider, endpoints?: string[]) {
         if ((endpoints?.length ?? 0) > 0) {
-            return await getPricesByNft(this.poolConfig.nftId, endpoints);
+            return await getPrices(endpoints, this.poolConfig.nftId);
         } else {
-            return await getPricesByNft(this.poolConfig.nftId);
+            return await getPrices(undefined, this.poolConfig.nftId);
         }
     }
 }

package/src/index.ts

@@ -9,6 +9,7 @@ export {
     calculateAssetData,
     calculateAssetInterest,
     getAvailableToBorrow,
+    calculateMaximumWithdrawAmount,
     presentValue,
     calculateLiquidationData,
 } from './api/math';
@@ -17,7 +18,7 @@ export {
 export { createAssetData, createAssetConfig, parseMasterData, parseUserData, parseUserLiteData } from './api/parser';
 
 // Prices
-export { getPricesByNft } from './api/prices';
+export { getPrices } from './api/prices';
 
 // Contracts' wrappers
 export { JettonWallet } from './contracts/JettonWallet';