@evaafi/sdk 0.6.2 → 0.6.3-b

package/CHANGELOG.md

@@ -4,7 +4,47 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
-## 0.6.2 - 2024-11-21
+## 0.6.3-b — 2025-04-30
+### Added
+ - ```USDe and tsUSDe``` new tokens in Main ```PoolConfig```
+ - Minor bug fixes
+
+
+## 0.6.3 — 2025-04-01
+### Added
+ - ```EvaaRewards``` wrapper of RewardUser contract with ```PoolAssetConfig```
+ - ```RewardUser``` wrapper of reward user contract
+ - ```RewardMaster``` wrapper of reward master contract
+ - ```JettonMinget``` wrapper of jetton master contract
+ - ```JettonWallet``` wrapper of jetton wallet contract
+ - ```EVAA_REWARDS_MASTER_CODE_MAINNET``` and ```EVAA_REWARDS_MASTER_CODE_TESTNET``` is constants for reward master code
+ - ```EVAA_REWARDS_USER_CODE_TESTNET``` and ```EVAA_REWARDS_USER_CODE_MAINNET``` is constants for reward user code
+ - ```TESTNET_MASTER_REWARD_CONFIG``` testnet TON config of reward 
+ - ```TESTNET_MASTER_EUSDT_REWARD_CONFIG``` testnet EUSDT config of reward
+ - ```MAINNET_MASTER_TON_REWARD_CONFIG``` mainnet TON config of reward
+ - ```MAINNET_MASTER_USDT_REWARD_CONFIG``` mainnet USDT config of reward
+
+## 0.6.2-c — 2025-01-07
+### Added
+ - ```getAssetLiquidityMinusReserves``` function needed to count the amount of free amount for withdrawal
+### Fixed
+ - ```borrowLimits``` function now take into account the amount available for withdrawal
+
+## 0.6.2-b — 2024-12-17
+### Added
+ - new field in ```UserLiteData``` . ```fullyParsed``` and ```havePrincipalWithoutPrice```
+   true if all prices for user parsing were provided or true if have a principal without price 
+   now user.getSync and parseUserData can work without some prices
+ - ```predictAPY``` - function that predicts a change in apy after supply or withdraw 
+
+## 0.6.2-a — 2024-12-13
+### Added
+ - new field in UserLiteData ```user.data.realPrincipals``` -
+   principals before applying dusts
+### Fixed
+ - getPricesForWithdraw/getPricesForLiquidate they should now be called with a different argument 
+
+## 0.6.2 — 2024-11-21
 ### Added
 - ALTS Pool
 - PricesCollector class  
@@ -29,7 +69,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 ### Changed
 - getPrices is deprecated use PricesCollector instead
 
-## 0.6.1-a - 2024-10-29
+## 0.6.1-a — 2024-10-29
 ### Changed
 - updated `EVAA_LP_MAINNET_VERSION` to `3`
 - `awaitedSupply` is always defined
@@ -38,7 +78,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 - `minimalOracles` is `3` in all pools
 
 
-## 0.6.1 - 2024-10-22
+## 0.6.1 — 2024-10-22
 ### Changed
 - added liquidation.ts with ```findAssetById```, ```calculateAssetsValues```, ```selectGreatestAssets```, ```calculateMinCollateralByTransferredAmount```, ```calculateLiquidationAmounts```, ```isLiquidatable```, ```isBadDebt```, ```addReserve```, ```deductReserve```, ```toAssetAmount```, ```toAssetWorth```, ```addLiquidationBonus```, ```deductLiquidationBonus```, ```PreparedAssetInfo```, ```prepareAssetInfo``` functions required or flexible liquidations calculation.
 - user. ```getSync``` and ```getSyncLite``` new argument ```applyDust``` by default is ```false```;
@@ -46,14 +86,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 ### Fixed
 
 
-## 0.6.0a - 2024-10-14
+## 0.6.0a — 2024-10-14
 ### Changed
 - user. ```getSync``` and ```getSyncLite``` new argument ```applyDust``` by default is ```false```
 ### Fixed
 - Healthfactor calculation minor bug
 - createLiquidationMessage fix new field payloadForwardAmount
 
-## 0.6.0 - 2024-10-10
+## 0.6.0 — 2024-10-10
 ### Added
 - SDK Supports Evaa v6 smart contracts
 ### Fixed
@@ -63,7 +103,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 ### Fixed
 - Fix typo in ```calculateMaximumWithdrawAmount```
 
