Ensure difficulty/hash/epoch overrides change the ChainSpec (#2798)

* Unify loading of eth2_network_config

* Apply overrides at lighthouse binary level

* Remove duplicate override values

* Add merge values to existing net configs

* Make override flags global

* Add merge fields to testing config

* Add one to TTD

* Fix failing engine tests

* Fix test compile error

* Remove TTD flags

* Move get_eth2_network_config

* Fix warn

* Address review comments

Author: paulhauner

Cargo.lock

@@ -2893,7 +2893,9 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             let parent_hash;
             if !is_merge_complete(&state) {
                 let terminal_pow_block_hash = execution_layer
-                    .block_on(|execution_layer| execution_layer.get_terminal_pow_block_hash())
+                    .block_on(|execution_layer| {
+                        execution_layer.get_terminal_pow_block_hash(&self.spec)
+                    })
                     .map_err(BlockProductionError::TerminalPoWBlockLookupFailed)?;
 
                 if let Some(terminal_pow_block_hash) = terminal_pow_block_hash {

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -1119,7 +1119,10 @@ impl<'a, T: BeaconChainTypes> FullyVerifiedBlock<'a, T> {
 
             let is_valid_terminal_pow_block = execution_layer
                 .block_on(|execution_layer| {
-                    execution_layer.is_valid_terminal_pow_block_hash(execution_payload.parent_hash)
+                    execution_layer.is_valid_terminal_pow_block_hash(
+                        execution_payload.parent_hash,
+                        &chain.spec,
+                    )
                 })
                 .map_err(ExecutionPayloadError::from)?;
 

beacon_node/beacon_chain/src/block_verification.rs

@@ -330,7 +330,6 @@ where
     }
 
     pub fn execution_layer(mut self, urls: &[&str]) -> Self {
-        let spec = self.spec.clone().expect("cannot build without spec");
         assert!(
             self.execution_layer.is_none(),
             "execution layer already defined"
@@ -345,8 +344,6 @@ where
             .unwrap();
         let execution_layer = ExecutionLayer::from_urls(
             urls,
-            spec.terminal_total_difficulty,
-            spec.terminal_block_hash,
             Some(Address::repeat_byte(42)),
             el_runtime.task_executor.clone(),
             el_runtime.log.clone(),
@@ -364,6 +361,7 @@ where
             spec.terminal_total_difficulty,
             DEFAULT_TERMINAL_BLOCK,
             spec.terminal_block_hash,
+            spec.terminal_block_hash_activation_epoch,
         );
         self.execution_layer = Some(mock.el.clone());
         self.mock_execution_layer = Some(mock);

beacon_node/beacon_chain/src/test_utils.rs

@@ -148,19 +148,10 @@ where
             None
         };
 
-        let terminal_total_difficulty = config
-            .terminal_total_difficulty_override
-            .unwrap_or(spec.terminal_total_difficulty);
-        let terminal_block_hash = config
-            .terminal_block_hash_override
-            .unwrap_or(spec.terminal_block_hash);
-
         let execution_layer = if let Some(execution_endpoints) = config.execution_endpoints {
             let context = runtime_context.service_context("exec".into());
             let execution_layer = ExecutionLayer::from_urls(
                 execution_endpoints,
-                terminal_total_difficulty,
-                terminal_block_hash,
                 config.fee_recipient,
                 context.executor.clone(),
                 context.log().clone(),