@evaafi/sdk 0.9.0-a → 0.9.1

package/dist/api/feeds.d.ts

@@ -1,31 +1,22 @@
 /// <reference types="node" />
 /// <reference types="node" />
+import { HexString } from '@pythnetwork/hermes-client';
 import { Dictionary } from '@ton/ton';
 import { Buffer } from 'buffer';
-export declare const PYTH_TON_PRICE_FEED_ID = "0x8963217838ab4cf5cadc172203c1f0b763fbaa45f346d8ee50ba994bbcac3026";
-export declare const PYTH_USDT_PRICE_FEED_ID = "0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b";
-export declare const PYTH_STTON_PRICE_FEED_ID = "0x9145e059026a4d5a46f3b96408f7e572e33b3257b9c2dbe8dba551c772762002";
-export declare const PYTH_TSTON_PRICE_FEED_ID = "0x3d1784128eeab5961ec60648fe497d3901eebd211b7f51e4bb0db9f024977d25";
-export declare const PYTH_USDC_PRICE_FEED_ID = "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a";
-export declare const PYTH_USDE_PRICE_FEED_ID = "0x6ec879b1e9963de5ee97e9c8710b742d6228252a5e2ca12d4ae81d7fe5ee8c5d";
-export declare const PYTH_TSUSDE_PRICE_FEED_ID = "0xcbe184846426619a60f51056d26efecb0537ad3a73b1e965fe695d06a257cb19";
+export declare const FEED_ID: {
+    TON: string;
+    USDT: string;
+    stTON: string;
+    tsTON: string;
+    USDC: string;
+    USDe: string;
+    tsUSDe: string;
+};
 export declare function bigintToBuffer(value: bigint, size: number): Buffer;
-export declare const packConnectedFeeds: (evaa_id: bigint, reffered_id: bigint) => Buffer;
-export declare const EVAA_TON_PRICE_FEED_ID: bigint;
-export declare const EVAA_NOT_PRICE_FEED_ID: bigint;
-export declare const EVAA_DOGS_PRICE_FEED_ID: bigint;
-export declare const EVAA_USDT_PRICE_FEED_ID: bigint;
-export declare const EVAA_STTON_PRICE_FEED_ID: bigint;
-export declare const EVAA_TSTON_PRICE_FEED_ID: bigint;
-export declare const EVAA_JUSDC_PRICE_FEED_ID: bigint;
-export declare const EVAA_JUSDT_PRICE_FEED_ID: bigint;
-export declare const EVAA_USDE_PRICE_FEED_ID: bigint;
-export declare const EVAA_TSUSDE_PRICE_FEED_ID: bigint;
-export declare const MAIN_POOL_FEEDS_MAP: Dictionary<bigint, Buffer>;
+export declare const packConnectedFeeds: (evaa_id: bigint, feedId: HexString) => Buffer;
+export declare const unpackConnectedFeeds: (buffer: Buffer) => FeedMapItem;
 export type FeedMapItem = {
-    evaaId: bigint;
-    referredPythFeed: bigint;
+    assetId: bigint;
+    feedId: HexString;
 };
-export declare function parseFeedsMapDict(dict: Dictionary<bigint, Buffer>): Map<bigint, FeedMapItem>;
-export declare const TESTNET_ALLOWED_REF_TOKENS: Dictionary<bigint, bigint>;
-export declare const TESTNET_FEEDS_MAP: Dictionary<bigint, Buffer>;
+export declare function parseFeedsMapDict(dict: Dictionary<bigint, Buffer>): Map<string, FeedMapItem>;

package/dist/api/feeds.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TESTNET_FEEDS_MAP = exports.TESTNET_ALLOWED_REF_TOKENS = exports.parseFeedsMapDict = exports.MAIN_POOL_FEEDS_MAP = exports.EVAA_TSUSDE_PRICE_FEED_ID = exports.EVAA_USDE_PRICE_FEED_ID = exports.EVAA_JUSDT_PRICE_FEED_ID = exports.EVAA_JUSDC_PRICE_FEED_ID = exports.EVAA_TSTON_PRICE_FEED_ID = exports.EVAA_STTON_PRICE_FEED_ID = exports.EVAA_USDT_PRICE_FEED_ID = exports.EVAA_DOGS_PRICE_FEED_ID = exports.EVAA_NOT_PRICE_FEED_ID = exports.EVAA_TON_PRICE_FEED_ID = exports.packConnectedFeeds = exports.bigintToBuffer = exports.PYTH_TSUSDE_PRICE_FEED_ID = exports.PYTH_USDE_PRICE_FEED_ID = exports.PYTH_USDC_PRICE_FEED_ID = exports.PYTH_TSTON_PRICE_FEED_ID = exports.PYTH_STTON_PRICE_FEED_ID = exports.PYTH_USDT_PRICE_FEED_ID = exports.PYTH_TON_PRICE_FEED_ID = void 0;
-const ton_1 = require("@ton/ton");
+exports.parseFeedsMapDict = exports.unpackConnectedFeeds = exports.packConnectedFeeds = exports.bigintToBuffer = exports.FEED_ID = void 0;
 const buffer_1 = require("buffer");
