From c8c0b45a79a8449a5b0af689250fd1fbe48d5d04 Mon Sep 17 00:00:00 2001 From: joshie <93316087+joshieDo@users.noreply.github.com> Date: Mon, 27 Jan 2025 15:42:48 +0000 Subject: [PATCH] add eest --- .github/assets/hive/build_simulators.sh | 5 +- .github/assets/hive/expected_failures.yaml | 6 ++ .github/assets/hive/load_images.sh | 4 +- .github/assets/hive/run_simulator.sh | 2 +- .github/workflows/hive.yml | 66 +++++++++++----------- 5 files changed, 45 insertions(+), 38 deletions(-) diff --git a/.github/assets/hive/build_simulators.sh b/.github/assets/hive/build_simulators.sh index b33f4db4ee79b..9d7c5bd1569f7 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 & +./hive -client reth --sim "ethereum/eest" --sim.buildarg fixtures=https://github.com/ethereum/execution-spec-tests/releases/download/pectra-devnet-6%40v1.0.0/fixtures_pectra-devnet-6.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/expected_failures.yaml b/.github/assets/hive/expected_failures.yaml index ae5a66f03bb01..475013d7518a6 100644 --- a/.github/assets/hive/expected_failures.yaml +++ b/.github/assets/hive/expected_failures.yaml @@ -51,3 +51,9 @@ engine-cancun: - Invalid NewPayload, ExcessBlobGas, Syncing=True, EmptyTxs=False, DynFeeTxs=False (Cancun) (reth) sync: [] + +# no fix: it’s too expensive to check whether the storage is empty on each creation +eest/consume-engine: + - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test_engine-zero_nonce]-reth +eest/consume-rlp: + - tests/prague/eip7702_set_code_tx/test_set_code_txs.py::test_set_code_to_non_empty_storage[fork_Prague-blockchain_test-zero_nonce]-reth 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..cb4d8110dfa3e 100755 --- a/.github/assets/hive/run_simulator.sh +++ b/.github/assets/hive/run_simulator.sh @@ -7,7 +7,7 @@ sim="${1}" limit="${2}" run_hive() { - hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 4 --client reth 2>&1 | tee /tmp/log || true + hive --sim "${sim}" --sim.limit "${limit}" --sim.parallelism 8 --client reth 2>&1 | tee /tmp/log || true } check_log() { diff --git a/.github/workflows/hive.yml b/.github/workflows/hive.yml index 334df715a2635..6c660fb41ca45 100644 --- a/.github/workflows/hive.yml +++ b/.github/workflows/hive.yml @@ -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