39 changed files with 219 additions and 717 deletions
--- a/.gitea/workflows/fixturenet-eth-stack.yml
+++ b/.gitea/workflows/fixturenet-eth-stack.yml
@ -1,11 +1,14 @@
-name: Test Ethereum Fixturenet Stack
+name: Ethereum Fixturenet Stack Test

 on:
-  push:
-    branches: '*'
  pull_request:
+    branches: '*'
+  push:
+    branches:
+      - main
+      - ci-test
  schedule: # Note: coordinate with other tests to not overload runners at the same time of day
-    - cron: '12 01 * * *'
+    - cron: '17 25 * * *'

 jobs:
  test:
@ -34,20 +37,3 @@ jobs:
        run: |
         PATH=$PATH:~/bin
         ./tests/fixturenet-eth-stack/run-test.sh
-
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
--- a/.gitea/workflows/publish-fixturenet-eth-images.yml
+++ b/.gitea/workflows/publish-fixturenet-eth-images.yml
@ -1,43 +0,0 @@
-name: Publish Ethereum Fixturenet Stack Container Images
-
-on:
-  push:
-    branches: 'main'
-    paths:
-      - '!**'
-      - '.gitea/workflows/triggers/publish-fixturenet-eth-images'
-      - '.gitea/workflows/publish-fixturenet-eth-images.yml'
-
-jobs:
-  publish:
-    name: "Publish Ethereum Fixturenet Stack Container Images"
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: '3.8'
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install stack orchestrator"
-        run: ./scripts/install-so.sh
-      - name: "Build containers"
-        run: |
-         PATH=$PATH:~/bin
-         laconic-so --quiet --stack $(pwd)/stack-orchestrator/stacks/fixturenet-eth setup-repositories
-         laconic-so --stack $(pwd)/stack-orchestrator/stacks/fixturenet-eth build-containers
-      - name: "Publish container images"
-        run: |
-          PATH=$PATH:~/bin
-          echo ${{ secrets.CICD_PUBLISH_TOKEN }} | docker login git.vdb.to -u cerccicd --password-stdin
-          laconic-so --stack $(pwd)/stack-orchestrator/stacks/fixturenet-eth build-containers --publish-images --image-registry git.vdb.to/cerc-io
--- a/.gitea/workflows/test-fixturenet-plugeth.yml
+++ b/.gitea/workflows/test-fixturenet-plugeth.yml
@ -1,56 +0,0 @@
-name: Test Ethereum Plugeth Fixturenet Stack
-
-on:
-  push:
-    branches: '*'
-  pull_request:
-  schedule: # Note: coordinate with other tests to not overload runners at the same time of day
-    - cron: '14 01 * * *'
-
-jobs:
-  test:
-    name: "Test fixturenet-plugeth stack"
-    strategy:
-      matrix:
-        os: [ubuntu-latest, ubuntu-latest-arm]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: "Clone project repository"
-        uses: actions/checkout@v3
-      # At present the stock setup-python action fails on Linux/aarch64
-      # Conditional steps below workaroud this by using deadsnakes for that case only
-      - name: "Install Python for ARM on Linux"
-        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
-        uses: deadsnakes/action@v3.0.1
-        with:
-          python-version: 3.11
-      - name: "Install Python cases other than ARM on Linux"
-        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: 3.11
-      - name: "Print Python version"
-        run: python3 --version
-      - name: "Install stack orchestrator"
-        run: ./scripts/install-so.sh
-      - name: "Run stack tests"
-        run: |
-         PATH=$PATH:~/bin
-         ./tests/fixturenet-plugeth-stack/run-test.sh
-
-      - name: Notify Vulcanize Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.VULCANIZE_SLACK_CI_ALERTS }}
-      - name: Notify DeepStack Slack on CI failure
-        if: ${{ always() && github.ref_name == 'main' }}
-        uses: ravsamhq/notify-slack-action@v2
-        with:
-          status: ${{ job.status }}
-          notify_when: 'failure'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.DEEPSTACK_SLACK_CI_ALERTS }}
--- a/.gitea/workflows/triggers/publish-fixturenet-eth-images
+++ b/.gitea/workflows/triggers/publish-fixturenet-eth-images
@ -1,2 +0,0 @@
-# Change this file to trigger the job publish-fixturenet-eth-images.yml
-5
--- a/stack-orchestrator/compose/docker-compose-fixturenet-eth.yml
+++ b/stack-orchestrator/compose/docker-compose-fixturenet-eth.yml
@ -1,3 +1,5 @@
+version: '3.7'
+
 services:
  fixturenet-eth-bootnode-geth:
    restart: always
@ -20,8 +22,9 @@ services:
      - SYS_PTRACE
    environment:
      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
+      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-eth/fixturenet-eth.env
    image: cerc/fixturenet-eth-geth:local
@ -59,6 +62,9 @@ services:
      - fixturenet-eth-bootnode-geth
    volumes:
      - fixturenet_eth_geth_2_data:/root/ethdata
+    ports:
+      - "8545"
+      - "8546"

  fixturenet-eth-bootnode-lighthouse:
    restart: always
