Partially implement --terminal-block-hash-override

beacon_node/client/src/builder.rs

@@ -150,12 +150,16 @@ where
         let terminal_total_difficulty = config
             .terminal_total_difficulty_override
             .unwrap_or(spec.terminal_total_difficulty);
+        let terminal_block_hash = config
+            .terminal_block_hash
+            .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(),

beacon_node/client/src/config.rs

@@ -4,7 +4,7 @@ use sensitive_url::SensitiveUrl;
 use serde_derive::{Deserialize, Serialize};
 use std::fs;
 use std::path::PathBuf;
-use types::{Address, Graffiti, PublicKeyBytes, Uint256};
+use types::{Address, Graffiti, Hash256, PublicKeyBytes, Uint256};
 
 /// Default directory name for the freezer database under the top-level data dir.
 const DEFAULT_FREEZER_DB_DIR: &str = "freezer_db";
@@ -76,6 +76,7 @@ pub struct Config {
     pub eth1: eth1::Config,
     pub execution_endpoints: Option<Vec<SensitiveUrl>>,
     pub terminal_total_difficulty_override: Option<Uint256>,
+    pub terminal_block_hash: Option<Hash256>,
     pub fee_recipient: Option<Address>,
     pub http_api: http_api::Config,
     pub http_metrics: http_metrics::Config,
@@ -99,6 +100,7 @@ impl Default for Config {
             eth1: <_>::default(),
             execution_endpoints: None,
             terminal_total_difficulty_override: None,
+            terminal_block_hash: None,
             fee_recipient: None,
             disabled_forks: Vec::new(),
             graffiti: Graffiti::default(),