upgrade halo2; enable challenge API, but not use it yet

lispc · lispc · commit 7078d97f1ba7 · 2022-12-13T20:25:33.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,8 +12,8 @@ members = [
     "mock",
 ]
 
-[patch.crates-io]
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0902" }
+[patch."https://github.com/privacy-scaling-explorations/halo2.git"]
+halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-1220" }
 
 # Definition of benchmarks profile to use.
 [profile.bench]
diff --git a/bus-mapping/Cargo.toml b/bus-mapping/Cargo.toml
@@ -13,7 +13,7 @@ mock = { path = "../mock", optional = true }
 
 ethers-core = "0.17.0"
 ethers-providers = "0.17.0"
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0902" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 itertools = "0.10"
 lazy_static = "1.4"
 log = "0.4.14"
diff --git a/circuit-benchmarks/Cargo.toml b/circuit-benchmarks/Cargo.toml
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0902" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 ark-std = { version = "0.3", features = ["print-trace"] }
 zkevm-circuits = { path = "../zkevm-circuits", features = ["test"]}
 keccak256 = { path = "../keccak256" }
diff --git a/eth-types/Cargo.toml b/eth-types/Cargo.toml
@@ -10,7 +10,7 @@ ethers-core = "0.17.0"
 ethers-signers = "0.17.0"
 hex = "0.4"
 lazy_static = "1.4"
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0902" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 regex = "1.5.4"
 serde = {version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.66"
diff --git a/gadgets/Cargo.toml b/gadgets/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["The appliedzkp team"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0902" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 sha3 = "0.7.2"
 eth-types = { path = "../eth-types" }
 digest = "0.7.6"
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -19,7 +19,7 @@ url = "2.2.2"
 pretty_assertions = "1.0.0"
 log = "0.4.14"
 env_logger = "0.9"
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0902" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 hex = "0.4.3"
 strum = "0.24.1"
 rand_chacha = "0.3"
diff --git a/keccak256/Cargo.toml b/keccak256/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 dev-graph = ["halo2_proofs/dev-graph", "plotters"]
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0902" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 itertools = "0.10.1"
 num-bigint = "0.4.2"
 num-traits = "0.2.14"
diff --git a/zkevm-circuits/Cargo.toml b/zkevm-circuits/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0902" }
+halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 num = "0.4"
 sha3 = "0.10"
 array-init = "2.0.0"
@@ -27,10 +27,10 @@ lazy_static = "1.4"
 keccak256 = { path = "../keccak256"}
 log = "0.4"
 env_logger = "0.9"
-ecdsa = { git = "https://github.com/scroll-tech/halo2wrong", branch = "scroll-dev-1010" }
-ecc =       { git = "https://github.com/scroll-tech/halo2wrong", branch = "scroll-dev-1010" }
-maingate =  { git = "https://github.com/scroll-tech/halo2wrong", branch = "scroll-dev-1010" }
-integer =   { git = "https://github.com/scroll-tech/halo2wrong", branch = "scroll-dev-1010" }
+ecdsa = { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09" }
+ecc =       { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09" }
+maingate =  { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09" }
+integer =   { git = "https://github.com/privacy-scaling-explorations/halo2wrong", tag = "v2022_09_09" }
 libsecp256k1 = "0.7"
 num-bigint = { version = "0.4" }
 subtle = "2.4"
diff --git a/zkevm-circuits/src/evm_circuit/util.rs b/zkevm-circuits/src/evm_circuit/util.rs
@@ -184,6 +184,7 @@ impl<F: FieldExt> StoredExpression<F> {
                     instance_query.rotation(),
                 )
             },
+            &|_| unimplemented!(),
             &|a| -a,
             &|a, b| a + b,
             &|a, b| a * b,

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ members = [`
`12`	`12`	`"mock",`
`13`	`13`	`]`
`14`	`14`
`15`		`-[patch.crates-io]`
`16`		`-halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0902" }`
	`15`	`+[patch."https://github.com/privacy-scaling-explorations/halo2.git"]`
	`16`	`+halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-1220" }`
`17`	`17`
`18`	`18`	`# Definition of benchmarks profile to use.`
`19`	`19`	`[profile.bench]`
Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,7 @@ impl<F: FieldExt> StoredExpression<F> {`
`184`	`184`	`instance_query.rotation(),`
`185`	`185`	`)`
`186`	`186`	`},`
	`187`	`+ &\|_\| unimplemented!(),`
`187`	`188`	`&\|a\| -a,`
`188`	`189`	`&\|a, b\| a + b,`
`189`	`190`	`&\|a, b\| a * b,`