@evaafi/sdk 0.5.5 → 0.5.6-a

package/dist/api/math.d.ts

@@ -1,4 +1,4 @@
-import { AssetConfig, AssetData, AssetInterest, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants } from '../types/Master';
+import { AgregatedBalances, AssetConfig, AssetData, AssetInterest, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, PoolConfig } from '../types/Master';
 import { Dictionary } from '@ton/core';
 import { LiquidationData, PredictHealthFactorArgs, UserBalance } from '../types/User';
 export declare function mulFactor(decimal: bigint, a: bigint, b: bigint): bigint;
@@ -17,8 +17,27 @@ 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 getAgregatedBalances(assetsData: ExtendedAssetsData, assetsConfig: ExtendedAssetsConfig, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants): AgregatedBalances;
+/**
+ * @deprecated The method should be used only for main contract v5
+ */
+export declare function isV5MainPoolContract(poolConfig: PoolConfig): boolean;
+/**
+ * @deprecated The method should be used only for main contract v5
+ */
+export declare function calculateMaximumWithdrawAmountOld(assetsConfig: ExtendedAssetsConfig, assetsData: ExtendedAssetsData, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants, assetId: bigint): bigint;
+export declare function calculateMaximumWithdrawAmount(//  todo v6 ifelse dust not debt at all is fixed?
+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;
+/**
+ *
+ * @param assetsConfig
+ * @param assetsData
+ * @param principals
+ * @param prices
+ * @param poolConfig
+ * @returns can return UNDEFINED_ASSET if there are no assets
+ */
+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;

package/dist/api/math.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.predictHealthFactor = exports.calculateLiquidationData = exports.presentValue = exports.getAvailableToBorrow = exports.calculateMaximumWithdrawAmount = exports.calculateMaximumWithdrawAmountOld = exports.isV5MainPoolContract = exports.getAgregatedBalances = 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");
+const assets_1 = require("../constants/assets");
+const __1 = require("..");
 function mulFactor(decimal, a, b) {
     return (a * b) / decimal;
 }
@@ -12,8 +14,9 @@ function mulDiv(x, y, z) {
 }
 exports.mulDiv = mulDiv;
 function mulDivC(x, y, z) {
-    const mul = x * y;
-    return mul / z + (mul % z ? 1n : 0n);
+    //const mul = x * y;
+    //return mul / z + (mul % z ? 1n : 0n);
+    return BigInt(Math.ceil(Number(x * y) / Number(z)));
 }
 exports.mulDivC = mulDivC;
 function bigIntMax(...args) {
@@ -102,7 +105,83 @@ function checkNotInDebtAtAll(principals) {
     return principals.values().every(x => x >= 0n);
 }
 exports.checkNotInDebtAtAll = checkNotInDebtAtAll;
-function calculateMaximumWithdrawAmount(assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
+function getAgregatedBalances(assetsData, assetsConfig, principals, prices, masterConstants) {
+    let user_total_supply = 0n;
+    let user_total_borrow = 0n;
+    for (const [assetId, principal] of principals) {
+        if (principal) {
+            if (!prices.has(assetId)) {
+                return { totalSupply: 0n, totalBorrow: 0n };
+            }
+            const price = prices.get(assetId);
+            const assetData = assetsData.get(assetId);
+            const assetConfig = assetsConfig.get(assetId);
+            // console.log('price', price);
+            if (principal < 0) {
+                user_total_borrow += presentValue(assetData.sRate, assetData.bRate, principal, masterConstants).amount * price / 10n ** assetConfig.decimals;
+            }
+            else {
+                user_total_supply += presentValue(assetData.sRate, assetData.bRate, principal, masterConstants).amount * price / 10n ** assetConfig.decimals;
+            }
+            // console.log('aggregated', assetId, presentValue(assetData.sRate, assetData.bRate, principal, masterConstants).type, presentValue(assetData.sRate, assetData.bRate, principal, masterConstants).amount * price / 10n ** assetConfig.decimals)
+        }
+    }
+    return { totalSupply: user_total_supply, totalBorrow: user_total_borrow };
+}
+exports.getAgregatedBalances = getAgregatedBalances;
+/**
+ * @deprecated The method should be used only for main contract v5
+ */
+function isV5MainPoolContract(poolConfig) {
+    if ((poolConfig.masterAddress == __1.MAINNET_POOL_CONFIG.masterAddress && poolConfig.masterVersion == 5) ||
+        (poolConfig.masterAddress == __1.TESTNET_POOL_CONFIG.masterAddress && poolConfig.masterVersion == 5)) {
+        return true;
+    }
+    else {
+        return false;
+    }
+}
+exports.isV5MainPoolContract = isV5MainPoolContract;
+/**
+ * @deprecated The method should be used only for main contract v5
+ */
+function calculateMaximumWithdrawAmountOld(assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
+    let withdrawAmountMax = 0n;
+    const assetConfig = assetsConfig.get(assetId);
+    const assetData = assetsData.get(assetId);
+    const oldPrincipal = principals.get(assetId);
+    const oldPresentValue = presentValue(assetData.sRate, assetData.bRate, oldPrincipal, masterConstants);
+    if (oldPresentValue.amount > assetConfig.dust) {
+        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);
+            const agregatedBalances = getAgregatedBalances(assetsData, assetsConfig, principals, prices, masterConstants);
+            let maxAmountToReclaim = mulDiv(agregatedBalances.totalSupply - mulDivC(agregatedBalances.totalBorrow, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor), 10n ** assetConfig.decimals, price);
+            withdrawAmountMax = bigIntMin(maxAmountToReclaim, oldPresentValue.amount);
+            //console.log('agregatedBalances', agregatedBalances);
+            //console.log('masterConstants.ASSET_COEFFICIENT_SCALE', masterConstants.ASSET_COEFFICIENT_SCALE);
+            //console.log('assetConfig.collateralFactor', assetConfig.collateralFactor);
+            //console.log('sekay', 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.calculateMaximumWithdrawAmountOld = calculateMaximumWithdrawAmountOld;
+function calculateMaximumWithdrawAmount(//  todo v6 ifelse dust not debt at all is fixed?
+assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
     let withdrawAmountMax = 0n;
     const assetConfig = assetsConfig.get(assetId);
     const assetData = assetsData.get(assetId);
@@ -179,62 +258,74 @@ function presentValue(sRate, bRate, principalValue, masterConstants) {
     }
 }
 exports.presentValue = presentValue;
-function calculateLiquidationData(assetsConfig, assetsData, principals, prices, masterConstants) {
-    let gCollateralValue = 0n;
-    let gCollateralAsset = 0n;
-    let gLoanValue = 0n;
-    let gLoanAsset = 0n;
+/**
+ *
+ * @param assetsConfig
+ * @param assetsData
+ * @param principals
+ * @param prices
+ * @param poolConfig
+ * @returns can return UNDEFINED_ASSET if there are no assets
+ */
+function calculateLiquidationData(assetsConfig, assetsData, principals, prices, poolConfig) {
+    let collateralValue = 0n;
+    let collateralAsset = assets_1.UNDEFINED_ASSET;
+    let loanValue = 0n;
+    let loanAsset = assets_1.UNDEFINED_ASSET;
     let totalDebt = 0n;
     let totalLimit = 0n;
-    for (const key of principals.keys()) {
-        const principal = principals.get(key);
-        const assetConfig = assetsConfig.get(key);
-        const assetData = assetsData.get(key);
+    for (const asset of poolConfig.poolAssetsConfig) {
+        if (!principals.has(asset.assetId)) {
+            continue;
+        }
+        const principal = principals.get(asset.assetId);
+        const assetConfig = assetsConfig.get(asset.assetId);
+        const assetData = assetsData.get(asset.assetId);
         const balance = 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) / masterConstants.ASSET_COEFFICIENT_SCALE;
-            if (assetWorth > gCollateralValue) {
-                gCollateralValue = assetWorth;
-                gCollateralAsset = key;
+            const assetWorth = (balance * prices.get(asset.assetId)) / 10n ** assetConfig.decimals;
+            totalLimit += (assetWorth * assetConfig.liquidationThreshold) / poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE;
+            if (assetWorth > collateralValue) {
+                collateralValue = assetWorth;
+                collateralAsset = asset;
             }
         }
         else if (balance < 0) {
-            const assetWorth = (-balance * prices.get(key)) / 10n ** assetConfig.decimals;
+            const assetWorth = (-balance * prices.get(asset.assetId)) / 10n ** assetConfig.decimals;
             totalDebt += assetWorth;
-            if (assetWorth > gLoanValue) {
-                gLoanValue = assetWorth;
-                gLoanAsset = key;
+            if (assetWorth > loanValue) {
+                loanValue = assetWorth;
+                loanAsset = asset;
             }
         }
     }
-    if (totalLimit < totalDebt) {
-        const gLoanAssetPrice = prices.get(gLoanAsset);
+    if (collateralAsset.assetId !== assets_1.UNDEFINED_ASSET.assetId && totalLimit < totalDebt) {
+        const loanAssetPrice = prices.get(loanAsset.assetId);
         const values = [];
-        const gCollateralAssetConfig = assetsConfig.get(gCollateralAsset);
-        const gLoanAssetConfig = assetsConfig.get(gLoanAsset);
-        const liquidationBonus = gCollateralAssetConfig.liquidationBonus;
-        const loanDecimal = 10n ** gLoanAssetConfig.decimals;
-        values.push((bigIntMax(gCollateralValue / 2n, bigIntMin(gCollateralValue, 10000000000n)) *
-            loanDecimal *
-            masterConstants.ASSET_COEFFICIENT_SCALE) /
+        const collateralAssetConfig = assetsConfig.get(collateralAsset.assetId);
+        const loanAssetConfig = assetsConfig.get(loanAsset.assetId);
+        const liquidationBonus = collateralAssetConfig.liquidationBonus;
+        const loanScale = 10n ** loanAssetConfig.decimals;
+        values.push((bigIntMax(collateralValue / 2n, bigIntMin(collateralValue, 100000000000n)) *
+            loanScale *
+            poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE) /
             liquidationBonus /
-            gLoanAssetPrice);
-        values.push((gLoanValue * loanDecimal) / gLoanAssetPrice);
+            loanAssetPrice);
+        values.push((loanValue * loanScale) / loanAssetPrice);
         const liquidationAmount = bigIntMin(...values) - 5n;
-        const gCollateralAssetPrice = prices.get(gCollateralAsset);
-        const collateralDecimal = 10n ** gCollateralAssetConfig.decimals;
-        let minCollateralAmount = (((liquidationAmount * gLoanAssetPrice * liquidationBonus) / 10000n) * collateralDecimal) /
-            gCollateralAssetPrice /
-            loanDecimal -
+        const collateralAssetPrice = prices.get(collateralAsset.assetId);
+        const collateralDecimal = 10n ** collateralAssetConfig.decimals;
+        let minCollateralAmount = (((liquidationAmount * loanAssetPrice * liquidationBonus) / poolConfig.masterConstants.ASSET_LIQUIDATION_BONUS_SCALE) * collateralDecimal) /
+            collateralAssetPrice /
+            loanScale -
             10n;
         minCollateralAmount = (minCollateralAmount * 97n) / 100n;
         if (minCollateralAmount / collateralDecimal >= 1n) {
             return {
-                greatestCollateralAsset: gCollateralAsset,
-                greatestCollateralValue: gCollateralValue,
-                greatestLoanAsset: gLoanAsset,
-                greatestLoanValue: gLoanValue,
+                greatestCollateralAsset: collateralAsset,
+                greatestCollateralValue: collateralValue,
+                greatestLoanAsset: loanAsset,
+                greatestLoanValue: loanValue,
                 totalDebt,
                 totalLimit,
                 liquidable: true,
@@ -244,10 +335,10 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices,
         }
     }
     return {
-        greatestCollateralAsset: gCollateralAsset,
-        greatestCollateralValue: gCollateralValue,
-        greatestLoanAsset: gLoanAsset,
-        greatestLoanValue: gLoanValue,
+        greatestCollateralAsset: collateralAsset,
+        greatestCollateralValue: collateralValue,
+        greatestLoanAsset: loanAsset,
+        greatestLoanValue: loanValue,
         totalDebt,
         totalLimit,
         liquidable: false,
@@ -255,7 +346,7 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices,
 }
 exports.calculateLiquidationData = calculateLiquidationData;
 function predictHealthFactor(args) {
-    const liquidationData = calculateLiquidationData(args.assetsConfig, args.assetsData, args.balances, args.prices, args.masterConstants);
+    const liquidationData = calculateLiquidationData(args.assetsConfig, args.assetsData, args.principals, args.prices, args.poolConfig);
     const tokenHash = (0, sha256BigInt_1.sha256Hash)(args.tokenSymbol);
     const assetConfig = args.assetsConfig.get(tokenHash);
     const assetPrice = Number(args.prices.get(tokenHash));
@@ -267,16 +358,16 @@ function predictHealthFactor(args) {
     const changeType = args.balanceChangeType;
     if (currentAmount != null && currentAmount != 0n) {
         if (changeType == User_1.BalanceChangeType.Borrow) {
-            totalBorrow += currentBalance * (1 + Number(assetConfig.originationFee) / Number(args.masterConstants.ASSET_ORIGINATION_FEE_SCALE));
+            totalBorrow += currentBalance * (1 + Number(assetConfig.originationFee) / Number(args.poolConfig.masterConstants.ASSET_ORIGINATION_FEE_SCALE));
         }
         else if (changeType == User_1.BalanceChangeType.Repay) {
             totalBorrow -= currentBalance;
         }
         else if (changeType == User_1.BalanceChangeType.Withdraw) {
-            totalLimit -= currentBalance * Number(assetConfig.liquidationThreshold) / Number(args.masterConstants.ASSET_COEFFICIENT_SCALE);
+            totalLimit -= currentBalance * Number(assetConfig.liquidationThreshold) / Number(args.poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE);
         }
         else if (changeType == User_1.BalanceChangeType.Supply) {
-            totalLimit += currentBalance * Number(assetConfig.liquidationThreshold) / Number(args.masterConstants.ASSET_COEFFICIENT_SCALE);
+            totalLimit += currentBalance * Number(assetConfig.liquidationThreshold) / Number(args.poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE);
         }
     }
     if (Number(totalLimit) == 0) {

package/dist/api/parser.d.ts

@@ -1,8 +1,8 @@
 import { Dictionary, DictionaryValue } from '@ton/core';
-import { AssetConfig, AssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, MasterData, PoolAssetsConfig } from '../types/Master';
+import { AssetConfig, AssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, MasterData, PoolAssetsConfig, PoolConfig } from '../types/Master';
 import { UserData, UserLiteData } from '../types/User';
 export declare function createAssetData(): DictionaryValue<AssetData>;
 export declare function createAssetConfig(): DictionaryValue<AssetConfig>;
 export declare function parseMasterData(masterDataBOC: string, poolAssetsConfig: PoolAssetsConfig, masterConstants: MasterConstants): MasterData;
-export declare function parseUserLiteData(userDataBOC: string, assetsData: ExtendedAssetsData, assetsConfig: ExtendedAssetsConfig, poolAssetsConfig: PoolAssetsConfig, masterConstants: MasterConstants, testnet?: boolean, applyDust?: boolean): UserLiteData;
-export declare function parseUserData(userLiteData: UserLiteData, assetsData: ExtendedAssetsData, assetsConfig: ExtendedAssetsConfig, prices: Dictionary<bigint, bigint>, poolAssetConfig: PoolAssetsConfig, masterConstants: MasterConstants, applyDust?: boolean): UserData;
+export declare function parseUserLiteData(userDataBOC: string, assetsData: ExtendedAssetsData, assetsConfig: ExtendedAssetsConfig, poolConfig: PoolConfig, applyDust?: boolean): UserLiteData;
+export declare function parseUserData(userLiteData: UserLiteData, assetsData: ExtendedAssetsData, assetsConfig: ExtendedAssetsConfig, prices: Dictionary<bigint, bigint>, poolConfig: PoolConfig, applyDust?: boolean): UserData;

package/dist/api/parser.js

@@ -181,7 +181,9 @@ function parseMasterData(masterDataBOC, poolAssetsConfig, masterConstants) {
     };
 }
 exports.parseMasterData = parseMasterData;
-function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolAssetsConfig, masterConstants, testnet = false, applyDust = false) {
+function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolConfig, applyDust = true) {
+    const poolAssetsConfig = poolConfig.poolAssetsConfig;
+    const masterConstants = poolConfig.masterConstants;
     const userSlice = core_1.Cell.fromBase64(userDataBOC).beginParse();
     const codeVersion = userSlice.loadCoins();
     const masterAddress = userSlice.loadAddress();
@@ -213,14 +215,20 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolAssetsConf
     }
     */
     userSlice.endParse();
+    const isV5Main = (0, math_1.isV5MainPoolContract)(poolConfig);
     const userBalances = core_1.Dictionary.empty();
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
         const assetData = assetsData.get(asset.assetId);
         const assetConfig = assetsConfig.get(asset.assetId);
-        let principals = principalsDict.get(asset.assetId) || 0n;
-        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;
+        let principal = principalsDict.get(asset.assetId) || 0n;
+        let balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principal, masterConstants);
+        let leftBorder = isV5Main ? balance.amount : principal;
+        if (applyDust && (principal > 0 && (leftBorder < assetConfig.dust))) { // v6 will be abs(principals) < dust
+            principal = 0n;
+            balance = {
+                amount: 0n,
+                type: User_1.BalanceType.supply,
+            };
             principalsDict.set(asset.assetId, 0n);
         }
         userBalances.set(asset.assetId, balance);
@@ -244,23 +252,27 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolAssetsConf
     };
 }
 exports.parseUserLiteData = parseUserLiteData;
-function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolAssetConfig, masterConstants, applyDust = false) {
+function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolConfig, applyDust = true) {
+    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 [_, asset] of Object.entries(poolAssetConfig)) {
+    const isV5Main = (0, math_1.isV5MainPoolContract)(poolConfig);
+    for (const [_, asset] of Object.entries(poolAssetsConfig)) {
         const assetData = assetsData.get(asset.assetId);
         const assetConfig = assetsConfig.get(asset.assetId);
-        let principals = userLiteData.principals.get(asset.assetId) || 0n;
-        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;
+        let principal = userLiteData.principals.get(asset.assetId) || 0n;
+        const balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principal, masterConstants);
+        let leftBorder = isV5Main ? balance.amount : principal;
+        if (applyDust && (principal > 0 && (leftBorder < assetConfig.dust))) { // v6 will be abs(principals) < dust
+            principal = 0n;
             userLiteData.principals.set(asset.assetId, 0n);
         }
         userLiteData.balances.set(asset.assetId, balance);
     }
-    for (const [_, asset] of Object.entries(poolAssetConfig)) {
+    for (const [_, asset] of Object.entries(poolAssetsConfig)) {
         const assetConfig = assetsConfig.get(asset.assetId);
         const balance = userLiteData.balances.get(asset.assetId);
         if (balance.type === User_1.BalanceType.supply) {
@@ -271,12 +283,17 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolAsset
         }
     }
     const availableToBorrow = (0, math_1.getAvailableToBorrow)(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants);
-    for (const [_, asset] of Object.entries(poolAssetConfig)) {
+    for (const [_, asset] of Object.entries(poolAssetsConfig)) {
         const assetConfig = assetsConfig.get(asset.assetId);
         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.calculateMaximumWithdrawAmount)(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId));
+            if ((0, math_1.isV5MainPoolContract)(poolConfig)) {
+                withdrawalLimits.set(asset.assetId, (0, math_1.calculateMaximumWithdrawAmountOld)(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId));
+            }
+            else {
+                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));
     }
@@ -284,7 +301,7 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolAsset
     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, masterConstants);
+    const liquidationData = (0, math_1.calculateLiquidationData)(assetsConfig, assetsData, userLiteData.principals, prices, poolConfig);
     const healthFactor = 1 - Number(liquidationData.totalDebt) / Number(liquidationData.totalLimit);
     return {
         ...userLiteData,

package/dist/config.d.ts

@@ -0,0 +1 @@
+export declare const TTL_ORACLE_DATA_SEC = 170;

package/dist/config.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TTL_ORACLE_DATA_SEC = void 0;
+exports.TTL_ORACLE_DATA_SEC = 170; // todo back to 120

package/dist/constants/assets.d.ts

@@ -1,8 +1,7 @@
 import { PoolAssetConfig } from "../types/Master";
+export declare const UNDEFINED_ASSET: PoolAssetConfig;
 export declare const TON_MAINNET: PoolAssetConfig;
-export declare const TON_TESTNET: import("../types/Master").PoolTonAssetConfig & {
-    name: string;
-};
+export declare const TON_TESTNET: PoolAssetConfig;
 export declare const JUSDT_MAINNET: PoolAssetConfig;
 export declare const JUSDC_MAINNET: PoolAssetConfig;
 export declare const STTON_MAINNET: PoolAssetConfig;

package/dist/constants/assets.js

@@ -1,12 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.USDT_STORM_MAINNET = exports.TON_STORM_MAINNET = exports.TONUSDT_DEDUST_MAINNET = exports.STTON_TESTNET = exports.JUSDC_TESTNET = exports.JUSDT_TESTNET = exports.USDT_MAINNET = exports.TSTON_MAINNET = exports.STTON_MAINNET = exports.JUSDC_MAINNET = exports.JUSDT_MAINNET = exports.TON_TESTNET = exports.TON_MAINNET = void 0;
+exports.USDT_STORM_MAINNET = exports.TON_STORM_MAINNET = exports.TONUSDT_DEDUST_MAINNET = exports.STTON_TESTNET = exports.JUSDC_TESTNET = exports.JUSDT_TESTNET = exports.USDT_MAINNET = exports.TSTON_MAINNET = exports.STTON_MAINNET = exports.JUSDC_MAINNET = exports.JUSDT_MAINNET = exports.TON_TESTNET = exports.TON_MAINNET = exports.UNDEFINED_ASSET = void 0;
 const core_1 = require("@ton/core");
 const sha256BigInt_1 = require("../utils/sha256BigInt");
 const general_1 = require("./general");
+exports.UNDEFINED_ASSET = {
+    name: 'undefined_asset',
+    assetId: -1n,
+    jettonMasterAddress: general_1.NULL_ADDRESS, // fake
+    jettonWalletCode: core_1.Cell.EMPTY
+};
 exports.TON_MAINNET = {
     name: 'TON',
-    assetId: (0, sha256BigInt_1.sha256Hash)('TON')
+    assetId: (0, sha256BigInt_1.sha256Hash)('TON'),
+    jettonMasterAddress: general_1.NULL_ADDRESS, // fake
+    jettonWalletCode: core_1.Cell.EMPTY
 };
 exports.TON_TESTNET = exports.TON_MAINNET;
 exports.JUSDT_MAINNET = {

package/dist/constants/general.d.ts

@@ -6,13 +6,14 @@ export declare const MASTER_CONSTANTS: {
     ASSET_RESERVE_FACTOR_SCALE: bigint;
     ASSET_LIQUIDATION_RESERVE_FACTOR_SCALE: bigint;
     ASSET_ORIGINATION_FEE_SCALE: bigint;
+    ASSET_LIQUIDATION_THRESHOLD_SCALE: bigint;
+    ASSET_LIQUIDATION_BONUS_SCALE: bigint;
 };
+export declare const NULL_ADDRESS: Address;
 export declare const EVAA_MASTER_MAINNET: Address;
 export declare const MAINNET_VERSION = 5;
 export declare const EVAA_MASTER_TESTNET: Address;
 export declare const TESTNET_VERSION = 5;
-export declare const EVAA_LP_TESTNET: Address;
-export declare const EVAA_LP_TESTNET_VERSION = 5;
 export declare const EVAA_LP_MAINNET: Address;
 export declare const EVAA_LP_MAINNET_VERSION = 0;
 export declare const MAIN_POOL_NFT_ID = "0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5";

package/dist/constants/general.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FEES = exports.OPCODES = exports.JETTON_WALLET_STANDART_CODE_TESTNET = exports.JETTON_WALLET_STANDART_CODE = exports.LENDING_CODE = exports.LP_POOL_NFT_ID = exports.MAIN_POOL_NFT_ID = exports.EVAA_LP_MAINNET_VERSION = exports.EVAA_LP_MAINNET = exports.EVAA_LP_TESTNET_VERSION = exports.EVAA_LP_TESTNET = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = exports.MASTER_CONSTANTS = void 0;
+exports.FEES = exports.OPCODES = exports.JETTON_WALLET_STANDART_CODE_TESTNET = exports.JETTON_WALLET_STANDART_CODE = exports.LENDING_CODE = exports.LP_POOL_NFT_ID = exports.MAIN_POOL_NFT_ID = exports.EVAA_LP_MAINNET_VERSION = exports.EVAA_LP_MAINNET = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = exports.NULL_ADDRESS = exports.MASTER_CONSTANTS = void 0;
 const core_1 = require("@ton/core");
 exports.MASTER_CONSTANTS = {
     FACTOR_SCALE: BigInt(1e12),
@@ -8,14 +8,15 @@ exports.MASTER_CONSTANTS = {
     ASSET_PRICE_SCALE: BigInt(1e9),
     ASSET_RESERVE_FACTOR_SCALE: 10000n,
     ASSET_LIQUIDATION_RESERVE_FACTOR_SCALE: 10000n,
-    ASSET_ORIGINATION_FEE_SCALE: BigInt(1e9)
+    ASSET_ORIGINATION_FEE_SCALE: BigInt(1e9),
+    ASSET_LIQUIDATION_THRESHOLD_SCALE: 10000n,
+    ASSET_LIQUIDATION_BONUS_SCALE: 10000n,
 };
+exports.NULL_ADDRESS = core_1.Address.parse('UQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJKZ');
 exports.EVAA_MASTER_MAINNET = core_1.Address.parse('EQC8rUZqR_pWV1BylWUlPNBzyiTYVoBEmQkMIQDZXICfnuRr');
 exports.MAINNET_VERSION = 5;
-exports.EVAA_MASTER_TESTNET = core_1.Address.parse('EQCoIxsE8m0Q_Ui9uM-2RPtVWXqHK0ttuW2Mccuaj4FfdkLl');
+exports.EVAA_MASTER_TESTNET = core_1.Address.parse('EQCoIxsE8m0Q_Ui9uM-2RPtVWXqHK0ttuW2Mccuaj4FfdkLl'); // EQBghPVKxgauOyrcyNYNwE2MRRnebaNpDGpVDQLbml_LIXnK
 exports.TESTNET_VERSION = 5;
-exports.EVAA_LP_TESTNET = core_1.Address.parse('EQBghPVKxgauOyrcyNYNwE2MRRnebaNpDGpVDQLbml_LIXnK');
-exports.EVAA_LP_TESTNET_VERSION = 5;
 exports.EVAA_LP_MAINNET = core_1.Address.parse('EQBIlZX2URWkXCSg3QF2MJZU-wC5XkBoLww-hdWk2G37Jc6N');
 exports.EVAA_LP_MAINNET_VERSION = 0;
 exports.MAIN_POOL_NFT_ID = '0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5';

package/dist/constants/pools.d.ts

@@ -1,5 +1,4 @@
 import { PoolConfig } from "../types/Master";
 export declare const MAINNET_POOL_CONFIG: PoolConfig;
 export declare const TESTNET_POOL_CONFIG: PoolConfig;
-export declare const TESTNET_LP_POOL_CONFIG: PoolConfig;
 export declare const MAINNET_LP_POOL_CONFIG: PoolConfig;

package/dist/constants/pools.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAINNET_LP_POOL_CONFIG = exports.TESTNET_LP_POOL_CONFIG = exports.TESTNET_POOL_CONFIG = exports.MAINNET_POOL_CONFIG = void 0;
+exports.MAINNET_LP_POOL_CONFIG = exports.TESTNET_POOL_CONFIG = exports.MAINNET_POOL_CONFIG = void 0;
 const assets_1 = require("./assets");
 const general_1 = require("./general");
 exports.MAINNET_POOL_CONFIG = {
@@ -31,19 +31,6 @@ exports.TESTNET_POOL_CONFIG = {
     ],
     lendingCode: general_1.LENDING_CODE
 };
-exports.TESTNET_LP_POOL_CONFIG = {
-    masterAddress: general_1.EVAA_LP_TESTNET,
-    masterVersion: general_1.EVAA_LP_TESTNET_VERSION,
-    masterConstants: general_1.MASTER_CONSTANTS,
-    nftId: general_1.LP_POOL_NFT_ID,
-    poolAssetsConfig: [
-        assets_1.TON_MAINNET,
-        assets_1.JUSDT_TESTNET,
-        assets_1.JUSDC_TESTNET,
-        assets_1.STTON_TESTNET
-    ],
-    lendingCode: general_1.LENDING_CODE
-};
 exports.MAINNET_LP_POOL_CONFIG = {
     masterAddress: general_1.EVAA_LP_MAINNET,
     masterVersion: general_1.EVAA_LP_MAINNET_VERSION,

package/dist/constants.d.ts

@@ -1,16 +1,16 @@
 import { Address, Cell } from '@ton/core';
+import { OracleNFT } from './types/Master';
 export declare const EVAA_MASTER_MAINNET: Address;
-export declare const MAINNET_VERSION = 5;
+export declare const MAINNET_VERSION = 0;
 export declare const EVAA_MASTER_TESTNET: Address;
-export declare const TESTNET_VERSION = 5;
-export declare const NFT_ID = "0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5";
+export declare const TESTNET_VERSION = 6;
+export declare const ORACLE_NFTS: OracleNFT[];
 export declare const MAINNET_ASSETS_ID: {
     TON: bigint;
     jUSDT: bigint;
     jUSDC: bigint;
     stTON: bigint;
     tsTON: bigint;
-    USDT: bigint;
 };
 export declare const TESTNET_ASSETS_ID: {
     TON: bigint;

package/dist/constants.js

@@ -1,20 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FEES = exports.OPCODES = exports.JETTON_WALLETS_CODE = exports.LENDING_CODE = exports.MASTER_CONSTANTS = exports.JETTON_MASTER_ADDRESSES = exports.TESTNET_ASSETS_ID = exports.MAINNET_ASSETS_ID = exports.NFT_ID = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = void 0;
+exports.FEES = exports.OPCODES = exports.JETTON_WALLETS_CODE = exports.LENDING_CODE = exports.MASTER_CONSTANTS = exports.JETTON_MASTER_ADDRESSES = exports.TESTNET_ASSETS_ID = exports.MAINNET_ASSETS_ID = exports.ORACLE_NFTS = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = void 0;
 const core_1 = require("@ton/core");
 const sha256BigInt_1 = require("./utils/sha256BigInt");
-exports.EVAA_MASTER_MAINNET = core_1.Address.parse('EQC8rUZqR_pWV1BylWUlPNBzyiTYVoBEmQkMIQDZXICfnuRr');
-exports.MAINNET_VERSION = 5;
-exports.EVAA_MASTER_TESTNET = core_1.Address.parse('kQCj7qf3i2Cbf1GVtZCinla7lIvE7l3MBMsJMTfAja3BdoRP');
-exports.TESTNET_VERSION = 5;
-exports.NFT_ID = '0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5';
+//todo set back to EQC8rUZqR_pWV1BylWUlPNBzyiTYVoBEmQkMIQDZXICfnuRr
+exports.EVAA_MASTER_MAINNET = core_1.Address.parse('EQC_hR5L4G3vkPG0VODURYoohp_3hlMW-gZiGp89HwyulZK4');
+//todo set back to 5 (todo set at 6 on 10.10.2024)
+exports.MAINNET_VERSION = 0;
+exports.EVAA_MASTER_TESTNET = core_1.Address.parse('kQC92pF4XWatZY9-ZS6SGW6s-dCpjk9NtEkdXQ7vFHJUAdT9');
+exports.TESTNET_VERSION = 6;
+exports.ORACLE_NFTS = [
+    { id: 0, address: '0xd3a8c0b9fd44fd25a49289c631e3ac45689281f2f8cf0744400b4c65bed38e5d' },
+    { id: 1, address: '0x2c21cabdaa89739de16bde7bc44e86401fac334a3c7e55305fe5e7563043e191' },
+    { id: 2, address: '0x2eb258ce7b5d02466ab8a178ad8b0ba6ffa7b58ef21de3dc3b6dd359a1e16af0' },
+    { id: 3, address: '0xf9a0769954b4430bca95149fb3d876deb7799d8f74852e0ad4ccc5778ce68b52' },
+];
 exports.MAINNET_ASSETS_ID = {
     TON: (0, sha256BigInt_1.sha256Hash)('TON'),
     jUSDT: (0, sha256BigInt_1.sha256Hash)('jUSDT'),
     jUSDC: (0, sha256BigInt_1.sha256Hash)('jUSDC'),
     stTON: (0, sha256BigInt_1.sha256Hash)('stTON'),
     tsTON: (0, sha256BigInt_1.sha256Hash)('tsTON'),
-    USDT: (0, sha256BigInt_1.sha256Hash)('USDT'),
+    //todo uncomment
+    // USDT: sha256Hash('USDT'),
 };
 exports.TESTNET_ASSETS_ID = {
     TON: (0, sha256BigInt_1.sha256Hash)('TON'),