pin zkevm-circuits to 0.9.7 (#288)

scroll-tech · Nov 16, 2023 · 78af51d · 78af51d
1 parent 6ccb1fd
commit 78af51d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,8 +26,8 @@ serde_json = "1.0"
 tokio = { version = "1.32", features = ["full"] }
 
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop"  }
-prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop", default-features = false, features = ["parallel_syn", "scroll", "shanghai"] }
-zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop", default-features = false, features = ["parallel_syn", "scroll", "shanghai"] }
+prover = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.9.7", default-features = false, features = ["parallel_syn", "scroll", "shanghai"] }
+zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.9.7", default-features = false, features = ["parallel_syn", "scroll", "shanghai"] }
 
 integration = { path = "integration" }
 

diff --git a/utils.sh b/utils.sh
@@ -24,15 +24,15 @@ function simple_tests() {
 }
 
 function replace_zkevm_circuits_branch() {
-	TO='tag = "v0.8.1"'
-	FROM='branch = "feat/max_snark=16"'
+	TO='tag = "v0.9.7"'
+	FROM='branch = "develop"'
 	#FROM='branch = "refactor/partial-db"'
-	sed -i "s#zkevm-circuits.git\", $FROM#zkevm-circuits.git\", $TO#" */Cargo.toml
+	sed -i "s#zkevm-circuits.git\", $FROM#zkevm-circuits.git\", $TO#" Cargo.toml
 	cargo update -p zkevm-circuits
 	cargo update -p eth-types
 	#git diff */Cargo.toml Cargo.lock
 }
 
-fetch_trace $1 $2
-#replace_zkevm_circuits_branch
+#fetch_trace $1 $2
+replace_zkevm_circuits_branch
 #simple_tests