add grandine-geth

.github/workflows/etb-all-clients.yml

@@ -60,6 +60,7 @@ jobs:
               "mainnet-deneb-lighthouse-geth-assertoor.yaml"
               "mainnet-deneb-lodestar-besu-assertoor.yaml"
               "mainnet-deneb-grandine-reth-assertoor.yaml"
+              "mainnet-deneb-grandine-geth-assertoor.yaml"
               "mainnet-deneb-nimbus-reth-assertoor.yaml"
               "mainnet-deneb-teku-besu-assertoor.yaml"
               "mainnet-deneb-mix-1.yaml"

configs/clients/mainnet-deneb-grandine-geth-assertoor.yaml

@@ -0,0 +1,42 @@
+testnet-config:
+  consensus-layer:
+      preset-base: 'mainnet'
+      capella-fork-epoch: 0
+      deneb-fork-epoch: 1
+      min-genesis-active-validator-count: 60
+      disable-peer-scoring: true
+
+
+consensus-configs:
+  grandine-consensus-client:
+    num-validators: 20
+    log-level: 'info'
+
+execution-configs:
+  geth-execution-config:
+    log-level: '4'
+
+client-instances:
+  grandine-geth:
+    image: "etb-all-clients"
+    tag: "dencun"
+    start-ip-address: "10.0.20.10"
+    num-nodes: 3
+    consensus-config: "grandine-consensus-client"
+    execution-config: "geth-execution-config"
+    validator-offset-start: 0
+
+generic-instances:
+    assertoor:
+      image: "etb-all-clients"
+      tag: "dencun"
+      start-ip-address: "10.0.20.220"
+      num-nodes: 1
+      entrypoint: "/usr/local/bin/assertoor"
+      command: [
+        "-v",
+        "--log-format",
+        "json",
+        "--config=/data/assertoor-config.yaml",
+      ]
+      ports: ["8080:8080", "9082:9090"]

deps/dockers/etb-all-clients_mainnet_dencun.Dockerfile

@@ -9,7 +9,7 @@ ARG GRANDINE_REPO="https://github.com/grandinetech/grandine.git"
 ARG GRANDINE_BRANCH="0.4.0.rc4"
 
 ARG PRYSM_REPO="https://github.com/prysmaticlabs/prysm.git"
-ARG PRYSM_BRANCH="v5.0.2"
+ARG PRYSM_BRANCH="v5.0.3"
 
 ARG LODESTAR_REPO="https://github.com/ChainSafe/lodestar.git"
 ARG LODESTAR_BRANCH="v1.17.0"
@@ -22,7 +22,7 @@ ARG TEKU_BRANCH="24.3.1"
 
 # Execution Clients
 ARG BESU_REPO="https://github.com/hyperledger/besu.git"
-ARG BESU_BRANCH="24.3.0"
+ARG BESU_BRANCH="24.3.3"
 
 ARG GETH_REPO="https://github.com/ethereum/go-ethereum.git"
 ARG GETH_BRANCH="v1.13.14"
@@ -47,6 +47,9 @@ ARG MOCK_BUILDER_BRANCH="v1.2.0"
 ARG ASSERTOR_REPO="https://github.com/ethpandaops/assertoor"
 ARG ASSERTOR_BRANCH="70968e4599648019db7d6a2acf99b8e1449167cb"
 
+ARG JSON_RPC_SNOOP_REPO="https://github.com/ethDreamer/json_rpc_snoop.git"
+ARG JSON_RPC_SNOOP_BRANCH="master"
+
 ###############################################################################
 # Builder to build all of the clients.
 FROM debian:stable-slim AS etb-client-builder
@@ -333,6 +336,8 @@ ARG TX_FUZZ_BRANCH
 ARG TX_FUZZ_REPO
 ARG BEACON_METRICS_GAZER_REPO
 ARG BEACON_METRICS_GAZER_BRANCH
+ARG JSON_RPC_SNOOP_REPO
+ARG JSON_RPC_SNOOP_BRANCH
 
 RUN go install github.com/wealdtech/ethereal/v2@latest
 RUN go install github.com/wealdtech/[email protected]
@@ -352,6 +357,13 @@ RUN cd beacon-metrics-gazer && \
     cargo update -p proc-macro2 && \
     cargo build --release
 
+RUN git clone "${JSON_RPC_SNOOP_REPO}" && \
+    cd json_rpc_snoop && \
+    git checkout "${JSON_RPC_SNOOP_BRANCH}"
+
+RUN cd json_rpc_snoop && \
+    make
+
 RUN cargo install jwt-cli
 
 ARG MOCK_BUILDER_REPO
@@ -430,6 +442,8 @@ COPY --from=misc-builder /git/tx-fuzz/cmd/livefuzzer/livefuzzer /usr/local/bin/l
 # beacon-metrics-gazer
 COPY --from=misc-builder /git/beacon-metrics-gazer/target/release/beacon-metrics-gazer /usr/local/bin/beacon-metrics-gazer
 
+COPY --from=misc-builder /git/json_rpc_snoop/target/release/json_rpc_snoop /usr/local/bin/json_rpc_snoop
+
 COPY --from=misc-builder /root/.cargo/bin/jwt /usr/local/bin/jwt
 # mock-builder
 COPY --from=misc-builder /git/mock-builder/mock-builder /usr/local/bin/mock-builder

verify_configs.sh

@@ -9,6 +9,7 @@ config_files=(
     "mainnet-deneb-lighthouse-geth-assertoor.yaml"
     "mainnet-deneb-lodestar-besu-assertoor.yaml"
     "mainnet-deneb-grandine-reth-assertoor.yaml"
+    "mainnet-deneb-grandine-geth-assertoor.yaml"
     "mainnet-deneb-nimbus-reth-assertoor.yaml"
     "mainnet-deneb-teku-besu-assertoor.yaml"
     "mainnet-deneb-mix-1.yaml"