Support fragments in GQL queries (#11 )

Part of [Regenerate ajna watcher with updated subgraph config](https://www.notion.so/Regenerate-ajna-watcher-with-updated-subgraph-config-c9bbecb033024c13a7515c7f1efc3363) Reviewed-on: #11 Co-authored-by: Nabarun <nabarun@deepstacksoft.com> Co-committed-by: Nabarun <nabarun@deepstacksoft.com>
Update package version (#10 )
2024-05-17 11:58:02 +00:00 · 2024-05-16 11:51:23 +00:00 · 2024-05-16 11:48:00 +00:00
5 changed files with 194 additions and 328 deletions
@@ -69,9 +69,9 @@
    isFEVM = true

    # Boolean flag to filter event logs by contracts
-    filterLogsByAddresses = false
+    filterLogsByAddresses = true
    # Boolean flag to filter event logs by topics
-    filterLogsByTopics = false
+    filterLogsByTopics = true

  [upstream.cache]
    name = "requests"
@@ -1,6 +1,6 @@
 {
  "name": "@cerc-io/ajna-watcher-ts",
-  "version": "0.1.6",
+  "version": "0.1.8",
  "description": "ajna-watcher-ts",
  "private": true,
  "main": "dist/index.js",
@@ -39,11 +39,11 @@
  "homepage": "https://github.com/cerc-io/watcher-ts#readme",
  "dependencies": {
    "@apollo/client": "^3.3.19",
-    "@cerc-io/cli": "^0.2.87",
-    "@cerc-io/ipld-eth-client": "^0.2.87",
-    "@cerc-io/solidity-mapper": "^0.2.87",
-    "@cerc-io/util": "^0.2.87",
-    "@cerc-io/graph-node": "^0.2.87",
+    "@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/graph-node": "^0.2.89",
    "@ethersproject/providers": "^5.4.4",
    "debug": "^4.3.1",
    "decimal.js": "^10.3.1",
@@ -6,7 +6,7 @@ import assert from 'assert';
 import { DeepPartial, FindConditions, FindManyOptions, ObjectLiteral } from 'typeorm';
 import debug from 'debug';
 import { ethers, constants } from 'ethers';
-import { SelectionNode } from 'graphql';
+import { GraphQLResolveInfo } from 'graphql';

 import { JsonFragment } from '@ethersproject/abi';
 import { BaseProvider } from '@ethersproject/providers';
@@ -464,9 +464,9 @@ export class Indexer implements IndexerInterface {
    entity: new () => Entity,
    id: string,
    block: BlockHeight,
-    selections: ReadonlyArray<SelectionNode> = []
+    queryInfo: GraphQLResolveInfo
  ): Promise<any> {
-    const data = await this._graphWatcher.getEntity(entity, id, this._relationsMap, block, selections);
+    const data = await this._graphWatcher.getEntity(entity, id, this._relationsMap, block, queryInfo);

    return data;
  }
@@ -476,9 +476,9 @@ export class Indexer implements IndexerInterface {
    block: BlockHeight,
    where: { [key: string]: any } = {},
    queryOptions: QueryOptions = {},
-    selections: ReadonlyArray<SelectionNode> = []
+    queryInfo: GraphQLResolveInfo
  ): Promise<any[]> {
-    return this._graphWatcher.getEntities(entity, this._relationsMap, block, where, queryOptions, selections);
+    return this._graphWatcher.getEntities(entity, this._relationsMap, block, where, queryOptions, queryInfo);
  }

  // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -176,10 +176,10 @@
    binaryen "101.0.0-nightly.20210723"
    long "^4.0.0"

-"@cerc-io/cache@^0.2.87":
-  version "0.2.87"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.87/cache-0.2.87.tgz#168818a315b3906fd0dd0927963eb7071eb6877f"
-  integrity sha512-fmRTmvO0cMfqCe+B0ZzUU2577J3yeSrUtKJuMMYTtyOp8Tx9lYyNfYU0rMhYY1LkkENwdg2iYsxVfF3g1VjwSA==
+"@cerc-io/cache@^0.2.89":
+  version "0.2.89"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.89/cache-0.2.89.tgz#89bddf8e1e9ae40939315cd8aec5dd9138feb85a"
+  integrity sha512-cF565BA7vltlecC7AG+Ih0hzEyAS89MLxLMFnCdYzObGqM0vyBP7RruC6RNu304Jg1zV/T2ablb6qh4VBPgCvQ==
  dependencies:
    canonical-json "^0.0.4"
    debug "^4.3.1"
@@ -187,19 +187,19 @@
    fs-extra "^10.0.0"
    level "^7.0.0"

-"@cerc-io/cli@^0.2.87":
-  version "0.2.87"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.87/cli-0.2.87.tgz#b06e9fff06fd4885aad909a715b61c0534251211"
-  integrity sha512-d4qucagLfVaGRUVYOoLoYwJ7shmH1hDYS9e7rFwiSZ1S75jWs/FABRFePwUgiWxemUJkBP5hwkrbhtAyAf9pzQ==
+"@cerc-io/cli@^0.2.89":
+  version "0.2.89"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.89/cli-0.2.89.tgz#9b67bd9add6f1f6ca67e947b38cc544ad6108c4c"
+  integrity sha512-Jduv4PCa8+Lru1VRYM+EudWXT9UE7uy+hRaHfWi4wGhWLKGd6S8A7WymbJtjA9NC0sNinBbfZmOLQ8xeiIypZA==
  dependencies:
    "@apollo/client" "^3.7.1"
-    "@cerc-io/cache" "^0.2.87"
-    "@cerc-io/ipld-eth-client" "^0.2.87"
+    "@cerc-io/cache" "^0.2.89"
+    "@cerc-io/ipld-eth-client" "^0.2.89"
    "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4"
    "@cerc-io/nitro-node" "^0.1.15"
-    "@cerc-io/peer" "^0.2.87"
-    "@cerc-io/rpc-eth-client" "^0.2.87"
-    "@cerc-io/util" "^0.2.87"
+    "@cerc-io/peer" "^0.2.89"
+    "@cerc-io/rpc-eth-client" "^0.2.89"
+    "@cerc-io/util" "^0.2.89"
    "@ethersproject/providers" "^5.4.4"
    "@graphql-tools/utils" "^9.1.1"
    "@ipld/dag-cbor" "^8.0.0"
@@ -220,16 +220,16 @@
    typeorm "0.2.37"
    yargs "^17.0.1"

-"@cerc-io/graph-node@^0.2.87":
-  version "0.2.87"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.87/graph-node-0.2.87.tgz#6dfe4938cbaeb6fb5316dbc4ae1f5257eb3b9a19"
-  integrity sha512-Tp3Wko5IQxjVn9nRn4ucFT1UEp/DQGtSwryh+zdpamx6TtvFnj8QPOhFlowKXKLVWA39Oa2T+a45jlboL6GL/g==
+"@cerc-io/graph-node@^0.2.89":
+  version "0.2.89"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.89/graph-node-0.2.89.tgz#ee536a33a109cb470551190505ed16616fdb279f"
+  integrity sha512-Jolu16pGpx9L9I/GBP1vY08Gvcv+imDKvttIeH4AHbWeMvPAAFYSh57PJGYwVO3T1/Sbg5o9xU6po+rYRDhqTw==
  dependencies:
    "@apollo/client" "^3.3.19"
    "@cerc-io/assemblyscript" "0.19.10-watcher-ts-0.1.2"
-    "@cerc-io/cache" "^0.2.87"
-    "@cerc-io/ipld-eth-client" "^0.2.87"
-    "@cerc-io/util" "^0.2.87"
+    "@cerc-io/cache" "^0.2.89"
+    "@cerc-io/ipld-eth-client" "^0.2.89"
+    "@cerc-io/util" "^0.2.89"
    "@types/json-diff" "^0.5.2"
    "@types/yargs" "^17.0.0"
    bn.js "^4.11.9"
@@ -246,14 +246,14 @@
    typeorm-naming-strategies "^2.0.0"
    yargs "^17.0.1"

-"@cerc-io/ipld-eth-client@^0.2.87":
-  version "0.2.87"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.87/ipld-eth-client-0.2.87.tgz#8badead87a2a52a7e5a7d86eec08e313038580d4"
-  integrity sha512-3mD0+79sHZNhLemkPKzZxWnGTSWlQoFmxl1YoUeh05tYdyonD6M20DBLiCTlTiF0WnO47q910R074kGRa4NZGQ==
+"@cerc-io/ipld-eth-client@^0.2.89":
+  version "0.2.89"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.89/ipld-eth-client-0.2.89.tgz#c0e969207cafb853d82989fe354ef86c54790e40"
+  integrity sha512-NVW8ro5Is6YlBLZUw2LRxB3r1Wig23XO49iKYSPKl3NHD9vb8DuhSn2ZKTEnH5PQ23LmjeaOPUOe6iD83OC/qg==
  dependencies:
    "@apollo/client" "^3.7.1"
-    "@cerc-io/cache" "^0.2.87"
-    "@cerc-io/util" "^0.2.87"
+    "@cerc-io/cache" "^0.2.89"
+    "@cerc-io/util" "^0.2.89"
    cross-fetch "^3.1.4"
    debug "^4.3.1"
    ethers "^5.4.4"
@@ -406,10 +406,10 @@
    unique-names-generator "^4.7.1"
    yargs "^17.0.1"

-"@cerc-io/peer@^0.2.87":
-  version "0.2.87"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.87/peer-0.2.87.tgz#9f9616b1b4c9b266020bb994d60ed1c27eaabffd"
-  integrity sha512-/iqqfksHo6z24DmU8WUNCYypPBhKlx0q+AhMJ/U9xXMjVgwuD9lnq55vctLQICN0s8FQ5mKe2XmRm8KrzFk7oQ==
+"@cerc-io/peer@^0.2.89":
+  version "0.2.89"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.89/peer-0.2.89.tgz#0e91ff1d84bdc30011c25caebafe0a509d4a6676"
+  integrity sha512-N0bi5HowDxWJ8H1klIJrqLsZSpcmvP1g4lpfM4lEcnmTmc3j0IchKO4Z4OelPLlWZWqHCSXsTzD2p1KnxkIKDw==
  dependencies:
    "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4"
    "@cerc-io/prometheus-metrics" "1.1.4"
@@ -448,23 +448,23 @@
    it-stream-types "^1.0.4"
    promjs "^0.4.2"

-"@cerc-io/rpc-eth-client@^0.2.87":
-  version "0.2.87"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.87/rpc-eth-client-0.2.87.tgz#01d3a93dc3ad4a77195b62be987149b8bdac903b"
-  integrity sha512-XvMRlFZL+RAoINXT6/UjcJYwBwFk7srgOYRf45onoeZMWEIbBXFzdqNXJbdCO3LyVpRKliXzipIfQpl5Y/5/fA==
+"@cerc-io/rpc-eth-client@^0.2.89":
+  version "0.2.89"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.89/rpc-eth-client-0.2.89.tgz#8f0750677598395d15b70e55d3730ee40e143ab5"
+  integrity sha512-N/s2OMIszD+7NQwCbC4m8R+AjnIG4W4/V9q/4//H6EIgfNYno+mnjYi3qU+nFlZe2gbWR4JiOU6JT7R4hm16kw==
  dependencies:
-    "@cerc-io/cache" "^0.2.87"
-    "@cerc-io/ipld-eth-client" "^0.2.87"
-    "@cerc-io/util" "^0.2.87"
+    "@cerc-io/cache" "^0.2.89"
+    "@cerc-io/ipld-eth-client" "^0.2.89"
+    "@cerc-io/util" "^0.2.89"
    chai "^4.3.4"
    ethers "^5.4.4"
    left-pad "^1.3.0"
    mocha "^8.4.0"

-"@cerc-io/solidity-mapper@^0.2.87":
-  version "0.2.87"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.87/solidity-mapper-0.2.87.tgz#94836c0075bb978eb3a59522e40b04a3adf35642"
-  integrity sha512-4lp0wBPOUskFnt/wM17NBfcQdzy/00/637VGx9aiaeBG0MjeGHuBmop/47PXxW30e/Ld95H0DkyLtRvFUhKPxQ==
+"@cerc-io/solidity-mapper@^0.2.89":
+  version "0.2.89"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.89/solidity-mapper-0.2.89.tgz#9cf1cfb125d9f275fd6c3d8a09571e65ac80475f"
+  integrity sha512-gBecAbjpnvi+i/EEhgkJc5BXHV+U9ZsvEWESdO7Hse+GW4EVb0nwEAVHcWAUp+MfcBFz5XcH/6oEHnCselk4Ew==
  dependencies:
    dotenv "^10.0.0"

@@ -473,15 +473,15 @@
  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fts-channel/-/1.0.3-ts-nitro-0.1.1/ts-channel-1.0.3-ts-nitro-0.1.1.tgz#0768781313a167295c0bf21307f47e02dc17e936"
  integrity sha512-2jFICUSyffuZ+8+qRhXuLSJq4GJ6Y02wxiXoubH0Kzv2lIKkJtWICY1ZQQhtXAvP0ncAQB85WJHqtqwH8l7J3Q==

-"@cerc-io/util@^0.2.87":
-  version "0.2.87"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.87/util-0.2.87.tgz#a4bec8f1d13eb0215c255a2d0f0f27606eeb4334"
-  integrity sha512-2vW70xD/tDzaLcEr8565wjAwGEDJ8zZq1P5kxvDuOavT6SN5xJVTlFS+tcaA4G23s9s5B9xkKlnzRyxL4CsRtg==
+"@cerc-io/util@^0.2.89":
+  version "0.2.89"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.89/util-0.2.89.tgz#ab12302e503723bdb86c80979abd5ba7640ba5ff"
+  integrity sha512-NdiyNKOMXVUEchVQ7cjwfGg57v664NXAML6RXakxnkk1KoD1WIO9EeZHilvCCnEK9aDDyu3Wz3hVW3y/6TCEwQ==
  dependencies:
    "@apollo/utils.keyvaluecache" "^1.0.1"
    "@cerc-io/nitro-node" "^0.1.15"
-    "@cerc-io/peer" "^0.2.87"
-    "@cerc-io/solidity-mapper" "^0.2.87"
+    "@cerc-io/peer" "^0.2.89"
+    "@cerc-io/solidity-mapper" "^0.2.89"
    "@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1"
    "@ethersproject/properties" "^5.7.0"
    "@ethersproject/providers" "^5.4.4"