@evaafi/sdk 0.5.3 → 0.5.5

package/dist/index.js

@@ -1,6 +1,20 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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.FEES = exports.OPCODES = exports.LENDING_CODE = exports.MASTER_CONSTANTS = exports.JETTON_MASTER_ADDRESSES = 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.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; } });
@@ -12,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
@@ -35,16 +50,34 @@ var User_1 = require("./types/User");
 Object.defineProperty(exports, "BalanceType", { enumerable: true, get: function () { return User_1.BalanceType; } });
 Object.defineProperty(exports, "BalanceChangeType", { enumerable: true, get: function () { return User_1.BalanceChangeType; } });
 // Constants
-var constants_1 = require("./constants");
-Object.defineProperty(exports, "EVAA_MASTER_MAINNET", { enumerable: true, get: function () { return constants_1.EVAA_MASTER_MAINNET; } });
-Object.defineProperty(exports, "MAINNET_VERSION", { enumerable: true, get: function () { return constants_1.MAINNET_VERSION; } });
-Object.defineProperty(exports, "EVAA_MASTER_TESTNET", { enumerable: true, get: function () { return constants_1.EVAA_MASTER_TESTNET; } });
-Object.defineProperty(exports, "TESTNET_VERSION", { enumerable: true, get: function () { return constants_1.TESTNET_VERSION; } });
-Object.defineProperty(exports, "JETTON_MASTER_ADDRESSES", { enumerable: true, get: function () { return constants_1.JETTON_MASTER_ADDRESSES; } });
-Object.defineProperty(exports, "MASTER_CONSTANTS", { enumerable: true, get: function () { return constants_1.MASTER_CONSTANTS; } });
-Object.defineProperty(exports, "LENDING_CODE", { enumerable: true, get: function () { return constants_1.LENDING_CODE; } });
-Object.defineProperty(exports, "OPCODES", { enumerable: true, get: function () { return constants_1.OPCODES; } });
-Object.defineProperty(exports, "FEES", { enumerable: true, get: function () { return constants_1.FEES; } });
+var general_1 = require("./constants/general");
+Object.defineProperty(exports, "EVAA_MASTER_MAINNET", { enumerable: true, get: function () { return general_1.EVAA_MASTER_MAINNET; } });
+Object.defineProperty(exports, "MAINNET_VERSION", { enumerable: true, get: function () { return general_1.MAINNET_VERSION; } });
+Object.defineProperty(exports, "EVAA_MASTER_TESTNET", { enumerable: true, get: function () { return general_1.EVAA_MASTER_TESTNET; } });
+Object.defineProperty(exports, "TESTNET_VERSION", { enumerable: true, get: function () { return general_1.TESTNET_VERSION; } });
+Object.defineProperty(exports, "LENDING_CODE", { enumerable: true, get: function () { return general_1.LENDING_CODE; } });
+Object.defineProperty(exports, "OPCODES", { enumerable: true, get: function () { return general_1.OPCODES; } });
+Object.defineProperty(exports, "FEES", { enumerable: true, get: function () { return general_1.FEES; } });
+Object.defineProperty(exports, "MASTER_CONSTANTS", { enumerable: true, get: function () { return general_1.MASTER_CONSTANTS; } });
+var pools_1 = require("./constants/pools");
+Object.defineProperty(exports, "MAINNET_POOL_CONFIG", { enumerable: true, get: function () { return pools_1.MAINNET_POOL_CONFIG; } });
+Object.defineProperty(exports, "TESTNET_POOL_CONFIG", { enumerable: true, get: function () { return pools_1.TESTNET_POOL_CONFIG; } });
+Object.defineProperty(exports, "MAINNET_LP_POOL_CONFIG", { enumerable: true, get: function () { return pools_1.MAINNET_LP_POOL_CONFIG; } });
+Object.defineProperty(exports, "TESTNET_LP_POOL_CONFIG", { enumerable: true, get: function () { return pools_1.TESTNET_LP_POOL_CONFIG; } });
+var assets_1 = require("./constants/assets");
+Object.defineProperty(exports, "TON_MAINNET", { enumerable: true, get: function () { return assets_1.TON_MAINNET; } });
+Object.defineProperty(exports, "USDT_MAINNET", { enumerable: true, get: function () { return assets_1.USDT_MAINNET; } });
+Object.defineProperty(exports, "TONUSDT_DEDUST_MAINNET", { enumerable: true, get: function () { return assets_1.TONUSDT_DEDUST_MAINNET; } });
+Object.defineProperty(exports, "TON_STORM_MAINNET", { enumerable: true, get: function () { return assets_1.TON_STORM_MAINNET; } });
+Object.defineProperty(exports, "USDT_STORM_MAINNET", { enumerable: true, get: function () { return assets_1.USDT_STORM_MAINNET; } });
+Object.defineProperty(exports, "JUSDT_MAINNET", { enumerable: true, get: function () { return assets_1.JUSDT_MAINNET; } });
+Object.defineProperty(exports, "JUSDC_MAINNET", { enumerable: true, get: function () { return assets_1.JUSDC_MAINNET; } });
+Object.defineProperty(exports, "STTON_MAINNET", { enumerable: true, get: function () { return assets_1.STTON_MAINNET; } });
+Object.defineProperty(exports, "TSTON_MAINNET", { enumerable: true, get: function () { return assets_1.TSTON_MAINNET; } });
+Object.defineProperty(exports, "JUSDT_TESTNET", { enumerable: true, get: function () { return assets_1.JUSDT_TESTNET; } });
+Object.defineProperty(exports, "JUSDC_TESTNET", { enumerable: true, get: function () { return assets_1.JUSDC_TESTNET; } });
+Object.defineProperty(exports, "STTON_TESTNET", { enumerable: true, get: function () { return assets_1.STTON_TESTNET; } });
+__exportStar(require("./constants/assets"), exports);
 // Utils
 var tonConnectSender_1 = require("./utils/tonConnectSender");
 Object.defineProperty(exports, "getLastSentBoc", { enumerable: true, get: function () { return tonConnectSender_1.getLastSentBoc; } });

package/dist/types/Master.d.ts

@@ -1,4 +1,32 @@
 import { Address, Cell, Dictionary } from '@ton/core';
+export type MasterConstants = {
+    FACTOR_SCALE: bigint;
+    ASSET_COEFFICIENT_SCALE: bigint;
+    ASSET_PRICE_SCALE: bigint;
+    ASSET_RESERVE_FACTOR_SCALE: bigint;
+    ASSET_LIQUIDATION_RESERVE_FACTOR_SCALE: bigint;
+    ASSET_ORIGINATION_FEE_SCALE: bigint;
+};
+export type PoolAssetConfig = (PoolTonAssetConfig | PoolJettonAssetConfig) & {
+    name: string;
+};
+export type PoolAssetsConfig = PoolAssetConfig[];
+export type PoolTonAssetConfig = {
+    assetId: bigint;
+};
+export type PoolJettonAssetConfig = {
+    assetId: bigint;
+    jettonMasterAddress: Address;
+    jettonWalletCode: Cell;
+};
+export type PoolConfig = {
+    masterAddress: Address;
+    masterVersion: number;
+    masterConstants: MasterConstants;
+    nftId: string;
+    poolAssetsConfig: PoolAssetsConfig;
+    lendingCode: Cell;
+};
 export type UpgradeConfig = {
     masterCodeVersion: number;
     userCodeVersion: number;
@@ -52,12 +80,14 @@ export type AssetApy = {
     borrowApy: number;
 };
 export type ExtendedAssetData = AssetData & AssetInterest & AssetApy;
+export type ExtendedAssetsData = Dictionary<bigint, ExtendedAssetData>;
+export type ExtendedAssetsConfig = Dictionary<bigint, AssetConfig>;
 export type MasterData = {
     meta: string;
     upgradeConfig: UpgradeConfig;
     masterConfig: MasterConfig;
-    assetsConfig: Dictionary<bigint, AssetConfig>;
-    assetsData: Dictionary<bigint, ExtendedAssetData>;
+    assetsConfig: ExtendedAssetsConfig;
+    assetsData: ExtendedAssetsData;
     assetsReserves: Dictionary<bigint, bigint>;
     apy: {
         supply: Dictionary<bigint, number>;

package/dist/types/User.d.ts

@@ -1,5 +1,5 @@
 import { Address, Cell, Dictionary } from '@ton/core';
-import { AssetConfig, ExtendedAssetData } from './Master';
+import { ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants } from './Master';
 export declare enum BalanceType {
     supply = "supply",
     borrow = "borrow"
@@ -70,6 +70,7 @@ export type PredictHealthFactorArgs = {
     tokenSymbol: string;
     balances: Dictionary<bigint, bigint>;
     prices: Dictionary<bigint, bigint>;
-    assetsData: Dictionary<bigint, ExtendedAssetData>;
-    assetsConfig: Dictionary<bigint, AssetConfig>;
+    assetsData: ExtendedAssetsData;
+    assetsConfig: ExtendedAssetsConfig;
+    masterConstants: MasterConstants;
 };

package/dist/utils/userJettonWallet.d.ts

@@ -1,2 +1,3 @@
 import { Address } from '@ton/core';
-export declare function getUserJettonWallet(ownerAddress: Address, assetID: bigint, network: 'mainnet' | 'testnet'): Address;
+import { PoolAssetConfig, PoolJettonAssetConfig } from '../types/Master';
+export declare function getUserJettonWallet(ownerAddress: Address, poolAssetConfig: PoolAssetConfig & PoolJettonAssetConfig): Address;

package/dist/utils/userJettonWallet.js

@@ -2,71 +2,55 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserJettonWallet = void 0;
 const core_1 = require("@ton/core");
-const constants_1 = require("../constants");
-function getUserJettonWallet(ownerAddress, assetID, network) {
-    const builder = (0, core_1.beginCell)().storeCoins(0).storeAddress(ownerAddress);
-    let jettonWalletCode;
-    switch (assetID) {
-        case constants_1.MAINNET_ASSETS_ID.jUSDT:
-            if (network === 'mainnet') {
-                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.jUSDT_MAINNET);
-                jettonWalletCode = constants_1.JETTON_WALLETS_CODE.jUSDT_MAINNET;
-            }
-            else {
-                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.jUSDT_TESTNET);
-                jettonWalletCode = constants_1.JETTON_WALLETS_CODE.jUSDT_TESTNET;
-            }
-            break;
-        case constants_1.MAINNET_ASSETS_ID.jUSDC:
-            if (network === 'mainnet') {
-                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.jUSDC_MAINNET);
-                jettonWalletCode = constants_1.JETTON_WALLETS_CODE.jUSDC_MAINNET;
-            }
-            else {
-                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.jUSDC_TESTNET);
-                jettonWalletCode = constants_1.JETTON_WALLETS_CODE.jUSDC_TESTNET;
-            }
-            break;
-        case constants_1.MAINNET_ASSETS_ID.stTON:
-            if (network === 'mainnet') {
-                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.stTON_MAINNET);
-                jettonWalletCode = constants_1.JETTON_WALLETS_CODE.stTON_MAINNET;
-            }
-            else {
-                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.stTON_TESTNET);
-                jettonWalletCode = constants_1.JETTON_WALLETS_CODE.stTON_TESTNET;
-            }
-            break;
-        case constants_1.MAINNET_ASSETS_ID.tsTON:
-            if (network === 'mainnet') {
-                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.tsTON_MAINNET);
-                jettonWalletCode = constants_1.JETTON_WALLETS_CODE.tsTON_MAINNET;
-            }
-            else {
-                // builder.storeAddress(JETTON_MASTER_ADDRESSES.tsTON_TESTNET);
-                // jettonWalletCode = JETTON_WALLETS_CODE.tsTON_TESTNET;
-                throw new Error('tsTON is not supported on testnet');
-            }
-            break;
-        case constants_1.MAINNET_ASSETS_ID.USDT:
-            if (network === 'mainnet') {
-                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.USDT_MAINNET);
-                jettonWalletCode = constants_1.JETTON_WALLETS_CODE.USDT_MAINNET;
-            }
-            else {
-                // builder.storeAddress(JETTON_MASTER_ADDRESSES.USDT_TESTNET);
-                // jettonWalletCode = JETTON_WALLETS_CODE.USDT_TESTNET;
-                throw new Error('USDT is not supported on testnet');
-            }
-            break;
-        default:
-            throw new Error('Unsupported asset');
+function getUserJettonWallet(ownerAddress, poolAssetConfig) {
+    const jettonMasterAddress = poolAssetConfig.jettonMasterAddress;
+    const jettonWalletCode = poolAssetConfig.jettonWalletCode;
+    if (poolAssetConfig.name === 'USDT') {
+        const lib_prep = (0, core_1.beginCell)().storeUint(2, 8).storeBuffer(jettonWalletCode.hash()).endCell();
+        const jwallet_code = new core_1.Cell({ exotic: true, bits: lib_prep.bits, refs: lib_prep.refs });
+        const jettonData = (0, core_1.beginCell)()
+            .storeUint(0, 4)
+            .storeCoins(0)
+            .storeAddress(ownerAddress)
+            .storeAddress(jettonMasterAddress)
+            .endCell();
+        const stateInit = (0, core_1.beginCell)()
+            .store((0, core_1.storeStateInit)({
+            code: jwallet_code,
+            data: jettonData
+        }))
+            .endCell();
+        return new core_1.Address(0, stateInit.hash());
     }
-    const data = builder.storeRef(jettonWalletCode).endCell();
+    if (poolAssetConfig.name === 'tsTON') {
+        const lib_prep = (0, core_1.beginCell)().storeUint(2, 8).storeBuffer(jettonWalletCode.hash()).endCell();
+        const jwallet_code = new core_1.Cell({ exotic: true, bits: lib_prep.bits, refs: lib_prep.refs });
+        const jettonData = (0, core_1.beginCell)()
+            .storeCoins(0)
+            .storeAddress(ownerAddress)
+            .storeAddress(jettonMasterAddress)
+            .storeRef(jwallet_code)
+            .storeCoins(0)
+            .storeUint(0, 48)
+            .endCell();
+        const stateInit = (0, core_1.beginCell)()
+            .store((0, core_1.storeStateInit)({
+            code: jwallet_code,
+            data: jettonData
+        }))
+            .endCell();
+        return new core_1.Address(0, stateInit.hash());
+    }
+    const jettonData = (0, core_1.beginCell)()
+        .storeCoins(0)
+        .storeAddress(ownerAddress)
+        .storeAddress(jettonMasterAddress)
+        .storeRef(jettonWalletCode)
+        .endCell();
     const stateInit = (0, core_1.beginCell)()
         .store((0, core_1.storeStateInit)({
         code: jettonWalletCode,
-        data: data,
+        data: jettonData
     }))
         .endCell();
     return new core_1.Address(0, stateInit.hash());

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@evaafi/sdk",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "SDK for EVAA contracts",
   "main": "dist/index.js",
+  "types": "src/index.ts",
   "files": [
     "dist",
     "src"
@@ -18,11 +19,14 @@
   "license": "MIT",
   "homepage": "https://github.com/evaafi/sdk#readme",
   "devDependencies": {
+    "@orbs-network/ton-access": "^2.3.3",
     "@ton/core": "0.56.0",
     "@tonconnect/sdk": "^3.0.0",
+    "@types/jest": "^29.5.12",
     "@types/node": "^20.10.4",
     "crypto-js": "^4.2.0",
     "prettier": "^3.2.4",
+    "ts-jest": "^29.2.4",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3"
   },
@@ -30,5 +34,9 @@
     "@ton/core": ">=0.56.0",
     "@tonconnect/sdk": ">=3.0.0",
     "crypto-js": ">=4.2.0"
+  },
+  "dependencies": {
+    "@ton/ton": "^14.0.0",
+    "dotenv": "^16.4.5"
   }
 }

