From d973fd42f2e04bdf8f9c33f5ddba2497a5c750cd Mon Sep 17 00:00:00 2001
From: cloudhead <cloudhead@radicle.xyz>
Date: Wed, 9 Aug 2023 10:48:58 +0200
Subject: [PATCH] cli: Auto-connect on sync

This adds functionality so that on `rad sync` and `rad clone`, we
connect to known seeds if necessary, before attempting to fetch.

In passing, some related changes were made:

* The `rad sync` command's arguments were reworked:
  `--replicas <count>` can be used to specify a replica count when
    fetching
* The `rad patch` command no longer has a `--fetch` option
* It's now possible to tell the node not to automatically connect to
  peers in the background
* `AddressBook` is being used underneath `Seeds` to allow for shuffled
  iteration
---
 radicle-cli/examples/rad-clone-connect.md |  16 ++
 radicle-cli/examples/rad-sync.md          |  38 ++++
 radicle-cli/src/commands/clone.rs         |   8 +-
 radicle-cli/src/commands/patch.rs         |  16 +-
 radicle-cli/src/commands/sync.rs          | 216 +++++++++++++++-------
 radicle-cli/src/commands/track.rs         |   8 +-
 radicle-cli/tests/commands.rs             |  74 ++++++++
 radicle-crypto/src/lib.rs                 |  14 +-
 radicle-node/src/service.rs               |  53 +++---
 radicle-node/src/test/environment.rs      |  28 ++-
 radicle/src/node.rs                       |  42 +++--
 radicle/src/node/address/types.rs         |  27 ++-
 radicle/src/node/config.rs                |  24 +++
 radicle/src/profile.rs                    |  14 +-
 14 files changed, 429 insertions(+), 149 deletions(-)
 create mode 100644 radicle-cli/examples/rad-clone-connect.md

