Add a config option for block processing offset (#520)

* Add config option for block processing offset

* Upgrade package versions
This commit is contained in:
prathamesh0 2024-06-10 15:09:33 +05:30 committed by GitHub
parent 52082fc874
commit acf69dd554
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 43 additions and 37 deletions

View File

@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "0.2.96",
"version": "0.2.97",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {

View File

@ -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": {

View File

@ -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",

View File

@ -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",

View File

@ -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).

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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",

View File

@ -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": {

View File

@ -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,

View File

@ -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": {

View File

@ -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",

View File

@ -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;

View File

@ -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;
}