Skip to content

Commit

Permalink
Replace PallasLookupRangeCheck45BConfig by PallasLookupRangeCheck4_5B…
Browse files Browse the repository at this point in the history 
…Config
  • Loading branch information
@ConstanceBeguier
ConstanceBeguier committed Aug 4, 2024
1 parent 7afcb87 commit 2cfde35
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
View file

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

8 changes: 4 additions & 4 deletions src/circuit/circuit_zsa.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use halo2_gadgets::{
},
utilities::{
bool_check,
lookup_range_check::{LookupRangeCheck45BConfig, PallasLookupRangeCheck45BConfig},
lookup_range_check::{LookupRangeCheck4_5BConfig, PallasLookupRangeCheck4_5BConfig},
},
};

Expand Down Expand Up @@ -49,7 +49,7 @@ mod note_commit;
mod value_commit_orchard;

impl OrchardCircuit for OrchardZSA {
type Config = Config<PallasLookupRangeCheck45BConfig>;
type Config = Config<PallasLookupRangeCheck4_5BConfig>;

fn configure(meta: &mut plonk::ConstraintSystem<pallas::Base>) -> Self::Config {
// Advice columns used in the Orchard circuit.
Expand Down Expand Up @@ -224,7 +224,7 @@ impl OrchardCircuit for OrchardZSA {

// We have a lot of free space in the right-most advice columns; use one of them
// for all of our range checks.
let range_check = LookupRangeCheck45BConfig::configure_with_tag(
let range_check = LookupRangeCheck4_5BConfig::configure_with_tag(
meta,
advices[9],
table_idx,
Expand All @@ -233,7 +233,7 @@ impl OrchardCircuit for OrchardZSA {

// Configuration for curve point operations.
// This uses 10 advice columns and spans the whole circuit.
let ecc_config = EccChip::<OrchardFixedBases, PallasLookupRangeCheck45BConfig>::configure(
let ecc_config = EccChip::<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>::configure(
meta,
advices,
lagrange_coeffs,
Expand Down
26 changes: 13 additions & 13 deletions src/circuit/circuit_zsa/note_commit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use halo2_gadgets::{
},
sinsemilla::{chip::SinsemillaChip, CommitDomain, Message, MessagePiece},
utilities::{
cond_swap::CondSwapChip, lookup_range_check::PallasLookupRangeCheck45BConfig,
cond_swap::CondSwapChip, lookup_range_check::PallasLookupRangeCheck4_5BConfig,
RangeConstrained,
},
};
Expand Down Expand Up @@ -56,10 +56,10 @@ pub(in crate::circuit) mod gadgets {
OrchardHashDomains,
OrchardCommitDomains,
OrchardFixedBases,
PallasLookupRangeCheck45BConfig,
PallasLookupRangeCheck4_5BConfig,
>,
ecc_chip: EccChip<OrchardFixedBases, PallasLookupRangeCheck45BConfig>,
note_commit_chip: NoteCommitChip<PallasLookupRangeCheck45BConfig>,
ecc_chip: EccChip<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>,
note_commit_chip: NoteCommitChip<PallasLookupRangeCheck4_5BConfig>,
cond_swap_chip: CondSwapChip<pallas::Base>,
g_d: &NonIdentityEccPoint,
pk_d: &NonIdentityEccPoint,
Expand All @@ -69,11 +69,11 @@ pub(in crate::circuit) mod gadgets {
asset: &NonIdentityEccPoint,
rcm: ScalarFixed<
pallas::Affine,
EccChip<OrchardFixedBases, PallasLookupRangeCheck45BConfig>,
EccChip<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>,
>,
is_native_asset: AssignedCell<pallas::Base, pallas::Base>,
) -> Result<
Point<pallas::Affine, EccChip<OrchardFixedBases, PallasLookupRangeCheck45BConfig>>,
Point<pallas::Affine, EccChip<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>>,
Error,
> {
let zsa_config = match &note_commit_chip.config.specific_config_for_circuit {
Expand Down Expand Up @@ -429,7 +429,7 @@ mod tests {
sinsemilla::chip::SinsemillaChip,
utilities::{
cond_swap::{CondSwapChip, CondSwapConfig},
lookup_range_check::PallasLookupRangeCheck45BConfig,
lookup_range_check::PallasLookupRangeCheck4_5BConfig,
},
};

Expand Down Expand Up @@ -457,8 +457,8 @@ mod tests {

impl Circuit<pallas::Base> for MyCircuit {
type Config = (
NoteCommitConfig<PallasLookupRangeCheck45BConfig>,
EccConfig<OrchardFixedBases, PallasLookupRangeCheck45BConfig>,
NoteCommitConfig<PallasLookupRangeCheck4_5BConfig>,
EccConfig<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>,
CondSwapConfig,
);
type FloorPlanner = SimpleFloorPlanner;
Expand Down Expand Up @@ -507,7 +507,7 @@ mod tests {
meta.fixed_column(),
];

let range_check = PallasLookupRangeCheck45BConfig::configure_with_tag(
let range_check = PallasLookupRangeCheck4_5BConfig::configure_with_tag(
meta,
advices[9],
table_idx,
Expand All @@ -517,7 +517,7 @@ mod tests {
OrchardHashDomains,
OrchardCommitDomains,
OrchardFixedBases,
PallasLookupRangeCheck45BConfig,
PallasLookupRangeCheck4_5BConfig,
>::configure(
meta,
advices[..5].try_into().unwrap(),
Expand All @@ -531,7 +531,7 @@ mod tests {
NoteCommitChip::configure(meta, advices, sinsemilla_config, true);

let ecc_config =
EccChip::<OrchardFixedBases, PallasLookupRangeCheck45BConfig>::configure(
EccChip::<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>::configure(
meta,
advices,
lagrange_coeffs,
Expand All @@ -556,7 +556,7 @@ mod tests {
OrchardHashDomains,
OrchardCommitDomains,
OrchardFixedBases,
PallasLookupRangeCheck45BConfig,
PallasLookupRangeCheck4_5BConfig,
>::load(
note_commit_config.sinsemilla_config.clone(), &mut layouter
)?;
Expand Down
22 changes: 11 additions & 11 deletions src/circuit/circuit_zsa/value_commit_orchard.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pub(in crate::circuit) mod gadgets {
use halo2_gadgets::{
ecc::{chip::EccChip, FixedPoint, NonIdentityPoint, Point, ScalarFixed, ScalarVar},
sinsemilla::{self, chip::SinsemillaChip},
utilities::lookup_range_check::{LookupRangeCheck, PallasLookupRangeCheck45BConfig},
utilities::lookup_range_check::{LookupRangeCheck, PallasLookupRangeCheck4_5BConfig},
};
use halo2_proofs::{
circuit::{AssignedCell, Chip, Layouter},
Expand All @@ -25,23 +25,23 @@ pub(in crate::circuit) mod gadgets {
OrchardHashDomains,
OrchardCommitDomains,
OrchardFixedBases,
PallasLookupRangeCheck45BConfig,
PallasLookupRangeCheck4_5BConfig,
>,
ecc_chip: EccChip<OrchardFixedBases, PallasLookupRangeCheck45BConfig>,
ecc_chip: EccChip<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>,
v_net_magnitude_sign: (
AssignedCell<pallas::Base, pallas::Base>,
AssignedCell<pallas::Base, pallas::Base>,
),
rcv: ScalarFixed<
pallas::Affine,
EccChip<OrchardFixedBases, PallasLookupRangeCheck45BConfig>,
EccChip<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>,
>,
asset: NonIdentityPoint<
pallas::Affine,
EccChip<OrchardFixedBases, PallasLookupRangeCheck45BConfig>,
EccChip<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>,
>,
) -> Result<
Point<pallas::Affine, EccChip<OrchardFixedBases, PallasLookupRangeCheck45BConfig>>,
Point<pallas::Affine, EccChip<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>>,
plonk::Error,
> {
// Check that magnitude is 64 bits.
Expand Down Expand Up @@ -119,7 +119,7 @@ mod tests {
},
sinsemilla::chip::{SinsemillaChip, SinsemillaConfig},
utilities::lookup_range_check::{
LookupRangeCheck45BConfig, PallasLookupRangeCheck45BConfig,
LookupRangeCheck4_5BConfig, PallasLookupRangeCheck4_5BConfig,
},
};

Expand All @@ -139,14 +139,14 @@ mod tests {
pub struct MyConfig {
primary: Column<Instance>,
advices: [Column<Advice>; 10],
ecc_config: EccConfig<OrchardFixedBases, PallasLookupRangeCheck45BConfig>,
ecc_config: EccConfig<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>,
// Sinsemilla config is only used to initialize the table_idx lookup table in the same
// way as in the Orchard circuit
sinsemilla_config: SinsemillaConfig<
OrchardHashDomains,
OrchardCommitDomains,
OrchardFixedBases,
PallasLookupRangeCheck45BConfig,
PallasLookupRangeCheck4_5BConfig,
>,
}
#[derive(Default)]
Expand Down Expand Up @@ -208,7 +208,7 @@ mod tests {
];
meta.enable_constant(lagrange_coeffs[0]);

let range_check = LookupRangeCheck45BConfig::configure_with_tag(
let range_check = LookupRangeCheck4_5BConfig::configure_with_tag(
meta,
advices[9],
table_idx,
Expand All @@ -229,7 +229,7 @@ mod tests {
primary,
advices,
ecc_config:
EccChip::<OrchardFixedBases, PallasLookupRangeCheck45BConfig>::configure(
EccChip::<OrchardFixedBases, PallasLookupRangeCheck4_5BConfig>::configure(
meta,
advices,
lagrange_coeffs,
Expand Down
6 changes: 3 additions & 3 deletions src/circuit/commit_ivk.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ mod tests {
},
utilities::{
lookup_range_check::{
PallasLookupRangeCheck, PallasLookupRangeCheck45BConfig,
PallasLookupRangeCheck, PallasLookupRangeCheck4_5BConfig,
PallasLookupRangeCheckConfig,
},
UtilitiesInstructions,
Expand All @@ -705,7 +705,7 @@ mod tests {
const ENABLE_HASH_FROM_PRIVATE_POINT: bool = false;
}

impl MyLookup for PallasLookupRangeCheck45BConfig {
impl MyLookup for PallasLookupRangeCheck4_5BConfig {
const ENABLE_HASH_FROM_PRIVATE_POINT: bool = true;
}

Expand Down Expand Up @@ -943,6 +943,6 @@ mod tests {

#[test]
fn commit_ivk_zsa() {
commit_ivk::<PallasLookupRangeCheck45BConfig>()
commit_ivk::<PallasLookupRangeCheck4_5BConfig>()
}
}

0 comments on commit 2cfde35

Please sign in to comment.