Update subgraph watcher versions for improved eth_getLogs calls (#820)

Part of [Investigate subgraph watchers lagging behind head](https://www.notion.so/Investigate-subgraph-watchers-lagging-behind-head-01b72294ca8e4f658e4c0e86b36d19e2)

Co-authored-by: Nabarun <nabarun@deepstacksoft.com>
Reviewed-on: cerc-io/stack-orchestrator#820
Co-authored-by: Prathamesh Musale <prathamesh.musale0@gmail.com>
Co-committed-by: Prathamesh Musale <prathamesh.musale0@gmail.com>

stack_orchestrator/data/compose/docker-compose-fixturenet-plugeth.yml

@@ -3,7 +3,7 @@ services:
     restart: always
     hostname: fixturenet-eth-bootnode-geth
     env_file:
-      - ../config/fixturenet-plugeth/fixturenet-eth.env
+      - ../config/fixturenet-eth/fixturenet-eth.env
     environment:
       RUN_BOOTNODE: "true"
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
@@ -24,9 +24,8 @@ services:
       CERC_RUN_STATEDIFF: ${CERC_RUN_STATEDIFF:-detect}
       CERC_STATEDIFF_DB_NODE_ID: 1
       CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-      CERC_ALLOW_UNPROTECTED_TXS: ${CERC_ALLOW_UNPROTECTED_TXS:-false}
     env_file:
-      - ../config/fixturenet-plugeth/fixturenet-eth.env
+      - ../config/fixturenet-eth/fixturenet-eth.env
     image: cerc/fixturenet-plugeth-plugeth:local
     volumes:
       - fixturenet_plugeth_geth_1_data:/root/ethdata
@@ -56,7 +55,7 @@ services:
     environment:
       CERC_KEEP_RUNNING_AFTER_GETH_EXIT: "true"
     env_file:
-      - ../config/fixturenet-plugeth/fixturenet-eth.env
+      - ../config/fixturenet-eth/fixturenet-eth.env
     image: cerc/fixturenet-plugeth-plugeth:local
     depends_on:
       - fixturenet-eth-bootnode-geth
@@ -83,7 +82,7 @@ services:
       retries: 10
       start_period: 30s
     env_file:
-      - ../config/fixturenet-plugeth/fixturenet-eth.env
+      - ../config/fixturenet-eth/fixturenet-eth.env
     environment:
       NODE_NUMBER: "1"
       ETH1_ENDPOINT: "http://fixturenet-eth-geth-1:8545"
@@ -109,7 +108,7 @@ services:
       retries: 10
       start_period: 30s
     env_file:
-      - ../config/fixturenet-plugeth/fixturenet-eth.env
+      - ../config/fixturenet-eth/fixturenet-eth.env
     environment:
       NODE_NUMBER: "2"
       ETH1_ENDPOINT: "http://fixturenet-eth-geth-2:8545"

stack_orchestrator/data/config/fixturenet-plugeth/fixturenet-eth.env

@@ -1,28 +0,0 @@
-# The password used to access test accounts (eg, via personal_unlockAccount).  The password is the same for all accounts.
-ACCOUNT_PASSWORD=secret1212
-
-# ENODE of the geth bootnode.
-BOOTNODE_KEY="b0ac22adcad37213c7c565810a50f1772291e7b0ce53fb73e7ec2a3c75bc13b5"
-ENODE="enode://af22c29c316ad069cf48a09a4ad5cf04a251b411e45098888d114c6dd7f489a13786620d5953738762afa13711d4ffb3b19aa5de772d8af72f851f7e9c5b164a@fixturenet-eth-bootnode-geth:30303"
-
-# JWT shared by geth and lighthouse for authentication.
-JWT="0x6cdcac3501046a08e186730dd8bd136cfaf0fdc1fc955f6e15ad3068c0ff2af0"
-
-# URL to download the ENR of the lighthouse bootnode (generated at first start).
-ENR_URL="http://fixturenet-eth-bootnode-lighthouse:3000/bootnode/enr.dat"
-
-# DB connection settings for statediffing (see docker-compose-db.yml)
-CERC_STATEDIFF_DB_HOST="ipld-eth-db"
-CERC_STATEDIFF_DB_PORT=5432
-CERC_STATEDIFF_DB_NAME="cerc_testing"
-CERC_STATEDIFF_DB_USER="vdbm"
-CERC_STATEDIFF_DB_PASSWORD="password"
-CERC_STATEDIFF_DB_GOOSE_MIN_VER=${CERC_STATEDIFF_DB_GOOSE_MIN_VER:-18}
-CERC_STATEDIFF_DB_LOG_STATEMENTS="${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false}"
-CERC_STATEDIFF_WORKERS=2
-
-CERC_GETH_VMODULE="statediff/*=5,rpc/*=5"
-CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3}
-
-# Used by Lighthouse
-SECONDS_PER_ETH1_BLOCK=${SECONDS_PER_ETH1_BLOCK:-3}

stack_orchestrator/data/config/watcher-ajna/watcher-config-template.toml

@@ -67,9 +67,9 @@
     isFEVM = true
 
     # Boolean flag to filter event logs by contracts
-    filterLogsByAddresses = true
+    filterLogsByAddresses = false
     # Boolean flag to filter event logs by topics
-    filterLogsByTopics = true
+    filterLogsByTopics = false
 
   [upstream.cache]
     name = "requests"

stack_orchestrator/data/config/watcher-merkl-sushiswap-v3/watcher-config-template.toml

@@ -67,7 +67,7 @@
     isFEVM = true
 
     # Boolean flag to filter event logs by contracts
-    filterLogsByAddresses = true
+    filterLogsByAddresses = false
     # Boolean flag to filter event logs by topics
     filterLogsByTopics = false
 

stack_orchestrator/data/config/watcher-sushiswap-v3/watcher-config-template.toml

@@ -67,9 +67,9 @@
     isFEVM = true
 
     # Boolean flag to filter event logs by contracts
-    filterLogsByAddresses = true
+    filterLogsByAddresses = false
     # Boolean flag to filter event logs by topics
-    filterLogsByTopics = true
+    filterLogsByTopics = false
 
   [upstream.cache]
     name = "requests"

stack_orchestrator/data/container-build/cerc-fixturenet-eth-geth/run-el.sh

@@ -109,10 +109,6 @@ else
       OTHER_OPTS="--miner.threads=1"
     fi
 
-    if [ "$CERC_ALLOW_UNPROTECTED_TXS" == "true" ]; then
-      OTHER_OPTS+=" --rpc.allow-unprotected-txs"
-    fi
-
     $START_CMD \
       --datadir="${CERC_ETH_DATADIR}" \
       --bootnodes="${ENODE}" \

stack_orchestrator/data/stacks/ajna/stack.yml

@@ -2,7 +2,7 @@ version: "1.0"
 name: ajna
 description: "Ajna watcher stack"
 repos:
-  - git.vdb.to/cerc-io/ajna-watcher-ts@v0.1.1
+  - git.vdb.to/cerc-io/ajna-watcher-ts@v0.1.3
 containers:
   - cerc/watcher-ajna
 pods:

stack_orchestrator/data/stacks/fixturenet-plugeth/README.md

@@ -1,19 +0,0 @@
-# fixturenet-plugeth
-
-A variation of `fixturenet-eth` that uses `plugeth` instead of `go-ethereum`.
-
-See `stacks/fixturenet-eth/README.md` for more information.
-
-## Containers
-
-* cerc/lighthouse
-* cerc/fixturenet-eth-plugeth
-* cerc/fixturenet-eth-lighthouse
-
-## Deploy the stack
-
-```bash
-laconic-so --stack fixturenet-plugeth setup-repositories
-laconic-so --stack fixturenet-plugeth build-containers
-laconic-so --stack fixturenet-plugeth deploy up
-```

stack_orchestrator/data/stacks/fixturenet-plugeth/stack.yml

@@ -1,17 +0,0 @@
-version: "1.0"
-name: fixturenet-plugeth
-description: "Plugeth Ethereum Fixturenet"
-repos:
-  - git.vdb.to/cerc-io/plugeth@statediff
-  - git.vdb.to/cerc-io/plugeth-statediff
-  - git.vdb.to/cerc-io/lighthouse
-containers:
-  - cerc/plugeth-statediff
-  - cerc/plugeth
-  - cerc/fixturenet-eth-genesis
-  - cerc/fixturenet-plugeth-plugeth
-  - cerc/lighthouse
-  - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-lighthouse
-pods:
-  - fixturenet-plugeth

stack_orchestrator/data/stacks/merkl-sushiswap-v3/stack.yml

@@ -2,7 +2,7 @@ version: "1.0"
 name: merkl-sushiswap-v3
 description: "SushiSwap v3 watcher stack"
 repos:
-  - github.com/cerc-io/merkl-sushiswap-v3-watcher-ts@v0.1.7
+  - github.com/cerc-io/merkl-sushiswap-v3-watcher-ts@v0.1.9
 containers:
   - cerc/watcher-merkl-sushiswap-v3
 pods:

stack_orchestrator/data/stacks/sushiswap-v3/stack.yml

@@ -2,7 +2,7 @@ version: "1.0"
 name: sushiswap-v3
 description: "SushiSwap v3 watcher stack"
 repos:
-  - github.com/cerc-io/sushiswap-v3-watcher-ts@v0.1.7
+  - github.com/cerc-io/sushiswap-v3-watcher-ts@v0.1.9
 containers:
   - cerc/watcher-sushiswap-v3
 pods: