From 52082fc87423bcbba01d80e85d1d10eb0255f804 Mon Sep 17 00:00:00 2001 From: Nabarun Gogoi Date: Fri, 7 Jun 2024 21:12:03 +0530 Subject: [PATCH] Process block with `MAX_REORG_DEPTH` delay from head (#519) * Process block behind latest head by reorg height * Upgrade package versions --- lerna.json | 2 +- packages/cache/package.json | 2 +- packages/cli/package.json | 12 ++++++------ packages/codegen/package.json | 4 ++-- .../src/templates/package-template.handlebars | 10 +++++----- packages/graph-node/package.json | 10 +++++----- packages/ipld-eth-client/package.json | 6 +++--- packages/peer/package.json | 2 +- packages/rpc-eth-client/package.json | 8 ++++---- packages/solidity-mapper/package.json | 2 +- packages/test/package.json | 2 +- packages/tracing-client/package.json | 2 +- packages/util/package.json | 8 ++++---- packages/util/src/events.ts | 14 +++++++++++++- packages/util/src/metrics.ts | 1 + 15 files changed, 49 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 789b8597..e0c2e0df 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.2.95", + "version": "0.2.96", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/cache/package.json b/packages/cache/package.json index 2dbe75d9..576ad388 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cache", - "version": "0.2.95", + "version": "0.2.96", "description": "Generic object cache", "main": "dist/index.js", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index c52d761a..3382be83 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cli", - "version": "0.2.95", + "version": "0.2.96", "main": "dist/index.js", "license": "AGPL-3.0", "scripts": { @@ -15,13 +15,13 @@ }, "dependencies": { "@apollo/client": "^3.7.1", - "@cerc-io/cache": "^0.2.95", - "@cerc-io/ipld-eth-client": "^0.2.95", + "@cerc-io/cache": "^0.2.96", + "@cerc-io/ipld-eth-client": "^0.2.96", "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4", "@cerc-io/nitro-node": "^0.1.15", - "@cerc-io/peer": "^0.2.95", - "@cerc-io/rpc-eth-client": "^0.2.95", - "@cerc-io/util": "^0.2.95", + "@cerc-io/peer": "^0.2.96", + "@cerc-io/rpc-eth-client": "^0.2.96", + "@cerc-io/util": "^0.2.96", "@ethersproject/providers": "^5.4.4", "@graphql-tools/utils": "^9.1.1", "@ipld/dag-cbor": "^8.0.0", diff --git a/packages/codegen/package.json b/packages/codegen/package.json index 560f6950..cb514281 100644 --- a/packages/codegen/package.json +++ b/packages/codegen/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/codegen", - "version": "0.2.95", + "version": "0.2.96", "description": "Code generator", "private": true, "main": "index.js", @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { - "@cerc-io/util": "^0.2.95", + "@cerc-io/util": "^0.2.96", "@graphql-tools/load-files": "^6.5.2", "@npmcli/package-json": "^5.0.0", "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git", diff --git a/packages/codegen/src/templates/package-template.handlebars b/packages/codegen/src/templates/package-template.handlebars index d266662f..8819bef5 100644 --- a/packages/codegen/src/templates/package-template.handlebars +++ b/packages/codegen/src/templates/package-template.handlebars @@ -41,12 +41,12 @@ "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { "@apollo/client": "^3.3.19", - "@cerc-io/cli": "^0.2.95", - "@cerc-io/ipld-eth-client": "^0.2.95", - "@cerc-io/solidity-mapper": "^0.2.95", - "@cerc-io/util": "^0.2.95", + "@cerc-io/cli": "^0.2.96", + "@cerc-io/ipld-eth-client": "^0.2.96", + "@cerc-io/solidity-mapper": "^0.2.96", + "@cerc-io/util": "^0.2.96", {{#if (subgraphPath)}} - "@cerc-io/graph-node": "^0.2.95", + "@cerc-io/graph-node": "^0.2.96", {{/if}} "@ethersproject/providers": "^5.4.4", "debug": "^4.3.1", diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json index f3dc38cc..58626ab3 100644 --- a/packages/graph-node/package.json +++ b/packages/graph-node/package.json @@ -1,10 +1,10 @@ { "name": "@cerc-io/graph-node", - "version": "0.2.95", + "version": "0.2.96", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { - "@cerc-io/solidity-mapper": "^0.2.95", + "@cerc-io/solidity-mapper": "^0.2.96", "@ethersproject/providers": "^5.4.4", "@graphprotocol/graph-ts": "^0.22.0", "@nomiclabs/hardhat-ethers": "^2.0.2", @@ -51,9 +51,9 @@ "dependencies": { "@apollo/client": "^3.3.19", "@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2", - "@cerc-io/cache": "^0.2.95", - "@cerc-io/ipld-eth-client": "^0.2.95", - "@cerc-io/util": "^0.2.95", + "@cerc-io/cache": "^0.2.96", + "@cerc-io/ipld-eth-client": "^0.2.96", + "@cerc-io/util": "^0.2.96", "@types/json-diff": "^0.5.2", "@types/yargs": "^17.0.0", "bn.js": "^4.11.9", diff --git a/packages/ipld-eth-client/package.json b/packages/ipld-eth-client/package.json index de2fbf3d..732383e0 100644 --- a/packages/ipld-eth-client/package.json +++ b/packages/ipld-eth-client/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/ipld-eth-client", - "version": "0.2.95", + "version": "0.2.96", "description": "IPLD ETH Client", "main": "dist/index.js", "scripts": { @@ -20,8 +20,8 @@ "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { "@apollo/client": "^3.7.1", - "@cerc-io/cache": "^0.2.95", - "@cerc-io/util": "^0.2.95", + "@cerc-io/cache": "^0.2.96", + "@cerc-io/util": "^0.2.96", "cross-fetch": "^3.1.4", "debug": "^4.3.1", "ethers": "^5.4.4", diff --git a/packages/peer/package.json b/packages/peer/package.json index 4e4278fe..7a76b454 100644 --- a/packages/peer/package.json +++ b/packages/peer/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/peer", - "version": "0.2.95", + "version": "0.2.96", "description": "libp2p module", "main": "dist/index.js", "exports": "./dist/index.js", diff --git a/packages/rpc-eth-client/package.json b/packages/rpc-eth-client/package.json index 101946dc..a0ddde56 100644 --- a/packages/rpc-eth-client/package.json +++ b/packages/rpc-eth-client/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/rpc-eth-client", - "version": "0.2.95", + "version": "0.2.96", "description": "RPC ETH Client", "main": "dist/index.js", "scripts": { @@ -19,9 +19,9 @@ }, "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { - "@cerc-io/cache": "^0.2.95", - "@cerc-io/ipld-eth-client": "^0.2.95", - "@cerc-io/util": "^0.2.95", + "@cerc-io/cache": "^0.2.96", + "@cerc-io/ipld-eth-client": "^0.2.96", + "@cerc-io/util": "^0.2.96", "chai": "^4.3.4", "ethers": "^5.4.4", "left-pad": "^1.3.0", diff --git a/packages/solidity-mapper/package.json b/packages/solidity-mapper/package.json index 3dfa0c7b..88daeede 100644 --- a/packages/solidity-mapper/package.json +++ b/packages/solidity-mapper/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/solidity-mapper", - "version": "0.2.95", + "version": "0.2.96", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { diff --git a/packages/test/package.json b/packages/test/package.json index 9408f1a6..8cafdaac 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/test", - "version": "0.2.95", + "version": "0.2.96", "main": "dist/index.js", "license": "AGPL-3.0", "private": true, diff --git a/packages/tracing-client/package.json b/packages/tracing-client/package.json index 7f78fada..4e3bd221 100644 --- a/packages/tracing-client/package.json +++ b/packages/tracing-client/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/tracing-client", - "version": "0.2.95", + "version": "0.2.96", "description": "ETH VM tracing client", "main": "dist/index.js", "scripts": { diff --git a/packages/util/package.json b/packages/util/package.json index 752562f1..7178bd66 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,13 +1,13 @@ { "name": "@cerc-io/util", - "version": "0.2.95", + "version": "0.2.96", "main": "dist/index.js", "license": "AGPL-3.0", "dependencies": { "@apollo/utils.keyvaluecache": "^1.0.1", "@cerc-io/nitro-node": "^0.1.15", - "@cerc-io/peer": "^0.2.95", - "@cerc-io/solidity-mapper": "^0.2.95", + "@cerc-io/peer": "^0.2.96", + "@cerc-io/solidity-mapper": "^0.2.96", "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1", "@ethersproject/properties": "^5.7.0", "@ethersproject/providers": "^5.4.4", @@ -54,7 +54,7 @@ "yargs": "^17.0.1" }, "devDependencies": { - "@cerc-io/cache": "^0.2.95", + "@cerc-io/cache": "^0.2.96", "@nomiclabs/hardhat-waffle": "^2.0.1", "@types/bunyan": "^1.8.8", "@types/express": "^4.17.14", diff --git a/packages/util/src/events.ts b/packages/util/src/events.ts index c4b23a71..6e6cb9dd 100644 --- a/packages/util/src/events.ts +++ b/packages/util/src/events.ts @@ -14,6 +14,7 @@ import { createPruningJob, processBlockByNumber } from './common'; import { OrderDirection } from './database'; import { HistoricalJobData, HistoricalJobResponseData } from './job-runner'; import { JobQueueConfig, ServerConfig } from './config'; +import { wait } from './misc'; const EVENT = 'event'; const BLOCK_PROGRESS_EVENT = 'block-progress-event'; @@ -189,7 +190,18 @@ export class EventWatcher { } if (isComplete) { - await processBlockByNumber(this._jobQueue, blockNumber + 1); + while (true) { + const { block: latestBlock } = await this._ethClient.getBlockByHash(); + + // Process block if it is MAX_REORG_DEPTH behind latest block + if (latestBlock.number >= blockNumber + MAX_REORG_DEPTH) { + await processBlockByNumber(this._jobQueue, blockNumber + 1); + break; + } + + log(`Latest block: ${latestBlock.number}; retry next block to process: ${blockNumber + 1} after ${this._config.jobQueue.blockDelayInMilliSecs}ms`); + await wait(this._config.jobQueue.blockDelayInMilliSecs); + } } } } diff --git a/packages/util/src/metrics.ts b/packages/util/src/metrics.ts index a3e36c79..2bbede17 100644 --- a/packages/util/src/metrics.ts +++ b/packages/util/src/metrics.ts @@ -125,6 +125,7 @@ export const startMetricsServer = async (config: Config, jobQueue: JobQueue, ind this.set({ kind: 'latest_canonical' }, syncStatus.latestCanonicalBlockNumber); this.set({ kind: 'chain_head' }, syncStatus.chainHeadBlockNumber); this.set({ kind: 'intial_indexed' }, syncStatus.initialIndexedBlockNumber); + this.set({ kind: 'latest_processed' }, syncStatus.latestProcessedBlockNumber); } } });