@evaafi/sdk 0.7.0 → 0.9.0-a

package/dist/index.d.ts

@@ -1,23 +1,23 @@
-export { mulFactor, mulDiv, bigIntMin, bigIntMax, calculatePresentValue, calculateCurrentRates, calculateAssetData, calculateAssetInterest, getAvailableToBorrow, calculateMaximumWithdrawAmount, presentValue, calculateLiquidationData, predictHealthFactor, calculateHealthParams, calculateInterestWithSupplyBorrow, predictAPY, BigMath, getAssetLiquidityMinusReserves, } from './api/math';
-export { calculateLiquidationAmounts, calculateMinCollateralByTransferredAmount, isLiquidatable, isBadDebt, addReserve, deductReserve, addLiquidationBonus, deductLiquidationBonus, toAssetAmount, toAssetWorth, PreparedAssetInfo, PreparedAssetInfoResult, prepareAssetInfo, findAssetById, selectGreatestAssets, calculateAssetsValues, AssetsValues, SelectedAssets, } from './api/liquidation';
-export { createAssetData, createAssetConfig, parseMasterData, parseUserData, parseUserLiteData } from './api/parser';
-export { getPrices } from './api/prices';
-export { JettonWallet } from './contracts/JettonWallet';
-export { EvaaParameters, WithdrawParameters, LiquidationBaseData, LiquidationParameters, Evaa } from './contracts/MasterContract';
-export { EvaaUser } from './contracts/UserContract';
+export * from './api/math';
+export * from './api/liquidation';
+export * from './api/parser';
+export * from './api/parsers';
+export * from './api/prices';
+export * from './api/feeds';
+export * from './contracts';
+export { EvaaUserRewards } from './rewards/EvaaRewards';
+export { JettonMinter as RewardJettonMinter, type JettonMinterConfig, type MintMessage } from './rewards/JettonMinter';
+export { JettonWallet as RewardJettonWallet, type JettonWalletConfig } from './rewards/JettonWallet';
 export { RewardMaster } from './rewards/RewardMaster';
-export { type EvaaRewardsConfig } from './types/MasterRewards';
 export { RewardUser } from './rewards/RewardUser';
+export { type EvaaRewardsConfig } from './types/MasterRewards';
 export { type EvaaUserRewardsConfig } from './types/UserRewards';
-export { JettonMinter as RewardJettonMinter, type JettonMinterConfig, type MintMessage } from './rewards/JettonMinter';
-export { JettonWallet as RewardJettonWallet, type JettonWalletConfig } from './rewards/JettonWallet';
-export { EvaaUserRewards } from './rewards/EvaaRewards';
-export { UpgradeConfig, AssetConfig, MasterConfig, AssetData, AssetInterest, AssetApy, ExtendedAssetData, MasterData, PoolConfig, ExtendedAssetsData, ExtendedAssetsConfig, PoolAssetConfig, PoolAssetsConfig, MasterConstants } from './types/Master';
-export { BalanceType, UserBalance, UserLiqudationData, LiquidableData, NonLiquidableData, LiquidationData, UserDataInactive, UserDataActive, UserData, BalanceChangeType } from './types/User';
+export * from './types/Master';
+export * from './types/User';
 export * from './constants/general';
 export * from './constants/pools';
 export * from './constants/assets';
-export * from './utils/utils';
 export * from './prices';
+export * from './utils/utils';
 export { getLastSentBoc, getTonConnectSender } from './utils/tonConnectSender';
 export { getUserJettonWallet } from './utils/userJettonWallet';

package/dist/index.js

@@ -14,80 +14,40 @@ 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.getTonConnectSender = exports.getLastSentBoc = exports.BalanceChangeType = exports.BalanceType = exports.EvaaUserRewards = exports.RewardJettonWallet = exports.RewardJettonMinter = exports.RewardUser = exports.RewardMaster = exports.EvaaUser = exports.Evaa = exports.JettonWallet = exports.getPrices = exports.parseUserLiteData = exports.parseUserData = exports.parseMasterData = exports.createAssetConfig = exports.createAssetData = exports.calculateAssetsValues = exports.selectGreatestAssets = exports.findAssetById = exports.prepareAssetInfo = exports.toAssetWorth = exports.toAssetAmount = exports.deductLiquidationBonus = exports.addLiquidationBonus = exports.deductReserve = exports.addReserve = exports.isBadDebt = exports.isLiquidatable = exports.calculateMinCollateralByTransferredAmount = exports.calculateLiquidationAmounts = exports.getAssetLiquidityMinusReserves = exports.BigMath = exports.predictAPY = exports.calculateInterestWithSupplyBorrow = exports.calculateHealthParams = exports.predictHealthFactor = exports.calculateLiquidationData = exports.presentValue = exports.calculateMaximumWithdrawAmount = exports.getAvailableToBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMax = exports.bigIntMin = exports.mulDiv = exports.mulFactor = void 0;
-exports.getUserJettonWallet = void 0;
+exports.getUserJettonWallet = exports.getTonConnectSender = exports.getLastSentBoc = exports.RewardUser = exports.RewardMaster = exports.RewardJettonWallet = exports.RewardJettonMinter = exports.EvaaUserRewards = void 0;
 // Math
