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

chore(frontend): expose literal method in MainPod builder + more op macros (#127)

Browse source 
* Expose literal builder method

* Add additional macros
This commit is contained in:
Ahmad Afuni 2025-03-12 23:30:11 +10:00 • committed by GitHub
parent 12ec220de6
commit abce0af675
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 127 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

191
src/examples.rs
View file

@ -105,156 +105,99 @@ pub fn eth_dos_pod_builder(
// Include Alice and Bob's keys as public statements. We don't // Include Alice and Bob's keys as public statements. We don't
// want to reveal the middleman. // want to reveal the middleman.
let alice_pubkey_copy = alice_bob_ethdos.pub_op(Operation( let alice_pubkey_copy = alice_bob_ethdos.pub_op(op!(new_entry, ("Alice", alice_pubkey)))?;
OperationType::Native(NativeOperation::NewEntry), let bob_pubkey_copy = alice_bob_ethdos.pub_op(op!(new_entry, ("Bob", bob_pubkey.clone())))?;
vec![OperationArg::Entry( let charlie_pubkey = alice_bob_ethdos.priv_op(op!(new_entry, ("Charlie", charlie_pubkey)))?;
"Alice".to_string(),
alice_pubkey.into(),
)],
))?;
let bob_pubkey_copy = alice_bob_ethdos.pub_op(Operation(
OperationType::Native(NativeOperation::NewEntry),
vec![OperationArg::Entry("Bob".to_string(), bob_pubkey.clone())],
))?;
let charlie_pubkey = alice_bob_ethdos.priv_op(Operation(
OperationType::Native(NativeOperation::NewEntry),
vec![OperationArg::Entry(
"Charlie".to_string(),
charlie_pubkey.into(),
)],
))?;
// The ETHDoS distance from Alice to Alice is 0. // The ETHDoS distance from Alice to Alice is 0.
let zero = alice_bob_ethdos.priv_op(Operation( let zero = alice_bob_ethdos.priv_literal(&0)?;
OperationType::Native(NativeOperation::NewEntry), let alice_equals_alice = alice_bob_ethdos.priv_op(op!(
vec![OperationArg::Entry("ZERO".to_string(), Value::from(0i64))], eq,
(alice_attestation, KEY_SIGNER),
alice_pubkey_copy.clone()
))?; ))?;
let alice_equals_alice = alice_bob_ethdos.priv_op(Operation( let ethdos_alice_alice_is_zero_base = alice_bob_ethdos.priv_op(op!(
OperationType::Native(NativeOperation::EqualFromEntries), custom,
vec![ eth_dos_base.clone(),
(alice_attestation, KEY_SIGNER).into(), alice_equals_alice,
OperationArg::Statement(alice_pubkey_copy.clone()), zero.clone()
],
))?; ))?;
let ethdos_alice_alice_is_zero_base = alice_bob_ethdos.priv_op(Operation( let ethdos_alice_alice_is_zero = alice_bob_ethdos.priv_op(op!(
OperationType::Custom(eth_dos_base.clone()), custom,
vec![ eth_dos.clone(),
OperationArg::Statement(alice_equals_alice), ethdos_alice_alice_is_zero_base
OperationArg::Statement(zero.clone()),
],
))?;
let ethdos_alice_alice_is_zero = alice_bob_ethdos.priv_op(Operation(
OperationType::Custom(eth_dos.clone()),
vec![OperationArg::Statement(ethdos_alice_alice_is_zero_base)],
))?; ))?;
// Alice and Charlie are ETH friends. // Alice and Charlie are ETH friends.
let attestation_is_signed_pod = Statement::from((alice_attestation, KEY_TYPE)); let attestation_is_signed_pod = Statement::from((alice_attestation, KEY_TYPE));
let attestation_signed_by_alice = alice_bob_ethdos.priv_op(Operation( let attestation_signed_by_alice =
OperationType::Native(NativeOperation::EqualFromEntries), alice_bob_ethdos.priv_op(op!(eq, (alice_attestation, KEY_SIGNER), alice_pubkey_copy))?;
vec![ let alice_attests_to_charlie = alice_bob_ethdos.priv_op(op!(
OperationArg::from((alice_attestation, KEY_SIGNER)), eq,
OperationArg::Statement(alice_pubkey_copy), (alice_attestation, "attestation"),
], charlie_pubkey.clone()
))?; ))?;
let alice_attests_to_charlie = alice_bob_ethdos.priv_op(Operation( let ethfriends_alice_charlie = alice_bob_ethdos.priv_op(op!(
OperationType::Native(NativeOperation::EqualFromEntries), custom,
vec![ eth_friend.clone(),
OperationArg::from((alice_attestation, "attestation")), attestation_is_signed_pod,
OperationArg::Statement(charlie_pubkey.clone()), attestation_signed_by_alice,
], alice_attests_to_charlie
))?;
let ethfriends_alice_charlie = alice_bob_ethdos.priv_op(Operation(
OperationType::Custom(eth_friend.clone()),
vec![
OperationArg::Statement(attestation_is_signed_pod),
OperationArg::Statement(attestation_signed_by_alice),
OperationArg::Statement(alice_attests_to_charlie),
],
))?; ))?;
// ...and so are Chuck and Bob. // ...and so are Chuck and Bob.
let attestation_is_signed_pod = Statement::from((charlie_attestation, KEY_TYPE)); let attestation_is_signed_pod = Statement::from((charlie_attestation, KEY_TYPE));
let attestation_signed_by_charlie = alice_bob_ethdos.priv_op(Operation( let attestation_signed_by_charlie =
OperationType::Native(NativeOperation::EqualFromEntries), alice_bob_ethdos.priv_op(op!(eq, (charlie_attestation, KEY_SIGNER), charlie_pubkey))?;
vec![ let charlie_attests_to_bob = alice_bob_ethdos.priv_op(op!(
OperationArg::from((charlie_attestation, KEY_SIGNER)), eq,
OperationArg::Statement(charlie_pubkey), (charlie_attestation, "attestation"),
], bob_pubkey_copy
))?; ))?;
let charlie_attests_to_bob = alice_bob_ethdos.priv_op(Operation( let ethfriends_charlie_bob = alice_bob_ethdos.priv_op(op!(
OperationType::Native(NativeOperation::EqualFromEntries), custom,
vec![ eth_friend.clone(),
OperationArg::from((charlie_attestation, "attestation")), attestation_is_signed_pod,
OperationArg::Statement(bob_pubkey_copy), attestation_signed_by_charlie,
], charlie_attests_to_bob
))?;
let ethfriends_charlie_bob = alice_bob_ethdos.priv_op(Operation(
OperationType::Custom(eth_friend.clone()),
vec![
OperationArg::Statement(attestation_is_signed_pod),
OperationArg::Statement(attestation_signed_by_charlie),
OperationArg::Statement(charlie_attests_to_bob),
],
))?; ))?;
// The ETHDoS distance from Alice to Charlie is 1. // The ETHDoS distance from Alice to Charlie is 1.
let one = alice_bob_ethdos.priv_op(Operation( let one = alice_bob_ethdos.priv_literal(&1)?;
OperationType::Native(NativeOperation::NewEntry),
vec![OperationArg::Entry("ONE".to_string(), Value::from(1i64))],
))?;
// 1 = 0 + 1 // 1 = 0 + 1
let ethdos_sum = alice_bob_ethdos.priv_op(Operation( let ethdos_sum =
OperationType::Native(NativeOperation::SumOf), alice_bob_ethdos.priv_op(op!(sum_of, one.clone(), zero.clone(), one.clone()))?;
vec![ let ethdos_alice_charlie_is_one_ind = alice_bob_ethdos.priv_op(op!(
OperationArg::Statement(one.clone()), custom,
OperationArg::Statement(zero.clone()), eth_dos_ind.clone(),
OperationArg::Statement(one.clone()), ethdos_alice_alice_is_zero,
], one.clone(),
ethdos_sum,
ethfriends_alice_charlie
))?; ))?;
let ethdos_alice_charlie_is_one_ind = alice_bob_ethdos.priv_op(Operation( let ethdos_alice_charlie_is_one = alice_bob_ethdos.priv_op(op!(
OperationType::Custom(eth_dos_ind.clone()), custom,
vec![ eth_dos.clone(),
OperationArg::Statement(ethdos_alice_alice_is_zero), ethdos_alice_charlie_is_one_ind
OperationArg::Statement(one.clone()),
OperationArg::Statement(ethdos_sum),
OperationArg::Statement(ethfriends_alice_charlie),
],
))?;
let ethdos_alice_charlie_is_one = alice_bob_ethdos.priv_op(Operation(
OperationType::Custom(eth_dos.clone()),
vec![OperationArg::Statement(ethdos_alice_charlie_is_one_ind)],
))?; ))?;
// The ETHDoS distance from Alice to Bob is 2. // The ETHDoS distance from Alice to Bob is 2.
// The constant "TWO" and the final statement are both to be // The constant "TWO" and the final statement are both to be
// public. // public.
let two = alice_bob_ethdos.pub_op(Operation( let two = alice_bob_ethdos.pub_literal(&2)?;
OperationType::Native(NativeOperation::NewEntry),
vec![OperationArg::Entry("TWO".to_string(), Value::from(2i64))],
))?;
// 2 = 1 + 1 // 2 = 1 + 1
let ethdos_sum = alice_bob_ethdos.priv_op(Operation( let ethdos_sum =
OperationType::Native(NativeOperation::SumOf), alice_bob_ethdos.priv_op(op!(sum_of, two.clone(), one.clone(), one.clone()))?;
vec![ let ethdos_alice_bob_is_two_ind = alice_bob_ethdos.priv_op(op!(
OperationArg::Statement(two.clone()), custom,
OperationArg::Statement(one.clone()), eth_dos_ind.clone(),
OperationArg::Statement(one.clone()), ethdos_alice_charlie_is_one,
], one.clone(),
))?; ethdos_sum,
let ethdos_alice_bob_is_two_ind = alice_bob_ethdos.priv_op(Operation( ethfriends_charlie_bob
OperationType::Custom(eth_dos_ind.clone()),
vec![
OperationArg::Statement(ethdos_alice_charlie_is_one),
OperationArg::Statement(one.clone()),
OperationArg::Statement(ethdos_sum),
OperationArg::Statement(ethfriends_charlie_bob),
],
))?;
let _ethdos_alice_bob_is_two = alice_bob_ethdos.pub_op(Operation(
OperationType::Custom(eth_dos.clone()),
vec![OperationArg::Statement(ethdos_alice_bob_is_two_ind)],
))?; ))?;
let _ethdos_alice_bob_is_two =
alice_bob_ethdos.pub_op(op!(custom, eth_dos.clone(), ethdos_alice_bob_is_two_ind))?;
Ok(alice_bob_ethdos) Ok(alice_bob_ethdos)
} }

