From 729d862aacca8ca98157cfd03980fd942d0ba4cc Mon Sep 17 00:00:00 2001 From: Nabarun Gogoi Date: Tue, 21 Nov 2023 17:44:54 +0530 Subject: [PATCH] Fix fetching blocks near chain head in job-runner (#485) * Fix null blocks check in job-runner when fetching near chain head * 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/common.ts | 2 +- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lerna.json b/lerna.json index 13fda4e86..16ac4d1e9 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.2.73", + "version": "0.2.74", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/cache/package.json b/packages/cache/package.json index 4bd9ebbb9..f0c076cc4 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cache", - "version": "0.2.73", + "version": "0.2.74", "description": "Generic object cache", "main": "dist/index.js", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index acec0b580..e026c5ebb 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cli", - "version": "0.2.73", + "version": "0.2.74", "main": "dist/index.js", "license": "AGPL-3.0", "scripts": { @@ -12,13 +12,13 @@ }, "dependencies": { "@apollo/client": "^3.7.1", - "@cerc-io/cache": "^0.2.73", - "@cerc-io/ipld-eth-client": "^0.2.73", + "@cerc-io/cache": "^0.2.74", + "@cerc-io/ipld-eth-client": "^0.2.74", "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4", "@cerc-io/nitro-node": "^0.1.15", - "@cerc-io/peer": "^0.2.73", - "@cerc-io/rpc-eth-client": "^0.2.73", - "@cerc-io/util": "^0.2.73", + "@cerc-io/peer": "^0.2.74", + "@cerc-io/rpc-eth-client": "^0.2.74", + "@cerc-io/util": "^0.2.74", "@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 36ad1b28f..fdcb7a35b 100644 --- a/packages/codegen/package.json +++ b/packages/codegen/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/codegen", - "version": "0.2.73", + "version": "0.2.74", "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.73", + "@cerc-io/util": "^0.2.74", "@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 79631a650..d9b847d89 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.73", - "@cerc-io/ipld-eth-client": "^0.2.73", - "@cerc-io/solidity-mapper": "^0.2.73", - "@cerc-io/util": "^0.2.73", + "@cerc-io/cli": "^0.2.74", + "@cerc-io/ipld-eth-client": "^0.2.74", + "@cerc-io/solidity-mapper": "^0.2.74", + "@cerc-io/util": "^0.2.74", {{#if (subgraphPath)}} - "@cerc-io/graph-node": "^0.2.73", + "@cerc-io/graph-node": "^0.2.74", {{/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 97a56518c..cb14df82e 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.73", + "version": "0.2.74", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { - "@cerc-io/solidity-mapper": "^0.2.73", + "@cerc-io/solidity-mapper": "^0.2.74", "@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.73", - "@cerc-io/ipld-eth-client": "^0.2.73", - "@cerc-io/util": "^0.2.73", + "@cerc-io/cache": "^0.2.74", + "@cerc-io/ipld-eth-client": "^0.2.74", + "@cerc-io/util": "^0.2.74", "@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 bce118ce5..baa219f18 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.73", + "version": "0.2.74", "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.73", - "@cerc-io/util": "^0.2.73", + "@cerc-io/cache": "^0.2.74", + "@cerc-io/util": "^0.2.74", "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 32351e0ac..6a68b17a6 100644 --- a/packages/peer/package.json +++ b/packages/peer/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/peer", - "version": "0.2.73", + "version": "0.2.74", "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 56d33403b..f99ce2c50 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.73", + "version": "0.2.74", "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.73", - "@cerc-io/ipld-eth-client": "^0.2.73", - "@cerc-io/util": "^0.2.73", + "@cerc-io/cache": "^0.2.74", + "@cerc-io/ipld-eth-client": "^0.2.74", + "@cerc-io/util": "^0.2.74", "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 9cdc3808e..81f9f618d 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.73", + "version": "0.2.74", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { diff --git a/packages/test/package.json b/packages/test/package.json index 9e1e61275..6df37cbc3 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/test", - "version": "0.2.73", + "version": "0.2.74", "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 a4f4e3330..50146f7a0 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.73", + "version": "0.2.74", "description": "ETH VM tracing client", "main": "dist/index.js", "scripts": { diff --git a/packages/util/package.json b/packages/util/package.json index 8db92f394..0fe701ff9 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,13 +1,13 @@ { "name": "@cerc-io/util", - "version": "0.2.73", + "version": "0.2.74", "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.73", - "@cerc-io/solidity-mapper": "^0.2.73", + "@cerc-io/peer": "^0.2.74", + "@cerc-io/solidity-mapper": "^0.2.74", "@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1", "@ethersproject/properties": "^5.7.0", "@ethersproject/providers": "^5.4.4", @@ -52,7 +52,7 @@ "yargs": "^17.0.1" }, "devDependencies": { - "@cerc-io/cache": "^0.2.73", + "@cerc-io/cache": "^0.2.74", "@nomiclabs/hardhat-waffle": "^2.0.1", "@types/bunyan": "^1.8.8", "@types/express": "^4.17.14", diff --git a/packages/util/src/common.ts b/packages/util/src/common.ts index 39683a665..d8b7f244e 100644 --- a/packages/util/src/common.ts +++ b/packages/util/src/common.ts @@ -81,7 +81,7 @@ export const fetchBlocksAtHeight = async ( console.timeEnd(`time:common#_fetchBlocks-eth-server-${blockNumber}`); // Check if all blocks are null and increment blockNumber to index next block number - if (ethFullBlocks.every(block => block === null)) { + if (ethFullBlocks.length > 0 && ethFullBlocks.every(block => block === null)) { blockNumber++; log(`Block ${blockNumber} requested was null (FEVM); Fetching next block`); continue;