@evaafi/sdk 0.9.2 → 0.9.3

package/dist/api/feeds.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { HexString } from '@pythnetwork/hermes-client';
 import { Dictionary } from '@ton/ton';
 import { Buffer } from 'buffer';

package/dist/api/prices.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { HexString } from '@pythnetwork/hermes-client';
 import { Cell } from '@ton/core';
 import { Buffer } from 'buffer';

package/dist/constants/general/index.js

@@ -79,7 +79,7 @@ exports.FEES = {
     // Supply
     SUPPLY: (0, core_1.toNano)('0.25'),
     // Supply & Withdraw
-    SUPPLY_WITHDRAW: (0, core_1.toNano)('0.45'),
+    SUPPLY_WITHDRAW: (0, core_1.toNano)('0.48'),
     // Liquidation
     LIQUIDATION: (0, core_1.toNano)('0.8'),
     LIQUIDATION_JETTON: (0, core_1.toNano)('1'),

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

@@ -3,11 +3,11 @@ import { ExtendedEvaaOracle } from '../../types/Master';
 export declare const EVAA_MASTER_MAINNET: Address;
 export declare const MAINNET_VERSION = 9;
 export declare const EVAA_LP_MAINNET: Address;
-export declare const EVAA_LP_MAINNET_VERSION = 5;
+export declare const EVAA_LP_MAINNET_VERSION = 6;
 export declare const EVAA_ALTS_MAINNET: Address;
-export declare const EVAA_ALTS_MAINNET_VERSION = 3;
+export declare const EVAA_ALTS_MAINNET_VERSION = 4;
 export declare const EVAA_STABLE_MAINNET: Address;
-export declare const STABLE_VERSION = 1;
+export declare const STABLE_VERSION = 3;
 export declare const EVAA_TOB_MAINNET: Address;
 export declare const EVAA_TOB_VERSION = 0;
 export declare const EVAA_PYTH_TOB_MAINNET: Address;

package/dist/constants/general/mainnet.js

@@ -7,13 +7,13 @@ exports.EVAA_MASTER_MAINNET = core_1.Address.parse('EQC8rUZqR_pWV1BylWUlPNBzyiTY
 exports.MAINNET_VERSION = 9;
 /* LP POOL */
 exports.EVAA_LP_MAINNET = core_1.Address.parse('EQBIlZX2URWkXCSg3QF2MJZU-wC5XkBoLww-hdWk2G37Jc6N');
-exports.EVAA_LP_MAINNET_VERSION = 5;
+exports.EVAA_LP_MAINNET_VERSION = 6;
 /* ALTS POOL */
 exports.EVAA_ALTS_MAINNET = core_1.Address.parse('EQANURVS3fhBO9bivig34iyJQi97FhMbpivo1aUEAS2GYSu-');
-exports.EVAA_ALTS_MAINNET_VERSION = 3;
+exports.EVAA_ALTS_MAINNET_VERSION = 4;
 /* STABLE POOL */
 exports.EVAA_STABLE_MAINNET = core_1.Address.parse('EQCdIdXf1kA_2Hd9mbGzSFDEPA-Px-et8qTWHEXgRGo0K3zd');
-exports.STABLE_VERSION = 1;
+exports.STABLE_VERSION = 3;
 /* EVAA V8 Trail of Bits Audited Pool */
 exports.EVAA_TOB_MAINNET = core_1.Address.parse('EQDrSGBBunrWNmIdHgdaA7Weu4yUr8Ckw3C9wNWobq7osn3H');
 exports.EVAA_TOB_VERSION = 0;
@@ -45,7 +45,7 @@ exports.ORACLES_MAINNET = [
         pubkey: Buffer.from('9cbf8374cf1f2cf17110134871d580198416e101683f4a61f54cf2a3e4e32070', 'hex'),
     },
 ];
-exports.PYTH_ORACLE_MAINNET = core_1.Address.parse('EQBU6k8HH6yX4Jf3d18swWbnYr31D3PJI7PgjXT-flsKHqql');
+exports.PYTH_ORACLE_MAINNET = core_1.Address.parse('EQA5NPyjfZztDm8jcTBwTAU9NGsgJEkw19z61yecX0TlseSB');
 exports.ORACLES_LP = exports.ORACLES_MAINNET;
 exports.ORACLES_ALTS = exports.ORACLES_MAINNET;
 exports.LENDING_CODE = core_1.Cell.fromBoc(Buffer.from('b5ee9c72c1010e0100fd000d12182a555a6065717691969efd0114ff00f4a413f4bcf2c80b010202c8050202039f740403001ff2f8276a2687d2018fd201800f883b840051d38642c678b64e4400780e58fc10802faf07f80e59fa801e78b096664c02078067c07c100627a7978402014807060007a0ddb0c60201c709080013a0fd007a026900aa90400201200b0a0031b8e1002191960aa00b9e2ca007f4042796d225e8019203f6010201200d0c000bf7c147d2218400b9d10e86981fd201840b07f8138d809797976a2687d2029116382f970fd9178089910374daf81b619fd20182c7883b8701981684100627910eba56001797a6a6ba610fd8200e8768f76a9f6aa00cc2a32a8292878809bef2f1889f883bbcdeb86f01', 'hex'))[0];

package/dist/constants/pools/mainnet.js

@@ -42,17 +42,17 @@ exports.MAINNET_POOL_CONFIG = {
         poolAssetsConfig: exports.MAINNET_POOL_ASSETS_CONFIG,
         pythOracle: {
             feedsMap: new Map([
-                [feeds_1.FEED_ID.TON, { assetId: assets_1.ASSET_ID.TON, feedId: '0x0' }],
-                [feeds_1.FEED_ID.USDT, { assetId: assets_1.ASSET_ID.USDT, feedId: '0x0' }],
+                [feeds_1.FEED_ID.TON, { assetId: assets_1.ASSET_ID.TON, feedId: "0x0" }],
+                [feeds_1.FEED_ID.USDT, { assetId: assets_1.ASSET_ID.USDT, feedId: "0x0" }],
                 [feeds_1.FEED_ID.tsTON, { assetId: assets_1.ASSET_ID.tsTON, feedId: feeds_1.FEED_ID.TON }],
-                [feeds_1.FEED_ID.tsUSDe, { assetId: assets_1.ASSET_ID.tsUSDe, feedId: feeds_1.FEED_ID.USDT }],
+                [feeds_1.FEED_ID.stTON, { assetId: assets_1.ASSET_ID.stTON, feedId: feeds_1.FEED_ID.TON }],
+                [feeds_1.FEED_ID.USDe, { assetId: assets_1.ASSET_ID.USDe, feedId: "0x0" }],
+                [feeds_1.FEED_ID.tsUSDe, { assetId: assets_1.ASSET_ID.tsUSDe, feedId: feeds_1.FEED_ID.USDe }],
             ]),
             pythAddress: general_1.PYTH_ORACLE_MAINNET,
             allowedRefTokens: core_1.Dictionary.empty()
                 .set(assets_1.ASSET_ID.jUSDT, assets_1.ASSET_ID.USDT)
                 .set(assets_1.ASSET_ID.jUSDC, assets_1.ASSET_ID.USDT)
-                .set(assets_1.ASSET_ID.USDe, assets_1.ASSET_ID.USDT)
-                .set(assets_1.ASSET_ID.stTON, assets_1.ASSET_ID.tsTON),
         },
     }),
     poolAssetsConfig: exports.MAINNET_POOL_ASSETS_CONFIG,