-## 0.5.6 - 2024-09-28
+## 0.5.6 — 2024-09-28
 
 ### Added
 - ```isTonAsset(PoolAssetConfig)``` function 
@@ -85,7 +125,7 @@ Dust is a small amount of principal that is ignored
 ### Fixed
 - parseUserLiteData (dust) & parseUserData (dust and withdrawLimits) calculations problem
 
-## 0.5.4 - 2024-09-09
+## 0.5.4 — 2024-09-09
 
 check ```tests\supply_withdraw_test.ts``` for new examples
 
@@ -129,23 +169,23 @@ await evaaMainNet.sendSupply(sender_mainnet, toNano(1), {
 - predictHealthFactor minor fixes
 - getUserJettonWallet all currencies support
 
-## 0.5.3 - 2024-08-20
+## 0.5.3 — 2024-08-20
 
 ### Fixed
 - getPrices now supports several endpoints (works on the principle of which one will answer faster, whose answer is used) and throws an exception if prices are not loaded
 
-## 0.5.2 - 2024-08-19
+## 0.5.2 — 2024-08-19
 
 ### Fixed
 - predictHealthFactor argument processing improving
 - getSync fixed parsing contract state, base64url was replaced to base64 encoding which has much higher support
 
-## 0.5.1 - 2024-07-05
+## 0.5.1 — 2024-07-05
 
 ### Added
 - predictHealthFactor function to predict a change in a health factor after repay, borrow, supply, withdraw
 
-## 0.5.0 - 2024-06-29
+## 0.5.0 — 2024-06-29
 This release contains breaking changes.  
 
 ### Added
@@ -163,7 +203,7 @@ This release contains breaking changes.
 ### Fixed
 - UserBalance calculation was fixed
 
-## 0.4.0 - 2024-06-01
+## 0.4.0 — 2024-06-01
 This release contains breaking changes.
 
 ### Added
@@ -184,15 +224,15 @@ This release contains breaking changes.
 - Jetton wallets address calculation
 - Field names in Assets Config and Assets Data serialization functions
 
-## 0.3.2 - 2024-04-20
+## 0.3.2 — 2024-04-20
 ### Added
 - New asset - Tether USD
 
-## 0.3.1 - 2024-04-19
+## 0.3.1 — 2024-04-19
 ### Added
 - New asset - tsTON
 
-## 0.3.0 - 2024-04-04
+## 0.3.0 — 2024-04-04
 ### Added
 - New asset - stTON
 
@@ -204,7 +244,7 @@ This release contains breaking changes.
 ### Removed
 - Ethereum dependencies
 
-## 0.2.0 - 2024-03-13
+## 0.2.0 — 2024-03-13
 This release contains breaking changes.
 
 ### Added
@@ -222,7 +262,7 @@ This release contains breaking changes.
 ### Fixed
 - Calculation of borrow limits
 
-## 0.1.0 - 2024-03-11
+## 0.1.0 — 2024-03-11
 ### Added
 - Parsing user lite data, which does not require prices
 - Assets reserves to `MasterData`

package/README.md

@@ -3,5 +3,6 @@
 The EVAA SDK is designed to easily integrate with the EVAA lending protocol on TON blockchain.
 
 ## Documentation
+You can find the Typedoc documentation [here](https://evaafi.github.io/sdk/).
 
-You can find the documentation in the [docs](./docs) folder.
+Additional (older) documentation can also be found in the [docs](./docs) folder.

package/dist/api/math.d.ts

@@ -1,6 +1,6 @@
-import { AgregatedBalances, AssetConfig, AssetData, AssetInterest, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, PoolConfig } from '../types/Master';
+import { AgregatedBalances, AssetApy, AssetConfig, AssetData, AssetInterest, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, PoolConfig } from '../types/Master';
 import { Dictionary } from '@ton/core';
-import { HealthParamsArgs, LiquidationData, PredictHealthFactorArgs, UserBalance } from '../types/User';
+import { HealthParamsArgs, LiquidationData, PredictAPYArgs, 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;
@@ -16,6 +16,7 @@ export declare const BigMath: {
     max: typeof bigIntMax;
 };
 export declare function calculatePresentValue(index: bigint, principalValue: bigint, masterConstants: MasterConstants): bigint;
+export declare function getAssetLiquidityMinusReserves(assetData: AssetData, masterConstants: MasterConstants): bigint;
 export declare function calculateCurrentRates(assetConfig: AssetConfig, assetData: AssetData, masterConstants: MasterConstants): {
     sRate: bigint;
     bRate: bigint;
@@ -25,6 +26,7 @@ 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 calculateInterestWithSupplyBorrow(totalSupply: bigint, totalBorrow: bigint, assetConfig: AssetConfig, masterConstants: MasterConstants): AssetInterest;
 export declare function checkNotInDebtAtAll(principals: Dictionary<bigint, bigint>): boolean;
 export declare function getAgregatedBalances(assetsData: ExtendedAssetsData, assetsConfig: ExtendedAssetsConfig, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants): AgregatedBalances;
 export declare function calculateMaximumWithdrawAmount(assetsConfig: ExtendedAssetsConfig, assetsData: ExtendedAssetsData, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants, assetId: bigint): bigint;
@@ -59,3 +61,11 @@ export declare function calculateHealthParams(parameters: HealthParamsArgs): {
  */
 export declare function calculateLiquidationData(assetsConfig: ExtendedAssetsConfig, assetsData: ExtendedAssetsData, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, poolConfig: PoolConfig): LiquidationData;
 export declare function predictHealthFactor(args: PredictHealthFactorArgs): number;
+/**
+ * Predicts how APY will change as a result of one of the actions Borrow, Supply, Withdraw or Repay.
+ *
+ * Used on the front-end.
+ *
+ * @returns Estimated APYs for Supply and Borrow
+ */
+export declare function predictAPY(args: PredictAPYArgs): AssetInterest & AssetApy;

package/dist/api/math.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.predictHealthFactor = exports.calculateLiquidationData = exports.calculateHealthParams = exports.presentValue = exports.getAvailableToBorrow = exports.calculateMaximumWithdrawAmount = exports.getAgregatedBalances = exports.checkNotInDebtAtAll = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.BigMath = exports.bigIntMin = exports.bigIntMax = exports.bigAbs = exports.mulDivC = exports.mulDiv = exports.mulFactor = void 0;
+exports.predictAPY = exports.predictHealthFactor = exports.calculateLiquidationData = exports.calculateHealthParams = exports.presentValue = exports.getAvailableToBorrow = exports.calculateMaximumWithdrawAmount = exports.getAgregatedBalances = exports.checkNotInDebtAtAll = exports.calculateInterestWithSupplyBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.getAssetLiquidityMinusReserves = exports.calculatePresentValue = exports.BigMath = exports.bigIntMin = exports.bigIntMax = exports.bigAbs = exports.mulDivC = exports.mulDiv = exports.mulFactor = void 0;
 const User_1 = require("../types/User");
 const assets_1 = require("../constants/assets");
 const liquidation_1 = require("./liquidation");
@@ -35,6 +35,12 @@ function calculatePresentValue(index, principalValue, masterConstants) {
     return (principalValue * index) / masterConstants.FACTOR_SCALE;
 }
 exports.calculatePresentValue = calculatePresentValue;
+function getAssetLiquidityMinusReserves(assetData, masterConstants) {
+    const total_supply = calculatePresentValue(assetData.sRate, assetData.totalSupply, masterConstants);
+    const total_borrow = calculatePresentValue(assetData.bRate, assetData.totalBorrow, masterConstants);
+    return bigIntMin(total_supply - total_borrow, assetData.balance);
+}
+exports.getAssetLiquidityMinusReserves = getAssetLiquidityMinusReserves;
 function calculateCurrentRates(assetConfig, assetData, masterConstants) {
     const now = BigInt(Math.floor(Date.now() / 1000));
     const timeElapsed = now - assetData.lastAccural;
@@ -81,6 +87,10 @@ exports.calculateAssetData = calculateAssetData;
 function calculateAssetInterest(assetConfig, assetData, masterConstants) {
     const totalSupply = calculatePresentValue(assetData.sRate, assetData.totalSupply, masterConstants);
     const totalBorrow = calculatePresentValue(assetData.bRate, assetData.totalBorrow, masterConstants);
+    return calculateInterestWithSupplyBorrow(totalSupply, totalBorrow, assetConfig, masterConstants);
+}
+exports.calculateAssetInterest = calculateAssetInterest;
+function calculateInterestWithSupplyBorrow(totalSupply, totalBorrow, assetConfig, masterConstants) {
     let utilization = 0n;
     let supplyInterest = 0n;
     let borrowInterest = 0n;
@@ -104,7 +114,7 @@ function calculateAssetInterest(assetConfig, assetData, masterConstants) {
         borrowInterest
     };
 }
-exports.calculateAssetInterest = calculateAssetInterest;
+exports.calculateInterestWithSupplyBorrow = calculateInterestWithSupplyBorrow;
 function checkNotInDebtAtAll(principals) {
     return principals.values().every(x => x >= 0n);
 }
@@ -173,10 +183,16 @@ function getAvailableToBorrow(assetsConfig, assetsData, principals, prices, mast
     let borrowLimit = 0n;
     let borrowAmount = 0n;
     for (const assetID of principals.keys()) {
+        const principal = principals.get(assetID);
+        if (principal == 0n) {
+            continue;
+        }
+        if (!prices.has(assetID)) {
+            return 0n;
+        }
         const assetConfig = assetsConfig.get(assetID);
         const assetData = assetsData.get(assetID);
         const price = prices.get(assetID);
-        const principal = principals.get(assetID);
         if (principal < 0n) {
             borrowAmount += mulDiv(calculatePresentValue(assetData.bRate, -principal, masterConstants), price, 10n ** assetConfig.decimals);
         }
@@ -359,7 +375,6 @@ function predictHealthFactor(args) {
     const assetId = args.asset.assetId;
     const assetConfig = args.assetsConfig.get(assetId);
     const assetPrice = Number(args.prices.get(assetId));
-    const assetData = args.assetsData.get(assetId);
     let totalLimit = Number(healthParams.totalLimit);
     let totalBorrow = Number(healthParams.totalDebt);
     const currentAmount = args.amount;
@@ -386,3 +401,40 @@ function predictHealthFactor(args) {
     return Math.min(Math.max(1 - totalBorrow / totalLimit, 0), 1); // let's limit a result to zero below and one above
 }
 exports.predictHealthFactor = predictHealthFactor;
+/**
+ * Predicts how APY will change as a result of one of the actions Borrow, Supply, Withdraw or Repay.
+ *
+ * Used on the front-end.
+ *
+ * @returns Estimated APYs for Supply and Borrow
+ */
+function predictAPY(args) {
+    const assetConfig = args.assetConfig;
+    const assetData = args.assetData;
+    const masterConstants = args.masterConstants;
+    let totalSupply = calculatePresentValue(assetData.sRate, assetData.totalSupply, masterConstants);
+    let totalBorrow = calculatePresentValue(assetData.bRate, assetData.totalBorrow, masterConstants);
+    const currentAmount = args.amount;
+    const changeType = args.balanceChangeType;
+    if (currentAmount != null && currentAmount != 0n) {
+        if (changeType == User_1.BalanceChangeType.Borrow) {
+            totalBorrow += currentAmount;
+        }
+        else if (changeType == User_1.BalanceChangeType.Repay) {
+            totalBorrow -= currentAmount;
+        }
+        else if (changeType == User_1.BalanceChangeType.Withdraw) {
+            totalSupply -= currentAmount;
+        }
+        else if (changeType == User_1.BalanceChangeType.Supply) {
+            totalSupply += currentAmount;
+        }
+    }
+    const interest = calculateInterestWithSupplyBorrow(totalSupply, totalBorrow, assetConfig, masterConstants);
+    return {
+        ...interest,
+        supplyApy: (1 + (Number(interest.supplyInterest) / 1e12) * 24 * 3600) ** 365 - 1,
+        borrowApy: (1 + (Number(interest.borrowInterest) / 1e12) * 24 * 3600) ** 365 - 1
+    };
+}
+exports.predictAPY = predictAPY;

package/dist/api/parser.js

@@ -24,8 +24,8 @@ function createAssetData() {
         serialize: (src, buidler) => {
             buidler.storeUint(src.sRate, 64);
             buidler.storeUint(src.bRate, 64);
-            buidler.storeUint(src.totalSupply, 64);
-            buidler.storeUint(src.totalBorrow, 64);
+            buidler.storeInt(src.totalSupply, 64);
+            buidler.storeInt(src.totalBorrow, 64);
             buidler.storeUint(src.lastAccural, 32);
             buidler.storeUint(src.balance, 64);
             buidler.storeUint(src.trackingSupplyIndex, 64);
@@ -33,15 +33,15 @@ function createAssetData() {
             buidler.storeUint(src.awaitedSupply, 64);
         },
         parse: (src) => {
-            const sRate = BigInt(src.loadInt(64));
-            const bRate = BigInt(src.loadInt(64));
-            const totalSupply = BigInt(src.loadInt(64));
-            const totalBorrow = BigInt(src.loadInt(64));
-            const lastAccural = BigInt(src.loadInt(32));
-            const balance = BigInt(src.loadInt(64));
-            const trackingSupplyIndex = BigInt(src.loadUint(64));
-            const trackingBorrowIndex = BigInt(src.loadUint(64));
-            const awaitedSupply = BigInt(src.loadUint(64));
+            const sRate = BigInt(src.loadUintBig(64));
+            const bRate = BigInt(src.loadUintBig(64));
+            const totalSupply = BigInt(src.loadIntBig(64));
+            const totalBorrow = BigInt(src.loadIntBig(64));
+            const lastAccural = BigInt(src.loadUintBig(32));
+            const balance = BigInt(src.loadUintBig(64));
+            const trackingSupplyIndex = BigInt(src.loadUintBig(64));
+            const trackingBorrowIndex = BigInt(src.loadUintBig(64));
+            const awaitedSupply = BigInt(src.loadUintBig(64));
             return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance, trackingSupplyIndex, trackingBorrowIndex, awaitedSupply };
         },
     };
@@ -183,7 +183,8 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolConfig, ap
     const codeVersion = userSlice.loadCoins();
     const masterAddress = userSlice.loadAddress();
     const userAddress = userSlice.loadAddress();
-    const principalsDict = userSlice.loadDict(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigInt(64));
+    const realPrincipals = userSlice.loadDict(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigInt(64));
+    const principalsDict = core_1.Dictionary.empty(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigInt(64));
     const userState = userSlice.loadInt(64);
     let trackingSupplyIndex = 0n;
     let trackingBorrowIndex = 0n;
@@ -209,7 +210,7 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolConfig, ap
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
         const assetData = assetsData.get(asset.assetId);
         const assetConfig = assetsConfig.get(asset.assetId);
-        let principal = principalsDict.get(asset.assetId) || 0n;
+        let principal = realPrincipals.get(asset.assetId) || 0n;
         let balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principal, masterConstants);
         if (applyDust && (principal > 0 && (principal < assetConfig.dust))) {
             principal = 0n;
@@ -219,6 +220,9 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolConfig, ap
             };
             principalsDict.set(asset.assetId, 0n);
         }
+        else {
+            principalsDict.set(asset.assetId, principal);
+        }
         userBalances.set(asset.assetId, balance);
     }
     return {
@@ -227,12 +231,14 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolConfig, ap
         masterAddress: masterAddress,
         ownerAddress: userAddress,
         principals: principalsDict,
+        realPrincipals: realPrincipals,
         state: userState,
         balances: userBalances,
         trackingSupplyIndex: trackingSupplyIndex,
         trackingBorrowIndex: trackingBorrowIndex,
         dutchAuctionStart: dutchAuctionStart,
         backupCell: backupCell,
+        fullyParsed: false,
         rewards: rewards,
         backupCell1: backupCell1,
         backupCell2: backupCell2,
@@ -240,12 +246,22 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolConfig, ap
 }
 exports.parseUserLiteData = parseUserLiteData;
 function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolConfig, applyDust = false) {
+    userLiteData.fullyParsed = true;
+    let havePrincipalWithoutPrice = false;
     const poolAssetsConfig = poolConfig.poolAssetsConfig;
     const masterConstants = poolConfig.masterConstants;
     const withdrawalLimits = core_1.Dictionary.empty();
     const borrowLimits = core_1.Dictionary.empty();
     let supplyBalance = 0n;
     let borrowBalance = 0n;
+    for (const [assetId, principal] of userLiteData.realPrincipals) {
+        if (!prices.has(assetId)) {
+            userLiteData.fullyParsed = false;
+            if (principal != 0n) {
+                havePrincipalWithoutPrice = true;
+            }
+        }
+    }
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
         const assetData = assetsData.get(asset.assetId);
         const assetConfig = assetsConfig.get(asset.assetId);
@@ -258,6 +274,9 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolConfi
         userLiteData.balances.set(asset.assetId, balance);
     }
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
+        if (!prices.has(asset.assetId)) {
+            continue;
+        }
         const assetConfig = assetsConfig.get(asset.assetId);
         const balance = userLiteData.balances.get(asset.assetId);
         if (balance.type === User_1.BalanceType.supply) {
@@ -267,24 +286,32 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolConfi
             borrowBalance += (balance.amount * prices.get(asset.assetId)) / 10n ** assetConfig.decimals;
         }
     }
-    const availableToBorrow = (0, math_1.getAvailableToBorrow)(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants);
+    const availableToBorrow = (0, math_1.getAvailableToBorrow)(assetsConfig, assetsData, userLiteData.realPrincipals, prices, masterConstants);
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
+        const balance = userLiteData.balances.get(asset.assetId);
         const assetConfig = assetsConfig.get(asset.assetId);
         const assetData = assetsData.get(asset.assetId);
-        const balance = userLiteData.balances.get(asset.assetId);
+        const assetLiquidityMinusReserves = (0, math_1.getAssetLiquidityMinusReserves)(assetData, masterConstants);
         if (balance.type === User_1.BalanceType.supply) {
-            withdrawalLimits.set(asset.assetId, (0, math_1.bigIntMin)((0, math_1.calculateMaximumWithdrawAmount)(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId), assetData.balance));
+            withdrawalLimits.set(asset.assetId, (0, math_1.bigIntMin)((0, math_1.calculateMaximumWithdrawAmount)(assetsConfig, assetsData, userLiteData.realPrincipals, prices, masterConstants, asset.assetId), assetData.balance));
         }
-        borrowLimits.set(asset.assetId, (0, math_1.bigIntMax)(0n, (0, math_1.bigIntMin)((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId), assetData.balance, assetData.totalSupply - assetData.totalBorrow)));
+        if (!prices.has(asset.assetId)) {
+            borrowLimits.set(asset.assetId, 0n);
+            continue;
+        }
+        borrowLimits.set(asset.assetId, (0, math_1.bigIntMax)(0n, (0, math_1.bigIntMin)((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId), assetLiquidityMinusReserves)));
     }
     const limitUsed = borrowBalance + availableToBorrow;
     const limitUsedPercent = limitUsed === 0n
         ? 0
         : Number(BigInt(1e9) - (availableToBorrow * BigInt(1e9)) / (borrowBalance + availableToBorrow)) / 1e7;
-    const liquidationData = (0, math_1.calculateLiquidationData)(assetsConfig, assetsData, userLiteData.principals, prices, poolConfig);
     let healthFactor = 1;
-    if (liquidationData.totalLimit != 0n) {
-        healthFactor = 1 - Number(liquidationData.totalDebt) / Number(liquidationData.totalLimit);
+    let liquidationData;
+    if (!havePrincipalWithoutPrice) {
+        liquidationData = (0, math_1.calculateLiquidationData)(assetsConfig, assetsData, userLiteData.realPrincipals, prices, poolConfig);
+        if (liquidationData.totalLimit != 0n) {
+            healthFactor = 1 - Number(liquidationData.totalDebt) / Number(liquidationData.totalLimit);
+        }
     }
     return {
         ...userLiteData,
@@ -297,6 +324,7 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolConfi
         limitUsed: limitUsed,
         liquidationData: liquidationData,
         healthFactor: healthFactor,
+        havePrincipalWithoutPrice: havePrincipalWithoutPrice
     };
 }
 exports.parseUserData = parseUserData;

package/dist/constants/assets.d.ts

@@ -1,4 +1,4 @@
-import { PoolAssetConfig } from "../types/Master";
+import { PoolAssetConfig } from '../types/Master';
 export declare const ASSET_ID: {
     TON: bigint;
     USDT: bigint;
@@ -7,6 +7,9 @@ export declare const ASSET_ID: {
     stTON: bigint;
     tsTON: bigint;
     uTON: bigint;
+    tgBTC: bigint;
+    USDe: bigint;
+    tsUSDe: bigint;
     TONUSDT_DEDUST: bigint;
     TONUSDT_STONFI: bigint;
     TON_STORM: bigint;
@@ -14,6 +17,7 @@ export declare const ASSET_ID: {
     NOT: bigint;
     DOGS: bigint;
     CATI: bigint;
+    EUSDT: bigint;
 };
 export declare const UNDEFINED_ASSET: PoolAssetConfig;
 export declare const TON_MAINNET: PoolAssetConfig;
@@ -33,3 +37,7 @@ export declare const CATI_MAINNET: PoolAssetConfig;
 export declare const DOGS_MAINNET: PoolAssetConfig;
 export declare const NOT_MAINNET: PoolAssetConfig;
 export declare const UTON_MAINNET: PoolAssetConfig;
+export declare const TGBTC_TESTNET: PoolAssetConfig;
+export declare const EUSDT_TESTNET: PoolAssetConfig;
+export declare const USDE_MAINNET: PoolAssetConfig;
+export declare const TSUSDE_MAINNET: PoolAssetConfig;