@paraswap/dex-lib 4.2.31 → 4.2.33

package/build/dex/miro-migrator/constants.d.ts

@@ -1,2 +1,2 @@
-export declare const MIRO_MIGRATION_GAS_COST = 35000;
+export declare const MIRO_MIGRATION_GAS_COST = 95000;
 export declare const TRANSFER_TOPIC = "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef";

package/build/dex/miro-migrator/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TRANSFER_TOPIC = exports.MIRO_MIGRATION_GAS_COST = void 0;
-exports.MIRO_MIGRATION_GAS_COST = 35_000;
+exports.MIRO_MIGRATION_GAS_COST = 95_000;
 exports.TRANSFER_TOPIC = '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef';
 //# sourceMappingURL=constants.js.map

package/build/dex/miro-migrator/miro-migrator-pool.d.ts

@@ -4,7 +4,6 @@ import { Log, Logger } from '../../types';
 import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
 import { IDexHelper } from '../../dex-helper/idex-helper';
 import { PoolState } from './types';
-import { Contract } from 'ethers';
 export declare class MiroMigratorEventPool extends StatefulEventSubscriber<PoolState> {
     readonly parentName: string;
     protected network: number;
@@ -12,16 +11,17 @@ export declare class MiroMigratorEventPool extends StatefulEventSubscriber<PoolS
     protected migratorAddress: string;
     protected xyzAddress: string;
     protected transferTopic: string;
+    protected migratorInterface: Interface;
     protected xyzInterface: Interface;
-    protected xyzContract: Contract;
     handlers: {
         [event: string]: (event: any, state: DeepReadonly<PoolState>, log: Readonly<Log>) => DeepReadonly<PoolState> | null;
     };
     logDecoder: (log: Log) => any;
-    constructor(parentName: string, network: number, dexHelper: IDexHelper, logger: Logger, migratorAddress: string, xyzAddress: string, transferTopic: string, xyzInterface?: Interface, xyzContract?: Contract);
+    addressesSubscribed: string[];
+    constructor(parentName: string, network: number, dexHelper: IDexHelper, logger: Logger, migratorAddress: string, xyzAddress: string, transferTopic: string, migratorInterface?: Interface, xyzInterface?: Interface);
     protected processLog(state: DeepReadonly<PoolState>, log: Readonly<Log>): Promise<DeepReadonly<PoolState> | null>;
     generateState(blockNumber?: number | 'latest'): Promise<DeepReadonly<PoolState>>;
     getOrGenerateState(blockNumber: number): Promise<PoolState>;
-    handleTransferTo(event: any, state: DeepReadonly<PoolState>): Promise<DeepReadonly<PoolState>>;
-    handleTransferFrom(event: any, state: DeepReadonly<PoolState>): Promise<DeepReadonly<PoolState>>;
+    handleTransferTo(event: any, state: DeepReadonly<PoolState>, log: Readonly<Log>): Promise<DeepReadonly<PoolState>>;
+    handleTransferFrom(event: any, state: DeepReadonly<PoolState>, log: Readonly<Log>): Promise<DeepReadonly<PoolState>>;
 }

package/build/dex/miro-migrator/miro-migrator-pool.js

@@ -7,8 +7,9 @@ exports.MiroMigratorEventPool = void 0;
 const abi_1 = require("@ethersproject/abi");
 const utils_1 = require("../../utils");
 const stateful_event_subscriber_1 = require("../../stateful-event-subscriber");
+const decoders_1 = require("../../lib/decoders");
+const MiroMigrator_abi_json_1 = __importDefault(require("../../abi/miro-migrator/MiroMigrator.abi.json"));
 const erc20_json_1 = __importDefault(require("../../abi/erc20.json"));
