fix: address PR concerns

Author: KolbyML

bin/e2hs-writer/src/reader.rs

@@ -25,7 +25,6 @@ use trin_execution::era::beacon::decode_transactions;
 use trin_validation::{
     accumulator::PreMergeAccumulator,
     constants::{CANCUN_BLOCK_NUMBER, EPOCH_SIZE, MERGE_BLOCK_NUMBER, SHANGHAI_BLOCK_NUMBER},
-    header_validator::HeaderValidator,
 };
 use url::Url;
 
@@ -73,7 +72,7 @@ impl EpochReader {
             true => Some(Arc::new(
                 lookup_epoch_acc(
                     epoch_index,
-                    &HeaderValidator::default().pre_merge_acc,
+                    &PreMergeAccumulator::default(),
                     &epoch_acc_path,
                 )
                 .await?,

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

@@ -98,7 +98,7 @@ impl E2HSBridge {
         Ok(Self {
             gossiper,
             block_semaphore,
-            header_validator: HeaderValidator::default(),
+            header_validator: HeaderValidator::new_without_historical_summaries(),
             block_range,
             random_fill,
             e2hs_files,

crates/validation/src/header_validator.rs

@@ -20,15 +20,14 @@ use crate::{
     oracle::HeaderOracle,
 };
 
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Clone)]
 pub enum HistoricalSummariesProvider {
     /// The historical summaries are provided by the header oracle.
     HeaderOracle(Arc<RwLock<HeaderOracle>>),
     /// The historical summaries are provided by passed historical summaries.
     HistoricalSummaries(HistoricalSummaries),
     /// We don't have historical summaries, for example the E2HS bridge doesn't use a provider and
     /// hence can't get HistoricalSummaries. HistoricalSummary proof validation will fail.
-    #[default]
     None,
 }
 
@@ -64,9 +63,7 @@ impl HistoricalSummariesProvider {
 
 /// HeaderValidator is responsible for validating pre-merge and post-merge headers with their
 /// respective proofs.
-///
-/// Default can only be used for validating pre-capella headers.
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone)]
 pub struct HeaderValidator {
     /// Pre-merge accumulator used to validate pre-merge headers.
     pub pre_merge_acc: PreMergeAccumulator,
@@ -78,16 +75,21 @@ pub struct HeaderValidator {
 
 impl HeaderValidator {
     pub fn new(historical_summaries_provider: HistoricalSummariesProvider) -> Self {
-        let pre_merge_acc = PreMergeAccumulator::default();
-        let historical_roots_acc = HistoricalRootsAccumulator::default();
-
         Self {
-            pre_merge_acc,
-            historical_roots_acc,
+            pre_merge_acc: PreMergeAccumulator::default(),
+            historical_roots_acc: HistoricalRootsAccumulator::default(),
             historical_summaries_provider,
         }
     }
 
+    pub fn new_without_historical_summaries() -> Self {
+        Self {
+            pre_merge_acc: PreMergeAccumulator::default(),
+            historical_roots_acc: HistoricalRootsAccumulator::default(),
+            historical_summaries_provider: HistoricalSummariesProvider::None,
+        }
+    }
+
     pub async fn validate_header_with_proof(
         &self,
         header_with_proof: &HeaderWithProof,
@@ -152,7 +154,7 @@ impl HeaderValidator {
             ));
         }
 
-        // Verify the chain of proofs for post-merge/pre-capella block header
+        // Verify the chain of proofs for post-capella block header
         Self::verify_beacon_block_proof(
             header_hash,
             &proof.execution_block_proof,
@@ -347,7 +349,7 @@ mod test {
             header,
             proof: BlockHeaderProof::HistoricalHashes(trin_proof),
         };
-        HeaderValidator::default()
+        HeaderValidator::new_without_historical_summaries()
             .validate_header_with_proof(&header_with_proof)
             .await
             .unwrap();
@@ -372,7 +374,7 @@ mod test {
             header,
             proof: BlockHeaderProof::HistoricalHashes(proof),
         };
-        HeaderValidator::default()
+        HeaderValidator::new_without_historical_summaries()
             .validate_header_with_proof(&header_with_proof)
             .await
             .unwrap();
@@ -401,7 +403,7 @@ mod test {
             header,
             proof: BlockHeaderProof::HistoricalHashes(proof),
         };
-        assert!(HeaderValidator::default()
+        assert!(HeaderValidator::new_without_historical_summaries()
             .validate_header_with_proof(&header_with_proof)
             .await
             .unwrap_err()
@@ -418,7 +420,7 @@ mod test {
             header: future_header,
             proof: BlockHeaderProof::HistoricalHashes(Default::default()),
         };
-        HeaderValidator::default()
+        HeaderValidator::new_without_historical_summaries()
             .validate_header_with_proof(&future_hwp)
             .await
             .unwrap();
@@ -441,7 +443,7 @@ mod test {
         let historical_roots_block_proof: BlockProofHistoricalRoots =
             serde_yaml::from_value(value).unwrap();
 
-        let header_validator = HeaderValidator::default();
+        let header_validator = HeaderValidator::new_without_historical_summaries();
         header_validator
             .verify_historical_roots(block_number, header_hash, &historical_roots_block_proof)
             .unwrap();
@@ -552,7 +554,9 @@ mod test {
     #[tokio::test]
     async fn header_oracle_bootstraps_with_default_pre_merge_acc() {
         assert_eq!(
-            HeaderValidator::default().pre_merge_acc.tree_hash_root(),
+            HeaderValidator::new_without_historical_summaries()
+                .pre_merge_acc
+                .tree_hash_root(),
             B256::from_str(DEFAULT_PRE_MERGE_ACC_HASH).unwrap(),
         );
     }

crates/validation/src/oracle.rs

@@ -222,18 +222,16 @@ impl HeaderOracle {
         tx.send(request)?;
 
         let content = match resp_rx.recv().await {
-            Some(val) => {
-                val.map_err(|err| anyhow!("Chain history subnetwork request error: {err:?}"))?
-            }
-            None => return Err(anyhow!("No response from chain history subnetwork")),
+            Some(val) => val.map_err(|err| anyhow!("Beacon subnetwork request error: {err:?}"))?,
+            None => return Err(anyhow!("No response from Beacon subnetwork")),
         };
         let content: Bytes = serde_json::from_value(content)?;
         let content: BeaconContentValue = BeaconContentValue::decode(&content_key, &content)?;
 
         match content {
             BeaconContentValue::HistoricalSummariesWithProof(content) => Ok(content.historical_summaries_with_proof.historical_summaries),
             _ => Err(anyhow!(
-                "Invalid HistoryContentValue received from HeaderWithProof lookup, expected BlockHeaderWithProof: {content:?}"
+                "Invalid BeaconContentValue received from HistoricalSummaries local_content, expected HistoricalSummariesWithProof: {content:?}"
             )),
         }
     }