diff --git a/radicle-cli/examples/rad-clone-connect.md b/radicle-cli/examples/rad-clone-connect.md
new file mode 100644
index 00000000..af23c657
--- /dev/null
+++ b/radicle-cli/examples/rad-clone-connect.md
@@ -0,0 +1,16 @@
+If we're not connecting to seed nodes when cloning, the `clone` command will
+automatically connect to the necessary seeds.
+
+```
+$ rad clone rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
+✓ Tracking relationship established for rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji with scope 'all'
+✓ Connecting to z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi[..]
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6MknSL…StBU8Vi..
+✓ Connecting to z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk[..]
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
+✓ Forking under z6Mkux1…nVhib7Z..
+✓ Creating checkout in ./heartwood..
+✓ Remote alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi added
+✓ Remote-tracking branch alice@z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi/master created for z6MknSL…StBU8Vi
+✓ Repository successfully cloned under [..]/heartwood/
+```
diff --git a/radicle-cli/examples/rad-sync.md b/radicle-cli/examples/rad-sync.md
index a319ab5c..fd400da3 100644
--- a/radicle-cli/examples/rad-sync.md
+++ b/radicle-cli/examples/rad-sync.md
@@ -25,3 +25,41 @@ $ rad sync --announce --timeout 1
 ! Seed z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z timed out..
 ✗ Sync failed: all seeds timed out
 ```
+
+We can also use the `--fetch` option to only fetch objects:
+
+```
+$ rad sync --fetch
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
+✓ Fetched repository from 2 seed(s)
+```
+
+Specifying both `--fetch` and `--announce` is equivalent to specifying none:
+
+``` (fail)
+$ rad sync --fetch --announce
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
+✓ Fetched repository from 2 seed(s)
+✗ Syncing with 2 node(s)..
+! Seed z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk timed out..
+! Seed z6Mkux1aUQD2voWWukVb5nNUR7thrHveQG4pDQua8nVhib7Z timed out..
+✗ Sync failed: all seeds timed out
+```
+
+It's also possible to use the `--seed` flag to only sync with a specific node:
+
+```
+$ rad sync --fetch --seed z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk..
+✓ Fetched repository from 1 seed(s)
+```
+
+And the `--replicas` flag to sync with a number of nodes:
+
+```
+$ rad sync --fetch --replicas 1
+✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkux1…nVhib7Z..
+✓ Fetched repository from 1 seed(s)
+```
diff --git a/radicle-cli/src/commands/clone.rs b/radicle-cli/src/commands/clone.rs
index 9f4edbd6..3f54713d 100644
--- a/radicle-cli/src/commands/clone.rs
+++ b/radicle-cli/src/commands/clone.rs
@@ -2,6 +2,7 @@
 use std::ffi::OsString;
 use std::path::Path;
 use std::str::FromStr;
+use std::time;
 
 use anyhow::anyhow;
 use thiserror::Error;
@@ -183,7 +184,12 @@ pub fn clone<G: Signer>(
         );
     }
 
-    let results = sync::fetch_all(id, node)?;
+    let results = sync::fetch(
+        id,
+        sync::SyncMode::default(),
+        time::Duration::from_secs(9),
+        node,
+    )?;
     let Ok(repository) = storage.repository(id) else {
         // If we don't have the project locally, even after attempting to fetch,
         // there's nothing we can do.
diff --git a/radicle-cli/src/commands/patch.rs b/radicle-cli/src/commands/patch.rs
index 5e5cd7c9..ececa1a7 100644
--- a/radicle-cli/src/commands/patch.rs
+++ b/radicle-cli/src/commands/patch.rs
@@ -25,10 +25,9 @@ use anyhow::anyhow;
 
 use radicle::cob::patch;
 use radicle::cob::patch::PatchId;
+use radicle::prelude::*;
 use radicle::storage::git::transport;
-use radicle::{prelude::*, Node};
 
-use crate::commands::rad_sync as sync;
 use crate::git::Rev;
 use crate::terminal as term;
 use crate::terminal::args::{string, Args, Error, Help};
@@ -158,7 +157,6 @@ pub enum Operation {
 #[derive(Debug)]
 pub struct Options {
     pub op: Operation,
-    pub fetch: bool,
     pub announce: bool,
     pub push: bool,
     pub verbose: bool,
@@ -171,7 +169,6 @@ impl Args for Options {
         let mut parser = lexopt::Parser::from_args(args);
         let mut op: Option<OperationName> = None;
         let mut verbose = false;
-        let mut fetch = false;
         let mut announce = false;
         let mut patch_id = None;
         let mut revision_id = None;
@@ -194,12 +191,6 @@ impl Args for Options {
                 Long("no-message") => {
                     message = Message::Blank;
                 }
-                Long("fetch") => {
-                    fetch = true;
-                }
-                Long("no-fetch") => {
-                    fetch = false;
-                }
                 Long("announce") => {
                     announce = true;
                 }
@@ -327,7 +318,6 @@ impl Args for Options {
         Ok((
             Options {
                 op,
-                fetch,
                 push,
                 verbose,
                 announce,
@@ -346,10 +336,6 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
 
     transport::local::register(profile.storage.clone());
 
-    if options.fetch {
-        sync::fetch_all(repository.id(), &mut Node::new(profile.socket()))?;
-    }
-
     match options.op {
         Operation::List { filter: Filter(f) } => {
             list::run(f, &repository, &profile)?;
diff --git a/radicle-cli/src/commands/sync.rs b/radicle-cli/src/commands/sync.rs
index d0b1141f..01e1856c 100644
--- a/radicle-cli/src/commands/sync.rs
+++ b/radicle-cli/src/commands/sync.rs
@@ -6,7 +6,7 @@ use anyhow::{anyhow, Context as _};
 
 use radicle::node;
 use radicle::node::{FetchResult, FetchResults, Handle as _, Node};
-use radicle::prelude::{Id, NodeId, Profile};
+use radicle::prelude::{Id, NodeId};
 
 use crate::terminal as term;
 use crate::terminal::args::{Args, Error, Help};
@@ -19,35 +19,57 @@ pub const HELP: Help = Help {
 Usage
 
     rad sync [<rid>] [<option>...]
-    rad sync [<rid>] [--fetch] [--seed <nid>] [<option>...]
-    rad sync [<rid>] [--announce] [<option>...]
+    rad sync [<rid>] [--fetch] [<rid>] [<option>...]
+    rad sync [<rid>] [--announce] [<rid>] [<option>...]
 
     By default, the current repository is synchronized both ways.
+    If an <rid> is specified, that repository is synced instead.
 
     The process begins by fetching changes from connected seeds,
     followed by announcing local refs to peers, thereby prompting
     them to fetch from us.
 
-    When `--fetch` is specified, a seed may be given with the `--seed`
-    option.
+    When `--fetch` is specified, any number of seeds may be given
+    using the `--seed` option, eg. `--seed <nid>@<addr>:<port>`.
 
-    When either `--fetch` or `--announce` are specified, this command
+    When `--replicas` is specified, the given replication factor will try
+    to be matched. For example, `--replicas 5` will sync with 5 seeds.
+
+    When `--fetch` or `--announce` are specified on their own, this command
     will only fetch or announce.
 
 Options
 
-    --fetch, -f         Fetch from seeds
-    --announce, -a      Announce refs to seeds
-    --seed <nid>        Seed to fetch from (use with `--fetch`)
-    --timeout <secs>    How many seconds to wait while syncing
-    --verbose, -v       Verbose output
-    --help              Print help
-
+    --fetch, -f               Turn on fetching (default: true)
+    --announce, -a            Turn on announcing (default: true)
+    --timeout <secs>          How many seconds to wait while syncing
+    --seed <nid>              Sync with the given node (may be specified multiple times)
+    --replicas, -r <count>    Sync with a specific number of seeds
+    --verbose, -v             Verbose output
+    --help                    Print help
 "#,
 };
 
-#[derive(Default, Debug, PartialEq, Eq)]
+#[derive(Debug, Default, PartialEq, Eq)]
+pub struct SyncOptions {
+    mode: SyncMode,
+    direction: SyncDirection,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum SyncMode {
+    Replicas(usize),
+    Seeds(Vec<NodeId>),
+}
+
+impl Default for SyncMode {
+    fn default() -> Self {
+        Self::Replicas(3)
+    }
+}
+
+#[derive(Debug, Default, PartialEq, Eq)]
+pub enum SyncDirection {
     Fetch,
     Announce,
     #[default]
@@ -57,10 +79,9 @@ pub enum SyncMode {
 #[derive(Default, Debug)]
 pub struct Options {
     pub rid: Option<Id>,
-    pub seed: Option<NodeId>,
     pub verbose: bool,
     pub timeout: time::Duration,
-    pub mode: SyncMode,
+    pub sync: SyncOptions,
 }
 
 impl Args for Options {
@@ -71,24 +92,46 @@ impl Args for Options {
         let mut verbose = false;
         let mut timeout = time::Duration::from_secs(9);
         let mut rid = None;
-        let mut seed = None;
-        let mut mode = SyncMode::default();
+        let mut sync = SyncOptions::default();
 
         while let Some(arg) = parser.next()? {
             match arg {
                 Long("verbose") | Short('v') => {
                     verbose = true;
                 }
+                Long("fetch") | Short('f') => {
+                    sync.direction = match sync.direction {
+                        SyncDirection::Both => SyncDirection::Fetch,
+                        SyncDirection::Announce => SyncDirection::Both,
+                        SyncDirection::Fetch => SyncDirection::Fetch,
+                    };
+                }
+                Long("replicas") | Short('r') => {
+                    let val = parser.value()?;
+                    let count = term::args::number(&val)?;
+
+                    if let SyncMode::Replicas(ref mut r) = sync.mode {
+                        *r = count;
+                    } else {
+                        anyhow::bail!("`--replicas` (-r) cannot be specified with `--seed`");
+                    }
+                }
                 Long("seed") => {
                     let val = parser.value()?;
-                    let val = term::args::nid(&val)?;
-                    seed = Some(val);
+                    let nid = term::args::nid(&val)?;
+
+                    if let SyncMode::Seeds(ref mut seeds) = sync.mode {
+                        seeds.push(nid);
+                    } else {
+                        sync.mode = SyncMode::Seeds(vec![nid]);
+                    }
                 }
-                Long("fetch") | Short('f') if mode == SyncMode::Both => {
-                    mode = SyncMode::Fetch;
-                }
-                Long("announce") | Short('a') if mode == SyncMode::Both => {
-                    mode = SyncMode::Announce;
+                Long("announce") | Short('a') => {
+                    sync.direction = match sync.direction {
+                        SyncDirection::Both => SyncDirection::Announce,
+                        SyncDirection::Announce => SyncDirection::Announce,
+                        SyncDirection::Fetch => SyncDirection::Both,
+                    };
                 }
                 Long("timeout") | Short('t') => {
                     let value = parser.value()?;
@@ -108,8 +151,10 @@ impl Args for Options {
             }
         }
 
-        if seed.is_some() && mode != SyncMode::Fetch {
-            anyhow::bail!("`--seed` must be used with `--fetch`");
+        if sync.direction == SyncDirection::Announce {
+            if let SyncMode::Seeds(_) = sync.mode {
+                anyhow::bail!("`--seed` is only supported when fetching.");
+            }
         }
 
         Ok((
@@ -117,8 +162,7 @@ impl Args for Options {
                 rid,
                 verbose,
                 timeout,
-                seed,
-                mode,
+                sync,
             },
             vec![],
         ))
@@ -136,22 +180,35 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
             rid
         }
     };
-
     let mut node = radicle::Node::new(profile.socket());
+    let mode = options.sync.mode;
 
-    match options.mode {
-        SyncMode::Announce => announce(rid, options.timeout, node),
-        SyncMode::Fetch => fetch(rid, options.seed, &mut node, profile),
-        SyncMode::Both => {
-            fetch(rid, options.seed, &mut node, profile)?;
-            announce(rid, options.timeout, node)?;
+    if [SyncDirection::Fetch, SyncDirection::Both].contains(&options.sync.direction) {
+        if !profile.tracking()?.is_repo_tracked(&rid)? {
+            anyhow::bail!("repository {rid} is not tracked");
+        }
+        let results = fetch(rid, mode.clone(), options.timeout, &mut node)?;
+        let success = results.success().count();
+        let failed = results.failed().count();
 
-            Ok(())
+        if success == 0 {
+            term::error(format!("Failed to fetch repository from {failed} seed(s)"));
+        } else {
+            term::success!("Fetched repository from {success} seed(s)");
         }
     }
+    if [SyncDirection::Announce, SyncDirection::Both].contains(&options.sync.direction) {
+        announce(rid, mode, options.timeout, node)?;
+    }
+    Ok(())
 }
 
-fn announce(rid: Id, timeout: time::Duration, mut node: Node) -> anyhow::Result<()> {
+fn announce(
+    rid: Id,
+    _mode: SyncMode,
+    timeout: time::Duration,
+    mut node: Node,
+) -> anyhow::Result<()> {
     let seeds = node.seeds(rid)?;
     let connected = seeds.connected().map(|s| s.nid).collect::<Vec<_>>();
     if connected.is_empty() {
@@ -184,45 +241,80 @@ fn announce(rid: Id, timeout: time::Duration, mut node: Node) -> anyhow::Result<
 
 pub fn fetch(
     rid: Id,
-    seed: Option<NodeId>,
+    mode: SyncMode,
+    timeout: time::Duration,
     node: &mut Node,
-    profile: Profile,
-) -> anyhow::Result<()> {
-    if !profile.tracking()?.is_repo_tracked(&rid)? {
-        anyhow::bail!("repository {rid} is not tracked");
+) -> Result<FetchResults, node::Error> {
+    match mode {
+        SyncMode::Seeds(seeds) => {
+            let mut results = FetchResults::default();
+            for seed in seeds {
+                let result = fetch_from(rid, &seed, node)?;
+                results.push(seed, result);
+            }
+            Ok(results)
+        }
+        SyncMode::Replicas(count) => fetch_all(rid, count, timeout, node),
     }
-
-    let results = if let Some(seed) = seed {
-        let result = fetch_from(rid, &seed, node)?;
-        FetchResults::from(vec![(seed, result)])
-    } else {
-        fetch_all(rid, node)?
-    };
-    let success = results.success().count();
-    let failed = results.failed().count();
-
-    if success == 0 {
-        term::error(format!("Failed to fetch repository from {failed} seed(s)"));
-    } else {
-        term::success!("Fetched repository from {success} seed(s)");
-    }
-    Ok(())
 }
 
-pub fn fetch_all(rid: Id, node: &mut Node) -> Result<FetchResults, node::Error> {
+fn fetch_all(
+    rid: Id,
+    count: usize,
+    timeout: time::Duration,
+    node: &mut Node,
+) -> Result<FetchResults, node::Error> {
     // Get seeds. This consults the local routing table only.
     let seeds = node.seeds(rid)?;
     let mut results = FetchResults::default();
+    let (connected, mut disconnected) = seeds.partition();
 
     // Fetch from connected seeds.
-    for seed in seeds.connected() {
+    for seed in connected.iter().take(count) {
         let result = fetch_from(rid, &seed.nid, node)?;
         results.push(seed.nid, result);
     }
+
+    // Try to connect to disconnected seeds and fetch from them.
+    while results.success().count() < count {
+        let Some(seed) = disconnected.pop() else {
+            break;
+        };
+        // Try all seed addresses until one succeeds.
+        for ka in seed.addrs {
+            let spinner = term::spinner(format!(
+                "Connecting to {}@{}..",
+                term::format::tertiary(&seed.nid),
+                term::format::tertiary(&ka.addr)
+            ));
+            let cr = node.connect(
+                seed.nid,
+                ka.addr,
+                node::ConnectOptions {
+                    persistent: false,
+                    timeout,
+                },
+            )?;
+
+            match cr {
+                node::ConnectResult::Connected => {
+                    spinner.finish();
+                    let result = fetch_from(rid, &seed.nid, node)?;
+                    results.push(seed.nid, result);
+                    break;
+                }
+                node::ConnectResult::Disconnected { .. } => {
+                    spinner.failed();
+                    continue;
+                }
+            }
+        }
+    }
+
     Ok(results)
 }
 
-pub fn fetch_from(rid: Id, seed: &NodeId, node: &mut Node) -> Result<FetchResult, node::Error> {
+fn fetch_from(rid: Id, seed: &NodeId, node: &mut Node) -> Result<FetchResult, node::Error> {
     let spinner = term::spinner(format!(
         "Fetching {} from {}..",
         term::format::tertiary(rid),
diff --git a/radicle-cli/src/commands/track.rs b/radicle-cli/src/commands/track.rs
index ce018084..e285bd40 100644
--- a/radicle-cli/src/commands/track.rs
+++ b/radicle-cli/src/commands/track.rs
@@ -1,4 +1,5 @@
 use std::ffi::OsString;
+use std::time;
 
 use anyhow::anyhow;
 
@@ -123,7 +124,12 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
             track_repo(rid, scope, &mut node)?;
 
             if options.fetch {
-                sync::fetch(rid, None, &mut node, profile)?;
+                sync::fetch(
+                    rid,
+                    sync::SyncMode::default(),
+                    time::Duration::from_secs(6),
+                    &mut node,
+                )?;
             }
         }
     }
diff --git a/radicle-cli/tests/commands.rs b/radicle-cli/tests/commands.rs
index b557e743..92a9a988 100644
--- a/radicle-cli/tests/commands.rs
+++ b/radicle-cli/tests/commands.rs
@@ -3,6 +3,9 @@ use std::str::FromStr;
 use std::{env, thread, time};
 
 use radicle::git;
+use radicle::node;
+use radicle::node::address::Store as _;
+use radicle::node::routing::Store as _;
 use radicle::node::Alias;
 use radicle::node::Handle as _;
 use radicle::prelude::Id;
@@ -512,6 +515,77 @@ fn rad_clone_all() {
     eve.has_inventory_of(&acme, &bob.id);
 }
 
+#[test]
+fn rad_clone_connect() {
+    let mut environment = Environment::new();
+    let working = environment.tmp().join("working");
+    let alice = environment.node(Config::test(Alias::new("alice")));
+    let bob = environment.node(Config::test(Alias::new("bob")));
+    let mut eve = environment.node(Config::test(Alias::new("eve")));
+    let acme = Id::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+    let now = localtime::LocalTime::now().as_secs();
+
+    fixtures::repository(working.join("acme"));
+
+    test(
+        "examples/rad-init.md",
+        working.join("acme"),
+        Some(&alice.home),
+        [],
+    )
+    .unwrap();
+
+    let mut alice = alice.spawn();
+    let mut bob = bob.spawn();
+
+    // Let Eve know about Alice and Bob having the repo.
+    eve.routing.insert([&acme], alice.id, now).unwrap();
+    eve.routing.insert([&acme], bob.id, now).unwrap();
+    eve.addresses
+        .insert(
+            &alice.id,
+            node::Features::SEED,
+            Alias::new("alice"),
+            0,
+            now,
+            [node::KnownAddress::new(
+                node::Address::from(alice.addr),
+                node::address::Source::Imported,
+            )],
+        )
+        .unwrap();
+    eve.addresses
+        .insert(
+            &bob.id,
+            node::Features::SEED,
+            Alias::new("bob"),
+            0,
+            now,
+            [node::KnownAddress::new(
+                node::Address::from(bob.addr),
+                node::address::Source::Imported,
+            )],
+        )
+        .unwrap();
+    eve.config.peers = node::config::PeerConfig::Static;
+
+    let eve = eve.spawn();
+
+    bob.handle.track_repo(acme, Scope::All).unwrap();
+    alice.connect(&bob);
+    bob.routes_to(&[(acme, alice.id)]);
+    eve.routes_to(&[(acme, alice.id), (acme, bob.id)]);
+    alice.routes_to(&[(acme, alice.id), (acme, bob.id)]);
+
+    test(
+        "examples/rad-clone-connect.md",
+        working.join("acme"),
+        Some(&eve.home),
+        [],
+    )
+    .unwrap();
+}
+
 #[test]
 fn rad_self() {
     let mut environment = Environment::new();
diff --git a/radicle-crypto/src/lib.rs b/radicle-crypto/src/lib.rs
index 21580c49..a2a57c6a 100644
--- a/radicle-crypto/src/lib.rs
+++ b/radicle-crypto/src/lib.rs
@@ -152,7 +152,7 @@ impl TryFrom<String> for Signature {
 }
 
 /// The public/verification key.
-#[derive(Serialize, Deserialize, Eq, Copy, Clone)]
+#[derive(Hash, Serialize, Deserialize, PartialEq, Eq, Copy, Clone)]
 #[serde(into = "String", try_from = "String")]
 pub struct PublicKey(pub ed25519::PublicKey);
 
@@ -282,12 +282,6 @@ pub enum PublicKeyError {
     InvalidKey(#[from] ed25519::Error),
 }
 
-impl std::hash::Hash for PublicKey {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.0.deref().hash(state)
-    }
-}
-
 impl PartialOrd for PublicKey {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
         self.0.as_ref().partial_cmp(other.as_ref())
@@ -318,12 +312,6 @@ impl fmt::Debug for PublicKey {
     }
 }
 
-impl PartialEq for PublicKey {
-    fn eq(&self, other: &Self) -> bool {
-        self.0 == other.0
-    }
-}
-
 impl From<ed25519::PublicKey> for PublicKey {
     fn from(other: ed25519::PublicKey) -> Self {
         Self(other)
diff --git a/radicle-node/src/service.rs b/radicle-node/src/service.rs
index 6aafcc5e..4dc2b8a0 100644
--- a/radicle-node/src/service.rs
+++ b/radicle-node/src/service.rs
@@ -22,6 +22,7 @@ use nonempty::NonEmpty;
 
 use radicle::node::address;
 use radicle::node::address::{AddressBook, KnownAddress};
+use radicle::node::config::PeerConfig;
 use radicle::node::ConnectOptions;
 
 use crate::crypto;
@@ -53,8 +54,6 @@ use self::limitter::RateLimiter;
 use self::message::InventoryAnnouncement;
 use self::tracking::NamespacesError;
 
-/// Target number of peers to maintain connections to.
-pub const TARGET_OUTBOUND_PEERS: usize = 8;
 /// How often to run the "idle" task.
 pub const IDLE_INTERVAL: LocalDuration = LocalDuration::from_secs(30);
 /// How often to run the "announce" task.
@@ -1359,30 +1358,31 @@ where
     }
 
     fn seeds(&self, rid: &Id) -> Result<Seeds, Error> {
-        let seeds = match self.routing.get(rid) {
-            Ok(seeds) => seeds.into_iter().fold(Seeds::default(), |mut seeds, node| {
-                if node != self.node_id() {
-                    let addrs: Vec<KnownAddress> = self
-                        .addresses
-                        .get(&node)
-                        .ok()
-                        .flatten()
-                        .map(|n| n.addrs)
-                        .unwrap_or(vec![]);
+        match self.routing.get(rid) {
+            Ok(seeds) => {
+                Ok(seeds
+                    .into_iter()
+                    .fold(Seeds::new(self.rng.clone()), |mut seeds, node| {
+                        if node != self.node_id() {
+                            let addrs: Vec<KnownAddress> = self
+                                .addresses
+                                .get(&node)
+                                .ok()
+                                .flatten()
+                                .map(|n| n.addrs)
+                                .unwrap_or(vec![]);
 
-                    if let Some(s) = self.sessions.get(&node) {
-                        seeds.insert(Seed::new(node, addrs, Some(s.state.clone())));
-                    } else {
-                        seeds.insert(Seed::new(node, addrs, None));
-                    }
-                }
-                seeds
-            }),
-            Err(err) => {
-                return Err(Error::Routing(err));
+                            if let Some(s) = self.sessions.get(&node) {
+                                seeds.insert(Seed::new(node, addrs, Some(s.state.clone())));
+                            } else {
+                                seeds.insert(Seed::new(node, addrs, None));
+                            }
+                        }
+                        seeds
+                    }))
             }
-        };
-        Ok(seeds)
+            Err(err) => Err(Error::Routing(err)),
+        }
     }
 
     /// Return a new filter object, based on our tracking policy.
@@ -1513,6 +1513,9 @@ where
     }
 
     fn maintain_connections(&mut self) {
+        let PeerConfig::Dynamic { target } = self.config.peers else {
+            return;
+        };
         trace!(target: "service", "Maintaining connections..");
 
         let now = self.clock;
@@ -1522,7 +1525,7 @@ where
             .filter(|s| s.link.is_outbound())
             .filter(|s| s.is_connected() || s.is_connecting())
             .count();
-        let wanted = TARGET_OUTBOUND_PEERS.saturating_sub(outbound);
+        let wanted = target.saturating_sub(outbound);
 
         // Don't connect to more peers than needed.
         if wanted == 0 {
diff --git a/radicle-node/src/test/environment.rs b/radicle-node/src/test/environment.rs
index e24ef74e..98d8802d 100644
--- a/radicle-node/src/test/environment.rs
+++ b/radicle-node/src/test/environment.rs
@@ -19,9 +19,10 @@ use radicle::git;
 use radicle::git::refname;
 use radicle::identity::Id;
 use radicle::node::address::Book;
+use radicle::node::routing;
 use radicle::node::routing::Store;
-use radicle::node::tracking::store as TrackingStore;
-use radicle::node::{Alias, ADDRESS_DB_FILE, TRACKING_DB_FILE};
+use radicle::node::tracking::store as tracking;
+use radicle::node::{Alias, ADDRESS_DB_FILE, ROUTING_DB_FILE, TRACKING_DB_FILE};
 use radicle::node::{ConnectOptions, Handle as _};
 use radicle::profile;
 use radicle::profile::Home;
@@ -79,16 +80,24 @@ impl Environment {
     pub fn node(&mut self, config: Config) -> Node<MemorySigner> {
         let profile = self.profile(&config.alias);
         let signer = MemorySigner::load(&profile.keystore, None).unwrap();
+
         let tracking_db = profile.home.node().join(TRACKING_DB_FILE);
-        TrackingStore::Config::open(tracking_db).unwrap();
+        let tracking = tracking::Config::open(tracking_db).unwrap();
+
+        let routing_db = profile.home.node().join(ROUTING_DB_FILE);
+        let routing = routing::Table::open(routing_db).unwrap();
+
         let addresses_db = profile.home.node().join(ADDRESS_DB_FILE);
-        Book::open(addresses_db).unwrap();
+        let addresses = Book::open(addresses_db).unwrap();
 
         Node {
             id: *profile.id(),
             home: profile.home,
             config,
             signer,
+            addresses,
+            routing,
+            tracking,
             storage: profile.storage,
         }
     }
@@ -104,7 +113,7 @@ impl Environment {
         let alias = Alias::from_str(alias).unwrap();
         let config = profile::Config::init(alias, &home.config()).unwrap();
 
-        TrackingStore::Config::open(tracking_db).unwrap();
+        tracking::Config::open(tracking_db).unwrap();
         let addresses_db = home.node().join(ADDRESS_DB_FILE);
         Book::open(addresses_db).unwrap();
 
@@ -131,6 +140,9 @@ pub struct Node<G> {
     pub signer: G,
     pub storage: Storage,
     pub config: Config,
+    pub addresses: Book,
+    pub routing: routing::Table,
+    pub tracking: tracking::Config<tracking::Write>,
 }
 
 /// Handle to a running node.
@@ -320,6 +332,9 @@ impl Node<MockSigner> {
         let home = Home::new(home).unwrap();
         let signer = MockSigner::default();
         let storage = Storage::open(home.storage()).unwrap();
+        let addresses = Book::memory().unwrap();
+        let tracking = tracking::Config::<tracking::Write>::memory().unwrap();
+        let routing = routing::Table::memory().unwrap();
 
         Self {
             id: *signer.public_key(),
@@ -327,6 +342,9 @@ impl Node<MockSigner> {
             signer,
             storage,
             config,
+            addresses,
+            tracking,
+            routing,
         }
     }
 }
diff --git a/radicle/src/node.rs b/radicle/src/node.rs
index 62d7abff..ecea6c48 100644
--- a/radicle/src/node.rs
+++ b/radicle/src/node.rs
@@ -6,7 +6,7 @@ pub mod events;
 pub mod routing;
 pub mod tracking;
 
-use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
+use std::collections::{BTreeSet, HashMap, HashSet};
 use std::io::{BufRead, BufReader};
 use std::ops::Deref;
 use std::os::unix::net::UnixStream;
@@ -23,6 +23,7 @@ use serde_json as json;
 
 use crate::crypto::PublicKey;
 use crate::identity::Id;
+use crate::profile;
 use crate::storage::RefUpdate;
 
 pub use address::KnownAddress;
@@ -66,7 +67,7 @@ pub enum PingState {
     Ok,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[allow(clippy::large_enum_variant)]
 pub enum State {
     /// Initial state for outgoing connections.
@@ -401,7 +402,7 @@ pub struct Session {
     pub state: State,
 }
 
-#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
+#[derive(Clone, Debug, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Seed {
     pub nid: NodeId,
@@ -420,10 +421,18 @@ impl Seed {
     }
 }
 
-#[derive(Clone, Debug, Default, serde::Serialize, serde::Deserialize)]
-pub struct Seeds(BTreeMap<NodeId, Seed>);
+#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)]
+/// Represents a set of seeds with associated metadata. Uses an RNG
+/// underneath, so every iteration returns a different ordering.
+pub struct Seeds(address::AddressBook<NodeId, Seed>);
 
 impl Seeds {
+    /// Create a new seeds list from an RNG.
+    pub fn new(rng: fastrand::Rng) -> Self {
+        Self(address::AddressBook::new(rng))
+    }
+
+    /// Insert a seed.
     pub fn insert(&mut self, seed: Seed) {
         self.0.insert(seed.nid, seed);
     }
@@ -431,21 +440,30 @@ impl Seeds {
     /// Partitions the list of seeds into connected and disconnected seeds.
     /// Note that the disconnected seeds may be in a "connecting" state.
     pub fn partition(&self) -> (Vec<Seed>, Vec<Seed>) {
-        self.0.values().cloned().partition(|s| s.is_connected())
+        self.0
+            .shuffled()
+            .map(|(_, v)| v)
+            .cloned()
+            .partition(|s| s.is_connected())
     }
 
     /// Return connected seeds.
     pub fn connected(&self) -> impl Iterator<Item = &Seed> {
-        self.0.values().filter(|s| s.is_connected())
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &Seed> {
-        self.0.values()
+        self.0
+            .shuffled()
+            .map(|(_, v)| v)
+            .filter(|s| s.is_connected())
     }
 
+    /// Check if a seed is connected.
     pub fn is_connected(&self, nid: &NodeId) -> bool {
         self.0.get(nid).map_or(false, |s| s.is_connected())
     }
+
+    /// Return a new seeds object with the given RNG.
+    pub fn with(self, rng: fastrand::Rng) -> Self {
+        Self(self.0.with(rng))
+    }
 }
 
 /// Announcement result returned by [`Node::announce`].
@@ -803,7 +821,7 @@ impl Handle for Node {
             .next()
             .ok_or(Error::EmptyResponse)??;
 
-        Ok(seeds)
+        Ok(seeds.with(profile::env::rng()))
     }
 
     fn fetch(&mut self, rid: Id, from: NodeId) -> Result<FetchResult, Error> {
diff --git a/radicle/src/node/address/types.rs b/radicle/src/node/address/types.rs
index e048b737..d4abe98b 100644
--- a/radicle/src/node/address/types.rs
+++ b/radicle/src/node/address/types.rs
@@ -1,3 +1,4 @@
+use std::hash;
 use std::ops::{Deref, DerefMut};
 
 use localtime::LocalTime;
@@ -9,13 +10,15 @@ use crate::node::{Address, Alias};
 use crate::prelude::Timestamp;
 
 /// A map with the ability to randomly select values.
-#[derive(Debug, Clone)]
-pub struct AddressBook<K, V> {
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(transparent)]
+pub struct AddressBook<K: hash::Hash + Eq, V> {
     inner: RandomMap<K, V>,
+    #[serde(skip)]
     rng: fastrand::Rng,
 }
 
-impl<K, V> AddressBook<K, V> {
+impl<K: hash::Hash + Eq, V> AddressBook<K, V> {
     /// Create a new address book.
     pub fn new(rng: fastrand::Rng) -> Self {
         Self {
@@ -53,14 +56,22 @@ impl<K, V> AddressBook<K, V> {
 
     /// Return a shuffled iterator over the keys.
     pub fn shuffled(&self) -> std::vec::IntoIter<(&K, &V)> {
-        let mut keys = self.inner.iter().collect::<Vec<_>>();
-        self.rng.shuffle(&mut keys);
+        let mut items = self.inner.iter().collect::<Vec<_>>();
+        self.rng.shuffle(&mut items);
 
-        keys.into_iter()
+        items.into_iter()
+    }
+
+    /// Return a new address book with the given RNG.
+    pub fn with(self, rng: fastrand::Rng) -> Self {
+        Self {
+            inner: self.inner,
+            rng,
+        }
     }
 }
 
-impl<K, V> Deref for AddressBook<K, V> {
+impl<K: hash::Hash + Eq, V> Deref for AddressBook<K, V> {
     type Target = RandomMap<K, V>;
 
     fn deref(&self) -> &Self::Target {
@@ -68,7 +79,7 @@ impl<K, V> Deref for AddressBook<K, V> {
     }
 }
 
-impl<K, V> DerefMut for AddressBook<K, V> {
+impl<K: hash::Hash + Eq, V> DerefMut for AddressBook<K, V> {
     fn deref_mut(&mut self) -> &mut Self::Target {
         &mut self.inner
     }
diff --git a/radicle/src/node/config.rs b/radicle/src/node/config.rs
index 93e61cb4..a696e0fc 100644
--- a/radicle/src/node/config.rs
+++ b/radicle/src/node/config.rs
@@ -8,6 +8,9 @@ use crate::node;
 use crate::node::tracking::{Policy, Scope};
 use crate::node::{Address, Alias, NodeId};
 
+/// Target number of peers to maintain connections to.
+pub const TARGET_OUTBOUND_PEERS: usize = 8;
+
 /// Peer-to-peer network.
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -103,12 +106,32 @@ impl Deref for ConnectAddress {
     }
 }
 
+/// Peer configuration.
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase", tag = "type")]
+pub enum PeerConfig {
+    /// Static peer set. Connect to the configured peers and maintain the connections.
+    Static,
+    /// Dynamic peer set.
+    Dynamic { target: usize },
+}
+
+impl Default for PeerConfig {
+    fn default() -> Self {
+        Self::Dynamic {
+            target: TARGET_OUTBOUND_PEERS,
+        }
+    }
+}
+
 /// Service configuration.
 #[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Config {
     /// Node alias.
     pub alias: Alias,
+    /// Peer configuration.
+    pub peers: PeerConfig,
     /// Peers to connect to on startup.
     /// Connections to these peers will be maintained.
     pub connect: HashSet<ConnectAddress>,
@@ -137,6 +160,7 @@ impl Config {
     pub fn new(alias: Alias) -> Self {
         Self {
             alias,
+            peers: PeerConfig::default(),
             connect: HashSet::default(),
             external_addresses: vec![],
             network: Network::default(),
diff --git a/radicle/src/profile.rs b/radicle/src/profile.rs
index c870eb1d..a0e33717 100644
--- a/radicle/src/profile.rs
+++ b/radicle/src/profile.rs
@@ -50,13 +50,13 @@ pub mod env {
 
     /// Get a random number generator from the environment.
     pub fn rng() -> fastrand::Rng {
-        let Ok(seed) = std::env::var(RAD_RNG_SEED) else {
-            return fastrand::Rng::new();
-        };
-        fastrand::Rng::with_seed(
-            seed.parse()
-                .expect("env::rng: invalid seed specified in `RAD_RNG_SEED`"),
-        )
+        if let Ok(seed) = std::env::var(RAD_RNG_SEED) {
+            return fastrand::Rng::with_seed(
+                seed.parse()
+                    .expect("env::rng: invalid seed specified in `RAD_RNG_SEED`"),
+            );
+        }
+        fastrand::Rng::new()
     }
 }