-var math_1 = require("./api/math");
-Object.defineProperty(exports, "mulFactor", { enumerable: true, get: function () { return math_1.mulFactor; } });
-Object.defineProperty(exports, "mulDiv", { enumerable: true, get: function () { return math_1.mulDiv; } });
-Object.defineProperty(exports, "bigIntMin", { enumerable: true, get: function () { return math_1.bigIntMin; } });
-Object.defineProperty(exports, "bigIntMax", { enumerable: true, get: function () { return math_1.bigIntMax; } });
-Object.defineProperty(exports, "calculatePresentValue", { enumerable: true, get: function () { return math_1.calculatePresentValue; } });
-Object.defineProperty(exports, "calculateCurrentRates", { enumerable: true, get: function () { return math_1.calculateCurrentRates; } });
-Object.defineProperty(exports, "calculateAssetData", { enumerable: true, get: function () { return math_1.calculateAssetData; } });
-Object.defineProperty(exports, "calculateAssetInterest", { enumerable: true, get: function () { return math_1.calculateAssetInterest; } });
-Object.defineProperty(exports, "getAvailableToBorrow", { enumerable: true, get: function () { return math_1.getAvailableToBorrow; } });
-Object.defineProperty(exports, "calculateMaximumWithdrawAmount", { enumerable: true, get: function () { return math_1.calculateMaximumWithdrawAmount; } });
-Object.defineProperty(exports, "presentValue", { enumerable: true, get: function () { return math_1.presentValue; } });
-Object.defineProperty(exports, "calculateLiquidationData", { enumerable: true, get: function () { return math_1.calculateLiquidationData; } });
-Object.defineProperty(exports, "predictHealthFactor", { enumerable: true, get: function () { return math_1.predictHealthFactor; } });
-Object.defineProperty(exports, "calculateHealthParams", { enumerable: true, get: function () { return math_1.calculateHealthParams; } });
-Object.defineProperty(exports, "calculateInterestWithSupplyBorrow", { enumerable: true, get: function () { return math_1.calculateInterestWithSupplyBorrow; } });
-Object.defineProperty(exports, "predictAPY", { enumerable: true, get: function () { return math_1.predictAPY; } });
-Object.defineProperty(exports, "BigMath", { enumerable: true, get: function () { return math_1.BigMath; } });
-Object.defineProperty(exports, "getAssetLiquidityMinusReserves", { enumerable: true, get: function () { return math_1.getAssetLiquidityMinusReserves; } });
-var liquidation_1 = require("./api/liquidation");
-Object.defineProperty(exports, "calculateLiquidationAmounts", { enumerable: true, get: function () { return liquidation_1.calculateLiquidationAmounts; } });
-Object.defineProperty(exports, "calculateMinCollateralByTransferredAmount", { enumerable: true, get: function () { return liquidation_1.calculateMinCollateralByTransferredAmount; } });
-Object.defineProperty(exports, "isLiquidatable", { enumerable: true, get: function () { return liquidation_1.isLiquidatable; } });
-Object.defineProperty(exports, "isBadDebt", { enumerable: true, get: function () { return liquidation_1.isBadDebt; } });
-Object.defineProperty(exports, "addReserve", { enumerable: true, get: function () { return liquidation_1.addReserve; } });
-Object.defineProperty(exports, "deductReserve", { enumerable: true, get: function () { return liquidation_1.deductReserve; } });
-Object.defineProperty(exports, "addLiquidationBonus", { enumerable: true, get: function () { return liquidation_1.addLiquidationBonus; } });
-Object.defineProperty(exports, "deductLiquidationBonus", { enumerable: true, get: function () { return liquidation_1.deductLiquidationBonus; } });
-Object.defineProperty(exports, "toAssetAmount", { enumerable: true, get: function () { return liquidation_1.toAssetAmount; } });
-Object.defineProperty(exports, "toAssetWorth", { enumerable: true, get: function () { return liquidation_1.toAssetWorth; } });
-Object.defineProperty(exports, "prepareAssetInfo", { enumerable: true, get: function () { return liquidation_1.prepareAssetInfo; } });
-Object.defineProperty(exports, "findAssetById", { enumerable: true, get: function () { return liquidation_1.findAssetById; } });
-Object.defineProperty(exports, "selectGreatestAssets", { enumerable: true, get: function () { return liquidation_1.selectGreatestAssets; } });
-Object.defineProperty(exports, "calculateAssetsValues", { enumerable: true, get: function () { return liquidation_1.calculateAssetsValues; } });
+__exportStar(require("./api/math"), exports);
+__exportStar(require("./api/liquidation"), exports);
 // Parser
