Skip to content

Update for compatibility with latest halo2 version (ZSA features) #470

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

Merged
nuttycom merged 2 commits into from
Aug 25, 2025
Merged

Update for compatibility with latest halo2 version (ZSA features) #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fba9536
Update for compatibility with latest halo2 version (ZSA features)
ConstanceBeguier Aug 11, 2025
29fbe53
Fix CI
ConstanceBeguier Aug 12, 2025
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
33 changes: 22 additions & 11 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.

9 changes: 7 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ hex = { version = "0.4", default-features = false, features = ["alloc"] }
lazy_static = "1"
memuse = { version = "0.2.2", default-features = false }
pasta_curves = "0.5"
proptest = { version = "1.0.0", optional = true }
proptest = { version = ">=1.0.0, <1.7.0", optional = true }
rand = { version = "0.8", default-features = false }
rand_core = { version = "0.6", default-features = false }
reddsa = { version = "0.5", default-features = false }
nonempty = { version = "0.11", default-features = false }
poseidon = { package = "halo2_poseidon", version = "0.1" }
Expand Down Expand Up @@ -68,7 +69,7 @@ plotters = { version = "0.3.0", optional = true }
criterion = "0.4" # 0.5 depends on clap 4 which has MSRV 1.70
halo2_gadgets = { version = "0.3", features = ["test-dependencies"] }
hex = "0.4"
proptest = "1.0.0"
proptest = ">=1.0.0, <1.7.0"
zcash_note_encryption = { version = "0.4", features = ["pre-zip-212"] }
incrementalmerkletree = { version = "0.8.1", features = ["test-dependencies"] }
shardtree = "0.6"
Expand Down Expand Up @@ -106,3 +107,7 @@ debug = true

[profile.bench]
debug = true

[patch.crates-io]
halo2_gadgets = { git = "https://github.com/zcash/halo2", rev = "2308caf68c48c02468b66cfc452dad54e355e32f" }
halo2_proofs = { git = "https://github.com/zcash/halo2", rev = "2308caf68c48c02468b66cfc452dad54e355e32f" }
Copy link
Contributor

@daira daira Aug 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked that it is not necessary for halo2_poseidon to have a patch directive.

4 changes: 3 additions & 1 deletion src/circuit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ use halo2_gadgets::{
MerklePath,
},
},
utilities::lookup_range_check::LookupRangeCheckConfig,
utilities::lookup_range_check::{LookupRangeCheck, LookupRangeCheckConfig},
};

mod commit_ivk;
Expand Down Expand Up @@ -327,6 +327,7 @@ impl plonk::Circuit<pallas::Base> for Circuit {
lagrange_coeffs[0],
lookup,
range_check,
false,
);
let merkle_config_1 = MerkleChip::configure(meta, sinsemilla_config_1.clone());

Expand All @@ -345,6 +346,7 @@ impl plonk::Circuit<pallas::Base> for Circuit {
lagrange_coeffs[1],
lookup,
range_check,
false,
);
let merkle_config_2 = MerkleChip::configure(meta, sinsemilla_config_2.clone());

Expand Down
11 changes: 9 additions & 2 deletions src/circuit/commit_ivk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,10 @@ impl CommitIvkChip {
}

pub(in crate::circuit) mod gadgets {
use halo2_gadgets::utilities::{lookup_range_check::LookupRangeCheckConfig, RangeConstrained};
use halo2_gadgets::utilities::{
lookup_range_check::{LookupRangeCheck, LookupRangeCheckConfig},
RangeConstrained,
};
use halo2_proofs::circuit::Chip;

use super::*;
Expand Down Expand Up @@ -678,7 +681,10 @@ mod tests {
chip::{SinsemillaChip, SinsemillaConfig},
primitives::CommitDomain,
},
utilities::{lookup_range_check::LookupRangeCheckConfig, UtilitiesInstructions},
utilities::{
lookup_range_check::{LookupRangeCheck, LookupRangeCheckConfig},
UtilitiesInstructions,
},
};
use halo2_proofs::{
circuit::{AssignedCell, Layouter, SimpleFloorPlanner, Value},
Expand Down Expand Up @@ -762,6 +768,7 @@ mod tests {
lagrange_coeffs[0],
lookup,
range_check,
false,
);

let commit_ivk_config = CommitIvkChip::configure(meta, advices);
Expand Down
7 changes: 5 additions & 2 deletions src/circuit/note_commit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ use halo2_gadgets::{
CommitDomain, Message, MessagePiece,
},
utilities::{
bool_check, lookup_range_check::LookupRangeCheckConfig, FieldValue, RangeConstrained,
bool_check,
lookup_range_check::{LookupRangeCheck, LookupRangeCheckConfig},
FieldValue, RangeConstrained,
},
};

Expand Down Expand Up @@ -2034,7 +2036,7 @@ mod tests {
},
sinsemilla::chip::SinsemillaChip,
sinsemilla::primitives::CommitDomain,
utilities::lookup_range_check::LookupRangeCheckConfig,
utilities::lookup_range_check::{LookupRangeCheck, LookupRangeCheckConfig},
};

use ff::{Field, PrimeField, PrimeFieldBits};
Expand Down Expand Up @@ -2119,6 +2121,7 @@ mod tests {
lagrange_coeffs[0],
lookup,
range_check,
false,
);
let note_commit_config =
NoteCommitChip::configure(meta, advices, sinsemilla_config);
Expand Down
Loading