@evaafi/sdk 0.5.5 → 0.5.6

package/dist/utils/merkleProof.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertToMerkleProof = convertToMerkleProof;
+exports.generateMerkleProofDirect = generateMerkleProofDirect;
+exports.generateMerkleProof = generateMerkleProof;
+const core_1 = require("@ton/core");
+function readUnaryLength(slice) {
+    let res = 0;
+    while (slice.loadBit()) {
+        res++;
+    }
+    return res;
+}
+function endExoticCell(b) {
+    let c = b.endCell();
+    return new core_1.Cell({ exotic: true, bits: c.bits, refs: c.refs });
+}
+function convertToMerkleProof(c) {
+    return endExoticCell((0, core_1.beginCell)()
+        .storeUint(3, 8)
+        .storeBuffer(c.hash(0))
+        .storeUint(c.depth(0), 16)
+        .storeRef(c));
+}
+function convertToPrunedBranch(c) {
+    return endExoticCell((0, core_1.beginCell)()
+        .storeUint(1, 8)
+        .storeUint(1, 8)
+        .storeBuffer(c.hash(0))
+        .storeUint(c.depth(0), 16));
+}
+function doGenerateMerkleProof(prefix, slice, n, keys) {
+    // Reading label
+    const originalCell = slice.asCell();
+    if (keys.length == 0) {
+        // no keys to prove, prune the whole subdict
+        return convertToPrunedBranch(originalCell);
+    }
+    let lb0 = slice.loadBit() ? 1 : 0;
+    let prefixLength = 0;
+    let pp = prefix;
+    if (lb0 === 0) {
+        // Short label detected
+        // Read
+        prefixLength = readUnaryLength(slice);
+        // Read prefix
+        for (let i = 0; i < prefixLength; i++) {
+            pp += slice.loadBit() ? '1' : '0';
+        }
+    }
+    else {
+        let lb1 = slice.loadBit() ? 1 : 0;
+        if (lb1 === 0) {
+            // Long label detected
+            prefixLength = slice.loadUint(Math.ceil(Math.log2(n + 1)));
+            for (let i = 0; i < prefixLength; i++) {
+                pp += slice.loadBit() ? '1' : '0';
+            }
+        }
+        else {
+            // Same label detected
+            let bit = slice.loadBit() ? '1' : '0';
+            prefixLength = slice.loadUint(Math.ceil(Math.log2(n + 1)));
+            for (let i = 0; i < prefixLength; i++) {
+                pp += bit;
+            }
+        }
+    }
+    if (n - prefixLength === 0) {
+        return originalCell;
+    }
+    else {
+        let sl = originalCell.beginParse();
+        let left = sl.loadRef();
+        let right = sl.loadRef();
+        // NOTE: Left and right branches are implicitly contain prefixes '0' and '1'
+        if (!left.isExotic) {
+            const leftKeys = keys.filter((key) => {
+                return pp + '0' === key.slice(0, pp.length + 1);
+            });
+            left = doGenerateMerkleProof(pp + '0', left.beginParse(), n - prefixLength - 1, leftKeys);
+        }
+        if (!right.isExotic) {
+            const rightKeys = keys.filter((key) => {
+                return pp + '1' === key.slice(0, pp.length + 1);
+            });
+            right = doGenerateMerkleProof(pp + '1', right.beginParse(), n - prefixLength - 1, rightKeys);
+        }
+        return (0, core_1.beginCell)()
+            .storeSlice(sl)
+            .storeRef(left)
+            .storeRef(right)
+            .endCell();
+    }
+}
+function generateMerkleProofDirect(dict, keys, keyObject) {
+    keys.forEach((key) => {
+        if (!dict.has(key)) {
+            throw new Error(`Trying to generate merkle proof for a missing key "${key}"`);
+        }
+    });
+    const s = (0, core_1.beginCell)().storeDictDirect(dict).asSlice();
+    return doGenerateMerkleProof('', s, keyObject.bits, keys.map((key) => keyObject.serialize(key).toString(2).padStart(keyObject.bits, '0')));
+}
+function generateMerkleProof(dict, keys, keyObject) {
+    return convertToMerkleProof(generateMerkleProofDirect(dict, keys, keyObject));
+}

package/dist/utils/priceUtils.d.ts