-var parser_1 = require("./api/parser");
-Object.defineProperty(exports, "createAssetData", { enumerable: true, get: function () { return parser_1.createAssetData; } });
-Object.defineProperty(exports, "createAssetConfig", { enumerable: true, get: function () { return parser_1.createAssetConfig; } });
-Object.defineProperty(exports, "parseMasterData", { enumerable: true, get: function () { return parser_1.parseMasterData; } });
-Object.defineProperty(exports, "parseUserData", { enumerable: true, get: function () { return parser_1.parseUserData; } });
-Object.defineProperty(exports, "parseUserLiteData", { enumerable: true, get: function () { return parser_1.parseUserLiteData; } });
+__exportStar(require("./api/parser"), exports);
+// Oracles
+__exportStar(require("./api/parsers"), exports);
 // Prices
-var prices_1 = require("./api/prices");
-Object.defineProperty(exports, "getPrices", { enumerable: true, get: function () { return prices_1.getPrices; } });
+__exportStar(require("./api/prices"), exports);
+// Feeds utils
+__exportStar(require("./api/feeds"), exports);
 // Contracts' wrappers
-var JettonWallet_1 = require("./contracts/JettonWallet");
-Object.defineProperty(exports, "JettonWallet", { enumerable: true, get: function () { return JettonWallet_1.JettonWallet; } });
-var MasterContract_1 = require("./contracts/MasterContract");
-Object.defineProperty(exports, "Evaa", { enumerable: true, get: function () { return MasterContract_1.Evaa; } });
-var UserContract_1 = require("./contracts/UserContract");
-Object.defineProperty(exports, "EvaaUser", { enumerable: true, get: function () { return UserContract_1.EvaaUser; } });
+__exportStar(require("./contracts"), exports);
 // Rewards contracts wrappers
+var EvaaRewards_1 = require("./rewards/EvaaRewards");
+Object.defineProperty(exports, "EvaaUserRewards", { enumerable: true, get: function () { return EvaaRewards_1.EvaaUserRewards; } });
+var JettonMinter_1 = require("./rewards/JettonMinter");
+Object.defineProperty(exports, "RewardJettonMinter", { enumerable: true, get: function () { return JettonMinter_1.JettonMinter; } });
+var JettonWallet_1 = require("./rewards/JettonWallet");
+Object.defineProperty(exports, "RewardJettonWallet", { enumerable: true, get: function () { return JettonWallet_1.JettonWallet; } });
 var RewardMaster_1 = require("./rewards/RewardMaster");
 Object.defineProperty(exports, "RewardMaster", { enumerable: true, get: function () { return RewardMaster_1.RewardMaster; } });
 var RewardUser_1 = require("./rewards/RewardUser");
 Object.defineProperty(exports, "RewardUser", { enumerable: true, get: function () { return RewardUser_1.RewardUser; } });
-var JettonMinter_1 = require("./rewards/JettonMinter");
-Object.defineProperty(exports, "RewardJettonMinter", { enumerable: true, get: function () { return JettonMinter_1.JettonMinter; } });
-var JettonWallet_2 = require("./rewards/JettonWallet");
-Object.defineProperty(exports, "RewardJettonWallet", { enumerable: true, get: function () { return JettonWallet_2.JettonWallet; } });
-var EvaaRewards_1 = require("./rewards/EvaaRewards");
-Object.defineProperty(exports, "EvaaUserRewards", { enumerable: true, get: function () { return EvaaRewards_1.EvaaUserRewards; } });
-var User_1 = require("./types/User");
-Object.defineProperty(exports, "BalanceType", { enumerable: true, get: function () { return User_1.BalanceType; } });
-Object.defineProperty(exports, "BalanceChangeType", { enumerable: true, get: function () { return User_1.BalanceChangeType; } });
+// Types
+__exportStar(require("./types/Master"), exports);
+__exportStar(require("./types/User"), exports);
 // Constants
 __exportStar(require("./constants/general"), exports);
 __exportStar(require("./constants/pools"), exports);
 __exportStar(require("./constants/assets"), exports);
-__exportStar(require("./utils/utils"), exports);
 __exportStar(require("./prices"), exports);
+__exportStar(require("./utils/utils"), exports);
 // Utils
 var tonConnectSender_1 = require("./utils/tonConnectSender");
 Object.defineProperty(exports, "getLastSentBoc", { enumerable: true, get: function () { return tonConnectSender_1.getLastSentBoc; } });

package/dist/prices/Oracle.interface.d.ts