-const assets_1 = require("../constants/assets");
-exports.PYTH_TON_PRICE_FEED_ID = '0x8963217838ab4cf5cadc172203c1f0b763fbaa45f346d8ee50ba994bbcac3026';
-exports.PYTH_USDT_PRICE_FEED_ID = '0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b';
-exports.PYTH_STTON_PRICE_FEED_ID = '0x9145e059026a4d5a46f3b96408f7e572e33b3257b9c2dbe8dba551c772762002';
-exports.PYTH_TSTON_PRICE_FEED_ID = '0x3d1784128eeab5961ec60648fe497d3901eebd211b7f51e4bb0db9f024977d25';
-exports.PYTH_USDC_PRICE_FEED_ID = '0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a';
-exports.PYTH_USDE_PRICE_FEED_ID = '0x6ec879b1e9963de5ee97e9c8710b742d6228252a5e2ca12d4ae81d7fe5ee8c5d';
-exports.PYTH_TSUSDE_PRICE_FEED_ID = '0xcbe184846426619a60f51056d26efecb0537ad3a73b1e965fe695d06a257cb19';
+exports.FEED_ID = {
+    TON: '0x8963217838ab4cf5cadc172203c1f0b763fbaa45f346d8ee50ba994bbcac3026',
+    USDT: '0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
+    stTON: '0x9145e059026a4d5a46f3b96408f7e572e33b3257b9c2dbe8dba551c772762002',
+    tsTON: '0x3d1784128eeab5961ec60648fe497d3901eebd211b7f51e4bb0db9f024977d25',
+    USDC: '0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+    USDe: '0x6ec879b1e9963de5ee97e9c8710b742d6228252a5e2ca12d4ae81d7fe5ee8c5d',
+    tsUSDe: '0xcbe184846426619a60f51056d26efecb0537ad3a73b1e965fe695d06a257cb19',
+};
 function bigintToBuffer(value, size) {
     if (value < 0n) {
         throw new Error('Only non-negative bigint is supported');
@@ -22,52 +22,25 @@ function bigintToBuffer(value, size) {
     return buffer_1.Buffer.from(padded, 'hex');
 }
 exports.bigintToBuffer = bigintToBuffer;
-const packConnectedFeeds = (evaa_id, reffered_id) => {
-    return buffer_1.Buffer.concat([bigintToBuffer(evaa_id, 32), bigintToBuffer(reffered_id, 32)]);
+const packConnectedFeeds = (evaa_id, feedId) => {
+    return buffer_1.Buffer.concat([bigintToBuffer(evaa_id, 32), bigintToBuffer(BigInt(feedId), 32)]);
 };
 exports.packConnectedFeeds = packConnectedFeeds;
-exports.EVAA_TON_PRICE_FEED_ID = assets_1.ASSET_ID.TON;
-exports.EVAA_NOT_PRICE_FEED_ID = assets_1.ASSET_ID.NOT;
-exports.EVAA_DOGS_PRICE_FEED_ID = assets_1.ASSET_ID.DOGS;
-exports.EVAA_USDT_PRICE_FEED_ID = assets_1.ASSET_ID.USDT;
-exports.EVAA_STTON_PRICE_FEED_ID = assets_1.ASSET_ID.stTON;
-exports.EVAA_TSTON_PRICE_FEED_ID = assets_1.ASSET_ID.tsTON;
-exports.EVAA_JUSDC_PRICE_FEED_ID = assets_1.ASSET_ID.jUSDC;
-exports.EVAA_JUSDT_PRICE_FEED_ID = assets_1.ASSET_ID.jUSDT;
-exports.EVAA_USDE_PRICE_FEED_ID = assets_1.ASSET_ID.USDe;
-exports.EVAA_TSUSDE_PRICE_FEED_ID = assets_1.ASSET_ID.tsUSDe;
-exports.MAIN_POOL_FEEDS_MAP = (() => {
-    const map = ton_1.Dictionary.empty();
-    map.set(BigInt(exports.PYTH_TON_PRICE_FEED_ID), (0, exports.packConnectedFeeds)(exports.EVAA_TON_PRICE_FEED_ID, 0n));
-    map.set(BigInt(exports.PYTH_USDT_PRICE_FEED_ID), (0, exports.packConnectedFeeds)(exports.EVAA_USDT_PRICE_FEED_ID, 0n));
-    map.set(BigInt(exports.PYTH_STTON_PRICE_FEED_ID), (0, exports.packConnectedFeeds)(exports.EVAA_STTON_PRICE_FEED_ID, BigInt(exports.PYTH_TON_PRICE_FEED_ID)));
-    map.set(BigInt(exports.PYTH_TSTON_PRICE_FEED_ID), (0, exports.packConnectedFeeds)(exports.EVAA_TSTON_PRICE_FEED_ID, BigInt(exports.PYTH_TON_PRICE_FEED_ID)));
-    map.set(BigInt(exports.PYTH_USDC_PRICE_FEED_ID), (0, exports.packConnectedFeeds)(exports.EVAA_JUSDC_PRICE_FEED_ID, 0n));
-    map.set(BigInt(exports.PYTH_USDT_PRICE_FEED_ID), (0, exports.packConnectedFeeds)(exports.EVAA_JUSDT_PRICE_FEED_ID, 0n));
-    map.set(BigInt(exports.PYTH_USDE_PRICE_FEED_ID), (0, exports.packConnectedFeeds)(exports.EVAA_USDE_PRICE_FEED_ID, 0n));
-    map.set(BigInt(exports.PYTH_TSUSDE_PRICE_FEED_ID), (0, exports.packConnectedFeeds)(exports.EVAA_TSUSDE_PRICE_FEED_ID, 0n));
-    return map;
-})();
+const unpackConnectedFeeds = (buffer) => {
+    return {
+        assetId: BigInt(`0x${buffer.toString('hex', 0, 32)}`),
+        feedId: `0x${buffer.toString('hex', 32)}`,
+    };
+};
+exports.unpackConnectedFeeds = unpackConnectedFeeds;
 function parseFeedsMapDict(dict) {
     const parsedData = new Map();
     for (const key of dict.keys()) {
         const buffer = dict.get(key);
-        const hex1 = '0x' + buffer.toString('hex', 0, 32);
-        const hex2 = '0x' + buffer.toString('hex', 32);
-        const evaaId = BigInt(hex1);
-        const referredPythFeed = BigInt(hex2);
-        parsedData.set(key, { evaaId, referredPythFeed });
+        const assetId = BigInt(`0x${buffer.toString('hex', 0, 32)}`);
+        const feedId = `0x${buffer.toString('hex', 32)}`;
+        parsedData.set(`0x${key.toString(16)}`, { assetId, feedId });
     }
     return parsedData;
 }
 exports.parseFeedsMapDict = parseFeedsMapDict;
-exports.TESTNET_ALLOWED_REF_TOKENS = (() => {
-    const map = ton_1.Dictionary.empty();
-    map.set(BigInt(exports.EVAA_JUSDT_PRICE_FEED_ID), BigInt(exports.EVAA_USDT_PRICE_FEED_ID));
-    return map;
-})();
-exports.TESTNET_FEEDS_MAP = (() => {
-    const map = ton_1.Dictionary.empty();
-    map.set(BigInt(exports.PYTH_TON_PRICE_FEED_ID), (0, exports.packConnectedFeeds)(exports.EVAA_TON_PRICE_FEED_ID, 0n));
-    return map;
-})();

package/dist/api/math.d.ts

@@ -1,5 +1,5 @@
-import { AgregatedBalances, AssetApy, AssetConfig, AssetData, AssetInterest, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, PoolConfig } from '../types/Master';
 import { Dictionary } from '@ton/core';
+import { AgregatedBalances, AssetApy, AssetConfig, AssetData, AssetInterest, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, PoolConfig } from '../types/Master';
 import { HealthParamsArgs, LiquidationData, PredictAPYArgs, PredictHealthFactorArgs, UserBalance } from '../types/User';
 export declare function mulFactor(decimal: bigint, a: bigint, b: bigint): bigint;
 export declare function mulDiv(x: bigint, y: bigint, z: bigint): bigint;

package/dist/api/math.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.predictAPY = exports.predictHealthFactor = exports.calculateLiquidationData = exports.calculateHealthParams = exports.presentValue = exports.getAvailableToBorrow = exports.calculateMaximumWithdrawAmount = exports.getAgregatedBalances = exports.checkNotInDebtAtAll = exports.calculateInterestWithSupplyBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.getAssetLiquidityMinusReserves = exports.calculatePresentValue = exports.BigMath = exports.bigIntMin = exports.bigIntMax = exports.bigAbs = exports.mulDivC = exports.mulDiv = exports.mulFactor = void 0;
-const User_1 = require("../types/User");
 const assets_1 = require("../constants/assets");
+const User_1 = require("../types/User");
 const liquidation_1 = require("./liquidation");
 function mulFactor(decimal, a, b) {
     return (a * b) / decimal;
@@ -43,7 +43,7 @@ function getAssetLiquidityMinusReserves(assetData, masterConstants) {
 exports.getAssetLiquidityMinusReserves = getAssetLiquidityMinusReserves;
 function calculateCurrentRates(assetConfig, assetData, masterConstants) {
     const now = BigInt(Math.floor(Date.now() / 1000));
-    const timeElapsed = now - assetData.lastAccural;
+    const timeElapsed = now - assetData.lastAccrual;
     const { supplyInterest, borrowInterest } = calculateAssetInterest(assetConfig, assetData, masterConstants);
     if (timeElapsed > 0) {
         const updatedSRate = assetData.sRate + mulFactor(masterConstants.FACTOR_SCALE, assetData.sRate, supplyInterest * timeElapsed);
@@ -53,7 +53,7 @@ function calculateCurrentRates(assetConfig, assetData, masterConstants) {
             bRate: updatedBRate,
             supplyInterest,
             borrowInterest,
-            now
+            now,
         };
     }
     return {
@@ -61,7 +61,7 @@ function calculateCurrentRates(assetConfig, assetData, masterConstants) {
         bRate: assetData.bRate,
         supplyInterest,
         borrowInterest,
-        now
+        now,
     };
 }
 exports.calculateCurrentRates = calculateCurrentRates;
@@ -74,13 +74,13 @@ function calculateAssetData(assetsConfigDict, assetsDataDict, assetId, masterCon
     const { sRate, bRate, supplyInterest, borrowInterest, now } = calculateCurrentRates(config, data, masterConstants);
     data.sRate = sRate || 0n;
     data.bRate = bRate || 0n;
-    data.lastAccural = now;
+    data.lastAccrual = now;
     const supplyApy = (1 + (Number(supplyInterest) / 1e12) * 24 * 3600) ** 365 - 1;
     const borrowApy = (1 + (Number(borrowInterest) / 1e12) * 24 * 3600) ** 365 - 1;
     return {
         ...data,
         ...{ supplyInterest, borrowInterest },
-        ...{ supplyApy, borrowApy }
+        ...{ supplyApy, borrowApy },
     };
 }
 exports.calculateAssetData = calculateAssetData;
@@ -111,12 +111,12 @@ function calculateInterestWithSupplyBorrow(totalSupply, totalBorrow, assetConfig
     supplyInterest = mulDiv(mulDiv(borrowInterest, utilization, masterConstants.FACTOR_SCALE), masterConstants.ASSET_RESERVE_FACTOR_SCALE - assetConfig.reserveFactor, masterConstants.ASSET_RESERVE_FACTOR_SCALE);
     return {
         supplyInterest,
-        borrowInterest
+        borrowInterest,
     };
 }
 exports.calculateInterestWithSupplyBorrow = calculateInterestWithSupplyBorrow;
 function checkNotInDebtAtAll(principals) {
-    return principals.values().every(x => x >= 0n);
+    return principals.values().every((x) => x >= 0n);
 }
 exports.checkNotInDebtAtAll = checkNotInDebtAtAll;
 function getAgregatedBalances(assetsData, assetsConfig, principals, prices, masterConstants) {
@@ -131,10 +131,14 @@ function getAgregatedBalances(assetsData, assetsConfig, principals, prices, mast
             const assetData = assetsData.get(assetId);
             const assetConfig = assetsConfig.get(assetId);
             if (principal < 0) {
-                user_total_borrow += presentValue(assetData.sRate, assetData.bRate, principal, masterConstants).amount * price / 10n ** assetConfig.decimals;
+                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;
+                user_total_supply +=
+                    (presentValue(assetData.sRate, assetData.bRate, principal, masterConstants).amount * price) /
+                        10n ** assetConfig.decimals;
             }
         }
     }
@@ -162,9 +166,8 @@ function calculateMaximumWithdrawAmount(assetsConfig, assetsData, principals, pr
                 maxAmountToReclaim = oldPresentValue.amount;
             }
             else if (price > 0) {
-                maxAmountToReclaim =
-                    bigIntMax(0n, mulDiv(mulDiv(borrowable, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor), 10n ** assetConfig.decimals, price)
-                        - calculatePresentValue(assetData.sRate, assetConfig.dust, masterConstants) / 2n);
+                maxAmountToReclaim = 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);
         }
@@ -174,7 +177,9 @@ function calculateMaximumWithdrawAmount(assetsConfig, assetsData, principals, pr
             return 0n;
         }
         const price = prices.get(assetId);
-        return getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants) * (10n ** assetConfig.decimals) / price;
+        return ((getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants) *
+            10n ** assetConfig.decimals) /
+            price);
     }
     return withdrawAmountMax;
 }
@@ -197,8 +202,7 @@ function getAvailableToBorrow(assetsConfig, assetsData, principals, prices, mast
             borrowAmount += mulDiv(calculatePresentValue(assetData.bRate, -principal, masterConstants), price, 10n ** assetConfig.decimals);
         }
         else if (principal > 0n) {
-            borrowLimit +=
-                mulDiv(mulDiv(calculatePresentValue(assetData.sRate, principal, masterConstants), price, 10n ** assetConfig.decimals), assetConfig.collateralFactor, masterConstants.ASSET_COEFFICIENT_SCALE);
+            borrowLimit += mulDiv(mulDiv(calculatePresentValue(assetData.sRate, principal, masterConstants), price, 10n ** assetConfig.decimals), assetConfig.collateralFactor, masterConstants.ASSET_COEFFICIENT_SCALE);
         }
     }
     return borrowLimit - borrowAmount;
@@ -215,19 +219,19 @@ function presentValue(sRate, bRate, principalValue, masterConstants) {
     if (principalValue > 0) {
         return {
             amount: calculatePresentValue(sRate, principalValue, masterConstants),
-            type: User_1.BalanceType.supply
+            type: User_1.BalanceType.supply,
         };
     }
     else if (principalValue < 0) {
         return {
             amount: calculatePresentValue(bRate, -principalValue, masterConstants),
-            type: User_1.BalanceType.borrow
+            type: User_1.BalanceType.borrow,
         };
     }
     else {
         return {
             amount: 0n,
-            type: undefined
+            type: undefined,
         };
     }
 }
@@ -247,21 +251,21 @@ function calculateHealthParams(parameters) {
             continue;
         const assetPrincipal = principals.get(asset.assetId);
         if (!assetsConfig.has(asset.assetId))
-            throw (`No config for ${asset.name}:${asset.assetId}`);
+            throw `No config for ${asset.name}:${asset.assetId}`;
         const assetConfig = assetsConfig.get(asset.assetId);
         if (!assetsData.has(asset.assetId))
-            throw (`No data for asset ${asset.name}:${asset.assetId}`);
+            throw `No data for asset ${asset.name}:${asset.assetId}`;
         const assetData = assetsData.get(asset.assetId);
         if (!prices.has(asset.assetId))
-            throw (`No price for asset ${asset.name}:${asset.assetId}`);
+            throw `No price for asset ${asset.name}:${asset.assetId}`;
         const assetPrice = prices.get(asset.assetId);
         const assetScale = 10n ** assetConfig.decimals;
         const { sRate, bRate } = assetData;
         const assetBalance = presentValue(sRate, bRate, assetPrincipal, poolConfig.masterConstants);
-        const assetWorth = assetBalance.amount * assetPrice / assetScale;
+        const assetWorth = (assetBalance.amount * assetPrice) / assetScale;
         if (assetBalance.type === User_1.BalanceType.supply) {
             totalSupply += assetWorth;
-            totalLimit += assetWorth * assetConfig.liquidationThreshold / ASSET_LIQUIDATION_THRESHOLD_SCALE;
+            totalLimit += (assetWorth * assetConfig.liquidationThreshold) / ASSET_LIQUIDATION_THRESHOLD_SCALE;
         }
         else if (assetBalance.type === User_1.BalanceType.borrow && assetConfig.dust < assetBalance.amount) {
             totalDebt += assetWorth;
@@ -274,9 +278,11 @@ function calculateHealthParams(parameters) {
         return (0, liquidation_1.isBadDebt)(totalSupply, totalDebt, liquidationBonus, poolConfig.masterConstants);
     };
     return {
-        totalDebt, totalLimit, totalSupply,
+        totalDebt,
+        totalLimit,
+        totalSupply,
         isLiquidatable: _isLiquidable,
-        isBadDebt: _isBadDebt
+        isBadDebt: _isBadDebt,
     };
 }
 exports.calculateHealthParams = calculateHealthParams;
@@ -303,12 +309,13 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices,
             continue;
         const assetConfig = assetsConfig.get(asset.assetId);
         const assetData = assetsData.get(asset.assetId);
-        const balance = principal > 0 ?
-            (principal * assetData.sRate) / ASSET_SRATE_SCALE :
-            (principal * assetData.bRate) / ASSET_BRATE_SCALE;
+        const balance = principal > 0
+            ? (principal * assetData.sRate) / ASSET_SRATE_SCALE
+            : (principal * assetData.bRate) / ASSET_BRATE_SCALE;
         const assetWorth = (bigAbs(balance) * prices.get(asset.assetId)) / 10n ** assetConfig.decimals;
         if (balance > 0) {
-            totalLimit += (assetWorth * assetConfig.liquidationThreshold) / poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE;
+            totalLimit +=
+                (assetWorth * assetConfig.liquidationThreshold) / poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE;
             // get the greatest collateral
             if (assetWorth > collateralValue) {
                 collateralValue = assetWorth;
@@ -340,7 +347,9 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices,
         const liquidationAmount = bigIntMin(...values) - 5n;
         const collateralAssetPrice = prices.get(collateralAsset.assetId);
         const collateralDecimal = 10n ** collateralAssetConfig.decimals;
-        let minCollateralAmount = (((liquidationAmount * loanAssetPrice * liquidationBonus) / poolConfig.masterConstants.ASSET_LIQUIDATION_BONUS_SCALE) * collateralDecimal) /
+        let minCollateralAmount = (((liquidationAmount * loanAssetPrice * liquidationBonus) /
+            poolConfig.masterConstants.ASSET_LIQUIDATION_BONUS_SCALE) *
+            collateralDecimal) /
             collateralAssetPrice /
             loanScale -
             10n;
@@ -355,7 +364,7 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices,
                 totalLimit,
                 liquidable: true,
                 liquidationAmount: (0, liquidation_1.addReserve)(liquidationAmount, loanAssetConfig.liquidationReserveFactor, poolConfig.masterConstants.ASSET_RESERVE_FACTOR_SCALE),
-                minCollateralAmount
+                minCollateralAmount,
             };
         }
     }
