Skip to content

Commit 4d81c14

Browse files
nikugogoinikugogoi
authored
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
1 parent 8d052ad commit 4d81c14

File tree

16 files changed

+43
-40
lines changed

16 files changed

+43
-40
lines changed

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"packages": [
33
"packages/*"
44
],
5-
"version": "0.2.94",
5+
"version": "0.2.95",
66
"npmClient": "yarn",
77
"useWorkspaces": true,
88
"command": {

‎packages/cache/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cerc-io/cache",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"description": "Generic object cache",
55
"main": "dist/index.js",
66
"scripts": {

‎packages/cli/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cerc-io/cli",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"main": "dist/index.js",
55
"license": "AGPL-3.0",
66
"scripts": {
@@ -15,13 +15,13 @@
1515
},
1616
"dependencies": {
1717
"@apollo/client": "^3.7.1",
18-
"@cerc-io/cache": "^0.2.94",
19-
"@cerc-io/ipld-eth-client": "^0.2.94",
18+
"@cerc-io/cache": "^0.2.95",
19+
"@cerc-io/ipld-eth-client": "^0.2.95",
2020
"@cerc-io/libp2p": "^0.42.2-laconic-0.1.4",
2121
"@cerc-io/nitro-node": "^0.1.15",
22-
"@cerc-io/peer": "^0.2.94",
23-
"@cerc-io/rpc-eth-client": "^0.2.94",
24-
"@cerc-io/util": "^0.2.94",
22+
"@cerc-io/peer": "^0.2.95",
23+
"@cerc-io/rpc-eth-client": "^0.2.95",
24+
"@cerc-io/util": "^0.2.95",
2525
"@ethersproject/providers": "^5.4.4",
2626
"@graphql-tools/utils": "^9.1.1",
2727
"@ipld/dag-cbor": "^8.0.0",

‎packages/codegen/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cerc-io/codegen",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"description": "Code generator",
55
"private": true,
66
"main": "index.js",
@@ -20,7 +20,7 @@
2020
},
2121
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
2222
"dependencies": {
23-
"@cerc-io/util": "^0.2.94",
23+
"@cerc-io/util": "^0.2.95",
2424
"@graphql-tools/load-files": "^6.5.2",
2525
"@npmcli/package-json": "^5.0.0",
2626
"@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",

‎packages/codegen/src/templates/package-template.handlebars

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
4242
"dependencies": {
4343
"@apollo/client": "^3.3.19",
44-
"@cerc-io/cli": "^0.2.94",
45-
"@cerc-io/ipld-eth-client": "^0.2.94",
46-
"@cerc-io/solidity-mapper": "^0.2.94",
47-
"@cerc-io/util": "^0.2.94",
44+
"@cerc-io/cli": "^0.2.95",
45+
"@cerc-io/ipld-eth-client": "^0.2.95",
46+
"@cerc-io/solidity-mapper": "^0.2.95",
47+
"@cerc-io/util": "^0.2.95",
4848
{{#if (subgraphPath)}}
49-
"@cerc-io/graph-node": "^0.2.94",
49+
"@cerc-io/graph-node": "^0.2.95",
5050
{{/if}}
5151
"@ethersproject/providers": "^5.4.4",
5252
"debug": "^4.3.1",

‎packages/codegen/src/templates/resolvers-template.handlebars

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ const executeAndRecordMetrics = async (
7676
apiKey: expressContext.req.header('x-api-key'),
7777
origin: expressContext.req.headers.origin
7878
});
79+
80+
throw error;
7981
} finally {
8082
endTimer();
8183
}
@@ -133,7 +135,7 @@ export const createResolvers = async (
133135
): Promise<ValueResult> => {
134136
log('{{this.name}}', blockHash, contractAddress
135137
{{~#each this.params}}, {{this.name~}} {{/each}});
136-
138+
137139
// Set cache-control hints
138140
// setGQLCacheHints(info, {}, gqlCacheConfig);
139141

‎packages/graph-node/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@cerc-io/graph-node",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"main": "dist/index.js",
55
"license": "AGPL-3.0",
66
"devDependencies": {
7-
"@cerc-io/solidity-mapper": "^0.2.94",
7+
"@cerc-io/solidity-mapper": "^0.2.95",
88
"@ethersproject/providers": "^5.4.4",
99
"@graphprotocol/graph-ts": "^0.22.0",
1010
"@nomiclabs/hardhat-ethers": "^2.0.2",
@@ -51,9 +51,9 @@
5151
"dependencies": {
5252
"@apollo/client": "^3.3.19",
5353
"@cerc-io/assemblyscript": "0.19.10-watcher-ts-0.1.2",
54-
"@cerc-io/cache": "^0.2.94",
55-
"@cerc-io/ipld-eth-client": "^0.2.94",
56-
"@cerc-io/util": "^0.2.94",
54+
"@cerc-io/cache": "^0.2.95",
55+
"@cerc-io/ipld-eth-client": "^0.2.95",
56+
"@cerc-io/util": "^0.2.95",
5757
"@types/json-diff": "^0.5.2",
5858
"@types/yargs": "^17.0.0",
5959
"bn.js": "^4.11.9",

‎packages/ipld-eth-client/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cerc-io/ipld-eth-client",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"description": "IPLD ETH Client",
55
"main": "dist/index.js",
66
"scripts": {
@@ -20,8 +20,8 @@
2020
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
2121
"dependencies": {
2222
"@apollo/client": "^3.7.1",
23-
"@cerc-io/cache": "^0.2.94",
24-
"@cerc-io/util": "^0.2.94",
23+
"@cerc-io/cache": "^0.2.95",
24+
"@cerc-io/util": "^0.2.95",
2525
"cross-fetch": "^3.1.4",
2626
"debug": "^4.3.1",
2727
"ethers": "^5.4.4",

‎packages/peer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cerc-io/peer",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"description": "libp2p module",
55
"main": "dist/index.js",
66
"exports": "./dist/index.js",

‎packages/rpc-eth-client/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cerc-io/rpc-eth-client",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"description": "RPC ETH Client",
55
"main": "dist/index.js",
66
"scripts": {
@@ -19,9 +19,9 @@
1919
},
2020
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
2121
"dependencies": {
22-
"@cerc-io/cache": "^0.2.94",
23-
"@cerc-io/ipld-eth-client": "^0.2.94",
24-
"@cerc-io/util": "^0.2.94",
22+
"@cerc-io/cache": "^0.2.95",
23+
"@cerc-io/ipld-eth-client": "^0.2.95",
24+
"@cerc-io/util": "^0.2.95",
2525
"chai": "^4.3.4",
2626
"ethers": "^5.4.4",
2727
"left-pad": "^1.3.0",

‎packages/solidity-mapper/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cerc-io/solidity-mapper",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"main": "dist/index.js",
55
"license": "AGPL-3.0",
66
"devDependencies": {

‎packages/test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cerc-io/test",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"main": "dist/index.js",
55
"license": "AGPL-3.0",
66
"private": true,

‎packages/tracing-client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cerc-io/tracing-client",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"description": "ETH VM tracing client",
55
"main": "dist/index.js",
66
"scripts": {

‎packages/util/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "@cerc-io/util",
3-
"version": "0.2.94",
3+
"version": "0.2.95",
44
"main": "dist/index.js",
55
"license": "AGPL-3.0",
66
"dependencies": {
77
"@apollo/utils.keyvaluecache": "^1.0.1",
88
"@cerc-io/nitro-node": "^0.1.15",
9-
"@cerc-io/peer": "^0.2.94",
10-
"@cerc-io/solidity-mapper": "^0.2.94",
9+
"@cerc-io/peer": "^0.2.95",
10+
"@cerc-io/solidity-mapper": "^0.2.95",
1111
"@cerc-io/ts-channel": "1.0.3-ts-nitro-0.1.1",
1212
"@ethersproject/properties": "^5.7.0",
1313
"@ethersproject/providers": "^5.4.4",
@@ -54,7 +54,7 @@
5454
"yargs": "^17.0.1"
5555
},
5656
"devDependencies": {
57-
"@cerc-io/cache": "^0.2.94",
57+
"@cerc-io/cache": "^0.2.95",
5858
"@nomiclabs/hardhat-waffle": "^2.0.1",
5959
"@types/bunyan": "^1.8.8",
6060
"@types/express": "^4.17.14",

‎packages/util/src/indexer.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ export class Indexer {
623623
let eventName = UNKNOWN_EVENT_NAME;
624624
let eventInfo = {};
625625
const tx = transactionMap[txHash];
626-
const extraInfo: { [key: string]: any } = { topics, data, tx };
626+
const extraInfo: { [key: string]: any } = { topics, data, tx, logIndex };
627627

628628
const contract = ethers.utils.getAddress(address);
629629
const watchedContract = this.isWatchedContract(contract);
@@ -641,7 +641,8 @@ export class Indexer {
641641
}
642642

643643
dbEvents.push({
644-
index: logIndex,
644+
// Use loop index incase of FEVM as logIndex is not actual index of log in block
645+
index: this._upstreamConfig.ethServer.isFEVM ? li : logIndex,
645646
txHash,
646647
contract,
647648
eventName,

‎packages/util/src/misc.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ export const jsonBigIntStringReplacer = (_: string, value: any): any => {
255255
export const getResultEvent = (event: EventInterface): ResultEvent => {
256256
const block = event.block;
257257
const eventFields = JSONbigNative.parse(event.eventInfo);
258-
const { tx, eventSignature } = JSONbigNative.parse(event.extraInfo);
258+
const { tx, eventSignature, logIndex } = JSONbigNative.parse(event.extraInfo);
259259

260260
return {
261261
block: {
@@ -275,7 +275,7 @@ export const getResultEvent = (event: EventInterface): ResultEvent => {
275275

276276
contract: event.contract,
277277

278-
eventIndex: event.index,
278+
eventIndex: logIndex ?? event.index,
279279
eventSignature,
280280
event: {
281281
__typename: `${event.eventName}Event`,

0 commit comments

Comments
 (0)