--- a/stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml
+++ b/stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml
@ -1,135 +0,0 @@
-services:
-  fixturenet-eth-bootnode-geth:
-    restart: always
-    hostname: fixturenet-eth-bootnode-geth
-    env_file:
-      - ../config/fixturenet-eth/fixturenet-eth.env
-    environment:
-      RUN_BOOTNODE: "true"
-      CERC_SCRIPT_DEBUG: ${CERC_SCRIPT_DEBUG}
-    image: cerc/fixturenet-plugeth-plugeth:local
-    volumes:
-      - fixturenet_plugeth_bootnode_geth_data:/root/ethdata
-      - fixturenet_plugeth_bootnode_geth_config:/opt/testnet/build/el
-    ports:
-      - "9898"
-      - "30303"
-
-  fixturenet-eth-geth-1:
-    restart: always
-    hostname: fixturenet-eth-geth-1
-    cap_add:
-      - SYS_PTRACE
-    environment:
-      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
-      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-eth/fixturenet-eth.env
-      - ../config/fixturenet-plugeth/statediff.env
-    image: cerc/fixturenet-plugeth-plugeth:local
-    volumes:
-      - fixturenet_plugeth_geth_1_data:/root/ethdata
-    healthcheck:
-      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8545/"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    depends_on:
-      - fixturenet-eth-bootnode-geth
-    ports:
-      - "8545"
-      - "8546"
-      - "40000"
-      - "6060"
-
-  fixturenet-eth-geth-2:
-    restart: always
-    hostname: fixturenet-eth-geth-2
-    healthcheck:
-      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8545/"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
-    environment:
-      CERC_KEEP_RUNNING_AFTER_GETH_EXIT: "true"
-    env_file:
-      - ../config/fixturenet-eth/fixturenet-eth.env
-    image: cerc/fixturenet-plugeth-plugeth:local
-    depends_on:
-      - fixturenet-eth-bootnode-geth
-    volumes:
-      - fixturenet_plugeth_geth_2_data:/root/ethdata
-    ports:
-      - "8545"
-      - "8546"
-
-  fixturenet-eth-bootnode-lighthouse:
-    restart: always
-    hostname: fixturenet-eth-bootnode-lighthouse
-    environment:
-      RUN_BOOTNODE: "true"
-    image: cerc/fixturenet-eth-lighthouse:local
-
-  fixturenet-eth-lighthouse-1:
-    restart: always
-    hostname: fixturenet-eth-lighthouse-1
-    healthcheck:
-      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 30s
-    env_file:
-      - ../config/fixturenet-eth/fixturenet-eth.env
-    environment:
-      NODE_NUMBER: "1"
-      ETH1_ENDPOINT: "http://fixturenet-eth-geth-1:8545"
-      EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-1:8551"
-    image: cerc/fixturenet-eth-lighthouse:local
-    volumes:
-      - fixturenet_plugeth_lighthouse_1_data:/opt/testnet/build/cl
-    depends_on:
-      fixturenet-eth-bootnode-lighthouse:
-        condition: service_started
-      fixturenet-eth-geth-1:
-        condition: service_healthy
-    ports:
-      - "8001"
-
-  fixturenet-eth-lighthouse-2:
-    restart: always
-    hostname: fixturenet-eth-lighthouse-2
-    healthcheck:
-      test: ["CMD", "wget", "--tries=1", "--connect-timeout=1", "--quiet", "-O", "-", "http://localhost:8001/eth/v2/beacon/blocks/head"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 30s
-    env_file:
-      - ../config/fixturenet-eth/fixturenet-eth.env
-    environment:
-      NODE_NUMBER: "2"
-      ETH1_ENDPOINT: "http://fixturenet-eth-geth-2:8545"
-      EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-2:8551"
-      LIGHTHOUSE_GENESIS_STATE_URL: "http://fixturenet-eth-lighthouse-1:8001/eth/v2/debug/beacon/states/0"
-    image: cerc/fixturenet-eth-lighthouse:local
-    volumes:
-      - fixturenet_plugeth_lighthouse_2_data:/opt/testnet/build/cl
-    depends_on:
-      fixturenet-eth-bootnode-lighthouse:
-        condition: service_started
-      fixturenet-eth-geth-2:
-        condition: service_healthy
-
-volumes:
-  fixturenet_plugeth_bootnode_geth_data:
-  fixturenet_plugeth_bootnode_geth_config:
-  fixturenet_plugeth_geth_1_data:
-  fixturenet_plugeth_geth_2_data:
-  fixturenet_plugeth_lighthouse_1_data:
-  fixturenet_plugeth_lighthouse_2_data:
--- a/stack-orchestrator/compose/docker-compose-ipld-eth-db.yml
+++ b/stack-orchestrator/compose/docker-compose-ipld-eth-db.yml
@ -1,28 +0,0 @@
-services:
-  migrations:
-    restart: on-failure
-    depends_on:
-      ipld-eth-db:
-        condition: service_healthy
-    image: cerc/ipld-eth-db:local
-    environment:
-      DATABASE_USER: "vdbm"
-      DATABASE_NAME: "cerc_testing"
-      DATABASE_PASSWORD: "password"
-      DATABASE_HOSTNAME: "ipld-eth-db"
-      DATABASE_PORT: 5432
-
-  ipld-eth-db:
-    image: timescale/timescaledb:latest-pg14
-    restart: always
-    environment:
-      POSTGRES_USER: "vdbm"
-      POSTGRES_DB: "cerc_testing"
-      POSTGRES_PASSWORD: "password"
-    ports:
-      - "127.0.0.1:8077:5432"
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "vdbm"]
-      interval: 2s
-      timeout: 1s
-      retries: 3
--- a/stack-orchestrator/compose/docker-compose-ipld-eth-server.yml
+++ b/stack-orchestrator/compose/docker-compose-ipld-eth-server.yml
@ -1,43 +0,0 @@
-services:
-  ipld-eth-server:
-    restart: unless-stopped
-    depends_on:
-      ipld-eth-db:
-        condition: service_healthy
-    image: cerc/ipld-eth-server:local
-    environment:
-      SERVER_HTTP_PATH: 0.0.0.0:8081
-      SERVER_GRAPHQL: "true"
-      SERVER_GRAPHQLPATH: 0.0.0.0:8082
-      ETH_CHAIN_CONFIG: "/opt/config/chain.json"
-      DATABASE_NAME: cerc_testing
-      DATABASE_HOSTNAME: ipld-eth-db
-      DATABASE_PORT: 5432
-      DATABASE_USER: "vdbm"
-      DATABASE_PASSWORD: "password"
-      ETH_FORWARD_ETH_CALLS: "false"
-      ETH_FORWARD_GET_STORAGE_AT: "false"
-      ETH_PROXY_ON_ERROR: "false"
-      METRICS: "true"
-      PROM_HTTP: "true"
-      PROM_HTTP_ADDR: "0.0.0.0"
-      PROM_HTTP_PORT: "8090"
-      LOG_LEVEL: "debug"
-      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
-    volumes:
-      - fixturenet_plugeth_bootnode_geth_config:/opt/config
-    ports:
-      - "8081"
-      - "8082"
-      - "8090"
-      - "40000"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "8081"]
-      interval: 20s
-      timeout: 5s
-      retries: 15
-      start_period: 5s
-
-volumes:
-  fixturenet_plugeth_bootnode_geth_config:
-
--- a/stack-orchestrator/config/fixturenet-eth/fixturenet-eth.env
+++ b/stack-orchestrator/config/fixturenet-eth/fixturenet-eth.env
@ -11,8 +11,15 @@ 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"