package/dist/contracts/PythMaster.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { HexString } from '@pythnetwork/hermes-client';
 import { Address, Cell, ContractProvider, Dictionary, Sender } from '@ton/core';
 import { PythOracleInfo } from '../api/parsers/PythOracleParser';

package/dist/contracts/PythOracle.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Address, Cell, Contract, ContractProvider } from '@ton/core';
 export declare class PythOracle implements Contract {
     readonly address: Address;

package/dist/oracles/Types.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import type { PriceUpdate } from '@pythnetwork/hermes-client';
 import type { Cell, Dictionary } from '@ton/core';
 /**

package/dist/oracles/collectors/ClassicCollector.js

@@ -137,7 +137,7 @@ _ClassicCollector_prices = new WeakMap(), _ClassicCollector_poolAssetsConfig = n
 }, _ClassicCollector_collectPrices = async function _ClassicCollector_collectPrices(fetchConfig) {
     for (const priceSource of __classPrivateFieldGet(this, _ClassicCollector_priceSources, "f")) {
         try {
-            __classPrivateFieldSet(this, _ClassicCollector_prices, await (0, utils_1.proxyFetchRetries)((0, utils_2.collectAndFilterPrices)(priceSource, __classPrivateFieldGet(this, _ClassicCollector_minimalOracles, "f"), fetchConfig), fetchConfig), "f");
+            __classPrivateFieldSet(this, _ClassicCollector_prices, await (0, utils_1.proxyFetchRetries)(() => (0, utils_2.collectAndFilterPrices)(priceSource, __classPrivateFieldGet(this, _ClassicCollector_minimalOracles, "f"), fetchConfig), fetchConfig), "f");
             return true;
         }
         catch (error) {

package/dist/oracles/collectors/PythCollector.js

@@ -13,7 +13,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PythCollector_instances, _PythCollector_parsedFeedsMap, _PythCollector_pythConfig, _PythCollector_poolAssetsConfig, _PythCollector_allowedRefTokens, _PythCollector_assetToFeeds, _PythCollector_getPythFeedsUpdates, _PythCollector_fetchPythUpdatesWithRetry, _PythCollector_filterEmptyPrincipalsAndAssets;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PythCollector = void 0;
-const hermes_client_1 = require("@pythnetwork/hermes-client");
 const core_1 = require("@ton/core");
 const math_1 = require("../../api/math");
 const prices_1 = require("../../api/prices");
@@ -238,12 +237,27 @@ _PythCollector_parsedFeedsMap = new WeakMap(), _PythCollector_pythConfig = new W
  * @returns binary - buffer of feeds update, parsed - json feeds data
  */
 async function _PythCollector_getPythFeedsUpdates(feedIds) {
-    const latestPriceUpdates = await Promise.any(__classPrivateFieldGet(this, _PythCollector_pythConfig, "f").pythEndpoints.map((x) => new hermes_client_1.HermesClient(x).getLatestPriceUpdates(feedIds, { encoding: 'hex' })));
+    const pythUpdateResponse = await Promise.any(__classPrivateFieldGet(this, _PythCollector_pythConfig, "f").pythEndpoints.map((x) => {
+        const endpoint = new URL(`./v2/updates/price/latest?encoding=hex`, `${x}${x.endsWith('/') ? '' : '/'}`);
+        for (const feedId of feedIds) {
+            endpoint.searchParams.append('ids[]', feedId);
+        }
+        return fetch(endpoint.toString());
+    }));
+    if (!pythUpdateResponse.ok) {
+        const text = await pythUpdateResponse.text();
+        throw new Error(`Failed to fetch Pyth updates: ${text}`);
+    }
+    const latestPriceUpdates = (await pythUpdateResponse.json());
     const parsed = latestPriceUpdates['parsed'];
-    const binary = Buffer.from(latestPriceUpdates.binary.data[0], 'hex');
+    const binaryHex = latestPriceUpdates?.binary?.data?.[0];
+    if (!binaryHex) {
+        throw new Error('Pyth update missing binary data');
+    }
+    const binary = Buffer.from(binaryHex, 'hex');
     return { binary, parsed };
 }, _PythCollector_fetchPythUpdatesWithRetry = async function _PythCollector_fetchPythUpdatesWithRetry(requiredFeeds, fetchConfig) {
-    return (0, utils_1.proxyFetchRetries)(__classPrivateFieldGet(this, _PythCollector_instances, "m", _PythCollector_getPythFeedsUpdates).call(this, requiredFeeds), fetchConfig);
+    return (0, utils_1.proxyFetchRetries)(() => __classPrivateFieldGet(this, _PythCollector_instances, "m", _PythCollector_getPythFeedsUpdates).call(this, requiredFeeds), fetchConfig);
 }, _PythCollector_filterEmptyPrincipalsAndAssets = function _PythCollector_filterEmptyPrincipalsAndAssets(principals) {
     return principals
         .keys()

package/dist/oracles/prices/PythPrices.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { HexString } from '@pythnetwork/hermes-client';
 import { PoolAssetConfig } from '../../types/Master';
 import { AbstractPrices, PriceParameters } from './AbstractPrices';

package/dist/oracles/sources/Backend.js

@@ -14,19 +14,22 @@ class BackendPriceSource extends PriceSource_1.PriceSource {
         return data.map((outputData) => this.parsePrices(outputData));
     }
     async loadOracleData(fetchConfig = utils_1.DefaultFetchConfig) {
-        const fetchPromise = fetch(`https://${this._endpoint}/api/prices`, {
-            headers: { accept: 'application/json' },
-            signal: AbortSignal.timeout(fetchConfig.timeout),
-        }).then(async (response) => {
-            const resp = await response.json();
-            const data = resp;
+        return await (0, utils_1.proxyFetchRetries)(async () => {
+            const response = await fetch(`https://${this._endpoint}/api/prices`, {
+                headers: { accept: 'application/json' },
+                signal: AbortSignal.timeout(fetchConfig.timeout),
+            });
+            if (!response.ok) {
+                const body = await response.text().catch(() => '');
+                throw new Error(`HTTP error! status: ${response.status}${body ? `, body: ${body}` : ''}`);
+            }
+            const data = (await response.json());
             let outputData = [];
             for (const nft of this._nfts) {
                 outputData.push({ oracleId: nft.id, data: data[nft.address] });
             }
             return outputData;
-        });
-        return await (0, utils_1.proxyFetchRetries)(fetchPromise, fetchConfig);
+        }, fetchConfig);
     }
     parsePrices(outputData) {
         try {

package/dist/oracles/sources/Icp.js

@@ -9,18 +9,22 @@ class IcpPriceSource extends _1.BackendPriceSource {
         this.priceSourceName = 'IcpPriceSource';
     }
     async loadOracleData(fetchConfig = utils_1.DefaultFetchConfig) {
-        const fetchPromise = fetch(`https://${this._endpoint}/prices`, {
-            headers: { accept: 'application/json' },
-            signal: AbortSignal.timeout(fetchConfig.timeout)
-        }).then(async (response) => {
+        return await (0, utils_1.proxyFetchRetries)(async () => {
+            const response = await fetch(`https://${this._endpoint}/prices`, {
+                headers: { accept: 'application/json' },
+                signal: AbortSignal.timeout(fetchConfig.timeout)
+            });
+            if (!response.ok) {
+                const body = await response.text().catch(() => '');
+                throw new Error(`HTTP error! status: ${response.status}${body ? `, body: ${body}` : ''}`);
+            }
             const data = (await response.json());
             let outputData = [];
             for (const nft of this._nfts) {
                 outputData.push({ oracleId: nft.id, data: data[nft.address] });
             }
             return outputData;
-        });
-        return await (0, utils_1.proxyFetchRetries)(fetchPromise, fetchConfig);
+        }, fetchConfig);
     }
 }
 exports.IcpPriceSource = IcpPriceSource;

package/dist/oracles/utils.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Cell, Dictionary, Slice } from '@ton/core';
 import { EvaaOracle, ExtendedEvaaOracle } from '../types/Master';
 import { FetchConfig } from '../utils/utils';

package/dist/rewards/RewardMaster.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Address, Cell, Contract, ContractProvider, Sender, StateInit } from '@ton/ton';
 import { Maybe } from '@ton/ton/dist/utils/maybe';
 import { EvaaRewardsConfig } from '../types/MasterRewards';

package/dist/rewards/RewardUser.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Address, Cell, Contract, ContractProvider, Sender, StateInit } from '@ton/ton';
 import { Maybe } from '@ton/ton/dist/utils/maybe';
 import { EvaaUserRewardsConfig } from '../types/UserRewards';