@@ -0,0 +1,9 @@
+import { Dictionary } from '@ton/core';
+import { Prices } from '.';
+import { PoolAssetConfig, PoolAssetsConfig } from '../types/Master';
+import { FetchConfig } from '../utils/utils';
+export interface Oracle {
+    getPricesForLiquidate(realPrincipals: Dictionary<bigint, bigint>, fetchConfig?: FetchConfig): Promise<Prices>;
+    getPricesForSupplyWithdraw(realPrincipals: Dictionary<bigint, bigint>, supplyAsset: PoolAssetConfig | undefined, withdrawAsset: PoolAssetConfig | undefined, collateralToDebt: boolean, fetchConfig?: FetchConfig): Promise<Prices>;
+    getPrices(assets: PoolAssetsConfig, fetchConfig?: FetchConfig): Promise<Prices>;
+}

package/dist/prices/Oracle.interface.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/prices/Prices.d.ts

@@ -1,9 +1,11 @@
-import { Cell, Dictionary } from "@ton/core";
-import { PoolAssetConfig } from "../types/Master";
+import { Cell, Dictionary } from '@ton/core';
+import { PoolAssetConfig } from '../types/Master';
 export declare class Prices {
     #private;
-    constructor(dict: Dictionary<bigint, bigint>, dataCell: Cell);
+    constructor(dict: Dictionary<bigint, bigint>, dataCell: Cell, minPublishTime?: bigint, maxPublishTime?: bigint);
     get dict(): Dictionary<bigint, bigint>;
     get dataCell(): Cell;
+    get minPublishTime(): bigint | undefined;
+    get maxPublishTime(): bigint | undefined;
     getAssetPrice<T extends bigint | PoolAssetConfig>(asset: T): bigint | undefined;
 }

package/dist/prices/Prices.js

