Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ openvm-transpiler = { git = "https://github.com/openvm-org/openvm.git", branch =
# more openvm related libs
openvm-stark-sdk = { git = "https://github.com/openvm-org/stark-backend.git", tag = "v1.2.0-rc.6" }

sbv-core = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "master", features = ["scroll", "rkyv"] }
sbv-helpers = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "master" }
sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "master", features = ["scroll", "rkyv"] }
sbv-kv = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "master" }
sbv-trie = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "master" }
sbv-precompile = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "master" }
sbv-core = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "fix/blockhash", features = ["scroll", "rkyv"] }
sbv-helpers = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "fix/blockhash" }
sbv-primitives = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "fix/blockhash", features = ["scroll", "rkyv"] }
sbv-kv = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "fix/blockhash" }
sbv-trie = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "fix/blockhash" }
sbv-precompile = { git = "https://github.com/scroll-tech/stateless-block-verifier", branch = "fix/blockhash" }

alloy-primitives = { version = "1.3", default-features = false, features = ["std", "map-hashbrown", "map-fxhash", "rkyv"] }
alloy-serde = { version = "1.0.13", default-features = false }
Expand Down
4 changes: 0 additions & 4 deletions crates/types/chunk/src/execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ pub fn execute(witness: ChunkWitness) -> Result<ChunkInfo, String> {
},
);

let state_commit_mode = witness.state_commit_mode.clone();
println!("state_commit_mode: {:?}", state_commit_mode);

let VerifyResult {
blocks,
pre_state_root,
Expand All @@ -40,7 +37,6 @@ pub fn execute(witness: ChunkWitness) -> Result<ChunkInfo, String> {
} = verifier::run(
witness.blocks,
chain_spec.clone(),
state_commit_mode,
Some(witness.compression_ratios.clone()),
)
.map_err(|e| format!("verify error: {e}"))?;
Expand Down
8 changes: 4 additions & 4 deletions crates/types/chunk/src/witness.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use alloy_primitives::B256;
#[allow(deprecated)]
use sbv_core::verifier::StateCommitMode;
use sbv_primitives::{U256, types::BlockWitness};
use std::collections::HashSet;
Expand All @@ -15,8 +16,6 @@ pub struct ChunkWitness {
pub fork_name: ForkName,
/// The compression ratios for each block in the chunk.
pub compression_ratios: Vec<Vec<U256>>,
/// The mode of state commitment for the chunk.
pub state_commit_mode: StateCommitMode,
}

/// The witness type accepted by the chunk-circuit.
Expand All @@ -40,6 +39,7 @@ pub struct LegacyChunkWitness {
/// The compression ratios for each block in the chunk.
pub compression_ratios: Vec<Vec<U256>>,
/// The mode of state commitment for the chunk.
#[allow(deprecated)]
pub state_commit_mode: StateCommitMode,
}

Expand Down Expand Up @@ -89,7 +89,6 @@ impl ChunkWitness {
prev_msg_queue_hash,
fork_name,
compression_ratios,
state_commit_mode: StateCommitMode::Auto,
}
}

Expand Down Expand Up @@ -129,7 +128,8 @@ impl From<ChunkWitness> for LegacyChunkWitness {
prev_msg_queue_hash: value.prev_msg_queue_hash,
fork_name: value.fork_name,
compression_ratios: value.compression_ratios,
state_commit_mode: value.state_commit_mode,
#[allow(deprecated)]
state_commit_mode: StateCommitMode::Auto,
}
}
}