@evaafi/sdk 0.5.6-a → 0.6.0

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,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.predictHealthFactor = exports.calculateLiquidationData = exports.presentValue = exports.getAvailableToBorrow = exports.calculateMaximumWithdrawAmount = exports.calculateMaximumWithdrawAmountOld = exports.isV5MainPoolContract = exports.getAgregatedBalances = exports.checkNotInDebtAtAll = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMin = exports.bigIntMax = exports.mulDivC = exports.mulDiv = exports.mulFactor = void 0;
+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;
 }
@@ -14,9 +12,8 @@ function mulDiv(x, y, z) {
 }
 exports.mulDiv = mulDiv;
 function mulDivC(x, y, z) {
-    //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);
 }
 exports.mulDivC = mulDivC;
 function bigIntMax(...args) {
@@ -116,72 +113,18 @@ 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 };
 }
 exports.getAgregatedBalances = getAgregatedBalances;
-/**
- * @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;
-    }
-}
-exports.isV5MainPoolContract = isV5MainPoolContract;
-/**
- * @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, 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);
-        return getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants) * (10n ** assetConfig.decimals) / price;
-    }
-    return withdrawAmountMax;
-}
-exports.calculateMaximumWithdrawAmountOld = calculateMaximumWithdrawAmountOld;
-function calculateMaximumWithdrawAmount(//  todo v6 ifelse dust not debt at all is fixed?
-assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
+function calculateMaximumWithdrawAmount(assetsConfig, assetsData, principals, prices, masterConstants, assetId) {
     let withdrawAmountMax = 0n;
     const assetConfig = assetsConfig.get(assetId);
     const assetData = assetsData.get(assetId);
@@ -203,7 +146,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);
         }
@@ -227,11 +171,11 @@ 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;
@@ -320,7 +264,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,
@@ -347,9 +291,9 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices,
 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));
     let totalLimit = Number(liquidationData.totalLimit);
     let totalBorrow = Number(liquidationData.totalDebt);
     const currentAmount = args.amount;

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,24 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseUserData = exports.parseUserLiteData = exports.parseMasterData = exports.createAssetConfig = exports.createAssetData = void 0;
+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) => {
@@ -28,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));
@@ -40,13 +41,13 @@ 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 };
         },
     };
 }
@@ -71,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) => {
@@ -95,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,
@@ -116,10 +115,9 @@ function createAssetConfig() {
                 maxTotalSupply,
                 reserveFactor,
                 liquidationReserveFactor,
-                /* Will be in v6
                 minPrincipalForRewards,
                 baseTrackingSupplySpeed,
-                baseTrackingBorrowSpeed */
+                baseTrackingBorrowSpeed
             };
         },
     };
@@ -136,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());
@@ -157,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)) {
@@ -190,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,
@@ -245,10 +238,9 @@ 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;
@@ -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,14 +278,9 @@ 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

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

@@ -2,25 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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)));
-}
-exports.getPrices = getPrices;
-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 +1 @@
-export declare const TTL_ORACLE_DATA_SEC = 170;
+export declare const TTL_ORACLE_DATA_SEC = 120;

package/dist/config.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TTL_ORACLE_DATA_SEC = void 0;
-exports.TTL_ORACLE_DATA_SEC = 170; // todo back to 120
+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;

