Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix order of events processing for FEVM #518

Merged
merged 4 commits into from
Jun 7, 2024
Merged

Fix order of events processing for FEVM #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
26aeb29
Fix events processing order for FEVM
nikugogoi Jun 7, 2024
5416bf3
Upgrade watcher package version
nikugogoi Jun 7, 2024
b3d3a1d
Fix getResultEvent for eventsInRange GQL query
nikugogoi Jun 7, 2024
68d5e4e
Fix eventFields parsing
nikugogoi Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "0.2.94",
"version": "0.2.95",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cache/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
12 changes: 6 additions & 6 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/codegen/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cerc-io/codegen",
"version": "0.2.94",
"version": "0.2.95",
"description": "Code generator",
"private": true,
"main": "index.js",
Expand All @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions packages/codegen/src/templates/package-template.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 3 additions & 1 deletion packages/codegen/src/templates/resolvers-template.handlebars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ const executeAndRecordMetrics = async (
apiKey: expressContext.req.header('x-api-key'),
origin: expressContext.req.headers.origin
});

throw error;
} finally {
endTimer();
}
Expand Down Expand Up @@ -133,7 +135,7 @@ export const createResolvers = async (
): Promise<ValueResult> => {
log('{{this.name}}', blockHash, contractAddress
{{~#each this.params}}, {{this.name~}} {{/each}});

// Set cache-control hints
// setGQLCacheHints(info, {}, gqlCacheConfig);

Expand Down
10 changes: 5 additions & 5 deletions packages/graph-node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/ipld-eth-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/peer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
8 changes: 4 additions & 4 deletions packages/rpc-eth-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/solidity-mapper/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/tracing-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions packages/util/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions packages/util/src/indexer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions packages/util/src/misc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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`,
Expand Down
Loading