Add names for custom predicates

Author: robknight

src/examples/custom.rs

@@ -37,6 +37,7 @@ pub fn eth_friend_batch(params: &Params) -> Result<Arc<CustomPredicateBatch>> {
                 .arg(("attestation_pod", literal("attestation")))
                 .arg(("dst_ori", "dst_key")),
         ],
+        "eth_friend",
     )?;
 
     println!("a.0. eth_friend = {}", builder.predicates.last().unwrap());
@@ -74,6 +75,7 @@ pub fn eth_dos_batch(params: &Params) -> Result<Arc<CustomPredicateBatch>> {
                 .arg(("distance_ori", "distance_key"))
                 .arg(0),
         ],
+        "eth_dos_distance_base",
     )?;
     println!(
         "b.0. eth_dos_distance_base = {}",
@@ -119,6 +121,7 @@ pub fn eth_dos_batch(params: &Params) -> Result<Arc<CustomPredicateBatch>> {
                 .arg(("intermed_ori", "intermed_key"))
                 .arg(("dst_ori", "dst_key")),
         ],
+        "eth_dos_distance_ind",
     )?;
 
     println!(
@@ -147,6 +150,7 @@ pub fn eth_dos_batch(params: &Params) -> Result<Arc<CustomPredicateBatch>> {
                 .arg(("dst_ori", "dst_key"))
                 .arg(("distance_ori", "distance_key")),
         ],
+        "eth_dos_distance",
     )?;
 
     println!(

src/frontend/custom.rs

@@ -208,6 +208,7 @@ impl CustomPredicateRef {
                     })
                     .collect(),
                 args_len: cp.args_len,
+                name: cp.name.to_string(),
             }
         };
         match custom_predicate.conjunction {
@@ -262,20 +263,32 @@ pub struct CustomPredicate {
     pub(crate) args_len: usize,
     // TODO: Add private args length?
     // TODO: Add args type information?
+    pub(crate) name: String,
 }
 
 impl CustomPredicate {
-    pub fn and(params: &Params, statements: Vec<StatementTmpl>, args_len: usize) -> Result<Self> {
-        Self::new(params, true, statements, args_len)
+    pub fn and(
+        params: &Params,
+        statements: Vec<StatementTmpl>,
+        args_len: usize,
+        name: &str,
+    ) -> Result<Self> {
+        Self::new(params, true, statements, args_len, name)
     }
-    pub fn or(params: &Params, statements: Vec<StatementTmpl>, args_len: usize) -> Result<Self> {
-        Self::new(params, false, statements, args_len)
+    pub fn or(
+        params: &Params,
+        statements: Vec<StatementTmpl>,
+        args_len: usize,
+        name: &str,
+    ) -> Result<Self> {
+        Self::new(params, false, statements, args_len, name)
     }
     pub fn new(
         params: &Params,
         conjunction: bool,
         statements: Vec<StatementTmpl>,
         args_len: usize,
+        name: &str,
     ) -> Result<Self> {
         if statements.len() > params.max_custom_predicate_arity {
             return Err(anyhow!("Custom predicate depends on too many statements"));
@@ -285,6 +298,7 @@ impl CustomPredicate {
             conjunction,
             statements,
             args_len,
+            name: name.to_string(),
         })
     }
 }
@@ -473,8 +487,9 @@ impl CustomPredicateBatchBuilder {
         args: &[&str],
         priv_args: &[&str],
         sts: &[StatementTmplBuilder],
+        name: &str,
     ) -> Result<Predicate> {
-        self.predicate(params, true, args, priv_args, sts)
+        self.predicate(params, true, args, priv_args, sts, name)
     }
 
     pub fn predicate_or(
@@ -483,8 +498,9 @@ impl CustomPredicateBatchBuilder {
         args: &[&str],
         priv_args: &[&str],
         sts: &[StatementTmplBuilder],
+        name: &str,
     ) -> Result<Predicate> {
-        self.predicate(params, false, args, priv_args, sts)
+        self.predicate(params, false, args, priv_args, sts, name)
     }
 
     /// creates the custom predicate from the given input, adds it to the
@@ -496,6 +512,7 @@ impl CustomPredicateBatchBuilder {
         args: &[&str],
         priv_args: &[&str],
         sts: &[StatementTmplBuilder],
+        name: &str,
     ) -> Result<Predicate> {
         let statements = sts
             .iter()
@@ -517,7 +534,8 @@ impl CustomPredicateBatchBuilder {
                 }
             })
             .collect();
-        let custom_predicate = CustomPredicate::new(params, conjunction, statements, args.len())?;
+        let custom_predicate =
+            CustomPredicate::new(params, conjunction, statements, args.len(), name)?;
         self.predicates.push(custom_predicate);
         Ok(Predicate::BatchSelf(self.predicates.len() - 1))
     }

src/frontend/serialization.rs

@@ -154,7 +154,6 @@ pub fn transform_value_schema(schema: &mut Schema) {
 #[cfg(test)]
 mod tests {
     use schemars::generate::SchemaSettings;
-    use serde_json::json;
 
     use crate::{
         backends::plonky2::mock::{mainpod::MockProver, signedpod::MockSigner},

src/middleware/statement.rs

@@ -5,9 +5,7 @@ use serde::{Deserialize, Serialize};
 use std::{fmt, iter};
 use strum_macros::FromRepr;
 
-use super::{
-    AnchoredKey, CustomPredicateRef, Params, Predicate, ToFields, Value, F, HASH_SIZE, VALUE_SIZE,
-};
+use super::{AnchoredKey, CustomPredicateRef, Params, Predicate, ToFields, Value, F, VALUE_SIZE};
 
 pub const KEY_SIGNER: &str = "_signer";
 pub const KEY_TYPE: &str = "_type";