From f559b88b1aaf81dde858e0014443f44c07734b6c Mon Sep 17 00:00:00 2001 From: Prathamesh Musale Date: Mon, 10 Jun 2024 19:16:51 +0530 Subject: [PATCH] Regenerate sushiswap-v2 watcher --- packages/v2-watcher/.husky/pre-commit | 0 packages/v2-watcher/README.md | 2 +- packages/v2-watcher/environments/local.toml | 4 +- packages/v2-watcher/package.json | 10 +-- packages/v2-watcher/src/resolvers.ts | 2 + packages/v3-watcher/environments/local.toml | 4 +- yarn.lock | 94 ++++++++++----------- 7 files changed, 60 insertions(+), 56 deletions(-) mode change 100644 => 100755 packages/v2-watcher/.husky/pre-commit diff --git a/packages/v2-watcher/.husky/pre-commit b/packages/v2-watcher/.husky/pre-commit old mode 100644 new mode 100755 diff --git a/packages/v2-watcher/README.md b/packages/v2-watcher/README.md index b1a3627..0dd5c62 100644 --- a/packages/v2-watcher/README.md +++ b/packages/v2-watcher/README.md @@ -2,7 +2,7 @@ ## Source -* Subgraph: [sushiswap-subgraphs v0.1.1-watcher](https://github.com/cerc-io/sushiswap-subgraphs/releases/tag/v0.1.1-watcher) +* Subgraph: [sushiswap-subgraphs v0.1.1-watcher-0.1.1](https://github.com/cerc-io/sushiswap-subgraphs/releases/tag/v0.1.1-watcher-0.1.1) ## Setup diff --git a/packages/v2-watcher/environments/local.toml b/packages/v2-watcher/environments/local.toml index f24df04..063d75e 100644 --- a/packages/v2-watcher/environments/local.toml +++ b/packages/v2-watcher/environments/local.toml @@ -64,7 +64,6 @@ [upstream] [upstream.ethServer] - # gqlApiEndpoint = "http://127.0.0.1:8082/graphql" rpcProviderEndpoints = [ "http://127.0.0.1:8081" ] @@ -93,6 +92,9 @@ subgraphEventsOrder = true blockDelayInMilliSecs = 2000 + # Number of blocks by which block processing lags behind head + blockProcessingOffset = 16 + # Boolean to switch between modes of processing events when starting the server. # Setting to true will fetch filtered events and required blocks in a range of blocks and then process them. # Setting to false will fetch blocks consecutively with its events and then process them (Behaviour is followed in realtime processing near head). diff --git a/packages/v2-watcher/package.json b/packages/v2-watcher/package.json index e10ef00..fb19efd 100644 --- a/packages/v2-watcher/package.json +++ b/packages/v2-watcher/package.json @@ -39,11 +39,11 @@ "homepage": "https://github.com/cerc-io/watcher-ts#readme", "dependencies": { "@apollo/client": "^3.3.19", - "@cerc-io/cli": "^0.2.93", - "@cerc-io/ipld-eth-client": "^0.2.93", - "@cerc-io/solidity-mapper": "^0.2.93", - "@cerc-io/util": "^0.2.93", - "@cerc-io/graph-node": "^0.2.93", + "@cerc-io/cli": "^0.2.97", + "@cerc-io/ipld-eth-client": "^0.2.97", + "@cerc-io/solidity-mapper": "^0.2.97", + "@cerc-io/util": "^0.2.97", + "@cerc-io/graph-node": "^0.2.97", "@ethersproject/providers": "^5.4.4", "debug": "^4.3.1", "decimal.js": "^10.3.1", diff --git a/packages/v2-watcher/src/resolvers.ts b/packages/v2-watcher/src/resolvers.ts index 9e7ed05..b6ea311 100644 --- a/packages/v2-watcher/src/resolvers.ts +++ b/packages/v2-watcher/src/resolvers.ts @@ -81,6 +81,8 @@ const executeAndRecordMetrics = async ( apiKey: expressContext.req.header('x-api-key'), origin: expressContext.req.headers.origin }); + + throw error; } finally { endTimer(); } diff --git a/packages/v3-watcher/environments/local.toml b/packages/v3-watcher/environments/local.toml index 138f854..7ca0d60 100644 --- a/packages/v3-watcher/environments/local.toml +++ b/packages/v3-watcher/environments/local.toml @@ -70,10 +70,10 @@ ] # 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 = false + rpcClient = true # Boolean flag to specify if rpcProviderEndpoint is an FEVM RPC endpoint - isFEVM = false + isFEVM = true # Boolean flag to filter event logs by contracts filterLogsByAddresses = true diff --git a/yarn.lock b/yarn.lock index 0e00ac0..a04915b 100644 --- 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.94": - version "0.2.94" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.94/cache-0.2.94.tgz#e1557bfc3c85ebe3b83f24c79b55c7324797e7ed" - integrity sha512-9NBMd+19aBs3lgiie0X6TJizcn7yBCfEXXlbvMvac9SgYDPcloU+ghauQephAxayRjaWkrgjjfEWR/I0x6FwqA== +"@cerc-io/cache@^0.2.97": + version "0.2.97" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcache/-/0.2.97/cache-0.2.97.tgz#996380c8cf842efd84ca1763720b4a4c97f2dd9f" + integrity sha512-O7qcuNt1+5ufRGFBeuWVALjFpu4oMn5OEqnhTqCLQuJ6FaosFArH7PFAYSyZfjYmE4UQRpAbzfpRj1EdhzU7Pg== 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.94": - version "0.2.94" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.94/cli-0.2.94.tgz#f193165a4b85174c48150051ea4b0e3df57fdf9e" - integrity sha512-aJGzH630bhYca74efVEU37sCjxRLmERDObzNpKIjbmYjKPg6urMbYI8gs33R2HIS/FUOMS39F5B9NMwgCQd/Vw== +"@cerc-io/cli@^0.2.97": + version "0.2.97" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fcli/-/0.2.97/cli-0.2.97.tgz#6aab38e5db520ea2f600fb6cd9f64566e80d3e81" + integrity sha512-F9o1LTQx5fEHMLL4HShhplHtDGZ565+71NBwiIV1dnfqz8HOxXIRDffGRHKl56EBWWkdxNis2vMIcLz98r9RfA== dependencies: "@apollo/client" "^3.7.1" - "@cerc-io/cache" "^0.2.94" - "@cerc-io/ipld-eth-client" "^0.2.94" + "@cerc-io/cache" "^0.2.97" + "@cerc-io/ipld-eth-client" "^0.2.97" "@cerc-io/libp2p" "^0.42.2-laconic-0.1.4" "@cerc-io/nitro-node" "^0.1.15" - "@cerc-io/peer" "^0.2.94" - "@cerc-io/rpc-eth-client" "^0.2.94" - "@cerc-io/util" "^0.2.94" + "@cerc-io/peer" "^0.2.97" + "@cerc-io/rpc-eth-client" "^0.2.97" + "@cerc-io/util" "^0.2.97" "@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.94": - version "0.2.94" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.94/graph-node-0.2.94.tgz#e8d346daa9e7733098d039d27e7d575e0f978b20" - integrity sha512-bGqv/5dq2saBcekA/YqDcepvRaZVIMPXt/lDEcP+8lXmavImXO1sdnut7JyMDQCy3DNKXT6IGADPM/olUwnDPQ== +"@cerc-io/graph-node@^0.2.97": + version "0.2.97" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fgraph-node/-/0.2.97/graph-node-0.2.97.tgz#31b49709123a513dbb043cbb05d60958973a72c0" + integrity sha512-v7PK2M4f41Z8ESm0QNaP3arGZdpMGO+Z4z3jp3+vISlzPkDdiY/Vmjzv8Sl5kI0LBm3ifziCRPxnBYJeLMj6GA== dependencies: "@apollo/client" "^3.3.19" "@cerc-io/assemblyscript" "0.19.10-watcher-ts-0.1.2" - "@cerc-io/cache" "^0.2.94" - "@cerc-io/ipld-eth-client" "^0.2.94" - "@cerc-io/util" "^0.2.94" + "@cerc-io/cache" "^0.2.97" + "@cerc-io/ipld-eth-client" "^0.2.97" + "@cerc-io/util" "^0.2.97" "@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.94": - version "0.2.94" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.94/ipld-eth-client-0.2.94.tgz#22f79eaf82da60a25d8f89f23cf45581c012d6ff" - integrity sha512-IOOZrryZ3M7ndhk8N9NeRaXvzC8eU2OS0z7fVL0xZ/h3Ei4D+dz8fVJbCvgGRB6mJadrMXYyhahOtEAJYxjNHg== +"@cerc-io/ipld-eth-client@^0.2.97": + version "0.2.97" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fipld-eth-client/-/0.2.97/ipld-eth-client-0.2.97.tgz#1ba6a774b6ee944bb6dea9977ad11b35e17a1a3e" + integrity sha512-AuH//S/IPJ1NQ2zfizBLLDHv6HEbpSliTkR+SgexzECtAZwRmbmZ9x+4fdN5EnRMS1W7LJ1FmcyXjarRBCBAiA== dependencies: "@apollo/client" "^3.7.1" - "@cerc-io/cache" "^0.2.94" - "@cerc-io/util" "^0.2.94" + "@cerc-io/cache" "^0.2.97" + "@cerc-io/util" "^0.2.97" cross-fetch "^3.1.4" debug "^4.3.1" ethers "^5.4.4" @@ -424,10 +424,10 @@ unique-names-generator "^4.7.1" yargs "^17.0.1" -"@cerc-io/peer@^0.2.94": - version "0.2.94" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.94/peer-0.2.94.tgz#c8776a9968b32d96fb91ed2a2c6d4b62b365e4a0" - integrity sha512-QQANziPnT08guAD/Nwy/HoqgIIX+w1+GS2bOUE4hfS+LJmTiZ+Zquiqcj69qGQeMQxfiUHmsBPttioF+B9rp/A== +"@cerc-io/peer@^0.2.97": + version "0.2.97" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fpeer/-/0.2.97/peer-0.2.97.tgz#6b386a53220bb4b026337eb2ef4246b3eeb947f9" + integrity sha512-ylJslts/q6uGVlHS27GiHKYVpTTTv/4vryexxqDPA45YJRk0vCleqRDPehRQr40kCgBQjG9W92Uwcwr7HcSQxQ== 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.94": - version "0.2.94" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.94/rpc-eth-client-0.2.94.tgz#0c4f679abacf0aed831cbd295d21780f2a3dd17a" - integrity sha512-S3UvHO7Qb4Z43+fArMbrs78CP8l81D5Ootd225MQ2//TGmu9QsIK9+oqdI1CIVAQCbxI7QAStzdz76Y0px2iFA== +"@cerc-io/rpc-eth-client@^0.2.97": + version "0.2.97" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Frpc-eth-client/-/0.2.97/rpc-eth-client-0.2.97.tgz#b854a4ac3eaeeb8b67cb79963b32230c1a3f56db" + integrity sha512-b9FbiuKKYWYaDDwfABiqItazNqkXi7YdWFmJ2mLTPGfnUT7OVKFji8LcWAsmubjTQb1mVhyHPz1y+bqAvhyxHA== dependencies: - "@cerc-io/cache" "^0.2.94" - "@cerc-io/ipld-eth-client" "^0.2.94" - "@cerc-io/util" "^0.2.94" + "@cerc-io/cache" "^0.2.97" + "@cerc-io/ipld-eth-client" "^0.2.97" + "@cerc-io/util" "^0.2.97" chai "^4.3.4" ethers "^5.4.4" left-pad "^1.3.0" mocha "^8.4.0" -"@cerc-io/solidity-mapper@^0.2.94": - version "0.2.94" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.94/solidity-mapper-0.2.94.tgz#a414653bf20fcbedd91d4a544c6a019c8a02d958" - integrity sha512-kO2xqyAeq2+bbxBcItsT6i8qK1F0BhaYPzV1tTNXgGbkp3j1do86mc6IeTEeV6J/8e9EaeRBsOSQOdGOHUjcDA== +"@cerc-io/solidity-mapper@^0.2.97": + version "0.2.97" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fsolidity-mapper/-/0.2.97/solidity-mapper-0.2.97.tgz#a7f666b00ce7a8867746a855d92575b09f1ca5eb" + integrity sha512-hUdqZ20NYa1NpbFs7z2AiInVGxjtAznE31uydRg1A20EN9csKUJ8+FP2C7ilFnB/UdB1qFVecB3QSw9Zc7TlUg== 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.94": - version "0.2.94" - resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.94/util-0.2.94.tgz#5d4c8046cf44641eac39a6f6ee11f2eb8b298c1f" - integrity sha512-4B1RkUKZoRMVVxWK5u+5d3GEmn0IN1FoAbkfCsBXMTH+OGI+VVGg6bRozaluy7pegpwDh1KtiH0A7NFjUup4OQ== +"@cerc-io/util@^0.2.97": + version "0.2.97" + resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Futil/-/0.2.97/util-0.2.97.tgz#5bc0865cfda68660215d59604cf42fb6c5b74352" + integrity sha512-wtpffWlXyc3+iEgX6bSD4+fWDTVqu9ryiD8mYtb+eTcK7/gA+VsGqzeDBD7tvEa6+cLpW6PqIc8ZpsMS62dASQ== dependencies: "@apollo/utils.keyvaluecache" "^1.0.1" "@cerc-io/nitro-node" "^0.1.15" - "@cerc-io/peer" "^0.2.94" - "@cerc-io/solidity-mapper" "^0.2.94" + "@cerc-io/peer" "^0.2.97" + "@cerc-io/solidity-mapper" "^0.2.97" "@cerc-io/ts-channel" "1.0.3-ts-nitro-0.1.1" "@ethersproject/properties" "^5.7.0" "@ethersproject/providers" "^5.4.4"