cerc-io/watcher-ts
16
1
Fork 0
mirror of https://github.com/cerc-io/watcher-ts synced 2025-01-04 18:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix event processing and entities query for filecoin watchers (#501)

Browse Source 
* Filter out pruned subgraph entities while fetching from db

* Sort events by tx index first incase upstream is FEVM

* Upgrade package versions

---------

Co-authored-by: Nabarun <nabarun@deepstacksoft.com>
This commit is contained in:
prathamesh0 2024-03-06 11:10:41 +05:30 committed by GitHub
parent 1cf1a3baa2
commit ff44fd8717
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 51 additions and 37 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/*"
],
"version": "0.2.80",
"version": "0.2.81",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {

2
packages/cache/package.json vendored
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/cache",
"version": "0.2.80",
"version": "0.2.81",
"description": "Generic object cache",
"main": "dist/index.js",
"scripts": {

12
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/cli",
"version": "0.2.80",
"version": "0.2.81",
"main": "dist/index.js",
"license": "AGPL-3.0",
"scripts": {
@ -15,13 +15,13 @@
},
"dependencies": {
"@apollo/client": "^3.7.1",
"@cerc-io/cache": "^0.2.80",
"@cerc-io/ipld-eth-client": "^0.2.80",
"@cerc-io/cache": "^0.2.81",
"@cerc-io/ipld-eth-client": "^0.2.81",
"@cerc-io/libp2p": "^0.42.2-laconic-0.1.4",
"@cerc-io/nitro-node": "^0.1.15",
"@cerc-io/peer": "^0.2.80",
"@cerc-io/rpc-eth-client": "^0.2.80",
"@cerc-io/util": "^0.2.80",
"@cerc-io/peer": "^0.2.81",
"@cerc-io/rpc-eth-client": "^0.2.81",
"@cerc-io/util": "^0.2.81",
"@ethersproject/providers": "^5.4.4",
"@graphql-tools/utils": "^9.1.1",
"@ipld/dag-cbor": "^8.0.0",

4
packages/codegen/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/codegen",
"version": "0.2.80",
"version": "0.2.81",
"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.80",
"@cerc-io/util": "^0.2.81",
"@graphql-tools/load-files": "^6.5.2",
"@npmcli/package-json": "^5.0.0",
"@poanet/solidity-flattener": "https://github.com/vulcanize/solidity-flattener.git",

10
packages/codegen/src/templates/package-template.handlebars
View File

@ -41,12 +41,12 @@
"homepage": "https://github.com/cerc-io/watcher-ts#readme",
"dependencies": {
"@apollo/client": "^3.3.19",
"@cerc-io/cli": "^0.2.80",
"@cerc-io/ipld-eth-client": "^0.2.80",
"@cerc-io/solidity-mapper": "^0.2.80",
"@cerc-io/util": "^0.2.80",
"@cerc-io/cli": "^0.2.81",
"@cerc-io/ipld-eth-client": "^0.2.81",
"@cerc-io/solidity-mapper": "^0.2.81",
"@cerc-io/util": "^0.2.81",
{{#if (subgraphPath)}}
"@cerc-io/graph-node": "^0.2.80",
"@cerc-io/graph-node": "^0.2.81",
{{/if}}
"@ethersproject/providers": "^5.4.4",
"debug": "^4.3.1",

10
packages/graph-node/package.json
View File

@ -1,10 +1,10 @@
{
"name": "@cerc-io/graph-node",
"version": "0.2.80",
"version": "0.2.81",
"main": "dist/index.js",
"license": "AGPL-3.0",
"devDependencies": {
"@cerc-io/solidity-mapper": "^0.2.80",
"@cerc-io/solidity-mapper": "^0.2.81",
"@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.80",
"@cerc-io/ipld-eth-client": "^0.2.80",
"@cerc-io/util": "^0.2.80",
"@cerc-io/cache": "^0.2.81",
"@cerc-io/ipld-eth-client": "^0.2.81",
"@cerc-io/util": "^0.2.81",
"@types/json-diff": "^0.5.2",
"@types/yargs": "^17.0.0",
"bn.js": "^4.11.9",

6
packages/ipld-eth-client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/ipld-eth-client",
"version": "0.2.80",
"version": "0.2.81",
"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.80",
"@cerc-io/util": "^0.2.80",
"@cerc-io/cache": "^0.2.81",
"@cerc-io/util": "^0.2.81",
"cross-fetch": "^3.1.4",
"debug": "^4.3.1",
"ethers": "^5.4.4",

2
packages/peer/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/peer",
"version": "0.2.80",
"version": "0.2.81",
"description": "libp2p module",
"main": "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",
"version": "0.2.80",
"version": "0.2.81",
"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.80",
"@cerc-io/ipld-eth-client": "^0.2.80",
"@cerc-io/util": "^0.2.80",
"@cerc-io/cache": "^0.2.81",
"@cerc-io/ipld-eth-client": "^0.2.81",
"@cerc-io/util": "^0.2.81",
"chai": "^4.3.4",
"ethers": "^5.4.4",
"left-pad": "^1.3.0",

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

@ -1,6 +1,6 @@
{
"name": "@cerc-io/solidity-mapper",
"version": "0.2.80",
"version": "0.2.81",
"main": "dist/index.js",
"license": "AGPL-3.0",
"devDependencies": {

2
packages/test/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/test",
"version": "0.2.80",
"version": "0.2.81",
"main": "dist/index.js",
"license": "AGPL-3.0",
"private": true,

2
packages/tracing-client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@cerc-io/tracing-client",
"version": "0.2.80",
"version": "0.2.81",
"description": "ETH VM tracing client",
"main": "dist/index.js",
"scripts": {

8
packages/util/package.json
View File

@ -1,13 +1,13 @@
{
"name": "@cerc-io/util",
"version": "0.2.80",
"version": "0.2.81",
"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.80",
"@cerc-io/solidity-mapper": "^0.2.80",
"@cerc-io/peer": "^0.2.81",
"@cerc-io/solidity-mapper": "^0.2.81",
"@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.80",
"@cerc-io/cache": "^0.2.81",
"@nomiclabs/hardhat-waffle": "^2.0.1",
"@types/bunyan": "^1.8.8",
"@types/express": "^4.17.14",

3
packages/util/src/graph/database.ts
View File

@ -447,7 +447,8 @@ export class GraphDatabase {
'latestEntities',
`${tableName}.id = "latestEntities"."id" AND ${tableName}.block_number = "latestEntities"."block_number"`
)
.setParameters(subQuery.getParameters());
.setParameters(subQuery.getParameters())
.where(`${tableName}.is_pruned = :isPruned`, { isPruned: false });
selectQueryBuilder = this._baseDatabase.buildQuery(repo, selectQueryBuilder, where, relationsMap.get(entityType), block);

15
packages/util/src/indexer.ts
View File

@ -547,13 +547,26 @@ export class Indexer {
// Create events to be saved to db for a block given blockHash, logs, transactions and a parser function
createDbEventsFromLogsAndTxs (blockHash: string, logs: any, transactions: any, parseEventNameAndArgs: (kind: string, logObj: any) => any): DeepPartial<EventInterface>[] {
const transactionMap = transactions.reduce((acc: {[key: string]: any}, transaction: {[key: string]: any}) => {
const transactionMap: {[key: string]: any} = transactions.reduce((acc: {[key: string]: any}, transaction: {[key: string]: any}) => {
acc[transaction.txHash] = transaction;
return acc;
}, {});
const dbEvents: Array<DeepPartial<EventInterface>> = [];
// Check if upstream is FEVM and sort logs by tx and log index
if (this._upstreamConfig.ethServer.isFEVM) {
// Sort the logs array first by tx index
// If two objects have the same tx index, it will then sort them by log index
logs = logs.sort((a: any, b: any) => {
if (a.transaction.hash !== b.transaction.hash) {
return transactionMap[a.transaction.hash].index - transactionMap[b.transaction.hash].index;
} else {
return a.index - b.index;
}
});
}
for (let li = 0; li < logs.length; li++) {
const logObj = logs[li];
const {