diff --git a/.github/assets/hive/build_simulators.sh b/.github/assets/hive/build_simulators.sh index b33f4db4ee79b..c1051e6aa3d4c 100755 --- a/.github/assets/hive/build_simulators.sh +++ b/.github/assets/hive/build_simulators.sh @@ -11,7 +11,7 @@ go build . # Run each hive command in the background for each simulator and wait echo "Building images" -./hive -client reth --sim "pyspec" -sim.timelimit 1s || true & +BRANCH=7685-no-data ./hive -client reth --sim "ethereum/eest" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/pectra-devnet-5%40v1.3.0/fixtures_pectra-devnet-5.tar.gz -sim.timelimit 1s || true & ./hive -client reth --sim "ethereum/engine" -sim.timelimit 1s || true & ./hive -client reth --sim "devp2p" -sim.timelimit 1s || true & ./hive -client reth --sim "ethereum/rpc-compat" -sim.timelimit 1s || true & @@ -26,7 +26,8 @@ docker save hive/hiveproxy:latest -o ../hive_assets/hiveproxy.tar & docker save hive/simulators/devp2p:latest -o ../hive_assets/devp2p.tar & docker save hive/simulators/ethereum/engine:latest -o ../hive_assets/engine.tar & docker save hive/simulators/ethereum/rpc-compat:latest -o ../hive_assets/rpc_compat.tar & -docker save hive/simulators/ethereum/pyspec:latest -o ../hive_assets/pyspec.tar & +docker save hive/simulators/ethereum/eest/consume-engine:latest -o ../hive_assets/eest_engine.tar & +docker save hive/simulators/ethereum/eest/consume-rlp:latest -o ../hive_assets/eest_rlp.tar & docker save hive/simulators/smoke/genesis:latest -o ../hive_assets/smoke_genesis.tar & docker save hive/simulators/smoke/network:latest -o ../hive_assets/smoke_network.tar & docker save hive/simulators/ethereum/sync:latest -o ../hive_assets/ethereum_sync.tar & diff --git a/.github/assets/hive/load_images.sh b/.github/assets/hive/load_images.sh index 05e1cb9905fae..37a2f82de5451 100755 --- a/.github/assets/hive/load_images.sh +++ b/.github/assets/hive/load_images.sh @@ -11,6 +11,8 @@ IMAGES=( "/tmp/smoke_genesis.tar" "/tmp/smoke_network.tar" "/tmp/ethereum_sync.tar" + "/tmp/eest_engine.tar" + "/tmp/eest_rlp.tar" "/tmp/reth_image.tar" ) @@ -22,4 +24,4 @@ done wait -docker image ls -a \ No newline at end of file +docker image ls -a diff --git a/.github/assets/hive/run_simulator.sh b/.github/assets/hive/run_simulator.sh index 731c94c3f69b3..269176b9ad81a 100755 --- a/.github/assets/hive/run_simulator.sh +++ b/.github/assets/hive/run_simulator.sh @@ -7,7 +7,9 @@ sim="${1}" limit="${2}" run_hive() { + set -x hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 4 --client reth 2>&1 | tee /tmp/log || true + set +x } check_log() { diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml index 334df715a2635..efe1e2f16283f 100644 --- a/.github/workflows/hive.yml +++ b/.github/workflows/hive.yml @@ -32,8 +32,8 @@ jobs: - name: Checkout hive tests uses: actions/checkout@v4 with: - repository: ethereum/hive - ref: master + repository: joshieDo/hive + ref: joshie/hive-combined-blocks path: hivetests - uses: actions/setup-go@v5 @@ -115,40 +115,38 @@ jobs: - eth_syncing # debug_ rpc methods - debug_ - # Pyspec cancun jobs - # TODO: uncomment when https://github.com/ethereum/hive/issues/1147 is fixed - #- sim: pyspec - # include: [cancun/eip4844] - #- sim: pyspec - # include: [cancun/eip4788] - #- sim: pyspec - # include: [cancun/eip6780] - #- sim: pyspec - # include: [cancun/eip5656] - #- sim: pyspec - # include: [cancun/eip1153] - #- sim: pyspec - # include: [cancun/eip7516] - # Pyspec shanghai jobs - #- sim: pyspec - # include: [shanghai/eip3651] - #- sim: pyspec - # include: [shanghai/eip3855] - #- sim: pyspec - # include: [shanghai/eip3860] - #- sim: pyspec - # include: [shanghai/eip4895] - # Pyspec merge and earlier jobs - #- sim: pyspec - # include: [merge/] - #- sim: pyspec - # include: [berlin/] - #- sim: pyspec - # include: [istanbul/] - #- sim: pyspec - # include: [homestead/] - #- sim: pyspec - # include: [frontier/] + + # consume-engine + - sim: ethereum/eest/consume-engine + limit: tests/prague + - sim: ethereum/eest/consume-engine + limit: tests/cancun + - sim: ethereum/eest/consume-engine + limit: tests/shanghai + - sim: ethereum/eest/consume-engine + limit: tests/berlin + - sim: ethereum/eest/consume-engine + limit: tests/istanbul + - sim: ethereum/eest/consume-engine + limit: tests/homestead + - sim: ethereum/eest/consume-engine + limit: tests/frontier + + # consume-rlp + - sim: ethereum/eest/consume-rlp + limit: tests/prague + - sim: ethereum/eest/consume-rlp + limit: tests/cancun + - sim: ethereum/eest/consume-rlp + limit: tests/shanghai + - sim: ethereum/eest/consume-rlp + limit: tests/berlin + - sim: ethereum/eest/consume-rlp + limit: tests/istanbul + - sim: ethereum/eest/consume-rlp + limit: tests/homestead + - sim: ethereum/eest/consume-rlp + limit: tests/frontier needs: - prepare-reth - prepare-hive @@ -185,8 +183,8 @@ jobs: - name: Checkout hive tests uses: actions/checkout@v4 with: - repository: ethereum/hive - ref: master + repository: joshieDo/hive + ref: joshie/hive-combined-blocks path: hivetests - name: Run simulator