@evaafi/sdk 0.6.0 → 0.6.1

package/src/api/math.ts

@@ -1,9 +1,25 @@
-import { AgregatedBalances, AssetConfig, AssetData, AssetInterest, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, PoolConfig } from '../types/Master';
+import {
+    AgregatedBalances,
+    AssetConfig,
+    AssetData,
+    AssetInterest,
+    ExtendedAssetData,
+    ExtendedAssetsConfig,
+    ExtendedAssetsData,
+    MasterConstants,
+    PoolConfig
+} from '../types/Master';
 import { Dictionary } from '@ton/core';
-import { BalanceChangeType, BalanceType, LiquidationData, PredictHealthFactorArgs, UserBalance } from '../types/User';
-import { sha256Hash } from '../utils/sha256BigInt';
-import { TON_MAINNET, UNDEFINED_ASSET } from '../constants/assets';
-import { MAINNET_POOL_CONFIG, TESTNET_POOL_CONFIG } from '..';
+import {
+    BalanceChangeType,
+    BalanceType,
+    HealthParamsArgs,
+    LiquidationData,
+    PredictHealthFactorArgs,
+    UserBalance
+} from '../types/User';
+import { UNDEFINED_ASSET } from '../constants/assets';
+import { addReserve, isBadDebt } from './liquidation';
 
 export function mulFactor(decimal: bigint, a: bigint, b: bigint): bigint {
     return (a * b) / decimal;
@@ -14,17 +30,25 @@ export function mulDiv(x: bigint, y: bigint, z: bigint): bigint {
 }
 
 export function mulDivC(x: bigint, y: bigint, z: bigint): bigint {
-    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)));
+}
+
+export function bigAbs(value: bigint) {
+    return value > 0n ? value : -value;
 }
 
 export function bigIntMax(...args: bigint[]): bigint {
     return args.reduce((m, e) => (e > m ? e : m));
 }
+
 export function bigIntMin(...args: bigint[]): bigint {
     return args.reduce((m, e) => (e < m ? e : m));
 }
 
+export const BigMath = { mulFactor, mulDiv, mulDivC, abs: bigAbs, min: bigIntMin, max: bigIntMax };
+
 export function calculatePresentValue(index: bigint, principalValue: bigint, masterConstants: MasterConstants): bigint {
     return (principalValue * index) / masterConstants.FACTOR_SCALE;
 }
@@ -44,7 +68,7 @@ export function calculateCurrentRates(assetConfig: AssetConfig, assetData: Asset
             bRate: updatedBRate,
             supplyInterest,
             borrowInterest,
-            now,
+            now
         };
     }
 
@@ -53,7 +77,7 @@ export function calculateCurrentRates(assetConfig: AssetConfig, assetData: Asset
         bRate: assetData.bRate,
         supplyInterest,
         borrowInterest,
-        now,
+        now
     };
 }
 
@@ -81,7 +105,7 @@ export function calculateAssetData(
     return {
         ...data,
         ...{ supplyInterest, borrowInterest },
-        ...{ supplyApy, borrowApy },
+        ...{ supplyApy, borrowApy }
     };
 }
 
@@ -107,19 +131,19 @@ export function calculateAssetInterest(assetConfig: AssetConfig, assetData: Asse
             mulFactor(
                 masterConstants.FACTOR_SCALE,
                 assetConfig.borrowRateSlopeHigh,
-                utilization - assetConfig.targetUtilization,
+                utilization - assetConfig.targetUtilization
             );
     }
 
     supplyInterest = mulDiv(
         mulDiv(borrowInterest, utilization, masterConstants.FACTOR_SCALE),
         masterConstants.ASSET_RESERVE_FACTOR_SCALE - assetConfig.reserveFactor,
-        masterConstants.ASSET_RESERVE_FACTOR_SCALE,
+        masterConstants.ASSET_RESERVE_FACTOR_SCALE
     );
 
     return {
         supplyInterest,
-        borrowInterest,
+        borrowInterest
     };
 }
 
@@ -127,37 +151,36 @@ export function checkNotInDebtAtAll(principals: Dictionary<bigint, bigint>): boo
     return principals.values().every(x => x >= 0n);
 }
 
-export function getAgregatedBalances (
+export function getAgregatedBalances(
     assetsData: ExtendedAssetsData,
     assetsConfig: ExtendedAssetsConfig,
     principals: Dictionary<bigint, bigint>,
     prices: Dictionary<bigint, bigint>,
-    masterConstants: MasterConstants,
-  ): AgregatedBalances {
+    masterConstants: MasterConstants
+): AgregatedBalances {
     let user_total_supply = 0n;
     let user_total_borrow = 0n;
-  
-    for (const [assetId, principal] of principals) {
 
+    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)!;
-  
-        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;
+
+            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};
-  }
+    return { totalSupply: user_total_supply, totalBorrow: user_total_borrow };
+}
 
 export function calculateMaximumWithdrawAmount(
     assetsConfig: ExtendedAssetsConfig,
@@ -165,7 +188,7 @@ export function calculateMaximumWithdrawAmount(
     principals: Dictionary<bigint, bigint>,
     prices: Dictionary<bigint, bigint>,
     masterConstants: MasterConstants,
-    assetId: bigint,
+    assetId: bigint
 ): bigint {
     let withdrawAmountMax = 0n;
 
@@ -175,8 +198,8 @@ export function calculateMaximumWithdrawAmount(
 
     if (oldPrincipal > assetConfig.dust) {
         const oldPresentValue = presentValue(assetData.sRate, assetData.bRate, oldPrincipal, masterConstants);
-        if(checkNotInDebtAtAll(principals)) {
-            withdrawAmountMax = oldPresentValue.amount; 
+        if (checkNotInDebtAtAll(principals)) {
+            withdrawAmountMax = oldPresentValue.amount;
         } else {
             if (!prices.has(assetId)) {
                 return 0n;
@@ -189,17 +212,16 @@ export function calculateMaximumWithdrawAmount(
 
             if (assetConfig.collateralFactor == 0n) {
                 maxAmountToReclaim = oldPresentValue.amount;
-            }
-            else if (price > 0) {
+            } else if (price > 0) {
                 maxAmountToReclaim =
-                    bigIntMax(0n, 
+                    bigIntMax(0n,
                         mulDiv(
                             mulDiv(borrowable, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor),
                             10n ** assetConfig.decimals, price)
                             - calculatePresentValue(assetData.sRate, assetConfig.dust, masterConstants) / 2n
                         );
             }
-          
+
             withdrawAmountMax = bigIntMin(
                 maxAmountToReclaim,
                 oldPresentValue.amount
@@ -234,9 +256,9 @@ export function getAvailableToBorrow(
         const price = prices.get(assetID) as bigint;
         const principal = principals.get(assetID) as bigint;
 
-        if (principal < 0) {
+        if (principal < 0n) {
             borrowAmount += mulDiv(calculatePresentValue(assetData.bRate, -principal, masterConstants), price, 10n ** assetConfig.decimals);
-        } else if (principal > 0) {
+        } else if (principal > 0n) {
             borrowLimit +=
                 mulDiv(
                     mulDiv(calculatePresentValue(assetData.sRate, principal, masterConstants), price, 10n ** assetConfig.decimals),
@@ -248,32 +270,96 @@ export function getAvailableToBorrow(
     return borrowLimit - borrowAmount;
 }
 
+/**
+ * Calculates balance value for asset principal.
+ * @param sRate asset supply rate
+ * @param bRate asset borrow rate
+ * @param principalValue asset principal value
+ * @param masterConstants pool constants
+ */
 export function presentValue(sRate: bigint, bRate: bigint, principalValue: bigint, masterConstants: MasterConstants): UserBalance {
     if (principalValue > 0) {
         return {
             amount: calculatePresentValue(sRate, principalValue, masterConstants),
-            type: BalanceType.supply,
+            type: BalanceType.supply
         };
     } else if (principalValue < 0) {
         return {
             amount: calculatePresentValue(bRate, -principalValue, masterConstants),
-            type: BalanceType.borrow,
+            type: BalanceType.borrow
         };
     } else {
         return {
             amount: 0n,
-            type: undefined,
+            type: undefined
         };
     }
 }
 
 /**
- * 
- * @param assetsConfig 
- * @param assetsData 
- * @param principals 
- * @param prices 
- * @param poolConfig 
+ * Calculates health parameters of the specified user account based on its parameters
+ * @param parameters
+ */
+export function calculateHealthParams(parameters: HealthParamsArgs) {
+    const {
+        principals, prices,
+        assetsData, assetsConfig,
+        poolConfig
+    } = parameters;
+
+    const { ASSET_LIQUIDATION_THRESHOLD_SCALE } = poolConfig.masterConstants;
+
+    let totalSupply = 0n;
+    let totalDebt = 0n;
+    let totalLimit = 0n;
+
+    for (const asset of poolConfig.poolAssetsConfig) {
+        if (!principals.has(asset.assetId)) continue;
+        const assetPrincipal = principals.get(asset.assetId)!;
+
+        if (!assetsConfig.has(asset.assetId)) throw (`No config for ${asset.name}:${asset.assetId}`);
+        const assetConfig = assetsConfig.get(asset.assetId)!;
+
+        if (!assetsData.has(asset.assetId)) throw (`No data for asset ${asset.name}:${asset.assetId}`);
+        const assetData = assetsData.get(asset.assetId)!;
+
+        if (!prices.has(asset.assetId)) throw (`No price for asset ${asset.name}:${asset.assetId}`);
+        const assetPrice = prices.get(asset.assetId)! as bigint;
+        const assetScale = 10n ** assetConfig.decimals;
+
+        const { sRate, bRate } = assetData;
+        const assetBalance = presentValue(sRate, bRate, assetPrincipal, poolConfig.masterConstants);
+        const assetWorth = assetBalance.amount * assetPrice / assetScale;
+        if (assetBalance.type === BalanceType.supply) {
+            totalSupply += assetWorth;
+            totalLimit += assetWorth * assetConfig.liquidationThreshold / ASSET_LIQUIDATION_THRESHOLD_SCALE;
+        } else if (assetBalance.type === BalanceType.borrow) {
+            totalDebt += assetWorth;
+        }
+    }
+
+    const _isLiquidable = totalLimit < totalDebt;
+
+    // the `bad debt` condition depends on certain asset's liquidation bonus parameter
+    // , so it is not a user constant, but depends on certain asset
+    const _isBadDebt = (liquidationBonus: bigint): boolean => {
+        return isBadDebt(totalSupply, totalDebt, liquidationBonus, poolConfig.masterConstants) as boolean;
+    };
+
+    return {
+        totalDebt, totalLimit, totalSupply,
+        isLiquidatable: _isLiquidable,
+        isBadDebt: _isBadDebt
+    };
+}
+
+/**
+ * Calculates liquidation data for greatest loan and collateral assets
+ * @param assetsConfig assets config dictionary
+ * @param assetsData assets data dictionary
+ * @param principals principals dictionary
+ * @param prices prices dictionary
+ * @param poolConfig pool config
  * @returns can return UNDEFINED_ASSET if there are no assets
  */
 export function calculateLiquidationData(
@@ -281,7 +367,7 @@ export function calculateLiquidationData(
     assetsData: ExtendedAssetsData,
     principals: Dictionary<bigint, bigint>,
     prices: Dictionary<bigint, bigint>,
-    poolConfig: PoolConfig,
+    poolConfig: PoolConfig
 ): LiquidationData {
     let collateralValue = 0n;
     let collateralAsset = UNDEFINED_ASSET;
@@ -290,25 +376,31 @@ export function calculateLiquidationData(
     let totalDebt = 0n;
     let totalLimit = 0n;
 
+    const {
+        ASSET_SRATE_SCALE, ASSET_BRATE_SCALE,
+        COLLATERAL_WORTH_THRESHOLD
+    } = poolConfig.masterConstants;
+
     for (const asset of poolConfig.poolAssetsConfig) {
-        if (!principals.has(asset.assetId)) {
-            continue;
-        }
         const principal = principals.get(asset.assetId)!;
+        if (!principal) continue;
         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);
+        const balance = principal > 0 ?
+            (principal * assetData.sRate) / ASSET_SRATE_SCALE :
+            (principal * assetData.bRate) / ASSET_BRATE_SCALE;
+
+        const assetWorth = (bigAbs(balance) * prices.get(asset.assetId)!) / 10n ** assetConfig.decimals;
         if (balance > 0) {
-            const assetWorth = (balance * prices.get(asset.assetId)!) / 10n ** assetConfig.decimals;
             totalLimit += (assetWorth * assetConfig.liquidationThreshold) / poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE;
+            // get the greatest collateral
             if (assetWorth > collateralValue) {
                 collateralValue = assetWorth;
                 collateralAsset = asset;
             }
         } else if (balance < 0) {
-            const assetWorth = (-balance * prices.get(asset.assetId)!) / 10n ** assetConfig.decimals;
             totalDebt += assetWorth;
+            // get the greatest loan
             if (assetWorth > loanValue) {
                 loanValue = assetWorth;
                 loanAsset = asset;
@@ -324,11 +416,11 @@ export function calculateLiquidationData(
         const liquidationBonus = collateralAssetConfig.liquidationBonus;
         const loanScale = 10n ** loanAssetConfig.decimals;
         values.push(
-            (bigIntMax(collateralValue / 2n, bigIntMin(collateralValue, 100_000_000_000n)) *
+            (bigIntMax(collateralValue / 2n, bigIntMin(collateralValue, COLLATERAL_WORTH_THRESHOLD)) *
                 loanScale *
                 poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE) /
-                liquidationBonus /
-                loanAssetPrice,
+            liquidationBonus /
+            loanAssetPrice
         );
         values.push((loanValue * loanScale) / loanAssetPrice);
 
@@ -337,11 +429,11 @@ export function calculateLiquidationData(
         const collateralDecimal = 10n ** collateralAssetConfig.decimals;
         let minCollateralAmount =
             (((liquidationAmount * loanAssetPrice * liquidationBonus) / poolConfig.masterConstants.ASSET_LIQUIDATION_BONUS_SCALE) * collateralDecimal) /
-                collateralAssetPrice /
-                loanScale -
+            collateralAssetPrice /
+            loanScale -
             10n;
         minCollateralAmount = (minCollateralAmount * 97n) / 100n;
-        if (minCollateralAmount / collateralDecimal >= 0n) {  // todo back to 1
+        if (minCollateralAmount > 0n) {
             return {
                 greatestCollateralAsset: collateralAsset,
                 greatestCollateralValue: collateralValue,
@@ -350,8 +442,8 @@ export function calculateLiquidationData(
                 totalDebt,
                 totalLimit,
                 liquidable: true,
-                liquidationAmount,
-                minCollateralAmount,
+                liquidationAmount: addReserve(liquidationAmount, loanAssetConfig.liquidationReserveFactor, poolConfig.masterConstants.ASSET_RESERVE_FACTOR_SCALE),
+                minCollateralAmount
             };
         }
     }
@@ -363,28 +455,29 @@ export function calculateLiquidationData(
         greatestLoanValue: loanValue,
         totalDebt,
         totalLimit,
-        liquidable: false,
+        liquidable: false
     };
 }
 
 export function predictHealthFactor(args: PredictHealthFactorArgs): number {
-    const liquidationData = calculateLiquidationData(args.assetsConfig, args.assetsData, args.principals, args.prices, args.poolConfig);
+    const healthParams = calculateHealthParams(args);
     const assetId = args.asset.assetId;
-    
+
     const assetConfig = args.assetsConfig.get(assetId)!;
     const assetPrice = Number(args.prices.get(assetId)!);
-   
-    let totalLimit = Number(liquidationData.totalLimit);
-    let totalBorrow = Number(liquidationData.totalDebt);
+const assetData = args.assetsData.get(assetId)!;
+
+    let totalLimit = Number(healthParams.totalLimit);
+    let totalBorrow = Number(healthParams.totalDebt);
 
     const currentAmount = args.amount;
 
-    const decimals = Number(assetConfig.decimals)
+    const decimals = Number(assetConfig.decimals);
 
     const currentBalance = assetPrice * Number(currentAmount) / Math.pow(10, decimals);
     const changeType = args.balanceChangeType;
 
-    if (currentAmount != null && currentAmount != 0n) { 
+    if (currentAmount != null && currentAmount != 0n) {
         if (changeType == BalanceChangeType.Borrow) {
             totalBorrow += currentBalance * (1 + Number(assetConfig.originationFee) / Number(args.poolConfig.masterConstants.ASSET_ORIGINATION_FEE_SCALE));
         } else if (changeType == BalanceChangeType.Repay) {

package/src/api/parser.ts

@@ -347,7 +347,10 @@ export function parseUserData(
             : Number(BigInt(1e9) - (availableToBorrow * BigInt(1e9)) / (borrowBalance + availableToBorrow)) / 1e7;
 
     const liquidationData = calculateLiquidationData(assetsConfig, assetsData, userLiteData.principals, prices, poolConfig);
-    const healthFactor = 1 - Number(liquidationData.totalDebt) / Number(liquidationData.totalLimit);
+    let healthFactor = 1;
+    if (liquidationData.totalLimit != 0n) {
+        healthFactor = 1 - Number(liquidationData.totalDebt) / Number(liquidationData.totalLimit);
+    } 
 
     return {
         ...userLiteData,

package/src/constants/assets.ts

@@ -3,6 +3,19 @@ import { PoolAssetConfig } from "../types/Master";
 import { sha256Hash } from "../utils/sha256BigInt";
 import { JETTON_WALLET_STANDART_CODE, JETTON_WALLET_STANDART_CODE_TESTNET, NULL_ADDRESS } from "./general";
 
+export const ASSET_ID = {
+    TON:            sha256Hash('TON'),
+    USDT:           sha256Hash('USDT'),
+    jUSDT:          sha256Hash('jUSDT'),
+    jUSDC:          sha256Hash('jUSDC'),
+    stTON:          sha256Hash('stTON'),
+    tsTON:          sha256Hash('tsTON'),
+    TONUSDT_DEDUST: sha256Hash('TONUSDT_DEDUST'),
+    TONUSDT_STONFI: sha256Hash('TONUSDT_STONFI'),
+    TON_STORM:      sha256Hash('TON_STORM'),
+    USDT_STORM:     sha256Hash('USDT_STORM'),
+};
+
 export const UNDEFINED_ASSET: PoolAssetConfig = { 
     name: 'undefined_asset',
     assetId: -1n,
@@ -12,7 +25,7 @@ export const UNDEFINED_ASSET: PoolAssetConfig = {
 
 export const TON_MAINNET: PoolAssetConfig = { 
     name: 'TON',
-    assetId: sha256Hash('TON'),
+    assetId: ASSET_ID.TON,
     jettonMasterAddress: NULL_ADDRESS,  // fake
     jettonWalletCode: Cell.EMPTY 
 }
@@ -20,21 +33,21 @@ export const TON_TESTNET = TON_MAINNET;
 
 export const JUSDT_MAINNET: PoolAssetConfig = { 
     name: 'jUSDT',
-    assetId: sha256Hash('jUSDT'), 
+    assetId: ASSET_ID.jUSDT,
     jettonMasterAddress: Address.parse('EQBynBO23ywHy_CgarY9NK9FTz0yDsG82PtcbSTQgGoXwiuA'),
     jettonWalletCode: JETTON_WALLET_STANDART_CODE
 }
 
 export const JUSDC_MAINNET: PoolAssetConfig = { 
     name: 'jUSDC',
-    assetId: sha256Hash('jUSDC'), 
+    assetId: ASSET_ID.jUSDC,
     jettonMasterAddress: Address.parse('EQB-MPwrd1G6WKNkLz_VnV6WqBDd142KMQv-g1O-8QUA3728'),
     jettonWalletCode: JETTON_WALLET_STANDART_CODE
 }
 
 export const STTON_MAINNET: PoolAssetConfig = { 
     name: 'stTON',
-    assetId: sha256Hash('stTON'), 
+    assetId: ASSET_ID.stTON,
     jettonMasterAddress: Address.parse('EQDNhy-nxYFgUqzfUzImBEP67JqsyMIcyk2S5_RwNNEYku0k'),
     jettonWalletCode: Cell.fromBase64(
         'te6cckECEgEAA2IAART/APSkE/S88sgLAQIBYgIDAgLMBAUAG6D2BdqJofQB9IH0gahhAgHUBgcCASAJCgHPCDHAJJfBOAB0NMDAXGwlRNfA/AN4PpA+kAx+gAxcdch+gAx+gAwc6m0AALTHyGCEA+KfqW6lTE0WfAK4CGCEBeNRRm6ljFERAPwC+AhghBZXwe8upUxNFnwDOAUXwTABOMCMIQP8vCAIABE+kQwwADy4U2AAfO1E0PoA+kD6QNQwECNfAwGCCJiWgKFtgBByIm6zIJFxkXDiA8jLBVAGzxZQBPoCy2oDk1jMAZEw4gHJAfsAAgFYCwwCAUgQEQHxAPTP/oA+kAh8AHtRND6APpA+kDUMFE2oVIqxwXy4sEowv/y4sJUNEJwVCATVBQDyFAE+gJYzxYBzxbMySLIywES9AD0AMsAySD5AHB0yMsCygfL/8nQBPpA9AQx+gAg10nCAPLixHeAGMjLBVAIzxZw+gIXy2sTzIA0C9ztRND6APpA+kDUMAjTP/oAUVGgBfpA+kBTW8cFVHNtcFQgE1QUA8hQBPoCWM8WAc8WzMkiyMsBEvQA9ADLAMn5AHB0yMsCygfL/8nQUA3HBRyx8uLDCvoAUaihggiYloBmtgihggjk4cCgGKEnlxBJEDg3XwTjDSXXCwGAODwCeghAXjUUZyMsfGcs/UAf6AiLPFlAGzxYl+gJQA88WyVAFzCORcpFx4lAIqBOgggpiWgCgFLzy4sUEyYBA+wAQI8hQBPoCWM8WAc8WzMntVABwUnmgGKGCEHNi0JzIyx9SMMs/WPoCUAfPFlAHzxbJcYAQyMsFJM8WUAb6AhXLahTMyXH7ABAkECMAfMMAI8IAsI4hghDVMnbbcIAQyMsFUAjPFlAE+gIWy2oSyx8Syz/JcvsAkzVsIeIDyFAE+gJYzxYBzxbMye1UAMkMO1E0PoA+kD6QNQwBtM/+gAwUUShUjfHBfLiwSXC//LiwgSCC5OHAL7y4sWCEHvdl97Iyx8Uyz9Y+gIhzxbJcYAYyMsFJM8WcPoCy2rMyYBA+wBAE8hQBPoCWM8WAc8WzMntVIACBIAg1yHtRND6APpA+kDUMATTHyGCEBeNRRm6AoIQe92X3roSsfLgyNM/MfoAMBOgUCPIUAT6AljPFgHPFszJ7VSBpMmqD'
@@ -43,7 +56,7 @@ export const STTON_MAINNET: PoolAssetConfig = {
 
 export const TSTON_MAINNET: PoolAssetConfig = { 
     name: 'tsTON',
-    assetId: sha256Hash('tsTON'), 
+    assetId: ASSET_ID.tsTON,
     jettonMasterAddress: Address.parse('EQC98_qAmNEptUtPc7W6xdHh_ZHrBUFpw5Ft_IzNU20QAJav'),
     jettonWalletCode: Cell.fromBase64(
         'te6cckECIQEAB38AART/APSkE/S88sgLAQIBYgIDAgLLBAUCASAWFwSz0IMcAkl8E4AHQ0wMBcbCOhRNfA9s84PpA+kAx+gAx9AQx+gAx+gAwc6m0AALTHwEgghAPin6luo6FMDRZ2zzgIIIQF41FGbqOhjBERAPbPOA1JIIQWV8HvLqBgcICQATov0iGGAAeXCmwADCgCDXIe1E0PoA+kD6QNT6ANMvMCD4I7mXMBSgcFQUAN4G0x8BggD/8CGCEBeNRRm6AoIQe92X3roSsfL00z8BMPoAMBWgBRA0QTDIUAb6AlAEzxZYzxbMAfoCAQHLL8ntVAL2A9M/AQH6APpAIfAV7UTQ+gD6QPpA1PoA0y8wIPgjuZcwFKBwVBQA3lFYoVJMxwXy4sEqwv/y4sJUNiFwVHAAJBA1EEcQNlnIUAb6AlAEzxZYzxbMAfoCAQHLL8kiyMsBEvQA9ADLAMkg2zwG+kD0BDH6ACDXScIA8uLEGwoC9u1E0PoA+kD6QNT6ANMvMCD4I7mXMBSgcFQUAN4lnSLXZZjII9DPFsn7BN/fCtM/AQH6AFFxoAf6QPpAU33HBVRzh3BUcAAkEDUQRxA2WchQBvoCUATPFljPFswB+gIBAcsvySLIywES9AD0AMsAyds8UA/HBR6x8uLDDBsLA/6OhDRZ2zzgbCLtRND6APpA+kDU+gDTLzAg+CO5lzAUoHBUFADeKIIQbY5ePLqOPRBFXwUzUiLHBfLiwYIImJaAcPsCyIAQAcsFWM8WcPoCcAHLaoIQ1TJ22wHLHwHTPwESAcs/AdHJgQCC+wDgKIIQdopQsrrjAiiCEGn7MGy6DQ4PANzIghAXjUUZAcsfUAwByz9QCvoCJc8WAc8WKPoCUAnPFsnIgBgBywVQBs8WcPoCQIV3UAPLa8zMJZFykXHiUAqoFaCCCfeKQKAWvPLixQbJgED7AFAEBQPIUAb6AlAEzxZYzxbMAfoCAQHLL8ntVAH4+gBRyqEhjjlSHKAaociCEHNi0JwByx8kAcs/UAP6AgHPFlAKzxbJyIAQAcsFJs8WUAj6AlAHcVjLaszJcfsAEFeVEEw7XwTiBoIImJaAtgly+wIn1wsBwwAFwgAVsJI1NeMNUCXIUAb6AlAEzxZYzxbMAfoCAQHLL8ntVAwATsiAEAHLBVAHzxZw+gJwActqghDVMnbbAcsfUAUByz/JgQCC+wAQNAH27UTQ+gD6QPpA1PoA0y8wIPgjuZcwFKBwVBQA3gnTPwEB+gD6QPQEMFGCoVJ8xwXy4sEqwv/y4sIIggle88CgghAstBeAoBm88uLHyIIQe92X3gHLHwEByz9QB/oCI88WUAXPFhP0AMnIgBgBywUjzxZw+gIBcVjLaszJEACkEEVfBTNSIscF8uLB0z8BAfpA+gD0BNHIgBgBywVQA88WcPoCyIIQD4p+pQHLH1AEAcs/AfoCI88WUAPPFhL0AHD6AnABygDJcVjLaszJgED7AAT+4wJfAzIkghAxjv8Xuo5YNFrHBfLixgHTPwEB0z8BMNMvAQHUgQ8Q+COCCCeNAKAkvPL0+CMjufLg+dHIgBgBywVQBM8WcPoCcAHLaoIQHH+aGgHLH1gByz8BAcsvzHAByz/JgED7AOAkgguaN0664wIEghDDnwvmuuMCXwSEDxESExQAPIBA+wAEUDXIUAb6AlAEzxZYzxbMAfoCAQHLL8ntVAP+OFI3xwXy4sYE0z8BAfpA0y8BgQ8Q+COCCCeNAKAivPL0+CMhufLg+QHSAAEB0gABAdH4KIhBUAJwAshYzxYBzxZw+gJw+gLJIcjLARP0ABL0AMsAySDbPFCooCJwDLYJyIAYAcsFUAnPFiv6AlAKdljLa8yCECvWNwQByx9QBBobFQBcNFjHBfLixtM/AQHRyIAQAcsFWM8WcPoCcAHLaoIQX+m4ygHLHwEByz/JgED7AABmWMcF8uLG0z8BAfpA0ciAEAHLBVADzxZw+gJwActqghAsy6AGAcsfAQHLPwHPFsmAQPsAAATy8ABmAcs/Jc8WAQHLLyf6AlgBygABAcoAyYBA+wBDQ8hQBvoCUATPFljPFswB+gIBAcsvye1UAgFYGBkAPb9rz2omh9AH0gfSBqfQBpl5gQfBHcy5gKUDgqCgBvQCTbQCXwURAkBOAFkLGeLAOeLOH0BOH0BZJDkZYCJ+gAJegBlgGTtnkBobAD+3YF2omh9AH0gfSBqfQBpl5gQfBHcy5gKUDgqCgBvLcAEU/wD0pBP0vPLICxwAHPkAdMjLAnABygfL/8nQAgFiHR4BQtAzMdDTAwFxsJFb4PpAMAHTHwGCECvWNwS64wJbhA/y8B8AHaFxl9qJofSB9IH0AfQAYQH+7UTQ+kD6QPoA+gAwUjbHBfLh9APTPwEB+kDTLwEB+gDSAAEB0gABMVEooSmhIZNRiKCVUZmgCQjiKML/8uH1ggiYloBw+wImEDhAGshQBM8WWM8WAfoCAfoCye1UyIAQAcsFUATPFnD6AnABy2qCEG7bGIkByx9YAcs/Ac8WASAAJgHLL1j6AlgBygABAcoAyYMG+wDZ+GMW'
@@ -52,7 +65,7 @@ export const TSTON_MAINNET: PoolAssetConfig = {
 
 export const USDT_MAINNET: PoolAssetConfig = { 
     name: 'USDT',
-    assetId: sha256Hash('USDT'), 
+    assetId: ASSET_ID.USDT,
     jettonMasterAddress: Address.parse('EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs'),
     jettonWalletCode: Cell.fromBoc(
         Buffer.from(
@@ -64,21 +77,21 @@ export const USDT_MAINNET: PoolAssetConfig = {
 
 export const JUSDT_TESTNET: PoolAssetConfig = { 
     name: 'jUSDT',
-    assetId: sha256Hash('jUSDT'), 
+    assetId: ASSET_ID.jUSDT,
     jettonMasterAddress: Address.parse('kQBe4gtSQMxM5RpMYLr4ydNY72F8JkY-icZXG1NJcsju8XM7'),
     jettonWalletCode: JETTON_WALLET_STANDART_CODE_TESTNET
 }
 
 export const JUSDC_TESTNET: PoolAssetConfig = { 
     name: 'jUSDC',
-    assetId: sha256Hash('jUSDC'), 
+    assetId: ASSET_ID.jUSDC,
     jettonMasterAddress: Address.parse('kQDaY5yUatYnHei73HBqRX_Ox9LK2XnR7XuCY9MFC2INbfYI'),
     jettonWalletCode: JETTON_WALLET_STANDART_CODE_TESTNET
 }
 
 export const STTON_TESTNET: PoolAssetConfig = { 
     name: 'stTON',
-    assetId: sha256Hash('stTON'), 
+    assetId: ASSET_ID.stTON,
     jettonMasterAddress: Address.parse('kQC3Duw3dg8k98xf5S7Bm7YOWVJ5QW8hm3iLqFfJfa_g9h07'),
     jettonWalletCode: Cell.fromBoc(
         Buffer.from(
@@ -90,7 +103,7 @@ export const STTON_TESTNET: PoolAssetConfig = {
 
 export const TONUSDT_DEDUST_MAINNET: PoolAssetConfig = {
     name: 'TONUSDT_DEDUST',
-    assetId: sha256Hash('TONUSDT_DEDUST'), 
+    assetId: ASSET_ID.TONUSDT_DEDUST,
     jettonMasterAddress: Address.parse('EQA-X_yo3fzzbDbJ_0bzFWKqtRuZFIRa1sJsveZJ1YpViO3r'),
     jettonWalletCode: Cell.fromBoc(
         Buffer.from(
@@ -102,7 +115,7 @@ export const TONUSDT_DEDUST_MAINNET: PoolAssetConfig = {
 
 export const TON_STORM_MAINNET: PoolAssetConfig = { 
     name: 'TON_STORM',
-    assetId: sha256Hash('TON_STORM'), 
+    assetId: ASSET_ID.TON_STORM,
     jettonMasterAddress: Address.parse('EQCNY2AQ3ZDYwJAqx_nzl9i9Xhd_Ex7izKJM6JTxXRnO6n1F'),
     jettonWalletCode: Cell.fromBoc(
         Buffer.from(
@@ -110,11 +123,12 @@ export const TON_STORM_MAINNET: PoolAssetConfig = {
             'hex',
         ),
     )[0],
+
 }
 
 export const USDT_STORM_MAINNET: PoolAssetConfig = { 
     name: 'USDT_STORM',
-    assetId: sha256Hash('USDT_STORM'), 
+    assetId: ASSET_ID.USDT_STORM,
     jettonMasterAddress: Address.parse('EQCup4xxCulCcNwmOocM9HtDYPU8xe0449tQLp6a-5BLEegW'),
     jettonWalletCode: Cell.fromBoc(
         Buffer.from(

package/src/constants/general.ts

@@ -2,15 +2,21 @@ import { Address, Cell, toNano } from '@ton/core';
 import { sha256Hash } from '../utils/sha256BigInt';
 import { OracleNFT } from '../types/Master';
 
+
+const ASSET_PRICE_SCALE = BigInt(1e9);
+
 export const MASTER_CONSTANTS = {
     FACTOR_SCALE: BigInt(1e12),
     ASSET_COEFFICIENT_SCALE: 10000n,
-    ASSET_PRICE_SCALE: BigInt(1e9),
+    ASSET_PRICE_SCALE,
     ASSET_RESERVE_FACTOR_SCALE: 10000n,
     ASSET_LIQUIDATION_RESERVE_FACTOR_SCALE: 10000n,
     ASSET_ORIGINATION_FEE_SCALE: BigInt(1e9),
     ASSET_LIQUIDATION_THRESHOLD_SCALE: 10_000n,
     ASSET_LIQUIDATION_BONUS_SCALE: 10_000n,
+    ASSET_SRATE_SCALE: BigInt(1e12),
+    ASSET_BRATE_SCALE: BigInt(1e12),
+    COLLATERAL_WORTH_THRESHOLD: 100n * ASSET_PRICE_SCALE, // literally 100$
 };
 
 export const NULL_ADDRESS = Address.parse('UQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJKZ');

package/src/constants/pools.ts

@@ -46,7 +46,7 @@ export const MAINNET_LP_POOL_CONFIG: PoolConfig = {
         USDT_MAINNET,
         TONUSDT_DEDUST_MAINNET,
         TON_STORM_MAINNET,
-        USDT_STORM_MAINNET,
+        USDT_STORM_MAINNET
     ],
     lendingCode: LENDING_CODE
 };