cerc-io/watcher-ts
16
1
Fork 0
mirror of https://github.com/cerc-io/watcher-ts synced 2025-01-07 20:08:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Process block with MAX_REORG_DEPTH delay from head (#519)

Browse Source 
* Process block behind latest head by reorg height

* Upgrade package versions
This commit is contained in:
Nabarun Gogoi 2024-06-07 21:12:03 +05:30 committed by GitHub
parent 4d81c14597
commit 52082fc874
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 49 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

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

2
packages/cache/package.json vendored
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/cache", "name": "@cerc-io/cache",
"version": "0.2.95", "version": "0.2.96",
"description": "Generic object cache", "description": "Generic object cache",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

12
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/cli", "name": "@cerc-io/cli",
"version": "0.2.95", "version": "0.2.96",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"scripts": { "scripts": {
@ -15,13 +15,13 @@
}, },
"dependencies": { "dependencies": {
"@apollo/client": "^3.7.1", "@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.95", "@cerc-io/cache": "^0.2.96",
"@cerc-io/ipld-eth-client": "^0.2.95", "@cerc-io/ipld-eth-client": "^0.2.96",
"@cerc-io/libp2p": "^0.42.2-laconic-0.1.4", "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4",
"@cerc-io/nitro-node": "^0.1.15", "@cerc-io/nitro-node": "^0.1.15",
"@cerc-io/peer": "^0.2.95", "@cerc-io/peer": "^0.2.96",
"@cerc-io/rpc-eth-client": "^0.2.95", "@cerc-io/rpc-eth-client": "^0.2.96",
"@cerc-io/util": "^0.2.95", "@cerc-io/util": "^0.2.96",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"@graphql-tools/utils": "^9.1.1", "@graphql-tools/utils": "^9.1.1",
"@ipld/dag-cbor": "^8.0.0", "@ipld/dag-cbor": "^8.0.0",

4
packages/codegen/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/codegen", "name": "@cerc-io/codegen",
"version": "0.2.95", "version": "0.2.96",
"description": "Code generator", "description": "Code generator",
"private": true, "private": true,
"main": "index.js", "main": "index.js",
@ -20,7 +20,7 @@
}, },
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@cerc-io/util": "^0.2.95", "@cerc-io/util": "^0.2.96",
"@graphql-tools/load-files": "^6.5.2", "@graphql-tools/load-files": "^6.5.2",
"@npmcli/package-json": "^5.0.0", "@npmcli/package-json": "^5.0.0",
"@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git", "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",

10
packages/codegen/src/templates/package-template.handlebars
View File

