don't specify default branch

Part of cerc-io/stack-orchestrator#905.

Reviewed-on: #21
Reviewed-by: David Boreham <dboreham@noreply.git.vdb.to>

.gitea/workflows/test-fixturenet-eth.yml

@@ -3,6 +3,7 @@ name: Test Ethereum Fixturenet Stack
 on:
   push:
     branches: '*'
+  pull_request:
   schedule: # Note: coordinate with other tests to not overload runners at the same time of day
     - cron: '12 01 * * *'
 
@@ -33,3 +34,20 @@ 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 }}

.gitea/workflows/test-fixturenet-plugeth.yml

@@ -3,13 +3,17 @@ 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"
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, ubuntu-latest-arm]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
@@ -19,12 +23,12 @@ jobs:
         if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
         uses: deadsnakes/action@v3.0.1
         with:
-          python-version: '3.11'
+          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'
+          python-version: 3.11
       - name: "Print Python version"
         run: python3 --version
       - name: "Install stack orchestrator"
@@ -33,3 +37,20 @@ jobs:
         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 }}

.gitea/workflows/triggers/publish-fixturenet-eth-images

@@ -1,2 +1,2 @@
 # Change this file to trigger the job publish-fixturenet-eth-images.yml
-Trigger
+4

stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml

@@ -10,6 +10,7 @@ services:
     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"
@@ -27,7 +28,7 @@ services:
       CERC_ALLOW_UNPROTECTED_TXS: ${CERC_ALLOW_UNPROTECTED_TXS:-false}
     env_file:
       - ../config/fixturenet-eth/fixturenet-eth.env
-      - ../config/fixturenet-eth/statediff.env
+      - ../config/fixturenet-plugeth/statediff.env
     image: cerc/fixturenet-plugeth-plugeth:local
     volumes:
       - fixturenet_plugeth_geth_1_data:/root/ethdata
@@ -127,6 +128,7 @@ services:
 
 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:

stack-orchestrator/compose/docker-compose-ipld-eth-db.yml

@@ -13,17 +13,16 @@ services:
       DATABASE_PORT: 5432
 
   ipld-eth-db:
-    image: timescale/timescaledb:2.8.1-pg14
+    image: timescale/timescaledb:latest-pg14
     restart: always
     environment:
       POSTGRES_USER: "vdbm"
       POSTGRES_DB: "cerc_testing"
       POSTGRES_PASSWORD: "password"
-    healthcheck:
-      test: ["CMD", "nc", "-v", "localhost", "5432"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 3s
     ports:
       - "127.0.0.1:8077:5432"
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "vdbm"]
+      interval: 2s
+      timeout: 1s
+      retries: 3

stack-orchestrator/compose/docker-compose-ipld-eth-server.yml

@@ -0,0 +1,43 @@
+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:
+

stack-orchestrator/config/fixturenet-eth/fixturenet-eth.env

@@ -14,5 +14,5 @@ ENR_URL="http://fixturenet-eth-bootnode-lighthouse:3000/bootnode/enr.dat"
 CERC_GETH_VMODULE="rpc/*=5"
 CERC_GETH_VERBOSITY=${CERC_GETH_VERBOSITY:-3}
 
-# Used by Lighthouse
-SECONDS_PER_ETH1_BLOCK=${SECONDS_PER_ETH1_BLOCK:-3}
+# --debug-level
+DEBUG_LEVEL=${LIGHTHOUSE_DEBUG_LEVEL:-info}

stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile

@@ -2,7 +2,9 @@ FROM ethpandaops/ethereum-genesis-generator:3.0.0 AS ethgen
 
 # Build genesis config
 ADD genesis /opt/genesis
-RUN cd /opt/genesis && make genesis-el
+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
 

stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/build_cl.sh

@@ -44,6 +44,11 @@ lcli \
   --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 "Generating $VALIDATOR_COUNT validators concurrently... (this may take a while)"
 

stack-orchestrator/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env

@@ -38,6 +38,13 @@ 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:-""}
 
@@ -53,6 +60,3 @@ ETH1_TTD=${ETH1_TTD:-`cat $ETH1_GENESIS_JSON | jq -r '.config.terminalTotalDiffi
 ETH1_DEPOSIT_CONTRACT_ADDRESS=${ETH1_DEPOSIT_CONTRACT_ADDRESS:-`cat $ETH1_CONFIG_YAML | grep 'deposit_contract_address' | awk '{ print $2 }' | sed 's/"//g'`}
 ETH1_DEPOSIT_CONTRACT_BLOCK=${ETH1_DEPOSIT_CONTRACT_BLOCK:-0x0}
 SUGGESTED_FEE_RECIPIENT=`cat ../build/el/accounts.csv | head -1 | cut -d',' -f2`
-
-# --debug-level
-DEBUG_LEVEL=${LIGHTHOUSE_DEBUG_LEVEL:-info}

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 bellatrix merge"
+  "beacon post-merge"
   "block number $MIN_BLOCK_NUM"
 )
 STATUS=0
@@ -69,14 +69,22 @@ 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" ] && ([ "$result" == "altair" ] || [ "$result" == "bellatrix" ]); then
-        inc_status
+      if [ ! -z "$result" ]; then
+        case "$result" in
+          "altair" | "bellatrix" | "capella" | "deneb")
+            inc_status
+            ;;
+        esac
       fi
       ;;
     3)
       result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.version'`
-      if [ ! -z "$result" ] && [ "$result" == "bellatrix" ]; then
-        inc_status
+      if [ ! -z "$result" ]; then
+        case "$result" in
+          "bellatrix" | "capella" | "deneb")
+            inc_status
+            ;;
+        esac
       fi
       ;;
     4)

stack-orchestrator/stacks/fixturenet-plugeth/stack.yml

@@ -6,6 +6,7 @@ repos:
   - 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
 containers:
   - cerc/plugeth-statediff
   - cerc/plugeth
@@ -15,6 +16,8 @@ containers:
   - cerc/lighthouse-cli
   - cerc/fixturenet-eth-lighthouse
   - cerc/ipld-eth-db
+  - cerc/ipld-eth-server
 pods:
   - fixturenet-plugeth
   - ipld-eth-db
+  - ipld-eth-server