From acf69dd5545584cd7a1e62b8f8f1bde5ee758e4c Mon Sep 17 00:00:00 2001 From: prathamesh0 <42446521+prathamesh0@users.noreply.github.com> Date: Mon, 10 Jun 2024 15:09:33 +0530 Subject: [PATCH] Add a config option for block processing offset (#520) * Add config option for block processing offset * Upgrade package versions --- lerna.json | 2 +- packages/cache/package.json | 2 +- packages/cli/package.json | 12 ++++++------ packages/codegen/package.json | 4 ++-- .../codegen/src/templates/config-template.handlebars | 3 +++ .../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/config.ts | 3 +++ packages/util/src/events.ts | 4 ++-- 16 files changed, 43 insertions(+), 37 deletions(-) diff --git a/lerna.json b/lerna.json index e0c2e0df..2ce496b6 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.2.96", + "version": "0.2.97", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/cache/package.json b/packages/cache/package.json index 576ad388..e735933b 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cache", - "version": "0.2.96", + "version": "0.2.97", "description": "Generic object cache", "main": "dist/index.js", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 3382be83..9a0871a0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cli", - "version": "0.2.96", + "version": "0.2.97", "main": "dist/index.js", "license": "AGPL-3.0", "scripts": { @@ -15,13 +15,13 @@ }, "dependencies": { "@apollo/client": "^3.7.1", - "@cerc-io/cache": "^0.2.96", - "@cerc-io/ipld-eth-client": "^0.2.96", + "@cerc-io/cache": "^0.2.97", + "@cerc-io/ipld-eth-client": "^0.2.97", "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4", "@cerc-io/nitro-node": "^0.1.15", - "@cerc-io/peer": "^0.2.96", - "@cerc-io/rpc-eth-client": "^0.2.96", - "@cerc-io/util": "^0.2.96", + "@cerc-io/peer": "^0.2.97", + "@cerc-io/rpc-eth-client": "^0.2.97", + "@cerc-io/util": "^0.2.97", "@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 cb514281..dda75668 100644 --- a/packages/codegen/package.json +++ b/packages/codegen/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/codegen", - "version": "0.2.96", + "version": "0.2.97", "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.96", + "@cerc-io/util": "^0.2.97", "@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/config-template.handlebars b/packages/codegen/src/templates/config-template.handlebars index 02e71964..88a0cb79 100644 --- a/packages/codegen/src/templates/config-template.handlebars +++ b/packages/codegen/src/templates/config-template.handlebars @@ -97,6 +97,9 @@ subgraphEventsOrder = true blockDelayInMilliSecs = 2000 + # Number of blocks by which block processing lags behind head + blockProcessingOffset = 0 + # Boolean to switch between modes of processing events when starting the server. # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them. # Setting to false will fetch blocks consecutively with its events and then process them (Behaviour is followed in realtime processing near head). diff --git a/packages/codegen/src/templates/package-template.handlebars b/packages/codegen/src/templates/package-template.handlebars index 8819bef5..66f33b54 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.96", - "@cerc-io/ipld-eth-client": "^0.2.96", - "@cerc-io/solidity-mapper": "^0.2.96", - "@cerc-io/util": "^0.2.96", + "@cerc-io/cli": "^0.2.97", + "@cerc-io/ipld-eth-client": "^0.2.97", + "@cerc-io/solidity-mapper": "^0.2.97", + "@cerc-io/util": "^0.2.97", {{#if (subgraphPath)}} - "@cerc-io/graph-node": "^0.2.96", + "@cerc-io/graph-node": "^0.2.97", {{/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 58626ab3..9d135c43 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.96", + "version": "0.2.97", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { - "@cerc-io/solidity-mapper": "^0.2.96", + "@cerc-io/solidity-mapper": "^0.2.97", "@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.96", - "@cerc-io/ipld-eth-client": "^0.2.96", - "@cerc-io/util": "^0.2.96", + "@cerc-io/cache": "^0.2.97", + "@cerc-io/ipld-eth-client": "^0.2.97", + "@cerc-io/util": "^0.2.97", "@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 732383e0..c035376a 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.96", + "version": "0.2.97", "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.96", - "@cerc-io/util": "^0.2.96", + "@cerc-io/cache": "^0.2.97", + "@cerc-io/util": "^0.2.97", "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 7a76b454..57c720ec 100644 --- a/packages/peer/package.json +++ b/packages/peer/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/peer", - "version": "0.2.96", + "version": "0.2.97", "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 a0ddde56..8261fb2f 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.96", + "version": "0.2.97", "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.96", - "@cerc-io/ipld-eth-client": "^0.2.96", - "@cerc-io/util": "^0.2.96", + "@cerc-io/cache": "^0.2.97", + "@cerc-io/ipld-eth-client": "^0.2.97", + "@cerc-io/util": "^0.2.97", "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 88daeede..b11f9e55 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.96", + "version": "0.2.97", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { diff --git a/packages/test/package.json b/packages/test/package.json index 8cafdaac..f152d990 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/test", - "version": "0.2.96", + "version": "0.2.97", "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 4e3bd221..4976bc1d 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.96", + "version": "0.2.97", "description": "ETH VM tracing client", "main": "dist/index.js", "scripts": { diff --git a/packages/util/package.json b/packages/util/package.json index 7178bd66..1c495304 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,13 +1,13 @@ { "name": "@cerc-io/util", - "version": "0.2.96", + "version": "0.2.97", "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.96", - "@cerc-io/solidity-mapper": "^0.2.96", + "@cerc-io/peer": "^0.2.97", + "@cerc-io/solidity-mapper": "^0.2.97", "@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.96", + "@cerc-io/cache": "^0.2.97", "@nomiclabs/hardhat-waffle": "^2.0.1", "@types/bunyan": "^1.8.8", "@types/express": "^4.17.14", diff --git a/packages/util/src/config.ts b/packages/util/src/config.ts index 000b1c7a..5f5326cd 100644 --- a/packages/util/src/config.ts +++ b/packages/util/src/config.ts @@ -23,6 +23,9 @@ export interface JobQueueConfig { subgraphEventsOrder: boolean; blockDelayInMilliSecs: number; + // Number of blocks by which block processing lags behind head (default: 0) + blockProcessingOffset?: number; + // Block range in which logs are fetched during historical blocks processing historicalLogsBlockRange?: number; diff --git a/packages/util/src/events.ts b/packages/util/src/events.ts index 6e6cb9dd..78100bf6 100644 --- a/packages/util/src/events.ts +++ b/packages/util/src/events.ts @@ -193,8 +193,8 @@ export class EventWatcher { 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) { + // Process block if it is blockProcessingOffset blocks behind latest block + if (latestBlock.number >= blockNumber + (this._config.jobQueue.blockProcessingOffset ?? 0)) { await processBlockByNumber(this._jobQueue, blockNumber + 1); break; }