refactor(lighthouse_facade): update dependencies and restructure project

- Removed the deprecated `lighthouse_wrapper` crate and replaced it with `lighthouse_facade` for improved architecture.
- Updated various dependencies in `Cargo.lock` to their latest versions, including `bitflags`, `parking_lot`, `tokio-util`, and `syn`.
- Adjusted `Cargo.toml` files to reflect the new structure and removed references to obsolete crates.
- Enhanced the application code to utilize the new `lighthouse_facade` crate, ensuring compatibility with the updated dependencies.
- Added a new documentation file outlining the upgrade implementation plan for future reference.

These changes streamline the codebase, improve maintainability, and prepare for upcoming enhancements.

Author: michaelgpt

Cargo.lock

@@ -2,9 +2,7 @@
 members = [
     "app", 
 
-    "crates/lighthouse_wrapper", 
-    "crates/lighthouse_wrapper_v2",
-    "crates/lighthouse_compat",
+    "crates/lighthouse_facade",
     "crates/miner",
     "crates/actor_system",
     "tests"

Cargo.toml

@@ -17,13 +17,9 @@ edition = "2021"
 #store = { git = "https://github.com/sigp/lighthouse", rev = "441fc16" }
 #bls = { git = "https://github.com/sigp/lighthouse", rev = "441fc16" }
 
-lighthouse_wrapper = { package = "lighthouse_wrapper", path = "../crates/lighthouse_wrapper" }
-
-
-
 # workspace
 actor_system = { path = "../crates/actor_system" }
-lighthouse_wrapper_v2 = { path = "../crates/lighthouse_wrapper_v2" }
+lighthouse_facade = { path = "../crates/lighthouse_facade" }
 
 # misc
 clap = { workspace = true }
@@ -114,7 +110,7 @@ bincode = "1.3"     # Fast serialization for network messages
 wide = { version = "0.7", features = ["std"], optional = true }
 
 [dependencies.libp2p]
-version = "0.53"
+version = "0.54"
 default-features = false
 features = ["identify", "yamux", "mdns", "noise", "gossipsub", "dns", "tcp", "tokio", "plaintext", "secp256k1", "macros", "ecdsa", "quic","kad", "request-response", "ping"]
 

app/Cargo.toml

@@ -9,7 +9,7 @@ use actix::prelude::*;
 use tracing::*;
 
 use bitcoin::CompactTarget;
-use lighthouse_wrapper::types::{MainnetEthSpec, Uint256 as U256};
+use lighthouse_facade::types::{MainnetEthSpec, Uint256 as U256};
 use rust_decimal::prelude::*;
 
 use crate::{

app/src/actors/auxpow/difficulty.rs

@@ -7,7 +7,7 @@
 use std::time::Duration;
 use actor_system::SupervisionConfig;
 use super::state::FederationConfig;
-use lighthouse_wrapper::bls::SecretKey;
+use lighthouse_facade::bls::SecretKey;
 
 /// Configuration for ChainActor behavior and performance
 #[derive(Debug, Clone)]

app/src/actors/chain/config.rs

@@ -9,13 +9,13 @@ use tokio::sync::RwLock;
 use tracing::*;
 use serde::{Deserialize, Serialize};
 
-use lighthouse_wrapper::execution_layer::{
+use lighthouse_facade::execution_layer::{
     auth::{Auth, JwtKey},
     HttpJsonRpc, BlockByNumberQuery, ForkchoiceState, PayloadAttributes,
     DEFAULT_EXECUTION_ENDPOINT, LATEST_TAG,
 };
-use lighthouse_wrapper::sensitive_url::SensitiveUrl;
-use lighthouse_wrapper::types::{Address, ExecutionBlockHash, ExecutionPayload, MainnetEthSpec};
+use lighthouse_facade::sensitive_url::SensitiveUrl;
+use lighthouse_facade::types::{Address, ExecutionBlockHash, ExecutionPayload, MainnetEthSpec};
 
 use crate::types::*;
 use super::{config::EngineConfig, state::ClientHealthStatus, EngineError, EngineResult, ClientError};
@@ -355,19 +355,19 @@ impl ExecutionClient {
         // Get network ID
         let network_id = client.rpc_request::<String>("net_version", serde_json::Value::Null, Duration::from_secs(5))
             .await
-            .and_then(|s| s.parse::<u64>().map_err(|_| lighthouse_wrapper::execution_layer::Error::InvalidPayloadBody("Invalid network ID".to_string())))
+            .and_then(|s| s.parse::<u64>().map_err(|_| lighthouse_facade::execution_layer::Error::InvalidPayloadBody("Invalid network ID".to_string())))
             .unwrap_or(0);
 
         // Get chain ID
         let chain_id = client.rpc_request::<String>("eth_chainId", serde_json::Value::Null, Duration::from_secs(5))
             .await
-            .and_then(|s| u64::from_str_radix(s.trim_start_matches("0x"), 16).map_err(|_| lighthouse_wrapper::execution_layer::Error::InvalidPayloadBody("Invalid chain ID".to_string())))
+            .and_then(|s| u64::from_str_radix(s.trim_start_matches("0x"), 16).map_err(|_| lighthouse_facade::execution_layer::Error::InvalidPayloadBody("Invalid chain ID".to_string())))
             .unwrap_or(0);
 
         // Get latest block number
         let latest_block = client.rpc_request::<String>("eth_blockNumber", serde_json::Value::Null, Duration::from_secs(5))
             .await
-            .and_then(|s| u64::from_str_radix(s.trim_start_matches("0x"), 16).map_err(|_| lighthouse_wrapper::execution_layer::Error::InvalidPayloadBody("Invalid block number".to_string())))
+            .and_then(|s| u64::from_str_radix(s.trim_start_matches("0x"), 16).map_err(|_| lighthouse_facade::execution_layer::Error::InvalidPayloadBody("Invalid block number".to_string())))
             .unwrap_or(0);
 
         // Check sync status

app/src/actors/engine/client.rs

@@ -11,17 +11,17 @@ use tokio::sync::RwLock;
 use tokio::time::sleep;
 use tracing::{debug, info, trace, warn};
 
-use lighthouse_wrapper::execution_layer::{
+use lighthouse_facade::execution_layer::{
     auth::{Auth, JwtKey},
     BlockByNumberQuery, ExecutionBlockWithTransactions, ForkchoiceState, HttpJsonRpc,
     PayloadAttributes, DEFAULT_EXECUTION_ENDPOINT, LATEST_TAG,
 };
-use lighthouse_wrapper::sensitive_url::SensitiveUrl;
-use lighthouse_wrapper::types::{
+use lighthouse_facade::sensitive_url::SensitiveUrl;
+use lighthouse_facade::types::{
     Address, ExecutionBlockHash, ExecutionPayload, ExecutionPayloadCapella, MainnetEthSpec,
     Uint256, Withdrawal,
 };
-use lighthouse_wrapper::{execution_layer, types};
+use lighthouse_facade::{execution_layer, types};
 use serde_json::json;
 use ssz_types::VariableList;
 

app/src/actors/engine/engine.rs

@@ -7,8 +7,8 @@ use std::time::{Duration, Instant};
 use tracing::*;
 use actix::prelude::*;
 
-use lighthouse_wrapper::execution_layer::ForkchoiceState;
-use lighthouse_wrapper::types::{Address, MainnetEthSpec};
+use lighthouse_facade::execution_layer::ForkchoiceState;
+use lighthouse_facade::types::{Address, MainnetEthSpec};
 
 use crate::types::*;
 use super::super::{
@@ -56,7 +56,7 @@ impl Handler<ForkchoiceUpdatedMessage> for EngineActor {
 
             // Convert payload attributes if provided
             let payload_attributes = msg.payload_attributes.map(|attrs| {
-                lighthouse_wrapper::execution_layer::PayloadAttributes::new(
+                lighthouse_facade::execution_layer::PayloadAttributes::new(
                     attrs.timestamp,
                     attrs.prev_randao,
                     attrs.suggested_fee_recipient,
@@ -145,9 +145,9 @@ impl Handler<SetFinalizedBlockMessage> for EngineActor {
 
 /// Convert lighthouse payload status to our format
 fn convert_payload_status(
-    status: lighthouse_wrapper::execution_layer::PayloadStatus
+    status: lighthouse_facade::execution_layer::PayloadStatus
 ) -> PayloadStatusType {
-    use lighthouse_wrapper::execution_layer::PayloadStatus;
+    use lighthouse_facade::execution_layer::PayloadStatus;
 
     match status {
         PayloadStatus::Valid => PayloadStatusType::Valid,

app/src/actors/engine/handlers/forkchoice_handlers.rs

@@ -9,7 +9,7 @@ use actix::prelude::*;
 use tracing_test::traced_test;
 use rand::{Rng, thread_rng};
 
-use lighthouse_wrapper::types::{Hash256, Address};
+use lighthouse_facade::types::{Hash256, Address};
 
 use crate::types::*;
 use super::super::{

app/src/actors/engine/tests/chaos.rs

@@ -4,8 +4,8 @@
 
 use std::time::{Duration, SystemTime};
 use actix::prelude::*;
-use lighthouse_wrapper::types::{Hash256, Address, MainnetEthSpec};
-use lighthouse_wrapper::execution_layer::PayloadAttributes;
+use lighthouse_facade::types::{Hash256, Address, MainnetEthSpec};
+use lighthouse_facade::execution_layer::PayloadAttributes;
 
 use crate::types::*;
 use super::super::{