@@ -10,17 +10,21 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Prices_instances, _Prices_dict, _Prices_dataCell, _Prices_extractAssetId;
+var _Prices_instances, _Prices_dict, _Prices_dataCell, _Prices_minPublishTime, _Prices_maxPublishTime, _Prices_extractAssetId;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Prices = void 0;
 const core_1 = require("@ton/core");
 class Prices {
-    constructor(dict, dataCell) {
+    constructor(dict, dataCell, minPublishTime, maxPublishTime) {
         _Prices_instances.add(this);
         _Prices_dict.set(this, void 0);
         _Prices_dataCell.set(this, void 0);
+        _Prices_minPublishTime.set(this, void 0);
+        _Prices_maxPublishTime.set(this, void 0);
         __classPrivateFieldSet(this, _Prices_dict, dict, "f");
         __classPrivateFieldSet(this, _Prices_dataCell, dataCell, "f");
+        __classPrivateFieldSet(this, _Prices_minPublishTime, minPublishTime, "f");
+        __classPrivateFieldSet(this, _Prices_maxPublishTime, maxPublishTime, "f");
     }
     get dict() {
         const dict = core_1.Dictionary.empty();
@@ -32,12 +36,18 @@ class Prices {
     get dataCell() {
         return new core_1.Cell(__classPrivateFieldGet(this, _Prices_dataCell, "f"));
     }
+    get minPublishTime() {
+        return __classPrivateFieldGet(this, _Prices_minPublishTime, "f");
+    }
+    get maxPublishTime() {
+        return __classPrivateFieldGet(this, _Prices_maxPublishTime, "f");
+    }
     getAssetPrice(asset) {
         const assetId = __classPrivateFieldGet(this, _Prices_instances, "m", _Prices_extractAssetId).call(this, asset);
         return __classPrivateFieldGet(this, _Prices_dict, "f").get(assetId);
     }
 }
 exports.Prices = Prices;
-_Prices_dict = new WeakMap(), _Prices_dataCell = new WeakMap(), _Prices_instances = new WeakSet(), _Prices_extractAssetId = function _Prices_extractAssetId(asset) {
+_Prices_dict = new WeakMap(), _Prices_dataCell = new WeakMap(), _Prices_minPublishTime = new WeakMap(), _Prices_maxPublishTime = new WeakMap(), _Prices_instances = new WeakSet(), _Prices_extractAssetId = function _Prices_extractAssetId(asset) {
     return typeof asset === 'bigint' ? asset : asset.assetId;
 };

package/dist/prices/PricesCollector.d.ts

@@ -1,12 +1,22 @@
 import { Dictionary } from "@ton/core";
-import { PoolAssetConfig, PoolAssetsConfig, PoolConfig } from "../types/Master";
+import { ExtendedEvaaOracle, PoolAssetConfig, PoolAssetsConfig } from "../types/Master";
+import { FetchConfig } from '../utils/utils';
+import { Oracle } from "./Oracle.interface";
+import { Prices } from "./Prices";
 import { PriceSource } from "./sources";
 import { PriceSourcesConfig } from "./Types";
-import { Prices } from "./Prices";
-export declare class PricesCollector {
+export type PricesCollectorConfig = {
+    poolAssetsConfig: PoolAssetsConfig;
+    minimalOracles: number;
+    evaaOracles: ExtendedEvaaOracle[];
+    sourcesConfig?: PriceSourcesConfig;
+    additionalPriceSources?: PriceSource[];
+};
+export declare class PricesCollector implements Oracle {
     #private;
-    constructor(poolConfig?: PoolConfig, sourcesConfig?: PriceSourcesConfig, additionalPriceSources?: PriceSource[]);
-    getPricesForLiquidate(realPrincipals: Dictionary<bigint, bigint>, retries?: number, timeout?: number): Promise<Prices>;
-    getPricesForWithdraw(realPrincipals: Dictionary<bigint, bigint>, withdrawAsset: PoolAssetConfig, collateralToDebt?: boolean, retries?: number, timeout?: number): Promise<Prices>;
-    getPrices(assets?: PoolAssetsConfig, retries?: number, timeout?: number): Promise<Prices>;
+    constructor(config: PricesCollectorConfig);
+    getPricesForLiquidate(realPrincipals: Dictionary<bigint, bigint>, fetchConfig?: FetchConfig): Promise<Prices>;
+    getPricesForWithdraw(realPrincipals: Dictionary<bigint, bigint>, withdrawAsset: PoolAssetConfig, collateralToDebt?: boolean, fetchConfig?: FetchConfig): Promise<Prices>;
+    getPricesForSupplyWithdraw(realPrincipals: Dictionary<bigint, bigint>, supplyAsset: PoolAssetConfig | undefined, withdrawAsset: PoolAssetConfig | undefined, collateralToDebt: boolean, fetchConfig?: FetchConfig): Promise<Prices>;
+    getPrices(assets?: PoolAssetsConfig, fetchConfig?: FetchConfig): Promise<Prices>;
 }

package/dist/prices/PricesCollector.js

@@ -10,40 +10,40 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PricesCollector_instances, _PricesCollector_prices, _PricesCollector_poolConfig, _PricesCollector_sourcesConfig, _PricesCollector_priceSources, _PricesCollector_getPricesByAssetList, _PricesCollector_collectPrices, _PricesCollector_filterPrices, _PricesCollector_filterEmptyPrincipalsAndAssets;
+var _PricesCollector_instances, _PricesCollector_prices, _PricesCollector_poolAssetsConfig, _PricesCollector_sourcesConfig, _PricesCollector_priceSources, _PricesCollector_minimalOracles, _PricesCollector_getPricesByAssetList, _PricesCollector_collectPrices, _PricesCollector_collectPricesWithValidation, _PricesCollector_filterPrices, _PricesCollector_filterEmptyPrincipalsAndAssets;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PricesCollector = void 0;
 const core_1 = require("@ton/core");
-const pools_1 = require("../constants/pools");
-const Types_1 = require("./Types");
-const utils_1 = require("./utils");
-const utils_2 = require("../utils/utils");
-const Prices_1 = require("./Prices");
 const math_1 = require("../api/math");
+const utils_1 = require("../utils/utils");
+const Prices_1 = require("./Prices");
+const Types_1 = require("./Types");
+const utils_2 = require("./utils");
 class PricesCollector {
-    constructor(poolConfig = pools_1.MAINNET_POOL_CONFIG, sourcesConfig = Types_1.DefaultPriceSourcesConfig, additionalPriceSources) {
+    constructor(config) {
         _PricesCollector_instances.add(this);
         _PricesCollector_prices.set(this, void 0);
-        _PricesCollector_poolConfig.set(this, void 0);
+        _PricesCollector_poolAssetsConfig.set(this, void 0);
         _PricesCollector_sourcesConfig.set(this, void 0);
         _PricesCollector_priceSources.set(this, void 0);
-        __classPrivateFieldSet(this, _PricesCollector_poolConfig, poolConfig, "f");
-        __classPrivateFieldSet(this, _PricesCollector_sourcesConfig, sourcesConfig, "f");
-        __classPrivateFieldSet(this, _PricesCollector_priceSources, (0, utils_1.generatePriceSources)(__classPrivateFieldGet(this, _PricesCollector_sourcesConfig, "f"), __classPrivateFieldGet(this, _PricesCollector_poolConfig, "f").oracles), "f");
-        if (additionalPriceSources) {
-            __classPrivateFieldGet(this, _PricesCollector_priceSources, "f").push(...additionalPriceSources);
+        _PricesCollector_minimalOracles.set(this, void 0);
+        __classPrivateFieldSet(this, _PricesCollector_poolAssetsConfig, config.poolAssetsConfig, "f");
+        __classPrivateFieldSet(this, _PricesCollector_sourcesConfig, config.sourcesConfig ?? Types_1.DefaultPriceSourcesConfig, "f");
+        __classPrivateFieldSet(this, _PricesCollector_priceSources, (0, utils_2.generatePriceSources)(__classPrivateFieldGet(this, _PricesCollector_sourcesConfig, "f"), config.evaaOracles), "f");
+        __classPrivateFieldSet(this, _PricesCollector_minimalOracles, config.minimalOracles, "f");
+        if (config.additionalPriceSources) {
+            __classPrivateFieldGet(this, _PricesCollector_priceSources, "f").push(...config.additionalPriceSources);
         }
         __classPrivateFieldSet(this, _PricesCollector_prices, [], "f");
     }
-    // TODO Make UserData class and incapsulate raw bigintegers
-    async getPricesForLiquidate(realPrincipals, retries = 1, timeout = 3000) {
+    async getPricesForLiquidate(realPrincipals, fetchConfig) {
         const assets = __classPrivateFieldGet(this, _PricesCollector_instances, "m", _PricesCollector_filterEmptyPrincipalsAndAssets).call(this, realPrincipals);
         if (assets.includes(undefined)) {
             throw new Error("User from another pool");
         }
-        return await this.getPrices(assets.map(x => x), retries, timeout);
+        return await this.getPrices(assets.map(x => x), fetchConfig);
     }
-    async getPricesForWithdraw(realPrincipals, withdrawAsset, collateralToDebt = false, retries = 1, timeout = 3000) {
+    async getPricesForWithdraw(realPrincipals, withdrawAsset, collateralToDebt = false, fetchConfig) {
         let assets = __classPrivateFieldGet(this, _PricesCollector_instances, "m", _PricesCollector_filterEmptyPrincipalsAndAssets).call(this, realPrincipals);
         if ((0, math_1.checkNotInDebtAtAll)(realPrincipals) && (realPrincipals.get(withdrawAsset.assetId) ?? 0n) > 0n && !collateralToDebt) {
             return new Prices_1.Prices(core_1.Dictionary.empty(), core_1.Cell.EMPTY);
@@ -57,74 +57,90 @@ class PricesCollector {
         if (collateralToDebt && assets.length == 1) {
             throw new Error("Cannot debt only one supplied asset");
         }
-        return await this.getPrices(assets.map(x => x), retries, timeout);
+        return await this.getPrices(assets.map(x => x), fetchConfig);
     }
-    async getPrices(assets = __classPrivateFieldGet(this, _PricesCollector_poolConfig, "f").poolAssetsConfig, retries = 1, timeout = 3000) {
-        console.debug('[getPrices] Assets length', assets.length);
-        if (assets.length == 0) {
+    async getPricesForSupplyWithdraw(realPrincipals, supplyAsset, withdrawAsset, collateralToDebt, fetchConfig) {
+        // Используем ту же логику, что и getPricesForWithdraw, но supplyAsset не используется
+        let assets = __classPrivateFieldGet(this, _PricesCollector_instances, "m", _PricesCollector_filterEmptyPrincipalsAndAssets).call(this, realPrincipals);
+        if ((0, math_1.checkNotInDebtAtAll)(realPrincipals) && withdrawAsset && (realPrincipals.get(withdrawAsset.assetId) ?? 0n) > 0n && !collateralToDebt) {
             return new Prices_1.Prices(core_1.Dictionary.empty(), core_1.Cell.EMPTY);
         }
-        for (let i = 0; i <= retries; i++) { // attemts = retries + 1
-            if (!__classPrivateFieldGet(this, _PricesCollector_prices, "f") || __classPrivateFieldGet(this, _PricesCollector_instances, "m", _PricesCollector_filterPrices).call(this) < __classPrivateFieldGet(this, _PricesCollector_poolConfig, "f").minimalOracles) {
-                //console.debug('[getPrices] Load prices attemp', i + 1)
-                if (i > 0) {
-                    await (0, utils_2.delay)(timeout);
-                }
-                await __classPrivateFieldGet(this, _PricesCollector_instances, "m", _PricesCollector_collectPrices).call(this);
-            }
-            else {
-                break;
-            }
+        if (assets.includes(undefined)) {
+            throw new Error("User from another pool");
         }
-        if (__classPrivateFieldGet(this, _PricesCollector_prices, "f").length < __classPrivateFieldGet(this, _PricesCollector_poolConfig, "f").minimalOracles) {
-            throw new Error(`Error per updating prices, valid ${__classPrivateFieldGet(this, _PricesCollector_prices, "f").length} of ${__classPrivateFieldGet(this, _PricesCollector_poolConfig, "f").minimalOracles}`); // if still not enough data after retries
+        if (withdrawAsset && !assets.includes(withdrawAsset)) {
+            assets.push(withdrawAsset);
+        }
+        if (collateralToDebt && assets.length == 1) {
+            throw new Error("Cannot debt only one supplied asset");
+        }
+        return await this.getPrices(assets.map(x => x), fetchConfig);
+    }
+    async getPrices(assets = __classPrivateFieldGet(this, _PricesCollector_poolAssetsConfig, "f"), fetchConfig) {
+        if (assets.length == 0) {
+            return new Prices_1.Prices(core_1.Dictionary.empty(), core_1.Cell.EMPTY);
+        }
+        await __classPrivateFieldGet(this, _PricesCollector_instances, "m", _PricesCollector_collectPricesWithValidation).call(this, fetchConfig);
+        if (__classPrivateFieldGet(this, _PricesCollector_prices, "f").length < __classPrivateFieldGet(this, _PricesCollector_minimalOracles, "f")) {
+            throw new Error(`Error per updating prices, valid ${__classPrivateFieldGet(this, _PricesCollector_prices, "f").length} of ${__classPrivateFieldGet(this, _PricesCollector_minimalOracles, "f")}`);
         }
         const prices = __classPrivateFieldGet(this, _PricesCollector_instances, "m", _PricesCollector_getPricesByAssetList).call(this, assets);
         return new Prices_1.Prices(prices.dict, prices.dataCell);
     }
 }
 exports.PricesCollector = PricesCollector;
-_PricesCollector_prices = new WeakMap(), _PricesCollector_poolConfig = new WeakMap(), _PricesCollector_sourcesConfig = new WeakMap(), _PricesCollector_priceSources = new WeakMap(), _PricesCollector_instances = new WeakSet(), _PricesCollector_getPricesByAssetList = function _PricesCollector_getPricesByAssetList(assets) {
-    //console.debug('[getPricesByAssetList] start')
-    let pricesFiltered = __classPrivateFieldGet(this, _PricesCollector_prices, "f"); // for strict check this.#prices.filter(x => assets.every(asset => x.dict.has(asset.assetId)));
-    if (pricesFiltered.length < __classPrivateFieldGet(this, _PricesCollector_poolConfig, "f").minimalOracles) {
+_PricesCollector_prices = new WeakMap(), _PricesCollector_poolAssetsConfig = new WeakMap(), _PricesCollector_sourcesConfig = new WeakMap(), _PricesCollector_priceSources = new WeakMap(), _PricesCollector_minimalOracles = new WeakMap(), _PricesCollector_instances = new WeakSet(), _PricesCollector_getPricesByAssetList = function _PricesCollector_getPricesByAssetList(assets) {
+    let pricesFiltered = __classPrivateFieldGet(this, _PricesCollector_prices, "f");
+    if (pricesFiltered.length < __classPrivateFieldGet(this, _PricesCollector_minimalOracles, "f")) {
         throw new Error("Not enough price data");
     }
-    if (pricesFiltered.length > __classPrivateFieldGet(this, _PricesCollector_poolConfig, "f").minimalOracles) {
+    if (pricesFiltered.length > __classPrivateFieldGet(this, _PricesCollector_minimalOracles, "f")) {
         const sortedByTimestamp = pricesFiltered.slice().sort((a, b) => b.timestamp - a.timestamp);
-        const newerPrices = sortedByTimestamp.slice(0, __classPrivateFieldGet(this, _PricesCollector_poolConfig, "f").minimalOracles);
+        const newerPrices = sortedByTimestamp.slice(0, __classPrivateFieldGet(this, _PricesCollector_minimalOracles, "f"));
         pricesFiltered = newerPrices.sort((a, b) => a.oracleId - b.oracleId);
     }
     const medianData = assets.map((asset) => ({
         assetId: asset.assetId,
-        medianPrice: (0, utils_1.getMedianPrice)(pricesFiltered, asset.assetId),
+        medianPrice: (0, utils_2.getMedianPrice)(pricesFiltered, asset.assetId),
     }));
     const nonEmptymedianData = medianData.filter(x => x.medianPrice != null);
-    const packedMedianData = (0, utils_1.packAssetsData)(nonEmptymedianData);
+    const packedMedianData = (0, utils_2.packAssetsData)(nonEmptymedianData);
     const oraclesData = pricesFiltered.map((x) => ({
         oracle: { id: x.oracleId, pubkey: x.pubkey },
         data: { timestamp: x.timestamp, prices: x.dict },
         signature: x.signature,
     }));
-    const packedOracleData = (0, utils_1.packOraclesData)(oraclesData, nonEmptymedianData.map(x => x.assetId));
+    const packedOracleData = (0, utils_2.packOraclesData)(oraclesData, nonEmptymedianData.map(x => x.assetId));
     const dict = core_1.Dictionary.empty();
     for (const medianDataAsset of nonEmptymedianData) {
         dict.set(medianDataAsset.assetId, medianDataAsset.medianPrice);
     }
     return {
         dict: dict,
-        dataCell: (0, utils_1.packPrices)(packedMedianData, packedOracleData)
+        dataCell: (0, utils_2.packPrices)(packedMedianData, packedOracleData)
     };
-}, _PricesCollector_collectPrices = async function _PricesCollector_collectPrices() {
-    try {
-        __classPrivateFieldSet(this, _PricesCollector_prices, await Promise.any(__classPrivateFieldGet(this, _PricesCollector_priceSources, "f").map(x => (0, utils_1.collectAndFilterPrices)(x, __classPrivateFieldGet(this, _PricesCollector_poolConfig, "f")))), "f");
-        return true;
+}, _PricesCollector_collectPrices = async function _PricesCollector_collectPrices(fetchConfig) {
+    for (const priceSource of __classPrivateFieldGet(this, _PricesCollector_priceSources, "f")) {
+        try {
+            __classPrivateFieldSet(this, _PricesCollector_prices, await (0, utils_1.proxyFetchRetries)((0, utils_2.collectAndFilterPrices)(priceSource, __classPrivateFieldGet(this, _PricesCollector_minimalOracles, "f"), fetchConfig), fetchConfig), "f");
+            return true;
+        }
+        catch (error) {
+            // Try next source
+            continue;
+        }
     }
-    catch { }
     return false;
+}, _PricesCollector_collectPricesWithValidation = async function _PricesCollector_collectPricesWithValidation(fetchConfig) {
+    if (!__classPrivateFieldGet(this, _PricesCollector_prices, "f") || __classPrivateFieldGet(this, _PricesCollector_instances, "m", _PricesCollector_filterPrices).call(this) < __classPrivateFieldGet(this, _PricesCollector_minimalOracles, "f")) {
+        const success = await __classPrivateFieldGet(this, _PricesCollector_instances, "m", _PricesCollector_collectPrices).call(this, fetchConfig);
+        if (!success || __classPrivateFieldGet(this, _PricesCollector_prices, "f").length < __classPrivateFieldGet(this, _PricesCollector_minimalOracles, "f")) {
+            throw new Error(`Failed to collect sufficient prices: ${__classPrivateFieldGet(this, _PricesCollector_prices, "f")?.length || 0} of ${__classPrivateFieldGet(this, _PricesCollector_minimalOracles, "f")}`);
+        }
+    }
 }, _PricesCollector_filterPrices = function _PricesCollector_filterPrices() {
-    __classPrivateFieldSet(this, _PricesCollector_prices, __classPrivateFieldGet(this, _PricesCollector_prices, "f").filter((0, utils_1.verifyPricesTimestamp)()), "f");
+    __classPrivateFieldSet(this, _PricesCollector_prices, __classPrivateFieldGet(this, _PricesCollector_prices, "f").filter((0, utils_2.verifyPricesTimestamp)()), "f");
     return __classPrivateFieldGet(this, _PricesCollector_prices, "f").length;
 }, _PricesCollector_filterEmptyPrincipalsAndAssets = function _PricesCollector_filterEmptyPrincipalsAndAssets(principals) {
-    return principals.keys().filter(x => principals.get(x) != 0n).map(x => __classPrivateFieldGet(this, _PricesCollector_poolConfig, "f").poolAssetsConfig.find(asset => asset.assetId == x));
+    return principals.keys().filter(x => principals.get(x) != 0n).map(x => __classPrivateFieldGet(this, _PricesCollector_poolAssetsConfig, "f").find(asset => asset.assetId == x));
 };

package/dist/prices/PythCollector.d.ts

@@ -0,0 +1,22 @@
+import { HexString } from '@pythnetwork/hermes-client';
+import { Dictionary } from '@ton/core';
+import { OracleConfig } from '../api/parsers/PythOracleParser';
+import { PoolAssetConfig, PoolAssetsConfig } from '../types/Master';
+import { FetchConfig } from '../utils/utils';
+import { Oracle } from './Oracle.interface';
+import { Prices } from './Prices';
+import { PythPriceSourcesConfig } from './Types';
+export type PythCollectorConfig = {
+    poolAssetsConfig: PoolAssetsConfig;
+    pythOracle: OracleConfig;
+    pythConfig: PythPriceSourcesConfig;
+};
+export declare class PythCollector implements Oracle {
+    #private;
+    constructor(config: PythCollectorConfig);
+    getPricesForLiquidate(realPrincipals: Dictionary<bigint, bigint>, fetchConfig?: FetchConfig): Promise<Prices>;
+    getPricesForSupplyWithdraw(realPrincipals: Dictionary<bigint, bigint>, supplyAsset: PoolAssetConfig | undefined, withdrawAsset: PoolAssetConfig | undefined, collateralToDebt: boolean, fetchConfig?: FetchConfig): Promise<Prices>;
+    getPrices(assets?: PoolAssetsConfig, fetchConfig?: FetchConfig): Promise<Prices>;
+    getPricesForWithdraw(realPrincipals: Dictionary<bigint, bigint>, withdrawAsset: PoolAssetConfig, collateralToDebt?: boolean, fetchConfig?: FetchConfig): Promise<Prices>;
+    createRequiredFeedsList(evaaIds: bigint[]): HexString[];
+}