From 4d81c14597517075ee40b07e53144de06d0aedb4 Mon Sep 17 00:00:00 2001 From: Nabarun Gogoi Date: Fri, 7 Jun 2024 17:23:55 +0530 Subject: [PATCH] Fix order of events processing for FEVM (#518) * Fix events processing order for FEVM * Upgrade watcher package version * Fix getResultEvent for eventsInRange GQL query * Fix eventFields parsing --- lerna.json | 2 +- packages/cache/package.json | 2 +- packages/cli/package.json | 12 ++++++------ packages/codegen/package.json | 4 ++-- .../src/templates/package-template.handlebars | 10 +++++----- .../src/templates/resolvers-template.handlebars | 4 +++- 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/indexer.ts | 5 +++-- packages/util/src/misc.ts | 4 ++-- 16 files changed, 43 insertions(+), 40 deletions(-) diff --git a/lerna.json b/lerna.json index 8b95dab6..789b8597 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.2.94", + "version": "0.2.95", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/cache/package.json b/packages/cache/package.json index d8c1303d..2dbe75d9 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cache", - "version": "0.2.94", + "version": "0.2.95", "description": "Generic object cache", "main": "dist/index.js", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 333e071a..c52d761a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cli", - "version": "0.2.94", + "version": "0.2.95", "main": "dist/index.js", "license": "AGPL-3.0", "scripts": { @@ -15,13 +15,13 @@ }, "dependencies": { "@apollo/client": "^3.7.1", - "@cerc-io/cache": "^0.2.94", - "@cerc-io/ipld-eth-client": "^0.2.94", + "@cerc-io/cache": "^0.2.95", + "@cerc-io/ipld-eth-client": "^0.2.95", "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4", "@cerc-io/nitro-node": "^0.1.15", - "@cerc-io/peer": "^0.2.94", - "@cerc-io/rpc-eth-client": "^0.2.94", - "@cerc-io/util": "^0.2.94", + "@cerc-io/peer": "^0.2.95", + "@cerc-io/rpc-eth-client": "^0.2.95", + "@cerc-io/util": "^0.2.95", "@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 72e241ba..560f6950 100644 --- a/packages/codegen/package.json +++ b/packages/codegen/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/codegen", - "version": "0.2.94", + "version": "0.2.95", "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.94", + "@cerc-io/util": "^0.2.95", "@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 f8800dbf..d266662f 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.94", - "@cerc-io/ipld-eth-client": "^0.2.94", - "@cerc-io/solidity-mapper": "^0.2.94", - "@cerc-io/util": "^0.2.94", + "@cerc-io/cli": "^0.2.95", + "@cerc-io/ipld-eth-client": "^0.2.95", + "@cerc-io/solidity-mapper": "^0.2.95", + "@cerc-io/util": "^0.2.95", {{#if (subgraphPath)}} - "@cerc-io/graph-node": "^0.2.94", + "@cerc-io/graph-node": "^0.2.95", {{/if}} "@ethersproject/providers": "^5.4.4", "debug": "^4.3.1", diff --git a/packages/codegen/src/templates/resolvers-template.handlebars b/packages/codegen/src/templates/resolvers-template.handlebars index 927606af..40dd71ff 100644 --- a/packages/codegen/src/templates/resolvers-template.handlebars +++ b/packages/codegen/src/templates/resolvers-template.handlebars @@ -76,6 +76,8 @@ const executeAndRecordMetrics = async ( apiKey: expressContext.req.header('x-api-key'), origin: expressContext.req.headers.origin }); + + throw error; } finally { endTimer(); } @@ -133,7 +135,7 @@ export const createResolvers = async ( ): Promise => { log('{{this.name}}', blockHash, contractAddress {{~#each this.params}}, {{this.name~}} {{/each}}); - + // Set cache-control hints // setGQLCacheHints(info, {}, gqlCacheConfig); diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json index 4c157570..f3dc38cc 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.94", + "version": "0.2.95", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { - "@cerc-io/solidity-mapper": "^0.2.94", + "@cerc-io/solidity-mapper": "^0.2.95", "@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.94", - "@cerc-io/ipld-eth-client": "^0.2.94", - "@cerc-io/util": "^0.2.94", + "@cerc-io/cache": "^0.2.95", + "@cerc-io/ipld-eth-client": "^0.2.95", + "@cerc-io/util": "^0.2.95", "@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 1923aad5..de2fbf3d 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.94", + "version": "0.2.95", "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.94", - "@cerc-io/util": "^0.2.94", + "@cerc-io/cache": "^0.2.95", + "@cerc-io/util": "^0.2.95", "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 6575abd8..4e4278fe 100644 --- a/packages/peer/package.json +++ b/packages/peer/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/peer", - "version": "0.2.94", + "version": "0.2.95", "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 06fd0b66..101946dc 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.94", + "version": "0.2.95", "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.94", - "@cerc-io/ipld-eth-client": "^0.2.94", - "@cerc-io/util": "^0.2.94", + "@cerc-io/cache": "^0.2.95", + "@cerc-io/ipld-eth-client": "^0.2.95", + "@cerc-io/util": "^0.2.95", "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 af7d331f..3dfa0c7b 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.94", + "version": "0.2.95", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { diff --git a/packages/test/package.json b/packages/test/package.json index 28dabb10..9408f1a6 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/test", - "version": "0.2.94", + "version": "0.2.95", "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 fd5273be..7f78fada 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.94", + "version": "0.2.95", "description": "ETH VM tracing client", "main": "dist/index.js", "scripts": { diff --git a/packages/util/package.json b/packages/util/package.json index e5986488..752562f1 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,13 +1,13 @@ { "name": "@cerc-io/util", - "version": "0.2.94", + "version": "0.2.95", "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.94", - "@cerc-io/solidity-mapper": "^0.2.94", + "@cerc-io/peer": "^0.2.95", + "@cerc-io/solidity-mapper": "^0.2.95", "@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.94", + "@cerc-io/cache": "^0.2.95", "@nomiclabs/hardhat-waffle": "^2.0.1", "@types/bunyan": "^1.8.8", "@types/express": "^4.17.14", diff --git a/packages/util/src/indexer.ts b/packages/util/src/indexer.ts index d4176727..2ba4d6e0 100644 --- a/packages/util/src/indexer.ts +++ b/packages/util/src/indexer.ts @@ -623,7 +623,7 @@ export class Indexer { let eventName = UNKNOWN_EVENT_NAME; let eventInfo = {}; const tx = transactionMap[txHash]; - const extraInfo: { [key: string]: any } = { topics, data, tx }; + const extraInfo: { [key: string]: any } = { topics, data, tx, logIndex }; const contract = ethers.utils.getAddress(address); const watchedContract = this.isWatchedContract(contract); @@ -641,7 +641,8 @@ export class Indexer { } dbEvents.push({ - index: logIndex, + // Use loop index incase of FEVM as logIndex is not actual index of log in block + index: this._upstreamConfig.ethServer.isFEVM ? li : logIndex, txHash, contract, eventName, diff --git a/packages/util/src/misc.ts b/packages/util/src/misc.ts index 9e3251ae..6d92c2a6 100644 --- a/packages/util/src/misc.ts +++ b/packages/util/src/misc.ts @@ -255,7 +255,7 @@ export const jsonBigIntStringReplacer = (_: string, value: any): any => { export const getResultEvent = (event: EventInterface): ResultEvent => { const block = event.block; const eventFields = JSONbigNative.parse(event.eventInfo); - const { tx, eventSignature } = JSONbigNative.parse(event.extraInfo); + const { tx, eventSignature, logIndex } = JSONbigNative.parse(event.extraInfo); return { block: { @@ -275,7 +275,7 @@ export const getResultEvent = (event: EventInterface): ResultEvent => { contract: event.contract, - eventIndex: event.index, + eventIndex: logIndex ?? event.index, eventSignature, event: { __typename: `${event.eventName}Event`,