@evaafi/sdk 0.5.6 → 0.6.0-a

package/dist/api/helpers.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadMyRef = loadMyRef;
-exports.loadMaybeMyRef = loadMaybeMyRef;
+exports.loadMaybeMyRef = exports.loadMyRef = void 0;
 const core_1 = require("@ton/core");
 class MyCell extends core_1.Cell {
     toString() {
@@ -19,6 +18,7 @@ function loadMyRef(slice) {
         refs: cell.refs,
     });
 }
+exports.loadMyRef = loadMyRef;
 function loadMaybeMyRef(slice) {
     const cell = slice.loadMaybeRef();
     if (cell === null) {
@@ -30,3 +30,4 @@ function loadMaybeMyRef(slice) {
         refs: cell.refs,
     });
 }
+exports.loadMaybeMyRef = loadMaybeMyRef;

package/dist/api/math.d.ts

@@ -18,16 +18,7 @@ export declare function calculateAssetData(assetsConfigDict: ExtendedAssetsConfi
 export declare function calculateAssetInterest(assetConfig: AssetConfig, assetData: AssetData, masterConstants: MasterConstants): AssetInterest;
 export declare function checkNotInDebtAtAll(principals: Dictionary<bigint, bigint>): boolean;
 export declare function getAgregatedBalances(assetsData: ExtendedAssetsData, assetsConfig: ExtendedAssetsConfig, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants): AgregatedBalances;
-/**
- * @deprecated The method should be used only for main contract v5
- */
-export declare function isV5MainPoolContract(poolConfig: PoolConfig): boolean;
-/**
- * @deprecated The method should be used only for main contract v5
- */
-export declare function calculateMaximumWithdrawAmountOld(assetsConfig: ExtendedAssetsConfig, assetsData: ExtendedAssetsData, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants, assetId: bigint): bigint;
-export declare function calculateMaximumWithdrawAmount(//  todo v6 ifelse dust not debt at all is fixed?
-assetsConfig: ExtendedAssetsConfig, assetsData: ExtendedAssetsData, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants, assetId: bigint): bigint;
+export declare function calculateMaximumWithdrawAmount(assetsConfig: ExtendedAssetsConfig, assetsData: ExtendedAssetsData, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants, assetId: bigint): bigint;
 export declare function getAvailableToBorrow(assetsConfig: ExtendedAssetsConfig, assetsData: ExtendedAssetsData, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>, masterConstants: MasterConstants): bigint;
 export declare function presentValue(sRate: bigint, bRate: bigint, principalValue: bigint, masterConstants: MasterConstants): UserBalance;
 /**

package/dist/api/math.js

@@ -1,46 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mulFactor = mulFactor;
-exports.mulDiv = mulDiv;
-exports.mulDivC = mulDivC;
-exports.bigIntMax = bigIntMax;
-exports.bigIntMin = bigIntMin;
-exports.calculatePresentValue = calculatePresentValue;
-exports.calculateCurrentRates = calculateCurrentRates;
-exports.calculateAssetData = calculateAssetData;
-exports.calculateAssetInterest = calculateAssetInterest;
-exports.checkNotInDebtAtAll = checkNotInDebtAtAll;
-exports.getAgregatedBalances = getAgregatedBalances;
-exports.isV5MainPoolContract = isV5MainPoolContract;
-exports.calculateMaximumWithdrawAmountOld = calculateMaximumWithdrawAmountOld;
-exports.calculateMaximumWithdrawAmount = calculateMaximumWithdrawAmount;
-exports.getAvailableToBorrow = getAvailableToBorrow;
-exports.presentValue = presentValue;
-exports.calculateLiquidationData = calculateLiquidationData;
-exports.predictHealthFactor = predictHealthFactor;
+exports.predictHealthFactor = exports.calculateLiquidationData = exports.presentValue = exports.getAvailableToBorrow = exports.calculateMaximumWithdrawAmount = exports.getAgregatedBalances = exports.checkNotInDebtAtAll = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMin = exports.bigIntMax = exports.mulDivC = exports.mulDiv = exports.mulFactor = void 0;
 const User_1 = require("../types/User");
-const sha256BigInt_1 = require("../utils/sha256BigInt");
 const assets_1 = require("../constants/assets");
-const __1 = require("..");
 function mulFactor(decimal, a, b) {
     return (a * b) / decimal;
 }
+exports.mulFactor = mulFactor;
 function mulDiv(x, y, z) {
     return (x * y) / z;
 }
+exports.mulDiv = mulDiv;
 function mulDivC(x, y, z) {
-    const mul = x * y;
-    return mul / z + (mul % z ? 1n : 0n);
+    //const mul = x * y;
+    //return mul / z + (mul % z ? 1n : 0n);
+    return BigInt(Math.ceil(Number(x * y) / Number(z)));
 }
+exports.mulDivC = mulDivC;
 function bigIntMax(...args) {
     return args.reduce((m, e) => (e > m ? e : m));
 }
+exports.bigIntMax = bigIntMax;
 function bigIntMin(...args) {
     return args.reduce((m, e) => (e < m ? e : m));
 }
+exports.bigIntMin = bigIntMin;
 function calculatePresentValue(index, principalValue, masterConstants) {
     return (principalValue * index) / masterConstants.FACTOR_SCALE;
 }
+exports.calculatePresentValue = calculatePresentValue;
 function calculateCurrentRates(assetConfig, assetData, masterConstants) {
     const now = BigInt(Math.floor(Date.now() / 1000));
     const timeElapsed = now - assetData.lastAccural;
@@ -64,6 +52,7 @@ function calculateCurrentRates(assetConfig, assetData, masterConstants) {
         now,
     };
 }
+exports.calculateCurrentRates = calculateCurrentRates;
 function calculateAssetData(assetsConfigDict, assetsDataDict, assetId, masterConstants) {
     const config = assetsConfigDict.get(assetId);
     const data = assetsDataDict.get(assetId);
@@ -82,6 +71,7 @@ function calculateAssetData(assetsConfigDict, assetsDataDict, assetId, masterCon
         ...{ supplyApy, borrowApy },
     };
 }
+exports.calculateAssetData = calculateAssetData;
 function calculateAssetInterest(assetConfig, assetData, masterConstants) {
     const totalSupply = calculatePresentValue(assetData.sRate, assetData.totalSupply, masterConstants);
     const totalBorrow = calculatePresentValue(assetData.bRate, assetData.totalBorrow, masterConstants);
@@ -108,9 +98,11 @@ function calculateAssetInterest(assetConfig, assetData, masterConstants) {
         borrowInterest,
     };
 }
+exports.calculateAssetInterest = calculateAssetInterest;
 function checkNotInDebtAtAll(principals) {
     return principals.values().every(x => x >= 0n);
 }
+exports.checkNotInDebtAtAll = checkNotInDebtAtAll;
 function getAgregatedBalances(assetsData, assetsConfig, principals, prices, masterConstants) {
     let user_total_supply = 0n;
     let user_total_borrow = 0n;
@@ -122,63 +114,20 @@ function getAgregatedBalances(assetsData, assetsConfig, principals, prices, mast
             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
- */
-function isV5MainPoolContract(poolConfig) {
-    if ((poolConfig.masterAddress == __1.MAINNET_POOL_CONFIG.masterAddress && poolConfig.masterVersion == 5) ||
-        (poolConfig.masterAddress == __1.TESTNET_POOL_CONFIG.masterAddress && poolConfig.masterVersion == 5)) {
-        return true;
-    }
-    else {
-        return false;
-    }
-}
-/**
- * @deprecated The method should be used only for main contract v5
- */
-function calculateMaximumWithdrawAmountOld(assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
-    let withdrawAmountMax = 0n;
-    const assetConfig = assetsConfig.get(assetId);
-    const assetData = assetsData.get(assetId);
-    const oldPrincipal = principals.get(assetId);
-    const oldPresentValue = presentValue(assetData.sRate, assetData.bRate, oldPrincipal, masterConstants);
-    if (oldPresentValue.amount > assetConfig.dust) {
-        if (checkNotInDebtAtAll(principals)) {
-            withdrawAmountMax = oldPresentValue.amount;
-        }
-        else {
-            if (!prices.has(assetId)) {
-                return 0n;
-            }
-            //const borrowable = getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants);
-            const price = prices.get(assetId);
-            const agregatedBalances = getAgregatedBalances(assetsData, assetsConfig, principals, 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);
-        return getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants) * (10n ** assetConfig.decimals) / price;
-    }
-    return withdrawAmountMax;
-}
-function calculateMaximumWithdrawAmount(//  todo v6 ifelse dust not debt at all is fixed?
-assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
+exports.getAgregatedBalances = getAgregatedBalances;
+function calculateMaximumWithdrawAmount(assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
     let withdrawAmountMax = 0n;
     const assetConfig = assetsConfig.get(assetId);
     const assetData = assetsData.get(assetId);
@@ -200,7 +149,8 @@ assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
             }
             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(maxAmountToReclaim, oldPresentValue.amount);
         }
@@ -214,6 +164,7 @@ assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
     }
     return withdrawAmountMax;
 }