-const ethers_1 = require("ethers");
 class MiroMigratorEventPool extends stateful_event_subscriber_1.StatefulEventSubscriber {
     parentName;
     network;
@@ -16,20 +17,21 @@ class MiroMigratorEventPool extends stateful_event_subscriber_1.StatefulEventSub
     migratorAddress;
     xyzAddress;
     transferTopic;
+    migratorInterface;
     xyzInterface;
-    xyzContract;
     handlers = {};
     logDecoder;
-    constructor(parentName, network, dexHelper, logger, migratorAddress, xyzAddress, transferTopic, xyzInterface = new abi_1.Interface(erc20_json_1.default), xyzContract = new ethers_1.Contract(xyzAddress, erc20_json_1.default, dexHelper.provider)) {
-        super(parentName, 'xyz', dexHelper, logger);
+    addressesSubscribed;
+    constructor(parentName, network, dexHelper, logger, migratorAddress, xyzAddress, transferTopic, migratorInterface = new abi_1.Interface(MiroMigrator_abi_json_1.default), xyzInterface = new abi_1.Interface(erc20_json_1.default)) {
+        super(parentName, 'state', dexHelper, logger);
         this.parentName = parentName;
         this.network = network;
         this.dexHelper = dexHelper;
         this.migratorAddress = migratorAddress;
         this.xyzAddress = xyzAddress;
         this.transferTopic = transferTopic;
+        this.migratorInterface = migratorInterface;
         this.xyzInterface = xyzInterface;
-        this.xyzContract = xyzContract;
         this.logDecoder = (log) => this.xyzInterface.parseLog(log);
         this.addressesSubscribed = [xyzAddress];
     }
@@ -38,11 +40,11 @@ class MiroMigratorEventPool extends stateful_event_subscriber_1.StatefulEventSub
             const event = this.logDecoder(log);
             if (log.topics[0] === this.transferTopic &&
                 event.args.dst.toLowerCase() === this.migratorAddress.toLowerCase()) {
-                return this.handleTransferTo(event, state);
+                return this.handleTransferTo(event, state, log);
             }
             if (log.topics[0] === this.transferTopic &&
                 event.args.src.toLowerCase() === this.migratorAddress.toLowerCase()) {
-                return this.handleTransferFrom(event, state);
+                return this.handleTransferFrom(event, state, log);
             }
             return null;
         }
@@ -52,10 +54,17 @@ class MiroMigratorEventPool extends stateful_event_subscriber_1.StatefulEventSub
         }
     }
     async generateState(blockNumber = 'latest') {
-        const balance = await this.xyzContract.balanceOf(this.migratorAddress, {
-            blockTag: blockNumber,
-        });
-        return { balance: balance.toBigInt() };
+        const calls = [
+            {
+                target: this.xyzAddress,
+                callData: this.xyzInterface.encodeFunctionData('balanceOf', [
+                    this.migratorAddress,
+                ]),
+                decodeFunction: decoders_1.uint256ToBigInt,
+            },
+        ];
+        const [balance] = await this.dexHelper.multiWrapper.tryAggregate(true, calls, blockNumber);
+        return { balance: balance.returnData };
     }
     async getOrGenerateState(blockNumber) {
         let state = this.getState(blockNumber);
@@ -65,12 +74,12 @@ class MiroMigratorEventPool extends stateful_event_subscriber_1.StatefulEventSub
         }
         return state;
     }
