rebase without assembly version

privacy-scaling-explorations · Feb 8, 2022 · 4cf8ba3 · 4cf8ba3
1 parent 8e3614e
commit 4cf8ba3
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/.github/proverCiScripts/getSysstat.sh b/.github/proverCiScripts/getSysstat.sh
@@ -25,7 +25,7 @@ maxMemUsed=$(cat mem.stats | awk '{ print $4 }' | sed 's/G//g' | sort -n | tail
 
 logfile=$(ls $target_dir | grep proverlog | xargs -n 1 basename)
 tail -12 $target_dir/$logfile
-move $target_dir/$logfile ~
+mv $target_dir/$logfile ~
 
 echo "Maximum CPU Usage at $maxUsedCPU%"
 echo "Maximum Mem Usage at ${maxMemUsed}Gb"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ members = [
 ]
 
 [patch.crates-io]
-halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-assembly" }
+halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-rebase" }
 # This fork makes bitvec 0.20.x work with funty 1.1 and funty 1.2.  Without
 # this fork, bitvec 0.20.x is incompatible with funty 1.2, which we depend on,
 # and leads to a compilation error.  This can be removed once the upstream PR

diff --git a/bus-mapping/Cargo.toml b/bus-mapping/Cargo.toml
@@ -11,7 +11,7 @@ ethers-providers = "0.6"
 itertools = "0.10"
 lazy_static = "1.4"
 log = "0.4.14"
-pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
+pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
 serde = {version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.66"
 

diff --git a/circuit-benchmarks/Cargo.toml b/circuit-benchmarks/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 
 [dependencies]
 ff = "0.11"
-halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-assembly" }
-pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
+halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-rebase" }
+pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
 ark-std = { version = "0.3", features = ["print-trace"] }
 zkevm-circuits = { path = "../zkevm-circuits" }
 bus-mapping = { path = "../bus-mapping" }

diff --git a/eth-types/Cargo.toml b/eth-types/Cargo.toml
@@ -9,7 +9,7 @@ ethers-core = "0.6"
 ethers-providers = "0.6"
 hex = "0.4"
 lazy_static = "1.4"
-pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
+pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
 regex = "1.5.4"
 serde = {version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.66"

diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -18,8 +18,8 @@ url = "2.2.2"
 pretty_assertions = "1.0.0"
 log = "0.4.14"
 env_logger = "0.9"
-halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-assembly" }
-pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
+halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-rebase" }
+pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
 
 [dev-dependencies]
 pretty_assertions = "1.0.0"

diff --git a/keccak256/Cargo.toml b/keccak256/Cargo.toml
@@ -7,11 +7,11 @@ edition = "2018"
 dev-graph = [ "halo2_proofs/dev-graph", "plotters" ]
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-assembly" }
+halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-rebase" }
 itertools = "0.10.1"
 num-bigint = "0.4.2"
 num-traits = "0.2.14"
-pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
+pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
 plotters = { version = "0.3.0", optional = true }
 
 [dev-dependencies]

diff --git a/zkevm-circuits/Cargo.toml b/zkevm-circuits/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2018"
 
 [dependencies]
 ff = "0.11"
-halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-assembly" }
-pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256", branch = "introduce-assembly-complete", features = ["asm"] }
+halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", branch = "kzg-rebase" }
+pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
 bigint = "4"
 num = "0.4"
 sha3 = "0.7.2"