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

chore: drop hash_poseidon indirection #1193

Merged
merged 1 commit into from
Mar 5, 2024
Merged

chore: drop hash_poseidon indirection #1193

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
19 changes: 1 addition & 18 deletions src/circuit/gadgets/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,8 @@
use bellpepper_core::{boolean::Boolean, num::AllocatedNum, ConstraintSystem, SynthesisError};
use neptune::{
circuit2::poseidon_hash_allocated as poseidon_hash,
circuit2_witness::poseidon_hash_allocated_witness,
poseidon::{Arity, PoseidonConstants},
};
use bellpepper_core::{boolean::Boolean, num::AllocatedNum, ConstraintSystem};

use crate::field::LurkField;
use crate::tag::{ContTag, ExprTag, Op1, Op2, Tag};

pub(crate) fn hash_poseidon<CS: ConstraintSystem<F>, F: LurkField, A: Arity<F>>(
mut cs: CS,
preimage: Vec<AllocatedNum<F>>,
constants: &PoseidonConstants<F, A>,
) -> Result<AllocatedNum<F>, SynthesisError> {
if cs.is_witness_generator() {
poseidon_hash_allocated_witness(&mut cs, &preimage, constants)
} else {
poseidon_hash(cs, preimage, constants)
}
}

pub(crate) fn allocate_constant<F: LurkField, CS: ConstraintSystem<F>>(
cs: &mut CS,
val: F,
Expand Down
27 changes: 13 additions & 14 deletions src/coprocessor/gadgets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
//! Helper gadgets for synthesis

use std::borrow::Borrow;

use bellpepper_core::{boolean::Boolean, num::AllocatedNum, ConstraintSystem, SynthesisError};
use neptune::circuit2::poseidon_hash_allocated as poseidon_hash;
use std::borrow::Borrow;

use crate::{
circuit::gadgets::{
constraints::{boolean_to_num, implies_equal},
data::hash_poseidon,
pointer::AllocatedPtr,
},
field::LurkField,
Expand All @@ -32,7 +31,7 @@ pub(crate) fn construct_tuple2<F: LurkField, CS: ConstraintSystem<F>, T: Tag>(
) -> Result<AllocatedPtr<F>, SynthesisError> {
let tag = g.alloc_tag_cloned(cs, tag);

let hash = hash_poseidon(
let hash = poseidon_hash(
cs,
vec![
a.tag().clone(),
Expand All @@ -59,7 +58,7 @@ pub(crate) fn construct_tuple3<F: LurkField, CS: ConstraintSystem<F>, T: Tag>(
) -> Result<AllocatedPtr<F>, SynthesisError> {
let tag = g.alloc_tag_cloned(cs, tag);

let hash = hash_poseidon(
let hash = poseidon_hash(
cs,
vec![
a.tag().clone(),
Expand Down Expand Up @@ -89,7 +88,7 @@ pub(crate) fn construct_tuple4<F: LurkField, CS: ConstraintSystem<F>, T: Tag>(
) -> Result<AllocatedPtr<F>, SynthesisError> {
let tag = g.alloc_tag_cloned(cs, tag);

let hash = hash_poseidon(
let hash = poseidon_hash(
cs,
vec![
a.tag().clone(),
Expand Down Expand Up @@ -163,7 +162,7 @@ pub(crate) fn construct_env<F: LurkField, CS: ConstraintSystem<F>>(
) -> Result<AllocatedPtr<F>, SynthesisError> {
let tag = g.alloc_tag_cloned(cs, &ExprTag::Env);

let hash = hash_poseidon(
let hash = poseidon_hash(
cs,
vec![
var_hash.clone(),
Expand All @@ -188,7 +187,7 @@ pub(crate) fn construct_provenance<F: LurkField, CS: ConstraintSystem<F>>(
) -> Result<AllocatedPtr<F>, SynthesisError> {
let tag = g.alloc_tag_cloned(cs, &ExprTag::Prov);

let hash = hash_poseidon(
let hash = poseidon_hash(
cs,
vec![
query_hash.clone(),
Expand Down Expand Up @@ -236,7 +235,7 @@ pub(crate) fn deconstruct_env<F: LurkField, CS: ConstraintSystem<F>>(
let val_hash = AllocatedNum::alloc_infallible(ns!(cs, "val_hash"), || c);
let new_env_hash = AllocatedNum::alloc_infallible(ns!(cs, "new_env_hash"), || d);

let hash = hash_poseidon(
let hash = poseidon_hash(
ns!(cs, "hash"),
vec![
key_sym_hash.clone(),
Expand Down Expand Up @@ -288,7 +287,7 @@ pub(crate) fn deconstruct_provenance<F: LurkField, CS: ConstraintSystem<F>>(
let res_hash = AllocatedNum::alloc_infallible(ns!(cs, "res_hash"), || c);
let deps_tuple_hash = AllocatedNum::alloc_infallible(ns!(cs, "deps_tuple_hash"), || d);

let hash = hash_poseidon(
let hash = poseidon_hash(
ns!(cs, "hash"),
vec![
query_cons_hash.clone(),
Expand Down Expand Up @@ -348,7 +347,7 @@ pub(crate) fn deconstruct_tuple2<F: LurkField, CS: ConstraintSystem<F>>(
let a = AllocatedPtr::alloc_infallible(ns!(cs, "a"), || a);
let b = AllocatedPtr::alloc_infallible(ns!(cs, "b"), || b);

let hash = hash_poseidon(
let hash = poseidon_hash(
ns!(cs, "hash"),
vec![
a.tag().clone(),
Expand Down Expand Up @@ -387,7 +386,7 @@ pub(crate) fn deconstruct_tuple3<F: LurkField, CS: ConstraintSystem<F>>(
let b = AllocatedPtr::alloc_infallible(ns!(cs, "b"), || b);
let c = AllocatedPtr::alloc_infallible(ns!(cs, "c"), || c);

let hash = hash_poseidon(
let hash = poseidon_hash(
ns!(cs, "hash"),
vec![
a.tag().clone(),
Expand Down Expand Up @@ -442,7 +441,7 @@ pub(crate) fn deconstruct_tuple4<F: LurkField, CS: ConstraintSystem<F>>(
let c = AllocatedPtr::alloc_infallible(ns!(cs, "c"), || c);
let d = AllocatedPtr::alloc_infallible(ns!(cs, "d"), || d);

let hash = hash_poseidon(
let hash = poseidon_hash(
ns!(cs, "hash"),
vec![
a.tag().clone(),
Expand Down Expand Up @@ -547,7 +546,7 @@ pub(crate) fn car_cdr<F: LurkField, CS: ConstraintSystem<F>>(
&data_is_not_empty,
)?;

let hash = hash_poseidon(
let hash = poseidon_hash(
ns!(cs, "hash"),
vec![
car.tag().clone(),
Expand Down
11 changes: 6 additions & 5 deletions src/lem/circuit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ use bellpepper_core::{
},
};
use elsa::sync::FrozenMap;
use neptune::circuit2::poseidon_hash_allocated as poseidon_hash;
use std::{collections::HashSet, sync::Arc};

use crate::{
Expand All @@ -40,7 +41,7 @@ use crate::{
enforce_selector_with_premise, implies_equal, implies_equal_const, implies_pack,
implies_u64, implies_unequal_const, mul, or, pick, sub,
},
data::{allocate_constant, hash_poseidon},
data::allocate_constant,
pointer::AllocatedPtr,
},
coprocessor::Coprocessor,
Expand Down Expand Up @@ -198,22 +199,22 @@ fn allocate_img_for_slot<F: LurkField, CS: ConstraintSystem<F>>(
let cs = cs.namespace(|| format!("image for slot {slot}"));
let preallocated_img = {
match slot.typ {
SlotType::Hash4 => AllocatedVal::Number(hash_poseidon(
SlotType::Hash4 => AllocatedVal::Number(poseidon_hash(
cs,
preallocated_preimg,
store.poseidon_cache.constants.c4(),
)?),
SlotType::Hash6 => AllocatedVal::Number(hash_poseidon(
SlotType::Hash6 => AllocatedVal::Number(poseidon_hash(
cs,
preallocated_preimg,
store.poseidon_cache.constants.c6(),
)?),
SlotType::Hash8 => AllocatedVal::Number(hash_poseidon(
SlotType::Hash8 => AllocatedVal::Number(poseidon_hash(
cs,
preallocated_preimg,
store.poseidon_cache.constants.c8(),
)?),
SlotType::Commitment => AllocatedVal::Number(hash_poseidon(
SlotType::Commitment => AllocatedVal::Number(poseidon_hash(
cs,
preallocated_preimg,
store.poseidon_cache.constants.c3(),
Expand Down