Update GQL schema types with where clause on plural fields (#8 )

Part of [Support arguments on nested GQL query selections](https://www.notion.so/Support-arguments-on-nested-GQL-query-selections-6731b85910894a2bb7496ef7a44044cc) Requires https://github.com/cerc-io/watcher-ts/pull/531 Reviewed-on: #8 Co-authored-by: Prathamesh Musale <prathamesh.musale0@gmail.com> Co-committed-by: Prathamesh Musale <prathamesh.musale0@gmail.com>
Update GQL schema types with arguments on plural fields (#7 )
2024-08-02 08:47:27 +00:00 · 2024-08-01 13:40:27 +00:00 · 2024-07-19 12:38:22 +00:00 · 2024-07-15 08:11:20 +00:00
4 changed files with 66 additions and 62 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@cerc-io/secured-finance-watcher-ts",
-  "version": "0.1.2",
+  "version": "0.1.4",
  "description": "secured-finance-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.102",
-    "@cerc-io/ipld-eth-client": "^0.2.102",
-    "@cerc-io/solidity-mapper": "^0.2.102",
-    "@cerc-io/util": "^0.2.102",
-    "@cerc-io/graph-node": "^0.2.102",
+    "@cerc-io/cli": "^0.2.106",
+    "@cerc-io/ipld-eth-client": "^0.2.106",
+    "@cerc-io/solidity-mapper": "^0.2.106",
+    "@cerc-io/util": "^0.2.106",
+    "@cerc-io/graph-node": "^0.2.106",
    "@ethersproject/providers": "^5.4.4",
    "debug": "^4.3.1",
    "decimal.js": "^10.3.1",
--- a/src/indexer.ts
+++ b/src/indexer.ts
@ -587,6 +587,10 @@ export class Indexer implements IndexerInterface {
    return this._baseIndexer.getBlocks(blockFilter);
  }

+  async getBlockByHash (blockHash?: string): Promise<{ block: any }> {
+    return this._baseIndexer.getBlockByHash(blockHash);
+  }
+
  async updateSyncStatusIndexedBlock (blockHash: string, blockNumber: number, force = false): Promise<SyncStatus> {
    return this._baseIndexer.updateSyncStatusIndexedBlock(blockHash, blockNumber, force);
  }
--- a/src/schema.gql
+++ b/src/schema.gql
@ -1632,14 +1632,14 @@ type User {
  id: ID!
  createdAt: BigInt!
  transactionCount: BigInt!
-  transactions: [Transaction!]!
+  transactions (where: Transaction_filter, orderBy: Transaction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transaction!]!
  orderCount: BigInt!
-  orders: [Order!]!
+  orders (where: Order_filter, orderBy: Order_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Order!]!
  liquidationCount: BigInt!
-  liquidations: [Liquidation!]!
+  liquidations (where: Liquidation_filter, orderBy: Liquidation_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Liquidation!]!
  transferCount: BigInt!
-  transfers: [Transfer!]!
-  deposits: [Deposit!]!
+  transfers (where: Transfer_filter, orderBy: Transfer_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transfer!]!
+  deposits (where: Deposit_filter, orderBy: Deposit_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Deposit!]!
 }

 type Order {
@ -1657,7 +1657,7 @@ type Order {
  lendingMarket: LendingMarket!
  isPreOrder: Boolean!
  type: OrderType!
-  transactions: [Transaction!]!
+  transactions (where: Transaction_filter, orderBy: Transaction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transaction!]!
  isCircuitBreakerTriggered: Boolean!
  createdAt: BigInt!
  blockNumber: BigInt!
@ -1669,10 +1669,10 @@ type LendingMarket {
  currency: Bytes!
  maturity: BigInt!
  isActive: Boolean!
-  transactions: [Transaction!]!
-  orders: [Order!]!
+  transactions (where: Transaction_filter, orderBy: Transaction_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Transaction!]!
+  orders (where: Order_filter, orderBy: Order_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [Order!]!
  volume: BigInt!
-  dailyVolume: [DailyVolume!]!
+  dailyVolume (where: DailyVolume_filter, orderBy: DailyVolume_orderBy, orderDirection: OrderDirection, first: Int = 100, skip: Int = 0): [DailyVolume!]!
  openingUnitPrice: BigInt!
  lastLendUnitPrice: BigInt!
  lastBorrowUnitPrice: BigInt!
--- a/yarn.lock
+++ b/yarn.lock
@ -194,10 +194,10 @@
    binaryen "101.0.0-nightly.20210723"
    long "^4.0.0"

-"@cerc-io/cache@^0.2.102":
-  version "0.2.102"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.102/cache-0.2.102.tgz#2a08e4fd136a6ac3e95386fc9d19aa836f0cdcc8"
-  integrity sha512-b69fUlaMyJvJItLN8tDSKsUTxD9v37eMKQYyXtxl36bqbbD77YtNGzdf3OnWoUbi1YPPfshPBOCd9DUtf4hjJw==
+"@cerc-io/cache@^0.2.106":
+  version "0.2.106"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.106/cache-0.2.106.tgz#00075d50433421af71639e527d7d6af1320b0150"
+  integrity sha512-vIHhkKLSaAq9EZp14fTWkb/kbervdt3FDxY3+WOP2qwSvppxiJk8Mvyyt5wmc4Yu0SHWKmdKpRohsF1vrH1DYg==
  dependencies:
    canonical-json "^0.0.4"
    debug "^4.3.1"
@ -205,19 +205,19 @@
    fs-extra "^10.0.0"
    level "^7.0.0"

-"@cerc-io/cli@^0.2.102":
-  version "0.2.102"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.102/cli-0.2.102.tgz#3c4dbd3afecd9ae3def211ac3d54d48a773a4a82"
-  integrity sha512-wyHDi8gmprsJq9q9FIam2K4FxBKPsG9ilvytztc4Vr8s7Iyg5q3d+9R9IMjuU4gmi+qwcx9i/2CSlvR0E2B7Tw==
+"@cerc-io/cli@^0.2.106":
+  version "0.2.106"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.106/cli-0.2.106.tgz#4711979a23e6a1ab371a76072c1e607b624d0657"
+  integrity sha512-a9HcukYuW73dCdLaGejjSL84u2h/xVkNCVlAYCkFMEY/CZ171lh5OloVkSUaogrQpng+/IinaXP1UXdnM58aQA==
  dependencies:
    "@apollo/client" "^3.7.1"
-    "@cerc-io/cache" "^0.2.102"
-    "@cerc-io/ipld-eth-client" "^0.2.102"
+    "@cerc-io/cache" "^0.2.106"
+    "@cerc-io/ipld-eth-client" "^0.2.106"
    "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4"
    "@cerc-io/nitro-node" "^0.1.15"
-    "@cerc-io/peer" "^0.2.102"
-    "@cerc-io/rpc-eth-client" "^0.2.102"
-    "@cerc-io/util" "^0.2.102"
+    "@cerc-io/peer" "^0.2.106"
+    "@cerc-io/rpc-eth-client" "^0.2.106"
+    "@cerc-io/util" "^0.2.106"
    "@ethersproject/providers" "^5.4.4"
    "@graphql-tools/utils" "^9.1.1"
    "@ipld/dag-cbor" "^8.0.0"
@ -238,16 +238,16 @@
    typeorm "0.2.37"
    yargs "^17.0.1"

-"@cerc-io/graph-node@^0.2.102":
-  version "0.2.102"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.102/graph-node-0.2.102.tgz#2c0f1f0d4ed375c55003122dd77ab9ae7912e742"
-  integrity sha512-A9G0x4o2pGGQ8qID33aipXAAxpuDvTrG1vPko7uB9wjSZMSpoipDbomUQZDZcQs19qKJ9u4l1Q2S1PxlpsiW4w==
+"@cerc-io/graph-node@^0.2.106":
+  version "0.2.106"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.106/graph-node-0.2.106.tgz#ad78cad7808803612df1ece681d3f543a095dc20"
+  integrity sha512-T5WuAuFUZP+EMVG7B22YgUHXxQzxCByU1u6gpvESVZsPOQIUn75/4LQpAvVfw/l71DDDHTCrG0KfadTvCnCz+A==
  dependencies:
    "@apollo/client" "^3.3.19"
    "@cerc-io/assemblyscript" "0.19.10-watcher-ts-0.1.2"
-    "@cerc-io/cache" "^0.2.102"
-    "@cerc-io/ipld-eth-client" "^0.2.102"
-    "@cerc-io/util" "^0.2.102"
+    "@cerc-io/cache" "^0.2.106"
+    "@cerc-io/ipld-eth-client" "^0.2.106"
+    "@cerc-io/util" "^0.2.106"
    "@types/json-diff" "^0.5.2"
    "@types/yargs" "^17.0.0"
    bn.js "^4.11.9"
@ -264,14 +264,14 @@
    typeorm-naming-strategies "^2.0.0"
    yargs "^17.0.1"

-"@cerc-io/ipld-eth-client@^0.2.102":
-  version "0.2.102"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.102/ipld-eth-client-0.2.102.tgz#c9d25b6c292c733b6b5669909f96d2dcb92132ff"
-  integrity sha512-CimfNG9B4D+jf1wVvq/6f6IT6yFPpJZpOmizpp6YpjfwdP31rWR50iBJQjx+rWyk9R+8yvSmMhS90mB/vg6ujQ==
+"@cerc-io/ipld-eth-client@^0.2.106":
+  version "0.2.106"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.106/ipld-eth-client-0.2.106.tgz#fa48bfa20ed89f0e462676b69f14aff5e612f53f"
+  integrity sha512-YVGfnyu3dQRLJZvk7zKt/DAB8N5oYpSTizwTY4rrPIY/F5Www/XEEGb2s95JpWtkGc3qqw9EhWYYTGn7FMmXRQ==
  dependencies:
    "@apollo/client" "^3.7.1"
-    "@cerc-io/cache" "^0.2.102"
-    "@cerc-io/util" "^0.2.102"
+    "@cerc-io/cache" "^0.2.106"
+    "@cerc-io/util" "^0.2.106"
    cross-fetch "^3.1.4"
    debug "^4.3.1"
    ethers "^5.4.4"
@ -394,10 +394,10 @@
    lodash "^4.17.21"
    uint8arrays "^4.0.3"

-"@cerc-io/peer@^0.2.102":
-  version "0.2.102"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.102/peer-0.2.102.tgz#b6ff92c97e52b940ade21e6e0b793b0a599d8704"
-  integrity sha512-d+hB4vB202TjiXhVr6uXQGOh4PC6kx7EuHKwxabxPOQROlWYk2/h1WO+ExydzeNaxZK1YPsDjnVfu71LkusX5g==
+"@cerc-io/peer@^0.2.106":
+  version "0.2.106"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.106/peer-0.2.106.tgz#be00031cfda26995299229f93217d124204fdb1a"
+  integrity sha512-RGGZZJSgOjHTtdpcB78S/Vdv8gbJsuB8JbXAB38ujpitVHq/vX2V0aRoaBZl248DuGUxLN0lMMeJiYqEFNvtjA==
  dependencies:
    "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4"
    "@cerc-io/prometheus-metrics" "1.1.4"
@ -466,23 +466,23 @@
    it-stream-types "^1.0.4"
    promjs "^0.4.2"

-"@cerc-io/rpc-eth-client@^0.2.102":
-  version "0.2.102"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.102/rpc-eth-client-0.2.102.tgz#c29b5e8e8b3f73212993ac7ef4c2b34d9b76747c"
-  integrity sha512-IR25u6KrWZTnF2QBma+LQmmtT+kB4QG7LurDBi/yX1ywt3Z3L+w88BegAX9tbG0Y5sHmIPJqKhj8lgnY3jHuJg==
+"@cerc-io/rpc-eth-client@^0.2.106":
+  version "0.2.106"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.106/rpc-eth-client-0.2.106.tgz#c9c506c43f2865020bb93acec77fb512689648bc"
+  integrity sha512-/M9U1e2Wjm97bQyNYHsQrapNKA7KUzIFQQx/A8cN/wblMC3Ihe4rcV5eqdfT+ucKT47KoE4JVpCy1wKdJxRPVg==
  dependencies:
-    "@cerc-io/cache" "^0.2.102"
-    "@cerc-io/ipld-eth-client" "^0.2.102"
-    "@cerc-io/util" "^0.2.102"
+    "@cerc-io/cache" "^0.2.106"
+    "@cerc-io/ipld-eth-client" "^0.2.106"
+    "@cerc-io/util" "^0.2.106"
    chai "^4.3.4"
    ethers "^5.4.4"
    left-pad "^1.3.0"
    mocha "^8.4.0"

-"@cerc-io/solidity-mapper@^0.2.102":
-  version "0.2.102"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.102/solidity-mapper-0.2.102.tgz#87e7dd124e908a2a311e4cff90406bdf0d74f1ad"
-  integrity sha512-ovqcfuiMCR/9FGXX0qp/6piuZ+l394QLXGIidYgirXFVdWkCNjl1p3Y7VevXNke+KN8FdU1eLqmMfHE0QMpnOw==
+"@cerc-io/solidity-mapper@^0.2.106":
+  version "0.2.106"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.106/solidity-mapper-0.2.106.tgz#758afe7c2b0f207d618ad05a2419cc2e4e1f967e"
+  integrity sha512-yhiOaozk52pFlpejUFjwk8wGrcFo8naJ4cMdYNVAjjnc2T1ANRVR1zOi07g3ylZI+lr86+c+sm5ySac5CCMT3Q==
  dependencies:
    dotenv "^10.0.0"

@ -491,15 +491,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.102":
-  version "0.2.102"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.102/util-0.2.102.tgz#1e76d4db59f9beda09d3455251c725ce409b4665"
-  integrity sha512-V8hnnfUgPE/zUULn3y1aJY2PKc0Pv4PcH8KY0BABPu5F5lhvCjW/XRMzJluFdwurUOT2Gyw+3vY7iNqVf15kGQ==
+"@cerc-io/util@^0.2.106":
+  version "0.2.106"
+  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.106/util-0.2.106.tgz#65265c0b4b6078ca9bc765584f701ee52df71dc4"
+  integrity sha512-OgcdveALMLDmt7uK9btim7UrHapw5uAS6p/uJKFaXxdfXI7NFnAW+Vz1YD6M25qoGkbxFsdLWorccTnvUuoqtw==
  dependencies:
    "@apollo/utils.keyvaluecache" "^1.0.1"
    "@cerc-io/nitro-node" "^0.1.15"
-    "@cerc-io/peer" "^0.2.102"
-    "@cerc-io/solidity-mapper" "^0.2.102"
+    "@cerc-io/peer" "^0.2.106"
+    "@cerc-io/solidity-mapper" "^0.2.106"
    "@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1"
    "@ethersproject/properties" "^5.7.0"
    "@ethersproject/providers" "^5.4.4"
Author	SHA1	Message	Date
Prathamesh Musale	805a8b2097	Update GQL schema types with where clause on plural fields (#8 ) Part of [Support arguments on nested GQL query selections](https://www.notion.so/Support-arguments-on-nested-GQL-query-selections-6731b85910894a2bb7496ef7a44044cc) Requires https://github.com/cerc-io/watcher-ts/pull/531 Reviewed-on: #8 Co-authored-by: Prathamesh Musale <prathamesh.musale0@gmail.com> Co-committed-by: Prathamesh Musale <prathamesh.musale0@gmail.com>	2024-08-02 08:47:27 +00:00
Prathamesh Musale	f9a8227719	Update GQL schema types with arguments on plural fields (#7 ) Part of [Support arguments on nested GQL query selections](https://www.notion.so/Support-arguments-on-nested-GQL-query-selections-6731b85910894a2bb7496ef7a44044cc) Queries like the following are supported now: ```gql query($userId: ID!) { user(id: $userId) { orderCount orders(orderBy: createdAt, orderDirection: desc) { id orderId inputAmount status createdAt } } } query($userId: ID!) { user(id: $userId) { transactions(orderBy: createdAt, orderDirection: desc) { id currency maturity side executionPrice futureValue amount averagePrice createdAt feeInFV user { id } } } } ``` Reviewed-on: #7 Co-authored-by: Prathamesh Musale <prathamesh.musale0@gmail.com> Co-committed-by: Prathamesh Musale <prathamesh.musale0@gmail.com>	2024-08-01 13:40:27 +00:00
Nabarun	ea4d3d6b1a	Upgrade watcher package version for handling multiple data sources in subgraph config (#6 ) Part of [Generate secured-finance subgraph watcher with codegen](https://www.notion.so/Generate-secured-finance-subgraph-watcher-with-codegen-2923413e0af54ea787c5435d6966f3bb) Reviewed-on: #6 Co-authored-by: Nabarun <nabarun@deepstacksoft.com> Co-committed-by: Nabarun <nabarun@deepstacksoft.com>	2024-07-19 12:38:22 +00:00
Nabarun	cc565c6576	Upgrade watcher packages to version `0.2.103` (#5 ) Part of [Investigate subgraph watchers lagging behind head](https://www.notion.so/Investigate-subgraph-watchers-lagging-behind-head-01b72294ca8e4f658e4c0e86b36d19e2) - Export metric for total ETH RPC count - Fix switching endpoint on max new block retries when `blockProcessingOffset` is set to some value Reviewed-on: #5 Co-authored-by: Nabarun <nabarun@deepstacksoft.com> Co-committed-by: Nabarun <nabarun@deepstacksoft.com>	2024-07-15 08:11:20 +00:00