package/dist/constants/general.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FEES = exports.OPCODES = exports.JETTON_WALLET_STANDART_CODE_TESTNET = exports.JETTON_WALLET_STANDART_CODE = exports.LENDING_CODE = exports.LP_POOL_NFT_ID = exports.MAIN_POOL_NFT_ID = exports.EVAA_LP_MAINNET_VERSION = exports.EVAA_LP_MAINNET = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = exports.NULL_ADDRESS = exports.MASTER_CONSTANTS = void 0;
+exports.FEES = exports.OPCODES = exports.JETTON_WALLET_STANDART_CODE_TESTNET = exports.JETTON_WALLET_STANDART_CODE = exports.LENDING_CODE = exports.ORACLES_LP = exports.ORACLES_TESTNET = exports.ORACLES_MAINNET = exports.EVAA_LP_MAINNET_VERSION = exports.EVAA_LP_MAINNET = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = exports.NULL_ADDRESS = exports.MASTER_CONSTANTS = void 0;
 const core_1 = require("@ton/core");
 exports.MASTER_CONSTANTS = {
     FACTOR_SCALE: BigInt(1e12),
@@ -14,13 +14,32 @@ exports.MASTER_CONSTANTS = {
 };
 exports.NULL_ADDRESS = core_1.Address.parse('UQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJKZ');
 exports.EVAA_MASTER_MAINNET = core_1.Address.parse('EQC8rUZqR_pWV1BylWUlPNBzyiTYVoBEmQkMIQDZXICfnuRr');
-exports.MAINNET_VERSION = 5;
-exports.EVAA_MASTER_TESTNET = core_1.Address.parse('EQCoIxsE8m0Q_Ui9uM-2RPtVWXqHK0ttuW2Mccuaj4FfdkLl'); // EQBghPVKxgauOyrcyNYNwE2MRRnebaNpDGpVDQLbml_LIXnK
-exports.TESTNET_VERSION = 5;
+exports.MAINNET_VERSION = 6;
+exports.EVAA_MASTER_TESTNET = core_1.Address.parse('EQDLsg3w-iBj26Gww7neYoJAxiT2t77Zo8ro56b0yuHsPp3C');
+exports.TESTNET_VERSION = 0;
 exports.EVAA_LP_MAINNET = core_1.Address.parse('EQBIlZX2URWkXCSg3QF2MJZU-wC5XkBoLww-hdWk2G37Jc6N');
-exports.EVAA_LP_MAINNET_VERSION = 0;
-exports.MAIN_POOL_NFT_ID = '0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5';
-exports.LP_POOL_NFT_ID = '0x85f0045998038bebd076987deb4d4c680a323cb04380491eaa7857b6469ba923';
+exports.EVAA_LP_MAINNET_VERSION = 2;
+exports.ORACLES_MAINNET = [
+    { id: 0, address: '0xd3a8c0b9fd44fd25a49289c631e3ac45689281f2f8cf0744400b4c65bed38e5d' },
+    { id: 1, address: '0x2c21cabdaa89739de16bde7bc44e86401fac334a3c7e55305fe5e7563043e191' },
+    { id: 2, address: '0x2eb258ce7b5d02466ab8a178ad8b0ba6ffa7b58ef21de3dc3b6dd359a1e16af0' },
+    { id: 3, address: '0xf9a0769954b4430bca95149fb3d876deb7799d8f74852e0ad4ccc5778ce68b52' },
+];
+exports.ORACLES_TESTNET = [
+    { id: 0, address: '0x3bb147a37b7a7f874c39320440f352bddd2c9337e31a778731910f0266391650' },
+    { id: 1, address: '0x676767e93b05a21aec9023a65f73cffe1c725709c3c964a7c3f0fd4229089bfe' },
+    { id: 2, address: '0x9c9e65951b0c5920c286bdb3410babcaf21f85bc9c90c13172988630f1244e0f' },
+    { id: 3, address: '0x9dcf880229bfb68d7344fd294624b64f1e0b43b9d858f0fdb1bc6434616c08f5' },
+    { id: 4, address: '0x4d1afcf7c0426ca61c405c8cfaef0053a0f0d143740ffed04c8716beb99cd614' },
+    { id: 5, address: '0x11c6baa608ed10733051fd74134441d384e471722fbc496b43ea4e3c6652485f' },
+    { id: 6, address: '0x2b685672f38dc2fce59013bb740bf24c6037049a1c267bb3b5f6f55d5b195f5f' },
+];
+exports.ORACLES_LP = [
+    { id: 0, address: '0xd3a8c0b9fd44fd25a49289c631e3ac45689281f2f8cf0744400b4c65bed38e5d' },
+    { id: 1, address: '0x2c21cabdaa89739de16bde7bc44e86401fac334a3c7e55305fe5e7563043e191' },
+    { id: 2, address: '0x2eb258ce7b5d02466ab8a178ad8b0ba6ffa7b58ef21de3dc3b6dd359a1e16af0' },
+    { id: 3, address: '0xf9a0769954b4430bca95149fb3d876deb7799d8f74852e0ad4ccc5778ce68b52' },
+];
 exports.LENDING_CODE = core_1.Cell.fromBoc(Buffer.from('b5ee9c72c1010e0100fd000d12182a555a6065717691969efd0114ff00f4a413f4bcf2c80b010202c8050202039f740403001ff2f8276a2687d2018fd201800f883b840051d38642c678b64e4400780e58fc10802faf07f80e59fa801e78b096664c02078067c07c100627a7978402014807060007a0ddb0c60201c709080013a0fd007a026900aa90400201200b0a0031b8e1002191960aa00b9e2ca007f4042796d225e8019203f6010201200d0c000bf7c147d2218400b9d10e86981fd201840b07f8138d809797976a2687d2029116382f970fd9178089910374daf81b619fd20182c7883b8701981684100627910eba56001797a6a6ba610fd8200e8768f76a9f6aa00cc2a32a8292878809bef2f1889f883bbcdeb86f01', 'hex'))[0];
 exports.JETTON_WALLET_STANDART_CODE = core_1.Cell.fromBase64('te6cckECEwEAA4UAART/APSkE/S88sgLAQIBYgIDAgLLBAUAG6D2BdqJofQB9IH0gamjAgHOBgcCAVgKCwL3CDHAJJfBOAB0NMDAXGwlRNfA/Ad4PpA+kAx+gAxcdch+gAx+gAwc6m0AALTHwHbPFsyNDQ0JIIQD4p+pbqaMGwiNl4xECPwGuAkghAXjUUZupswbCJeMhAkQwDwG+A3WzaCEFlfB7y6nwJxsPLSwFAjuvLixgHwHOBfBYAgJABE+kQwwADy4U2AAXIBP+DMgbpUwgLH4M94gbvLSmtDTBzHT/9P/9ATTB9Qw0PoA+gD6APoA+gD6ADAACIQP8vACAVgMDQIBSBESAfcBdM/AQH6APpAIfAB7UTQ+gD6QPpA1NFRNqFSLMcF8uLBKsL/8uLCVDRCcFQgE1QUA8hQBPoCWM8WAc8WzMkiyMsBEvQA9ADLAMkgcAH5AHTIywISygfL/8nQBPpA9AQx+gAg10nCAPLixMiAGAHLBVAHzxZw+gJ3ActrgDgLzO1E0PoA+kD6QNTRCtM/AQH6AFFRoAX6QPpAU13HBVRzb3BUIBNUFAPIUAT6AljPFgHPFszJIsjLARL0APQAywDJcAH5AHTIywISygfL/8nQUA/HBR6x8uLDDPoAUcqhKbYIGaFQB6AYoSaSbFXjDSXXCwHDACHCALCAPEACqE8zIghAXjUUZWAoCyx/LP1AH+gIizxZQBs8WJfoCUAPPFslQBcwjkXKRceJQB6gToAiqAFAEoBegFLzy4sUByYBA+wBDAMhQBPoCWM8WAc8WzMntVAByUmmgGKHIghBzYtCcKQLLH8s/UAf6AlAEzxZQB88WyciAEAHLBSfPFlAE+gJxActqE8zJcfsAUEITAHSOI8iAEAHLBVAGzxZQBfoCcAHLaoIQ1TJ221gFAssfyz/JcvsAklsz4kADyFAE+gJYzxYBzxbMye1UAOs7UTQ+gD6QPpA1NEF0z8BAfoAIcIA8uLC+kD0BAHQ05/RAdFRYqFSWMcF8uLBJsL/8uLCyIIQe92X3lgEAssfyz8B+gIjzxYBzxYTy5/JyIAYAcsFI88WcPoCcQHLaszJgED7AEATyFAE+gJYzxYBzxbMye1UgAIcgCDXIe1E0PoA+kD6QNTRBNMfAYQPIYIQF41FGboCghB73ZfeuhKx8vTTPwEw+gAwE6BQI8hQBPoCWM8WAc8WzMntVINjFu1o=');
 exports.JETTON_WALLET_STANDART_CODE_TESTNET = core_1.Cell.fromBase64('te6cckECEQEAAyMAART/APSkE/S88sgLAQIBYgIDAgLMBAUAG6D2BdqJofQB9IH0gahhAgHUBgcCASAICQDDCDHAJJfBOAB0NMDAXGwlRNfA/AM4PpA+kAx+gAxcdch+gAx+gAwc6m0AALTH4IQD4p+pVIgupUxNFnwCeCCEBeNRRlSILqWMUREA/AK4DWCEFlfB7y6k1nwC+BfBIQP8vCAAET6RDBwuvLhTYAIBIAoLAIPUAQa5D2omh9AH0gfSBqGAJpj8EIC8aijKkQXUEIPe7L7wndCVj5cWLpn5j9ABgJ0CgR5CgCfQEsZ4sA54tmZPaqQB8VA9M/+gD6QCHwAe1E0PoA+kD6QNQwUTahUirHBfLiwSjC//LiwlQ0QnBUIBNUFAPIUAT6AljPFgHPFszJIsjLARL0APQAywDJIPkAcHTIywLKB8v/ydAE+kD0BDH6ACDXScIA8uLEd4AYyMsFUAjPFnD6AhfLaxPMgMAgEgDQ4AnoIQF41FGcjLHxnLP1AH+gIizxZQBs8WJfoCUAPPFslQBcwjkXKRceJQCKgToIIJycOAoBS88uLFBMmAQPsAECPIUAT6AljPFgHPFszJ7VQC9ztRND6APpA+kDUMAjTP/oAUVGgBfpA+kBTW8cFVHNtcFQgE1QUA8hQBPoCWM8WAc8WzMkiyMsBEvQA9ADLAMn5AHB0yMsCygfL/8nQUA3HBRyx8uLDCvoAUaihggiYloBmtgihggiYloCgGKEnlxBJEDg3XwTjDSXXCwGAPEADXO1E0PoA+kD6QNQwB9M/+gD6QDBRUaFSSccF8uLBJ8L/8uLCBYIJMS0AoBa88uLDghB73ZfeyMsfFcs/UAP6AiLPFgHPFslxgBjIywUkzxZw+gLLaszJgED7AEATyFAE+gJYzxYBzxbMye1UgAHBSeaAYoYIQc2LQnMjLH1Iwyz9Y+gJQB88WUAfPFslxgBDIywUkzxZQBvoCFctqFMzJcfsAECQQIwB8wwAjwgCwjiGCENUydttwgBDIywVQCM8WUAT6AhbLahLLHxLLP8ly+wCTNWwh4gPIUAT6AljPFgHPFszJ7VSV6u3X');
@@ -33,9 +52,9 @@ exports.OPCODES = {
 };
 exports.FEES = {
     SUPPLY: (0, core_1.toNano)('0.3'),
-    WITHDRAW: (0, core_1.toNano)('0.5'),
-    SUPPLY_JETTON: (0, core_1.toNano)('0.29'),
-    SUPPLY_JETTON_FWD: (0, core_1.toNano)('0.5'),
+    WITHDRAW: (0, core_1.toNano)('0.35'),
+    SUPPLY_JETTON: (0, core_1.toNano)('0.35'),
+    SUPPLY_JETTON_FWD: (0, core_1.toNano)('0.3'),
     LIQUIDATION: (0, core_1.toNano)('0.8'),
     LIQUIDATION_JETTON: (0, core_1.toNano)('1'),
     LIQUIDATION_JETTON_FWD: (0, core_1.toNano)('0.8'),

package/dist/constants/pools.js

@@ -7,7 +7,8 @@ exports.MAINNET_POOL_CONFIG = {
     masterAddress: general_1.EVAA_MASTER_MAINNET,
     masterVersion: general_1.MAINNET_VERSION,
     masterConstants: general_1.MASTER_CONSTANTS,
-    nftId: general_1.MAIN_POOL_NFT_ID,
+    oracles: general_1.ORACLES_MAINNET,
+    minimalOracles: 3,
     poolAssetsConfig: [
         assets_1.TON_MAINNET,
         assets_1.JUSDT_MAINNET,
@@ -22,7 +23,8 @@ exports.TESTNET_POOL_CONFIG = {
     masterAddress: general_1.EVAA_MASTER_TESTNET,
     masterVersion: general_1.TESTNET_VERSION,
     masterConstants: general_1.MASTER_CONSTANTS,
-    nftId: general_1.MAIN_POOL_NFT_ID,
+    oracles: general_1.ORACLES_TESTNET,
+    minimalOracles: 5,
     poolAssetsConfig: [
         assets_1.TON_MAINNET,
         assets_1.JUSDT_TESTNET,
@@ -35,7 +37,8 @@ exports.MAINNET_LP_POOL_CONFIG = {
     masterAddress: general_1.EVAA_LP_MAINNET,
     masterVersion: general_1.EVAA_LP_MAINNET_VERSION,
     masterConstants: general_1.MASTER_CONSTANTS,
-    nftId: general_1.LP_POOL_NFT_ID,
+    oracles: general_1.ORACLES_LP,
+    minimalOracles: 3,
     poolAssetsConfig: [
         assets_1.TON_MAINNET,
         assets_1.USDT_MAINNET,

package/dist/contracts/MasterContract.d.ts

@@ -27,6 +27,8 @@ export type SupplyParameters = {
     userAddress: Address;
     responseAddress?: Address;
     forwardAmount?: bigint;
+    amountToTransfer: bigint;
+    payload: Cell;
 };
 /**
  * Parameters for the withdraw message
@@ -43,8 +45,10 @@ export type WithdrawParameters = {
     amount: bigint;
     userAddress: Address;
     includeUserCode: boolean;
-    priceData: Cell;
     asset: PoolAssetConfig;
+    priceData: Cell;
+    amountToTransfer: bigint;
+    payload: Cell;
 };
 /**
  * Base data for liquidation. Can be obtained from the user contract liquidationParameters getter
@@ -62,6 +66,7 @@ export type LiquidationBaseData = {
     minCollateralAmount: bigint;
     liquidationAmount: bigint;
     tonLiquidation: boolean;
+    forwardAmount?: bigint;
 };
 /**
  * Base parameters for liquidation
@@ -74,10 +79,10 @@ export type LiquidationParameters = LiquidationBaseData & {
     asset: PoolAssetConfig;
     queryID: bigint;
     liquidatorAddress: Address;
+    responseAddress: Address;
     includeUserCode: boolean;
     priceData: Cell;
-    responseAddress?: Address;
-    forwardAmount?: bigint;
+    payload: Cell;
 };
 /**
  * Evaa master contract wrapper