@@ -0,0 +1,55 @@
+import { Cell, Dictionary, Slice } from "@ton/core";
+import { PriceData, RawPriceData } from "../types/Common";
+import { Oracle, PoolAssetsConfig } from "../types/Master";
+import 'promise.any';
+type OutputData = {
+    metadata: {
+        blockId: string;
+        transactionId: string;
+        outputIndex: number;
+        isSpent: boolean;
+        milestoneIndexSpent: number;
+        milestoneTimestampSpent: number;
+        transactionIdSpent: string;
+        milestoneIndexBooked: number;
+        milestoneTimestampBooked: number;
+        ledgerIndex: number;
+    };
+    output: {
+        type: number;
+        amount: string;
+        nftId: string;
+        unlockConditions: {
+            type: number;
+            address: {
+                type: number;
+                pubKeyHash: string;
+            };
+        }[];
+        features: {
+            type: number;
+            data: string;
+        }[];
+    };
+};
+export type OraclePricesData = {
+    timestamp: number;
+    prices: Dictionary<bigint, bigint>;
+};
+export declare function loadPrices(oracleNftId: String, endpoints: String[], timeout: number): Promise<OutputData>;
+export declare function parsePrices(outputData: OutputData, oracleId: number): Promise<RawPriceData>;
+export declare function verifyPrices(assets: PoolAssetsConfig): (priceData: RawPriceData) => boolean;
+export declare function getMedianPrice(pricesData: PriceData[], asset: bigint): bigint;
+export declare function packAssetsData(assetsData: {
+    assetId: bigint;
+    medianPrice: bigint;
+}[]): Cell;
+export declare function packPrices(assetsDataCell: Cell, oraclesDataCell: Cell): Cell;
+export declare function createOracleDataProof(oracle: Oracle, data: OraclePricesData, signature: Buffer, assets: Array<bigint>): Slice;
+export declare function packOraclesData(oraclesData: {
+    oracle: Oracle;
+    data: OraclePricesData;
+    signature: Buffer;
+}[], assets: Array<bigint>): Cell;
+export declare function sumDicts(result: Dictionary<bigint, bigint>, addendum: Dictionary<bigint, bigint>): void;
+export {};