-CERC_GETH_VMODULE="rpc/*=5"
-CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3}
+# 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

-# --debug-level
-DEBUG_LEVEL=${LIGHTHOUSE_DEBUG_LEVEL:-info}
+CERC_GETH_VMODULE="statediff/*=5,rpc/*=5"
+CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3}
--- a/stack-orchestrator/config/fixturenet-plugeth/statediff.env
+++ b/stack-orchestrator/config/fixturenet-plugeth/statediff.env
@ -1,12 +0,0 @@
-# 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:-21}
-CERC_STATEDIFF_DB_LOG_STATEMENTS="${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false}"
-CERC_STATEDIFF_WORKERS=2
-
-CERC_GETH_HTTP_APIS="eth,web3,net,admin,personal,debug,statediff"
-CERC_GETH_WS_APIS="eth,web3,net,admin,personal,debug,statediff"
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile
@ -1,19 +0,0 @@
-FROM ethpandaops/ethereum-genesis-generator:3.0.0 AS ethgen
-
-# Build genesis config
-ADD genesis /opt/genesis
-WORKDIR /opt/genesis
-RUN make genesis-el
-RUN jq ".config" build/el/geth.json > build/el/chain.json
-
-FROM golang:1.21-alpine as builder
-
-COPY --from=ethgen /opt/genesis /opt/genesis
-
-# Snag the genesis block info.
-RUN CGO_ENABLED=0 go install github.com/cerc-io/eth-dump-genblock@v0.2.0
-RUN eth-dump-genblock /opt/genesis/build/el/geth.json > /opt/genesis/build/el/genesis_block.json
-
-FROM alpine:latest
-
-COPY --from=builder /opt/genesis /opt/genesis
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/build.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/build.sh
@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/fixturenet-eth-genesis-postmerge
-
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-docker build -t cerc/fixturenet-eth-genesis-postmerge:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/el/build_el.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/el/build_el.sh
@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# See: https://github.com/skylenet/ethereum-genesis-generator/blob/master/entrypoint.sh
-
-rm -rf ../build/el
-mkdir -p ../build/el
-
-tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
-envsubst < el-config.yaml > $tmp_dir/genesis-config.yaml
-
-python3 /apps/el-gen/genesis_geth.py $tmp_dir/genesis-config.yaml | \
-  jq 'del(.config.pragueTime)' \
-  > ../build/el/geth.json
-
-python3 ../accounts/mnemonic_to_csv.py $tmp_dir/genesis-config.yaml > ../build/el/accounts.csv
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/Dockerfile
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/Dockerfile
@ -0,0 +1,28 @@
+FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
+
+FROM golang:1.20-alpine as builder
+
+RUN apk add --no-cache python3 py3-pip
+
+COPY genesis /opt/genesis
+
+# Install ethereum-genesis-generator tools
+COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/
+COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/
+COPY --from=ethgen /apps /apps
+RUN cd /apps/el-gen && pip3 install --break-system-packages -r requirements.txt
+# web3==5.24.0 used by el-gen is broken on python 3.11
+RUN pip3 install --break-system-packages --upgrade "web3==6.5.0"
+RUN pip3 install --break-system-packages --upgrade "typing-extensions"
+
+# Build genesis config
+RUN apk add --no-cache make bash envsubst jq
+RUN cd /opt/genesis && make genesis-el
+
+# Snag the genesis block info.
+RUN go install github.com/cerc-io/eth-dump-genblock@latest
+RUN eth-dump-genblock /opt/genesis/build/el/geth.json > /opt/genesis/build/el/genesis_block.json
+
+FROM alpine:latest
+
+COPY --from=builder /opt/genesis /opt/genesis
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/build.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/build.sh
@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Build cerc/fixturenet-eth-genesis-premerge
+
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+docker build -t cerc/fixturenet-eth-genesis-premerge:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/Makefile
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/Makefile
@ -6,7 +6,7 @@ genesis: genesis-el

 .PHONY: genesis-el
 genesis-el:
-	cd el && . /apps/el-gen/.venv/bin/activate && ./build_el.sh
+	cd el; ./build_el.sh

 .PHONY: clean
 clean:
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/accounts/import_keys.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/accounts/import_keys.sh
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/accounts/mnemonic_to_csv.py
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/accounts/mnemonic_to_csv.py
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/el/build_el.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-premerge/genesis/el/build_el.sh
@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+set -e
+
+# See: https://github.com/skylenet/ethereum-genesis-generator/blob/master/entrypoint.sh
+
+rm -rf ../build/el
+mkdir -p ../build/el
+
+tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX)
+envsubst < el-config.yaml > $tmp_dir/genesis-config.yaml
+
+ttd=`cat $tmp_dir/genesis-config.yaml | grep terminal_total_difficulty | awk '{ print $2 }'`
+homestead_block=`cat $tmp_dir/genesis-config.yaml | grep homestead_block | awk '{ print $2 }'`
+eip150_block=`cat $tmp_dir/genesis-config.yaml | grep eip150_block | awk '{ print $2 }'`
+eip155_block=`cat $tmp_dir/genesis-config.yaml | grep eip155_block | awk '{ print $2 }'`
+eip158_block=`cat $tmp_dir/genesis-config.yaml | grep eip158_block | awk '{ print $2 }'`
+byzantium_block=`cat $tmp_dir/genesis-config.yaml | grep byzantium_block | awk '{ print $2 }'`
+constantinople_block=`cat $tmp_dir/genesis-config.yaml | grep constantinople_block | awk '{ print $2 }'`
+petersburg_block=`cat $tmp_dir/genesis-config.yaml | grep petersburg_block | awk '{ print $2 }'`
+istanbul_block=`cat $tmp_dir/genesis-config.yaml | grep istanbul_block | awk '{ print $2 }'`
+berlin_block=`cat $tmp_dir/genesis-config.yaml | grep berlin_block | awk '{ print $2 }'`
+london_block=`cat $tmp_dir/genesis-config.yaml | grep london_block | awk '{ print $2 }'`
+merge_fork_block=`cat $tmp_dir/genesis-config.yaml | grep merge_fork_block | awk '{ print $2 }'`
+
+python3 /apps/el-gen/genesis_geth.py $tmp_dir/genesis-config.yaml | \
+  jq ".config.terminalTotalDifficulty=$ttd" | \
+  jq ".config.homesteadBlock=$homestead_block" | \
+  jq ".config.eip150Block=$eip150_block" | \
+  jq ".config.eip155Block=$eip155_block" | \
+  jq ".config.eip158Block=$eip158_block" | \
+  jq ".config.byzantiumBlock=$byzantium_block" | \
+  jq ".config.constantinopleBlock=$constantinople_block" | \
+  jq ".config.petersburgBlock=$petersburg_block" | \
+  jq ".config.istanbulBlock=$istanbul_block" | \
+  jq ".config.berlinBlock=$berlin_block" | \
+  jq ".config.londonBlock=$london_block" | \
+  jq ".config.mergeForkBlock=$merge_fork_block" | \
+  jq ".config.mergeNetsplitBlock=$merge_fork_block" \
+  > ../build/el/geth.json
+python3 ../accounts/mnemonic_to_csv.py $tmp_dir/genesis-config.yaml > ../build/el/accounts.csv
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/el/el-config.yaml
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/genesis/el/el-config.yaml
@ -10,8 +10,22 @@ el_premine_addrs: {}
 chain_id: 1212
 deposit_contract_address: "0x1212121212121212121212121212121212121212"
 genesis_timestamp: 0
-genesis_delay: 0
-deneb_fork_epoch: 0
-# note: only needed as workaround https://github.com/ethpandaops/ethereum-genesis-generator/pull/105
-electra_fork_epoch: 0
-slot_duration_in_seconds: 3
+terminal_total_difficulty: 1000
+homestead_block: 1
+eip150_block: 1
+eip155_block: 1
+eip158_block: 1
+byzantium_block: 1
+constantinople_block: 1
+petersburg_block: 1
+istanbul_block: 1
+berlin_block: 1
+london_block: 1
+merge_fork_block: 1
+
+clique:
+  enabled: false
+  signers:
+    - 36d56343bc308d4ffaac2f793d121aba905fa6cc
+    - 5e762d4a3847cadaf40a4b0c39574b0ff6698c78
+    - 15d7acc1019fdf8ab4f0f7bd31ec1487ecb5a2bd
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/Dockerfile
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/Dockerfile
@ -1,5 +1,5 @@
-FROM cerc/fixturenet-eth-genesis-postmerge:local as fnetgen
-FROM ethereum/client-go:v1.14.8 as geth
+FROM cerc/fixturenet-eth-genesis-premerge:local as fnetgen
+FROM ethereum/client-go:release-1.11 as geth

 # Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile
 FROM golang:1.21-alpine as delve
@ -16,8 +16,6 @@ COPY --from=geth /usr/local/bin/geth /usr/local/bin/
 COPY --from=fnetgen /opt/genesis /opt/testnet

 # Initialize the geth db with our config
-RUN geth --datadir ~/ethdata --state.scheme hash \
-    init /opt/testnet/build/el/geth.json && \
-    rm -f ~/ethdata/geth/nodekey
+RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey

 ENTRYPOINT ["/opt/testnet/run.sh"]
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/run-el.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-geth/run-el.sh
@ -6,7 +6,7 @@ fi

 ETHERBASE=`cat /opt/testnet/build/el/accounts.csv | head -1 | cut -d',' -f2`
 NETWORK_ID=`cat /opt/testnet/el/el-config.yaml | grep 'chain_id' | awk '{ print $2 }'`
-NETRESTRICT=`ip addr | grep -w inet | grep -v '127.0' | awk '{print $2}'`
+NETRESTRICT=`ip addr | grep 'inet ' | grep -v '127.0' | head -1 | awk '{print $2}'`
 CERC_ETH_DATADIR="${CERC_ETH_DATADIR:-$HOME/ethdata}"
 CERC_PLUGINS_DIR="${CERC_PLUGINS_DIR:-/usr/local/lib/plugeth}"

@ -50,64 +50,6 @@ else

    echo -n "$JWT" > /opt/testnet/build/el/jwtsecret

-    if [ "$CERC_RUN_STATEDIFF" == "detect" ] && [ -n "$CERC_STATEDIFF_DB_HOST" ]; then
-      dig_result=$(dig $CERC_STATEDIFF_DB_HOST +short)
-      dig_status_code=$?
-      if [[ $dig_status_code = 0 && -n $dig_result ]]; then
-        echo "Statediff DB at $CERC_STATEDIFF_DB_HOST"
-        CERC_RUN_STATEDIFF="true"
-      else
-        echo "No statediff DB available."
-        CERC_RUN_STATEDIFF="false"
-      fi
-    fi
-
-    STATEDIFF_OPTS=""
-    if [ "$CERC_RUN_STATEDIFF" == "true" ]; then
-      ready=0
-      echo "Waiting for statediff DB..."
-      while [ $ready -eq 0 ]; do
-        sleep 1
-        export PGPASSWORD="$CERC_STATEDIFF_DB_PASSWORD"
-        result=$(psql -h "$CERC_STATEDIFF_DB_HOST" \
-          -p "$CERC_STATEDIFF_DB_PORT" \
-          -U "$CERC_STATEDIFF_DB_USER" \
-          -d "$CERC_STATEDIFF_DB_NAME" \
-          -t -c 'select max(version_id) from goose_db_version;' 2>/dev/null | awk '{ print $1 }')
-        if [ -n "$result" ]; then
-          echo "DB ready."
-          if [ $result -ge $CERC_STATEDIFF_DB_GOOSE_MIN_VER ]; then
-            ready=1
-          else
-            echo "DB not at required version (want $CERC_STATEDIFF_DB_GOOSE_MIN_VER, have $result)"
-          fi
-        fi
-      done
-      STATEDIFF_OPTS="--statediff \
-      --statediff.db.host=$CERC_STATEDIFF_DB_HOST \
-      --statediff.db.name=$CERC_STATEDIFF_DB_NAME \
-      --statediff.db.nodeid=$CERC_STATEDIFF_DB_NODE_ID \
-      --statediff.db.password=$CERC_STATEDIFF_DB_PASSWORD \
-      --statediff.db.port=$CERC_STATEDIFF_DB_PORT \
-      --statediff.db.user=$CERC_STATEDIFF_DB_USER \
-      --statediff.db.logstatements=${CERC_STATEDIFF_DB_LOG_STATEMENTS:-false} \
-      --statediff.db.copyfrom=${CERC_STATEDIFF_DB_COPY_FROM:-true} \
-      --statediff.waitforsync=true \
-      --statediff.workers=${CERC_STATEDIFF_WORKERS:-1} \
-      --statediff.writing=true"
-
-      if [ -d "${CERC_PLUGINS_DIR}" ]; then
-        # With plugeth, we separate the statediff options by prefixing with ' -- '
-        STATEDIFF_OPTS="--pluginsdir "${CERC_PLUGINS_DIR}" -- ${STATEDIFF_OPTS}"
-      fi
-    fi
-
-    OTHER_OPTS=""
-    if [ "$CERC_ALLOW_UNPROTECTED_TXS" == "true" ]; then
-      # Allow for unprotected (non EIP155) txs to be submitted via RPC
-      OTHER_OPTS+=" --rpc.allow-unprotected-txs"
-    fi
-
    $START_CMD \
      --datadir="${CERC_ETH_DATADIR}" \
      --bootnodes="${ENODE}" \
