WIP: Fix fixturenet-eth/plugeth stacks #817

Closed
roysc wants to merge 6 commits from roysc/fix-eth-stacks into main
5 changed files with 7 additions and 8 deletions

View File

@ -6,8 +6,8 @@ on:
paths: paths:
- '!**' - '!**'
- '.gitea/workflows/triggers/fixturenet-eth-plugeth-test' - '.gitea/workflows/triggers/fixturenet-eth-plugeth-test'
schedule: # Note: coordinate with other tests to not overload runners at the same time of day # schedule: # Note: coordinate with other tests to not overload runners at the same time of day
- cron: '2 14 * * *' # - cron: '2 14 * * *'
# Needed until we can incorporate docker startup into the executor container # Needed until we can incorporate docker startup into the executor container
env: env:

View File

@ -1,3 +1,4 @@
Change this file to trigger running the fixturenet-eth-plugeth-test CI job Change this file to trigger running the fixturenet-eth-plugeth-test CI job
trigger trigger
trigger trigger
...

View File

@ -2,7 +2,7 @@
services: services:
foundry: foundry:
restart: always restart: always
image: cerc/foundry:local image: ghcr.io/foundry-rs/foundry:latest
command: ["while :; do sleep 600; done"] command: ["while :; do sleep 600; done"]
volumes: volumes:
- ../config/foundry/foundry.toml:/foundry.toml - ../config/foundry/foundry.toml:/foundry.toml

View File

@ -9,7 +9,7 @@ STATUSES=(
"beacon phase0" "beacon phase0"
"beacon altair" "beacon altair"
"beacon bellatrix pre-merge" "beacon bellatrix pre-merge"
"beacon bellatrix merge" "beacon post-merge"
"block number $MIN_BLOCK_NUM" "block number $MIN_BLOCK_NUM"
) )
STATUS=0 STATUS=0
@ -69,13 +69,13 @@ while [ $STATUS -lt ${#STATUSES[@]} ]; do
;; ;;
2) 2)
result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.version'` 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 if [ ! -z "$result" ] && ([ "$result" == "altair" ] || [ "$result" == "bellatrix" ] || [ "$result" == "capella" ] || [ "$result" == "deneb" ]); then
inc_status inc_status
fi fi
;; ;;
3) 3)
result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.version'` result=`wget --no-check-certificate --quiet -O - "$LIGHTHOUSE_BASE_URL/eth/v2/beacon/blocks/head" | jq -r '.version'`
if [ ! -z "$result" ] && [ "$result" == "bellatrix" ]; then if [ ! -z "$result" ] && ([ "$result" == "bellatrix" ] || [ "$result" == "capella" ] || [ "$result" == "deneb" ]); then
inc_status inc_status
fi fi
;; ;;

View File

@ -8,7 +8,6 @@ repos:
- git.vdb.to/cerc-io/ipld-eth-db@v5 - git.vdb.to/cerc-io/ipld-eth-db@v5
- git.vdb.to/cerc-io/ipld-eth-server@v5 - git.vdb.to/cerc-io/ipld-eth-server@v5
- git.vdb.to/cerc-io/tx-spammer - git.vdb.to/cerc-io/tx-spammer
- github.com/dboreham/foundry
containers: containers:
- cerc/plugeth-statediff - cerc/plugeth-statediff
- cerc/plugeth - cerc/plugeth
@ -18,7 +17,6 @@ containers:
- cerc/lighthouse-cli - cerc/lighthouse-cli
- cerc/fixturenet-eth-lighthouse - cerc/fixturenet-eth-lighthouse
- cerc/tx-spammer - cerc/tx-spammer
- cerc/foundry
- cerc/ipld-eth-db - cerc/ipld-eth-db
- cerc/ipld-eth-server - cerc/ipld-eth-server
pods: pods: