[p2p/lookup] Support IP Updates Between Set Updates (#3047)

Author: patrick-ogrady

consensus/src/marshal/mod.rs

@@ -234,7 +234,7 @@ mod tests {
         let backfill = control.register(1, TEST_QUOTA).await.unwrap();
         let resolver_cfg = resolver::Config {
             public_key: validator.clone(),
-            manager: oracle.manager(),
+            provider: oracle.manager(),
             blocker: control.clone(),
             mailbox_size: config.mailbox_size,
             initial: Duration::from_secs(1),
@@ -475,7 +475,7 @@ mod tests {
             // Register the initial peer set.
             let mut manager = oracle.manager();
             manager
-                .update(0, participants.clone().try_into().unwrap())
+                .track(0, participants.clone().try_into().unwrap())
                 .await;
             for (i, validator) in participants.iter().enumerate() {
                 let (application, actor, _processed_height) = setup_validator(
@@ -625,7 +625,7 @@ mod tests {
             // Register the initial peer set.
             let mut manager = oracle.manager();
             manager
-                .update(0, participants.clone().try_into().unwrap())
+                .track(0, participants.clone().try_into().unwrap())
                 .await;
             for (i, validator) in participants.iter().enumerate().skip(1) {
                 let (application, actor, _processed_height) = setup_validator(
@@ -831,7 +831,7 @@ mod tests {
                     let backfill = control.register(0, TEST_QUOTA).await.unwrap();
                     let resolver_cfg = resolver::Config {
                         public_key: validator.clone(),
-                        manager: oracle_manager,
+                        provider: oracle_manager,
                         blocker: control.clone(),
                         mailbox_size: config.mailbox_size,
                         initial: Duration::from_secs(1),
@@ -1695,7 +1695,7 @@ mod tests {
             // Register the initial peer set
             let mut manager = oracle.manager();
             manager
-                .update(0, participants.clone().try_into().unwrap())
+                .track(0, participants.clone().try_into().unwrap())
                 .await;
 
             // Set up two validators

consensus/src/marshal/resolver/p2p.rs

@@ -5,20 +5,20 @@ use crate::{
     Block,
 };
 use commonware_cryptography::PublicKey;
-use commonware_p2p::{Blocker, Manager, Receiver, Sender};
+use commonware_p2p::{Blocker, Provider, Receiver, Sender};
 use commonware_resolver::p2p;
 use commonware_runtime::{Clock, Metrics, Spawner};
 use commonware_utils::channel::mpsc;
 use rand::Rng;
 use std::time::Duration;
 
 /// Configuration for the P2P [Resolver](commonware_resolver::Resolver).
-pub struct Config<P: PublicKey, C: Manager<PublicKey = P>, B: Blocker<PublicKey = P>> {
+pub struct Config<P: PublicKey, C: Provider<PublicKey = P>, B: Blocker<PublicKey = P>> {
     /// The public key to identify this node.
     pub public_key: P,
 
     /// The provider of peers that can be consulted for fetching data.
-    pub manager: C,
+    pub provider: C,
 
     /// The blocker that will be used to block peers that send invalid responses.
     pub blocker: B,
@@ -53,7 +53,7 @@ pub fn init<E, C, Bl, B, S, R, P>(
 )
 where
     E: Rng + Spawner + Clock + Metrics,
-    C: Manager<PublicKey = P>,
+    C: Provider<PublicKey = P>,
     Bl: Blocker<PublicKey = P>,
     B: Block,
     S: Sender<PublicKey = P>,
@@ -65,7 +65,7 @@ where
     let (resolver_engine, resolver) = p2p::Engine::new(
         ctx.with_label("resolver"),
         p2p::Config {
-            manager: config.manager,
+            provider: config.provider,
             blocker: config.blocker,
             consumer: handler.clone(),
             producer: handler,

consensus/src/simplex/actors/resolver/actor.rs

@@ -15,7 +15,7 @@ use bytes::Bytes;
 use commonware_codec::{Decode, Encode};
 use commonware_cryptography::Digest;
 use commonware_macros::select_loop;
-use commonware_p2p::{utils::StaticManager, Blocker, Receiver, Sender};
+use commonware_p2p::{utils::StaticProvider, Blocker, Receiver, Sender};
 use commonware_parallel::Strategy;
 use commonware_resolver::p2p;
 use commonware_runtime::{spawn_cell, Clock, ContextCell, Handle, Metrics, Spawner};
@@ -107,7 +107,7 @@ impl<
         let (resolver_engine, mut resolver) = p2p::Engine::new(
             self.context.with_label("resolver"),
             p2p::Config {
-                manager: StaticManager::new(self.epoch.get(), participants),
+                provider: StaticProvider::new(self.epoch.get(), participants),
                 blocker: self.blocker.take().expect("blocker must be set"),
                 consumer: handler.clone(),
                 producer: handler,

examples/bridge/src/bin/validator.rs

@@ -196,7 +196,7 @@ fn main() {
         //
         // In a real-world scenario, this would be updated as new peer sets are created (like when
         // the composition of a validator set changes).
-        oracle.update(0, validators.clone()).await;
+        oracle.track(0, validators.clone()).await;
 
         // Register consensus channels
         //

examples/chat/src/main.rs

@@ -172,7 +172,7 @@ fn main() {
         //
         // In a real-world scenario, this would be updated as new peer sets are created (like when
         // the composition of a validator set changes).
-        oracle.update(0, recipients).await;
+        oracle.track(0, recipients).await;
 
         // Initialize chat
         const MAX_MESSAGE_BACKLOG: usize = 128;

examples/flood/src/bin/flood.rs

@@ -140,7 +140,7 @@ fn main() {
             discovery::Network::new(context.with_label("network"), p2p_cfg);
 
         // Provide authorized peers
-        oracle.update(0, peer_keys.clone()).await;
+        oracle.track(0, peer_keys.clone()).await;
 
         // Register flood channel
         let (mut flood_sender, mut flood_receiver) = network.register(

examples/log/src/main.rs

@@ -169,7 +169,7 @@ fn main() {
         //
         // In a real-world scenario, this would be updated as new peer sets are created (like when
         // the composition of a validator set changes).
-        oracle.update(0, validators.clone()).await;
+        oracle.track(0, validators.clone()).await;
 
         // Register consensus channels
         //

examples/reshare/src/dkg/actor.rs

@@ -112,7 +112,7 @@ pub struct Config<C: Signer, P> {
 pub struct Actor<E, P, H, C, V>
 where
     E: Spawner + Metrics + CryptoRngCore + Clock + RuntimeStorage,
-    P: Manager<PublicKey = C::PublicKey, Peers = Set<C::PublicKey>>,
+    P: Manager<PublicKey = C::PublicKey>,
     H: Hasher,
     C: Signer,
     V: Variant,
@@ -135,7 +135,7 @@ where
 impl<E, P, H, C, V> Actor<E, P, H, C, V>
 where
     E: Spawner + Metrics + CryptoRngCore + Clock + RuntimeStorage,
-    P: Manager<PublicKey = C::PublicKey, Peers = Set<C::PublicKey>>,
+    P: Manager<PublicKey = C::PublicKey>,
     H: Hasher,
     C: Signer,
     V: Variant,
@@ -296,7 +296,7 @@ where
             // - Dealers and players for the active epoch
             // - Players for the next epoch
             self.manager
-                .update(
+                .track(
                     epoch.get(),
                     Set::from_iter_dedup(
                         dealers

examples/reshare/src/engine.rs

@@ -28,7 +28,7 @@ use commonware_runtime::{
     Storage,
 };
 use commonware_storage::archive::immutable;
-use commonware_utils::{channel::mpsc, ordered::Set, union, NZUsize, NZU16, NZU32, NZU64};
+use commonware_utils::{channel::mpsc, union, NZUsize, NZU16, NZU32, NZU64};
 use futures::future::try_join_all;
 use rand_core::CryptoRngCore;
 use std::{
@@ -56,7 +56,7 @@ const MAX_REPAIR: NonZero<usize> = NZUsize!(50);
 
 pub struct Config<C, P, B, V, T>
 where
-    P: Manager<PublicKey = C::PublicKey, Peers = Set<C::PublicKey>>,
+    P: Manager<PublicKey = C::PublicKey>,
     C: Signer,
     B: Blocker<PublicKey = C::PublicKey>,
     V: Variant,
@@ -78,7 +78,7 @@ pub struct Engine<E, C, P, B, H, V, S, L, T>
 where
     E: Spawner + Metrics + CryptoRngCore + Clock + Storage + Network,
     C: Signer,
-    P: Manager<PublicKey = C::PublicKey, Peers = Set<C::PublicKey>>,
+    P: Manager<PublicKey = C::PublicKey>,
     B: Blocker<PublicKey = C::PublicKey>,
     H: Hasher,
     V: Variant,
@@ -122,7 +122,7 @@ impl<E, C, P, B, H, V, S, L, T> Engine<E, C, P, B, H, V, S, L, T>
 where
     E: Spawner + Metrics + CryptoRngCore + Clock + Storage + Network,
     C: Signer,
-    P: Manager<PublicKey = C::PublicKey, Peers = Set<C::PublicKey>>,
+    P: Manager<PublicKey = C::PublicKey>,
     B: Blocker<PublicKey = C::PublicKey>,
     H: Hasher,
     V: Variant,

examples/reshare/src/validator.rs

@@ -105,7 +105,7 @@ pub async fn run<S, L>(
     // Create a static resolver for marshal
     let resolver_cfg = marshal_resolver::Config {
         public_key: config.signing_key.public_key(),
-        manager: oracle.clone(),
+        provider: oracle.clone(),
         blocker: oracle.clone(),
         mailbox_size: 200,
         initial: Duration::from_secs(1),
@@ -373,7 +373,7 @@ mod test {
             *restart_count += 1;
             let resolver_cfg = marshal_resolver::Config {
                 public_key: pk.clone(),
-                manager: oracle.manager(),
+                provider: oracle.manager(),
                 blocker: oracle.control(pk.clone()),
                 mailbox_size: 200,
                 initial: Duration::from_secs(1),