Re-introduce ReferenceHeader::V8 for backwards compatibility with 0.5.2 (#226)

* fix: re-introduce ReferenceHeader::V8 for backwards compatibility

* for automatically set is_openvm_v13 flag in verifier, also recognize 0.5.6 release files

* chore: fmt

* chore: commitments

---------

Co-authored-by: Ho <fan@scroll.io>
Co-authored-by: Zhuo Zhang <mycinbrin@gmail.com>

Author: 3 people

crates/circuits/batch-circuit/batch_exe_commit.rs

@@ -1,4 +1,4 @@
 #![cfg_attr(rustfmt, rustfmt_skip)]
 //! Generated by crates/build-guest. DO NOT EDIT!
 
-pub const COMMIT: [u32; 8] = [1400913761, 1120536600, 55670230, 465644265, 1148889494, 843767345, 1745070471, 193928041];
+pub const COMMIT: [u32; 8] = [1322080380, 1651942255, 463083856, 1076384953, 571197325, 1702971627, 375491115, 829280832];

crates/circuits/bundle-circuit/bundle_exe_commit.rs

@@ -1,4 +1,4 @@
 #![cfg_attr(rustfmt, rustfmt_skip)]
 //! Generated by crates/build-guest. DO NOT EDIT!
 
-pub const COMMIT: [u32; 8] = [836552939, 1686806590, 135501859, 346088423, 1193474372, 757143280, 1995358180, 150494652];
+pub const COMMIT: [u32; 8] = [1144920578, 672155974, 440997509, 565686465, 150547879, 714324919, 1665603288, 907252136];

crates/integration/src/testers/batch.rs

@@ -17,6 +17,7 @@ impl PartialProvingTask for BatchWitness {
         let header_hash = match &self.reference_header {
             ReferenceHeader::V6(h) => h.batch_hash(),
             ReferenceHeader::V7_V8_V9(h) => h.batch_hash(),
+            ReferenceHeader::V8(_) => unreachable!("Unexpected ReferenceHeader::V8 0.7.0 onwards"),
             ReferenceHeader::Validium(h) => h.batch_hash(),
         };
         header_hash.to_string()

crates/integration/src/utils/mod.rs

@@ -70,6 +70,9 @@ impl From<&ReferenceHeader> for LastHeader {
         match value {
             ReferenceHeader::V6(h) => h.into(),
             ReferenceHeader::V7_V8_V9(h) => h.into(),
+            ReferenceHeader::V8(_) => {
+                unreachable!("Unexpected ReferenceHeader::V8 from 0.7.0 onwards")
+            }
             ReferenceHeader::Validium(h) => h.into(),
         }
     }
@@ -450,6 +453,7 @@ fn test_build_and_parse_batch_task() -> eyre::Result<()> {
             let enveloped = batch::EnvelopeV7::from_slice(&task_wit.blob_bytes);
             <batch::PayloadV7 as Payload>::from_envelope(&enveloped).validate(h, infos);
         }
+        ReferenceHeader::V8(_) => unreachable!("Unexpected ReferenceHeader::V8 from 0.7.0 onwards"),
         ReferenceHeader::Validium(_h) => {
             todo!()
         }

crates/types/batch/src/header/mod.rs

@@ -56,6 +56,19 @@ pub enum ReferenceHeader {
     /// Since the codec implementation is unchanged across STF-versions v7, v8 and v9, we define a
     /// single variant to cover all those cases.
     V7_V8_V9(v7::BatchHeaderV7),
+    /// Batch header v8 for backwards compatibility to support Feynman (0.5.2).
+    V8(v7::BatchHeaderV7),
     /// Represents batch header utilised in L3 validium.
     Validium(validium::BatchHeaderValidium),
 }
+
+impl ReferenceHeader {
+    /// Consumes the reference header that is expected to be [`Self::V7_V8_V9`] and transforms it
+    /// to [`Self::V8`] for backwards compatibilty support for [`Version::feynman`].
+    pub fn into_v8_feynman(self) -> Self {
+        match self {
+            Self::V7_V8_V9(h) => Self::V8(h),
+            _ => unreachable!("Expect ReferenceHeader::V7_V8_V9 from 0.7.0 onwards"),
+        }
+    }
+}

crates/types/batch/src/witness.rs

@@ -182,7 +182,10 @@ impl From<BatchWitness> for LegacyBatchWitness {
             chunk_infos: value.chunk_infos.into_iter().map(|c| c.into()).collect(),
             blob_bytes: value.blob_bytes,
             point_eval_witness: point_eval_witness.clone().into(),
-            reference_header: value.reference_header,
+            reference_header: match value.fork_name {
+                ForkName::Feynman => value.reference_header.into_v8_feynman(),
+                _ => unreachable!("0.5.2 expects fork=Feynman"),
+            },
             fork_name: value.fork_name,
         }
     }
@@ -221,6 +224,9 @@ impl From<&BatchWitness> for BatchInfo {
                 };
                 BatchInfoBuilderV7::build(witness.version, args)
             }
+            ReferenceHeader::V8(_) => {
+                unreachable!("Unexpected ReferenceHeader::V8 from 0.7.0 onwards");
+            }
             ReferenceHeader::Validium(header) => ValidiumBatchInfoBuilder::build(
                 ValidiumBuilderArgs::new(witness.version, *header, chunk_infos),
             ),

crates/verifier/src/verifier.rs

@@ -52,9 +52,10 @@ impl UniversalVerifier {
         // TODO: clean this after we get rid of openvm v1.3.
         let is_openvm_v13 = {
             let hash = sha256::digest(&evm_verifier);
-            // from 0.5.2 release files
-            let is_openvm_v13 =
-                hash == ("4f1b70db9fade2ce7425924dc662d75c5a315f3a611ed8cadd68b516407a4cf1");
+            // from 0.5.2 and 0.5.6 release files
+            let is_openvm_v13 = hash
+                == ("4f1b70db9fade2ce7425924dc662d75c5a315f3a611ed8cadd68b516407a4cf1")
+                || hash == ("d1f7a8066bd45c1bb82b73c7a7138d5793589fb8c6b2eb3c74b94db63109501d");
             println!(
                 "is_openvm_v13: {}, verifier.bin sha256sum: {}",
                 is_openvm_v13, hash