57
src/frontend/mod.rs
View file

@ -330,15 +330,7 @@ impl MainPodBuilder {
} }
// todo: better error handling // todo: better error handling
OperationArg::Literal(v) => { OperationArg::Literal(v) => {
let k = format!("c{}", self.const_cnt); let value_of_st = self.literal(public, v)?;
self.const_cnt += 1;
let value_of_st = self.op(
public,
Operation(
OperationType::Native(NativeOperation::NewEntry),
vec![OperationArg::Entry(k.clone(), v.clone())],
),
)?;
*arg = OperationArg::Statement(value_of_st.clone()); *arg = OperationArg::Statement(value_of_st.clone());
st_args.push(value_of_st.1[0].clone()) st_args.push(value_of_st.1[0].clone())
} }
@ -650,6 +642,29 @@ impl MainPodBuilder {
Ok(self.statements[self.statements.len() - 1].clone()) Ok(self.statements[self.statements.len() - 1].clone())
} }
/// Convenience method for introducing public constants.
pub fn pub_literal<V: Clone + Into<Value>>(&mut self, v: &V) -> Result<Statement> {
self.literal(true, v)
}
/// Convenience method for introducing private constants.
pub fn priv_literal<V: Clone + Into<Value>>(&mut self, v: &V) -> Result<Statement> {
self.literal(false, v)
}
fn literal<V: Clone + Into<Value>>(&mut self, public: bool, v: &V) -> Result<Statement> {
let v: Value = v.clone().into();
let k = format!("c{}", self.const_cnt);
self.const_cnt += 1;
self.op(
public,
Operation(
OperationType::Native(NativeOperation::NewEntry),
vec![OperationArg::Entry(k.clone(), v)],
),
)
}
pub fn reveal(&mut self, st: &Statement) { pub fn reveal(&mut self, st: &Statement) {
self.public_statements.push(st.clone()); self.public_statements.push(st.clone());
} }
@ -875,6 +890,9 @@ pub mod build_utils {
#[macro_export] #[macro_export]
macro_rules! op { macro_rules! op {
(new_entry, ($key:expr, $value:expr)) => { $crate::frontend::Operation(
$crate::middleware::OperationType::Native($crate::middleware::NativeOperation::NewEntry),
$crate::op_args!(($key, $value))) };
(eq, $($arg:expr),+) => { $crate::frontend::Operation( (eq, $($arg:expr),+) => { $crate::frontend::Operation(
$crate::middleware::OperationType::Native($crate::middleware::NativeOperation::EqualFromEntries), $crate::middleware::OperationType::Native($crate::middleware::NativeOperation::EqualFromEntries),
$crate::op_args!($($arg),*)) }; $crate::op_args!($($arg),*)) };
@ -887,12 +905,33 @@ pub mod build_utils {
(lt, $($arg:expr),+) => { crate::frontend::Operation( (lt, $($arg:expr),+) => { crate::frontend::Operation(
crate::middleware::OperationType::Native(crate::middleware::NativeOperation::LtFromEntries), crate::middleware::OperationType::Native(crate::middleware::NativeOperation::LtFromEntries),
crate::op_args!($($arg),*)) }; crate::op_args!($($arg),*)) };
(transitive_eq, $($arg:expr),+) => { crate::frontend::Operation(
crate::middleware::OperationType::Native(crate::middleware::NativeOperation::TransitiveEqualFromStatements),
crate::op_args!($($arg),*)) };
(gt_to_ne, $($arg:expr),+) => { crate::frontend::Operation(
crate::middleware::OperationType::Native(crate::middleware::NativeOperation::GtToNotEqual),
crate::op_args!($($arg),*)) };
(lt_to_ne, $($arg:expr),+) => { crate::frontend::Operation(
crate::middleware::OperationType::Native(crate::middleware::NativeOperation::LtToNotEqual),
crate::op_args!($($arg),*)) };
(contains, $($arg:expr),+) => { crate::frontend::Operation( (contains, $($arg:expr),+) => { crate::frontend::Operation(
crate::middleware::OperationType::Native(crate::middleware::NativeOperation::ContainsFromEntries), crate::middleware::OperationType::Native(crate::middleware::NativeOperation::ContainsFromEntries),
crate::op_args!($($arg),*)) }; crate::op_args!($($arg),*)) };
(not_contains, $($arg:expr),+) => { crate::frontend::Operation( (not_contains, $($arg:expr),+) => { crate::frontend::Operation(
crate::middleware::OperationType::Native(crate::middleware::NativeOperation::NotContainsFromEntries), crate::middleware::OperationType::Native(crate::middleware::NativeOperation::NotContainsFromEntries),
crate::op_args!($($arg),*)) }; crate::op_args!($($arg),*)) };
(sum_of, $($arg:expr),+) => { crate::frontend::Operation(
crate::middleware::OperationType::Native(crate::middleware::NativeOperation::SumOf),
crate::op_args!($($arg),*)) };
(product_of, $($arg:expr),+) => { crate::frontend::Operation(
crate::middleware::OperationType::Native(crate::middleware::NativeOperation::ProductOf),
crate::op_args!($($arg),*)) };
(max_of, $($arg:expr),+) => { crate::frontend::Operation(
crate::middleware::OperationType::Native(crate::middleware::NativeOperation::MaxOf),
crate::op_args!($($arg),*)) };
(custom, $op:expr, $($arg:expr),+) => { $crate::frontend::Operation(
$crate::middleware::OperationType::Custom($op),
$crate::op_args!($($arg),*)) };
} }
} }

12
src/frontend/operation.rs
View file

@ -56,6 +56,18 @@ impl From<(&SignedPod, &str)> for OperationArg {
} }
} }
impl From<Statement> for OperationArg {
fn from(s: Statement) -> Self {
Self::Statement(s)
}
}
impl<V: Into<Value>> From<(&str, V)> for OperationArg {
fn from((key, value): (&str, V)) -> Self {
Self::Entry(key.to_string(), value.into())
}
}
#[derive(Clone, Debug, PartialEq, Eq)] #[derive(Clone, Debug, PartialEq, Eq)]
pub struct Operation(pub OperationType, pub Vec<OperationArg>); pub struct Operation(pub OperationType, pub Vec<OperationArg>);