ed255/pod2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix custom predicate circuits and add tests for them (#235)

Browse source 
* add tests, fix custom predicates

* wip

* wip

* fix custom predicates

* modularize code

* fix typos

* remove scratch file

* update

* Update src/backends/plonky2/circuits/mainpod.rs

Co-authored-by: Ahmad Afuni <root@ahmadafuni.com>

---------

Co-authored-by: Ahmad Afuni <root@ahmadafuni.com>
This commit is contained in:
Eduard S. 2025-05-16 13:17:14 +02:00 • committed by GitHub
parent f5a1aa7523
commit def0730462
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 629 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/backends/plonky2/circuits/common.rs
View file

@ -153,7 +153,7 @@ impl<T> Build<T> for T {
}
impl StatementTarget {
/// Build a new native StatementTarget
/// Build a new native StatementTarget. Pads the arguments.
pub fn new_native(
builder: &mut CircuitBuilder<F, D>,
params: &Params,
@ -311,7 +311,7 @@ impl NativePredicateTarget {
#[derive(Clone)]
pub struct PredicateTarget {
elements: [Target; Params::predicate_size()],
pub(crate) elements: [Target; Params::predicate_size()],
}
impl PredicateTarget {
@ -520,8 +520,35 @@ impl CustomPredicateEntryTarget {
) -> Result<()> {
pw.set_target_arr(&self.id.elements, &predicate.batch.id().0)?;
pw.set_target(self.index, F::from_canonical_usize(predicate.index))?;
self.predicate
.set_targets(pw, params, predicate.predicate())?;
// Replace statement templates of batch-self with (id,index)
let batch = &predicate.batch;
let predicate = predicate.predicate();
let statements = predicate
.statements
.clone()
.into_iter()
.map(|st_tmpl| {
let pred = match st_tmpl.pred {
Predicate::BatchSelf(i) => Predicate::Custom(CustomPredicateRef {
batch: batch.clone(),
index: i,
}),
p => p,
};
StatementTmpl {
pred,
args: st_tmpl.args,
}
})
.collect_vec();
let predicate = CustomPredicate {
name: predicate.name.clone(),
conjunction: predicate.conjunction,
statements,
args_len: predicate.args_len,
};
self.predicate.set_targets(pw, params, &predicate)?;
Ok(())
}
}
@ -570,6 +597,7 @@ impl CustomPredicateVerifyEntryTarget {
self.custom_predicate_table_index,
F::from_canonical_usize(cpv.custom_predicate_table_index),
)?;
// Replace statement templates of batch-self with (id,index)
self.custom_predicate
.set_targets(pw, params, &cpv.custom_predicate)?;
let pad_arg = WildcardValue::None;
@ -1439,7 +1467,7 @@ pub(crate) mod tests {
let params = Params::default();
let config = CircuitConfig::standard_recursion_config();
let custom_predicate_batch = eth_friend_batch(&params)?;
let custom_predicate_batch = eth_friend_batch(&params, false)?;
for (i, cp) in custom_predicate_batch.predicates().iter().enumerate() {
let mut builder = CircuitBuilder::<F, D>::new(config.clone());
@ -1502,10 +1530,10 @@ pub(crate) mod tests {
helper_custom_predicate_batch_target_id(&params, &custom_predicate_batch).unwrap();
// Some cases from the examples
let custom_predicate_batch = eth_friend_batch(&params)?;
let custom_predicate_batch = eth_friend_batch(&params, false)?;
helper_custom_predicate_batch_target_id(&params, &custom_predicate_batch).unwrap();
let custom_predicate_batch = eth_dos_batch(&params)?;
let custom_predicate_batch = eth_dos_batch(&params, false)?;
helper_custom_predicate_batch_target_id(&params, &custom_predicate_batch).unwrap();
let custom_predicate_batch =