Multiple committees

Cargo.toml

@@ -39,6 +39,7 @@ alloy-signer = "1.0.5"
 alloy-signer-local = "1.0.5"
 anyhow = "1.0.89"
 arbitrary = "1.4.1"
+arbtest = "0.3.2"
 ark-bn254 = "0.5"
 ark-ec = "0.5"
 ark-ff = "0.5"
@@ -47,6 +48,7 @@ ark-secp256k1 = "0.5"
 ark-bls12-381 = "0.5"
 ark-serialize = { version = "0.5", features = ["derive"] }
 ark-std = { version = "0.5", default-features = false }
+arrayvec = "0.7.6"
 async-lock = "3.3"
 async-trait = "0.1"
 bimap = "0.6.3"
@@ -90,6 +92,7 @@ spongefish = { git = "https://github.com/arkworks-rs/spongefish.git", rev = "e9f
 thiserror = "2.0"
 tide-disco = "0.9.3"
 tokio = { version = "1", default-features = false, features = ["full"] }
+tokio-stream = "0.1.17"
 toml = "0.8.19"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }

cliquenet/src/addr.rs

@@ -1,6 +1,8 @@
+use std::collections::HashMap;
 use std::fmt;
 use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
 
+use multisig::{Committee, PublicKey, x25519};
 use serde::{Deserialize, Deserializer, Serialize, Serializer, de};
 
 /// A network address.
@@ -134,6 +136,67 @@ impl<'de> Deserialize<'de> for Address {
     }
 }
 
+/// A `Committee` plus address information.
+#[derive(Debug, Clone)]
+pub struct AddressableCommittee {
+    committee: Committee,
+    addresses: HashMap<PublicKey, (x25519::PublicKey, Address)>,
+}
+
+impl AddressableCommittee {
+    pub fn new<I, A>(c: Committee, addrs: I) -> Self
+    where
+        I: IntoIterator<Item = (PublicKey, x25519::PublicKey, A)>,
+        A: Into<Address>,
+    {
+        let this = Self {
+            committee: c,
+            addresses: addrs
+                .into_iter()
+                .map(|(k, x, a)| (k, (x, a.into())))
+                .collect(),
+        };
+        this.assert_shared_domain();
+        this
+    }
+
+    pub fn committee(&self) -> &Committee {
+        &self.committee
+    }
+
+    pub fn address(&self, p: &PublicKey) -> Option<&(x25519::PublicKey, Address)> {
+        self.addresses.get(p)
+    }
+
+    pub fn parties(&self) -> impl Iterator<Item = &PublicKey> {
+        self.addresses.keys()
+    }
+
+    pub fn entries(&self) -> impl Iterator<Item = (PublicKey, x25519::PublicKey, Address)> {
+        self.addresses.iter().map(|(k, (x, a))| (*k, *x, a.clone()))
+    }
+
+    pub fn diff(
+        &self,
+        other: &Self,
+    ) -> impl Iterator<Item = (PublicKey, x25519::PublicKey, Address)> {
+        self.addresses
+            .iter()
+            .filter(|(k, _)| !other.addresses.contains_key(k))
+            .map(|(k, (x, a))| (*k, *x, a.clone()))
+    }
+
+    /// Assert that addresses and committee have the same keys.
+    fn assert_shared_domain(&self) {
+        for p in self.committee.parties() {
+            assert!(self.addresses.contains_key(p), "{p} has no address")
+        }
+        for k in self.addresses.keys() {
+            assert!(self.committee.contains_key(k), "{k} not in committee")
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::Address;

cliquenet/src/lib.rs

@@ -10,7 +10,7 @@ mod time;
 
 pub mod overlay;
 
-pub use addr::{Address, InvalidAddress};
+pub use addr::{Address, AddressableCommittee, InvalidAddress};
 pub use error::NetworkError;
 pub use id::Id;
 pub use metrics::NetworkMetrics;
@@ -22,3 +22,21 @@ pub const MAX_MESSAGE_SIZE: usize = 5 * 1024 * 1024;
 
 /// Max. number of messages to queue for a peer.
 pub const PEER_CAPACITY: usize = 256;
+
+/// Network peer role.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum Role {
+    /// Active peers receive broadcast messages.
+    Active,
+    /// Passive peers are excluded from broadcasts.
+    ///
+    /// Note however that passive peers can be addressed directly in
+    /// unicast or multicast operations.
+    Passive,
+}
+
+impl Role {
+    pub fn is_active(self) -> bool {
+        matches!(self, Self::Active)
+    }
+}