From e17a00b7d94677f25fcf7ced2dfd72c9a38fadcf Mon Sep 17 00:00:00 2001 From: DZariusz Date: Mon, 4 Nov 2024 14:52:12 +0100 Subject: [PATCH] added more logs to tx fetcher --- CHANGELOG.md | 4 ++++ package.json | 2 +- src/services/on-chain-stats/OnChainTxFetcher.ts | 17 +++++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35254d09..6ea75481 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Unreleased +## [5.12.4] - 2024-11-04 +### Added +- added more logs to tx fetcher + ## [5.12.3] - 2024-11-03 ### Added - added more logs to tx fetcher diff --git a/package.json b/package.json index 6f0b1bda..214fee4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sanctuary", - "version": "5.12.3", + "version": "5.12.4", "repository": { "type": "git", "url": "git+https://github.com/umbrella-network/sanctuary.git" diff --git a/src/services/on-chain-stats/OnChainTxFetcher.ts b/src/services/on-chain-stats/OnChainTxFetcher.ts index 0d44fa6e..e81529ac 100644 --- a/src/services/on-chain-stats/OnChainTxFetcher.ts +++ b/src/services/on-chain-stats/OnChainTxFetcher.ts @@ -53,9 +53,9 @@ export class OnChainTxFetcher { const ranges = CreateBatchRanges.apply(rangeFrom, rangeTo, blockchainScanner.settings.fetchBlocksBatchSize); const timeStart = Date.now(); - const feedsMap = await this.umbrellaFeedsMap(chainId); + const allFeedsContracts = await this.umbrellaFeedsMap(chainId); - this.logger.debug(`[OnChainTxFetcher][${chainId}] feedsMap: ${feedsMap.keys()}`); + this.logger.debug(`[OnChainTxFetcher][${chainId}] allFeedsContracts.size: ${allFeedsContracts.size}`); this.logger.info( `[OnChainTxFetcher][${chainId}] blocks to sync: ${rangeTo - rangeFrom} blocks, starting from ${rangeFrom}` @@ -74,7 +74,8 @@ export class OnChainTxFetcher { const fetchedBlocks = await this.updateTxRepository.getBlocks(chainId, from, to); const { txs, lastBlockBeforeError } = await this.txsFetcher.call(chainId, from, to, fetchedBlocks); - const filteredTx = this.onlyUmbrellaFeedsTx(txs, feedsMap); + const filteredTx = this.onlyUmbrellaFeedsTx(txs, allFeedsContracts); + this.logger.debug(`[OnChainTxFetcher][${chainId}] filteredTx: ${filteredTx.length} of ${txs.length}`); gotError = lastBlockBeforeError !== undefined; const checkpointBlock = lastBlockBeforeError || to; @@ -114,21 +115,21 @@ export class OnChainTxFetcher { } } - private onlyUmbrellaFeedsTx(txs: TransactionResponse[], feedsAddresses: Map): TransactionResponse[] { + private onlyUmbrellaFeedsTx(txs: TransactionResponse[], feedsAddresses: Set): TransactionResponse[] { return txs.filter((tx) => { return !!tx.to && feedsAddresses.has(tx.to.toLowerCase()); }); } - private async umbrellaFeedsMap(chainId: ChainsIds): Promise> { - const map = new Map(); + private async umbrellaFeedsMap(chainId: ChainsIds): Promise> { + const set = new Set(); const umbrellaFeeds = await this.contractRepository.getAllContracts(chainId, UMBRELLA_FEEDS_NAME); umbrellaFeeds.forEach((uf) => { - map.set(uf.address.toLowerCase(), true); + set.add(uf.address.toLowerCase()); }); - return map; + return set; } private blockFrom(chainId: ChainsIds, lastSavedBlock: number | undefined): number {