@evaafi/sdk 0.5.6 → 0.6.0

package/dist/utils/merkleProof.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToMerkleProof = convertToMerkleProof;
-exports.generateMerkleProofDirect = generateMerkleProofDirect;
-exports.generateMerkleProof = generateMerkleProof;
+exports.generateMerkleProof = exports.generateMerkleProofDirect = exports.convertToMerkleProof = void 0;
 const core_1 = require("@ton/core");
 function readUnaryLength(slice) {
     let res = 0;
@@ -22,6 +20,7 @@ function convertToMerkleProof(c) {
         .storeUint(c.depth(0), 16)
         .storeRef(c));
 }
+exports.convertToMerkleProof = convertToMerkleProof;
 function convertToPrunedBranch(c) {
     return endExoticCell((0, core_1.beginCell)()
         .storeUint(1, 8)
@@ -102,6 +101,8 @@ function generateMerkleProofDirect(dict, keys, keyObject) {
     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')));
 }
+exports.generateMerkleProofDirect = generateMerkleProofDirect;
 function generateMerkleProof(dict, keys, keyObject) {
     return convertToMerkleProof(generateMerkleProofDirect(dict, keys, keyObject));
 }
+exports.generateMerkleProof = generateMerkleProof;

package/dist/utils/priceUtils.d.ts

@@ -1,7 +1,7 @@
+/// <reference types="node" />
 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;
@@ -36,7 +36,7 @@ export type OraclePricesData = {
     timestamp: number;
     prices: Dictionary<bigint, bigint>;
 };
-export declare function loadPrices(oracleNftId: String, endpoints: String[], timeout: number): Promise<OutputData>;
+export declare function loadPrices(oracleNftId: String, endpoints: String[]): 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;

package/dist/utils/priceUtils.js

@@ -1,30 +1,22 @@
 "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;
+exports.sumDicts = exports.packOraclesData = exports.createOracleDataProof = exports.packPrices = exports.packAssetsData = exports.getMedianPrice = exports.verifyPrices = exports.parsePrices = exports.loadPrices = void 0;
 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 loadPrices(oracleNftId, endpoints) {
+    return await Promise.any(endpoints.map(x => loadOracleData(oracleNftId, x)));
 }
-async function loadOracleData(oracleNftId, endpoint, timeout) {
+exports.loadPrices = loadPrices;
+async function loadOracleData(oracleNftId, endpoint) {
     let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${oracleNftId}`, {
         headers: { accept: 'application/json' },
-        signal: AbortSignal.timeout(timeout)
+        signal: AbortSignal.timeout(5000)
     });
     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)
+        signal: AbortSignal.timeout(5000)
     });
     return await result.json();
 }
@@ -49,11 +41,12 @@ async function parsePrices(outputData, oracleId) {
         throw Error();
     }
 }
+exports.parsePrices = parsePrices;
 function verifyPrices(assets) {
     return function (priceData) {
         const timestamp = Date.now() / 1000;
         const pricesTime = priceData.timestamp;
-        for (const [key, asset] of Object.entries(assets)) {
+        for (const asset of assets) {
             if (!priceData.dict.has(asset.assetId)) {
                 return false;
             }
@@ -62,6 +55,7 @@ function verifyPrices(assets) {
         return timestamp - pricesTime < config_1.TTL_ORACLE_DATA_SEC;
     };
 }
+exports.verifyPrices = verifyPrices;
 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);
@@ -72,6 +66,7 @@ function getMedianPrice(pricesData, asset) {
         return sorted[mid];
     }
 }
+exports.getMedianPrice = getMedianPrice;
 function packAssetsData(assetsData) {
     if (assetsData.length == 0) {
         throw new Error("No assets data to pack");
@@ -82,6 +77,7 @@ function packAssetsData(assetsData) {
         .storeMaybeRef(acc)
         .endCell(), null);
 }
+exports.packAssetsData = packAssetsData;
 function packPrices(assetsDataCell, oraclesDataCell) {
     let pricesCell = (0, core_1.beginCell)()
         .storeRef(assetsDataCell)
@@ -89,6 +85,7 @@ function packPrices(assetsDataCell, oraclesDataCell) {
         .endCell();
     return pricesCell;
 }
+exports.packPrices = packPrices;
 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();
@@ -96,6 +93,7 @@ function createOracleDataProof(oracle, data, signature, assets) {
     let oracleDataProof = (0, core_1.beginCell)().storeUint(oracle.id, 32).storeRef(merkleProof).storeBuffer(signature).asSlice();
     return oracleDataProof;
 }
+exports.createOracleDataProof = createOracleDataProof;
 function packOraclesData(oraclesData, assets) {
     if (oraclesData.length == 0) {
         throw new Error("no oracles data to pack");
@@ -103,6 +101,7 @@ function packOraclesData(oraclesData, assets) {
     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);
 }
+exports.packOraclesData = packOraclesData;
 // : String = "api.stardust-mainnet.iotaledger.net"
 function sumDicts(result, addendum) {
     for (const key of addendum.keys()) {
@@ -115,3 +114,4 @@ function sumDicts(result, addendum) {
         result.set(key, current + value);
     }
 }
+exports.sumDicts = sumDicts;

package/dist/utils/sha256BigInt.js

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

package/dist/utils/userJettonWallet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserJettonWallet = getUserJettonWallet;
+exports.getUserJettonWallet = void 0;
 const core_1 = require("@ton/core");
 const assets_1 = require("../constants/assets");
 function getUserJettonWallet(ownerAddress, poolAssetConfig) {
@@ -59,3 +59,4 @@ function getUserJettonWallet(ownerAddress, poolAssetConfig) {
         .endCell();
     return new core_1.Address(0, stateInit.hash());
 }
+exports.getUserJettonWallet = getUserJettonWallet;

package/dist/utils/utils.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@evaafi/sdk",
-  "version": "0.5.6",
-  "description": "SDK for EVAA contracts",
+  "version": "0.6.0",
+  "description": "SDK for EVAA v6 contracts",
   "main": "dist/index.js",
   "files": [
     "dist",

package/src/api/math.ts

@@ -159,73 +159,7 @@ export function getAgregatedBalances (
     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,
-): 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?
+export function calculateMaximumWithdrawAmount(
     assetsConfig: ExtendedAssetsConfig,
     assetsData: ExtendedAssetsData,
     principals: Dictionary<bigint, bigint>,
@@ -258,10 +192,12 @@ export function calculateMaximumWithdrawAmount(  //  todo v6 ifelse dust not deb
             }
             else if (price > 0) {
                 maxAmountToReclaim =
-                    mulDiv(
-                        mulDivC(borrowable, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor),
-                        10n ** assetConfig.decimals, price
-                    );
+                    bigIntMax(0n, 
+                        mulDiv(
+                            mulDiv(borrowable, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor),
+                            10n ** assetConfig.decimals, price)
+                            - calculatePresentValue(assetData.sRate, assetConfig.dust, masterConstants) / 2n
+                        );
             }
           
             withdrawAmountMax = bigIntMin(
@@ -299,13 +235,13 @@ export function getAvailableToBorrow(
         const principal = principals.get(assetID) as bigint;
 
         if (principal < 0) {
-            borrowAmount += (calculatePresentValue(assetData.bRate, -principal, masterConstants) * price) / 10n ** assetConfig.decimals;
+            borrowAmount += mulDiv(calculatePresentValue(assetData.bRate, -principal, masterConstants), price, 10n ** assetConfig.decimals);
         } else if (principal > 0) {
             borrowLimit +=
-            mulDivC(
-                mulDivC(calculatePresentValue(assetData.sRate, principal, masterConstants), price, 10n ** assetConfig.decimals),
-                assetConfig.collateralFactor,
-                masterConstants.ASSET_COEFFICIENT_SCALE);
+                mulDiv(
+                    mulDiv(calculatePresentValue(assetData.sRate, principal, masterConstants), price, 10n ** assetConfig.decimals),
+                    assetConfig.collateralFactor,
+                    masterConstants.ASSET_COEFFICIENT_SCALE);
         }
     }
 
@@ -405,7 +341,7 @@ export function calculateLiquidationData(
                 loanScale -
             10n;
         minCollateralAmount = (minCollateralAmount * 97n) / 100n;
-        if (minCollateralAmount / collateralDecimal >= 1n) {
+        if (minCollateralAmount / collateralDecimal >= 0n) {  // todo back to 1
             return {
                 greatestCollateralAsset: collateralAsset,
                 greatestCollateralValue: collateralValue,
@@ -433,10 +369,10 @@ export function calculateLiquidationData(
 
 export function predictHealthFactor(args: PredictHealthFactorArgs): number {
     const liquidationData = calculateLiquidationData(args.assetsConfig, args.assetsData, args.principals, args.prices, args.poolConfig);
-    const tokenHash = sha256Hash(args.tokenSymbol);
+    const assetId = args.asset.assetId;
     
-    const assetConfig = args.assetsConfig.get(tokenHash)!;
-    const assetPrice = Number(args.prices.get(tokenHash)!);
+    const assetConfig = args.assetsConfig.get(assetId)!;
+    const assetPrice = Number(args.prices.get(assetId)!);
    
     let totalLimit = Number(liquidationData.totalLimit);
     let totalBorrow = Number(liquidationData.totalDebt);

package/src/api/parser.ts

@@ -6,10 +6,8 @@ import {
     calculateAssetData,
     calculateLiquidationData,
     calculateMaximumWithdrawAmount,
-    calculateMaximumWithdrawAmountOld,
     calculatePresentValue,
     getAvailableToBorrow,
-    isV5MainPoolContract,
     presentValue,
 } from './math';
 import { loadMaybeMyRef, loadMyRef } from './helpers';
@@ -17,8 +15,7 @@ import { BalanceType, UserBalance, UserData, UserLiteData, UserRewards } from '.
 import { MAINNET_POOL_CONFIG, TESTNET_POOL_CONFIG } from '../constants/pools';
 import { basename } from 'path';
 
-// Will be in v6
-/* export function createUserRewards(): DictionaryValue<UserRewards> {
+export function createUserRewards(): DictionaryValue<UserRewards> {
     return {
         serialize: (src: any, buidler: any) => {
             buidler.storeUint(src.trackingIndex, 64);
@@ -30,7 +27,7 @@ import { basename } from 'path';
             return { trackingIndex, trackingAccured };
         },
     };
-}*/
+}
 
 export function createAssetData(): DictionaryValue<AssetData> {
     return {
@@ -41,10 +38,11 @@ export function createAssetData(): DictionaryValue<AssetData> {
             buidler.storeUint(src.totalBorrow, 64);
             buidler.storeUint(src.lastAccural, 32);
             buidler.storeUint(src.balance, 64);
-            /* Will be in v6
             buidler.storeUint(src.trackingSupplyIndex, 64);
             buidler.storeUint(src.trackingBorrowIndex, 64);
-            buidler.storeUint(src.lastTrackingAccural, 32); */
+            if (src.awaitedSupply) {
+                buidler.storeUint(src.awaitedSupply, 64);
+            }
         },
         parse: (src: Slice) => {
             const sRate = BigInt(src.loadInt(64));
@@ -53,13 +51,15 @@ export function createAssetData(): DictionaryValue<AssetData> {
             const totalBorrow = BigInt(src.loadInt(64));
             const lastAccural = BigInt(src.loadInt(32));
             const balance = BigInt(src.loadInt(64));
-            /* Will be in v6
             const trackingSupplyIndex = BigInt(src.loadUint(64));
             const trackingBorrowIndex = BigInt(src.loadUint(64));
-            const lastTrackingAccural = BigInt(src.loadUint(32)); 
+            let awaitedSupply: bigint | undefined = undefined;
+            if (src.remainingBits == 64) {
+                awaitedSupply = BigInt(src.loadUint(64));   
+            }
 
-            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance, trackingSupplyIndex, trackingBorrowIndex, lastTrackingAccural};        }, */
-            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance};        },
+            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance, trackingSupplyIndex, trackingBorrowIndex, awaitedSupply};
+        },
     };
 }
 
@@ -83,10 +83,9 @@ export function createAssetConfig(): DictionaryValue<AssetConfig> {
             refBuild.storeUint(src.maxTotalSupply, 64);
             refBuild.storeUint(src.reserveFactor, 16);
             refBuild.storeUint(src.liquidationReserveFactor, 16);
-            /* Will be in v6 
             refBuild.storeUint(src.minPrincipalForRewards, 64);
             refBuild.storeUint(src.baseTrackingSupplySpeed, 64);
-            refBuild.storeUint(src.baseTrackingBorrowSpeed, 64); */
+            refBuild.storeUint(src.baseTrackingBorrowSpeed, 64);
             builder.storeRef(refBuild.endCell());
         },
         parse: (src: Slice) => {
@@ -107,10 +106,9 @@ export function createAssetConfig(): DictionaryValue<AssetConfig> {
             const maxTotalSupply = ref.loadUintBig(64);
             const reserveFactor = ref.loadUintBig(16);
             const liquidationReserveFactor = ref.loadUintBig(16);
-            /* Will be in v6 
             const minPrincipalForRewards = ref.loadUintBig(64);
             const baseTrackingSupplySpeed = ref.loadUintBig(64);
-            const baseTrackingBorrowSpeed = ref.loadUintBig(64); */
+            const baseTrackingBorrowSpeed = ref.loadUintBig(64);
 
             return {
                 oracle,
@@ -129,10 +127,9 @@ export function createAssetConfig(): DictionaryValue<AssetConfig> {
                 maxTotalSupply,
                 reserveFactor,
                 liquidationReserveFactor,
-                /* Will be in v6 
                 minPrincipalForRewards,
                 baseTrackingSupplySpeed,
-                baseTrackingBorrowSpeed */
+                baseTrackingBorrowSpeed
             };
         },
     };
@@ -150,16 +147,15 @@ export function parseMasterData(masterDataBOC: string, poolAssetsConfig: PoolAss
         updateTime: upgradeConfigParser.loadUint(64),
         freezeTime: upgradeConfigParser.loadUint(64),
         userCode: loadMyRef(upgradeConfigParser),
-        blankCode: loadMyRef(upgradeConfigParser),
         newMasterCode: loadMaybeMyRef(upgradeConfigParser),
         newUserCode: loadMaybeMyRef(upgradeConfigParser),
     };
-    upgradeConfigParser.endParse();
+    // upgradeConfigParser.endParse(); todo fix with new testnet contract
 
     const masterConfigSlice = masterSlice.loadRef().beginParse();
-
     const assetsConfigDict = masterConfigSlice.loadDict(Dictionary.Keys.BigUint(256), createAssetConfig());
     const assetsDataDict = masterSlice.loadDict(Dictionary.Keys.BigUint(256), createAssetData());
+
     const assetsExtendedData = Dictionary.empty<bigint, ExtendedAssetData>();
     const assetsReserves = Dictionary.empty<bigint, bigint>();
     const apy = {
@@ -171,15 +167,16 @@ export function parseMasterData(masterDataBOC: string, poolAssetsConfig: PoolAss
         const assetData = calculateAssetData(assetsConfigDict, assetsDataDict, asset.assetId, masterConstants);
         assetsExtendedData.set(asset.assetId, assetData);
     }
-
     const masterConfig = {
         ifActive: masterConfigSlice.loadInt(8),
         admin: masterConfigSlice.loadAddress(),
-        adminPK: masterConfigSlice.loadUintBig(256),
+        oraclesInfo:  {
+            numOracles: masterConfigSlice.loadUint(16),
+            threshold: masterConfigSlice.loadUint(16),
+            oracles: loadMaybeMyRef(masterConfigSlice)
+        },
         tokenKeys: loadMaybeMyRef(masterConfigSlice),
-        walletToMaster: loadMaybeMyRef(masterConfigSlice),
     };
-
     masterConfigSlice.endParse();
 
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
@@ -220,11 +217,7 @@ export function parseUserLiteData(
     const userAddress = userSlice.loadAddress();
     const principalsDict = userSlice.loadDict(Dictionary.Keys.BigUint(256), Dictionary.Values.BigInt(64));
     const userState = userSlice.loadInt(64);
-    const trackingSupplyIndex = userSlice.loadUintBig(64);
-    const trackingBorrowIndex = userSlice.loadUintBig(64);
-    const dutchAuctionStart = userSlice.loadUint(32);
-    const backupCell = loadMyRef(userSlice);
-    /* Will be in v6 
+
     let trackingSupplyIndex = 0n;
     let trackingBorrowIndex = 0n;
     let dutchAuctionStart = 0;
@@ -243,9 +236,8 @@ export function parseUserLiteData(
         backupCell1 = userSlice.loadMaybeRef();
         backupCell2 = userSlice.loadMaybeRef();
     }
-    */
+    
     userSlice.endParse();
-    const isV5Main = isV5MainPoolContract(poolConfig);
     const userBalances = Dictionary.empty<bigint, UserBalance>();
 
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
@@ -254,9 +246,8 @@ export function parseUserLiteData(
 
         let principal = principalsDict.get(asset.assetId) || 0n;
         let balance = 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
+        if (applyDust && (principal > 0 && (principal < assetConfig.dust))) {
             principal = 0n;
             balance = {
                 amount: 0n,
@@ -279,10 +270,10 @@ export function parseUserLiteData(
         trackingBorrowIndex: trackingBorrowIndex,
         dutchAuctionStart: dutchAuctionStart,
         backupCell: backupCell,
-        /* Will be in v6 
+        
         rewards: rewards,
         backupCell1: backupCell1,
-        backupCell2: backupCell2, */
+        backupCell2: backupCell2,
     };
 }
 
@@ -302,7 +293,6 @@ export function parseUserData(
 
     let supplyBalance = 0n;
     let borrowBalance = 0n;
-    const isV5Main = isV5MainPoolContract(poolConfig);
 
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
         const assetData = assetsData.get(asset.assetId) as ExtendedAssetData;
@@ -310,9 +300,8 @@ export function parseUserData(
 
         let principal = userLiteData.principals.get(asset.assetId) || 0n;
         const balance = 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
+        if (applyDust && (principal > 0 && (principal < assetConfig.dust))) {
             principal = 0n;
             userLiteData.principals.set(asset.assetId, 0n);
         }
@@ -339,22 +328,15 @@ export function parseUserData(
         const balance = userLiteData.balances.get(asset.assetId) as UserBalance;
         
         if (balance.type === BalanceType.supply) {
-            if (isV5MainPoolContract(poolConfig)) {
-                withdrawalLimits.set(
-                    asset.assetId,
-                    calculateMaximumWithdrawAmountOld(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId)
-                );
-            }
-            else {
-                withdrawalLimits.set(
-                    asset.assetId,
-                    calculateMaximumWithdrawAmount(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId)
-                );
-            }
+            withdrawalLimits.set(
+                asset.assetId,
+                bigIntMin(calculateMaximumWithdrawAmount(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId), assetData.balance)
+            );
         }
+
         borrowLimits.set(
             asset.assetId,
-            bigIntMin((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId)!, assetData.balance),
+            bigIntMax(0n, bigIntMin((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId)!, assetData.balance, assetData.totalSupply - assetData.totalBorrow)),
         );
     }