Update to LH v5.2.0

Cargo.toml

@@ -32,3 +32,4 @@ hmac = "0.12.1"
 sha2 = "0.10.7"
 toml = "0.8.0"
 hex = "0.4.3"
+async-channel = "1.9.0"

src/main.rs

@@ -23,7 +23,6 @@ use execution_layer::http::{
     ENGINE_GET_PAYLOAD_V3, ENGINE_NEW_PAYLOAD_V1, ENGINE_NEW_PAYLOAD_V2, ENGINE_NEW_PAYLOAD_V3,
     ETH_SYNCING,
 };
-use futures::channel::mpsc::channel;
 use slog::Logger;
 use std::net::SocketAddr;
 use std::sync::Arc;
@@ -90,9 +89,9 @@ struct AppState {
 // TODO: do something with signal/signal_rx
 async fn new_task_executor(log: Logger) -> TaskExecutor {
     let handle = Handle::current();
-    let (_signal, exit) = exit_future::signal();
-    let (signal_tx, _signal_rx) = channel(1);
-    TaskExecutor::new(handle, exit, log, signal_tx)
+    let (_signal, exit) = async_channel::bounded(1);
+    let (shutdown_tx, _) = futures::channel::mpsc::channel(1);
+    TaskExecutor::new(handle, exit, log, shutdown_tx)
 }
 
 async fn handle_client_json_rpc(

src/new_payload.rs

@@ -3,8 +3,8 @@ use crate::{
     multiplexer::{Multiplexer, NewPayloadCacheEntry},
     types::{
         ErrorResponse, JsonExecutionPayload, JsonPayloadStatusV1, JsonPayloadStatusV1Status,
-        JsonValue, NewPayloadRequest, NewPayloadRequestCapella, NewPayloadRequestDeneb,
-        NewPayloadRequestMerge, QuantityU64, Request, Response,
+        JsonValue, NewPayloadRequest, NewPayloadRequestBellatrix, NewPayloadRequestCapella,
+        NewPayloadRequestDeneb, QuantityU64, Request, Response,
     },
 };
 use eth2::types::{
@@ -156,8 +156,8 @@ impl<E: EthSpec> Multiplexer<E> {
         parent_beacon_block_root: Option<Hash256>,
     ) -> NewPayloadRequest<E> {
         match execution_payload {
-            ExecutionPayload::Merge(execution_payload) => {
-                NewPayloadRequest::Merge(NewPayloadRequestMerge { execution_payload })
+            ExecutionPayload::Bellatrix(execution_payload) => {
+                NewPayloadRequest::Bellatrix(NewPayloadRequestBellatrix { execution_payload })
             }
             ExecutionPayload::Capella(execution_payload) => {
                 NewPayloadRequest::Capella(NewPayloadRequestCapella { execution_payload })
@@ -172,6 +172,8 @@ impl<E: EthSpec> Multiplexer<E> {
                     parent_beacon_block_root: parent_beacon_block_root.unwrap_or_default(),
                 })
             }
+            // TODO: Electra
+            ExecutionPayload::Electra(_) => todo!("Electra"),
         }
     }
 
@@ -234,7 +236,7 @@ impl<E: EthSpec> Multiplexer<E> {
 
         let fork_name = self.spec.fork_name_at_slot::<E>(slot);
 
-        let payload = if method == ENGINE_NEW_PAYLOAD_V1 || fork_name == ForkName::Merge {
+        let payload = if method == ENGINE_NEW_PAYLOAD_V1 || fork_name == ForkName::Bellatrix {
             serde_json::from_value(payload_json).map(JsonExecutionPayload::V1)
         } else if method == ENGINE_NEW_PAYLOAD_V2 || fork_name == ForkName::Capella {
             serde_json::from_value(payload_json).map(JsonExecutionPayload::V2)

src/payload_builder.rs

@@ -8,8 +8,8 @@ use crate::{
     ErrorResponse, Multiplexer, Request, Response,
 };
 use eth2::types::{
-    BlobsBundle, EthSpec, ExecutionBlockHash, ExecutionPayload, ExecutionPayloadCapella,
-    ExecutionPayloadDeneb, ExecutionPayloadMerge, FixedVector, ForkName, Hash256, Uint256,
+    BlobsBundle, EthSpec, ExecutionBlockHash, ExecutionPayload, ExecutionPayloadBellatrix,
+    ExecutionPayloadCapella, ExecutionPayloadDeneb, FixedVector, ForkName, Hash256, Uint256,
     Unsigned, VariableList,
 };
 use execution_layer::{calculate_execution_block_hash, PayloadAttributes};
@@ -113,7 +113,7 @@ impl<E: EthSpec> Multiplexer<E> {
         let block_hash = ExecutionBlockHash::zero();
 
         let mut payload = match fork_name {
-            ForkName::Merge => ExecutionPayload::Merge(ExecutionPayloadMerge {
+            ForkName::Bellatrix => ExecutionPayload::Bellatrix(ExecutionPayloadBellatrix {
                 parent_hash,
                 fee_recipient,
                 state_root,
@@ -179,6 +179,8 @@ impl<E: EthSpec> Multiplexer<E> {
                     excess_blob_gas,
                 })
             }
+            // TODO: support Electra
+            ForkName::Electra => todo!(),
             ForkName::Base | ForkName::Altair => return Err(format!("invalid fork: {fork_name}")),
         };
 
@@ -281,6 +283,10 @@ impl<E: EthSpec> Multiplexer<E> {
                     },
                 )
             }
+            // TODO: Electra support
+            JsonExecutionPayload::V4(_) => {
+                todo!("Electra")
+            }
         }
     }
 }

src/types.rs

@@ -12,7 +12,8 @@ pub use execution_layer::{
         JsonPayloadAttributes, JsonPayloadAttributesV2, JsonPayloadStatusV1,
         JsonPayloadStatusV1Status, TransparentJsonPayloadId,
     },
-    NewPayloadRequest, NewPayloadRequestCapella, NewPayloadRequestDeneb, NewPayloadRequestMerge,
+    NewPayloadRequest, NewPayloadRequestBellatrix, NewPayloadRequestCapella,
+    NewPayloadRequestDeneb,
 };
 pub use serde_json::Value as JsonValue;
 pub use task_executor::TaskExecutor;