Skip to content

Add extra front-end types and make MainPodBuilder emit these #166

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
robknight merged 8 commits into from
Apr 7, 2025
Merged

Add extra front-end types and make MainPodBuilder emit these #166

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fac4ee7
All test pass on middleware->frontend type refactor
robknight Mar 25, 2025
a83da21
Convert frontend CustomPredicateRef to a named field struct
robknight Mar 26, 2025
2b7ad67
Minor serialization improvements
robknight Mar 27, 2025
6ee329e
Set appropriate titles in JSON schemas
robknight Mar 27, 2025
7ca92d0
Add names for custom predicates
robknight Mar 30, 2025
675fde5
Remove PodClass from front-end Origin type
robknight Apr 2, 2025
64818a7
Merge branch 'main' into robknight/custom-predicate-frontend
ax0 Apr 4, 2025
81dc917
Simplify value conversion
robknight Apr 7, 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
16 changes: 10 additions & 6 deletions src/examples/custom.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ use std::sync::Arc;
use anyhow::Result;

use crate::{
frontend::{literal, CustomPredicateBatchBuilder, StatementTmplBuilder},
middleware::{
CustomPredicateBatch, CustomPredicateRef, NativePredicate, Params, PodType, Predicate,
KEY_SIGNER, KEY_TYPE,
frontend::{
literal, CustomPredicateBatch, CustomPredicateBatchBuilder, CustomPredicateRef,
NativePredicate, Predicate, StatementTmplBuilder, Value,
},
middleware::{self, Params, PodType, KEY_SIGNER, KEY_TYPE},
};

use NativePredicate as NP;
Expand All @@ -27,7 +27,7 @@ pub fn eth_friend_batch(params: &Params) -> Result<Arc<CustomPredicateBatch>> {
// there is an attestation pod that's a SignedPod
STB::new(NP::ValueOf)
.arg(("attestation_pod", literal(KEY_TYPE)))
.arg(PodType::MockSigned), // TODO
.arg(Value::from(middleware::Value::from(PodType::MockSigned))), // TODO
Copy link
Collaborator

@ax0 ax0 Mar 26, 2025

Choose a reason for hiding this comment

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

These Value type conversions are getting out of hand.

Copy link
Collaborator

@ed255 ed255 Apr 6, 2025

Choose a reason for hiding this comment

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

Suggested change
.arg(Value::from(middleware::Value::from(PodType::MockSigned))), // TODO
.arg(middleware::Value::from(PodType::MockSigned)), // TODO

This also works, and it's a bit shorter.
But I agree with @ax0 that maybe the From implementations between types of the same name in frontend and middleware may be making the code harder to follow.

Copy link
Collaborator

@ed255 ed255 Apr 7, 2025

Choose a reason for hiding this comment

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

I'll explore enriching the middleware types with "metadata" so that we can avoid duplicating so many types in the frontend. #171

// the attestation pod is signed by (src_or, src_key)
STB::new(NP::Equal)
.arg(("attestation_pod", literal(KEY_SIGNER)))
Expand All @@ -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());
Expand All @@ -45,7 +46,7 @@ pub fn eth_friend_batch(params: &Params) -> Result<Arc<CustomPredicateBatch>> {

/// Instantiates an ETHDoS batch
pub fn eth_dos_batch(params: &Params) -> Result<Arc<CustomPredicateBatch>> {
let eth_friend = Predicate::Custom(CustomPredicateRef(eth_friend_batch(params)?, 0));
let eth_friend = Predicate::Custom(CustomPredicateRef::new(eth_friend_batch(params)?, 0));
let mut builder = CustomPredicateBatchBuilder::new("eth_dos_distance_base".into());

// eth_dos_distance_base(src_or, src_key, dst_or, dst_key, distance_or, distance_key) = and<
Expand Down Expand Up @@ -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 = {}",
Expand Down Expand Up @@ -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!(
Expand Down Expand Up @@ -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!(
Expand Down
10 changes: 5 additions & 5 deletions src/examples/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ use custom::{eth_dos_batch, eth_friend_batch};
use std::collections::HashMap;

use crate::backends::plonky2::mock::signedpod::MockSigner;
use crate::frontend::CustomPredicateRef;
use crate::frontend::{
containers::{Dictionary, Set},
MainPodBuilder, SignedPod, SignedPodBuilder, Statement, Value,
};
use crate::middleware::CustomPredicateRef;
use crate::middleware::{Params, PodType, KEY_SIGNER, KEY_TYPE};
use crate::op;

Expand Down Expand Up @@ -94,11 +94,11 @@ pub fn eth_dos_pod_builder(
bob_pubkey: &Value,
) -> Result<MainPodBuilder> {
// Will need ETH friend and ETH DoS custom predicate batches.
let eth_friend = CustomPredicateRef(eth_friend_batch(params)?, 0);
let eth_friend = CustomPredicateRef::new(eth_friend_batch(params)?, 0);
let eth_dos_batch = eth_dos_batch(params)?;
let eth_dos_base = CustomPredicateRef(eth_dos_batch.clone(), 0);
let eth_dos_ind = CustomPredicateRef(eth_dos_batch.clone(), 1);
let eth_dos = CustomPredicateRef(eth_dos_batch.clone(), 2);
let eth_dos_base = CustomPredicateRef::new(eth_dos_batch.clone(), 0);
let eth_dos_ind = CustomPredicateRef::new(eth_dos_batch.clone(), 1);
let eth_dos = CustomPredicateRef::new(eth_dos_batch.clone(), 2);

// ETHDoS POD builder
let mut alice_bob_ethdos = MainPodBuilder::new(params);
Expand Down
Loading
Loading