cargo check ok

Author: lispc

Cargo.lock

@@ -17,9 +17,9 @@ repository = "https://github.com/scroll-tech/scroll"
 version = "4.5.47"
 
 [workspace.dependencies]
-scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/validium" }
-scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/validium" }
-scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", branch = "feat/validium" }
+scroll-zkvm-prover = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "5c361ad" }
+scroll-zkvm-verifier = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "5c361ad" }
+scroll-zkvm-types = { git = "https://github.com/scroll-tech/zkvm-prover", rev = "5c361ad" }
 
 sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "master", features = ["scroll", "rkyv"] }
 sbv-utils = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "master" }

Cargo.toml

@@ -17,6 +17,8 @@ pub(crate) fn witness_use_legacy_mode() -> bool {
     unsafe { LEGACY_WITNESS_ENCODING }
 }
 
+pub const VALIDIUM_VERSION: u8 = 0b01000001;
+
 pub fn set_dynamic_feature(feats: &str) {
     for feat_s in feats.split(':') {
         match feat_s.trim().to_lowercase().as_str() {

crates/libzkp/src/lib.rs

@@ -252,6 +252,7 @@ mod tests {
                 batch_hash: B256::repeat_byte(4),
                 withdraw_root: B256::repeat_byte(5),
                 msg_queue_hash: B256::repeat_byte(6),
+                encryption_key: None,
             };
             let bundle_pi_hash = bundle_info.pi_hash(ForkName::EuclidV1);
             BundleProofMetadata {

crates/libzkp/src/proofs.rs

@@ -14,7 +14,7 @@ use crate::{
     utils::panic_catch,
 };
 use sbv_primitives::B256;
-use scroll_zkvm_types::public_inputs::{ForkName, MultiVersionPublicInputs};
+use scroll_zkvm_types::public_inputs::{ForkName, MultiVersionPublicInputs, Version};
 
 fn encode_task_to_witness<T: serde::Serialize>(task: &T) -> eyre::Result<Vec<u8>> {
     let config = bincode::config::standard();
@@ -23,7 +23,7 @@ fn encode_task_to_witness<T: serde::Serialize>(task: &T) -> eyre::Result<Vec<u8>
 
 fn check_aggregation_proofs<Metadata>(
     proofs: &[proofs::WrappedProof<Metadata>],
-    fork_name: ForkName,
+    version: Version,
 ) -> eyre::Result<()>
 where
     Metadata: proofs::ProofMetadata,
@@ -32,7 +32,7 @@ where
         for w in proofs.windows(2) {
             w[1].metadata
                 .pi_hash_info()
-                .validate(w[0].metadata.pi_hash_info(), fork_name);
+                .validate(w[0].metadata.pi_hash_info(), version);
         }
     })
     .map_err(|e| eyre::eyre!("Chunk data validation failed: {}", e))?;

crates/libzkp/src/tasks.rs

@@ -1,4 +1,4 @@
-use crate::proofs::ChunkProof;
+use crate::{proofs::ChunkProof, VALIDIUM_VERSION};
 use c_kzg::Bytes48;
 use eyre::Result;
 use sbv_primitives::{B256, U256};
@@ -8,7 +8,7 @@ use scroll_zkvm_types::{
         BatchInfo, BatchWitness, Envelope, EnvelopeV6, EnvelopeV7, EnvelopeV8, LegacyBatchWitness,
         ReferenceHeader, N_BLOB_BYTES,
     },
-    public_inputs::ForkName,
+    public_inputs::{ForkName, Version},
     task::ProvingTask,
     utils::{to_rkyv_bytes, RancorError},
 };
@@ -179,7 +179,7 @@ impl BatchProvingTask {
         };
 
         BatchWitness {
-            version: 65,
+            version: VALIDIUM_VERSION,
             fork_name,
             chunk_proofs: self.chunk_proofs.iter().map(|proof| proof.into()).collect(),
             chunk_infos: self
@@ -201,7 +201,8 @@ impl BatchProvingTask {
         let witness = self.build_guest_input();
         let metadata = BatchInfo::from(&witness);
 
-        super::check_aggregation_proofs(self.chunk_proofs.as_slice(), fork_name)?;
+        // FIXME
+        super::check_aggregation_proofs(self.chunk_proofs.as_slice(), Version::validium_v1())?;
 
         Ok(metadata)
     }

crates/libzkp/src/tasks/batch.rs

@@ -1,8 +1,8 @@
-use crate::proofs::BatchProof;
+use crate::{proofs::BatchProof, VALIDIUM_VERSION};
 use eyre::Result;
 use scroll_zkvm_types::{
-    bundle::{BundleInfo, BundleWitness},
-    public_inputs::ForkName,
+    bundle::{BundleInfo, BundleWitness, LegacyBundleWitness},
+    public_inputs::{ForkName, Version},
     task::ProvingTask,
     utils::{to_rkyv_bytes, RancorError},
 };
@@ -41,6 +41,7 @@ impl BundleProvingTask {
 
     fn build_guest_input(&self) -> BundleWitness {
         BundleWitness {
+            version: VALIDIUM_VERSION,
             batch_proofs: self.batch_proofs.iter().map(|proof| proof.into()).collect(),
             batch_infos: self
                 .batch_proofs
@@ -59,7 +60,7 @@ impl BundleProvingTask {
         let witness = self.build_guest_input();
         let metadata = BundleInfo::from(&witness);
 
-        super::check_aggregation_proofs(self.batch_proofs.as_slice(), fork_name)?;
+        super::check_aggregation_proofs(self.batch_proofs.as_slice(), Version::validium_v1())?;
 
         Ok(metadata)
     }
@@ -71,7 +72,8 @@ impl TryFrom<BundleProvingTask> for ProvingTask {
     fn try_from(value: BundleProvingTask) -> Result<Self> {
         let witness = value.build_guest_input();
         let serialized_witness = if crate::witness_use_legacy_mode() {
-            to_rkyv_bytes::<RancorError>(&witness)?.into_vec()
+            let legacy = LegacyBundleWitness::from(witness);
+            to_rkyv_bytes::<RancorError>(&legacy)?.into_vec()
         } else {
             super::encode_task_to_witness(&witness)?
         };

crates/libzkp/src/tasks/bundle.rs

@@ -1,3 +1,5 @@
+use crate::VALIDIUM_VERSION;
+
 use super::chunk_interpreter::*;
 use eyre::Result;
 use sbv_core::BlockWitness;
@@ -126,11 +128,13 @@ impl ChunkProvingTask {
     }
 
     fn build_guest_input(&self) -> ChunkWitness {
-        let validium_input: ValidiumInputs = todo!();
+        let validium_input: scroll_zkvm_types::chunk::ValidiumInputs = todo!();
         ChunkWitness::new(
+            VALIDIUM_VERSION,
             &self.block_witnesses,
             self.prev_msg_queue_hash,
             self.fork_name.to_lowercase().as_str().into(),
+            Some(validium_input),
         )
     }