+exports.calculateMaximumWithdrawAmount = calculateMaximumWithdrawAmount;
 function getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants) {
     let borrowLimit = 0n;
     let borrowAmount = 0n;
@@ -223,15 +174,16 @@ function getAvailableToBorrow(assetsConfig, assetsData, principals, prices, mast
         const price = prices.get(assetID);
         const principal = principals.get(assetID);
         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);
         }
     }
     return borrowLimit - borrowAmount;
 }
+exports.getAvailableToBorrow = getAvailableToBorrow;
 function presentValue(sRate, bRate, principalValue, masterConstants) {
     if (principalValue > 0) {
         return {
@@ -252,6 +204,7 @@ function presentValue(sRate, bRate, principalValue, masterConstants) {
         };
     }
 }
+exports.presentValue = presentValue;
 /**
  *
  * @param assetsConfig
@@ -314,7 +267,7 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices,
             loanScale -
             10n;
         minCollateralAmount = (minCollateralAmount * 97n) / 100n;
-        if (minCollateralAmount / collateralDecimal >= 1n) {
+        if (minCollateralAmount / collateralDecimal >= 0n) { // todo back to 1
             return {
                 greatestCollateralAsset: collateralAsset,
                 greatestCollateralValue: collateralValue,
@@ -338,11 +291,13 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices,
         liquidable: false,
     };
 }
+exports.calculateLiquidationData = calculateLiquidationData;
 function predictHealthFactor(args) {
     const liquidationData = calculateLiquidationData(args.assetsConfig, args.assetsData, args.principals, args.prices, args.poolConfig);
-    const tokenHash = (0, sha256BigInt_1.sha256Hash)(args.tokenSymbol);
-    const assetConfig = args.assetsConfig.get(tokenHash);
-    const assetPrice = Number(args.prices.get(tokenHash));
+    const assetId = args.asset.assetId;
+    const assetConfig = args.assetsConfig.get(assetId);
+    const assetPrice = Number(args.prices.get(assetId));
+    const assetData = args.assetsData.get(assetId);
     let totalLimit = Number(liquidationData.totalLimit);
     let totalBorrow = Number(liquidationData.totalDebt);
     const currentAmount = args.amount;
@@ -368,3 +323,4 @@ function predictHealthFactor(args) {
     }
     return Math.min(Math.max(1 - totalBorrow / totalLimit, 0), 1); // let's limit a result to zero below and one above
 }
+exports.predictHealthFactor = predictHealthFactor;

package/dist/api/parser.d.ts

@@ -1,6 +1,7 @@
 import { Dictionary, DictionaryValue } from '@ton/core';
 import { AssetConfig, AssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, MasterData, PoolAssetsConfig, PoolConfig } from '../types/Master';
-import { UserData, UserLiteData } from '../types/User';
+import { UserData, UserLiteData, UserRewards } from '../types/User';
+export declare function createUserRewards(): DictionaryValue<UserRewards>;
 export declare function createAssetData(): DictionaryValue<AssetData>;
 export declare function createAssetConfig(): DictionaryValue<AssetConfig>;
 export declare function parseMasterData(masterDataBOC: string, poolAssetsConfig: PoolAssetsConfig, masterConstants: MasterConstants): MasterData;

package/dist/api/parser.js

@@ -1,28 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAssetData = createAssetData;
-exports.createAssetConfig = createAssetConfig;
-exports.parseMasterData = parseMasterData;
-exports.parseUserLiteData = parseUserLiteData;
-exports.parseUserData = parseUserData;
+exports.parseUserData = exports.parseUserLiteData = exports.parseMasterData = exports.createAssetConfig = exports.createAssetData = exports.createUserRewards = void 0;
 const core_1 = require("@ton/core");
 const math_1 = require("./math");
 const helpers_1 = require("./helpers");
 const User_1 = require("../types/User");
-// Will be in v6
-/* export function createUserRewards(): DictionaryValue<UserRewards> {
+function createUserRewards() {
     return {
-        serialize: (src: any, buidler: any) => {
+        serialize: (src, buidler) => {
             buidler.storeUint(src.trackingIndex, 64);
             buidler.storeUint(src.trackingAccured, 64);
-    },
-        parse: (src: Slice) => {
+        },
+        parse: (src) => {
             const trackingIndex = BigInt(src.loadUint(64));
             const trackingAccured = BigInt(src.loadUint(64));
             return { trackingIndex, trackingAccured };
         },
     };
-}*/
+}
+exports.createUserRewards = createUserRewards;
 function createAssetData() {
     return {
         serialize: (src, buidler) => {
@@ -32,10 +28,11 @@ function createAssetData() {
             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) => {
             const sRate = BigInt(src.loadInt(64));
@@ -44,16 +41,17 @@ function createAssetData() {
             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));
-
-            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance, trackingSupplyIndex, trackingBorrowIndex, lastTrackingAccural};        }, */
-            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance };
+            let awaitedSupply = undefined;
+            if (src.remainingBits == 64) {
+                awaitedSupply = BigInt(src.loadUint(64));
+            }
+            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance, trackingSupplyIndex, trackingBorrowIndex, awaitedSupply };
         },
     };
 }
