Rename current methods

Cargo.toml

@@ -48,6 +48,7 @@ mpc-net = { path = "mpc-net", version = "0.1.0" }
 mpc-trait = { path = "mpc-trait", version = "0.1.0" }
 itertools = "0.13.0"
 nalgebra = "0.33.0"
+tokio = { version = "1.40.0", features = ["sync", "net"] }
 
 [dev-dependencies]
 criterion = { version = "0.4", features = ["html_reports"] }

mpc-algebra/Cargo.toml

@@ -29,12 +29,12 @@ mpc-net = { path = "../mpc-net" }
 mpc-trait = { path = "../mpc-trait" }
 
 structopt = "0.3"
-env_logger = "0.8"
 sha2 = "0.9"
+env_logger = "0.11.5"
 
 [features]
 default = ["ark-r1cs-std"]
 
 [[example]]
 name = "algebra"
-path = "examples/algebra.rs"
+path = "examples/algebra.rs"

mpc-algebra/examples/algebra.rs

@@ -8,12 +8,11 @@ use ark_poly::reveal;
 use ark_std::PubUniformRand;
 use ark_std::{end_timer, start_timer};
 use log::debug;
-use mpc_algebra::pedersen::Randomness;
 use mpc_algebra::boolean_field::MpcBooleanField;
+use mpc_algebra::pedersen::Randomness;
 use mpc_algebra::{
     edwards2, share, AdditiveFieldShare, BitAdd, BitDecomposition, BitwiseLessThan, BooleanWire,
-    CommitmentScheme as MpcCommitmentScheme, EqualityZero, LessThan,
-    LogicalOperations,
+    CommitmentScheme as MpcCommitmentScheme, EqualityZero, LessThan, LogicalOperations,
     MpcEdwardsProjective, MpcField, Reveal, UniformBitRand,
 };
 use mpc_net::{MpcMultiNet as Net, MpcNet};