@ -127,19 +69,17 @@ else
      --http.corsdomain="*" \
      --networkid="${NETWORK_ID}" \
      --netrestrict="${NETRESTRICT}" \
-      --state.scheme hash \
      --gcmode archive \
      --txlookuplimit=0 \
      --cache.preimages \
      --syncmode=full \
      --mine \
+      --miner.threads=1 \
      --metrics \
      --metrics.addr="0.0.0.0" \
      --verbosity=${CERC_GETH_VERBOSITY:-3} \
      --log.vmodule="${CERC_GETH_VMODULE}" \
      --miner.etherbase="${ETHERBASE}" \
-      ${OTHER_OPTS} \
-      ${STATEDIFF_OPTS} \
      &

    geth_pid=$!
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile
@ -1,5 +1,6 @@
 FROM cerc/lighthouse-cli:local AS lcli
-FROM cerc/fixturenet-eth-genesis-postmerge:local AS fnetgen
+FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
+FROM cerc/fixturenet-eth-genesis-premerge:local AS fnetgen

 FROM cerc/lighthouse:local

@ -11,13 +12,16 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y --no-install-reco
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*

-COPY --from=lcli /usr/local/bin/lcli /usr/local/bin/lcli
-COPY --from=fnetgen /opt/genesis/el /opt/testnet/el
-COPY --from=fnetgen /opt/genesis/build/el /opt/testnet/build/el
-
 COPY genesis /opt/testnet
 COPY run-cl.sh /opt/testnet/run.sh

+COPY --from=lcli /usr/local/bin/lcli /usr/local/bin/lcli
+COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/eth2-testnet-genesis
+COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/eth2-val-tools
+COPY --from=ethgen /apps /apps
+COPY --from=fnetgen /opt/genesis/el /opt/testnet/el
+COPY --from=fnetgen /opt/genesis/build/el /opt/testnet/build/el
+
 RUN cd /opt/testnet && make genesis-cl

 # Work around some bugs in lcli where the default path is always used.
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/beacon_node.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/beacon_node.sh
@ -10,6 +10,7 @@ set -Eeuo pipefail
 source ./vars.env

 SUBSCRIBE_ALL_SUBNETS=
+DEBUG_LEVEL=${DEBUG_LEVEL:-debug}

 # Get positional arguments
 data_dir=$DATADIR/node_${NODE_NUMBER}
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/bootnode.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/bootnode.sh
@ -9,6 +9,8 @@ set -Eeuo pipefail

 source ./vars.env

+DEBUG_LEVEL=${1:-info}
+
 echo "Starting bootnode"

 # Clean up existing ENR dir to avoid node connectivity issues on a restart
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh
@ -1,6 +1,5 @@
 #!/usr/bin/env bash

-# See https://github.com/sigp/lighthouse/scripts/local_testnet/setup.sh
 #
 # Deploys the deposit contract and makes deposits for $VALIDATOR_COUNT insecure deterministic validators.
 # Produces a testnet specification and a genesis state where the genesis time
@ -25,31 +24,23 @@ echo "(Note: errors of the form 'WARN: Scrypt parameters are too weak...' below
 lcli \
  new-testnet \
  --spec $SPEC_PRESET \
-  --testnet-dir $TESTNET_DIR \
  --deposit-contract-address $ETH1_DEPOSIT_CONTRACT_ADDRESS \
+  --testnet-dir $TESTNET_DIR \
  --min-genesis-active-validator-count $GENESIS_VALIDATOR_COUNT \
  --validator-count $VALIDATOR_COUNT \
  --min-genesis-time $GENESIS_TIME \
  --genesis-delay $GENESIS_DELAY \
  --genesis-fork-version $GENESIS_FORK_VERSION \
  --altair-fork-epoch $ALTAIR_FORK_EPOCH \
-  --bellatrix-fork-epoch $BELLATRIX_FORK_EPOCH \
-  --capella-fork-epoch $CAPELLA_FORK_EPOCH \
-  --deneb-fork-epoch $DENEB_FORK_EPOCH \
+  --bellatrix-fork-epoch $MERGE_FORK_EPOCH \
  --eth1-id $ETH1_CHAIN_ID \
  --eth1-block-hash $ETH1_BLOCK_HASH \
  --eth1-follow-distance 1 \
  --seconds-per-slot $SECONDS_PER_SLOT \
  --seconds-per-eth1-block $SECONDS_PER_ETH1_BLOCK \
-  --interop-genesis-state \
  --force

-# Patch the spec with settings not supported by lcli
-sed -i "/^SHARD_COMMITTEE_PERIOD:/s/:.*/: $SHARD_COMMITTEE_PERIOD/" $TESTNET_DIR/config.yaml
-sed -i "/^MIN_VALIDATOR_WITHDRAWABILITY_DELAY:/s/:.*/: $MIN_VALIDATOR_WITHDRAWABILITY_DELAY/" $TESTNET_DIR/config.yaml
-sed -i "/^MAX_SEED_LOOKAHEAD:/s/:.*/: $MAX_SEED_LOOKAHEAD/" $TESTNET_DIR/config.yaml
-
-echo Specification and genesis.ssz generated at $TESTNET_DIR.
+echo Specification generated at $TESTNET_DIR.
 echo "Generating $VALIDATOR_COUNT validators concurrently... (this may take a while)"

 lcli \
