feat: enable post-capella HistoricalSummary Header validation

bin/e2hs-writer/src/reader.rs

@@ -76,7 +76,7 @@ impl EpochReader {
             Some(Arc::new(
                 lookup_epoch_acc(
                     epoch_index,
-                    &HeaderValidator::new().pre_merge_acc,
+                    &HeaderValidator::new_without_historical_summaries().pre_merge_acc,
                     &epoch_acc_path,
                 )
                 .await?,

bin/portal-bridge/src/bridge/e2hs.rs

@@ -15,7 +15,9 @@ use e2store::{
 };
 use ethportal_api::{
     types::{
-        execution::header_with_proof::HeaderWithProof, network::Subnetwork, portal_wire::OfferTrace,
+        execution::header_with_proof::{BlockHeaderProof, HeaderWithProof},
+        network::Subnetwork,
+        portal_wire::OfferTrace,
     },
     BlockBody, ContentValue, HistoryContentKey, HistoryContentValue, OverlayContentKey,
     RawContentValue, Receipts,
@@ -95,7 +97,7 @@ impl E2HSBridge {
         Ok(Self {
             gossiper,
             block_semaphore,
-            header_validator: HeaderValidator::new(),
+            header_validator: HeaderValidator::new_without_historical_summaries(),
             block_range,
             random_fill,
             e2hs_files,
@@ -171,7 +173,7 @@ impl E2HSBridge {
                     continue;
                 }
             }
-            if let Err(err) = self.validate_block_tuple(&block_tuple) {
+            if let Err(err) = self.validate_block_tuple(&block_tuple).await {
                 error!("Failed to validate block tuple: {err:?}");
                 continue;
             }
@@ -206,10 +208,19 @@ impl E2HSBridge {
             .unwrap_or_else(|err| panic!("unable to read e2hs file at path: {e2hs_path:?} : {err}"))
     }
 
-    fn validate_block_tuple(&self, block_tuple: &BlockTuple) -> anyhow::Result<()> {
+    async fn validate_block_tuple(&self, block_tuple: &BlockTuple) -> anyhow::Result<()> {
         let header_with_proof = &block_tuple.header_with_proof.header_with_proof;
-        self.header_validator
-            .validate_header_with_proof(header_with_proof)?;
+        // The E2HS bridge doesn't have access to a provider so it can't validate historical summary
+        // Header with Proofs
+        if !matches!(
+            header_with_proof.proof,
+            BlockHeaderProof::HistoricalSummariesCapella(_)
+                | BlockHeaderProof::HistoricalSummariesDeneb(_)
+        ) {
+            self.header_validator
+                .validate_header_with_proof(header_with_proof)
+                .await?;
+        }
         let body = &block_tuple.body.body;
         body.validate_against_header(&header_with_proof.header)?;
         let receipts = &block_tuple.receipts.receipts;

bin/trin/src/run.rs

@@ -2,7 +2,6 @@ use std::{net::SocketAddr, path::PathBuf, sync::Arc};
 
 use ethportal_api::{
     types::{distance::Distance, network::Subnetwork},
-    utils::bytes::hex_encode,
     version::get_trin_version,
 };
 use portalnet::{
@@ -14,7 +13,6 @@ use portalnet::{
 use rpc::{config::RpcConfig, launch_jsonrpc_server, RpcServerHandle};
 use tokio::sync::{mpsc, RwLock};
 use tracing::info;
-use tree_hash::TreeHash;
 use trin_beacon::initialize_beacon_network;
 use trin_history::initialize_history_network;
 use trin_state::initialize_state_network;
@@ -121,12 +119,7 @@ async fn run_trin_internal(
     }
 
     // Initialize validation oracle
-    let header_oracle = HeaderOracle::default();
-    info!(
-        hash_tree_root = %hex_encode(header_oracle.header_validator.pre_merge_acc.tree_hash_root().0),
-        "Loaded pre-merge accumulator."
-    );
-    let header_oracle = Arc::new(RwLock::new(header_oracle));
+    let header_oracle = Arc::new(RwLock::new(HeaderOracle::default()));
 
     // Initialize and spawn uTP socket
     let (utp_talk_reqs_tx, utp_talk_reqs_rx) = mpsc::unbounded_channel();

crates/subnetworks/history/src/validation.rs

@@ -11,18 +11,32 @@ use ethportal_api::{
 };
 use ssz::Decode;
 use tokio::sync::RwLock;
+use tracing::info;
+use tree_hash::TreeHash;
 use trin_validation::{
+    header_validator::{HeaderValidator, HistoricalSummariesProvider, HistoricalSummariesSource},
     oracle::HeaderOracle,
     validator::{ValidationResult, Validator},
 };
 
 pub struct ChainHistoryValidator {
     pub header_oracle: Arc<RwLock<HeaderOracle>>,
+    pub header_validator: HeaderValidator,
 }
 
 impl ChainHistoryValidator {
     pub fn new(header_oracle: Arc<RwLock<HeaderOracle>>) -> Self {
-        Self { header_oracle }
+        let header_validator = HeaderValidator::new(HistoricalSummariesProvider::new(
+            HistoricalSummariesSource::HeaderOracle(header_oracle.clone()),
+        ));
+        info!(
+            hash_tree_root = %header_validator.pre_merge_acc.tree_hash_root(),
+            "Loaded pre-merge accumulator."
+        );
+        Self {
+            header_oracle,
+            header_validator,
+        }
     }
 }
 
@@ -44,11 +58,9 @@ impl Validator<HistoryContentKey> for ChainHistoryValidator {
                     "Content validation failed: Invalid header hash. Found: {header_hash:?} - Expected: {:?}",
                     hex_encode(header_hash)
                 );
-                self.header_oracle
-                    .read()
-                    .await
-                    .header_validator
-                    .validate_header_with_proof(&header_with_proof)?;
+                self.header_validator
+                    .validate_header_with_proof(&header_with_proof)
+                    .await?;
 
                 Ok(ValidationResult::new(true))
             }
@@ -63,11 +75,9 @@ impl Validator<HistoryContentKey> for ChainHistoryValidator {
                     "Content validation failed: Invalid header number. Found: {header_number} - Expected: {}",
                     key.block_number
                 );
-                self.header_oracle
-                    .read()
-                    .await
-                    .header_validator
-                    .validate_header_with_proof(&header_with_proof)?;
+                self.header_validator
+                    .validate_header_with_proof(&header_with_proof)
+                    .await?;
 
                 Ok(ValidationResult::new(true))
             }

crates/validation/Cargo.toml

@@ -26,6 +26,7 @@ serde.workspace = true
 serde_json.workspace = true
 ssz_types.workspace = true
 tokio.workspace = true
+tracing.workspace = true
 tree_hash.workspace = true
 tree_hash_derive.workspace = true