@@ -412,7 +411,7 @@ fn test_pedersen_commitment() {
     // mpc calculation
     let mpc_parameters = MpcPed::setup(rng).unwrap();
 
-    let scalar_x_bytes = if Net::am_king() {
+    let scalar_x_bytes = if Net::is_leader() {
         x_bits
         .iter()
         .map(|b| {

mpc-algebra/src/channel.rs

@@ -20,7 +20,7 @@ pub trait MpcSerNet: MpcNet {
     fn send_to_king<T: CanonicalDeserialize + CanonicalSerialize>(out: &T) -> Option<Vec<T>> {
         let mut bytes_out = Vec::new();
         out.serialize(&mut bytes_out).unwrap();
-        Self::send_bytes_to_king(&bytes_out).map(|bytes_in| {
+        Self::worker_send_or_leader_receive(&bytes_out).map(|bytes_in| {
             bytes_in
                 .into_iter()
                 .map(|b| T::deserialize(&b[..]).unwrap())
@@ -29,7 +29,7 @@ pub trait MpcSerNet: MpcNet {
     }
 
     fn receive_from_king<T: CanonicalSerialize + CanonicalDeserialize>(out: Option<Vec<T>>) -> T {
-        let bytes_in = Self::recv_bytes_from_king(out.map(|outs| {
+        let bytes_in = Self::worker_receive_or_leader_send(out.map(|outs| {
             outs.iter()
                 .map(|out| {
                     let mut bytes_out = Vec::new();

mpc-algebra/src/r1cs_helper/groups/curves/twisted_edwards/mod.rs

@@ -469,7 +469,7 @@ where
         let revealed_xr = xytzrsuv.reveal();
 
         // step5: allocate share
-        let share = if Net::am_king() {
+        let share = if Net::is_leader() {
             MpcTEProjective::from_public(revealed_xr) - rsuv
         } else {
             -rsuv

mpc-algebra/src/share/additive.rs

@@ -88,7 +88,7 @@ impl<F: Field> Reveal for AdditiveFieldShare<F> {
 
     fn from_public(f: Self::Base) -> Self {
         Self {
-            val: if Net::am_king() { f } else { F::zero() },
+            val: if Net::is_leader() { f } else { F::zero() },
         }
     }
 
@@ -99,7 +99,7 @@ impl<F: Field> Reveal for AdditiveFieldShare<F> {
         let mut r: Vec<F> = (0..(Net::n_parties() - 1)).map(|_| F::rand(rng)).collect();
         let sum_r: F = r.iter().sum();
         r.push(f - sum_r);
-        Self::from_add_shared(Net::receive_from_king(if Net::am_king() {
+        Self::from_add_shared(Net::receive_from_king(if Net::is_leader() {
             Some(r)
         } else {
             None
@@ -113,7 +113,7 @@ impl<F: Field> Reveal for AdditiveFieldShare<F> {
             .map(|i| f[i] - &rs.iter().map(|r| &r[i]).sum())
             .collect();
         rs.push(final_shares);
-        Net::receive_from_king(if Net::am_king() { Some(rs) } else { None })
+        Net::receive_from_king(if Net::is_leader() { Some(rs) } else { None })
             .into_iter()
             .map(Self::from_add_shared)
             .collect()
@@ -144,7 +144,7 @@ impl<F: Field> FieldShare<F> for AdditiveFieldShare<F> {
     }
 
     fn shift(&mut self, other: &F) -> &mut Self {
-        if Net::am_king() {
+        if Net::is_leader() {
             self.val += other;
         }
         self
@@ -262,7 +262,7 @@ impl<F: Field> Reveal for MulFieldShare<F> {
     }
     fn from_public(f: F) -> Self {
         Self {
-            val: if Net::am_king() { f } else { F::one() },
+            val: if Net::is_leader() { f } else { F::one() },
         }
     }
     fn from_add_shared(f: F) -> Self {
@@ -290,7 +290,7 @@ impl<F: Field> FieldShare<F> for MulFieldShare<F> {
     }
 
     fn scale(&mut self, other: &F) -> &mut Self {
-        if Net::am_king() {
+        if Net::is_leader() {
             self.val *= other;
         }
         self
@@ -367,7 +367,7 @@ impl<G: Group, M> Reveal for AdditiveGroupShare<G, M> {
 
     fn from_public(b: G) -> Self {
         Self {
-            val: if Net::am_king() { b } else { G::zero() },
+            val: if Net::is_leader() { b } else { G::zero() },
             _phants: PhantomData,
         }
     }
@@ -379,7 +379,7 @@ impl<G: Group, M> Reveal for AdditiveGroupShare<G, M> {
         let mut r: Vec<G> = (0..(Net::n_parties() - 1)).map(|_| G::rand(rng)).collect();
         let sum_r: G = r.iter().sum();
         r.push(f - sum_r);
-        Self::from_add_shared(Net::receive_from_king(if Net::am_king() {
+        Self::from_add_shared(Net::receive_from_king(if Net::is_leader() {
             Some(r)
         } else {
             None
@@ -393,7 +393,7 @@ impl<G: Group, M> Reveal for AdditiveGroupShare<G, M> {
             .map(|i| f[i] - &rs.iter().map(|r| &r[i]).sum())
             .collect();
         rs.push(final_shares);
-        Net::receive_from_king(if Net::am_king() { Some(rs) } else { None })
+        Net::receive_from_king(if Net::is_leader() { Some(rs) } else { None })
             .into_iter()
             .map(Self::from_add_shared)
             .collect()
@@ -483,7 +483,7 @@ impl<G: Group, M: Msm<G, G::ScalarField>> GroupShare<G> for AdditiveGroupShare<G
     }
 
     fn shift(&mut self, other: &G) -> &mut Self {
-        if Net::am_king() {
+        if Net::is_leader() {
             self.val += other;
         }
         self
@@ -524,7 +524,7 @@ macro_rules! groups_share {
                 mut a: Self::ProjectiveShare,
                 o: &E::$affine,
             ) -> Self::ProjectiveShare {
-                if Net::am_king() {
+                if Net::is_leader() {
                     a.val.add_assign_mixed(&o);
                 }
                 a

mpc-algebra/src/share/spdz.rs

@@ -29,7 +29,7 @@ use crate::Reveal;
 
 #[inline]
 pub fn mac_share<F: Field>() -> F {
-    if Net::am_king() {
+    if Net::is_leader() {
         F::one()
     } else {
         F::zero()
@@ -145,7 +145,7 @@ impl<F: Field> Reveal for SpdzFieldShare<F> {
         let mut r: Vec<F> = (0..(Net::n_parties() - 1)).map(|_| F::rand(rng)).collect();
         let sum_r: F = r.iter().sum();
         r.push(f - sum_r);
-        Self::from_add_shared(Net::receive_from_king(if Net::am_king() {
+        Self::from_add_shared(Net::receive_from_king(if Net::is_leader() {
             Some(r)
         } else {
             None
@@ -159,7 +159,7 @@ impl<F: Field> Reveal for SpdzFieldShare<F> {
             .map(|i| f[i] - &rs.iter().map(|r| &r[i]).sum())
             .collect();
         rs.push(final_shares);
-        Net::receive_from_king(if Net::am_king() { Some(rs) } else { None })
+        Net::receive_from_king(if Net::is_leader() { Some(rs) } else { None })
             .into_iter()
             .map(Self::from_add_shared)
             .collect()
@@ -320,7 +320,7 @@ impl<G: Group, M> Reveal for SpdzGroupShare<G, M> {
         let mut r: Vec<G> = (0..(Net::n_parties() - 1)).map(|_| G::rand(rng)).collect();
         let sum_r: G = r.iter().sum();
         r.push(f - sum_r);
-        Self::from_add_shared(Net::receive_from_king(if Net::am_king() {
+        Self::from_add_shared(Net::receive_from_king(if Net::is_leader() {
             Some(r)
         } else {
             None
@@ -334,7 +334,7 @@ impl<G: Group, M> Reveal for SpdzGroupShare<G, M> {
             .map(|i| f[i] - &rs.iter().map(|r| &r[i]).sum())
             .collect();
         rs.push(final_shares);
-        Net::receive_from_king(if Net::am_king() { Some(rs) } else { None })
+        Net::receive_from_king(if Net::is_leader() { Some(rs) } else { None })
             .into_iter()
             .map(Self::from_add_shared)
             .collect()
@@ -455,7 +455,7 @@ impl<G: Group, M: Msm<G, G::ScalarField>> GroupShare<G> for SpdzGroupShare<G, M>
     }
 
     fn shift(&mut self, other: &G) -> &mut Self {
-        if Net::am_king() {
+        if Net::is_leader() {
             self.sh.shift(other);
         }
         let mut other = other.clone();
@@ -531,7 +531,7 @@ impl<F: Field, S: PrimeField> FieldShare<F> for SpdzMulFieldShare<F, S> {
     }
 
     fn scale(&mut self, other: &F) -> &mut Self {
-        if Net::am_king() {
+        if Net::is_leader() {
             self.sh.scale(other);
         }
         self.mac.scale(&other.pow(&mac_share::<S>().into_repr()));
@@ -642,7 +642,7 @@ macro_rules! groups_share {
                 mut a: Self::ProjectiveShare,
                 o: &E::$affine,
             ) -> Self::ProjectiveShare {
-                if Net::am_king() {
+                if Net::is_leader() {
                     a.sh.val.add_assign_mixed(&o);
                 }
                 a.mac.val += &o.scalar_mul(mac_share::<E::Fr>());

mpc-algebra/src/wire/edwards2.rs

@@ -885,7 +885,7 @@ impl<P: Parameters> AffProjShare<P::ScalarField, GroupAffine<P>, GroupProjective
         mut a: Self::ProjectiveShare,
         o: &GroupAffine<P>,
     ) -> Self::ProjectiveShare {
-        if Net::am_king() {
+        if Net::is_leader() {
             a.val.add_assign_mixed(&o);
         }
         a
@@ -928,7 +928,7 @@ impl<P: Parameters> AffProjShare<P::ScalarField, GroupAffine<P>, GroupProjective
         mut a: Self::ProjectiveShare,
         o: &GroupAffine<P>,
     ) -> Self::ProjectiveShare {
-        if Net::am_king() {
+        if Net::is_leader() {
             a.sh.val.add_assign_mixed(&o);
         }
         a

mpc-algebra/src/wire/field.rs

@@ -47,15 +47,35 @@ pub struct DummyFieldTripleSource<F, S> {
 impl<T: Field, S: FieldShare<T>> BeaverSource<S, S, S> for DummyFieldTripleSource<T, S> {
     fn triple(&mut self) -> (S, S, S) {
         (
-            S::from_add_shared(if Net::am_king() { T::one() } else { T::zero() }),
-            S::from_add_shared(if Net::am_king() { T::one() } else { T::zero() }),
-            S::from_add_shared(if Net::am_king() { T::one() } else { T::zero() }),
+            S::from_add_shared(if Net::is_leader() {
+                T::one()
+            } else {
+                T::zero()
+            }),
+            S::from_add_shared(if Net::is_leader() {
+                T::one()
+            } else {
+                T::zero()
+            }),
+            S::from_add_shared(if Net::is_leader() {
+                T::one()
+            } else {
+                T::zero()
+            }),
         )
     }
     fn inv_pair(&mut self) -> (S, S) {
         (
-            S::from_add_shared(if Net::am_king() { T::one() } else { T::zero() }),
-            S::from_add_shared(if Net::am_king() { T::one() } else { T::zero() }),
+            S::from_add_shared(if Net::is_leader() {
+                T::one()
+            } else {
+                T::zero()
+            }),
+            S::from_add_shared(if Net::is_leader() {
+                T::one()
+            } else {
+                T::zero()
+            }),
         )
     }
 }