@ -59,3 +50,13 @@ lcli \
  --node-count $BN_COUNT

 echo Validators generated with keystore passwords at $DATADIR.
+echo "Building genesis state... (this might take a while)"
+
+lcli \
+  interop-genesis \
+  --spec $SPEC_PRESET \
+  --genesis-time $GENESIS_TIME \
+  --testnet-dir $TESTNET_DIR \
+  $GENESIS_VALIDATOR_COUNT
+
+echo Created genesis state in $TESTNET_DIR
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/validator_client.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/validator_client.sh
@ -8,6 +8,8 @@ set -Eeuo pipefail

 source ./vars.env

+DEBUG_LEVEL=info
+
 BUILDER_PROPOSALS=

 # Get options
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env
@ -25,9 +25,7 @@ BOOTNODE_PORT=${BOOTNODE_PORT:-4242}

 # Hard fork configuration
 ALTAIR_FORK_EPOCH=${ALTAIR_FORK_EPOCH:-0}
-BELLATRIX_FORK_EPOCH=${BELLATRIX_FORK_EPOCH:-0}
-CAPELLA_FORK_EPOCH=${CAPELLA_FORK_EPOCH:-0}
-DENEB_FORK_EPOCH=${DENEB_FORK_EPOCH:-0}
+MERGE_FORK_EPOCH=${MERGE_FORK_EPOCH:-0}

 # Spec version (mainnet or minimal)
 SPEC_PRESET=${SPEC_PRESET:-mainnet}
@ -38,13 +36,6 @@ SECONDS_PER_SLOT=${SECONDS_PER_SLOT:-3}
 # Seconds per Eth1 block
 SECONDS_PER_ETH1_BLOCK=${SECONDS_PER_ETH1_BLOCK:-1}

-# Min epochs between validator activation and exit
-SHARD_COMMITTEE_PERIOD=2
-# Min epochs between validator exit and withdrawal
-MIN_VALIDATOR_WITHDRAWABILITY_DELAY=1
-# Delay for validator activation/exit
-MAX_SEED_LOOKAHEAD=1
-
 # Command line arguments for validator client
 VC_ARGS=${VC_ARGS:-""}

--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh
@ -9,7 +9,7 @@ STATUSES=(
  "beacon phase0"
  "beacon altair"
  "beacon bellatrix pre-merge"
-  "beacon post-merge"
+  "beacon bellatrix merge"
  "block number $MIN_BLOCK_NUM"
 )
 STATUS=0
@ -69,22 +69,14 @@ while [ $STATUS -lt ${#STATUSES[@]} ]; do
      ;;
    2)
      result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.version'`
-      if [ ! -z "$result" ]; then
-        case "$result" in
-          "altair" | "bellatrix" | "capella" | "deneb")
-            inc_status
-            ;;
-        esac
+      if [ ! -z "$result" ] && ([ "$result" == "altair" ] || [ "$result" == "bellatrix" ]); then
+        inc_status
      fi
      ;;
    3)
      result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.version'`
-      if [ ! -z "$result" ]; then
-        case "$result" in
-          "bellatrix" | "capella" | "deneb")
-            inc_status
-            ;;
-        esac
+      if [ ! -z "$result" ] && [ "$result" == "bellatrix" ]; then
+        inc_status
      fi
      ;;
    4)
--- a/stack-orchestrator/container-build/cerc-fixturenet-plugeth-plugeth/Dockerfile
+++ b/stack-orchestrator/container-build/cerc-fixturenet-plugeth-plugeth/Dockerfile
@ -1,27 +0,0 @@
-FROM cerc/fixturenet-eth-genesis-postmerge:local as fnetgen
-
-# Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile
-FROM golang:1.21-alpine as delve
-RUN go install github.com/go-delve/delve/cmd/dlv@latest
-
-FROM cerc/plugeth-statediff:local as statediff
-# FIXME: fork of plugeth, use stock after upstreaming patches
-FROM cerc/plugeth:local as geth
-
-FROM alpine:3.18
-
-RUN apk add --no-cache bash wget python3 bind-tools postgresql-client
-
-COPY run-el.sh /opt/testnet/run.sh
-
-COPY --from=delve /go/bin/dlv /usr/local/bin/
-COPY --from=geth /usr/local/bin/geth /usr/local/bin/
-COPY --from=fnetgen /opt/genesis /opt/testnet
-COPY --from=statediff  /usr/local/lib/statediff.so /usr/local/lib/plugeth/
-
-# Initialize the geth db with our config
-RUN geth --datadir ~/ethdata --state.scheme hash \
-    init /opt/testnet/build/el/geth.json && \
-    rm -f ~/ethdata/geth/nodekey
-
-ENTRYPOINT ["/opt/testnet/run.sh"]
--- a/stack-orchestrator/container-build/cerc-fixturenet-plugeth-plugeth/build.sh
+++ b/stack-orchestrator/container-build/cerc-fixturenet-plugeth-plugeth/build.sh
@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/fixturenet-plugeth-plugeth
-set -x
-
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-cp -fp ${SCRIPT_DIR}/../cerc-fixturenet-eth-geth/run-el.sh ${SCRIPT_DIR}/
-
-docker build -t cerc/fixturenet-plugeth-plugeth:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR
--- a/stack-orchestrator/container-build/cerc-lighthouse/Dockerfile
+++ b/stack-orchestrator/container-build/cerc-lighthouse/Dockerfile
@ -1,10 +1,9 @@
-FROM sigp/lighthouse:v5.1.2
+ARG TAG_SUFFIX="-modern"
+FROM sigp/lighthouse:v4.3.0${TAG_SUFFIX}

-RUN apt-get update && apt-get -y upgrade \
-    && apt-get -y install bash netcat curl less jq wget \
-    && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt-get update; apt-get install bash netcat curl less jq wget -y;

-WORKDIR /root
+WORKDIR /root/
 ADD start-lighthouse.sh .

 ENTRYPOINT [ "./start-lighthouse.sh" ]
