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

Handle null blocks in FEVM (#400)

Browse Source 
* Avoid gasPrice while serializing tx in getRawTransaction

* Convert base fee to bigint when fetching block data

* Fix methods to get block data in rpc-eth-client

* Fix error checking in rpc-eth-client

* Continue processig after missing null block in FEVM

* Self review fix

* Upgrade package versions

---------

Co-authored-by: Nabarun <nabarun@deepstacksoft.com>
This commit is contained in:
prathamesh0 2023-08-09 17:31:11 +05:30 committed by GitHub
parent c06330dd06
commit 3b090b3987
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 58 additions and 44 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.50", "version": "0.2.51",
"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.50", "version": "0.2.51",
"description": "Generic object cache", "description": "Generic object cache",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

6
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/cli", "name": "@cerc-io/cli",
"version": "0.2.50", "version": "0.2.51",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"scripts": { "scripts": {
@ -11,8 +11,8 @@
"chat": "DEBUG='vulcanize:*, laconic:*' node dist/chat.js" "chat": "DEBUG='vulcanize:*, laconic:*' node dist/chat.js"
}, },
"dependencies": { "dependencies": {
"@cerc-io/peer": "^0.2.50", "@cerc-io/peer": "^0.2.51",
"@cerc-io/util": "^0.2.50", "@cerc-io/util": "^0.2.51",
"@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.50", "version": "0.2.51",
"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.50", "@cerc-io/util": "^0.2.51",
"@graphql-tools/load-files": "^6.5.2", "@graphql-tools/load-files": "^6.5.2",
"@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git", "@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",
"@solidity-parser/parser": "^0.13.2", "@solidity-parser/parser": "^0.13.2",

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.50", "@cerc-io/cli": "^0.2.51",
"@cerc-io/ipld-eth-client": "^0.2.50", "@cerc-io/ipld-eth-client": "^0.2.51",
"@cerc-io/solidity-mapper": "^0.2.50", "@cerc-io/solidity-mapper": "^0.2.51",
"@cerc-io/util": "^0.2.50", "@cerc-io/util": "^0.2.51",
{{#if (subgraphPath)}} {{#if (subgraphPath)}}
"@cerc-io/graph-node": "^0.2.50", "@cerc-io/graph-node": "^0.2.51",
{{/if}} {{/if}}
"@ethersproject/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"apollo-type-bigint": "^0.1.3", "apollo-type-bigint": "^0.1.3",

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.50", "version": "0.2.51",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"devDependencies": { "devDependencies": {
"@cerc-io/solidity-mapper": "^0.2.50", "@cerc-io/solidity-mapper": "^0.2.51",
"@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.50", "@cerc-io/cache": "^0.2.51",
"@cerc-io/ipld-eth-client": "^0.2.50", "@cerc-io/ipld-eth-client": "^0.2.51",
"@cerc-io/util": "^0.2.50", "@cerc-io/util": "^0.2.51",
"@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",

4
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.50", "version": "0.2.51",
"description": "IPLD ETH Client", "description": "IPLD ETH Client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {
@ -20,7 +20,7 @@
"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.50", "@cerc-io/cache": "^0.2.51",
"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.50", "version": "0.2.51",
"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.50", "version": "0.2.51",
"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.50", "@cerc-io/cache": "^0.2.51",
"@cerc-io/util": "^0.2.50", "@cerc-io/ipld-eth-client": "^0.2.51",
"@cerc-io/ipld-eth-client": "^0.2.50", "@cerc-io/util": "^0.2.51",
"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",

14
packages/rpc-eth-client/src/eth-client.ts
View File

@ -90,7 +90,8 @@ export class EthClient {
} }
async getBlocks ({ blockNumber, blockHash }: { blockNumber?: number, blockHash?: string }): Promise<any> { async getBlocks ({ blockNumber, blockHash }: { blockNumber?: number, blockHash?: string }): Promise<any> {
const blockHashOrBlockNumber = blockHash ?? blockNumber; const blockNumberHex = blockNumber ? utils.hexValue(blockNumber) : undefined;
const blockHashOrBlockNumber = blockHash ?? blockNumberHex;
assert(blockHashOrBlockNumber); assert(blockHashOrBlockNumber);
let nodes: any[] = []; let nodes: any[] = [];
console.time(`time:eth-client#getBlocks-${JSON.stringify({ blockNumber, blockHash })}`); console.time(`time:eth-client#getBlocks-${JSON.stringify({ blockNumber, blockHash })}`);
@ -98,7 +99,7 @@ export class EthClient {
try { try {
const rawBlock = await this._provider.send( const rawBlock = await this._provider.send(
blockHash ? 'eth_getBlockByHash' : 'eth_getBlockByNumber', blockHash ? 'eth_getBlockByHash' : 'eth_getBlockByNumber',
[utils.hexValue(blockHashOrBlockNumber), false] [blockHashOrBlockNumber, false]
); );
if (rawBlock) { if (rawBlock) {
@ -119,7 +120,7 @@ export class EthClient {
} }
} catch (err: any) { } catch (err: any) {
// Check and ignore future block error // Check and ignore future block error
if (!(err.code === errors.SERVER_ERROR && err.error.message === "requested a future epoch (beyond 'latest')")) { if (!(err.code === errors.SERVER_ERROR && err.error && err.error.message === "requested a future epoch (beyond 'latest')")) {
throw err; throw err;
} }
} finally { } finally {
@ -134,13 +135,14 @@ export class EthClient {
} }
async getFullBlocks ({ blockNumber, blockHash }: { blockNumber?: number, blockHash?: string }): Promise<any> { async getFullBlocks ({ blockNumber, blockHash }: { blockNumber?: number, blockHash?: string }): Promise<any> {
const blockHashOrBlockNumber = blockHash ?? blockNumber; const blockNumberHex = blockNumber ? utils.hexValue(blockNumber) : undefined;
const blockHashOrBlockNumber = blockHash ?? blockNumberHex;
assert(blockHashOrBlockNumber); assert(blockHashOrBlockNumber);
console.time(`time:eth-client#getFullBlocks-${JSON.stringify({ blockNumber, blockHash })}`); console.time(`time:eth-client#getFullBlocks-${JSON.stringify({ blockNumber, blockHash })}`);
const rawBlock = await this._provider.send( const rawBlock = await this._provider.send(
blockHash ? 'eth_getBlockByHash' : 'eth_getBlockByNumber', blockHash ? 'eth_getBlockByHash' : 'eth_getBlockByNumber',
[utils.hexValue(blockHashOrBlockNumber), false] [blockHashOrBlockNumber, false]
); );
console.timeEnd(`time:eth-client#getFullBlocks-${JSON.stringify({ blockNumber, blockHash })}`); console.timeEnd(`time:eth-client#getFullBlocks-${JSON.stringify({ blockNumber, blockHash })}`);
@ -162,7 +164,7 @@ export class EthClient {
Extra: rawBlock.extraData, Extra: rawBlock.extraData,
MixDigest: rawBlock.mixHash, MixDigest: rawBlock.mixHash,
Nonce: BigInt(rawBlock.nonce), Nonce: BigInt(rawBlock.nonce),
BaseFee: rawBlock.baseFeePerGas BaseFee: BigInt(rawBlock.baseFeePerGas)
}; };
const rlpData = encodeHeader(header); const rlpData = encodeHeader(header);

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

@ -1,10 +1,10 @@
{ {
"name": "@cerc-io/solidity-mapper", "name": "@cerc-io/solidity-mapper",
"version": "0.2.50", "version": "0.2.51",
"main": "dist/index.js", "main": "dist/index.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"devDependencies": { "devDependencies": {
"@cerc-io/ipld-eth-client": "^0.2.50", "@cerc-io/ipld-eth-client": "^0.2.51",
"@ethersproject/abi": "^5.3.0", "@ethersproject/abi": "^5.3.0",
"@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-ethers": "^2.0.2",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",

2
packages/test/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@cerc-io/test", "name": "@cerc-io/test",
"version": "0.2.50", "version": "0.2.51",
"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.50", "version": "0.2.51",
"description": "ETH VM tracing client", "description": "ETH VM tracing client",
"main": "dist/index.js", "main": "dist/index.js",
"scripts": { "scripts": {

6
packages/util/package.json
View File

@ -1,12 +1,12 @@
{ {
"name": "@cerc-io/util", "name": "@cerc-io/util",
"version": "0.2.50", "version": "0.2.51",
"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-client": "^0.1.5", "@cerc-io/nitro-client": "^0.1.5",
"@cerc-io/solidity-mapper": "^0.2.50", "@cerc-io/solidity-mapper": "^0.2.51",
"@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/providers": "^5.4.4", "@ethersproject/providers": "^5.4.4",
"@graphql-tools/schema": "^9.0.10", "@graphql-tools/schema": "^9.0.10",
@ -40,7 +40,7 @@
"yargs": "^17.0.1" "yargs": "^17.0.1"
}, },
"devDependencies": { "devDependencies": {
"@cerc-io/cache": "^0.2.50", "@cerc-io/cache": "^0.2.51",
"@nomiclabs/hardhat-waffle": "^2.0.1", "@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/express": "^4.17.14", "@types/express": "^4.17.14",
"@types/fs-extra": "^9.0.11", "@types/fs-extra": "^9.0.11",

14
packages/util/src/common.ts
View File

@ -1,6 +1,7 @@
import debug from 'debug'; import debug from 'debug';
import assert from 'assert'; import assert from 'assert';
import { DeepPartial } from 'typeorm'; import { DeepPartial } from 'typeorm';
import { errors } from 'ethers';
import { import {
QUEUE_BLOCK_PROCESSING, QUEUE_BLOCK_PROCESSING,
@ -93,14 +94,25 @@ export const fetchBlocksAtHeight = async (
// Try fetching blocks from eth-server until found. // Try fetching blocks from eth-server until found.
while (!blocks.length) { while (!blocks.length) {
try {
console.time('time:common#_fetchBlocks-eth-server'); console.time('time:common#_fetchBlocks-eth-server');
blocks = await indexer.getBlocks({ blockNumber }); blocks = await indexer.getBlocks({ blockNumber });
console.timeEnd('time:common#_fetchBlocks-eth-server');
if (!blocks.length) { if (!blocks.length) {
log(`No blocks fetched for block number ${blockNumber}, retrying after ${jobQueueConfig.blockDelayInMilliSecs} ms delay.`); log(`No blocks fetched for block number ${blockNumber}, retrying after ${jobQueueConfig.blockDelayInMilliSecs} ms delay.`);
await wait(jobQueueConfig.blockDelayInMilliSecs); await wait(jobQueueConfig.blockDelayInMilliSecs);
} }
} catch (err: any) {
// Handle null block error in case of Lotus EVM
if (!(err.code === errors.SERVER_ERROR && err.error && err.error.message === 'requested epoch was a null round')) {
throw err;
}
log(`Block ${blockNumber} requested was null (FEVM); Fetching next block`);
blockNumber++;
} finally {
console.timeEnd('time:common#_fetchBlocks-eth-server');
}
} }
assert(blocks.length, 'Blocks not fetched'); assert(blocks.length, 'Blocks not fetched');

2
packages/util/src/eth.ts
View File

@ -118,7 +118,7 @@ export function getRawTransaction (tx: TransactionResponse): string {
} }
// Extract the relevant parts of the transaction and signature // Extract the relevant parts of the transaction and signature
const txFields = 'accessList chainId data gasPrice gasLimit maxFeePerGas maxPriorityFeePerGas nonce to type value'.split(' '); const txFields = 'accessList chainId data gasLimit maxFeePerGas maxPriorityFeePerGas nonce to type value'.split(' ');
const sigFields = 'v r s'.split(' '); const sigFields = 'v r s'.split(' ');
// Seriailze the signed transaction // Seriailze the signed transaction