diff --git a/Cargo.lock b/Cargo.lock
index 9c804b56..3845f626 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6457,7 +6457,7 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 [[package]]
 name = "sbv-core"
 version = "2.0.0"
-source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=master#482b62d1350445ae86f19d7e5d79a598c7a49135"
+source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=fix%2Fblockhash#499c28de3328dce43a0ded419fab77ff8da986fa"
 dependencies = [
  "cfg-if",
  "itertools 0.14.0",
@@ -6474,7 +6474,7 @@ dependencies = [
 [[package]]
 name = "sbv-helpers"
 version = "2.0.0"
-source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=master#482b62d1350445ae86f19d7e5d79a598c7a49135"
+source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=fix%2Fblockhash#499c28de3328dce43a0ded419fab77ff8da986fa"
 dependencies = [
  "tracing",
 ]
@@ -6482,7 +6482,7 @@ dependencies = [
 [[package]]
 name = "sbv-kv"
 version = "2.0.0"
-source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=master#482b62d1350445ae86f19d7e5d79a598c7a49135"
+source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=fix%2Fblockhash#499c28de3328dce43a0ded419fab77ff8da986fa"
 dependencies = [
  "auto_impl",
  "hashbrown 0.15.5",
@@ -6492,7 +6492,7 @@ dependencies = [
 [[package]]
 name = "sbv-precompile"
 version = "2.0.0"
-source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=master#482b62d1350445ae86f19d7e5d79a598c7a49135"
+source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=fix%2Fblockhash#499c28de3328dce43a0ded419fab77ff8da986fa"
 dependencies = [
  "openvm-ecc-guest 1.4.0-rc.4",
  "openvm-pairing",
@@ -6503,7 +6503,7 @@ dependencies = [
 [[package]]
 name = "sbv-primitives"
 version = "2.0.0"
-source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=master#482b62d1350445ae86f19d7e5d79a598c7a49135"
+source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=fix%2Fblockhash#499c28de3328dce43a0ded419fab77ff8da986fa"
 dependencies = [
  "alloy-consensus",
  "alloy-eips 1.0.24",
@@ -6540,7 +6540,7 @@ dependencies = [
 [[package]]
 name = "sbv-trie"
 version = "2.0.0"
-source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=master#482b62d1350445ae86f19d7e5d79a598c7a49135"
+source = "git+https://github.com/scroll-tech/stateless-block-verifier?branch=fix%2Fblockhash#499c28de3328dce43a0ded419fab77ff8da986fa"
 dependencies = [
  "alloy-rlp",
  "alloy-trie",
diff --git a/Cargo.toml b/Cargo.toml
index 8e0b2c99..a3b8f2ff 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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 }
diff --git a/crates/types/chunk/src/execute.rs b/crates/types/chunk/src/execute.rs
index 585384f3..6fcc599d 100644
--- a/crates/types/chunk/src/execute.rs
+++ b/crates/types/chunk/src/execute.rs
@@ -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,
@@ -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}"))?;
diff --git a/crates/types/chunk/src/witness.rs b/crates/types/chunk/src/witness.rs
index 6f4bf4ef..7699512b 100644
--- a/crates/types/chunk/src/witness.rs
+++ b/crates/types/chunk/src/witness.rs
@@ -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;
@@ -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.
@@ -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,
 }
 
@@ -89,7 +89,6 @@ impl ChunkWitness {
             prev_msg_queue_hash,
             fork_name,
             compression_ratios,
-            state_commit_mode: StateCommitMode::Auto,
         }
     }
 
@@ -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,
         }
     }
 }