package/dist/utils/priceUtils.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadPrices = loadPrices;
+exports.parsePrices = parsePrices;
+exports.verifyPrices = verifyPrices;
+exports.getMedianPrice = getMedianPrice;
+exports.packAssetsData = packAssetsData;
+exports.packPrices = packPrices;
+exports.createOracleDataProof = createOracleDataProof;
+exports.packOraclesData = packOraclesData;
+exports.sumDicts = sumDicts;
+const core_1 = require("@ton/core");
+const config_1 = require("../config");
+const merkleProof_1 = require("./merkleProof");
+require("promise.any");
+async function loadPrices(oracleNftId, endpoints, timeout) {
+    return await Promise.any(endpoints.map(x => loadOracleData(oracleNftId, x, timeout)));
+}
+async function loadOracleData(oracleNftId, endpoint, timeout) {
+    let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${oracleNftId}`, {
+        headers: { accept: 'application/json' },
+        signal: AbortSignal.timeout(timeout)
+    });
+    let outputId = (await result.json());
+    result = await fetch(`https://${endpoint}/api/core/v2/outputs/${outputId.items[0]}`, {
+        headers: { accept: 'application/json' },
+        signal: AbortSignal.timeout(timeout)
+    });
+    return await result.json();
+}
+async function parsePrices(outputData, oracleId) {
+    const data = JSON.parse(decodeURIComponent(outputData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')));
+    try {
+        const pricesCell = core_1.Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
+        const signature = Buffer.from(data['signature'], 'hex');
+        const publicKey = Buffer.from(data['publicKey'], 'hex');
+        const timestamp = Number(data['timestamp']);
+        return {
+            dict: pricesCell.beginParse().loadRef().beginParse().loadDictDirect(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigVarUint(4)),
+            dataCell: (0, core_1.beginCell)().storeRef(pricesCell).storeBuffer(signature).endCell(),
+            oracleId: oracleId,
+            signature: signature,
+            pubkey: publicKey,
+            timestamp: timestamp,
+        };
+    }
+    catch (error) {
+        console.log(oracleId, data, error);
+        throw Error();
+    }
+}
+function verifyPrices(assets) {
+    return function (priceData) {
+        const timestamp = Date.now() / 1000;
+        const pricesTime = priceData.timestamp;
+        for (const [key, asset] of Object.entries(assets)) {
+            if (!priceData.dict.has(asset.assetId)) {
+                return false;
+            }
+        }
+        // console.log('timestamp', timestamp, 'pricestime', pricesTime, timestamp - pricesTime);
+        return timestamp - pricesTime < config_1.TTL_ORACLE_DATA_SEC;
+    };
+}
+function getMedianPrice(pricesData, asset) {
+    const sorted = pricesData.map(x => x.dict.get(asset)).sort((a, b) => Number(a) - Number(b));
+    const mid = Math.floor(sorted.length / 2);
+    if (sorted.length % 2 === 0) {
+        return (sorted[mid - 1] + sorted[mid]) / 2n;
+    }
+    else {
+        return sorted[mid];
+    }
+}
+function packAssetsData(assetsData) {
+    if (assetsData.length == 0) {
+        throw new Error("No assets data to pack");
+    }
+    return assetsData.reduceRight((acc, { assetId, medianPrice }) => (0, core_1.beginCell)()
+        .storeUint(assetId, 256)
+        .storeCoins(medianPrice)
+        .storeMaybeRef(acc)
+        .endCell(), null);
+}
+function packPrices(assetsDataCell, oraclesDataCell) {
+    let pricesCell = (0, core_1.beginCell)()
+        .storeRef(assetsDataCell)
+        .storeRef(oraclesDataCell)
+        .endCell();
+    return pricesCell;
+}
+function createOracleDataProof(oracle, data, signature, assets) {
+    let prunedDict = (0, merkleProof_1.generateMerkleProofDirect)(data.prices, assets, core_1.Dictionary.Keys.BigUint(256));
+    let prunedData = (0, core_1.beginCell)().storeUint(data.timestamp, 32).storeMaybeRef(prunedDict).endCell();
+    let merkleProof = (0, merkleProof_1.convertToMerkleProof)(prunedData);
+    let oracleDataProof = (0, core_1.beginCell)().storeUint(oracle.id, 32).storeRef(merkleProof).storeBuffer(signature).asSlice();
+    return oracleDataProof;
+}
+function packOraclesData(oraclesData, assets) {
+    if (oraclesData.length == 0) {
+        throw new Error("no oracles data to pack");
+    }
+    let proofs = oraclesData.sort((d1, d2) => d1.oracle.id - d2.oracle.id).map(({ oracle, data, signature }) => createOracleDataProof(oracle, data, signature, assets));
+    return proofs.reduceRight((acc, val) => (0, core_1.beginCell)().storeSlice(val).storeMaybeRef(acc).endCell(), null);
+}
+// : String = "api.stardust-mainnet.iotaledger.net"
+function sumDicts(result, addendum) {
+    for (const key of addendum.keys()) {
+        const current = result.get(key);
+        const value = addendum.get(key);
+        if (current === undefined) {
+            result.set(key, value);
+            continue;
+        }
+        result.set(key, current + value);
+    }
+}

package/dist/utils/sha256BigInt.js

@@ -3,11 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sha256Hash = void 0;
+exports.sha256Hash = sha256Hash;
 const sha256_1 = __importDefault(require("crypto-js/sha256"));
 function sha256Hash(input) {
     const hash = (0, sha256_1.default)(input);
     const hashHex = hash.toString();
     return BigInt('0x' + hashHex);
 }
-exports.sha256Hash = sha256Hash;

package/dist/utils/tonConnectSender.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTonConnectSender = exports.getLastSentBoc = void 0;
+exports.getLastSentBoc = getLastSentBoc;
+exports.getTonConnectSender = getTonConnectSender;
 const core_1 = require("@ton/core");
 /*
 This is not the best solution to get the BOC of the sent external message, however the Sender
@@ -11,7 +12,6 @@ let lastSentBoc;
 function getLastSentBoc() {
     return lastSentBoc;
 }
-exports.getLastSentBoc = getLastSentBoc;
 function getTonConnectSender(connector) {
     return {
         get address() {
@@ -34,4 +34,3 @@ function getTonConnectSender(connector) {
         },
     };
 }
-exports.getTonConnectSender = getTonConnectSender;

package/dist/utils/userJettonWallet.d.ts

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

package/dist/utils/userJettonWallet.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserJettonWallet = void 0;
+exports.getUserJettonWallet = getUserJettonWallet;
 const core_1 = require("@ton/core");
+const assets_1 = require("../constants/assets");
 function getUserJettonWallet(ownerAddress, poolAssetConfig) {
+    if (poolAssetConfig.name == 'TON' || poolAssetConfig.assetId === assets_1.UNDEFINED_ASSET.assetId) {
+        throw new Error(`Cant getUserJettonWallet for ${poolAssetConfig.name} asset`);
+    }
     const jettonMasterAddress = poolAssetConfig.jettonMasterAddress;
     const jettonWalletCode = poolAssetConfig.jettonWalletCode;
     if (poolAssetConfig.name === 'USDT') {
@@ -55,4 +59,3 @@ function getUserJettonWallet(ownerAddress, poolAssetConfig) {
         .endCell();
     return new core_1.Address(0, stateInit.hash());
 }
-exports.getUserJettonWallet = getUserJettonWallet;

package/dist/utils/utils.d.ts

@@ -0,0 +1,2 @@
+import { PoolAssetConfig } from "../types/Master";
+export declare function isTonAsset(asset: PoolAssetConfig): boolean;

package/dist/utils/utils.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isTonAsset = isTonAsset;
+function isTonAsset(asset) {
+    return asset.name === 'TON';
+}

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@evaafi/sdk",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "SDK for EVAA contracts",
   "main": "dist/index.js",
-  "types": "src/index.ts",
   "files": [
     "dist",
     "src"
@@ -21,7 +20,7 @@
   "devDependencies": {
     "@orbs-network/ton-access": "^2.3.3",
     "@ton/core": "0.56.0",
-    "@tonconnect/sdk": "^3.0.0",
+    "@tonconnect/sdk": "^3.0.5",
     "@types/jest": "^29.5.12",
     "@types/node": "^20.10.4",
     "crypto-js": "^4.2.0",

package/src/api/math.ts

@@ -1,7 +1,9 @@
-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 { 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 '..';
 
 export function mulFactor(decimal: bigint, a: bigint, b: bigint): bigint {
     return (a * b) / decimal;
@@ -125,13 +127,111 @@ export function checkNotInDebtAtAll(principals: Dictionary<bigint, bigint>): boo
     return principals.values().every(x => x >= 0n);
 }
 
-export function calculateMaximumWithdrawAmount(
+export function getAgregatedBalances (
+    assetsData: ExtendedAssetsData,
+    assetsConfig: ExtendedAssetsConfig,
+    principals: Dictionary<bigint, bigint>,
+    prices: Dictionary<bigint, bigint>,
+    masterConstants: MasterConstants,
+  ): AgregatedBalances {
+    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)!;
+  
+        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;
+        }
+  
+      }
+    }
+    return {totalSupply: user_total_supply, totalBorrow: user_total_borrow};
+  }
+
+/**
+ * @deprecated The method should be used only for main contract v5
+ */
+export function isV5MainPoolContract(poolConfig: PoolConfig): boolean {
+  if ((poolConfig.masterAddress == MAINNET_POOL_CONFIG.masterAddress && poolConfig.masterVersion == 5) || 
+  (poolConfig.masterAddress == TESTNET_POOL_CONFIG.masterAddress && poolConfig.masterVersion == 5)) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+/**
+ * @deprecated The method should be used only for main contract v5
+ */
+export function calculateMaximumWithdrawAmountOld(
     assetsConfig: ExtendedAssetsConfig,
     assetsData: ExtendedAssetsData,
     principals: Dictionary<bigint, bigint>,
     prices: Dictionary<bigint, bigint>,
     masterConstants: MasterConstants,
-    assetId: bigint
+    assetId: bigint,
+): bigint {
+    let withdrawAmountMax = 0n;
+
+    const assetConfig = assetsConfig.get(assetId) as AssetConfig;
+    const assetData = assetsData.get(assetId) as ExtendedAssetData;
+    const oldPrincipal = principals.get(assetId) as bigint;
+    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) as bigint;
+            const agregatedBalances = getAgregatedBalances(assetsData, assetsConfig, principals, principals, masterConstants);
+            let maxAmountToReclaim = 
+                mulDiv(
+                    agregatedBalances.totalSupply - mulDivC(agregatedBalances.totalBorrow, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor),
+                    10n**assetConfig.decimals,
+                    price
+                );
+          
+            withdrawAmountMax = bigIntMin(
+                maxAmountToReclaim,
+                oldPresentValue.amount
+            );
+        }
+    } else {
+        if (!prices.has(assetId)) {
+            return 0n;
+        }
+
+        const price = prices.get(assetId) as bigint;
+
+        return getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants) * (10n ** assetConfig.decimals) / price;
+    }
+
+    return withdrawAmountMax;
+}
+
+export function 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 {
     let withdrawAmountMax = 0n;
 
@@ -152,6 +252,7 @@ export function calculateMaximumWithdrawAmount(
             const price = prices.get(assetId) as bigint;
 
             let maxAmountToReclaim = 0n;
+
             if (assetConfig.collateralFactor == 0n) {
                 maxAmountToReclaim = oldPresentValue.amount;
             }
@@ -230,74 +331,86 @@ export function presentValue(sRate: bigint, bRate: bigint, principalValue: bigin
     }
 }
 
+/**
+ * 
+ * @param assetsConfig 
+ * @param assetsData 
+ * @param principals 
+ * @param prices 
+ * @param poolConfig 
+ * @returns can return UNDEFINED_ASSET if there are no assets
+ */
 export function calculateLiquidationData(
     assetsConfig: ExtendedAssetsConfig,
     assetsData: ExtendedAssetsData,
     principals: Dictionary<bigint, bigint>,
     prices: Dictionary<bigint, bigint>,
-    masterConstants: MasterConstants,
+    poolConfig: PoolConfig,
 ): LiquidationData {
-    let gCollateralValue = 0n;
-    let gCollateralAsset = 0n;
-    let gLoanValue = 0n;
-    let gLoanAsset = 0n;
+    let collateralValue = 0n;
+    let collateralAsset = UNDEFINED_ASSET;
+    let loanValue = 0n;
+    let loanAsset = 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 !== UNDEFINED_ASSET.assetId && totalLimit < totalDebt) {
+        const loanAssetPrice = prices.get(loanAsset.assetId)!;
         const values: bigint[] = [];
-        const gCollateralAssetConfig = assetsConfig.get(gCollateralAsset)!;
-        const gLoanAssetConfig = assetsConfig.get(gLoanAsset)!;
-        const liquidationBonus = gCollateralAssetConfig.liquidationBonus;
-        const loanDecimal = 10n ** gLoanAssetConfig.decimals;
+        const collateralAssetConfig = assetsConfig.get(collateralAsset.assetId)!;
+        const loanAssetConfig = assetsConfig.get(loanAsset.assetId)!;
+        const liquidationBonus = collateralAssetConfig.liquidationBonus;
+        const loanScale = 10n ** loanAssetConfig.decimals;
         values.push(
-            (bigIntMax(gCollateralValue / 2n, bigIntMin(gCollateralValue, 10_000_000_000n)) *
-                loanDecimal *
-                masterConstants.ASSET_COEFFICIENT_SCALE) /
+            (bigIntMax(collateralValue / 2n, bigIntMin(collateralValue, 100_000_000_000n)) *
+                loanScale *
+                poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE) /
                 liquidationBonus /
-                gLoanAssetPrice,
+                loanAssetPrice,
         );
-        values.push((gLoanValue * loanDecimal) / gLoanAssetPrice);
+        values.push((loanValue * loanScale) / loanAssetPrice);
 
         const liquidationAmount = (bigIntMin(...values) as bigint) - 5n;
-        const gCollateralAssetPrice: bigint = prices.get(gCollateralAsset)!;
-        const collateralDecimal = 10n ** gCollateralAssetConfig.decimals;
+        const collateralAssetPrice: bigint = prices.get(collateralAsset.assetId)!;
+        const collateralDecimal = 10n ** collateralAssetConfig.decimals;
         let minCollateralAmount =
-            (((liquidationAmount * gLoanAssetPrice * liquidationBonus) / 10000n) * collateralDecimal) /
-                gCollateralAssetPrice /
-                loanDecimal -
+            (((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,
@@ -308,10 +421,10 @@ export function calculateLiquidationData(
     }
 
     return {
-        greatestCollateralAsset: gCollateralAsset,
-        greatestCollateralValue: gCollateralValue,
-        greatestLoanAsset: gLoanAsset,
-        greatestLoanValue: gLoanValue,
+        greatestCollateralAsset: collateralAsset,
+        greatestCollateralValue: collateralValue,
+        greatestLoanAsset: loanAsset,
+        greatestLoanValue: loanValue,
         totalDebt,
         totalLimit,
         liquidable: false,
@@ -319,7 +432,7 @@ export function calculateLiquidationData(
 }
 
 export function predictHealthFactor(args: PredictHealthFactorArgs): number {
-    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 = sha256Hash(args.tokenSymbol);
     
     const assetConfig = args.assetsConfig.get(tokenHash)!;
@@ -337,13 +450,13 @@ export function predictHealthFactor(args: PredictHealthFactorArgs): number {
 
     if (currentAmount != null && currentAmount != 0n) { 
         if (changeType == 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 == BalanceChangeType.Repay) {
             totalBorrow -= currentBalance;
         } else if (changeType == 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 == 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) {