-    async handleTransferTo(event, state) {
+    async handleTransferTo(event, state, log) {
         return {
             balance: state.balance + BigInt(event.args.wad),
         };
     }
-    async handleTransferFrom(event, state) {
+    async handleTransferFrom(event, state, log) {
         return {
             balance: state.balance - BigInt(event.args.wad),
         };

package/build/dex/miro-migrator/miro-migrator-pool.js.map

@@ -1 +1 @@
-{"version":3,"file":"miro-migrator-pool.js","sourceRoot":"","sources":["../../../src/dex/miro-migrator/miro-migrator-pool.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"miro-migrator-pool.js","sourceRoot":"","sources":["../../../src/dex/miro-migrator/miro-migrator-pool.ts"],"names":[],"mappings":"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"}

package/build/dex/miro-migrator/miro-migrator.js

@@ -126,10 +126,7 @@ class MiroMigrator extends simple_exchange_1.SimpleExchange {
         ];
     }
     getCalldataGasCost(poolPrices) {
-        return (CALLDATA_GAS_COST.FUNCTION_SELECTOR +
-            CALLDATA_GAS_COST.AMOUNT +
-            CALLDATA_GAS_COST.OFFSET_SMALL +
-            CALLDATA_GAS_COST.ZERO);
+        return CALLDATA_GAS_COST.DEX_NO_PAYLOAD;
     }
     getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
         return {
@@ -149,6 +146,7 @@ class MiroMigrator extends simple_exchange_1.SimpleExchange {
             dexFuncHasRecipient: false,
             exchangeData: swapData,
             targetExchange: this.migratorAddress,
+            returnAmountPos: undefined,
         };
     }
     async getTopPoolsForToken(tokenAddress, limit) {

package/build/dex/miro-migrator/miro-migrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"miro-migrator.js","sourceRoot":"","sources":["../../../src/dex/miro-migrator/miro-migrator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"miro-migrator.js","sourceRoot":"","sources":["../../../src/dex/miro-migrator/miro-migrator.ts"],"names":[],"mappings":"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"}

package/build/dex/uniswap-v2/rpc-pool-tracker.d.ts

@@ -4,34 +4,39 @@ import { Address, PoolLiquidity, Token } from '../../types';
 import { UniswapV2 } from './uniswap-v2';
 type CachedPool = {
     address: Address;
+    updatedAt: number;
     token0: Token;
     token1: Token;
 };
 type Pool = {
     address: Address;
-    token0: Token;
-    token1: Token;
-    reserves: {
-        updatedAt: null | number;
-        reserve0: bigint;
-        reserve1: bigint;
-    };
+    token0Address: Address;
+    token0Decimals: number;
+    token1Address: Address;
+    token1Decimals: number;
+    reserve0: bigint;
+    reserve1: bigint;
+    reservesUpdatedAt: number | null;
+    updatedAt: number;
 };
 export declare class UniswapV2RpcPoolTracker extends UniswapV2 {
     protected network: Network;
     protected dexHelper: IDexHelper;
     protected isDynamicFees: boolean;
     private cacheKey;
+    protected allPoolsLength: number;
     pools: Record<string, Pool>;
     readonly isStatePollingDex = true;
-    private updateInterval;
+    private newPoolsUpdateInterval;
+    private poolsAgeUpdateInterval;
     constructor(network: Network, dexKey: string, dexHelper: IDexHelper, isDynamicFees?: boolean);
     initializePricing(): Promise<void>;
     updatePools(initialize?: boolean): Promise<void>;
     initPools(fromIndex: number, toIndex: number): Promise<void>;
     getCachedPools(fromIndex: number, toIndex: number): Promise<void>;
     updatePoolState(): Promise<void>;
-    getAllPoolsLength(): Promise<number>;
+    updatePoolsAge(): Promise<void>;
+    getOnChainPoolsLength(): Promise<number>;
     fetchPools(fromIndex: number, toIndex: number): Promise<Record<string, CachedPool>>;
     updatePoolsReserves(pools: Pool[]): Promise<void>;
     getTopPoolsForToken(tokenAddress: Address, limit: number): Promise<PoolLiquidity[]>;

package/build/dex/uniswap-v2/rpc-pool-tracker.js

@@ -5,9 +5,14 @@ const abi_1 = require("@ethersproject/abi");
 const constants_1 = require("../../constants");
 const decoders_1 = require("../../lib/decoders");
 const uniswap_v2_1 = require("./uniswap-v2");
-const UPDATE_POOL_INTERVAL = 10 * 60 * 1000; // 10 minutes
-const INIT_BATCH_SIZE = 1000;
+// also used to check if reserves should be updated
+const UPDATE_NEW_POOLS_INTERVAL = 10 * 60 * 1000; // 10 minutes
+const UPDATE_POOLS_AGE_INTERVAL = 24 * 60 * 60 * 1000; // 24 hours
+const WRITE_BATCH_SIZE = 1_000;
 const READ_BATCH_SIZE = 10_000;
+// pool is valid if last update was less than 180 days ago, otherwise pool is considered stale and will not be used on pt
+const VALID_POOLS_AGE = 1000 * 60 * 60 * 24 * 180; // 180 days
+const MAX_RESERVES_POOLS_UPDATE = 5_000;
 const FactoryABI = [
     {
         constant: true,
@@ -104,28 +109,44 @@ class UniswapV2RpcPoolTracker extends uniswap_v2_1.UniswapV2 {
     dexHelper;
     isDynamicFees;
     cacheKey;
+    allPoolsLength = 0;
     pools = {};
     isStatePollingDex = true;
-    updateInterval = null;
+    newPoolsUpdateInterval = null;
+    poolsAgeUpdateInterval = null;
     constructor(network, dexKey, dexHelper, isDynamicFees = false) {
         super(network, dexKey, dexHelper, isDynamicFees);
         this.network = network;
         this.dexHelper = dexHelper;
         this.isDynamicFees = isDynamicFees;
         this.cacheKey =
-            `${constants_1.CACHE_PREFIX}_${this.dexKey}_${this.network}_pools`.toLowerCase();
+            `${constants_1.CACHE_PREFIX}_${this.network}_${this.dexKey}_pools`.toLowerCase();
     }
     async initializePricing() {
         this.logger.info(`PancakeSwapV2: Initializing pools for ${this.dexKey} on ${this.network}...`);
         if (!this.dexHelper.config.isSlave) {
             await this.updatePools(true);
-            this.updateInterval = setInterval(async () => {
-                await this.updatePools();
-            }, UPDATE_POOL_INTERVAL);
+            await this.updatePoolsAge();
+            this.newPoolsUpdateInterval = setInterval(async () => {
+                try {
+                    await this.updatePools();
+                }
+                catch (error) {
+                    this.logger.error(`Error updating new pools for ${this.dexKey} on ${this.network}: ${error}`);
+                }
+            }, UPDATE_NEW_POOLS_INTERVAL);
+            this.poolsAgeUpdateInterval = setInterval(async () => {
+                try {
+                    await this.updatePoolsAge();
+                }
+                catch (error) {
+                    this.logger.error(`Error updating pools age for ${this.dexKey} on ${this.network}: ${error}`);
+                }
+            }, UPDATE_POOLS_AGE_INTERVAL);
         }
     }
     async updatePools(initialize = false) {
-        const allPools = await this.getAllPoolsLength();
+        const allPools = await this.getOnChainPoolsLength();
         const allCachedPools = await this.dexHelper.cache.hlen(this.cacheKey);
         const missingPools = allPools - allCachedPools;
         if (!initialize && missingPools > 1_000) {
@@ -137,9 +158,9 @@ class UniswapV2RpcPoolTracker extends uniswap_v2_1.UniswapV2 {
     }
     async initPools(fromIndex, toIndex) {
         this.logger.info(`Initializing pools from ${fromIndex} to ${toIndex}...`);
-        for (let i = fromIndex; i < toIndex; i += INIT_BATCH_SIZE) {
-            this.logger.info(`Fetching pools from ${i} to ${Math.min(i + INIT_BATCH_SIZE, toIndex)}`);
-            const fetchedPools = await this.fetchPools(i, Math.min(i + INIT_BATCH_SIZE, toIndex));
+        for (let i = fromIndex; i < toIndex; i += WRITE_BATCH_SIZE) {
+            this.logger.info(`Fetching pools from ${i} to ${Math.min(i + WRITE_BATCH_SIZE, toIndex)}`);
+            const fetchedPools = await this.fetchPools(i, Math.min(i + WRITE_BATCH_SIZE, toIndex));
             const pools = Object.fromEntries(Object.entries(fetchedPools).map(([key, value]) => [
                 key,
                 JSON.stringify(value),
@@ -157,30 +178,92 @@ class UniswapV2RpcPoolTracker extends uniswap_v2_1.UniswapV2 {
             }
             this.logger.info(`Getting cached pools from ${batchStart} to ${batchEnd}`);
             const pools = await this.dexHelper.cache.hmget(this.cacheKey, keys);
+            const minValidUpdatedAt = Date.now() - VALID_POOLS_AGE;
             pools.forEach((pool, idx) => {
-                const index = batchStart + idx;
-                this.pools[index] = pool
-                    ? {
-                        ...JSON.parse(pool),
-                        reserves: {
+                if (pool) {
+                    const index = batchStart + idx;
+                    const parsedPool = JSON.parse(pool);
+                    if (parsedPool && parsedPool.updatedAt > minValidUpdatedAt) {
+                        this.pools[index] = {
+                            address: parsedPool.address,
+                            token0Address: parsedPool.token0.address,
+                            token0Decimals: parsedPool.token0.decimals,
+                            token1Address: parsedPool.token1.address,
+                            token1Decimals: parsedPool.token1.decimals,
+                            updatedAt: parsedPool.updatedAt,
                             reserve0: 0n,
                             reserve1: 0n,
-                            updatedAt: null,
-                        },
+                            reservesUpdatedAt: null,
+                        };
                     }
-                    : null;
+                }
+                else {
+                    this.logger.warn(`Pool with index ${batchStart + idx} not found in cache`);
+                }
+                this.allPoolsLength++;
             });
         }
     }
     async updatePoolState() {
         await this.updatePools();
-        const allPools = Object.keys(this.pools).length;
+        const allPools = this.allPoolsLength;
         const allCachedPools = await this.dexHelper.cache.hlen(this.cacheKey);
         if (allPools < allCachedPools) {
             await this.getCachedPools(allPools, allCachedPools);
         }
     }
-    async getAllPoolsLength() {
+    async updatePoolsAge() {
+        this.logger.info(`Starting update pools age for ${this.dexKey} on ${this.network}...`);
+        const allPools = this.allPoolsLength;
+        const allCachedPools = await this.dexHelper.cache.hlen(this.cacheKey);
+        if (allPools < allCachedPools) {
+            await this.getCachedPools(allPools, allCachedPools);
+        }
+        const poolsIndexes = Object.keys(this.pools);
+        this.logger.info(`Updating pools age for ${poolsIndexes.length} pools on ${this.network}...`);
+        // batch poolsCalldata and process in chunks to avoid huge amounts of multi-calls
+        for (let batchStart = 0; batchStart < poolsIndexes.length; batchStart += WRITE_BATCH_SIZE) {
+            const batchEnd = Math.min(batchStart + WRITE_BATCH_SIZE, poolsIndexes.length);
+            const batchIndexes = poolsIndexes.slice(batchStart, batchEnd);
+            this.logger.info(`Updating pools age for ${batchStart}-${batchEnd} pools on ${this.network}...`);
+            const batchCalldata = batchIndexes.map(poolIndex => ({
+                target: this.pools[poolIndex].address,
+                callData: factoryIface.encodeFunctionData('getReserves', []),
+                decodeFunction: (result) => {
+                    return (0, decoders_1.generalDecoder)(result, ['uint112', 'uint112', 'uint32'], 0, res => Number(res[2]));
+                },
+            }));
+            const batchPoolsData = await this.dexHelper.multiWrapper.tryAggregate(true, batchCalldata, undefined, 
+            // as calls are small, should be affordable to use a larger batch size
+            WRITE_BATCH_SIZE);
+            const poolsToUpdate = {};
+            for (let i = 0; i < batchPoolsData.length; i++) {
+                const poolIndex = batchIndexes[i];
+                const updatedAt = batchPoolsData[i].returnData * 1000;
+                if (updatedAt !== this.pools[poolIndex].updatedAt) {
+                    this.pools[poolIndex].updatedAt = updatedAt;
+                    const pool = {
+                        address: this.pools[poolIndex].address,
+                        updatedAt,
+                        token0: {
+                            address: this.pools[poolIndex].token0Address,
+                            decimals: this.pools[poolIndex].token0Decimals,
+                        },
+                        token1: {
+                            address: this.pools[poolIndex].token1Address,
+                            decimals: this.pools[poolIndex].token1Decimals,
+                        },
+                    };
+                    poolsToUpdate[poolIndex] = JSON.stringify(pool);
+                }
+            }
+            if (Object.keys(poolsToUpdate).length > 0) {
+                await this.dexHelper.cache.hmset(this.cacheKey, poolsToUpdate);
+            }
+        }
+        this.logger.info(`Finished update pools age for ${poolsIndexes.length} pools on ${this.network}.`);
+    }
+    async getOnChainPoolsLength() {
         const allPoolsCallData = {
             target: this.factoryAddress,
             callData: factoryIface.encodeFunctionData('allPairsLength', []),
@@ -214,13 +297,19 @@ class UniswapV2RpcPoolTracker extends uniswap_v2_1.UniswapV2 {
                 target: poolResult.returnData,
                 callData: factoryIface.encodeFunctionData('token1', []),
                 decodeFunction: decoders_1.addressDecode,
+            }, {
+                target: poolResult.returnData,
+                callData: factoryIface.encodeFunctionData('getReserves', []),
+                decodeFunction: (result) => {
+                    return (0, decoders_1.generalDecoder)(result, ['uint112', 'uint112', 'uint32'], 0, res => Number(res[2]));
+                },
             });
         }
         const poolsData = await this.dexHelper.multiWrapper.tryAggregate(true, poolsCalldata);
         const tokensSet = new Set();
         for (let i = 0; i < allPoolsResults.length; i++) {
-            const token0 = poolsData[i * 2].returnData.toLowerCase();
-            const token1 = poolsData[i * 2 + 1].returnData.toLowerCase();
+            const token0 = poolsData[i * 3].returnData.toLowerCase();
+            const token1 = poolsData[i * 3 + 1].returnData.toLowerCase();
             tokensSet.add(token0.toLowerCase());
             tokensSet.add(token1.toLowerCase());
         }
@@ -242,11 +331,12 @@ class UniswapV2RpcPoolTracker extends uniswap_v2_1.UniswapV2 {
         const pools = {};
         for (let i = 0; i < allPoolsResults.length; i++) {
             const poolAddress = allPoolsResults[i].returnData.toLowerCase();
-            const token0 = poolsData[i * 2].returnData.toLowerCase();
-            const token1 = poolsData[i * 2 + 1].returnData.toLowerCase();
-            // const [reserve0, reserve1] = pools[i * 3 + 2].returnData as bigint[];
+            const token0 = poolsData[i * 3].returnData.toLowerCase();
+            const token1 = poolsData[i * 3 + 1].returnData.toLowerCase();
+            const updatedAt = poolsData[i * 3 + 2].returnData;
             pools[i + fromIndex] = {
                 address: poolAddress,
+                updatedAt: updatedAt * 1000,
                 token0: {
                     address: token0,
                     decimals: decimals[token0],
@@ -266,50 +356,60 @@ class UniswapV2RpcPoolTracker extends uniswap_v2_1.UniswapV2 {
                 target: pool.address,
                 callData: factoryIface.encodeFunctionData('getReserves', []),
                 decodeFunction: (result) => {
-                    return (0, decoders_1.generalDecoder)(result, ['uint112', 'uint112'], [0n, 0n], res => [BigInt(res[0]), BigInt(res[1])]);
+                    return (0, decoders_1.generalDecoder)(result, ['uint112', 'uint112', 'uint32'], [0n, 0n, 0], res => [BigInt(res[0]), BigInt(res[1]), Number(res[2])]);
                 },
             });
         }
         const results = await this.dexHelper.multiWrapper.tryAggregate(true, callData);
         for (let i = 0; i < pools.length; i++) {
-            const [reserve0, reserve1] = results[i].returnData;
+            const [reserve0, reserve1, updatedAt] = results[i].returnData;
             const pool = pools[i];
-            pool.reserves = {
-                updatedAt: Date.now(),
-                reserve0: reserve0,
-                reserve1: reserve1,
-            };
+            pool.updatedAt = updatedAt * 1000; // convert to ms
+            pool.reserve0 = reserve0;
+            pool.reserve1 = reserve1;
+            pool.reservesUpdatedAt = Date.now();
         }
     }
     async getTopPoolsForToken(tokenAddress, limit) {
         const token = tokenAddress.toLowerCase();
-        let pools = Object.values(this.pools).filter(pool => pool.token0.address === token || pool.token1.address === token);
+        // sort by updateAt with the assumption that pools with good liquidity are updated more frequently
+        let pools = Object.values(this.pools)
+            .filter(pool => pool.token0Address === token || pool.token1Address === token)
+            .sort((a, b) => {
+            return b.updatedAt - a.updatedAt;
+        });
         if (pools.length === 0) {
             return [];
         }
         const now = Date.now();
-        const poolsToUpdate = pools.filter(pool => !pool.reserves.updatedAt ||
-            now - pool.reserves.updatedAt > UPDATE_POOL_INTERVAL);
+        const poolsToUpdate = pools
+            .filter(pool => !pool.reservesUpdatedAt ||
+            now - pool.reservesUpdatedAt > UPDATE_NEW_POOLS_INTERVAL)
+            .slice(0, MAX_RESERVES_POOLS_UPDATE);
         if (poolsToUpdate.length > 0) {
-            await this.updatePoolsReserves(pools);
+            try {
+                this.logger.info(`Started updating reserves for ${poolsToUpdate.length} pools for token ${token} on ${this.network}...`);
+                await this.updatePoolsReserves(poolsToUpdate);
+                this.logger.info(`Finished updating reserves for ${poolsToUpdate.length} pools for token ${token} on ${this.network}...`);
+            }
+            catch (error) {
+                this.logger.error(`Error updating reserves for pools for token ${token} on ${this.network}: ${error}`);
+                return [];
+            }
         }
         pools = pools
             .sort((a, b) => {
-            const aReserve = token === a.token0.address
-                ? a.reserves.reserve0
-                : a.reserves.reserve1;
-            const bReserve = token === b.token0.address
-                ? b.reserves.reserve0
-                : b.reserves.reserve1;
+            const aReserve = token === a.token0Address ? a.reserve0 : a.reserve1;
+            const bReserve = token === b.token0Address ? b.reserve0 : b.reserve1;
             return Number(bReserve - aReserve);
         })
             .slice(0, limit);
         const tokensAmounts = pools
             .map(pool => {
-            const token0 = pool.token0.address;
-            const token1 = pool.token1.address;
-            const reserve0 = pool.reserves.reserve0;
-            const reserve1 = pool.reserves.reserve1;
+            const token0 = pool.token0Address;
+            const token1 = pool.token1Address;
+            const reserve0 = pool.reserve0;
+            const reserve1 = pool.reserve1;
             return [
                 [token0, reserve0],
                 [token1, reserve1],
@@ -318,7 +418,15 @@ class UniswapV2RpcPoolTracker extends uniswap_v2_1.UniswapV2 {
             .flat();
         const usdTokenAmounts = await this.dexHelper.getUsdTokenAmounts(tokensAmounts);
         const poolsWithLiquidity = pools.map((pool, i) => {
-            const connectorToken = token === pool.token0.address ? pool.token1 : pool.token0;
+            const connectorToken = token === pool.token0Address
+                ? {
+                    address: pool.token1Address,
+                    decimals: pool.token1Decimals,
+                }
+                : {
+                    address: pool.token0Address,
+                    decimals: pool.token0Decimals,
+                };
             let token0ReserveUSD = usdTokenAmounts[i * 2];
             let token1ReserveUSD = usdTokenAmounts[i * 2 + 1];
             // fallback to non-empty usd reserves
@@ -340,9 +448,13 @@ class UniswapV2RpcPoolTracker extends uniswap_v2_1.UniswapV2 {
             .slice(0, limit);
     }
     releaseResources() {
-        if (this.updateInterval) {
-            clearInterval(this.updateInterval);
-            this.updateInterval = null;
+        if (this.newPoolsUpdateInterval) {
+            clearInterval(this.newPoolsUpdateInterval);
+            this.newPoolsUpdateInterval = null;
+        }
+        if (this.poolsAgeUpdateInterval) {
+            clearInterval(this.poolsAgeUpdateInterval);
+            this.poolsAgeUpdateInterval = null;
         }
     }
 }