release v0.3.1

scroll-tech · May 29, 2023 · d59ea1d · d59ea1d
1 parent 825fb74
commit d59ea1d
Show file tree

Hide file tree

Showing 8 changed files with 1,209,656 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/types/Cargo.toml b/types/Cargo.toml
@@ -1,10 +1,10 @@
 [package]
 name = "types"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 
 [dependencies]
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "v0.3" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.3.1" }
 base64 = "0.13.0"
 blake2 = "0.10.3"
 ethers-core = "0.17.0"

diff --git a/zkevm/Cargo.toml b/zkevm/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zkevm"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -12,10 +12,10 @@ halo2-snark-aggregator-api = { git = "https://github.com/scroll-tech/halo2-snark
 
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 
-bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "v0.3" }
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "v0.3" }
-zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "v0.3", default-features = false, features = ["test","poseidon-codehash","enable-sign-verify","scroll","zktrie"] }
-mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "v0.3" }
+bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.3.1" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.3.1" }
+zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.3.1", default-features = false, features = ["test","poseidon-codehash","enable-sign-verify","scroll","zktrie"] }
+mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.3.1" }
 
 rand = "0.8"
 rand_xorshift = "0.3"

diff --git a/zkevm/release.sh b/zkevm/release.sh
@@ -1,31 +1,22 @@
 set -x
 set -e
+set -u
 set -o pipefail
 
 export OPT_MEM=true
 #export MOCK_PROVE=true
-#export KECCAK_ROWS=20
-#export KECCAK_DEGREE=19
 export RUST_MIN_STACK=100000000
-export PARAM_SEED=bb4b94a1bbef58c4b5fcda6c900629b5 
 
-function goerli() {
-		TRACE_DIR="0327-correct-deletion"
-		d="617365.json"
-		RUST_LOG=debug TRACE_PATH=`realpath ~/zip-traces/${TRACE_DIR}/${d}` cargo test --features prove_verify --release test_agg -- --nocapture 2>&1 | tee logs/agg.${d}.log
-		d="617366.json"
-		RUST_LOG=debug TRACE_PATH=`realpath ~/zip-traces/${TRACE_DIR}/${d}` cargo test --features prove_verify --release test_agg -- --nocapture 2>&1 | tee logs/agg.${d}.log
-}
+function run_goerli_tests() {
+	MOCK_PROVE=true RUST_LOG=debug TRACE_PATH=$(realpath tests/extra_traces/hash_precompile_1.json) cargo test --features prove_verify --release test_agg -- --nocapture 2>&1 | tee logs/precompile_fail.log
 
-function run_agg_tests() {
-	#RUST_LOG=info MODE=single cargo test --features prove_verify --release test_agg -- --nocapture 2>&1 | tee logs/agg.log.single
-	#RUST_LOG=debug MODE=greeter cargo test --features prove_verify --release test_agg -- --nocapture 2>&1 | tee logs/agg.log.greeter
-	#RUST_LOG=debug MODE=pack cargo test --features prove_verify --release test_agg -- --nocapture 2>&1 | tee logs/agg.log.pack
-	RUST_LOG=debug MODE=multi cargo test --features prove_verify --release test_agg -- --nocapture 2>&1 | tee logs/agg.log.multi
-	RUST_LOG=debug MODE=sushi cargo test --features prove_verify --release test_agg -- --nocapture 2>&1 | tee logs/agg.log.sushi
-	#RUST_LOG=trace PARAM_SEED=bb4b94a1bbef58c4b5fcda6c900629b5 MODE=native cargo test --features prove_verify --release test_agg -- --nocapture 2>&1 | tee logs/agg.log.native
+	#RUST_LOG=debug MODE=multi cargo test --features prove_verify --release test_aggregation_api -- --nocapture 2>&1 | tee logs/multi.log
+	#RUST_LOG=debug MODE=sushi cargo test --features prove_verify --release test_aggregation_api -- --nocapture 2>&1 | tee logs/sushi.log
 }
 
-goerli
-#run_agg_tests
+function run_devnet_tests() {
+	CHAIN_ID=5343532222 RUST_LOG=debug TRACE_PATH=$(realpath tests/extra_traces/devnet.json) cargo test --features prove_verify --release test_agg -- --nocapture 2>&1 | tee logs/devnet.log
+}
 
+run_goerli_tests
+run_devnet_tests