@evaafi/sdk 0.5.6-a → 0.6.0

package/dist/contracts/MasterContract.js

@@ -41,9 +41,8 @@ class Evaa {
                 .storeUint(general_1.OPCODES.SUPPLY, 32)
                 .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                 .storeAddress(parameters.userAddress)
-                /* Will be in v6
                 .storeUint(parameters.amountToTransfer, 64)
-                .storeRef(parameters.payload) */
+                .storeRef(parameters.payload)
                 .endCell())
                 .endCell();
         }
@@ -54,9 +53,8 @@ class Evaa {
                 .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                 .storeUint(parameters.amount, 64)
                 .storeAddress(parameters.userAddress)
-                /* Will be in v6
                 .storeUint(parameters.amountToTransfer, 64)
-                .storeRef(parameters.payload) */
+                .storeRef(parameters.payload)
                 .endCell();
         }
     }
@@ -72,9 +70,8 @@ class Evaa {
             .storeUint(parameters.amount, 64)
             .storeAddress(parameters.userAddress)
             .storeInt(parameters.includeUserCode ? -1 : 0, 2)
-            /* Will be in v6
             .storeUint(parameters.amountToTransfer, 64)
-            .storeRef(parameters.payload) */
+            .storeRef(parameters.payload)
             .storeRef(parameters.priceData)
             .endCell();
     }
@@ -103,6 +100,10 @@ class Evaa {
                 // do not need liquidationAmount in case of jetton liquidation because
                 // the exact amount of transferred jettons for liquidation is known
                 .storeUint(0, 64)
+                .storeRef((0, core_1.beginCell)()
+                .storeUint(parameters.forwardAmount ?? 0, 64) // idk .. ) todo check
+                .storeRef(parameters.payload)
+                .endCell())
                 .storeRef(parameters.priceData)
                 .endCell())
                 .endCell();
@@ -117,6 +118,10 @@ class Evaa {
                 .storeUint(parameters.minCollateralAmount, 64)
                 .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                 .storeUint(parameters.liquidationAmount, 64)
+                .storeRef((0, core_1.beginCell)()
+                .storeUint(parameters.forwardAmount ?? 0, 64) // idk .. ) todo check
+                .storeRef(parameters.payload)
+                .endCell())
                 .storeRef(parameters.priceData)
                 .endCell();
         }
@@ -233,10 +238,10 @@ class Evaa {
     }
     async getPrices(provider, endpoints) {
         if ((endpoints?.length ?? 0) > 0) {
-            return await (0, __1.getPrices)(endpoints, this.poolConfig.nftId);
+            return await (0, __1.getPrices)(endpoints, this.poolConfig);
         }
         else {
-            return await (0, __1.getPrices)(undefined, this.poolConfig.nftId);
+            return await (0, __1.getPrices)(undefined, this.poolConfig);
         }
     }
 }

package/dist/index.d.ts

@@ -1,11 +1,11 @@
-export { mulFactor, mulDiv, bigIntMin, bigIntMax, calculatePresentValue, calculateCurrentRates, calculateAssetData, calculateAssetInterest, getAvailableToBorrow, calculateMaximumWithdrawAmount, presentValue, calculateLiquidationData, } from './api/math';
+export { mulFactor, mulDiv, bigIntMin, bigIntMax, calculatePresentValue, calculateCurrentRates, calculateAssetData, calculateAssetInterest, getAvailableToBorrow, calculateMaximumWithdrawAmount, presentValue, calculateLiquidationData, predictHealthFactor } from './api/math';
 export { createAssetData, createAssetConfig, parseMasterData, parseUserData, parseUserLiteData } from './api/parser';
 export { getPrices } from './api/prices';
 export { JettonWallet } from './contracts/JettonWallet';
-export { EvaaParameters, WithdrawParameters, LiquidationBaseData, Evaa, } from './contracts/MasterContract';
+export { EvaaParameters, WithdrawParameters, LiquidationBaseData, LiquidationParameters, Evaa, } from './contracts/MasterContract';
 export { EvaaUser } from './contracts/UserContract';
 export { PriceData } from './types/Common';
