feat: require execution rpc (#49)

cli/src/main.rs

@@ -46,14 +46,12 @@ fn get_config() -> Config {
         None => get_cached_checkpoint(&data_dir).unwrap_or(config.general.checkpoint),
     };
 
+    config.general.execution_rpc = Some(cli.execution_rpc);
+
     if let Some(port) = cli.port {
         config.general.rpc_port = Some(port);
     }
 
-    if let Some(execution_rpc) = cli.execution_rpc {
-        config.general.execution_rpc = execution_rpc;
-    }
-
     if let Some(consensus_rpc) = cli.consensus_rpc {
         config.general.consensus_rpc = consensus_rpc;
     }
@@ -94,7 +92,7 @@ struct Cli {
     #[clap(short = 'w', long)]
     checkpoint: Option<String>,
     #[clap(short, long)]
-    execution_rpc: Option<String>,
+    execution_rpc: String,
     #[clap(short, long)]
     consensus_rpc: Option<String>,
     #[clap(long)]

client/src/node.rs

@@ -31,7 +31,7 @@ impl Node {
 
         let consensus =
             ConsensusClient::new(consensus_rpc, checkpoint_hash, config.clone()).await?;
-        let execution = ExecutionClient::new(execution_rpc)?;
+        let execution = ExecutionClient::new(execution_rpc.as_ref().unwrap())?;
 
         let payloads = BTreeMap::new();
         let finalized_payloads = BTreeMap::new();

config/src/lib.rs

@@ -26,7 +26,7 @@ pub struct General {
     #[serde(deserialize_with = "bytes_deserialize")]
     pub checkpoint: Vec<u8>,
     pub consensus_rpc: String,
-    pub execution_rpc: String,
+    pub execution_rpc: Option<String>,
     pub rpc_port: Option<u16>,
 }
 

config/src/networks.rs

@@ -16,8 +16,7 @@ pub fn mainnet() -> Config {
             )
             .unwrap(),
             consensus_rpc: "http://testing.mainnet.beacon-api.nimbus.team".to_string(),
-            execution_rpc: "https://eth-mainnet.g.alchemy.com/v2/Q0BqQPbTQfSMzrCNl4x80XS_PLLB1RNf"
-                .to_string(),
+            execution_rpc: None,
             rpc_port: Some(8545),
         },
         forks: Forks {
@@ -52,9 +51,7 @@ pub fn goerli() -> Config {
             )
             .unwrap(),
             consensus_rpc: "http://34.207.158.131:5052".to_string(),
-            execution_rpc:
-                "https://eth-goerli.g.alchemy.com:443/v2/o_8Qa9kgwDPf9G8sroyQ-uQtyhyWa3ao"
-                    .to_string(),
+            execution_rpc: None,
             rpc_port: Some(8545),
         },
         forks: Forks {