Merge branch 'unstable' into electra-alpha7

beacon_node/execution_layer/src/engine_api.rs

@@ -570,6 +570,7 @@ pub enum ClientCode {
     Lodestar,
     Nethermind,
     Nimbus,
+    TrinExecution,
     Teku,
     Prysm,
     Reth,
@@ -588,6 +589,7 @@ impl std::fmt::Display for ClientCode {
             ClientCode::Lodestar => "LS",
             ClientCode::Nethermind => "NM",
             ClientCode::Nimbus => "NB",
+            ClientCode::TrinExecution => "TE",
             ClientCode::Teku => "TK",
             ClientCode::Prysm => "PM",
             ClientCode::Reth => "RH",
@@ -611,6 +613,7 @@ impl TryFrom<String> for ClientCode {
             "LS" => Ok(Self::Lodestar),
             "NM" => Ok(Self::Nethermind),
             "NB" => Ok(Self::Nimbus),
+            "TE" => Ok(Self::TrinExecution),
             "TK" => Ok(Self::Teku),
             "PM" => Ok(Self::Prysm),
             "RH" => Ok(Self::Reth),

beacon_node/execution_layer/src/metrics.rs

@@ -1,4 +1,4 @@
-pub use lighthouse_metrics::*;
+pub use metrics::*;
 use std::sync::LazyLock;
 
 pub const HIT: &str = "hit";