@@ -366,7 +375,7 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices,
         greatestLoanValue: loanValue,
         totalDebt,
         totalLimit,
-        liquidable: false
+        liquidable: false,
     };
 }
 exports.calculateLiquidationData = calculateLiquidationData;
@@ -379,20 +388,28 @@ function predictHealthFactor(args) {
     let totalBorrow = Number(healthParams.totalDebt);
     const currentAmount = args.amount;
     const decimals = Number(assetConfig.decimals);
-    const currentBalance = assetPrice * Number(currentAmount) / Math.pow(10, decimals);
+    const currentBalance = (assetPrice * Number(currentAmount)) / Math.pow(10, decimals);
     const changeType = args.balanceChangeType;
     if (currentAmount != null && currentAmount != 0n) {
         if (changeType == User_1.BalanceChangeType.Borrow) {
-            totalBorrow += currentBalance * (1 + Number(assetConfig.originationFee) / Number(args.poolConfig.masterConstants.ASSET_ORIGINATION_FEE_SCALE));
+            totalBorrow +=
+                currentBalance *
+                    (1 +
+                        Number(assetConfig.originationFee) /
+                            Number(args.poolConfig.masterConstants.ASSET_ORIGINATION_FEE_SCALE));
         }
         else if (changeType == User_1.BalanceChangeType.Repay) {
             totalBorrow -= currentBalance;
         }
         else if (changeType == User_1.BalanceChangeType.Withdraw) {
-            totalLimit -= currentBalance * Number(assetConfig.liquidationThreshold) / Number(args.poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE);
+            totalLimit -=
+                (currentBalance * Number(assetConfig.liquidationThreshold)) /
+                    Number(args.poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE);
         }
         else if (changeType == User_1.BalanceChangeType.Supply) {
-            totalLimit += currentBalance * Number(assetConfig.liquidationThreshold) / Number(args.poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE);
+            totalLimit +=
+                (currentBalance * Number(assetConfig.liquidationThreshold)) /
+                    Number(args.poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE);
         }
     }
     if (Number(totalLimit) == 0) {
@@ -434,7 +451,7 @@ function predictAPY(args) {
     return {
         ...interest,
         supplyApy: (1 + (Number(interest.supplyInterest) / 1e12) * 24 * 3600) ** 365 - 1,
-        borrowApy: (1 + (Number(interest.borrowInterest) / 1e12) * 24 * 3600) ** 365 - 1
+        borrowApy: (1 + (Number(interest.borrowInterest) / 1e12) * 24 * 3600) ** 365 - 1,
     };
 }
 exports.predictAPY = predictAPY;

package/dist/api/parser.d.ts

@@ -1,11 +1,11 @@
 import { Dictionary, DictionaryValue } from '@ton/core';
 import { MasterConfig, MasterData, OracleInfo } from '../contracts/AbstractMaster';
-import { AssetConfig, AssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, PoolAssetsConfig, PoolConfig } from '../types/Master';
+import { AssetConfig, AssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConstants, PoolAssetConfig, PoolConfig } from '../types/Master';
 import { UserData, UserLiteData, UserRewards } from '../types/User';
 import { OracleParser } from './parsers/AbstractOracleParser';
 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, oracleParser: OracleParser): MasterData<MasterConfig<OracleInfo>>;
+export declare function parseMasterData(masterDataBOC: string, poolAssetsConfig: PoolAssetConfig[], masterConstants: MasterConstants, oracleParser: OracleParser): MasterData<MasterConfig<OracleInfo>>;
 export declare function parseUserLiteData(userDataBOC: string, assetsData: ExtendedAssetsData, assetsConfig: ExtendedAssetsConfig, poolConfig: PoolConfig, applyDust?: boolean): UserLiteData;
 export declare function parseUserData(userLiteData: UserLiteData, assetsData: ExtendedAssetsData, assetsConfig: ExtendedAssetsConfig, prices: Dictionary<bigint, bigint>, poolConfig: PoolConfig, applyDust?: boolean): UserData;

package/dist/api/parser.js

@@ -26,7 +26,7 @@ function createAssetData() {
             buidler.storeUint(src.bRate, 64);
             buidler.storeInt(src.totalSupply, 64);
             buidler.storeInt(src.totalBorrow, 64);
-            buidler.storeUint(src.lastAccural, 32);
+            buidler.storeUint(src.lastAccrual, 32);
             buidler.storeUint(src.balance, 64);
             buidler.storeUint(src.trackingSupplyIndex, 64);
             buidler.storeUint(src.trackingBorrowIndex, 64);
@@ -37,7 +37,7 @@ function createAssetData() {
             const bRate = BigInt(src.loadUintBig(64));
             const totalSupply = BigInt(src.loadIntBig(64));
             const totalBorrow = BigInt(src.loadIntBig(64));
-            const lastAccural = BigInt(src.loadUintBig(32));
+            const lastAccrual = BigInt(src.loadUintBig(32));
             const balance = BigInt(src.loadUintBig(64));
             const trackingSupplyIndex = BigInt(src.loadUintBig(64));
             const trackingBorrowIndex = BigInt(src.loadUintBig(64));
@@ -47,7 +47,7 @@ function createAssetData() {
                 bRate,
                 totalSupply,
                 totalBorrow,
-                lastAccural,
+                lastAccrual,
                 balance,
                 trackingSupplyIndex,
                 trackingBorrowIndex,

package/dist/api/parsers/PythOracleParser.d.ts

@@ -1,10 +1,10 @@
-/// <reference types="node" />
-/// <reference types="node" />
+import { HexString } from '@pythnetwork/hermes-client';
 import { Address, Dictionary, Slice } from '@ton/core';
+import { FeedMapItem } from '../feeds';
 import { AbstractOracleParser } from './AbstractOracleParser';
 export type OracleConfig = {
     pythAddress: Address;
-    feedsMap: Dictionary<bigint, Buffer>;
+    feedsMap: Map<HexString, FeedMapItem>;
     allowedRefTokens: Dictionary<bigint, bigint>;
 };
 export type PythOracleInfo = OracleConfig & {

package/dist/api/parsers/PythOracleParser.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PythOracleParser = void 0;
 const core_1 = require("@ton/core");
+const feeds_1 = require("../feeds");
 const AbstractOracleParser_1 = require("./AbstractOracleParser");
 class PythOracleParser extends AbstractOracleParser_1.AbstractOracleParser {
     parseOracleConfig(masterConfigSlice) {
@@ -10,7 +11,7 @@ class PythOracleParser extends AbstractOracleParser_1.AbstractOracleParser {
         const feedDataSlice = feedDataCell.beginParse();
         return {
             pythAddress: oraclesSlice.loadAddress(),
-            feedsMap: feedDataSlice.loadDict(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.Buffer(64)),
+            feedsMap: (0, feeds_1.parseFeedsMapDict)(feedDataSlice.loadDict(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.Buffer(64))),
             allowedRefTokens: feedDataSlice.loadDict(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigUint(256)),
             pricesTtl: oraclesSlice.loadUint(32),
             pythComputeBaseGas: oraclesSlice.loadUintBig(64),

package/dist/api/prices.js

@@ -4,6 +4,7 @@ exports.packPythUpdatesData = exports.composeFeedsCell = void 0;
 const pyth_ton_js_1 = require("@pythnetwork/pyth-ton-js");
 const core_1 = require("@ton/core");
 const ton_1 = require("@ton/ton");
+// TODO: move to PythCollector
 function composeFeedsCell(feeds) {
     if (feeds.length === 0) {
         return (0, ton_1.beginCell)().storeUint(0, 8).endCell();
@@ -39,7 +40,7 @@ export async function getPrices(endpoints: string[] = ["api.stardust-mainnet.iot
         backendEndpoints: DefaultPriceSourcesConfig.backendEndpoints,
     }
 
-    const priceCollector = new PricesCollector(poolConfig, sources);
+    const priceCollector = new ClassicCollector(poolConfig, sources);
     const prices = await priceCollector.getPrices();
 
     return { dict: prices.dict, dataCell: prices.dataCell };

package/dist/constants/general/index.d.ts

@@ -51,15 +51,29 @@ export declare const OPCODES: {
     JETTON_TRANSFER: number;
 };
 export declare const FEES: {
-    JETTON_FWD: bigint;
-    SUPPLY: bigint;
-    SUPPLY_WITHDRAW: bigint;
-    LIQUIDATION: bigint;
-    LIQUIDATION_JETTON: bigint;
-    LIQUIDATION_JETTON_FWD: bigint;
-    REWARD_MASTER_TON_TOP_UP: bigint;
-    REWARD_MASTER_DEPLOY: bigint;
-    REWARD_MASTER_WITHDRAW: bigint;
-    REWARD_USER_DEPLOY: bigint;
-    REWARD_USER_CLAIM: bigint;
+    readonly JETTON_FWD: bigint;
+    readonly SUPPLY: bigint;
+    readonly SUPPLY_WITHDRAW: bigint;
+    readonly LIQUIDATION: bigint;
+    readonly LIQUIDATION_JETTON: bigint;
+    readonly LIQUIDATION_JETTON_FWD: bigint;
+    readonly REWARD_MASTER_TON_TOP_UP: bigint;
+    readonly REWARD_MASTER_DEPLOY: bigint;
+    readonly REWARD_MASTER_WITHDRAW: bigint;
+    readonly REWARD_USER_DEPLOY: bigint;
+    readonly REWARD_USER_CLAIM: bigint;
+};
+/**
+ * Common validation constants and error messages
+ */
+export declare const VALIDATION: {
+    readonly ERRORS: {
+        readonly INVALID_AMOUNT: "Amount must be positive";
+        readonly INVALID_SUBACCOUNT_ID: "Subaccount ID must be between 0 and 255";
+        readonly MISSING_JETTON_AMOUNT: "Either amount, liquidationAmount, or supplyAmount must be provided";
+        readonly MISSING_RESPONSE_ADDRESS: "responseAddress, userAddress, or liquidatorAddress must be provided";
+        readonly INVALID_ASSET_CONFIG: "Invalid asset configuration provided";
+        readonly MASTER_CONTRACT_INACTIVE: "Master contract is not active";
+        readonly OUTDATED_SDK_VERSION: "Outdated SDK pool version";
+    };
 };

package/dist/constants/general/index.js

@@ -14,7 +14,7 @@ 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.FEES = exports.OPCODES = exports.MASTER_CONSTANTS = exports.ASSET_PRICE_SCALE = exports.NULL_ADDRESS = void 0;
+exports.VALIDATION = exports.FEES = exports.OPCODES = exports.MASTER_CONSTANTS = exports.ASSET_PRICE_SCALE = exports.NULL_ADDRESS = void 0;
 const core_1 = require("@ton/core");
 __exportStar(require("./mainnet"), exports);
 __exportStar(require("./testnet"), exports);
@@ -91,3 +91,17 @@ exports.FEES = {
     REWARD_USER_DEPLOY: (0, core_1.toNano)('0.05'),
     REWARD_USER_CLAIM: (0, core_1.toNano)('0.1'),
 };
+/**
+ * Common validation constants and error messages
+ */
+exports.VALIDATION = {
+    ERRORS: {
+        INVALID_AMOUNT: 'Amount must be positive',
+        INVALID_SUBACCOUNT_ID: 'Subaccount ID must be between 0 and 255',
+        MISSING_JETTON_AMOUNT: 'Either amount, liquidationAmount, or supplyAmount must be provided',
+        MISSING_RESPONSE_ADDRESS: 'responseAddress, userAddress, or liquidatorAddress must be provided',
+        INVALID_ASSET_CONFIG: 'Invalid asset configuration provided',
+        MASTER_CONTRACT_INACTIVE: 'Master contract is not active',
+        OUTDATED_SDK_VERSION: 'Outdated SDK pool version',
+    },
+};