@ -41,12 +41,12 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@apollo/client": "^3.3.19", "@apollo/client": "^3.3.19",
"@cerc-io/cli": "^0.2.95", "@cerc-io/cli": "^0.2.96",
"@cerc-io/ipld-eth-client": "^0.2.95", "@cerc-io/ipld-eth-client": "^0.2.96",
"@cerc-io/solidity-mapper": "^0.2.95", "@cerc-io/solidity-mapper": "^0.2.96",
"@cerc-io/util": "^0.2.95", "@cerc-io/util": "^0.2.96",
{{#if (subgraphPath)}} {{#if (subgraphPath)}}
"@cerc-io/graph-node": "^0.2.95", "@cerc-io/graph-node": "^0.2.96",
{{/if}} {{/if}}
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1", "debug": "^4.3.1",

10
packages/graph-node/package.json
View File

@ -1,10 +1,10 @@
{ {
"name": "@cerc-io/graph-node", "name": "@cerc-io/graph-node",
"version": "0.2.95", "version": "0.2.96",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"devDependencies": { "devDependencies": {
"@cerc-io/solidity-mapper": "^0.2.95", "@cerc-io/solidity-mapper": "^0.2.96",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"@graphprotocol/graph-ts": "^0.22.0", "@graphprotocol/graph-ts": "^0.22.0",
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
@ -51,9 +51,9 @@
"dependencies": { "dependencies": {
"@apollo/client": "^3.3.19", "@apollo/client": "^3.3.19",
"@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2", "@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2",
"@cerc-io/cache": "^0.2.95", "@cerc-io/cache": "^0.2.96",
"@cerc-io/ipld-eth-client": "^0.2.95", "@cerc-io/ipld-eth-client": "^0.2.96",
"@cerc-io/util": "^0.2.95", "@cerc-io/util": "^0.2.96",
"@types/json-diff": "^0.5.2", "@types/json-diff": "^0.5.2",
"@types/yargs": "^17.0.0", "@types/yargs": "^17.0.0",
"bn.js": "^4.11.9", "bn.js": "^4.11.9",

6
packages/ipld-eth-client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/ipld-eth-client", "name": "@cerc-io/ipld-eth-client",
"version": "0.2.95", "version": "0.2.96",
"description": "IPLD ETH Client", "description": "IPLD ETH Client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
@ -20,8 +20,8 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@apollo/client": "^3.7.1", "@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.95", "@cerc-io/cache": "^0.2.96",
"@cerc-io/util": "^0.2.95", "@cerc-io/util": "^0.2.96",
"cross-fetch": "^3.1.4", "cross-fetch": "^3.1.4",
"debug": "^4.3.1", "debug": "^4.3.1",
"ethers": "^5.4.4", "ethers": "^5.4.4",

2
packages/peer/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/peer", "name": "@cerc-io/peer",
"version": "0.2.95", "version": "0.2.96",
"description": "libp2p module", "description": "libp2p module",
"main": "dist/index.js", "main": "dist/index.js",
"exports": "./dist/index.js", "exports": "./dist/index.js",

8
packages/rpc-eth-client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/rpc-eth-client", "name": "@cerc-io/rpc-eth-client",
"version": "0.2.95", "version": "0.2.96",
"description": "RPC ETH Client", "description": "RPC ETH Client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
@ -19,9 +19,9 @@
}, },
"homepage": "https://github.com/cerc-io/watcher-ts#readme", "homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": { "dependencies": {
"@cerc-io/cache": "^0.2.95", "@cerc-io/cache": "^0.2.96",
"@cerc-io/ipld-eth-client": "^0.2.95", "@cerc-io/ipld-eth-client": "^0.2.96",
"@cerc-io/util": "^0.2.95", "@cerc-io/util": "^0.2.96",
"chai": "^4.3.4", "chai": "^4.3.4",
"ethers": "^5.4.4", "ethers": "^5.4.4",
"left-pad": "^1.3.0", "left-pad": "^1.3.0",

2
packages/solidity-mapper/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/solidity-mapper", "name": "@cerc-io/solidity-mapper",
"version": "0.2.95", "version": "0.2.96",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"devDependencies": { "devDependencies": {

2
packages/test/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/test", "name": "@cerc-io/test",
"version": "0.2.95", "version": "0.2.96",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"private": true, "private": true,

2
packages/tracing-client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/tracing-client", "name": "@cerc-io/tracing-client",
"version": "0.2.95", "version": "0.2.96",
"description": "ETH VM tracing client", "description": "ETH VM tracing client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

8
packages/util/package.json
View File

@ -1,13 +1,13 @@
{ {
"name": "@cerc-io/util", "name": "@cerc-io/util",
"version": "0.2.95", "version": "0.2.96",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"dependencies": { "dependencies": {
"@apollo/utils.keyvaluecache": "^1.0.1", "@apollo/utils.keyvaluecache": "^1.0.1",
"@cerc-io/nitro-node": "^0.1.15", "@cerc-io/nitro-node": "^0.1.15",
"@cerc-io/peer": "^0.2.95", "@cerc-io/peer": "^0.2.96",
"@cerc-io/solidity-mapper": "^0.2.95", "@cerc-io/solidity-mapper": "^0.2.96",
"@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1", "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1",
"@ethersproject/properties": "^5.7.0", "@ethersproject/properties": "^5.7.0",
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
@ -54,7 +54,7 @@
"yargs": "^17.0.1" "yargs": "^17.0.1"
}, },
"devDependencies": { "devDependencies": {
"@cerc-io/cache": "^0.2.95", "@cerc-io/cache": "^0.2.96",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/bunyan": "^1.8.8", "@types/bunyan": "^1.8.8",
"@types/express": "^4.17.14", "@types/express": "^4.17.14",

12
packages/util/src/events.ts
View File

@ -14,6 +14,7 @@ import { createPruningJob, processBlockByNumber } from './common';
import { OrderDirection } from './database'; import { OrderDirection } from './database';
import { HistoricalJobData, HistoricalJobResponseData } from './job-runner'; import { HistoricalJobData, HistoricalJobResponseData } from './job-runner';
import { JobQueueConfig, ServerConfig } from './config'; import { JobQueueConfig, ServerConfig } from './config';
import { wait } from './misc';
const EVENT = 'event'; const EVENT = 'event';
const BLOCK_PROGRESS_EVENT = 'block-progress-event'; const BLOCK_PROGRESS_EVENT = 'block-progress-event';
@ -189,7 +190,18 @@ export class EventWatcher {
} }
if (isComplete) { if (isComplete) {
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); 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);
}
} }
} }
} }

1
packages/util/src/metrics.ts
View File

@ -125,6 +125,7 @@ export const startMetricsServer = async (config: Config, jobQueue: JobQueue, ind
this.set({ kind: 'latest_canonical' }, syncStatus.latestCanonicalBlockNumber); this.set({ kind: 'latest_canonical' }, syncStatus.latestCanonicalBlockNumber);
this.set({ kind: 'chain_head' }, syncStatus.chainHeadBlockNumber); this.set({ kind: 'chain_head' }, syncStatus.chainHeadBlockNumber);
this.set({ kind: 'intial_indexed' }, syncStatus.initialIndexedBlockNumber); this.set({ kind: 'intial_indexed' }, syncStatus.initialIndexedBlockNumber);
this.set({ kind: 'latest_processed' }, syncStatus.latestProcessedBlockNumber);
} }
} }
}); });