feat: add Deneb header validation (ethereum#1786)

Author: morph-dev

Cargo.lock

@@ -168,7 +168,7 @@ mod tests {
     }
 
     #[test_log::test(tokio::test)]
-    #[should_panic(expected = "Merkle proof validation failed for pre-merge header")]
+    #[should_panic(expected = "Execution block proof verification failed for pre-Merge header")]
     async fn invalidate_header_by_hash_with_invalid_number() {
         let header_with_proof_ssz = get_header_with_proof_ssz();
         let mut header =
@@ -188,7 +188,7 @@ mod tests {
     }
 
     #[test_log::test(tokio::test)]
-    #[should_panic(expected = "Merkle proof validation failed for pre-merge header")]
+    #[should_panic(expected = "Execution block proof verification failed for pre-Merge header")]
     async fn invalidate_header_by_hash_with_invalid_gaslimit() {
         let header_with_proof_ssz = get_header_with_proof_ssz();
         let mut header =
@@ -224,7 +224,7 @@ mod tests {
     }
 
     #[test_log::test(tokio::test)]
-    #[should_panic(expected = "Merkle proof validation failed for pre-merge header")]
+    #[should_panic(expected = "Execution block proof verification failed for pre-Merge header")]
     async fn invalidate_header_by_number_with_invalid_number() {
         let header_with_proof_ssz = get_header_with_proof_ssz();
         let mut header =
@@ -244,7 +244,7 @@ mod tests {
     }
 
     #[test_log::test(tokio::test)]
-    #[should_panic(expected = "Merkle proof validation failed for pre-merge header")]
+    #[should_panic(expected = "Execution block proof verification failed for pre-Merge header")]
     async fn invalidate_header_by_number_with_invalid_gaslimit() {
         let header_with_proof_ssz: Vec<u8> = get_header_with_proof_ssz();
         let mut header =

crates/subnetworks/history/src/validation.rs

@@ -13,8 +13,13 @@ version.workspace = true
 
 [dependencies]
 alloy.workspace = true
+anyhow.workspace = true
+ethereum_ssz.workspace = true
 ethportal-api.workspace = true
 directories.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+serde_yaml.workspace = true
 tempfile.workspace = true
 tracing.workspace = true
 tracing-subscriber = { workspace = true, features = ["env-filter"] }

crates/utils/Cargo.toml

@@ -5,3 +5,4 @@ pub mod cli;
 pub mod dir;
 pub mod log;
 pub mod submodules;
+pub mod testing;

crates/utils/src/lib.rs

@@ -1,8 +1,13 @@
 use std::{
-    fs, io,
+    fs::{self, File},
+    io::{self, BufReader},
     path::{Path, PathBuf},
 };
 
+use anyhow::anyhow;
+use serde::Deserialize;
+use ssz::Decode;
+
 pub const PORTAL_SPEC_TESTS_SUBMODULE_PATH: [&str; 2] =
     ["../../portal-spec-tests", "../../../portal-spec-tests"];
 
@@ -25,6 +30,35 @@ pub fn read_portal_spec_tests_file<P: AsRef<Path>>(path: P) -> io::Result<String
 }
 
 /// Reads binary file from a "portal-spec-tests" submodule
-pub fn read_portal_spec_tests_file_as_bytes<P: AsRef<Path>>(path: P) -> io::Result<Vec<u8>> {
+pub fn read_binary_portal_spec_tests_file<P: AsRef<Path>>(path: P) -> io::Result<Vec<u8>> {
     fs::read(portal_spec_tests_file_path(path))
 }
+
+/// Reads json file from a "portal-spec-tests" submodule
+pub fn read_json_portal_spec_tests_file<T>(path: impl AsRef<Path>) -> anyhow::Result<T>
+where
+    T: for<'de> Deserialize<'de>,
+{
+    let reader = BufReader::new(File::open(portal_spec_tests_file_path(path))?);
+    Ok(serde_json::from_reader(reader)?)
+}
+
+/// Reads yaml file from a "portal-spec-tests" submodule
+pub fn read_yaml_portal_spec_tests_file<T>(path: impl AsRef<Path>) -> anyhow::Result<T>
+where
+    T: for<'de> Deserialize<'de>,
+{
+    let reader = BufReader::new(File::open(portal_spec_tests_file_path(path))?);
+    Ok(serde_yaml::from_reader(reader)?)
+}
+
+/// Reads ssz file from a "portal-spec-tests" submodule
+pub fn read_ssz_portal_spec_tests_file<T: Decode>(path: impl AsRef<Path>) -> anyhow::Result<T> {
+    let bytes = read_binary_portal_spec_tests_file(&path)?;
+    T::from_ssz_bytes(&bytes).map_err(|err| {
+        anyhow!(
+            "Error decoding ssz file: {}. Error: {err:?}",
+            path.as_ref().display()
+        )
+    })
+}

crates/utils/src/submodules.rs

@@ -0,0 +1,16 @@
+use ethportal_api::{ContentValue, ContentValueError, OverlayContentKey, RawContentValue};
+use serde::{Deserialize, Serialize};
+
+/// The common test vectors type.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ContentItem<K: OverlayContentKey> {
+    pub content_key: K,
+    #[serde(rename = "content_value")]
+    pub raw_content_value: RawContentValue,
+}
+
+impl<K: OverlayContentKey> ContentItem<K> {
+    pub fn content_value<V: ContentValue<TContentKey = K>>(&self) -> Result<V, ContentValueError> {
+        V::decode(&self.content_key, &self.raw_content_value)
+    }
+}

crates/utils/src/testing.rs

@@ -120,3 +120,80 @@ impl PreMergeAccumulator {
         )
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use std::fs;
+
+    use alloy::primitives::map::HashMap;
+    use ethportal_api::{
+        types::execution::header_with_proof::{BlockHeaderProof, HeaderWithProof},
+        HistoryContentKey, HistoryContentValue,
+    };
+    use rstest::rstest;
+    use trin_utils::{
+        submodules::{
+            read_json_portal_spec_tests_file, read_ssz_portal_spec_tests_file,
+            read_yaml_portal_spec_tests_file,
+        },
+        testing::ContentItem,
+    };
+
+    use super::*;
+
+    #[rstest]
+    fn construct_proof(
+        #[values(
+            1_000_001, 1_000_002, 1_000_003, 1_000_004, 1_000_005, 1_000_006, 1_000_007, 1_000_008,
+            1_000_009, 1_000_010
+        )]
+        block_number: u64,
+    ) {
+        let all_test_data: HashMap<u64, ContentItem<HistoryContentKey>> =
+            read_json_portal_spec_tests_file(
+                "tests/mainnet/history/headers_with_proof/1000001-1000010.json",
+            )
+            .unwrap();
+        let test_data = all_test_data[&block_number].clone();
+
+        let epoch_accumulator = read_ssz_portal_spec_tests_file(
+            "tests/mainnet/history/accumulator/epoch-record-00122.ssz",
+        )
+        .unwrap();
+
+        test_construct_proof(test_data, epoch_accumulator);
+    }
+
+    #[rstest]
+    fn construct_proof_from_partial_epoch(#[values(15_537_392, 15_537_393)] block_number: u64) {
+        let test_data: ContentItem<HistoryContentKey> = read_yaml_portal_spec_tests_file(format!(
+            "tests/mainnet/history/headers_with_proof/{block_number}.yaml"
+        ))
+        .unwrap();
+
+        let epoch_accumulator_bytes = fs::read("./src/assets/epoch_accs/0xe6ebe562c89bc8ecb94dc9b2889a27a816ec05d3d6bd1625acad72227071e721.bin").unwrap();
+        let epoch_accumulator = EpochAccumulator::from_ssz_bytes(&epoch_accumulator_bytes).unwrap();
+        assert_eq!(epoch_accumulator.len(), 5362);
+
+        test_construct_proof(test_data, epoch_accumulator);
+    }
+
+    fn test_construct_proof(
+        content_item: ContentItem<HistoryContentKey>,
+        epoch_accumulator: EpochAccumulator,
+    ) {
+        let HistoryContentValue::BlockHeaderWithProof(HeaderWithProof { header, proof }) =
+            content_item.content_value().unwrap()
+        else {
+            panic!("Expected BlockHeaderWithProof content value");
+        };
+
+        let BlockHeaderProof::HistoricalHashes(expected_proof) = proof else {
+            panic!("Expected HistoricalHashes proof")
+        };
+
+        let generated_proof =
+            PreMergeAccumulator::construct_proof(&header, &epoch_accumulator).unwrap();
+        assert_eq!(generated_proof, expected_proof);
+    }
+}