From cfafe7ba3ac444324247067bb8aa17596d581ef8 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Sat, 16 Oct 2021 05:07:21 +0000 Subject: [PATCH] Update to consensus-spec-tests v1.1.3 (#2722) ## Issue Addressed NA ## Proposed Changes Updates to `testing/ef_tests` to use https://github.com/ethereum/consensus-spec-tests/releases/tag/v1.1.3. Also updates `initialize_beacon_state_from_eth1` to set the `state.fork.previous_version` to the Altair fork version when starting a new Altair chain from genesis. This will not have an effect on mainnet or any long-lived testnets. This was introduced in https://github.com/ethereum/consensus-specs/releases/tag/v1.1.1. ## Additional Info NA --- consensus/state_processing/src/genesis.rs | 2 ++ testing/ef_tests/Makefile | 2 +- testing/ef_tests/check_all_files_accessed.py | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/consensus/state_processing/src/genesis.rs b/consensus/state_processing/src/genesis.rs index 0628e9fbd..7834c6daf 100644 --- a/consensus/state_processing/src/genesis.rs +++ b/consensus/state_processing/src/genesis.rs @@ -48,6 +48,8 @@ pub fn initialize_beacon_state_from_eth1( // https://github.com/ethereum/eth2.0-specs/pull/2323 if spec.fork_name_at_epoch(state.current_epoch()) == ForkName::Altair { upgrade_to_altair(&mut state, spec)?; + + state.fork_mut().previous_version = spec.altair_fork_version; } // Now that we have our validators, initialize the caches (including the committees) diff --git a/testing/ef_tests/Makefile b/testing/ef_tests/Makefile index a16fa58fb..5a4385fd1 100644 --- a/testing/ef_tests/Makefile +++ b/testing/ef_tests/Makefile @@ -1,4 +1,4 @@ -TESTS_TAG := v1.1.0-beta.4 +TESTS_TAG := v1.1.3 TESTS = general minimal mainnet TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS)) diff --git a/testing/ef_tests/check_all_files_accessed.py b/testing/ef_tests/check_all_files_accessed.py index 56784a764..5e119a86d 100755 --- a/testing/ef_tests/check_all_files_accessed.py +++ b/testing/ef_tests/check_all_files_accessed.py @@ -43,6 +43,9 @@ excluded_paths = [ "tests/minimal/phase0/fork_choice", "tests/mainnet/altair/fork_choice", "tests/minimal/altair/fork_choice", + # Merkle-proof tests for light clients + "tests/mainnet/altair/merkle/single_proof/pyspec_tests/", + "tests/minimal/altair/merkle/single_proof/pyspec_tests/" ] def normalize_path(path):