package/src/api/math.ts

@@ -1,5 +1,4 @@
-import { AssetConfig, AssetData, AssetInterest, ExtendedAssetData } from '../types/Master';
-import { MASTER_CONSTANTS } from '../constants';
+import { AssetConfig, AssetData, AssetInterest, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants } from '../types/Master';
 import { Dictionary } from '@ton/core';
 import { BalanceChangeType, BalanceType, LiquidationData, PredictHealthFactorArgs, UserBalance } from '../types/User';
 import { sha256Hash } from '../utils/sha256BigInt';
@@ -12,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));
 }
@@ -19,20 +23,20 @@ export function bigIntMin(...args: bigint[]): bigint {
     return args.reduce((m, e) => (e < m ? e : m));
 }
 
-export function calculatePresentValue(index: bigint, principalValue: bigint): bigint {
-    return (principalValue * index) / MASTER_CONSTANTS.FACTOR_SCALE;
+export function calculatePresentValue(index: bigint, principalValue: bigint, masterConstants: MasterConstants): bigint {
+    return (principalValue * index) / masterConstants.FACTOR_SCALE;
 }
 
-export function calculateCurrentRates(assetConfig: AssetConfig, assetData: AssetData) {
+export function calculateCurrentRates(assetConfig: AssetConfig, assetData: AssetData, masterConstants: MasterConstants) {
     const now = BigInt(Math.floor(Date.now() / 1000));
     const timeElapsed = now - assetData.lastAccural;
-    const { supplyInterest, borrowInterest } = calculateAssetInterest(assetConfig, assetData);
+    const { supplyInterest, borrowInterest } = calculateAssetInterest(assetConfig, assetData, masterConstants);
 
     if (timeElapsed > 0) {
         const updatedSRate =
-            assetData.sRate + mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetData.sRate, supplyInterest * timeElapsed);
+            assetData.sRate + mulFactor(masterConstants.FACTOR_SCALE, assetData.sRate, supplyInterest * timeElapsed);
         const updatedBRate =
-            assetData.bRate + mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetData.bRate, borrowInterest * timeElapsed);
+            assetData.bRate + mulFactor(masterConstants.FACTOR_SCALE, assetData.bRate, borrowInterest * timeElapsed);
         return {
             sRate: updatedSRate,
             bRate: updatedBRate,
@@ -52,9 +56,10 @@ export function calculateCurrentRates(assetConfig: AssetConfig, assetData: Asset
 }
 
 export function calculateAssetData(
-    assetsConfigDict: Dictionary<bigint, AssetConfig>,
+    assetsConfigDict: ExtendedAssetsConfig,
     assetsDataDict: Dictionary<bigint, AssetData>,
     assetId: bigint,
+    masterConstants: MasterConstants
 ): ExtendedAssetData {
     const config = assetsConfigDict.get(assetId);
     const data = assetsDataDict.get(assetId);
@@ -63,7 +68,7 @@ export function calculateAssetData(
         throw new Error('Asset Data or Config is not accessible');
     }
 
-    const { sRate, bRate, supplyInterest, borrowInterest, now } = calculateCurrentRates(config, data);
+    const { sRate, bRate, supplyInterest, borrowInterest, now } = calculateCurrentRates(config, data, masterConstants);
     data.sRate = sRate || 0n;
     data.bRate = bRate || 0n;
     data.lastAccural = now;
@@ -78,36 +83,36 @@ export function calculateAssetData(
     };
 }
 
-export function calculateAssetInterest(assetConfig: AssetConfig, assetData: AssetData): AssetInterest {
-    const totalSupply = calculatePresentValue(assetData.sRate, assetData.totalSupply);
-    const totalBorrow = calculatePresentValue(assetData.bRate, assetData.totalBorrow);
+export function calculateAssetInterest(assetConfig: AssetConfig, assetData: AssetData, masterConstants: MasterConstants): AssetInterest {
+    const totalSupply = calculatePresentValue(assetData.sRate, assetData.totalSupply, masterConstants);
+    const totalBorrow = calculatePresentValue(assetData.bRate, assetData.totalBorrow, masterConstants);
     let utilization = 0n;
     let supplyInterest = 0n;
     let borrowInterest = 0n;
 
     if (totalSupply !== 0n) {
-        utilization = (totalBorrow * MASTER_CONSTANTS.FACTOR_SCALE) / totalSupply;
+        utilization = (totalBorrow * masterConstants.FACTOR_SCALE) / totalSupply;
     }
 
     if (utilization <= assetConfig.targetUtilization) {
         borrowInterest =
             assetConfig.baseBorrowRate +
-            mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetConfig.borrowRateSlopeLow, utilization);
+            mulFactor(masterConstants.FACTOR_SCALE, assetConfig.borrowRateSlopeLow, utilization);
     } else {
         borrowInterest =
             assetConfig.baseBorrowRate +
-            mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetConfig.borrowRateSlopeLow, assetConfig.targetUtilization) +
+            mulFactor(masterConstants.FACTOR_SCALE, assetConfig.borrowRateSlopeLow, assetConfig.targetUtilization) +
             mulFactor(
-                MASTER_CONSTANTS.FACTOR_SCALE,
+                masterConstants.FACTOR_SCALE,
                 assetConfig.borrowRateSlopeHigh,
                 utilization - assetConfig.targetUtilization,
             );
     }
 
     supplyInterest = mulDiv(
-        mulDiv(borrowInterest, utilization, MASTER_CONSTANTS.FACTOR_SCALE),
-        MASTER_CONSTANTS.ASSET_RESERVE_FACTOR_SCALE - assetConfig.reserveFactor,
-        MASTER_CONSTANTS.ASSET_RESERVE_FACTOR_SCALE,
+        mulDiv(borrowInterest, utilization, masterConstants.FACTOR_SCALE),
+        masterConstants.ASSET_RESERVE_FACTOR_SCALE - assetConfig.reserveFactor,
+        masterConstants.ASSET_RESERVE_FACTOR_SCALE,
     );
 
     return {
@@ -116,11 +121,72 @@ 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: Dictionary<bigint, AssetConfig>,
-    assetsData: Dictionary<bigint, ExtendedAssetData>,
+    assetsConfig: ExtendedAssetsConfig,
+    assetsData: ExtendedAssetsData,
     principals: Dictionary<bigint, bigint>,
     prices: Dictionary<bigint, bigint>,
+    masterConstants: MasterConstants
 ): bigint {
     let borrowLimit = 0n;
     let borrowAmount = 0n;
@@ -132,27 +198,28 @@ export function getAvailableToBorrow(
         const principal = principals.get(assetID) as bigint;
 
         if (principal < 0) {
-            borrowAmount += (calculatePresentValue(assetData.bRate, -principal) * price) / 10n ** assetConfig.decimals;
+            borrowAmount += (calculatePresentValue(assetData.bRate, -principal, masterConstants) * price) / 10n ** assetConfig.decimals;
         } else if (principal > 0) {
             borrowLimit +=
-                (calculatePresentValue(assetData.sRate, principal) * price * assetConfig.collateralFactor) /
-                10n ** assetConfig.decimals /
-                MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE;
+            mulDivC(
+                mulDivC(calculatePresentValue(assetData.sRate, principal, masterConstants), price, 10n ** assetConfig.decimals),
+                assetConfig.collateralFactor,
+                masterConstants.ASSET_COEFFICIENT_SCALE);
         }
     }
 
     return borrowLimit - borrowAmount;
 }
 
-export function presentValue(sRate: bigint, bRate: bigint, principalValue: bigint): UserBalance {
+export function presentValue(sRate: bigint, bRate: bigint, principalValue: bigint, masterConstants: MasterConstants): UserBalance {
     if (principalValue > 0) {
         return {
-            amount: calculatePresentValue(sRate, principalValue),
+            amount: calculatePresentValue(sRate, principalValue, masterConstants),
             type: BalanceType.supply,
         };
     } else if (principalValue < 0) {
         return {
-            amount: calculatePresentValue(bRate, -principalValue),
+            amount: calculatePresentValue(bRate, -principalValue, masterConstants),
             type: BalanceType.borrow,
         };
     } else {
@@ -164,10 +231,11 @@ export function presentValue(sRate: bigint, bRate: bigint, principalValue: bigin
 }
 
 export function calculateLiquidationData(
-    assetsConfig: Dictionary<bigint, AssetConfig>,
-    assetsData: Dictionary<bigint, ExtendedAssetData>,
+    assetsConfig: ExtendedAssetsConfig,
+    assetsData: ExtendedAssetsData,
     principals: Dictionary<bigint, bigint>,
     prices: Dictionary<bigint, bigint>,
+    masterConstants: MasterConstants,
 ): LiquidationData {
     let gCollateralValue = 0n;
     let gCollateralAsset = 0n;
@@ -184,7 +252,7 @@ export function calculateLiquidationData(
             principal > 0 ? (principal * assetData.sRate) / BigInt(1e12) : (principal * assetData.bRate) / BigInt(1e12);
         if (balance > 0) {
             const assetWorth = (balance * prices.get(key)!) / 10n ** assetConfig.decimals;
-            totalLimit += (assetWorth * assetConfig.liquidationThreshold) / MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE;
+            totalLimit += (assetWorth * assetConfig.liquidationThreshold) / masterConstants.ASSET_COEFFICIENT_SCALE;
             if (assetWorth > gCollateralValue) {
                 gCollateralValue = assetWorth;
                 gCollateralAsset = key;
@@ -209,7 +277,7 @@ export function calculateLiquidationData(
         values.push(
             (bigIntMax(gCollateralValue / 2n, bigIntMin(gCollateralValue, 10_000_000_000n)) *
                 loanDecimal *
-                MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE) /
+                masterConstants.ASSET_COEFFICIENT_SCALE) /
                 liquidationBonus /
                 gLoanAssetPrice,
         );
@@ -251,7 +319,7 @@ export function calculateLiquidationData(
 }
 
 export function predictHealthFactor(args: PredictHealthFactorArgs): number {
-    const liquidationData = calculateLiquidationData(args.assetsConfig, args.assetsData, args.balances, args.prices);
+    const liquidationData = calculateLiquidationData(args.assetsConfig, args.assetsData, args.balances, args.prices, args.masterConstants);
     const tokenHash = sha256Hash(args.tokenSymbol);
     
     const assetConfig = args.assetsConfig.get(tokenHash)!;
@@ -267,16 +335,15 @@ export function predictHealthFactor(args: PredictHealthFactorArgs): number {
     const currentBalance = assetPrice * Number(currentAmount) / Math.pow(10, decimals);
     const changeType = args.balanceChangeType;
 
-    if (currentAmount != null && !Number.isNaN(currentAmount) &&
-             Number.isFinite(currentAmount) && currentAmount != 0n) { 
+    if (currentAmount != null && currentAmount != 0n) { 
         if (changeType == BalanceChangeType.Borrow) {
-            totalBorrow += currentBalance * (1 + Number(assetConfig.originationFee) / Number(MASTER_CONSTANTS.ASSET_ORIGINATION_FEE_SCALE));
+            totalBorrow += currentBalance * (1 + Number(assetConfig.originationFee) / Number(args.masterConstants.ASSET_ORIGINATION_FEE_SCALE));
         } else if (changeType == BalanceChangeType.Repay) {
             totalBorrow -= currentBalance;
         } else if (changeType == BalanceChangeType.Withdraw) {
-            totalLimit -= currentBalance * Number(assetConfig.liquidationThreshold) / Number(MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE);
+            totalLimit -= currentBalance * Number(assetConfig.liquidationThreshold) / Number(args.masterConstants.ASSET_COEFFICIENT_SCALE);
         } else if (changeType == BalanceChangeType.Supply) {
-            totalLimit += currentBalance * Number(assetConfig.liquidationThreshold) / Number(MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE);
+            totalLimit += currentBalance * Number(assetConfig.liquidationThreshold) / Number(args.masterConstants.ASSET_COEFFICIENT_SCALE);
         }
     }
     if (Number(totalLimit) == 0) {