[Merge] Implement execution_layer (#2635)

* Checkout serde_utils from rayonism * Make eth1::http functions pub * Add bones of execution_layer * Modify decoding * Expose Transaction, cargo fmt * Add executePayload * Add all minimal spec endpoints * Start adding json rpc wrapper * Finish custom JSON response handler * Switch to new rpc sending method * Add first test * Fix camelCase * Finish adding tests * Begin threading execution layer into BeaconChain * Fix clippy lints * Fix clippy lints * Thread execution layer into ClientBuilder * Add CLI flags * Add block processing methods to ExecutionLayer * Add block_on to execution_layer * Integrate execute_payload * Add extra_data field * Begin implementing payload handle * Send consensus valid/invalid messages * Fix minor type in task_executor * Call forkchoiceUpdated * Add search for TTD block * Thread TTD into execution layer * Allow producing block with execution payload * Add LRU cache for execution blocks * Remove duplicate 0x on ssz_types serialization * Add tests for block getter methods * Add basic block generator impl * Add is_valid_terminal_block to EL * Verify merge block in block_verification * Partially implement --terminal-block-hash-override * Add terminal_block_hash to ChainSpec * Remove Option from terminal_block_hash in EL * Revert merge changes to consensus/fork_choice * Remove commented-out code * Add bones for handling RPC methods on test server * Add first ExecutionLayer tests * Add testing for finding terminal block * Prevent infinite loops * Add insert_merge_block to block gen * Add block gen test for pos blocks * Start adding payloads to block gen * Fix clippy lints * Add execution payload to block gen * Add execute_payload to block_gen * Refactor block gen * Add all routes to mock server * Use Uint256 for base_fee_per_gas * Add working execution chain build * Remove unused var * Revert "Use Uint256 for base_fee_per_gas" This reverts commit 6c88f19ac4. * Fix base_fee_for_gas Uint256 * Update execute payload handle * Improve testing, fix bugs * Fix default fee-recipient * Fix fee-recipient address (again) * Add check for terminal block, add comments, tidy * Apply suggestions from code review Co-authored-by: realbigsean <seananderson33@GMAIL.com> * Fix is_none on handle Drop * Remove commented-out tests Co-authored-by: realbigsean <seananderson33@GMAIL.com>
2026-04-30 19:23:50 +00:00 · 2021-09-30 08:14:15 +10:00
parent 1563bce905
commit d8623cfc4f
38 changed files with 3239 additions and 114 deletions
--- a/beacon_node/src/config.rs
+++ b/beacon_node/src/config.rs
@@ -232,6 +232,35 @@ pub fn get_config<E: EthSpec>(
        client_config.eth1.purge_cache = true;
    }

+    if let Some(endpoints) = cli_args.value_of("execution-endpoints") {
+        client_config.sync_eth1_chain = true;
+        client_config.execution_endpoints = endpoints
+            .split(',')
+            .map(|s| SensitiveUrl::parse(s))
+            .collect::<Result<_, _>>()
+            .map(Some)
+            .map_err(|e| format!("execution-endpoints contains an invalid URL {:?}", e))?;
+    } else if cli_args.is_present("merge") {
+        client_config.execution_endpoints = Some(client_config.eth1.endpoints.clone());
+    }
+
+    if let Some(terminal_total_difficulty) =
+        clap_utils::parse_optional(cli_args, "total-terminal-difficulty-override")?
+    {
+        if client_config.execution_endpoints.is_none() {
+            return Err(
+                "The --merge flag must be provided when using --total-terminal-difficulty-override"
+                    .into(),
+            );
+        }
+
+        client_config.terminal_total_difficulty_override = Some(terminal_total_difficulty);
+    }
+
+    client_config.fee_recipient = clap_utils::parse_optional(cli_args, "fee-recipient")?;
+    client_config.terminal_block_hash =
+        clap_utils::parse_optional(cli_args, "terminal-block-hash")?;
+
    if let Some(freezer_dir) = cli_args.value_of("freezer-dir") {
        client_config.freezer_db_path = Some(PathBuf::from(freezer_dir));
    }