Altair consensus changes and refactors (#2279)

## Proposed Changes Implement the consensus changes necessary for the upcoming Altair hard fork. ## Additional Info This is quite a heavy refactor, with pivotal types like the `BeaconState` and `BeaconBlock` changing from structs to enums. This ripples through the whole codebase with field accesses changing to methods, e.g. `state.slot` => `state.slot()`. Co-authored-by: realbigsean <seananderson33@gmail.com>
2026-05-07 16:55:46 +00:00 · 2021-07-09 06:15:32 +00:00
parent 89361573d4
commit b4689e20c6
271 changed files with 9652 additions and 8444 deletions
--- a/common/eth2/src/lib.rs
+++ b/common/eth2/src/lib.rs
@@ -21,7 +21,6 @@ use reqwest::{IntoUrl, Response};
 pub use reqwest::{StatusCode, Url};
 use sensitive_url::SensitiveUrl;
 use serde::{de::DeserializeOwned, Serialize};
-use ssz::Decode;
 use std::convert::TryFrom;
 use std::fmt;
 use std::iter::Iterator;
@@ -498,6 +497,7 @@ impl BeaconNodeHttpClient {
    pub async fn get_beacon_blocks_ssz<T: EthSpec>(
        &self,
        block_id: BlockId,
+        spec: &ChainSpec,
    ) -> Result<Option<SignedBeaconBlock<T>>, Error> {
        let mut path = self.eth_path()?;

@@ -509,7 +509,7 @@ impl BeaconNodeHttpClient {

        self.get_bytes_opt_accept_header(path, Accept::Ssz)
            .await?
-            .map(|bytes| SignedBeaconBlock::from_ssz_bytes(&bytes).map_err(Error::InvalidSsz))
+            .map(|bytes| SignedBeaconBlock::from_ssz_bytes(&bytes, spec).map_err(Error::InvalidSsz))
            .transpose()
    }

@@ -715,7 +715,7 @@ impl BeaconNodeHttpClient {
    }

    /// `GET config/spec`
-    pub async fn get_config_spec(&self) -> Result<GenericResponse<YamlConfig>, Error> {
+    pub async fn get_config_spec(&self) -> Result<GenericResponse<ConfigAndPreset>, Error> {
        let mut path = self.eth_path()?;

        path.path_segments_mut()
@@ -883,6 +883,7 @@ impl BeaconNodeHttpClient {
    pub async fn get_debug_beacon_states_ssz<T: EthSpec>(
        &self,
        state_id: StateId,
+        spec: &ChainSpec,
    ) -> Result<Option<BeaconState<T>>, Error> {
        let mut path = self.eth_path()?;

@@ -895,7 +896,7 @@ impl BeaconNodeHttpClient {

        self.get_bytes_opt_accept_header(path, Accept::Ssz)
            .await?
-            .map(|bytes| BeaconState::from_ssz_bytes(&bytes).map_err(Error::InvalidSsz))
+            .map(|bytes| BeaconState::from_ssz_bytes(&bytes, spec).map_err(Error::InvalidSsz))
            .transpose()
    }

--- a/common/eth2/src/lighthouse.rs
+++ b/common/eth2/src/lighthouse.rs
@@ -2,13 +2,12 @@

 use crate::{
    ok_or_error,
-    types::{BeaconState, Epoch, EthSpec, GenericResponse, ValidatorId},
+    types::{BeaconState, ChainSpec, Epoch, EthSpec, GenericResponse, ValidatorId},
    BeaconNodeHttpClient, DepositData, Error, Eth1Data, Hash256, StateId, StatusCode,
 };
 use proto_array::core::ProtoArray;
 use reqwest::IntoUrl;
 use serde::{Deserialize, Serialize};
-use ssz::Decode;
 use ssz_derive::{Decode, Encode};

 pub use eth2_libp2p::{types::SyncState, PeerInfo};
@@ -470,6 +469,7 @@ impl BeaconNodeHttpClient {
    pub async fn get_lighthouse_beacon_states_ssz<E: EthSpec>(
        &self,
        state_id: &StateId,
+        spec: &ChainSpec,
    ) -> Result<Option<BeaconState<E>>, Error> {
        let mut path = self.server.full.clone();

@@ -483,7 +483,7 @@ impl BeaconNodeHttpClient {

        self.get_bytes_opt(path)
            .await?
-            .map(|bytes| BeaconState::from_ssz_bytes(&bytes).map_err(Error::InvalidSsz))
+            .map(|bytes| BeaconState::from_ssz_bytes(&bytes, spec).map_err(Error::InvalidSsz))
            .transpose()
    }

--- a/common/eth2/src/lighthouse_vc/http_client.rs
+++ b/common/eth2/src/lighthouse_vc/http_client.rs
@@ -211,7 +211,7 @@ impl ValidatorClientHttpClient {
    }

    /// `GET lighthouse/spec`
-    pub async fn get_lighthouse_spec(&self) -> Result<GenericResponse<YamlConfig>, Error> {
+    pub async fn get_lighthouse_spec(&self) -> Result<GenericResponse<ConfigAndPreset>, Error> {
        let mut path = self.server.full.clone();

        path.path_segments_mut()
--- a/common/eth2_config/src/lib.rs
+++ b/common/eth2_config/src/lib.rs
@@ -44,13 +44,6 @@ impl Eth2Config {
            spec: ChainSpec::minimal(),
        }
    }
-
-    pub fn v012_legacy() -> Self {
-        Self {
-            eth_spec_id: EthSpecId::V012Legacy,
-            spec: ChainSpec::v012_legacy(),
-        }
-    }
 }

 /// A directory that can be built by downloading files via HTTP.
@@ -112,16 +105,8 @@ macro_rules! define_net {
    };
 }

-define_net!(altona, include_altona_file, "altona", true);
-
-define_net!(medalla, include_medalla_file, "medalla", true);
-
-define_net!(spadina, include_spadina_file, "spadina", true);
-
 define_net!(pyrmont, include_pyrmont_file, "pyrmont", true);

 define_net!(mainnet, include_mainnet_file, "mainnet", true);

-define_net!(toledo, include_toledo_file, "toledo", true);
-
 define_net!(prater, include_prater_file, "prater", true);
--- a/common/eth2_network_config/build.rs
+++ b/common/eth2_network_config/build.rs
@@ -1,19 +1,12 @@
 //! Extracts zipped genesis states on first run.
-use eth2_config::{
-    altona, mainnet, medalla, prater, pyrmont, spadina, toledo, Eth2NetArchiveAndDirectory,
-    GENESIS_FILE_NAME,
-};
+use eth2_config::{mainnet, prater, pyrmont, Eth2NetArchiveAndDirectory, GENESIS_FILE_NAME};
 use std::fs::File;
 use std::io;
 use zip::ZipArchive;

 const ETH2_NET_DIRS: &[Eth2NetArchiveAndDirectory<'static>] = &[
-    altona::ETH2_NET_DIR,
-    medalla::ETH2_NET_DIR,
-    spadina::ETH2_NET_DIR,
    mainnet::ETH2_NET_DIR,
    pyrmont::ETH2_NET_DIR,
-    toledo::ETH2_NET_DIR,
    prater::ETH2_NET_DIR,
 ];

--- a/common/eth2_network_config/built_in_network_configs/altona/boot_enr.yaml
+++ b/common/eth2_network_config/built_in_network_configs/altona/boot_enr.yaml
@@ -1,10 +0,0 @@
- enr:-LK4QFtV7Pz4reD5a7cpfi1z6yPrZ2I9eMMU5mGQpFXLnLoKZW8TXvVubShzLLpsEj6aayvVO1vFx-MApijD3HLPhlECh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD6etXjAAABIf__________gmlkgnY0gmlwhDMPYfCJc2VjcDI1NmsxoQIerw_qBc9apYfZqo2awiwS930_vvmGnW2psuHsTzrJ8YN0Y3CCIyiDdWRwgiMo
- enr:-LK4QPVkFd_MKzdW0219doTZryq40tTe8rwWYO75KDmeZM78fBskGsfCuAww9t8y3u0Q0FlhXOhjE1CWpx3SGbUaU80Ch2F0dG5ldHOIAAAAAAAAAACEZXRoMpD6etXjAAABIf__________gmlkgnY0gmlwhDMPRgeJc2VjcDI1NmsxoQNHu-QfNgzl8VxbMiPgv6wgAljojnqAOrN18tzJMuN8oYN0Y3CCIyiDdWRwgiMo
- enr:-LK4QHe52XPPrcv6-MvcmN5GqDe_sgCwo24n_2hedlfwD_oxNt7cXL3tXJ7h9aYv6CTS1C_H2G2_dkeqm_LBO9nrpiYBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD9yjmwAAABIf__________gmlkgnY0gmlwhANzD9uJc2VjcDI1NmsxoQJX7zMnRU3szfGfS8MAIfPaQKOBpu3sBVTXf4Qq0b_m-4N0Y3CCIyiDdWRwgiMo
- enr:-LK4QLkbbq7xuRa_EnWd_kc0TkQk0pd0B0cZYR5LvBsncFQBDyPbGdy8d24TzRVeK7ZWwM5_2EcSJK223f8TYUOQYfwBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD9yjmwAAABIf__________gmlkgnY0gmlwhAPsjtOJc2VjcDI1NmsxoQJNw_aZgWXl2SstD--WAjooGudjWLjEbbCIddJuEPxzWYN0Y3CCIyiDdWRwgiMo
- enr:-LK4QHy-glnxN1WTk5f6d7-xXwy_UKJLs5k7p_S4KRY9I925KTzW_kQLjfFriIpH0de7kygBwrSl726ukq9_OG_sgKMCh2F0dG5ldHOIUjEAIQEAFMiEZXRoMpD9yjmwAAABIf__________gmlkgnY0gmlwhBLmhrCJc2VjcDI1NmsxoQNlU7gT0HUvpLA41n-P5GrCgjwMwtG02YsRRO0lAmpmBYN0Y3CCIyiDdWRwgiMo
- enr:-LK4QDz0n0vpyOpuStB8e22h9ayHVcvmN7o0trC7eC0DnZV9GYGzK5uKv7WlzpMQM2nDTG43DWvF_DZYwJOZCbF4iCQBh2F0dG5ldHOI__________-EZXRoMpD9yjmwAAABIf__________gmlkgnY0gmlwhBKN136Jc2VjcDI1NmsxoQP5gcOUcaruHuMuTv8ht7ZEawp3iih7CmeLqcoY1hxOnoN0Y3CCIyiDdWRwgiMo
- enr:-LK4QOScOZ35sOXEH6CEW15lfv7I3DhqQAzCPQ_nRav95otuSh4yi9ol0AruKDiIk9qqGXyD-wQDaBAPLhwl4t-rUSQBh2F0dG5ldHOI__________-EZXRoMpD9yjmwAAABIf__________gmlkgnY0gmlwhCL68KuJc2VjcDI1NmsxoQK5fYR3Ipoc01dz0d2-EcL7m26zKQSkAbf4rwcMMM09CoN0Y3CCIyiDdWRwgiMo
- enr:-Ku4QMqmWPFkgM58F16wxB50cqWDaWaIsyANHL8wUNSB4Cy1TP9__uJQNRODvx_dvO6rY-BT3psrYTMAaxnMGXb6DuoBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD1pf1CAAAAAP__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQNoed9JnQh7ltcAacHEGOjwocL1BhMQbYTgaPX0kFuXtIN1ZHCCE4g
- enr:-LK4QDHu6BtDKnGbthNp-GvweQlW0jiOX9KFCj5Ql9kScrFed76tgHlFv7A-9ZRB-EVZpKItvlNjo3yxjj7jYIZUJa4Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpAAAAAAAAAAAAAAAAAAAAAAgmlkgnY0gmlwhDbUyQKJc2VjcDI1NmsxoQLV6Yse8baXDFu9r_dvm9BVd2ni2-wwvANWA-4ewbhniIN0Y3CCIyiDdWRwgiMo
- enr:-LK4QF3lT3Ch8Ljyx-KwoPrvoJHO-HDd3jOREMIZCWzi_HkHFVub5qt52MliDTLDgpXMS9tBzzLI4ObT_Z2m2Kus9vMBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpAAAAAAAAAAAAAAAAAAAAAAgmlkgnY0gmlwhBKNqHeJc2VjcDI1NmsxoQOTO9uI9UZjuTOpcWvnCfhfQTmcMaIzBFsjMpXYnppET4N0Y3CCIyiDdWRwgiMo
--- a/common/eth2_network_config/built_in_network_configs/altona/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/altona/config.yaml
@@ -1,60 +0,0 @@
-CONFIG_NAME: "altona"
-MAX_COMMITTEES_PER_SLOT: 64
-TARGET_COMMITTEE_SIZE: 128
-MAX_VALIDATORS_PER_COMMITTEE: 2048
-MIN_PER_EPOCH_CHURN_LIMIT: 4
-CHURN_LIMIT_QUOTIENT: 65536
-SHUFFLE_ROUND_COUNT: 90
-MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 640
-MIN_GENESIS_TIME: 1593433800
-HYSTERESIS_QUOTIENT: 4
-HYSTERESIS_DOWNWARD_MULTIPLIER: 1
-HYSTERESIS_UPWARD_MULTIPLIER: 5
-SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8
-ETH1_FOLLOW_DISTANCE: 1024
-TARGET_AGGREGATORS_PER_COMMITTEE: 16
-RANDOM_SUBNETS_PER_VALIDATOR: 1
-EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION: 256
-SECONDS_PER_ETH1_BLOCK: 14
-DEPOSIT_CONTRACT_ADDRESS: 0x16e82D77882A663454Ef92806b7DeCa1D394810f
-MIN_DEPOSIT_AMOUNT: 1000000000
-MAX_EFFECTIVE_BALANCE: 32000000000
-EJECTION_BALANCE: 16000000000
-EFFECTIVE_BALANCE_INCREMENT: 1000000000
-GENESIS_FORK_VERSION: 0x00000121
-BLS_WITHDRAWAL_PREFIX: 0x00
-GENESIS_DELAY: 172800
-SECONDS_PER_SLOT: 12
-MIN_ATTESTATION_INCLUSION_DELAY: 1
-SLOTS_PER_EPOCH: 32
-MIN_SEED_LOOKAHEAD: 1
-MAX_SEED_LOOKAHEAD: 4
-EPOCHS_PER_ETH1_VOTING_PERIOD: 32
-SLOTS_PER_HISTORICAL_ROOT: 8192
-MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
-SHARD_COMMITTEE_PERIOD: 256
-MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
-EPOCHS_PER_HISTORICAL_VECTOR: 65536
-EPOCHS_PER_SLASHINGS_VECTOR: 8192
-HISTORICAL_ROOTS_LIMIT: 16777216
-VALIDATOR_REGISTRY_LIMIT: 1099511627776
-BASE_REWARD_FACTOR: 64
-WHISTLEBLOWER_REWARD_QUOTIENT: 512
-PROPOSER_REWARD_QUOTIENT: 8
-INACTIVITY_PENALTY_QUOTIENT: 16777216
-MIN_SLASHING_PENALTY_QUOTIENT: 32
-MAX_PROPOSER_SLASHINGS: 16
-MAX_ATTESTER_SLASHINGS: 2
-MAX_ATTESTATIONS: 128
-MAX_DEPOSITS: 16
-MAX_VOLUNTARY_EXITS: 16
-DOMAIN_BEACON_PROPOSER: 0x00000000
-DOMAIN_BEACON_ATTESTER: 0x01000000
-DOMAIN_RANDAO: 0x02000000
-DOMAIN_DEPOSIT: 0x03000000
-DOMAIN_VOLUNTARY_EXIT: 0x04000000
-DOMAIN_SELECTION_PROOF: 0x05000000
-DOMAIN_AGGREGATE_AND_PROOF: 0x06000000
-DEPOSIT_CHAIN_ID: 5
-DEPOSIT_NETWORK_ID: 5
-PROPORTIONAL_SLASHING_MULTIPLIER: 3
--- a/common/eth2_network_config/built_in_network_configs/altona/deploy_block.txt
+++ b/common/eth2_network_config/built_in_network_configs/altona/deploy_block.txt
@@ -1 +0,0 @@
-2917810
--- a/common/eth2_network_config/built_in_network_configs/altona/genesis.ssz.zip
+++ b/common/eth2_network_config/built_in_network_configs/altona/genesis.ssz.zip
--- a/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/mainnet/config.yaml
@@ -1,51 +1,66 @@
-# Mainnet preset
+# Mainnet config

-CONFIG_NAME: "mainnet"
+# Extends the mainnet preset
+PRESET_BASE: 'mainnet'

-# Misc
+# Genesis
 # ---------------------------------------------------------------
-# 2**6 (= 64)
-MAX_COMMITTEES_PER_SLOT: 64
-# 2**7 (= 128)
-TARGET_COMMITTEE_SIZE: 128
-# 2**11 (= 2,048)
-MAX_VALIDATORS_PER_COMMITTEE: 2048
-# 2**2 (= 4)
-MIN_PER_EPOCH_CHURN_LIMIT: 4
-# 2**16 (= 65,536)
-CHURN_LIMIT_QUOTIENT: 65536
-# See issue 563
-SHUFFLE_ROUND_COUNT: 90
 # `2**14` (= 16,384)
 MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 16384
 # Dec 1, 2020, 12pm UTC
 MIN_GENESIS_TIME: 1606824000
-# 4
-HYSTERESIS_QUOTIENT: 4
-# 1 (minus 0.25)
-HYSTERESIS_DOWNWARD_MULTIPLIER: 1
-# 5 (plus 1.25)
-HYSTERESIS_UPWARD_MULTIPLIER: 5
+# Mainnet initial fork version, recommend altering for testnets
+GENESIS_FORK_VERSION: 0x00000000
+# 604800 seconds (7 days)
+GENESIS_DELAY: 604800


-# Fork Choice
+# Forking
 # ---------------------------------------------------------------
-# 2**3 (= 8)
-SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8
+# Some forks are disabled for now:
+#  - These may be re-assigned to another fork-version later
+#  - Temporarily set to max uint64 value: 2**64 - 1
+
+# Altair
+ALTAIR_FORK_VERSION: 0x01000000
+ALTAIR_FORK_EPOCH: 18446744073709551615
+# Merge
+MERGE_FORK_VERSION: 0x02000000
+MERGE_FORK_EPOCH: 18446744073709551615
+# Sharding
+SHARDING_FORK_VERSION: 0x03000000
+SHARDING_FORK_EPOCH: 18446744073709551615
+
+# TBD, 2**32 is a placeholder. Merge transition approach is in active R&D.
+TRANSITION_TOTAL_DIFFICULTY: 4294967296


-# Validator
+# Time parameters
 # ---------------------------------------------------------------
-# 2**11 (= 2,048)
-ETH1_FOLLOW_DISTANCE: 2048
-# 2**4 (= 16)
-TARGET_AGGREGATORS_PER_COMMITTEE: 16
-# 2**0 (= 1)
-RANDOM_SUBNETS_PER_VALIDATOR: 1
-# 2**8 (= 256)
-EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION: 256
+# 12 seconds
+SECONDS_PER_SLOT: 12
 # 14 (estimate from Eth1 mainnet)
 SECONDS_PER_ETH1_BLOCK: 14
+# 2**8 (= 256) epochs ~27 hours
+MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
+# 2**8 (= 256) epochs ~27 hours
+SHARD_COMMITTEE_PERIOD: 256
+# 2**11 (= 2,048) Eth1 blocks ~8 hours
+ETH1_FOLLOW_DISTANCE: 2048
+
+
+# Validator cycle
+# ---------------------------------------------------------------
+# 2**2 (= 4)
+INACTIVITY_SCORE_BIAS: 4
+# 2**4 (= 16)
+INACTIVITY_SCORE_RECOVERY_RATE: 16
+# 2**4 * 10**9 (= 16,000,000,000) Gwei
+EJECTION_BALANCE: 16000000000
+# 2**2 (= 4)
+MIN_PER_EPOCH_CHURN_LIMIT: 4
+# 2**16 (= 65,536)
+CHURN_LIMIT_QUOTIENT: 65536


 # Deposit contract
@@ -53,103 +68,4 @@ SECONDS_PER_ETH1_BLOCK: 14
 # Ethereum PoW Mainnet
 DEPOSIT_CHAIN_ID: 1
 DEPOSIT_NETWORK_ID: 1
-# **TBD**
 DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cBB839Cbe05303d7705Fa
-
-
-# Gwei values
-# ---------------------------------------------------------------
-# 2**0 * 10**9 (= 1,000,000,000) Gwei
-MIN_DEPOSIT_AMOUNT: 1000000000
-# 2**5 * 10**9 (= 32,000,000,000) Gwei
-MAX_EFFECTIVE_BALANCE: 32000000000
-# 2**4 * 10**9 (= 16,000,000,000) Gwei
-EJECTION_BALANCE: 16000000000
-# 2**0 * 10**9 (= 1,000,000,000) Gwei
-EFFECTIVE_BALANCE_INCREMENT: 1000000000
-
-
-# Initial values
-# ---------------------------------------------------------------
-# Mainnet initial fork version, recommend altering for testnets
-GENESIS_FORK_VERSION: 0x00000000
-BLS_WITHDRAWAL_PREFIX: 0x00
-
-
-# Time parameters
-# ---------------------------------------------------------------
-# 604800 seconds (7 days)
-GENESIS_DELAY: 604800
-# 12 seconds
-SECONDS_PER_SLOT: 12
-# 2**0 (= 1) slots 12 seconds
-MIN_ATTESTATION_INCLUSION_DELAY: 1
-# 2**5 (= 32) slots 6.4 minutes
-SLOTS_PER_EPOCH: 32
-# 2**0 (= 1) epochs 6.4 minutes
-MIN_SEED_LOOKAHEAD: 1
-# 2**2 (= 4) epochs 25.6 minutes
-MAX_SEED_LOOKAHEAD: 4
-# 2**6 (= 64) epochs ~6.8 hours
-EPOCHS_PER_ETH1_VOTING_PERIOD: 64
-# 2**13 (= 8,192) slots ~13 hours
-SLOTS_PER_HISTORICAL_ROOT: 8192
-# 2**8 (= 256) epochs ~27 hours
-MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
-# 2**8 (= 256) epochs ~27 hours
-SHARD_COMMITTEE_PERIOD: 256
-# 2**2 (= 4) epochs 25.6 minutes
-MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
-
-
-# State vector lengths
-# ---------------------------------------------------------------
-# 2**16 (= 65,536) epochs ~0.8 years
-EPOCHS_PER_HISTORICAL_VECTOR: 65536
-# 2**13 (= 8,192) epochs ~36 days
-EPOCHS_PER_SLASHINGS_VECTOR: 8192
-# 2**24 (= 16,777,216) historical roots, ~26,131 years
-HISTORICAL_ROOTS_LIMIT: 16777216
-# 2**40 (= 1,099,511,627,776) validator spots
-VALIDATOR_REGISTRY_LIMIT: 1099511627776
-
-
-# Reward and penalty quotients
-# ---------------------------------------------------------------
-# 2**6 (= 64)
-BASE_REWARD_FACTOR: 64
-# 2**9 (= 512)
-WHISTLEBLOWER_REWARD_QUOTIENT: 512
-# 2**3 (= 8)
-PROPOSER_REWARD_QUOTIENT: 8
-# 2**26 (= 67,108,864)
-INACTIVITY_PENALTY_QUOTIENT: 67108864
-# 2**7 (= 128) (lower safety margin at Phase 0 genesis)
-MIN_SLASHING_PENALTY_QUOTIENT: 128
-# 1 (lower safety margin at Phase 0 genesis)
-PROPORTIONAL_SLASHING_MULTIPLIER: 1
-
-
-# Max operations per block
-# ---------------------------------------------------------------
-# 2**4 (= 16)
-MAX_PROPOSER_SLASHINGS: 16
-# 2**1 (= 2)
-MAX_ATTESTER_SLASHINGS: 2
-# 2**7 (= 128)
-MAX_ATTESTATIONS: 128
-# 2**4 (= 16)
-MAX_DEPOSITS: 16
-# 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
-
-
-# Signature domains
-# ---------------------------------------------------------------
-DOMAIN_BEACON_PROPOSER: 0x00000000
-DOMAIN_BEACON_ATTESTER: 0x01000000
-DOMAIN_RANDAO: 0x02000000
-DOMAIN_DEPOSIT: 0x03000000
-DOMAIN_VOLUNTARY_EXIT: 0x04000000
-DOMAIN_SELECTION_PROOF: 0x05000000
-DOMAIN_AGGREGATE_AND_PROOF: 0x06000000
--- a/common/eth2_network_config/built_in_network_configs/medalla/boot_enr.yaml
+++ b/common/eth2_network_config/built_in_network_configs/medalla/boot_enr.yaml
@@ -1,10 +0,0 @@
-# lighthouse Node
- enr:-LK4QCGFeQXjpQkgOfLHsbTjD65IOtSqV7Qo-Qdqv6SrL8lqFY7INPMMGP5uGKkVDcJkeXimSeNeypaZV3MHkcJgr9QCh2F0dG5ldHOIAAAAAAAAAACEZXRoMpDnp11aAAAAAf__________gmlkgnY0gmlwhA37LMaJc2VjcDI1NmsxoQJ7k0mKtTd_kdEq251flOjD1HKpqgMmIETDoD-Msy_O-4N0Y3CCIyiDdWRwgiMo
-# Lighthouse node
- enr:-LK4QCpyWmMLYwC2umMJ_g0c9VY7YOFwZyaR80_tuQNTWOzJbaR82DDhVQYqmE_0gvN6Du5jwnxzIaaNRZQlVXzfIK0Dh2F0dG5ldHOIAAAAAAAAAACEZXRoMpDnp11aAAAAAf__________gmlkgnY0gmlwhCLR2xuJc2VjcDI1NmsxoQOYiWqrQtQksTEtS3qY6idxJE5wkm0t9wKqpzv2gCR21oN0Y3CCIyiDdWRwgiMo
-# Prysm
- enr:-Ku4QOnVSyvzS3VbF87J8MubaRuTyfPi6B67XQg6-5eAV_uILAhn9geTTQmfqDIOcIeAxWHUUajQp6lYniAXPWncp6UBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpAYrkzLAAAAAf__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQKekYKqUtwbaJKKCct_srE5-g7tBUm68mj_jpeSb7CCqYN1ZHCCC7g
-# Prysm
- enr:-Ku4QHWezvidY_m0dWEwERrNrqjEQWrlIx7b8K4EIxGgTrLmUxHCZPW5-t8PsS8nFxAJ8k8YacKP5zPRk5gbsTSsRTQBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpAYrkzLAAAAAf__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQMypP_ODwTuBq2v0oIdjPGCEyu9Hb_jHDbuIX_iNvBRGoN1ZHCCGWQ
-# Cat-dog
- enr:-Ku4QJmPsyq4lmDdFebMKXk7vdt8WsLWkArYT2K8eN057oFudm2tITrZJD9sq1x92-bRmXTyAJgb2FD4ior-KHIU3KcDh2F0dG5ldHOIAAAAAAAAAACEZXRoMpDaNQiCAAAAA___________gmlkgnY0gmlwhBK4vdCJc2VjcDI1NmsxoQMWAsR84_ETgq4-14FV2x00ptmI-YU3tdkZV9CUgYPEnIN1ZHCCI1s
--- a/common/eth2_network_config/built_in_network_configs/medalla/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/medalla/config.yaml
@@ -1,60 +0,0 @@
-CONFIG_NAME: "medalla"
-MAX_COMMITTEES_PER_SLOT: 64
-TARGET_COMMITTEE_SIZE: 128
-MAX_VALIDATORS_PER_COMMITTEE: 2048
-MIN_PER_EPOCH_CHURN_LIMIT: 4
-CHURN_LIMIT_QUOTIENT: 65536
-SHUFFLE_ROUND_COUNT: 90
-MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 16384
-MIN_GENESIS_TIME: 1596546000
-HYSTERESIS_QUOTIENT: 4
-HYSTERESIS_DOWNWARD_MULTIPLIER: 1
-HYSTERESIS_UPWARD_MULTIPLIER: 5
-SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8
-ETH1_FOLLOW_DISTANCE: 1024
-TARGET_AGGREGATORS_PER_COMMITTEE: 16
-RANDOM_SUBNETS_PER_VALIDATOR: 1
-EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION: 256
-SECONDS_PER_ETH1_BLOCK: 14
-DEPOSIT_CONTRACT_ADDRESS: 0x07b39F4fDE4A38bACe212b546dAc87C58DfE3fDC
-MIN_DEPOSIT_AMOUNT: 1000000000
-MAX_EFFECTIVE_BALANCE: 32000000000
-EJECTION_BALANCE: 16000000000
-EFFECTIVE_BALANCE_INCREMENT: 1000000000
-GENESIS_FORK_VERSION: 0x00000001
-BLS_WITHDRAWAL_PREFIX: 0x00
-GENESIS_DELAY: 172800
-SECONDS_PER_SLOT: 12
-MIN_ATTESTATION_INCLUSION_DELAY: 1
-SLOTS_PER_EPOCH: 32
-MIN_SEED_LOOKAHEAD: 1
-MAX_SEED_LOOKAHEAD: 4
-EPOCHS_PER_ETH1_VOTING_PERIOD: 32
-SLOTS_PER_HISTORICAL_ROOT: 8192
-MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
-SHARD_COMMITTEE_PERIOD: 256
-MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
-EPOCHS_PER_HISTORICAL_VECTOR: 65536
-EPOCHS_PER_SLASHINGS_VECTOR: 8192
-HISTORICAL_ROOTS_LIMIT: 16777216
-VALIDATOR_REGISTRY_LIMIT: 1099511627776
-BASE_REWARD_FACTOR: 64
-WHISTLEBLOWER_REWARD_QUOTIENT: 512
-PROPOSER_REWARD_QUOTIENT: 8
-INACTIVITY_PENALTY_QUOTIENT: 16777216
-MIN_SLASHING_PENALTY_QUOTIENT: 32
-MAX_PROPOSER_SLASHINGS: 16
-MAX_ATTESTER_SLASHINGS: 2
-MAX_ATTESTATIONS: 128
-MAX_DEPOSITS: 16
-MAX_VOLUNTARY_EXITS: 16
-DOMAIN_BEACON_PROPOSER: 0x00000000
-DOMAIN_BEACON_ATTESTER: 0x01000000
-DOMAIN_RANDAO: 0x02000000
-DOMAIN_DEPOSIT: 0x03000000
-DOMAIN_VOLUNTARY_EXIT: 0x04000000
-DOMAIN_SELECTION_PROOF: 0x05000000
-DOMAIN_AGGREGATE_AND_PROOF: 0x06000000
-DEPOSIT_CHAIN_ID: 5
-DEPOSIT_NETWORK_ID: 5
-PROPORTIONAL_SLASHING_MULTIPLIER: 3
--- a/common/eth2_network_config/built_in_network_configs/medalla/deploy_block.txt
+++ b/common/eth2_network_config/built_in_network_configs/medalla/deploy_block.txt
@@ -1 +0,0 @@
-3085928
--- a/common/eth2_network_config/built_in_network_configs/medalla/genesis.ssz.zip
+++ b/common/eth2_network_config/built_in_network_configs/medalla/genesis.ssz.zip
--- a/common/eth2_network_config/built_in_network_configs/prater/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/prater/config.yaml
@@ -1,53 +1,66 @@
-# Prater preset
+# Prater config

-CONFIG_NAME: "prater"
+# Extends the mainnet preset
+PRESET_BASE: 'mainnet'

-# Misc
+# Genesis
 # ---------------------------------------------------------------
-# 2**6 (= 64)
-MAX_COMMITTEES_PER_SLOT: 64
-# 2**7 (= 128)
-TARGET_COMMITTEE_SIZE: 128
-# 2**11 (= 2,048)
-MAX_VALIDATORS_PER_COMMITTEE: 2048
-# 2**2 (= 4)
-MIN_PER_EPOCH_CHURN_LIMIT: 4
-# 2**16 (= 65,536)
-CHURN_LIMIT_QUOTIENT: 65536
-# See issue 563
-SHUFFLE_ROUND_COUNT: 90
 # `2**14` (= 16,384)
 MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 16384
 # Mar-01-2021 08:53:32 AM +UTC
 MIN_GENESIS_TIME: 1614588812
-# 4
-HYSTERESIS_QUOTIENT: 4
-# 1 (minus 0.25)
-HYSTERESIS_DOWNWARD_MULTIPLIER: 1
-# 5 (plus 1.25)
-HYSTERESIS_UPWARD_MULTIPLIER: 5
+# Prater area code (Vienna)
+GENESIS_FORK_VERSION: 0x00001020
+# Customized for Prater: 1919188 seconds (Mar-23-2021 02:00:00 PM +UTC)
+GENESIS_DELAY: 1919188

-
-# Fork Choice
+# Forking
 # ---------------------------------------------------------------
-# 2**3 (= 8)
-SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8
+# Some forks are disabled for now:
+#  - These may be re-assigned to another fork-version later
+#  - Temporarily set to max uint64 value: 2**64 - 1
+
+# Altair
+ALTAIR_FORK_VERSION: 0x01000000
+ALTAIR_FORK_EPOCH: 18446744073709551615
+# Merge
+MERGE_FORK_VERSION: 0x02000000
+MERGE_FORK_EPOCH: 18446744073709551615
+# Sharding
+SHARDING_FORK_VERSION: 0x03000000
+SHARDING_FORK_EPOCH: 18446744073709551615
+
+# TBD, 2**32 is a placeholder. Merge transition approach is in active R&D.
+TRANSITION_TOTAL_DIFFICULTY: 4294967296


-# Validator
+# Time parameters
 # ---------------------------------------------------------------
-# 2**11 (= 2,048)
-ETH1_FOLLOW_DISTANCE: 2048
-# 2**4 (= 16)
-TARGET_AGGREGATORS_PER_COMMITTEE: 16
-# 2**0 (= 1)
-RANDOM_SUBNETS_PER_VALIDATOR: 1
-# 2**8 (= 256)
-EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION: 256
+# 12 seconds
+SECONDS_PER_SLOT: 12
 # 14 (estimate from Eth1 mainnet)
 SECONDS_PER_ETH1_BLOCK: 14
+# 2**8 (= 256) epochs ~27 hours
+MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
+# 2**8 (= 256) epochs ~27 hours
+SHARD_COMMITTEE_PERIOD: 256
+# 2**11 (= 2,048) Eth1 blocks ~8 hours
+ETH1_FOLLOW_DISTANCE: 2048


+# Validator cycle
+# ---------------------------------------------------------------
+# 2**2 (= 4)
+INACTIVITY_SCORE_BIAS: 4
+# 2**4 (= 16)
+INACTIVITY_SCORE_RECOVERY_RATE: 16
+# 2**4 * 10**9 (= 16,000,000,000) Gwei
+EJECTION_BALANCE: 16000000000
+# 2**2 (= 4)
+MIN_PER_EPOCH_CHURN_LIMIT: 4
+# 2**16 (= 65,536)
+CHURN_LIMIT_QUOTIENT: 65536
+
 # Deposit contract
 # ---------------------------------------------------------------
 # Ethereum Goerli testnet
@@ -55,101 +68,3 @@ DEPOSIT_CHAIN_ID: 5
 DEPOSIT_NETWORK_ID: 5
 # Prater test deposit contract on Goerli Testnet
 DEPOSIT_CONTRACT_ADDRESS: 0xff50ed3d0ec03aC01D4C79aAd74928BFF48a7b2b
-
-
-# Gwei values
-# ---------------------------------------------------------------
-# 2**0 * 10**9 (= 1,000,000,000) Gwei
-MIN_DEPOSIT_AMOUNT: 1000000000
-# 2**5 * 10**9 (= 32,000,000,000) Gwei
-MAX_EFFECTIVE_BALANCE: 32000000000
-# 2**4 * 10**9 (= 16,000,000,000) Gwei
-EJECTION_BALANCE: 16000000000
-# 2**0 * 10**9 (= 1,000,000,000) Gwei
-EFFECTIVE_BALANCE_INCREMENT: 1000000000
-
-
-# Initial values
-# ---------------------------------------------------------------
-# Prater area code (Vienna)
-GENESIS_FORK_VERSION: 0x00001020
-BLS_WITHDRAWAL_PREFIX: 0x00
-
-
-# Time parameters
-# ---------------------------------------------------------------
-# Customized for Prater: 1919188 seconds (Mar-23-2021 02:00:00 PM +UTC)
-GENESIS_DELAY: 1919188
-# 12 seconds
-SECONDS_PER_SLOT: 12
-# 2**0 (= 1) slots 12 seconds
-MIN_ATTESTATION_INCLUSION_DELAY: 1
-# 2**5 (= 32) slots 6.4 minutes
-SLOTS_PER_EPOCH: 32
-# 2**0 (= 1) epochs 6.4 minutes
-MIN_SEED_LOOKAHEAD: 1
-# 2**2 (= 4) epochs 25.6 minutes
-MAX_SEED_LOOKAHEAD: 4
-# 2**6 (= 64) epochs ~6.8 hours
-EPOCHS_PER_ETH1_VOTING_PERIOD: 64
-# 2**13 (= 8,192) slots ~13 hours
-SLOTS_PER_HISTORICAL_ROOT: 8192
-# 2**8 (= 256) epochs ~27 hours
-MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
-# 2**8 (= 256) epochs ~27 hours
-SHARD_COMMITTEE_PERIOD: 256
-# 2**2 (= 4) epochs 25.6 minutes
-MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
-
-
-# State vector lengths
-# ---------------------------------------------------------------
-# 2**16 (= 65,536) epochs ~0.8 years
-EPOCHS_PER_HISTORICAL_VECTOR: 65536
-# 2**13 (= 8,192) epochs ~36 days
-EPOCHS_PER_SLASHINGS_VECTOR: 8192
-# 2**24 (= 16,777,216) historical roots, ~26,131 years
-HISTORICAL_ROOTS_LIMIT: 16777216
-# 2**40 (= 1,099,511,627,776) validator spots
-VALIDATOR_REGISTRY_LIMIT: 1099511627776
-
-
-# Reward and penalty quotients
-# ---------------------------------------------------------------
-# 2**6 (= 64)
-BASE_REWARD_FACTOR: 64
-# 2**9 (= 512)
-WHISTLEBLOWER_REWARD_QUOTIENT: 512
-# 2**3 (= 8)
-PROPOSER_REWARD_QUOTIENT: 8
-# 2**26 (= 67,108,864)
-INACTIVITY_PENALTY_QUOTIENT: 67108864
-# 2**7 (= 128) (lower safety margin at Phase 0 genesis)
-MIN_SLASHING_PENALTY_QUOTIENT: 128
-# 1 (lower safety margin at Phase 0 genesis)
-PROPORTIONAL_SLASHING_MULTIPLIER: 1
-
-
-# Max operations per block
-# ---------------------------------------------------------------
-# 2**4 (= 16)
-MAX_PROPOSER_SLASHINGS: 16
-# 2**1 (= 2)
-MAX_ATTESTER_SLASHINGS: 2
-# 2**7 (= 128)
-MAX_ATTESTATIONS: 128
-# 2**4 (= 16)
-MAX_DEPOSITS: 16
-# 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
-
-
-# Signature domains
-# ---------------------------------------------------------------
-DOMAIN_BEACON_PROPOSER: 0x00000000
-DOMAIN_BEACON_ATTESTER: 0x01000000
-DOMAIN_RANDAO: 0x02000000
-DOMAIN_DEPOSIT: 0x03000000
-DOMAIN_VOLUNTARY_EXIT: 0x04000000
-DOMAIN_SELECTION_PROOF: 0x05000000
-DOMAIN_AGGREGATE_AND_PROOF: 0x06000000
--- a/common/eth2_network_config/built_in_network_configs/pyrmont/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/pyrmont/config.yaml
@@ -1,52 +1,66 @@
-# Pyrmont preset
-CONFIG_NAME: "pyrmont"
+# Pyrmont config

-# Misc
+# Extends the mainnet preset
+PRESET_BASE: 'mainnet'
+
+# Genesis
 # ---------------------------------------------------------------
-# 2**6 (= 64)
-MAX_COMMITTEES_PER_SLOT: 64
-# 2**7 (= 128)
-TARGET_COMMITTEE_SIZE: 128
-# 2**11 (= 2,048)
-MAX_VALIDATORS_PER_COMMITTEE: 2048
-# 2**2 (= 4)
-MIN_PER_EPOCH_CHURN_LIMIT: 4
-# 2**16 (= 65,536)
-CHURN_LIMIT_QUOTIENT: 65536
-# See issue 563
-SHUFFLE_ROUND_COUNT: 90
 # `2**14` (= 16,384)
 MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 16384
 # Nov 18, 2020, 12pm UTC
 MIN_GENESIS_TIME: 1605700800
-# 4
-HYSTERESIS_QUOTIENT: 4
-# 1 (minus 0.25)
-HYSTERESIS_DOWNWARD_MULTIPLIER: 1
-# 5 (plus 1.25)
-HYSTERESIS_UPWARD_MULTIPLIER: 5
+# Pyrmont area code
+GENESIS_FORK_VERSION: 0x00002009
+# Customized for Pyrmont: 432000 seconds (5 days)
+GENESIS_DELAY: 432000

-
-# Fork Choice
+# Forking
 # ---------------------------------------------------------------
-# 2**3 (= 8)
-SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8
+# Some forks are disabled for now:
+#  - These may be re-assigned to another fork-version later
+#  - Temporarily set to max uint64 value: 2**64 - 1
+
+# Altair
+ALTAIR_FORK_VERSION: 0x01000000
+ALTAIR_FORK_EPOCH: 18446744073709551615
+# Merge
+MERGE_FORK_VERSION: 0x02000000
+MERGE_FORK_EPOCH: 18446744073709551615
+# Sharding
+SHARDING_FORK_VERSION: 0x03000000
+SHARDING_FORK_EPOCH: 18446744073709551615
+
+# TBD, 2**32 is a placeholder. Merge transition approach is in active R&D.
+TRANSITION_TOTAL_DIFFICULTY: 4294967296


-# Validator
+# Time parameters
 # ---------------------------------------------------------------
-# 2**11 (= 2,048)
-ETH1_FOLLOW_DISTANCE: 2048
-# 2**4 (= 16)
-TARGET_AGGREGATORS_PER_COMMITTEE: 16
-# 2**0 (= 1)
-RANDOM_SUBNETS_PER_VALIDATOR: 1
-# 2**8 (= 256)
-EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION: 256
+# 12 seconds
+SECONDS_PER_SLOT: 12
 # 14 (estimate from Eth1 mainnet)
 SECONDS_PER_ETH1_BLOCK: 14
+# 2**8 (= 256) epochs ~27 hours
+MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
+# 2**8 (= 256) epochs ~27 hours
+SHARD_COMMITTEE_PERIOD: 256
+# 2**11 (= 2,048) Eth1 blocks ~8 hours
+ETH1_FOLLOW_DISTANCE: 2048


+# Validator cycle
+# ---------------------------------------------------------------
+# 2**2 (= 4)
+INACTIVITY_SCORE_BIAS: 4
+# 2**4 (= 16)
+INACTIVITY_SCORE_RECOVERY_RATE: 16
+# 2**4 * 10**9 (= 16,000,000,000) Gwei
+EJECTION_BALANCE: 16000000000
+# 2**2 (= 4)
+MIN_PER_EPOCH_CHURN_LIMIT: 4
+# 2**16 (= 65,536)
+CHURN_LIMIT_QUOTIENT: 65536
+
 # Deposit contract
 # ---------------------------------------------------------------
 # Ethereum Goerli testnet
@@ -54,101 +68,3 @@ DEPOSIT_CHAIN_ID: 5
 DEPOSIT_NETWORK_ID: 5
 # Pyrmont test deposit contract on Goerli (2nd edition, 0x00002009 fork version)
 DEPOSIT_CONTRACT_ADDRESS: 0x8c5fecdC472E27Bc447696F431E425D02dd46a8c
-
-
-# Gwei values
-# ---------------------------------------------------------------
-# 2**0 * 10**9 (= 1,000,000,000) Gwei
-MIN_DEPOSIT_AMOUNT: 1000000000
-# 2**5 * 10**9 (= 32,000,000,000) Gwei
-MAX_EFFECTIVE_BALANCE: 32000000000
-# 2**4 * 10**9 (= 16,000,000,000) Gwei
-EJECTION_BALANCE: 16000000000
-# 2**0 * 10**9 (= 1,000,000,000) Gwei
-EFFECTIVE_BALANCE_INCREMENT: 1000000000
-
-
-# Initial values
-# ---------------------------------------------------------------
-# Pyrmont area code
-GENESIS_FORK_VERSION: 0x00002009
-BLS_WITHDRAWAL_PREFIX: 0x00
-
-
-# Time parameters
-# ---------------------------------------------------------------
-# Customized for Pyrmont: 432000 seconds (5 days)
-GENESIS_DELAY: 432000
-# 12 seconds
-SECONDS_PER_SLOT: 12
-# 2**0 (= 1) slots 12 seconds
-MIN_ATTESTATION_INCLUSION_DELAY: 1
-# 2**5 (= 32) slots 6.4 minutes
-SLOTS_PER_EPOCH: 32
-# 2**0 (= 1) epochs 6.4 minutes
-MIN_SEED_LOOKAHEAD: 1
-# 2**2 (= 4) epochs 25.6 minutes
-MAX_SEED_LOOKAHEAD: 4
-# 2**6 (= 64) epochs ~6.8 hours
-EPOCHS_PER_ETH1_VOTING_PERIOD: 64
-# 2**13 (= 8,192) slots ~13 hours
-SLOTS_PER_HISTORICAL_ROOT: 8192
-# 2**8 (= 256) epochs ~27 hours
-MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
-# 2**8 (= 256) epochs ~27 hours
-SHARD_COMMITTEE_PERIOD: 256
-# 2**2 (= 4) epochs 25.6 minutes
-MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
-
-
-# State vector lengths
-# ---------------------------------------------------------------
-# 2**16 (= 65,536) epochs ~0.8 years
-EPOCHS_PER_HISTORICAL_VECTOR: 65536
-# 2**13 (= 8,192) epochs ~36 days
-EPOCHS_PER_SLASHINGS_VECTOR: 8192
-# 2**24 (= 16,777,216) historical roots, ~26,131 years
-HISTORICAL_ROOTS_LIMIT: 16777216
-# 2**40 (= 1,099,511,627,776) validator spots
-VALIDATOR_REGISTRY_LIMIT: 1099511627776
-
-
-# Reward and penalty quotients
-# ---------------------------------------------------------------
-# 2**6 (= 64)
-BASE_REWARD_FACTOR: 64
-# 2**9 (= 512)
-WHISTLEBLOWER_REWARD_QUOTIENT: 512
-# 2**3 (= 8)
-PROPOSER_REWARD_QUOTIENT: 8
-# 2**26 (= 67,108,864)
-INACTIVITY_PENALTY_QUOTIENT: 67108864
-# 2**7 (= 128) (lower safety margin at Phase 0 genesis)
-MIN_SLASHING_PENALTY_QUOTIENT: 128
-# 1 (lower safety margin at Phase 0 genesis)
-PROPORTIONAL_SLASHING_MULTIPLIER: 1
-
-
-# Max operations per block
-# ---------------------------------------------------------------
-# 2**4 (= 16)
-MAX_PROPOSER_SLASHINGS: 16
-# 2**1 (= 2)
-MAX_ATTESTER_SLASHINGS: 2
-# 2**7 (= 128)
-MAX_ATTESTATIONS: 128
-# 2**4 (= 16)
-MAX_DEPOSITS: 16
-# 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
-
-
-# Signature domains
-# ---------------------------------------------------------------
-DOMAIN_BEACON_PROPOSER: 0x00000000
-DOMAIN_BEACON_ATTESTER: 0x01000000
-DOMAIN_RANDAO: 0x02000000
-DOMAIN_DEPOSIT: 0x03000000
-DOMAIN_VOLUNTARY_EXIT: 0x04000000
-DOMAIN_SELECTION_PROOF: 0x05000000
-DOMAIN_AGGREGATE_AND_PROOF: 0x06000000
--- a/common/eth2_network_config/built_in_network_configs/spadina/boot_enr.yaml
+++ b/common/eth2_network_config/built_in_network_configs/spadina/boot_enr.yaml
@@ -1,8 +0,0 @@
-# Lighthouse
- enr:-KG4QEPVpcw8HLNsDuqNPIx4sXLCUsuDOHVtPcNmgSewWcDgSkd6s-vGCXlac86BTYIU8sYqhvD-ZeTW1uG5OtEBm-QDhGV0aDKQCfsKEgAAAAL__________4JpZIJ2NIJpcIQ0ECjWiXNlY3AyNTZrMaEDCavdC37lb2fgBgKrvrLRZ-ZvL6JFNeUHHc5TXZ_BYqmDdGNwgiMog3VkcIIjKA
-# teku
- enr:-KG4QA-EcFfXQsL2dcneG8vp8HTWLrpwHQ5HhfyIytfpeKOISzROy2kYSsf_v-BZKnIx5XHDjqJ-ttz0hoz6qJA7tasEhGV0aDKQxKgkDQAAAAL__________4JpZIJ2NIJpcIQDFt-UiXNlY3AyNTZrMaECkR4C5DVO_9rB48eHTY4kdyOHsguTEDlvb7Ce0_mvghSDdGNwgiMog3VkcIIjKA
-# prysm 
- enr:-Ku4QGQJf2bcDAwVGvbvtq3AB4KKwAvStTenY-i_QnW2ABNRRBncIU_5qR_e_um-9t3s9g-Y5ZfFATj1nhtzq6lvgc4Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpDEqCQNAAAAAv__________gmlkgnY0gmlwhBLf22SJc2VjcDI1NmsxoQNoed9JnQh7ltcAacHEGOjwocL1BhMQbYTgaPX0kFuXtIN1ZHCCE4g
-# proto
- enr:-Ku4QFW1SLbtzJ_ghQQC8-8xezvZ1Mx95J-zer9IPmDE2BKeD_SM7j4vH6xmroUFVuyK-54n2Ey2ueB-Lf-fkbcLwAQBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpDEqCQNAAAAAv__________gmlkgnY0gmlwhGQZkSyJc2VjcDI1NmsxoQJMcbZhTCEKYSH5-qPQPgYfSHHUMLGBAKU-f-96yYKFMIN1ZHCCIyg
--- a/common/eth2_network_config/built_in_network_configs/spadina/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/spadina/config.yaml
@@ -1,60 +0,0 @@
-CONFIG_NAME: "spadina"
-MAX_COMMITTEES_PER_SLOT: 64
-TARGET_COMMITTEE_SIZE: 128
-MAX_VALIDATORS_PER_COMMITTEE: 2048
-MIN_PER_EPOCH_CHURN_LIMIT: 4
-CHURN_LIMIT_QUOTIENT: 65536
-SHUFFLE_ROUND_COUNT: 90
-MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 1024
-MIN_GENESIS_TIME: 1601380800
-HYSTERESIS_QUOTIENT: 4
-HYSTERESIS_DOWNWARD_MULTIPLIER: 1
-HYSTERESIS_UPWARD_MULTIPLIER: 5
-PROPORTIONAL_SLASHING_MULTIPLIER: 3
-SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8
-ETH1_FOLLOW_DISTANCE: 1024
-TARGET_AGGREGATORS_PER_COMMITTEE: 16
-RANDOM_SUBNETS_PER_VALIDATOR: 1
-EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION: 256
-SECONDS_PER_ETH1_BLOCK: 14
-DEPOSIT_CHAIN_ID: 5
-DEPOSIT_NETWORK_ID: 5
-DEPOSIT_CONTRACT_ADDRESS: 0x48B597F4b53C21B48AD95c7256B49D1779Bd5890
-MIN_DEPOSIT_AMOUNT: 1000000000
-MAX_EFFECTIVE_BALANCE: 32000000000
-EJECTION_BALANCE: 16000000000
-EFFECTIVE_BALANCE_INCREMENT: 1000000000
-GENESIS_FORK_VERSION: 0x00000002
-BLS_WITHDRAWAL_PREFIX: 0x00
-GENESIS_DELAY: 172800
-SECONDS_PER_SLOT: 12
-MIN_ATTESTATION_INCLUSION_DELAY: 1
-SLOTS_PER_EPOCH: 32
-MIN_SEED_LOOKAHEAD: 1
-MAX_SEED_LOOKAHEAD: 4
-EPOCHS_PER_ETH1_VOTING_PERIOD: 32
-SLOTS_PER_HISTORICAL_ROOT: 8192
-MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
-SHARD_COMMITTEE_PERIOD: 256
-MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
-EPOCHS_PER_HISTORICAL_VECTOR: 65536
-EPOCHS_PER_SLASHINGS_VECTOR: 8192
-HISTORICAL_ROOTS_LIMIT: 16777216
-VALIDATOR_REGISTRY_LIMIT: 1099511627776
-BASE_REWARD_FACTOR: 64
-WHISTLEBLOWER_REWARD_QUOTIENT: 512
-PROPOSER_REWARD_QUOTIENT: 8
-INACTIVITY_PENALTY_QUOTIENT: 16777216
-MIN_SLASHING_PENALTY_QUOTIENT: 32
-MAX_PROPOSER_SLASHINGS: 16
-MAX_ATTESTER_SLASHINGS: 2
-MAX_ATTESTATIONS: 128
-MAX_DEPOSITS: 16
-MAX_VOLUNTARY_EXITS: 16
-DOMAIN_BEACON_PROPOSER: 0x00000000
-DOMAIN_BEACON_ATTESTER: 0x01000000
-DOMAIN_RANDAO: 0x02000000
-DOMAIN_DEPOSIT: 0x03000000
-DOMAIN_VOLUNTARY_EXIT: 0x04000000
-DOMAIN_SELECTION_PROOF: 0x05000000
-DOMAIN_AGGREGATE_AND_PROOF: 0x06000000
--- a/common/eth2_network_config/built_in_network_configs/spadina/deploy_block.txt
+++ b/common/eth2_network_config/built_in_network_configs/spadina/deploy_block.txt
@@ -1 +0,0 @@
-3384340
--- a/common/eth2_network_config/built_in_network_configs/spadina/genesis.ssz.zip
+++ b/common/eth2_network_config/built_in_network_configs/spadina/genesis.ssz.zip
--- a/common/eth2_network_config/built_in_network_configs/toledo/boot_enr.yaml
+++ b/common/eth2_network_config/built_in_network_configs/toledo/boot_enr.yaml
@@ -1,20 +0,0 @@
-# discv5.1-only bootnode @protolambda
- enr:-Ku4QL5E378NT4-vqP6v1mZ7kHxiTHJvuBvQixQsuTTCffa0PJNWMBlG3Mduvsvd6T2YP1U3l5tBKO5H-9wyX2SCtPkBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpC4EvfsAHAe0P__________gmlkgnY0gmlwhDaetEeJc2VjcDI1NmsxoQKtGC2CAuba7goLLdle899M3esUmoWRvzi7GBVhq6ViCYN1ZHCCIyg
-
-# lighthouse (Canada) @protolambda
- enr:-LK4QHLujdDjOwm2siyFJ2XGz19_ip-qTtozG3ceZ3_56G-LMWb4um67gTSYRJg0WsSkyvRMBEpz8uuIYl-7HfWvktgBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCXm69nAHAe0P__________gmlkgnY0gmlwhCO3C5OJc2VjcDI1NmsxoQKXw9BLDY6YwmqTtfkzUnlJQb82UrlX4lIAnSSYWHFRlYN0Y3CCIyiDdWRwgiMo
-
-# lighthouse (Sao Paulo) @protolambda
- enr:-LK4QMxmk7obupScBebKFaasSH3QmYUg-HaEmMAljfmGQCLbKwdOhszzx-VfVPvlH7bZZbOmg3-SNWbJsFfytdjD7a4Bh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCXm69nAHAe0P__________gmlkgnY0gmlwhBLkdWuJc2VjcDI1NmsxoQOwYsJyLOjJcDIqiQSSZtDi_EwwSaUjPBSnLVY_PYu-HoN0Y3CCIyiDdWRwgiMo
-
-# Teku @protolambda
- enr:-KG4QKqo0mG4C35ntJg8icO54wd973aZ7aBiAnC2t1XkGvgqNDOEHwNe2ykxYVUj9AWjm_lKD7brlhXKCZEskGbie2cDhGV0aDKQl5uvZwBwHtD__________4JpZIJ2NIJpcIQNOThwiXNlY3AyNTZrMaECn1dwC8MRt8rk2VUT8RjzEBaceF09d4CEQI20O_SWYcqDdGNwgiMog3VkcIIjKA
-
-# Prysm @protolambda
- enr:-LK4QAhU5smiLgU0AgrdFv8eCKmDPCBkXCMCIy8Aktaci5qvCYOsW98xVqJS6OoPWt4Sz_YoTdLQBWxd-RZ756vmGPMBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCXm69nAHAe0P__________gmlkgnY0gmlwhDTTDL2Jc2VjcDI1NmsxoQOmSJ0mKsQjab7Zralm1Hi0AEReZ2SEqYdKoOPmoA98DoN0Y3CCIyiDdWRwgiMo
-
-# Lighthouse: @sigp
- enr:-LK4QBsu_4I-tmA5WgxkJWRuVUCj2_QE2mmrwX0sFvAc3NR_YPrub4kpvPCb_OjKLwEefxey81SAcvQ7mr2Vvh8xhbgBh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCXm69nAHAe0P__________gmlkgnY0gmlwhA3UHZWJc2VjcDI1NmsxoQL9FPylFeunleHuPXlbB938eIMd3X9y9cJ8ZI8y3Li0u4N0Y3CCIyiDdWRwgiMo
-
-# Lighthouse: @sigp
- enr:-LK4QEfW9TCASUUy8L5xamlTVs3JbgT8iYOUspJkbh3rj-BuUndLjtonockiN2K_0g-cBQGq-wvsgAiz5Q3-ic-Wz_ABh2F0dG5ldHOIAAAAAAAAAACEZXRoMpCXm69nAHAe0P__________gmlkgnY0gmlwhCLV8-OJc2VjcDI1NmsxoQKYJuiXbqPzkbT0NAKIJneNWiX0136HiYI9qtx5NF1IloN0Y3CCIyiDdWRwgiMo
--- a/common/eth2_network_config/built_in_network_configs/toledo/config.yaml
+++ b/common/eth2_network_config/built_in_network_configs/toledo/config.yaml
@@ -1,154 +0,0 @@
-# Toledo preset, variant of mainnet
-
-CONFIG_NAME: "toledo"
-
-# Misc
-# ---------------------------------------------------------------
-# 2**6 (= 64)
-MAX_COMMITTEES_PER_SLOT: 64
-# 2**7 (= 128)
-TARGET_COMMITTEE_SIZE: 128
-# 2**11 (= 2,048)
-MAX_VALIDATORS_PER_COMMITTEE: 2048
-# 2**2 (= 4)
-MIN_PER_EPOCH_CHURN_LIMIT: 4
-# 2**16 (= 65,536)
-CHURN_LIMIT_QUOTIENT: 65536
-# See issue 563
-SHUFFLE_ROUND_COUNT: 90
-# `2**14` (= 16,384)
-MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 16384
-# Nov 10, 2020, 12pm UTC
-MIN_GENESIS_TIME: 1605009600
-# 4
-HYSTERESIS_QUOTIENT: 4
-# 1 (minus 0.25)
-HYSTERESIS_DOWNWARD_MULTIPLIER: 1
-# 5 (plus 1.25)
-HYSTERESIS_UPWARD_MULTIPLIER: 5
-
-
-# Fork Choice
-# ---------------------------------------------------------------
-# 2**3 (= 8)
-SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8
-
-
-# Validator
-# ---------------------------------------------------------------
-# 2**11 (= 2,048)
-ETH1_FOLLOW_DISTANCE: 2048
-# 2**4 (= 16)
-TARGET_AGGREGATORS_PER_COMMITTEE: 16
-# 2**0 (= 1)
-RANDOM_SUBNETS_PER_VALIDATOR: 1
-# 2**8 (= 256)
-EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION: 256
-# 14 (estimate from Eth1 mainnet)
-SECONDS_PER_ETH1_BLOCK: 14
-
-
-# Deposit contract
-# ---------------------------------------------------------------
-# Ethereum Goerli testnet
-DEPOSIT_CHAIN_ID: 5
-DEPOSIT_NETWORK_ID: 5
-# Toledo permissioned test deposit contract on Goerli
-DEPOSIT_CONTRACT_ADDRESS: 0x47709dC7a8c18688a1f051761fc34ac253970bC0
-
-
-# Gwei values
-# ---------------------------------------------------------------
-# 2**0 * 10**9 (= 1,000,000,000) Gwei
-MIN_DEPOSIT_AMOUNT: 1000000000
-# 2**5 * 10**9 (= 32,000,000,000) Gwei
-MAX_EFFECTIVE_BALANCE: 32000000000
-# 2**4 * 10**9 (= 16,000,000,000) Gwei
-EJECTION_BALANCE: 16000000000
-# 2**0 * 10**9 (= 1,000,000,000) Gwei
-EFFECTIVE_BALANCE_INCREMENT: 1000000000
-
-
-# Initial values
-# ---------------------------------------------------------------
-GENESIS_FORK_VERSION: 0x00701ED0
-BLS_WITHDRAWAL_PREFIX: 0x00
-
-
-# Time parameters
-# ---------------------------------------------------------------
-# 86400 seconds (1 day)
-GENESIS_DELAY: 86400
-# 12 seconds
-SECONDS_PER_SLOT: 12
-# 2**0 (= 1) slots 12 seconds
-MIN_ATTESTATION_INCLUSION_DELAY: 1
-# 2**5 (= 32) slots 6.4 minutes
-SLOTS_PER_EPOCH: 32
-# 2**0 (= 1) epochs 6.4 minutes
-MIN_SEED_LOOKAHEAD: 1
-# 2**2 (= 4) epochs 25.6 minutes
-MAX_SEED_LOOKAHEAD: 4
-# 2**6 (= 64) epochs ~6.8 hours
-EPOCHS_PER_ETH1_VOTING_PERIOD: 64
-# 2**13 (= 8,192) slots ~13 hours
-SLOTS_PER_HISTORICAL_ROOT: 8192
-# 2**8 (= 256) epochs ~27 hours
-MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256
-# 2**8 (= 256) epochs ~27 hours
-SHARD_COMMITTEE_PERIOD: 256
-# 2**2 (= 4) epochs 25.6 minutes
-MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4
-
-
-# State vector lengths
-# ---------------------------------------------------------------
-# 2**16 (= 65,536) epochs ~0.8 years
-EPOCHS_PER_HISTORICAL_VECTOR: 65536
-# 2**13 (= 8,192) epochs ~36 days
-EPOCHS_PER_SLASHINGS_VECTOR: 8192
-# 2**24 (= 16,777,216) historical roots, ~26,131 years
-HISTORICAL_ROOTS_LIMIT: 16777216
-# 2**40 (= 1,099,511,627,776) validator spots
-VALIDATOR_REGISTRY_LIMIT: 1099511627776
-
-
-# Reward and penalty quotients
-# ---------------------------------------------------------------
-# 2**6 (= 64)
-BASE_REWARD_FACTOR: 64
-# 2**9 (= 512)
-WHISTLEBLOWER_REWARD_QUOTIENT: 512
-# 2**3 (= 8)
-PROPOSER_REWARD_QUOTIENT: 8
-# 2**26 (= 67,108,864)
-INACTIVITY_PENALTY_QUOTIENT: 67108864
-# 2**7 (= 128) (lower safety margin at Phase 0 genesis)
-MIN_SLASHING_PENALTY_QUOTIENT: 128
-# 1 (lower safety margin at Phase 0 genesis)
-PROPORTIONAL_SLASHING_MULTIPLIER: 1
-
-
-# Max operations per block
-# ---------------------------------------------------------------
-# 2**4 (= 16)
-MAX_PROPOSER_SLASHINGS: 16
-# 2**1 (= 2)
-MAX_ATTESTER_SLASHINGS: 2
-# 2**7 (= 128)
-MAX_ATTESTATIONS: 128
-# 2**4 (= 16)
-MAX_DEPOSITS: 16
-# 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
-
-
-# Signature domains
-# ---------------------------------------------------------------
-DOMAIN_BEACON_PROPOSER: 0x00000000
-DOMAIN_BEACON_ATTESTER: 0x01000000
-DOMAIN_RANDAO: 0x02000000
-DOMAIN_DEPOSIT: 0x03000000
-DOMAIN_VOLUNTARY_EXIT: 0x04000000
-DOMAIN_SELECTION_PROOF: 0x05000000
-DOMAIN_AGGREGATE_AND_PROOF: 0x06000000
--- a/common/eth2_network_config/built_in_network_configs/toledo/deploy_block.txt
+++ b/common/eth2_network_config/built_in_network_configs/toledo/deploy_block.txt
@@ -1 +0,0 @@
-3702432
--- a/common/eth2_network_config/built_in_network_configs/toledo/genesis.ssz.zip
+++ b/common/eth2_network_config/built_in_network_configs/toledo/genesis.ssz.zip
--- a/common/eth2_network_config/src/lib.rs
+++ b/common/eth2_network_config/src/lib.rs
@@ -1,23 +1,21 @@
 use eth2_config::{predefined_networks_dir, *};

 use enr::{CombinedKey, Enr};
-use ssz::Decode;
 use std::fs::{create_dir_all, File};
 use std::io::{Read, Write};
 use std::path::PathBuf;
-use types::{BeaconState, EthSpec, EthSpecId, YamlConfig};
+use types::{BeaconState, ChainSpec, Config, EthSpec, EthSpecId};

-pub const ADDRESS_FILE: &str = "deposit_contract.txt";
 pub const DEPLOY_BLOCK_FILE: &str = "deploy_block.txt";
 pub const BOOT_ENR_FILE: &str = "boot_enr.yaml";
 pub const GENESIS_STATE_FILE: &str = "genesis.ssz";
-pub const YAML_CONFIG_FILE: &str = "config.yaml";
+pub const BASE_CONFIG_FILE: &str = "config.yaml";

 #[derive(Copy, Clone, Debug, PartialEq)]
 pub struct HardcodedNet {
    pub name: &'static str,
    pub genesis_is_known: bool,
-    pub yaml_config: &'static [u8],
+    pub config: &'static [u8],
    pub deploy_block: &'static [u8],
    pub boot_enr: &'static [u8],
    pub genesis_state_bytes: &'static [u8],
@@ -30,7 +28,7 @@ macro_rules! define_net {
        HardcodedNet {
            name: ETH2_NET_DIR.name,
            genesis_is_known: ETH2_NET_DIR.genesis_is_known,
-            yaml_config: $include_file!("../", "config.yaml"),
+            config: $include_file!("../", "config.yaml"),
            deploy_block: $include_file!("../", "deploy_block.txt"),
            boot_enr: $include_file!("../", "boot_enr.yaml"),
            genesis_state_bytes: $include_file!("../", "genesis.ssz"),
@@ -38,16 +36,11 @@ macro_rules! define_net {
    }};
 }

-const ALTONA: HardcodedNet = define_net!(altona, include_altona_file);
-const MEDALLA: HardcodedNet = define_net!(medalla, include_medalla_file);
-const SPADINA: HardcodedNet = define_net!(spadina, include_spadina_file);
 const PYRMONT: HardcodedNet = define_net!(pyrmont, include_pyrmont_file);
 const MAINNET: HardcodedNet = define_net!(mainnet, include_mainnet_file);
-const TOLEDO: HardcodedNet = define_net!(toledo, include_toledo_file);
 const PRATER: HardcodedNet = define_net!(prater, include_prater_file);

-const HARDCODED_NETS: &[HardcodedNet] =
-    &[ALTONA, MEDALLA, SPADINA, PYRMONT, MAINNET, TOLEDO, PRATER];
+const HARDCODED_NETS: &[HardcodedNet] = &[PYRMONT, MAINNET, PRATER];
 pub const DEFAULT_HARDCODED_NETWORK: &str = "mainnet";

 /// Specifies an Eth2 network.
@@ -60,7 +53,7 @@ pub struct Eth2NetworkConfig {
    pub deposit_contract_deploy_block: u64,
    pub boot_enr: Option<Vec<Enr<CombinedKey>>>,
    pub genesis_state_bytes: Option<Vec<u8>>,
-    pub yaml_config: Option<YamlConfig>,
+    pub config: Config,
 }

 impl Eth2NetworkConfig {
@@ -85,24 +78,17 @@ impl Eth2NetworkConfig {
            ),
            genesis_state_bytes: Some(net.genesis_state_bytes.to_vec())
                .filter(|bytes| !bytes.is_empty()),
-            yaml_config: Some(
-                serde_yaml::from_reader(net.yaml_config)
-                    .map_err(|e| format!("Unable to parse yaml config: {:?}", e))?,
-            ),
+            config: serde_yaml::from_reader(net.config)
+                .map_err(|e| format!("Unable to parse yaml config: {:?}", e))?,
        })
    }

    /// Returns an identifier that should be used for selecting an `EthSpec` instance for this
    /// network configuration.
    pub fn eth_spec_id(&self) -> Result<EthSpecId, String> {
-        self.yaml_config
-            .as_ref()
-            .ok_or_else(|| "YAML specification file missing".to_string())
-            .and_then(|config| {
-                config
-                    .eth_spec_id()
-                    .ok_or_else(|| format!("Unknown CONFIG_NAME: {}", config.config_name))
-            })
+        self.config
+            .eth_spec_id()
+            .ok_or_else(|| "Config does not match any known preset".to_string())
    }

    /// Returns `true` if this configuration contains a `BeaconState`.
@@ -110,14 +96,25 @@ impl Eth2NetworkConfig {
        self.genesis_state_bytes.is_some()
    }

+    /// Construct a consolidated `ChainSpec` from the YAML config.
+    pub fn chain_spec<E: EthSpec>(&self) -> Result<ChainSpec, String> {
+        ChainSpec::from_config::<E>(&self.config).ok_or_else(|| {
+            format!(
+                "YAML configuration incompatible with spec constants for {}",
+                E::spec_name()
+            )
+        })
+    }
+
    /// Attempts to deserialize `self.beacon_state`, returning an error if it's missing or invalid.
    pub fn beacon_state<E: EthSpec>(&self) -> Result<BeaconState<E>, String> {
+        let spec = self.chain_spec::<E>()?;
        let genesis_state_bytes = self
            .genesis_state_bytes
            .as_ref()
            .ok_or("Genesis state is unknown")?;

-        BeaconState::from_ssz_bytes(genesis_state_bytes)
+        BeaconState::from_ssz_bytes(genesis_state_bytes, &spec)
            .map_err(|e| format!("Genesis state SSZ bytes are invalid: {:?}", e))
    }

@@ -167,9 +164,7 @@ impl Eth2NetworkConfig {
            write_to_yaml_file!(BOOT_ENR_FILE, boot_enr);
        }

-        if let Some(yaml_config) = &self.yaml_config {
-            write_to_yaml_file!(YAML_CONFIG_FILE, yaml_config);
-        }
+        write_to_yaml_file!(BASE_CONFIG_FILE, &self.config);

        // The genesis state is a special case because it uses SSZ, not YAML.
        if let Some(genesis_state_bytes) = &self.genesis_state_bytes {
@@ -210,7 +205,7 @@ impl Eth2NetworkConfig {

        let deposit_contract_deploy_block = load_from_file!(DEPLOY_BLOCK_FILE);
        let boot_enr = optional_load_from_file!(BOOT_ENR_FILE);
-        let yaml_config = optional_load_from_file!(YAML_CONFIG_FILE);
+        let config = load_from_file!(BASE_CONFIG_FILE);

        // The genesis state is a special case because it uses SSZ, not YAML.
        let genesis_file_path = base_dir.join(GENESIS_STATE_FILE);
@@ -232,7 +227,7 @@ impl Eth2NetworkConfig {
            deposit_contract_deploy_block,
            boot_enr,
            genesis_state_bytes,
-            yaml_config,
+            config,
        })
    }
 }
@@ -242,9 +237,16 @@ mod tests {
    use super::*;
    use ssz::Encode;
    use tempfile::Builder as TempBuilder;
-    use types::{Eth1Data, Hash256, MainnetEthSpec, V012LegacyEthSpec, YamlConfig};
+    use types::{Config, Eth1Data, Hash256, MainnetEthSpec};

-    type E = V012LegacyEthSpec;
+    type E = MainnetEthSpec;
+
+    #[test]
+    fn mainnet_config_eq_chain_spec() {
+        let config = Eth2NetworkConfig::from_hardcoded_net(&MAINNET).unwrap();
+        let spec = ChainSpec::mainnet();
+        assert_eq!(spec, config.chain_spec::<E>().unwrap());
+    }

    #[test]
    fn hard_coded_nets_work() {
@@ -252,27 +254,8 @@ mod tests {
            let config = Eth2NetworkConfig::from_hardcoded_net(net)
                .unwrap_or_else(|_| panic!("{:?}", net.name));

-            if net.name == "mainnet"
-                || net.name == "toledo"
-                || net.name == "pyrmont"
-                || net.name == "prater"
-            {
-                // Ensure we can parse the YAML config to a chain spec.
-                config
-                    .yaml_config
-                    .as_ref()
-                    .unwrap()
-                    .apply_to_chain_spec::<MainnetEthSpec>(&E::default_spec())
-                    .unwrap();
-            } else {
-                // Ensure we can parse the YAML config to a chain spec.
-                config
-                    .yaml_config
-                    .as_ref()
-                    .unwrap()
-                    .apply_to_chain_spec::<V012LegacyEthSpec>(&E::default_spec())
-                    .unwrap();
-            }
+            // Ensure we can parse the YAML config to a chain spec.
+            config.chain_spec::<MainnetEthSpec>().unwrap();

            assert_eq!(
                config.genesis_state_bytes.is_some(),
@@ -296,16 +279,16 @@ mod tests {
        // TODO: figure out how to generate ENR and add some here.
        let boot_enr = None;
        let genesis_state = Some(BeaconState::new(42, eth1_data, spec));
-        let yaml_config = Some(YamlConfig::from_spec::<E>(spec));
+        let config = Config::from_chain_spec::<E>(spec);

-        do_test::<E>(boot_enr, genesis_state, yaml_config);
-        do_test::<E>(None, None, None);
+        do_test::<E>(boot_enr, genesis_state, config.clone());
+        do_test::<E>(None, None, config);
    }

    fn do_test<E: EthSpec>(
        boot_enr: Option<Vec<Enr<CombinedKey>>>,
        genesis_state: Option<BeaconState<E>>,
-        yaml_config: Option<YamlConfig>,
+        config: Config,
    ) {
        let temp_dir = TempBuilder::new()
            .prefix("eth2_testnet_test")
@@ -318,7 +301,7 @@ mod tests {
            deposit_contract_deploy_block,
            boot_enr,
            genesis_state_bytes: genesis_state.as_ref().map(Encode::as_ssz_bytes),
-            yaml_config,
+            config,
        };

        testnet
--- a/common/fallback/Cargo.toml
+++ b/common/fallback/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [dependencies]
-itertools = "0.9.0"
+itertools = "0.10.0"