+exports.createAssetData = createAssetData;
 function createAssetConfig() {
     return {
         serialize: (src, builder) => {
@@ -74,10 +72,9 @@ function createAssetConfig() {
             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) => {
@@ -98,10 +95,9 @@ function createAssetConfig() {
             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,
                 decimals,
@@ -119,14 +115,14 @@ function createAssetConfig() {
                 maxTotalSupply,
                 reserveFactor,
                 liquidationReserveFactor,
-                /* Will be in v6
                 minPrincipalForRewards,
                 baseTrackingSupplySpeed,
-                baseTrackingBorrowSpeed */
+                baseTrackingBorrowSpeed
             };
         },
     };
 }
+exports.createAssetConfig = createAssetConfig;
 function parseMasterData(masterDataBOC, poolAssetsConfig, masterConstants) {
     const masterSlice = core_1.Cell.fromBase64(masterDataBOC).beginParse();
     const meta = masterSlice.loadRef().beginParse().loadStringTail();
@@ -138,11 +134,10 @@ function parseMasterData(masterDataBOC, poolAssetsConfig, masterConstants) {
         updateTime: upgradeConfigParser.loadUint(64),
         freezeTime: upgradeConfigParser.loadUint(64),
         userCode: (0, helpers_1.loadMyRef)(upgradeConfigParser),
-        blankCode: (0, helpers_1.loadMyRef)(upgradeConfigParser),
         newMasterCode: (0, helpers_1.loadMaybeMyRef)(upgradeConfigParser),
         newUserCode: (0, helpers_1.loadMaybeMyRef)(upgradeConfigParser),
     };
-    upgradeConfigParser.endParse();
+    // upgradeConfigParser.endParse(); todo fix with new testnet contract
     const masterConfigSlice = masterSlice.loadRef().beginParse();
     const assetsConfigDict = masterConfigSlice.loadDict(core_1.Dictionary.Keys.BigUint(256), createAssetConfig());
     const assetsDataDict = masterSlice.loadDict(core_1.Dictionary.Keys.BigUint(256), createAssetData());
@@ -159,9 +154,12 @@ function parseMasterData(masterDataBOC, poolAssetsConfig, masterConstants) {
     const masterConfig = {
         ifActive: masterConfigSlice.loadInt(8),
         admin: masterConfigSlice.loadAddress(),
-        adminPK: masterConfigSlice.loadUintBig(256),
+        oraclesInfo: {
+            numOracles: masterConfigSlice.loadUint(16),
+            threshold: masterConfigSlice.loadUint(16),
+            oracles: (0, helpers_1.loadMaybeMyRef)(masterConfigSlice)
+        },
         tokenKeys: (0, helpers_1.loadMaybeMyRef)(masterConfigSlice),
-        walletToMaster: (0, helpers_1.loadMaybeMyRef)(masterConfigSlice),
     };
     masterConfigSlice.endParse();
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
@@ -182,6 +180,7 @@ function parseMasterData(masterDataBOC, poolAssetsConfig, masterConstants) {
         apy: apy,
     };
 }
+exports.parseMasterData = parseMasterData;
 function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolConfig, applyDust = true) {
     const poolAssetsConfig = poolConfig.poolAssetsConfig;
     const masterConstants = poolConfig.masterConstants;
@@ -191,40 +190,33 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolConfig, ap
     const userAddress = userSlice.loadAddress();
     const principalsDict = userSlice.loadDict(core_1.Dictionary.Keys.BigUint(256), core_1.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 = (0, helpers_1.loadMyRef)(userSlice);
-    /* Will be in v6
     let trackingSupplyIndex = 0n;
     let trackingBorrowIndex = 0n;
     let dutchAuctionStart = 0;
-    let backupCell = Cell.EMPTY;
-    let rewards = Dictionary.empty(Dictionary.Keys.BigUint(256), createUserRewards());
-    let backupCell1: Cell | null = null;
-    let backupCell2: Cell | null = null;
+    let backupCell = core_1.Cell.EMPTY;
+    let rewards = core_1.Dictionary.empty(core_1.Dictionary.Keys.BigUint(256), createUserRewards());
+    let backupCell1 = null;
+    let backupCell2 = null;
     const bitsLeft = userSlice.remainingBits;
     if (bitsLeft > 32) {
         trackingSupplyIndex = userSlice.loadUintBig(64);
         trackingBorrowIndex = userSlice.loadUintBig(64);
         dutchAuctionStart = userSlice.loadUint(32);
-        backupCell = loadMyRef(userSlice);
-    } else {
-        rewards = userSlice.loadDict(Dictionary.Keys.BigUint(256), createUserRewards());
+        backupCell = (0, helpers_1.loadMyRef)(userSlice);
+    }
+    else {
+        rewards = userSlice.loadDict(core_1.Dictionary.Keys.BigUint(256), createUserRewards());
         backupCell1 = userSlice.loadMaybeRef();
         backupCell2 = userSlice.loadMaybeRef();
     }
-    */
     userSlice.endParse();
-    const isV5Main = (0, math_1.isV5MainPoolContract)(poolConfig);
     const userBalances = core_1.Dictionary.empty();
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
         const assetData = assetsData.get(asset.assetId);
         const assetConfig = assetsConfig.get(asset.assetId);
         let principal = principalsDict.get(asset.assetId) || 0n;
         let balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principal, masterConstants);
-        let leftBorder = isV5Main ? balance.amount : principal;
-        if (applyDust && (principal > 0 && (leftBorder < assetConfig.dust))) { // v6 will be abs(principals) < dust
+        if (applyDust && (principal > 0 && (principal < assetConfig.dust))) {
             principal = 0n;
             balance = {
                 amount: 0n,
@@ -246,12 +238,12 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, poolConfig, ap
         trackingBorrowIndex: trackingBorrowIndex,
         dutchAuctionStart: dutchAuctionStart,
         backupCell: backupCell,
-        /* Will be in v6
         rewards: rewards,
         backupCell1: backupCell1,
-        backupCell2: backupCell2, */
+        backupCell2: backupCell2,
     };
 }
+exports.parseUserLiteData = parseUserLiteData;
 function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolConfig, applyDust = true) {
     const poolAssetsConfig = poolConfig.poolAssetsConfig;
     const masterConstants = poolConfig.masterConstants;
@@ -259,14 +251,12 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolConfi
     const borrowLimits = core_1.Dictionary.empty();
     let supplyBalance = 0n;
     let borrowBalance = 0n;
-    const isV5Main = (0, math_1.isV5MainPoolContract)(poolConfig);
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
         const assetData = assetsData.get(asset.assetId);
         const assetConfig = assetsConfig.get(asset.assetId);
         let principal = userLiteData.principals.get(asset.assetId) || 0n;
         const balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principal, masterConstants);
-        let leftBorder = isV5Main ? balance.amount : principal;
-        if (applyDust && (principal > 0 && (leftBorder < assetConfig.dust))) { // v6 will be abs(principals) < dust
+        if (applyDust && (principal > 0 && (principal < assetConfig.dust))) {
             principal = 0n;
             userLiteData.principals.set(asset.assetId, 0n);
         }
@@ -288,21 +278,19 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolConfi
         const assetData = assetsData.get(asset.assetId);
         const balance = userLiteData.balances.get(asset.assetId);
         if (balance.type === User_1.BalanceType.supply) {
-            if ((0, math_1.isV5MainPoolContract)(poolConfig)) {
-                withdrawalLimits.set(asset.assetId, (0, math_1.calculateMaximumWithdrawAmountOld)(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId));
-            }
-            else {
-                withdrawalLimits.set(asset.assetId, (0, math_1.calculateMaximumWithdrawAmount)(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId));
-            }
+            withdrawalLimits.set(asset.assetId, (0, math_1.bigIntMin)((0, math_1.calculateMaximumWithdrawAmount)(assetsConfig, assetsData, userLiteData.principals, prices, masterConstants, asset.assetId), assetData.balance));
         }
-        borrowLimits.set(asset.assetId, (0, math_1.bigIntMin)((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId), assetData.balance));
+        borrowLimits.set(asset.assetId, (0, math_1.bigIntMax)(0n, (0, math_1.bigIntMin)((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId), assetData.balance, assetData.totalSupply - assetData.totalBorrow)));
     }
     const limitUsed = borrowBalance + availableToBorrow;
     const limitUsedPercent = limitUsed === 0n
         ? 0
         : Number(BigInt(1e9) - (availableToBorrow * BigInt(1e9)) / (borrowBalance + availableToBorrow)) / 1e7;
     const liquidationData = (0, math_1.calculateLiquidationData)(assetsConfig, assetsData, userLiteData.principals, prices, 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,
         withdrawalLimits: withdrawalLimits,
@@ -316,3 +304,4 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, poolConfi
         healthFactor: healthFactor,
     };
 }
+exports.parseUserData = parseUserData;

package/dist/api/prices.d.ts

@@ -1,2 +1,3 @@
 import { PriceData } from '../types/Common';
-export declare function getPrices(endpoints?: string[], nftId?: string): Promise<PriceData>;
+import { PoolConfig } from '../types/Master';
+export declare function getPrices(endpoints?: String[], poolConfig?: PoolConfig): Promise<PriceData>;

package/dist/api/prices.js

@@ -1,25 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPrices = getPrices;
+exports.getPrices = void 0;
 const core_1 = require("@ton/core");
-const general_1 = require("../constants/general");
-async function getPrices(endpoints = ["api.stardust-mainnet.iotaledger.net"], nftId = general_1.MAIN_POOL_NFT_ID) {
-    return await Promise.any(endpoints.map(x => loadPrices(nftId, x)));
-}
-async function loadPrices(nftId, endpoint = "api.stardust-mainnet.iotaledger.net") {
-    let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${nftId}`, {
-        headers: { accept: 'application/json' },
-    });
-    let outputId = (await result.json());
-    result = await fetch(`https://${endpoint}/api/core/v2/outputs/${outputId.items[0]}`, {
-        headers: { accept: 'application/json' },
-    });
-    let resData = (await result.json());
-    const data = JSON.parse(decodeURIComponent(resData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')));
-    const pricesCell = core_1.Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
-    const signature = Buffer.from(data['signature'], 'hex');
+const priceUtils_1 = require("../utils/priceUtils");
+const pools_1 = require("../constants/pools");
+async function getPrices(endpoints = ["api.stardust-mainnet.iotaledger.net", "iota.evaa.finance"], poolConfig = pools_1.MAINNET_POOL_CONFIG) {
+    if (endpoints.length == 0) {
+        throw new Error("Empty endpoint list");
+    }
+    const prices = await Promise.all(poolConfig.oracles.map(async (x) => await (0, priceUtils_1.parsePrices)(await (0, priceUtils_1.loadPrices)(x.address, endpoints), x.id)));
+    let acceptedPrices = prices.filter((0, priceUtils_1.verifyPrices)(poolConfig.poolAssetsConfig));
+    if (acceptedPrices.length < poolConfig.minimalOracles) {
+        throw new Error("Prices are outdated");
+    }
+    if (acceptedPrices.length > poolConfig.minimalOracles && acceptedPrices.length % 2 == 0) {
+        acceptedPrices = acceptedPrices.slice(0, acceptedPrices.length - 1); // to reduce fees, MINIMAL_ORACLES_NUMBER is odd
+    }
+    if (acceptedPrices.length != poolConfig.minimalOracles) {
+        const sortedByTimestamp = acceptedPrices.slice().sort((a, b) => b.timestamp - a.timestamp);
+        const newerPrices = sortedByTimestamp.slice(0, poolConfig.minimalOracles);
+        acceptedPrices = newerPrices.sort((a, b) => a.oracleId - b.oracleId);
+    }
+    const medianData = poolConfig.poolAssetsConfig.map(asset => ({ assetId: asset.assetId, medianPrice: (0, priceUtils_1.getMedianPrice)(acceptedPrices, asset.assetId) }));
+    const packedMedianData = (0, priceUtils_1.packAssetsData)(medianData);
+    const oraclesData = acceptedPrices.map(x => ({ oracle: { id: x.oracleId, pubkey: x.pubkey }, data: { timestamp: x.timestamp, prices: x.dict }, signature: x.signature }));
+    const packedOracleData = (0, priceUtils_1.packOraclesData)(oraclesData, poolConfig.poolAssetsConfig.map(x => x.assetId));
+    const dict = core_1.Dictionary.empty();
+    medianData.forEach(x => dict.set(x.assetId, x.medianPrice));
     return {
-        dict: pricesCell.beginParse().loadDictDirect(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigUint(64)),
-        dataCell: (0, core_1.beginCell)().storeRef(pricesCell).storeBuffer(signature).endCell(),
+        dict: dict,
+        dataCell: (0, priceUtils_1.packPrices)(packedMedianData, packedOracleData)
     };
 }
+exports.getPrices = getPrices;

package/dist/config.d.ts

@@ -1,2 +1 @@
-export declare const MINIMAL_ORACLES_NUMBER = 5;
-export declare const TTL_ORACLE_DATA_SEC = 170;
+export declare const TTL_ORACLE_DATA_SEC = 120;

package/dist/config.js

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

package/dist/constants/general.d.ts

@@ -1,4 +1,5 @@
 import { Address, Cell } from '@ton/core';
+import { OracleNFT } from '../types/Master';
 export declare const MASTER_CONSTANTS: {
     FACTOR_SCALE: bigint;
     ASSET_COEFFICIENT_SCALE: bigint;
@@ -11,13 +12,14 @@ export declare const MASTER_CONSTANTS: {
 };
 export declare const NULL_ADDRESS: Address;
 export declare const EVAA_MASTER_MAINNET: Address;
-export declare const MAINNET_VERSION = 5;
+export declare const MAINNET_VERSION = 6;
 export declare const EVAA_MASTER_TESTNET: Address;
-export declare const TESTNET_VERSION = 5;
+export declare const TESTNET_VERSION = 0;
 export declare const EVAA_LP_MAINNET: Address;
-export declare const EVAA_LP_MAINNET_VERSION = 0;
-export declare const MAIN_POOL_NFT_ID = "0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5";
-export declare const LP_POOL_NFT_ID = "0x85f0045998038bebd076987deb4d4c680a323cb04380491eaa7857b6469ba923";
+export declare const EVAA_LP_MAINNET_VERSION = 2;
+export declare const ORACLES_MAINNET: OracleNFT[];
+export declare const ORACLES_TESTNET: OracleNFT[];
+export declare const ORACLES_LP: OracleNFT[];
 export declare const LENDING_CODE: Cell;
 export declare const JETTON_WALLET_STANDART_CODE: Cell;
 export declare const JETTON_WALLET_STANDART_CODE_TESTNET: Cell;