From 4fd6bf4ad7d8b6c8e3e1960b50d95455ee9f9a36 Mon Sep 17 00:00:00 2001 From: Nabarun Gogoi Date: Fri, 17 May 2024 18:47:15 +0530 Subject: [PATCH] [WIP] Handle GQL query fragment for single entity query (#511) * Handle GQL query fragment for single entity query * Upgrade package versions --- lerna.json | 2 +- packages/cache/package.json | 2 +- packages/cli/package.json | 12 ++++++------ packages/codegen/package.json | 4 ++-- .../src/templates/package-template.handlebars | 10 +++++----- 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/graph/database.ts | 5 +++-- 14 files changed, 38 insertions(+), 37 deletions(-) diff --git a/lerna.json b/lerna.json index 6ecb27c2..9843efe5 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.2.89", + "version": "0.2.90", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/cache/package.json b/packages/cache/package.json index fbbd4683..42aee490 100644 --- a/packages/cache/package.json +++ b/packages/cache/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cache", - "version": "0.2.89", + "version": "0.2.90", "description": "Generic object cache", "main": "dist/index.js", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index b837eca6..f47f13ae 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/cli", - "version": "0.2.89", + "version": "0.2.90", "main": "dist/index.js", "license": "AGPL-3.0", "scripts": { @@ -15,13 +15,13 @@ }, "dependencies": { "@apollo/client": "^3.7.1", - "@cerc-io/cache": "^0.2.89", - "@cerc-io/ipld-eth-client": "^0.2.89", + "@cerc-io/cache": "^0.2.90", + "@cerc-io/ipld-eth-client": "^0.2.90", "@cerc-io/libp2p": "^0.42.2-laconic-0.1.4", "@cerc-io/nitro-node": "^0.1.15", - "@cerc-io/peer": "^0.2.89", - "@cerc-io/rpc-eth-client": "^0.2.89", - "@cerc-io/util": "^0.2.89", + "@cerc-io/peer": "^0.2.90", + "@cerc-io/rpc-eth-client": "^0.2.90", + "@cerc-io/util": "^0.2.90", "@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 63f75e2d..49886cd2 100644 --- a/packages/codegen/package.json +++ b/packages/codegen/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/codegen", - "version": "0.2.89", + "version": "0.2.90", "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.89", + "@cerc-io/util": "^0.2.90", "@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 7793d1a6..02520166 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.89", - "@cerc-io/ipld-eth-client": "^0.2.89", - "@cerc-io/solidity-mapper": "^0.2.89", - "@cerc-io/util": "^0.2.89", + "@cerc-io/cli": "^0.2.90", + "@cerc-io/ipld-eth-client": "^0.2.90", + "@cerc-io/solidity-mapper": "^0.2.90", + "@cerc-io/util": "^0.2.90", {{#if (subgraphPath)}} - "@cerc-io/graph-node": "^0.2.89", + "@cerc-io/graph-node": "^0.2.90", {{/if}} "@ethersproject/providers": "^5.4.4", "debug": "^4.3.1", diff --git a/packages/graph-node/package.json b/packages/graph-node/package.json index b00ce06b..9de491f6 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.89", + "version": "0.2.90", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { - "@cerc-io/solidity-mapper": "^0.2.89", + "@cerc-io/solidity-mapper": "^0.2.90", "@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.89", - "@cerc-io/ipld-eth-client": "^0.2.89", - "@cerc-io/util": "^0.2.89", + "@cerc-io/cache": "^0.2.90", + "@cerc-io/ipld-eth-client": "^0.2.90", + "@cerc-io/util": "^0.2.90", "@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 8317658b..706fafca 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.89", + "version": "0.2.90", "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.89", - "@cerc-io/util": "^0.2.89", + "@cerc-io/cache": "^0.2.90", + "@cerc-io/util": "^0.2.90", "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 9c42cca0..63b99fe2 100644 --- a/packages/peer/package.json +++ b/packages/peer/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/peer", - "version": "0.2.89", + "version": "0.2.90", "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 2def3779..3a00422d 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.89", + "version": "0.2.90", "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.89", - "@cerc-io/ipld-eth-client": "^0.2.89", - "@cerc-io/util": "^0.2.89", + "@cerc-io/cache": "^0.2.90", + "@cerc-io/ipld-eth-client": "^0.2.90", + "@cerc-io/util": "^0.2.90", "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 6acf194e..5c03f1f2 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.89", + "version": "0.2.90", "main": "dist/index.js", "license": "AGPL-3.0", "devDependencies": { diff --git a/packages/test/package.json b/packages/test/package.json index cdbce7b8..c4dd1ad5 100644 --- a/packages/test/package.json +++ b/packages/test/package.json @@ -1,6 +1,6 @@ { "name": "@cerc-io/test", - "version": "0.2.89", + "version": "0.2.90", "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 384f5e8c..acd21f7f 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.89", + "version": "0.2.90", "description": "ETH VM tracing client", "main": "dist/index.js", "scripts": { diff --git a/packages/util/package.json b/packages/util/package.json index 2a3ed160..630062a1 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,13 +1,13 @@ { "name": "@cerc-io/util", - "version": "0.2.89", + "version": "0.2.90", "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.89", - "@cerc-io/solidity-mapper": "^0.2.89", + "@cerc-io/peer": "^0.2.90", + "@cerc-io/solidity-mapper": "^0.2.90", "@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.89", + "@cerc-io/cache": "^0.2.90", "@nomiclabs/hardhat-waffle": "^2.0.1", "@types/bunyan": "^1.8.8", "@types/express": "^4.17.14", diff --git a/packages/util/src/graph/database.ts b/packages/util/src/graph/database.ts index 94645d52..f69b850a 100644 --- a/packages/util/src/graph/database.ts +++ b/packages/util/src/graph/database.ts @@ -241,7 +241,7 @@ export class GraphDatabase { } }; - let entityData: any = await repo.findOne(findOptions as FindOneOptions); + let entityData = await repo.findOne(findOptions as FindOneOptions); if (!entityData && findOptions.where.blockHash) { entityData = await this._baseDatabase.getPrevEntityVersion(queryRunner, repo, findOptions); @@ -249,7 +249,8 @@ export class GraphDatabase { // Get relational fields if (entityData) { - entityData = await this.loadEntityRelations(queryRunner, block, relationsMap, entityType, entityData, selections, queryInfo); + const defragmentedSelections = this._defragmentGQLQuerySelections(selections, queryInfo); + entityData = await this.loadEntityRelations(queryRunner, block, relationsMap, entityType, entityData, defragmentedSelections, queryInfo); } return entityData;