Skip to content
This repository was archived by the owner on Jul 5, 2024. It is now read-only.

Commit a47ede5

Browse files
hero78119hero78119
committed
upgrade halo2/halo2curves dependency
1 parent fc4964c commit a47ede5

File tree

31 files changed

+134
-148
lines changed

31 files changed

+134
-148
lines changed

‎Cargo.lock

+38-70
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ members = [
1616
]
1717

1818
[patch.crates-io]
19-
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
19+
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
2020

2121
# Definition of benchmarks profile to use.
2222
[profile.bench]

‎bus-mapping/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ mock = { path = "../mock", optional = true }
1212

1313
ethers-core = "=2.0.10"
1414
ethers-providers = "=2.0.10"
15-
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
15+
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
1616
itertools = "0.10"
1717
lazy_static = "1.4"
1818
log = "0.4.14"
@@ -21,7 +21,7 @@ serde_json = "1.0.66"
2121
strum = "0.24"
2222
strum_macros = "0.24"
2323
revm-precompile = { version = "=2.2.0", default-features = false, optional = true }
24-
24+
2525
[dev-dependencies]
2626
hex = "0.4.3"
2727
pretty_assertions = "1.0.0"

‎circuit-benchmarks/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license = "MIT OR Apache-2.0"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
10+
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
1111
ark-std = { version = "0.3", features = ["print-trace"] }
1212
zkevm-circuits = { path = "../zkevm-circuits", features = ["test-circuits"] }
1313
bus-mapping = { path = "../bus-mapping", features = ["test"] }

‎eth-types/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ethers-core = "=2.0.10"
1010
ethers-signers = "=2.0.10"
1111
hex = "0.4"
1212
lazy_static = "1.4"
13-
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
13+
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
1414
regex = "1.5.4"
1515
serde = {version = "1.0.130", features = ["derive"] }
1616
serde_json = "1.0.66"

‎gadgets/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ authors = ["The appliedzkp team"]
66
license = "MIT OR Apache-2.0"
77

88
[dependencies]
9-
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
9+
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
1010
sha3 = "0.7.2"
1111
eth-types = { path = "../eth-types" }
1212
digest = "0.7.6"

‎gadgets/src/batched_is_zero.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ mod test {
242242
};
243243
let k = 4;
244244
let prover = MockProver::<Fr>::run(k, &circuit, vec![]).unwrap();
245-
prover.assert_satisfied_par()
245+
prover.assert_satisfied()
246246
}
247247

248248
#[test]

‎gadgets/src/is_zero.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ mod test {
171171
_marker: PhantomData,
172172
};
173173
let prover = MockProver::<Fp>::run(k, &circuit, vec![]).unwrap();
174-
prover.assert_satisfied_par()
174+
prover.assert_satisfied()
175175
}};
176176
}
177177

@@ -188,7 +188,7 @@ mod test {
188188
_marker: PhantomData,
189189
};
190190
let prover = MockProver::<Fp>::run(k, &circuit, vec![]).unwrap();
191-
assert!(prover.verify_par().is_err());
191+
assert!(prover.verify().is_err());
192192
}};
193193
}
194194

‎gadgets/src/mul_add.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ mod test {
401401
_marker: PhantomData,
402402
};
403403
let prover = MockProver::<Fp>::run(k, &circuit, vec![]).unwrap();
404-
prover.assert_satisfied_par()
404+
prover.assert_satisfied()
405405
}};
406406
}
407407

‎integration-tests/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ url = "2.2.2"
1919
pretty_assertions = "1.0.0"
2020
log = "0.4.14"
2121
env_logger = "0.9"
22-
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
22+
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
2323
rand_chacha = "0.3"
2424
paste = "1.0"
2525
rand_xorshift = "0.3.0"

‎integration-tests/src/integration_test_circuits.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ impl<C: SubCircuit<Fr> + Circuit<Fr>> IntegrationTest<C> {
340340
self.test_variadic(&mock_prover);
341341

342342
mock_prover
343-
.verify_par()
343+
.verify()
344344
.expect("mock prover verification failed");
345345
}
346346

@@ -465,7 +465,7 @@ impl<C: SubCircuit<Fr> + Circuit<Fr>> IntegrationTest<C> {
465465
.unwrap();
466466
self.test_root_variadic(&mock_prover);
467467
mock_prover
468-
.verify_par()
468+
.verify()
469469
.expect("mock prover verification failed");
470470
}
471471
} else {

‎light-client-poc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2021"
77
serde = { version = "1.0", features = ["derive"] }
88
serde_json = { version = "1.0", features = ["arbitrary_precision"] }
99
zkevm-circuits = { path = "../zkevm-circuits", features=["test-circuits"]}
10-
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
10+
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
1111
eyre = { version = "0.6.8" }
1212
hex = "0.4.3"
1313
num_enum = "0.6.1"

‎light-client-poc/src/circuit/prover.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ impl StateUpdateCircuit<Fr> {
9999

100100
let prover =
101101
MockProver::<Fr>::run(self.degree as u32, self, vec![public_inputs.0]).unwrap();
102-
prover.assert_satisfied_at_rows_par(0..num_rows, 0..num_rows);
102+
prover.assert_satisfied_at_rows(0..num_rows, 0..num_rows);
103103
}
104104

105105
pub fn prove(self, keys: &StateUpdateCircuitKeys) -> Result<Vec<u8>> {

‎testool/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ yaml-rust = "0.4.5"
3232
zkevm-circuits = { path="../zkevm-circuits", features=["test-util", "test-circuits"] }
3333
rand_chacha = "0.3"
3434
rand = "0.8"
35-
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
35+
halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0" }
3636
urlencoding = "2.1.2"
3737

3838

‎testool/src/statetest/executor.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ pub fn run_test(
382382

383383
let prover = MockProver::run(k, &circuit, instance).unwrap();
384384
prover
385-
.verify_par()
385+
.verify()
386386
.map_err(|err| StateTestError::CircuitUnsatisfied {
387387
num_failure: err.len(),
388388
first_failure: err[0].to_string(),

0 commit comments

Comments
 (0)