Upgrade watcher-ts packages to export metrics on ETH RPC requests (#8 )

Part of [Regenerate ajna watcher with updated subgraph config ](https://www.notion.so/Regenerate-ajna-watcher-with-updated-subgraph-config-c9bbecb033024c13a7515c7f1efc3363) Reviewed-on: #8 Co-authored-by: Prathamesh Musale <prathamesh.musale0@gmail.com> Co-committed-by: Prathamesh Musale <prathamesh.musale0@gmail.com>
Regenerate watcher with updated subgraph and latest codegen (#7 )
2024-05-15 13:48:07 +00:00 · 2024-05-14 08:02:34 +00:00 · 2024-05-09 11:02:05 +00:00
13 changed files with 70 additions and 54 deletions
@@ -1,5 +1,9 @@
 # ajna-watcher-ts

+## Source
+
+* Subgraph: [ajna-subgraph v0.1.1](https://github.com/cerc-io/ajna-subgraph/releases/tag/v0.1.1)
+
 ## Setup

 * Run the following command to install required packages:
@@ -58,7 +58,9 @@

 [upstream]
  [upstream.ethServer]
-    rpcProviderEndpoint = "http://127.0.0.1:8081"
+    rpcProviderEndpoints = [
+      "http://127.0.0.1:8081"
+    ]

    # Boolean flag to specify if rpc-eth-client should be used for RPC endpoint instead of ipld-eth-client (ipld-eth-server GQL client)
    rpcClient = true
@@ -95,3 +97,6 @@
  # Max block range of historical processing after which it waits for completion of events processing
  # If set to -1 historical processing does not wait for events processing and completes till latest canonical block
  historicalMaxFetchAhead = 10000
+
+  # Max number of retries to fetch new block after which watcher will failover to other RPC endpoints
+  maxNewBlockRetries = 3
@@ -1,6 +1,6 @@
 {
  "name": "@cerc-io/ajna-watcher-ts",
-  "version": "0.1.3",
+  "version": "0.1.6",
  "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.85",
-    "@cerc-io/ipld-eth-client": "^0.2.85",
-    "@cerc-io/solidity-mapper": "^0.2.85",
-    "@cerc-io/util": "^0.2.85",
-    "@cerc-io/graph-node": "^0.2.85",
+    "@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",
    "@ethersproject/providers": "^5.4.4",
    "debug": "^4.3.1",
    "decimal.js": "^10.3.1",
@@ -326,6 +326,13 @@ export class Indexer implements IndexerInterface {
    await this._baseIndexer.fetchStateStatus();
  }

+  switchClients ({ ethClient, ethProvider }: { ethClient: EthClient, ethProvider: BaseProvider }): void {
+    this._ethClient = ethClient;
+    this._ethProvider = ethProvider;
+    this._baseIndexer.switchClients({ ethClient, ethProvider });
+    this._graphWatcher.switchClients({ ethClient, ethProvider });
+  }
+
  async getMetaData (block: BlockHeight): Promise<ResultMeta | null> {
    return this._baseIndexer.getMetaData(block);
  }
@@ -176,10 +176,10 @@
    binaryen "101.0.0-nightly.20210723"
    long "^4.0.0"

-"@cerc-io/cache@^0.2.85":
-  version "0.2.85"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.85/cache-0.2.85.tgz#687240f5364d9a18e0903857515e8d89e4f769f5"
-  integrity sha512-JbMhZ2lLelpHZ7+CIJQ1jwyNlrCbAXlN+sI+YQlRbFcnFwzGLKNYGMshQzZBlh5fb908oKXMALJcxIGOcNu1Zw==
+"@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==
  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.85":
-  version "0.2.85"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.85/cli-0.2.85.tgz#cc4e0a210a94bfb4ee0105125fa4ebb8d1909ec3"
-  integrity sha512-arQ1SwhDTgMeEHPlowXhFXBMuIK4drV8AW4x4aisZp49/A/ceJYhNkW0sbiVTm4uwBMGFioRxfo+fmRUtim4nw==
+"@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==
  dependencies:
    "@apollo/client" "^3.7.1"
-    "@cerc-io/cache" "^0.2.85"
-    "@cerc-io/ipld-eth-client" "^0.2.85"
+    "@cerc-io/cache" "^0.2.87"
+    "@cerc-io/ipld-eth-client" "^0.2.87"
    "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4"
    "@cerc-io/nitro-node" "^0.1.15"
-    "@cerc-io/peer" "^0.2.85"
-    "@cerc-io/rpc-eth-client" "^0.2.85"
-    "@cerc-io/util" "^0.2.85"
+    "@cerc-io/peer" "^0.2.87"
+    "@cerc-io/rpc-eth-client" "^0.2.87"
+    "@cerc-io/util" "^0.2.87"
    "@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.85":
-  version "0.2.85"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.85/graph-node-0.2.85.tgz#1d715a3bab5d9e8fa1bd42bb649d7c8d11393701"
-  integrity sha512-8xn5gbZrxHTH17et07y7CZcquXj0W13NHTrawujlMeNkLziDeBTQJMeePaWAoyGR0WMjxvGV60lk4AM7D/OI+A==
+"@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==
  dependencies:
    "@apollo/client" "^3.3.19"
    "@cerc-io/assemblyscript" "0.19.10-watcher-ts-0.1.2"
-    "@cerc-io/cache" "^0.2.85"
-    "@cerc-io/ipld-eth-client" "^0.2.85"
-    "@cerc-io/util" "^0.2.85"
+    "@cerc-io/cache" "^0.2.87"
+    "@cerc-io/ipld-eth-client" "^0.2.87"
+    "@cerc-io/util" "^0.2.87"
    "@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.85":
-  version "0.2.85"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.85/ipld-eth-client-0.2.85.tgz#c3ac789d4c803d627fed68e962fc3bc43f911b6a"
-  integrity sha512-ewCPbMAUi0pfFsLz5+dRaGAtmBW6vOlXmnzKFZ/aCqtlqF36g+dg7y6In4PpOqleGAHUGOfEssfl5Om10wjacg==
+"@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==
  dependencies:
    "@apollo/client" "^3.7.1"
-    "@cerc-io/cache" "^0.2.85"
-    "@cerc-io/util" "^0.2.85"
+    "@cerc-io/cache" "^0.2.87"
+    "@cerc-io/util" "^0.2.87"
    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.85":
-  version "0.2.85"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.85/peer-0.2.85.tgz#edfb193e0054e148c513abf4cc44cfceb6a4ff2b"
-  integrity sha512-qP/ruyHNMhLSi5yUwUTtZ53E388RCrWKIafmQ9Zn3req2ZU1FCd2r5hBtUv0tnboy2AgB76wpvxrPNG3E8+yAQ==
+"@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==
  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.85":
-  version "0.2.85"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.85/rpc-eth-client-0.2.85.tgz#0131d631b1ca241928a5d28a3fab18201b93f821"
-  integrity sha512-sj4p89C7STw/Tbg+HdDCs9ZMnnK5dkqdmFkwL0SwUiHoEoxny/D6tWigIpLqucqdBIwB4HvsRlLforL8wEWBzQ==
+"@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==
  dependencies:
-    "@cerc-io/cache" "^0.2.85"
-    "@cerc-io/ipld-eth-client" "^0.2.85"
-    "@cerc-io/util" "^0.2.85"
+    "@cerc-io/cache" "^0.2.87"
+    "@cerc-io/ipld-eth-client" "^0.2.87"
+    "@cerc-io/util" "^0.2.87"
    chai "^4.3.4"
    ethers "^5.4.4"
    left-pad "^1.3.0"
    mocha "^8.4.0"

-"@cerc-io/solidity-mapper@^0.2.85":
-  version "0.2.85"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.85/solidity-mapper-0.2.85.tgz#9c7c8a3122da6a4f8c69f3cc100aeafc22ede48a"
-  integrity sha512-4KqNi8IBVK52KpWBwydZw/kitglOAf6TkoQ1sDOiGfp51Yd/UAeI9eM+nluH4NVrZ1Nb/s/3i5h7Di5wHObNcA==
+"@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==
  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.85":
-  version "0.2.85"
-  resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.85/util-0.2.85.tgz#6fb3668e3b3f9fa9e893614f65f17d76696c7c8a"
-  integrity sha512-/6GDN0yhZVaDNmET2fuYBsY46lFyWEd8OoRhK+ZNpEAluhAePZ5UHMFLlHlRmPNVAqkSWtvuL8fFX4ss7I/Aew==
+"@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==
  dependencies:
    "@apollo/utils.keyvaluecache" "^1.0.1"
    "@cerc-io/nitro-node" "^0.1.15"
-    "@cerc-io/peer" "^0.2.85"
-    "@cerc-io/solidity-mapper" "^0.2.85"
+    "@cerc-io/peer" "^0.2.87"
+    "@cerc-io/solidity-mapper" "^0.2.87"
    "@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1"
    "@ethersproject/properties" "^5.7.0"
    "@ethersproject/providers" "^5.4.4"