package/dist/types/Master.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Address, Cell, Dictionary } from '@ton/core';
 import { AbstractCollector } from '../oracles';
 export { FeedMapItem, parseFeedsMapDict } from '../api/feeds';

package/dist/types/MasterRewards.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Address, Cell } from '@ton/ton';
 import { PoolAssetConfig } from './Master';
 export type EvaaRewardsConfig = {

package/dist/types/UserRewards.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Address, Cell } from '@ton/ton';
 import { PoolAssetConfig } from './Master';
 export type EvaaUserRewardsConfig = {

package/dist/utils/sha256BigInt.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="node" />
-/// <reference types="node" />
 export declare function sha256Hash(input: string): bigint;
 export declare function bigIntToBuffer(value: bigint): Buffer;

package/dist/utils/utils.d.ts

@@ -7,5 +7,5 @@ export interface FetchConfig {
     timeout: number;
 }
 export declare const DefaultFetchConfig: FetchConfig;
-export declare function proxyFetchRetries<T>(fetch: Promise<T>, config?: FetchConfig): Promise<T>;
+export declare function proxyFetchRetries<T>(factory: () => Promise<T>, config?: FetchConfig): Promise<T>;
 export declare function isValidSubaccountId(subaccountId: number): boolean;

package/dist/utils/utils.js

@@ -18,14 +18,16 @@ exports.DefaultFetchConfig = {
     retries: 3,
     timeout: 1000,
 };
-async function proxyFetchRetries(fetch, config = exports.DefaultFetchConfig) {
+async function proxyFetchRetries(factory, config = exports.DefaultFetchConfig) {
     let lastError = null;
     for (let attempt = 0; attempt <= config.retries; attempt++) {
         try {
             const timeoutPromise = new Promise((_, reject) => {
                 setTimeout(() => reject(new Error('Request timeout')), config.timeout);
             });
-            return await Promise.race([fetch, timeoutPromise]);
+            // Create a fresh promise per attempt
+            const result = await Promise.race([factory(), timeoutPromise]);
+            return result;
         }
         catch (error) {
             lastError = error instanceof Error ? error : new Error(String(error));

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evaafi/sdk",
-    "version": "0.9.2",
+    "version": "0.9.3",
     "description": "The EVAA SDK is designed to easily integrate with the EVAA lending protocol on TON blockchain.",
     "main": "dist/index.js",
     "files": [
@@ -41,5 +41,6 @@
         "@pythnetwork/pyth-ton-js": "^0.1.2",
         "@ton/ton": "14.0.0",
         "dotenv": "16.4.5"
-    }
+    },
+    "packageManager": "yarn@4.9.2+sha512.1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c"
 }

package/src/constants/general/index.ts

@@ -75,7 +75,7 @@ export const FEES = {
     SUPPLY: toNano('0.25'),
 
     // Supply & Withdraw
-    SUPPLY_WITHDRAW: toNano('0.45'),
+    SUPPLY_WITHDRAW: toNano('0.48'),
 
     // Liquidation
     LIQUIDATION: toNano('0.8'),

package/src/constants/general/mainnet.ts

@@ -7,15 +7,15 @@ export const MAINNET_VERSION = 9;
 
 /* LP POOL */
 export const EVAA_LP_MAINNET = Address.parse('EQBIlZX2URWkXCSg3QF2MJZU-wC5XkBoLww-hdWk2G37Jc6N');
-export const EVAA_LP_MAINNET_VERSION = 5;
+export const EVAA_LP_MAINNET_VERSION = 6;
 
 /* ALTS POOL */
 export const EVAA_ALTS_MAINNET = Address.parse('EQANURVS3fhBO9bivig34iyJQi97FhMbpivo1aUEAS2GYSu-');
-export const EVAA_ALTS_MAINNET_VERSION = 3;
+export const EVAA_ALTS_MAINNET_VERSION = 4;
 
 /* STABLE POOL */
 export const EVAA_STABLE_MAINNET = Address.parse('EQCdIdXf1kA_2Hd9mbGzSFDEPA-Px-et8qTWHEXgRGo0K3zd');
-export const STABLE_VERSION = 1;
+export const STABLE_VERSION = 3;
 
 /* EVAA V8 Trail of Bits Audited Pool */
 export const EVAA_TOB_MAINNET = Address.parse('EQDrSGBBunrWNmIdHgdaA7Weu4yUr8Ckw3C9wNWobq7osn3H');
@@ -52,7 +52,7 @@ export const ORACLES_MAINNET: ExtendedEvaaOracle[] = [
     },
 ];
 
-export const PYTH_ORACLE_MAINNET: Address = Address.parse('EQBU6k8HH6yX4Jf3d18swWbnYr31D3PJI7PgjXT-flsKHqql');
+export const PYTH_ORACLE_MAINNET: Address = Address.parse('EQA5NPyjfZztDm8jcTBwTAU9NGsgJEkw19z61yecX0TlseSB');
 
 export const ORACLES_LP: ExtendedEvaaOracle[] = ORACLES_MAINNET;
 export const ORACLES_ALTS: ExtendedEvaaOracle[] = ORACLES_MAINNET;

package/src/constants/pools/mainnet.ts

@@ -91,17 +91,17 @@ export const MAINNET_POOL_CONFIG: PoolConfig = {
         poolAssetsConfig: MAINNET_POOL_ASSETS_CONFIG,
         pythOracle: {
             feedsMap: new Map<HexString, FeedMapItem>([
-                [FEED_ID.TON, { assetId: ASSET_ID.TON, feedId: '0x0' }],
-                [FEED_ID.USDT, { assetId: ASSET_ID.USDT, feedId: '0x0' }],
+                [FEED_ID.TON, { assetId: ASSET_ID.TON, feedId: "0x0" }],
+                [FEED_ID.USDT, { assetId: ASSET_ID.USDT, feedId: "0x0" }],
                 [FEED_ID.tsTON, { assetId: ASSET_ID.tsTON, feedId: FEED_ID.TON }],
-                [FEED_ID.tsUSDe, { assetId: ASSET_ID.tsUSDe, feedId: FEED_ID.USDT }],
+                [FEED_ID.stTON, { assetId: ASSET_ID.stTON, feedId: FEED_ID.TON }],
+                [FEED_ID.USDe, { assetId: ASSET_ID.USDe, feedId: "0x0" }],
+                [FEED_ID.tsUSDe, { assetId: ASSET_ID.tsUSDe, feedId: FEED_ID.USDe }],
             ]),
             pythAddress: PYTH_ORACLE_MAINNET,
             allowedRefTokens: Dictionary.empty<bigint, bigint>()
                 .set(ASSET_ID.jUSDT, ASSET_ID.USDT)
                 .set(ASSET_ID.jUSDC, ASSET_ID.USDT)
-                .set(ASSET_ID.USDe, ASSET_ID.USDT)
-                .set(ASSET_ID.stTON, ASSET_ID.tsTON),
         },
     }),
     poolAssetsConfig: MAINNET_POOL_ASSETS_CONFIG,

package/src/oracles/collectors/ClassicCollector.ts

@@ -184,7 +184,7 @@ export class ClassicCollector extends AbstractCollector {
         for (const priceSource of this.#priceSources) {
             try {
                 this.#prices = await proxyFetchRetries(
-                    collectAndFilterPrices(priceSource, this.#minimalOracles, fetchConfig),
+                    () => collectAndFilterPrices(priceSource, this.#minimalOracles, fetchConfig),
                     fetchConfig,
                 );
                 return true;

package/src/oracles/collectors/PythCollector.ts

@@ -1,4 +1,4 @@
-import { HermesClient, HexString, PriceUpdate } from '@pythnetwork/hermes-client';
+import { HexString, PriceUpdate } from '@pythnetwork/hermes-client';
 import { Dictionary } from '@ton/core';
 import { checkNotInDebtAtAll } from '../../api/math';
 import { OracleConfig } from '../../api/parsers/PythOracleParser';
@@ -275,15 +275,29 @@ export class PythCollector extends AbstractCollector {
      * @returns binary - buffer of feeds update, parsed - json feeds data
      */
     async #getPythFeedsUpdates(feedIds: HexString[]): Promise<PythFeedUpdateType> {
-        const latestPriceUpdates: PriceUpdate = await Promise.any(
-            this.#pythConfig.pythEndpoints.map((x) =>
-                new HermesClient(x).getLatestPriceUpdates(feedIds, { encoding: 'hex' }),
-            ),
+        const pythUpdateResponse = await Promise.any(
+            this.#pythConfig.pythEndpoints.map((x) => {
+                const endpoint = new URL(`./v2/updates/price/latest?encoding=hex`, `${x}${x.endsWith('/') ? '' : '/'}`);
+
+                for (const feedId of feedIds) {
+                    endpoint.searchParams.append('ids[]', feedId);
+                }
+
+                return fetch(endpoint.toString());
+            }),
         );
+        if (!pythUpdateResponse.ok) {
+            const text = await pythUpdateResponse.text();
+            throw new Error(`Failed to fetch Pyth updates: ${text}`);
+        }
 
+        const latestPriceUpdates = (await pythUpdateResponse.json()) as PriceUpdate;
         const parsed = latestPriceUpdates['parsed'];
-        const binary = Buffer.from(latestPriceUpdates.binary.data[0], 'hex');
-
+        const binaryHex = latestPriceUpdates?.binary?.data?.[0];
+        if (!binaryHex) {
+            throw new Error('Pyth update missing binary data');
+        }
+        const binary = Buffer.from(binaryHex, 'hex');
         return { binary, parsed };
     }
 
@@ -291,7 +305,7 @@ export class PythCollector extends AbstractCollector {
         requiredFeeds: HexString[],
         fetchConfig?: FetchConfig,
     ): Promise<PythFeedUpdateType> {
-        return proxyFetchRetries(this.#getPythFeedsUpdates(requiredFeeds), fetchConfig);
+        return proxyFetchRetries(() => this.#getPythFeedsUpdates(requiredFeeds), fetchConfig);
     }
 
     /**

package/src/oracles/sources/Backend.ts

@@ -12,22 +12,23 @@ export class BackendPriceSource extends PriceSource {
     }
 
     async loadOracleData(fetchConfig: FetchConfig = DefaultFetchConfig): Promise<OutputData[]> {
-        const fetchPromise = fetch(`https://${this._endpoint}/api/prices`, {
-            headers: { accept: 'application/json' },
-            signal: AbortSignal.timeout(fetchConfig.timeout),
-        }).then(async (response) => {
-            const resp = await response.json();
-            const data = resp as Record<string, string>;
-            let outputData: OutputData[] = [];
+        return await proxyFetchRetries(async () => {
+            const response = await fetch(`https://${this._endpoint}/api/prices`, {
+                headers: { accept: 'application/json' },
+                signal: AbortSignal.timeout(fetchConfig.timeout),
+            });
+            if (!response.ok) {
+                const body = await response.text().catch(() => '');
+                throw new Error(`HTTP error! status: ${response.status}${body ? `, body: ${body}` : ''}`);
+            }
+            const data = (await response.json()) as Record<string, string>;
 
+            let outputData: OutputData[] = [];
             for (const nft of this._nfts) {
                 outputData.push({ oracleId: nft.id, data: data[nft.address] });
             }
-
             return outputData;
-        });
-
-        return await proxyFetchRetries(fetchPromise, fetchConfig);
+        }, fetchConfig);
     }
 
     parsePrices(outputData: OutputData): RawPriceData {

package/src/oracles/sources/Icp.ts

@@ -5,22 +5,23 @@ export class IcpPriceSource extends BackendPriceSource {
     protected priceSourceName: string = 'IcpPriceSource';
 
     async loadOracleData(fetchConfig: FetchConfig = DefaultFetchConfig): Promise<OutputData[]> {
-        const fetchPromise = fetch(`https://${this._endpoint}/prices`, {
-            headers: { accept: 'application/json' },
-            signal: AbortSignal.timeout(fetchConfig.timeout)
-        }).then(async (response) => {
+        return await proxyFetchRetries(async () => {
+            const response = await fetch(`https://${this._endpoint}/prices`, {
+                headers: { accept: 'application/json' },
+                signal: AbortSignal.timeout(fetchConfig.timeout)
+            });
+            if (!response.ok) {
+                const body = await response.text().catch(() => '');
+                throw new Error(`HTTP error! status: ${response.status}${body ? `, body: ${body}` : ''}`);
+            }
             const data = (await response.json()) as Record<string, string>;
 
             let outputData: OutputData[] = [];
-
             for (const nft of this._nfts) {
                 outputData.push({oracleId: nft.id, data: data[nft.address] })
             }
-
             return outputData;
-        });
-
-        return await proxyFetchRetries(fetchPromise, fetchConfig);
+        }, fetchConfig);
     }
 }
 

package/src/utils/utils.ts

@@ -23,7 +23,7 @@ export const DefaultFetchConfig: FetchConfig = {
     timeout: 1000,
 };
 
-export async function proxyFetchRetries<T>(fetch: Promise<T>, config: FetchConfig = DefaultFetchConfig) {
+export async function proxyFetchRetries<T>(factory: () => Promise<T>, config: FetchConfig = DefaultFetchConfig) {
     let lastError: Error | null = null;
     for (let attempt = 0; attempt <= config.retries; attempt++) {
         try {
@@ -31,7 +31,9 @@ export async function proxyFetchRetries<T>(fetch: Promise<T>, config: FetchConfi
                 setTimeout(() => reject(new Error('Request timeout')), config.timeout);
             });
 
-            return await Promise.race([fetch, timeoutPromise]);
+            // Create a fresh promise per attempt
+            const result = await Promise.race([factory(), timeoutPromise]);
+            return result;
         } catch (error) {
             lastError = error instanceof Error ? error : new Error(String(error));