v0.11.0 (scroll-tech#317)

* rc9 * done * minor
huimiebaa · Jun 12, 2024 · bbbc06e · bbbc06e
1 parent 0c48b15
commit bbbc06e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,7 @@ serde_json = "1.0"
 tokio = { version = "1.32", features = ["full"] }
 
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1"  }
-prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop", default-features = false, features = ["parallel_syn", "scroll"] }
+prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.11.0", default-features = false, features = ["parallel_syn", "scroll"] }
 integration = { path = "integration" }
 
 [patch.crates-io]

diff --git a/integration/src/test_util/capacity_checker.rs b/integration/src/test_util/capacity_checker.rs
@@ -114,7 +114,7 @@ fn ccc_block_tx_by_tx(checker: &mut CircuitCapacityChecker, block_idx: usize, bl
             coinbase: block.coinbase.clone(),
             header: block.header.clone(),
             start_l1_queue_index: block.start_l1_queue_index,
-            tx_storage_trace: vec![], // not used
+            ..Default::default()
         };
         log::debug!("calling estimate_circuit_capacity");
         let results = checker.estimate_circuit_capacity(tx_trace).unwrap();

diff --git a/integration/tests/batch_tests.rs b/integration/tests/batch_tests.rs
@@ -1,5 +1,5 @@
 use integration::test_util::{new_batch_prover, prove_and_verify_batch};
-use prover::{io::from_json_file, utils::init_env_and_log, BatchProvingTask};
+use prover::{eth_types::utils::from_json_file, utils::init_env_and_log, BatchProvingTask};
 use std::{fs, path::PathBuf};
 
 #[cfg(feature = "prove_verify")]

diff --git a/release.sh b/release.sh
@@ -1,5 +1,5 @@
-IN=integration/outputs/agg_tests_20240530_134631
-OUT=release-v0.11.0rc5
+IN=integration/outputs/e2e_tests_20240611_124434/
+OUT=release-v0.11.0
 
 mkdir -p $OUT
 cp $IN/chunk_chunk_0.protocol $OUT/chunk.protocol