--- a/stack-orchestrator/container-build/cerc-lighthouse/build.sh
+++ b/stack-orchestrator/container-build/cerc-lighthouse/build.sh
@ -6,4 +6,4 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 # See: https://stackoverflow.com/a/246128/1701505
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

-docker build -t cerc/lighthouse:local ${build_command_args} ${SCRIPT_DIR}
+docker build -t cerc/lighthouse:local ${build_command_args} --build-arg TAG_SUFFIX="" ${SCRIPT_DIR}
--- a/stack-orchestrator/container-build/cerc-plugeth-statediff/build.sh
+++ b/stack-orchestrator/container-build/cerc-plugeth-statediff/build.sh
@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/plugeth-statediff
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-# Pass Go auth token if present
-if [[ -n "${CERC_GO_AUTH_TOKEN}" ]]; then
-    build_command_args="${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN}"
-fi
-docker build -t cerc/plugeth-statediff:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth-statediff
--- a/stack-orchestrator/container-build/cerc-plugeth/build.sh
+++ b/stack-orchestrator/container-build/cerc-plugeth/build.sh
@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/plugeth
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-# Pass Go auth token if present
-if [[ -n "${CERC_GO_AUTH_TOKEN}" ]]; then
-    build_command_args="${build_command_args} --build-arg GIT_VDBTO_TOKEN=${CERC_GO_AUTH_TOKEN}"
-fi
-docker build -t cerc/plugeth:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth
--- a/stack-orchestrator/stacks/fixturenet-eth/README.md
+++ b/stack-orchestrator/stacks/fixturenet-eth/README.md
@ -59,6 +59,60 @@ $ laconic-so --stack ~/cerc/fixturenet-eth-stacks/stacks/fixturenet-eth deploy e
 3
 ```

+## Additional pieces
+
+Several other containers can used with the basic `fixturenet-eth`:
+
+* `ipld-eth-db` (enables statediffing)
+* `ipld-eth-server` (GQL and Ethereum API server, requires `ipld-eth-db`)
+* `ipld-eth-beacon-db` and `ipld-eth-beacon-indexer` (for indexing Beacon chain blocks)
+* `eth-probe` (captures eth1 tx gossip)
+* `keycloak` (nginx proxy with keycloak auth for API authentication)
+* `tx-spammer` (generates and sends automated transactions to the fixturenet)
+
+It is not necessary to use them all at once, but a complete example follows:
+
+```
+# Setup
+$ laconic-so setup-repositories --include git.vdb.to/cerc-io/go-ethereum,git.vdb.to/cerc-io/ipld-eth-db,git.vdb.to/cerc-io/ipld-eth-server,github.com/cerc-io/ipld-eth-beacon-db,github.com/cerc-io/ipld-eth-beacon-indexer,github.com/cerc-io/eth-probe,git.vdb.to/cerc-io/tx-spammer
+
+# Build
+$ laconic-so build-containers --include cerc/go-ethereum,cerc/lighthouse,cerc/fixturenet-eth-geth,cerc/fixturenet-eth-lighthouse,cerc/ipld-eth-db,cerc/ipld-eth-server,cerc/ipld-eth-beacon-db,cerc/ipld-eth-beacon-indexer,cerc/eth-probe,cerc/keycloak,cerc/tx-spammer
+
+# Deploy
+$ laconic-so deploy-system --include db,fixturenet-eth,ipld-eth-server,ipld-eth-beacon-db,ipld-eth-beacon-indexer,eth-probe,keycloak,tx-spammer up
+
+# Status
+
+$ container-build/cerc-fixturenet-eth-lighthouse/scripts/status.sh
+Waiting for geth to generate DAG.... done
+Waiting for beacon phase0.... done
+Waiting for beacon altair.... done
+Waiting for beacon bellatrix pre-merge.... done
+Waiting for beacon bellatrix merge.... done
+
+$ docker ps -f 'name=laconic' --format 'table {{.Names}}\t{{.Ports}}'  | cut -d'-' -f3- | sort
+NAMES                                                                           PORTS
+eth-probe-db-1                         0.0.0.0:55849->5432/tcp
+eth-probe-mq-1
+eth-probe-probe-1
+fixturenet-eth-bootnode-geth-1         8545-8546/tcp, 30303/udp, 0.0.0.0:55847->9898/tcp, 0.0.0.0:55848->30303/tcp
+fixturenet-eth-bootnode-lighthouse-1
+fixturenet-eth-geth-1-1                8546/tcp, 30303/tcp, 30303/udp, 0.0.0.0:55851->8545/tcp
+fixturenet-eth-geth-2-1                8545-8546/tcp, 30303/tcp, 30303/udp
+fixturenet-eth-lighthouse-1-1          0.0.0.0:55858->8001/tcp
+fixturenet-eth-lighthouse-2-1
+ipld-eth-beacon-db-1                   127.0.0.1:8076->5432/tcp
+ipld-eth-beacon-indexer-1
+ipld-eth-db-1                          127.0.0.1:8077->5432/tcp
+ipld-eth-server-1                      127.0.0.1:8081-8082->8081-8082/tcp
+keycloak-1                             8443/tcp, 0.0.0.0:55857->8080/tcp
+keycloak-db-1                          0.0.0.0:55850->5432/tcp
+keycloak-nginx-1                       0.0.0.0:55859->80/tcp
+migrations-1
+tx-spammer-1
+```
+
 ## Clean up

 Stop all services running in the background:
--- a/stack-orchestrator/stacks/fixturenet-eth/stack.yml
+++ b/stack-orchestrator/stacks/fixturenet-eth/stack.yml
@ -6,7 +6,7 @@ repos:
 containers:
  - cerc/lighthouse
  - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-genesis-postmerge
+  - cerc/fixturenet-eth-genesis-premerge
  - cerc/fixturenet-eth-geth
  - cerc/fixturenet-eth-lighthouse
 pods:
--- a/stack-orchestrator/stacks/fixturenet-plugeth/stack.yml
+++ b/stack-orchestrator/stacks/fixturenet-plugeth/stack.yml
@ -1,23 +0,0 @@
-version: "1.1"
-name: fixturenet-plugeth
-description: "Plugeth Ethereum Indexing Fixturenet"
-repos:
-  - git.vdb.to/cerc-io/plugeth@statediff
-  - git.vdb.to/cerc-io/plugeth-statediff
-  - git.vdb.to/cerc-io/lighthouse
-  - git.vdb.to/cerc-io/ipld-eth-db
-  - git.vdb.to/cerc-io/ipld-eth-server@v5
-containers:
-  - cerc/plugeth-statediff
-  - cerc/plugeth
-  - cerc/fixturenet-eth-genesis-postmerge
-  - cerc/fixturenet-plugeth-plugeth
-  - cerc/lighthouse
-  - cerc/lighthouse-cli
-  - cerc/fixturenet-eth-lighthouse
-  - cerc/ipld-eth-db
-  - cerc/ipld-eth-server
-pods:
-  - fixturenet-plugeth
-  - ipld-eth-db
-  - ipld-eth-server
--- a/tests/fixturenet-plugeth-stack/run-test.sh
+++ b/tests/fixturenet-plugeth-stack/run-test.sh
@ -1,132 +0,0 @@
-#!/usr/bin/env bash
-set -e
-if [ -n "$CERC_SCRIPT_DEBUG" ]; then
-  set -x
-fi
-
-SO_COMMAND=laconic-so
-
-test_name="Fixturenet eth stack deploy test"
-echo "Running ${test_name}"
-
-stack_name=$(pwd)/stack-orchestrator/stacks/fixturenet-plugeth
-
-test_fail_exit () {
-    local fail_message=$1
-    echo "${test_name}: ${fail_message}"
-    echo "${test_name}: FAILED"
-    exit 1
-}
-
-log_info () {
-    local message=$1
-    echo "$(date +"%Y-%m-%d %T"): ${message}"
-}
-
-get_block_number () {
-  local result=$(wget -q -O- "$1" \
-    --header "Content-Type: application/json" \
-    --post-data '{"id": 1, "jsonrpc": "2.0", "method": "eth_blockNumber"}' | \
-    jq -r '.result')
-  printf "%d" $result
-}
-
-# Sanity check the stack dir exists
-if [ ! -d "${stack_name}" ]; then
-    test_fail_exit "stack directory not present"
-    exit 1
-fi
-
-# Set a non-default repo dir
-export CERC_REPO_BASE_DIR=~/stack-orchestrator-test/repo-base-dir
-reported_version_string=$( $SO_COMMAND version )
-echo "SO version is: ${reported_version_string}"
-echo "Cloning repositories into: $CERC_REPO_BASE_DIR"
-rm -rf $CERC_REPO_BASE_DIR
-mkdir -p $CERC_REPO_BASE_DIR
-
-$SO_COMMAND --stack ${stack_name} setup-repositories
-
-echo "Building containers"
-$SO_COMMAND --stack ${stack_name} build-containers
-
-test_deployment_dir=$CERC_REPO_BASE_DIR/test-deployment-dir
-test_deployment_spec=$CERC_REPO_BASE_DIR/test-deployment-spec.yml
-
-$SO_COMMAND --stack ${stack_name} deploy init --output $test_deployment_spec
-# Check the file now exists
-if [ ! -f "$test_deployment_spec" ]; then
-    test_fail_exit "deploy init test: spec file not present"
-fi
-echo "deploy init test: passed"
-
-$SO_COMMAND --stack ${stack_name} deploy create --spec-file $test_deployment_spec --deployment-dir $test_deployment_dir
-# Check the deployment dir exists
-if [ ! -d "$test_deployment_dir" ]; then
-    test_fail_exit "deploy create test: deployment directory not present"
-fi
-echo "deploy create test: passed"
-
-dump_logs () {
-  echo "Test failed. Logs from stack:"
-  $SO_COMMAND deployment --dir $test_deployment_dir logs
-}
-trap dump_logs ERR
-
-$SO_COMMAND deployment --dir $test_deployment_dir start
-
-geth_endpoint=localhost:$($SO_COMMAND deployment --dir $test_deployment_dir port fixturenet-eth-geth-1 8545 | cut -d: -f2)
-
-timeout=900 # 15 minutes
-log_info "Getting initial block number. Timeout set to $timeout seconds"
-start_time=$(date +%s)
-elapsed_time=0
-initial_block_number=0
-while [ "$initial_block_number" -eq 0 ]  && [ $elapsed_time -lt $timeout ]; do
-  sleep 10
-  log_info "Waiting for initial block..."
-  initial_block_number=$(get_block_number $geth_endpoint)
-  current_time=$(date +%s)
-  elapsed_time=$((current_time - start_time))
-done
-
-subsequent_block_number=$initial_block_number
-
-# if initial block was 0 after timeout, assume chain did not start successfully and skip finding subsequent block
-if [[ $initial_block_number -gt 0 ]]; then
-  timeout=300
-  log_info "Getting subsequent block number. Timeout set to $timeout seconds"
-  start_time=$(date +%s)
-  elapsed_time=0
-  # wait for 5 blocks or timeout
-  while [ "$subsequent_block_number" -le $((initial_block_number + 5)) ]  && [ $elapsed_time -lt $timeout ]; do
-    sleep 10
-    log_info "Waiting for five blocks or $timeout seconds..."
-    subsequent_block_number=$(get_block_number $geth_endpoint)
-    current_time=$(date +%s)
-    elapsed_time=$((current_time - start_time))
-  done
-fi
-
-# will return 0 if either of the above loops timed out
-block_number_difference=$((subsequent_block_number - initial_block_number))
-
-log_info "Results of block height queries:"
-echo "Initial block height: $initial_block_number"
-echo "Subsequent block height: $subsequent_block_number"
-
-# Block height difference should be between 1 and some small number
-[[ $block_number_difference -gt 1 && $block_number_difference -lt 100 ]]
-
-# Check that the block hash is present in the ipld-eth-db
-echo "Querying ipld-eth-db for block number $subsequent_block_number"
-block_hash_query="SELECT block_hash from eth.header_cids where block_number = $subsequent_block_number"
-block_hash=$(
-  $SO_COMMAND deployment --dir $test_deployment_dir exec ipld-eth-db \
-    "psql -qtA -U vdbm -c '$block_hash_query' cerc_testing"
-)
-echo "Block hash in ipld-eth-db: $block_hash"
-
-[[ -n $block_hash ]]
-
-echo "Test passed."