-export { UpgradeConfig, AssetConfig, MasterConfig, AssetData, AssetInterest, AssetApy, ExtendedAssetData, MasterData, PoolConfig, ExtendedAssetsData, ExtendedAssetsConfig, PoolAssetConfig, PoolAssetsConfig, } from './types/Master';
+export { UpgradeConfig, AssetConfig, MasterConfig, AssetData, AssetInterest, AssetApy, ExtendedAssetData, MasterData, PoolConfig, ExtendedAssetsData, ExtendedAssetsConfig, PoolAssetConfig, PoolAssetsConfig, MasterConstants } from './types/Master';
 export { BalanceType, UserBalance, UserLiqudationData, LiquidableData, NonLiquidableData, LiquidationData, UserDataInactive, UserDataActive, UserData, BalanceChangeType } from './types/User';
 export { EVAA_MASTER_MAINNET, MAINNET_VERSION, EVAA_MASTER_TESTNET, TESTNET_VERSION, LENDING_CODE, OPCODES, FEES, MASTER_CONSTANTS } from './constants/general';
 export { MAINNET_POOL_CONFIG, TESTNET_POOL_CONFIG, MAINNET_LP_POOL_CONFIG, } from './constants/pools';

package/dist/index.js

@@ -14,7 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserJettonWallet = exports.getTonConnectSender = exports.getLastSentBoc = exports.STTON_TESTNET = exports.JUSDC_TESTNET = exports.JUSDT_TESTNET = exports.TSTON_MAINNET = exports.STTON_MAINNET = exports.JUSDC_MAINNET = exports.JUSDT_MAINNET = exports.USDT_STORM_MAINNET = exports.TON_STORM_MAINNET = exports.TONUSDT_DEDUST_MAINNET = exports.USDT_MAINNET = exports.TON_MAINNET = exports.UNDEFINED_ASSET = exports.MAINNET_LP_POOL_CONFIG = exports.TESTNET_POOL_CONFIG = exports.MAINNET_POOL_CONFIG = exports.MASTER_CONSTANTS = exports.FEES = exports.OPCODES = exports.LENDING_CODE = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = exports.BalanceChangeType = exports.BalanceType = exports.EvaaUser = exports.Evaa = exports.JettonWallet = exports.getPrices = exports.parseUserLiteData = exports.parseUserData = exports.parseMasterData = exports.createAssetConfig = exports.createAssetData = exports.calculateLiquidationData = exports.presentValue = exports.calculateMaximumWithdrawAmount = exports.getAvailableToBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMax = exports.bigIntMin = exports.mulDiv = exports.mulFactor = void 0;
+exports.getTonConnectSender = exports.getLastSentBoc = exports.STTON_TESTNET = exports.JUSDC_TESTNET = exports.JUSDT_TESTNET = exports.TSTON_MAINNET = exports.STTON_MAINNET = exports.JUSDC_MAINNET = exports.JUSDT_MAINNET = exports.USDT_STORM_MAINNET = exports.TON_STORM_MAINNET = exports.TONUSDT_DEDUST_MAINNET = exports.USDT_MAINNET = exports.TON_MAINNET = exports.UNDEFINED_ASSET = exports.MAINNET_LP_POOL_CONFIG = exports.TESTNET_POOL_CONFIG = exports.MAINNET_POOL_CONFIG = exports.MASTER_CONSTANTS = exports.FEES = exports.OPCODES = exports.LENDING_CODE = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = exports.BalanceChangeType = exports.BalanceType = exports.EvaaUser = exports.Evaa = exports.JettonWallet = exports.getPrices = exports.parseUserLiteData = exports.parseUserData = exports.parseMasterData = exports.createAssetConfig = exports.createAssetData = exports.predictHealthFactor = exports.calculateLiquidationData = exports.presentValue = exports.calculateMaximumWithdrawAmount = exports.getAvailableToBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMax = exports.bigIntMin = exports.mulDiv = exports.mulFactor = void 0;
+exports.getUserJettonWallet = void 0;
 // Math
 var math_1 = require("./api/math");
 Object.defineProperty(exports, "mulFactor", { enumerable: true, get: function () { return math_1.mulFactor; } });
@@ -29,6 +30,7 @@ Object.defineProperty(exports, "getAvailableToBorrow", { enumerable: true, get:
 Object.defineProperty(exports, "calculateMaximumWithdrawAmount", { enumerable: true, get: function () { return math_1.calculateMaximumWithdrawAmount; } });
 Object.defineProperty(exports, "presentValue", { enumerable: true, get: function () { return math_1.presentValue; } });
 Object.defineProperty(exports, "calculateLiquidationData", { enumerable: true, get: function () { return math_1.calculateLiquidationData; } });
+Object.defineProperty(exports, "predictHealthFactor", { enumerable: true, get: function () { return math_1.predictHealthFactor; } });
 // Parser
 var parser_1 = require("./api/parser");
 Object.defineProperty(exports, "createAssetData", { enumerable: true, get: function () { return parser_1.createAssetData; } });

package/dist/types/Common.d.ts

@@ -1,4 +1,13 @@
+/// <reference types="node" />
 import { Cell, Dictionary } from '@ton/core';
+export type RawPriceData = {
+    dict: Dictionary<bigint, bigint>;
+    dataCell: Cell;
+    oracleId: number;
+    signature: Buffer;
+    pubkey: Buffer;
+    timestamp: number;
+};
 export type PriceData = {
     dict: Dictionary<bigint, bigint>;
     dataCell: Cell;

package/dist/types/Master.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { Address, Cell, Dictionary } from '@ton/core';
 export type MasterConstants = {
     FACTOR_SCALE: bigint;
@@ -20,7 +21,8 @@ export type PoolConfig = {
     masterAddress: Address;
     masterVersion: number;
     masterConstants: MasterConstants;
-    nftId: string;
+    oracles: OracleNFT[];
+    minimalOracles: number;
     poolAssetsConfig: PoolAssetsConfig;
     lendingCode: Cell;
 };
@@ -31,7 +33,6 @@ export type UpgradeConfig = {
     updateTime: number;
     freezeTime: number;
     userCode: Cell;
-    blankCode: Cell;
     newMasterCode: Cell | null;
     newUserCode: Cell | null;
 };
@@ -52,13 +53,20 @@ export type AssetConfig = {
     maxTotalSupply: bigint;
     reserveFactor: bigint;
     liquidationReserveFactor: bigint;
+    minPrincipalForRewards: bigint;
+    baseTrackingSupplySpeed: bigint;
+    baseTrackingBorrowSpeed: bigint;
 };
 export type MasterConfig = {
     ifActive: number;
     admin: Address;
-    adminPK: bigint;
+    oraclesInfo: OraclesInfo;
     tokenKeys: Cell | null;
-    walletToMaster: Cell | null;
+};
+export type OraclesInfo = {
+    numOracles: number;
+    threshold: number;
+    oracles: Cell | null;
 };
 export type AssetData = {
     sRate: bigint;
@@ -67,6 +75,9 @@ export type AssetData = {
     totalBorrow: bigint;
     lastAccural: bigint;
     balance: bigint;
+    trackingSupplyIndex: bigint;
+    trackingBorrowIndex: bigint;
+    awaitedSupply?: bigint;
 };
 export type AssetInterest = {
     supplyInterest: bigint;
@@ -95,3 +106,11 @@ export type AgregatedBalances = {
     totalBorrow: bigint;
     totalSupply: bigint;
 };
+export type OracleNFT = {
+    id: number;
+    address: string;
+};
+export type Oracle = {
+    id: number;
+    pubkey: Buffer;
+};

package/dist/types/User.d.ts

@@ -37,6 +37,9 @@ export type UserLiteData = {
     trackingBorrowIndex: bigint;
     dutchAuctionStart: number;
     backupCell: Cell;
+    rewards: Dictionary<bigint, UserRewards>;
+    backupCell1: Cell | null;
+    backupCell2: Cell | null;
 };
 export type UserDataActive = UserLiteData & {
     withdrawalLimits: Dictionary<bigint, bigint>;
@@ -67,7 +70,7 @@ export declare enum BalanceChangeType {
 export type PredictHealthFactorArgs = {
     balanceChangeType: BalanceChangeType;
     amount: bigint;
-    tokenSymbol: string;
+    asset: PoolAssetConfig;
     principals: Dictionary<bigint, bigint>;
     prices: Dictionary<bigint, bigint>;
     assetsData: ExtendedAssetsData;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@evaafi/sdk",
-  "version": "0.5.6a",
-  "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

@@ -14,9 +14,8 @@ 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);
-    return BigInt(Math.ceil(Number(x * y) / Number(z)));
+    const mul = x * y;
+    return mul / z + (mul % z ? 1n : 0n);
 }
 
 export function bigIntMax(...args: bigint[]): bigint {
@@ -148,89 +147,19 @@ export function getAgregatedBalances (
         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};
   }
 
-/**
- * @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, 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) 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>,
@@ -263,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(
@@ -304,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);
         }
     }
 
@@ -410,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,
@@ -438,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)),
         );
     }