Merge branch 'master' into feat/galileo

Author: roynalnaruto

Cargo.lock

@@ -1,4 +1,4 @@
 #![cfg_attr(rustfmt, rustfmt_skip)]
 //! Generated by crates/build-guest. DO NOT EDIT!
 
-pub const COMMIT: [u32; 8] = [1869611773, 1247170897, 378997350, 1626925707, 51022202, 1885217756, 994126060, 367287951];
+pub const COMMIT: [u32; 8] = [1649793006, 453918448, 700472053, 1708688727, 1956651385, 1452705656, 611459631, 1820274171];

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] = [1289401053, 749703688, 860681877, 492591804, 495756180, 98854923, 410751013, 1460515955];
+pub const COMMIT: [u32; 8] = [2012351307, 1390891344, 349217220, 1980321794, 92671869, 1673212720, 1290433404, 1552447571];

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] = [1096015076, 1198291774, 641106194, 1394738744, 869777519, 1181640357, 1080205349, 850775029];
+pub const COMMIT: [u32; 8] = [534218310, 1811212981, 1016259372, 652600422, 1802874675, 1341042917, 594473376, 479497145];

crates/circuits/chunk-circuit/chunk_exe_commit.rs

@@ -1,8 +1,15 @@
+use crate::{
+    PartialProvingTask, ProverTester, guest_version, prove_verify, testdata_fork_directory,
+    tester_execute, testers::PATH_TESTDATA, testing_hardfork, testing_version,
+    utils::metadata_from_chunk_witnesses,
+};
+use openvm_sdk::StdIn;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use sbv_core::BlockWitness;
 use sbv_primitives::{B256, types::consensus::TxL1Message};
 use scroll_zkvm_prover::utils::vm::ExecutionResult;
 use scroll_zkvm_prover::{Prover, utils::read_json};
+use scroll_zkvm_types::chunk::ChunkWitnessUpgradeCompact;
 use scroll_zkvm_types::{
     chunk::{ChunkInfo, ChunkWitness, LegacyChunkWitness, SecretKey},
     proof::ProofEnum,
@@ -13,12 +20,6 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use crate::{
-    PartialProvingTask, ProverTester, prove_verify, testdata_fork_directory, tester_execute,
-    testers::PATH_TESTDATA, testing_hardfork, testing_version,
-    utils::metadata_from_chunk_witnesses,
-};
-
 /// Load a file <block_n>.json in the <PATH_BLOCK_WITNESS> directory.
 pub fn read_block_witness_from_testdata(block_n: usize) -> eyre::Result<BlockWitness> {
     read_block_witness(
@@ -67,6 +68,28 @@ impl PartialProvingTask for ChunkWitness {
         Ok(bytes.to_vec())
     }
 
+    fn write_guest_input(&self, stdin: &mut StdIn) -> eyre::Result<()>
+    where
+        Self: Sized,
+    {
+        let bytes: Vec<u8> = match guest_version().as_str() {
+            "0.5.2" => self.legacy_rkyv_archive()?,
+            "0.6.0-rc.6" => {
+                let config = bincode::config::standard();
+                bincode::serde::encode_to_vec(
+                    ChunkWitnessUpgradeCompact::from(self.clone()),
+                    config,
+                )?
+            }
+            _ => {
+                let config = bincode::config::standard();
+                bincode::serde::encode_to_vec(self, config)?
+            }
+        };
+        stdin.write_bytes(&bytes);
+        Ok(())
+    }
+
     fn fork_name(&self) -> ForkName {
         ForkName::from(self.fork_name.as_str())
     }

crates/integration/src/testers/chunk.rs

@@ -5,4 +5,4 @@ mod execute;
 pub use execute::execute;
 
 mod witness;
-pub use witness::{ChunkWitness, LegacyChunkWitness, ValidiumInputs};
+pub use witness::{ChunkWitness, ChunkWitnessUpgradeCompact, LegacyChunkWitness, ValidiumInputs};

crates/types/chunk/src/scroll.rs

@@ -34,6 +34,23 @@ pub struct ValidiumInputs {
     pub secret_key: Box<[u8]>,
 }
 
+/// The witness type accepted by last version chunk-circuit.
+#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
+pub struct ChunkWitnessUpgradeCompact {
+    /// Version byte as per [version][types_base::version].
+    pub version: u8,
+    /// The block witness for each block in the chunk.
+    pub blocks: Vec<BlockWitness>,
+    /// The on-chain rolling L1 message queue hash before enqueueing any L1 msg tx from the chunk.
+    pub prev_msg_queue_hash: B256,
+    /// The code version specify the chain spec
+    pub fork_name: ForkName,
+    /// The compression ratios for each block in the chunk.
+    pub compression_ratios: Vec<Vec<U256>>,
+    /// Validium encrypted txs and secret key if this is a validium chain.
+    pub validium: Option<ValidiumInputs>,
+}
+
 /// The witness type accepted by the chunk-circuit.
 #[derive(
     Clone,
@@ -130,6 +147,7 @@ impl ChunkWitness {
                     .collect(),
             })
             .collect();
+
         let compression_infos = blocks
             .iter()
             .map(|block| block.compression_infos())
@@ -186,10 +204,27 @@ impl From<ChunkWitness> for LegacyChunkWitness {
             fork_name: value.fork_name,
             compression_ratios: value
                 .compression_infos
-                .into_iter()
-                .map(|infos| infos.into_iter().map(|info| info.0).collect())
+                .iter()
+                .map(|compression_infos| compression_infos.iter().map(|v| v.0).collect())
                 .collect(),
             state_commit_mode: StateCommitMode::Auto,
         }
     }
 }
+
+impl From<ChunkWitness> for ChunkWitnessUpgradeCompact {
+    fn from(value: ChunkWitness) -> Self {
+        ChunkWitnessUpgradeCompact {
+            version: value.version,
+            blocks: value.blocks,
+            prev_msg_queue_hash: value.prev_msg_queue_hash,
+            fork_name: value.fork_name,
+            compression_ratios: value
+                .compression_infos
+                .iter()
+                .map(|compression_infos| compression_infos.iter().map(|v| v.0).collect())
+                .collect(),
+            validium: value.validium,
+        }
+    }
+}