Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: upgrade halo2 to v1.1 #28

Merged
merged 1 commit into from
Dec 11, 2023
Merged

fix: upgrade halo2 to v1.1 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ debug = true

# patch until PR https://github.com/privacy-scaling-explorations/halo2/pull/111 is merged
[patch."https://github.com/privacy-scaling-explorations/halo2.git"]
halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.0" }
halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1" }

[patch."https://github.com/privacy-scaling-explorations/poseidon.git"]
poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "main" }
24 changes: 17 additions & 7 deletions snark-verifier/src/system/halo2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ pub fn compile<'a, C: CurveAffine, P: Params<'a, C>>(
params: &P,
vk: &VerifyingKey<C>,
config: Config,
) -> Protocol<C>
) -> Protocol<C>
where
C::ScalarExt: FromUniformBytes<64>
C::ScalarExt: FromUniformBytes<64>,
{
assert_eq!(vk.get_domain().k(), params.k());

Expand Down Expand Up @@ -622,7 +622,16 @@ impl<'a, F: PrimeField> Polynomials<'a, F> {
})
.collect_vec();

let compress = |expressions: &'a [plonk::Expression<F>]| {
let compress_input = |expressions: &[Vec<plonk::Expression<F>>]| {
Expression::DistributePowers(
expressions
.iter()
.flat_map(|exprs| exprs.iter().map(|expr| self.convert(expr, t)))
.collect(),
self.theta().into(),
)
};
let compress_table = |expressions: &[plonk::Expression<F>]| {
Expression::DistributePowers(
expressions.iter().map(|expression| self.convert(expression, t)).collect(),
self.theta().into(),
Expand All @@ -638,8 +647,8 @@ impl<'a, F: PrimeField> Polynomials<'a, F> {
lookup,
(z, z_omega, permuted_input, permuted_input_omega_inv, permuted_table),
)| {
let input = compress(lookup.input_expressions());
let table = compress(lookup.table_expressions());
let input = compress_input(lookup.input_expressions());
let table = compress_table(lookup.table_expressions());
iter::empty()
.chain(Some(l_0 * (one - z)))
.chain(self.zk.then(|| l_last * (z * z - z)))
Expand Down Expand Up @@ -726,8 +735,9 @@ impl<C: CurveAffine> Transcript<C, MockChallenge> for MockTranscript<C::Scalar>
}
}

fn transcript_initial_state<C: CurveAffine>(vk: &VerifyingKey<C>) -> C::Scalar
where C::ScalarExt: FromUniformBytes<64>,
fn transcript_initial_state<C: CurveAffine>(vk: &VerifyingKey<C>) -> C::Scalar
where
C::ScalarExt: FromUniformBytes<64>,
{
let mut transcript = MockTranscript::default();
vk.hash_into(&mut transcript).unwrap();
Expand Down