From c534b25dbd94dc41731f98e4c4b2a170fe02c347 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 16 Nov 2026 20:44:13 +0000 Subject: handshake: the party its sender is of In a swarm holding a store, a node's handshakes name the party it is of (`docs/store.md`, Members), so that a peer tells whether it is a member before its entry reaches it: HELLO and HELLO_REPLY carry `party`, as `--store-party` says, None elsewhere and without the `federation` feature. Wire format version 52. --- src/simtest/timing.rs | 2 ++ src/swarm/peer/handshake.rs | 14 ++++++++++++++ src/transport/mod.rs | 7 +++++++ src/transport/wire.rs | 13 ++++++++++--- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/simtest/timing.rs b/src/simtest/timing.rs index 5f93acc..ba85bb9 100644 --- a/src/simtest/timing.rs +++ b/src/simtest/timing.rs @@ -283,6 +283,7 @@ async fn resent_hello_keeps_the_session() { run_id: run, handshake, root: None, + party: None, }) }; for repeated in [handshake, handshake.saturating_sub(1)] { @@ -327,6 +328,7 @@ async fn late_epoch_does_not_flip_a_peers_epoch() { run_id: run, handshake: 1, root: None, + party: None, }) }; let status = |epoch: Epoch, epoch_seq: u32| { diff --git a/src/swarm/peer/handshake.rs b/src/swarm/peer/handshake.rs index 8e9b0ef..4cc0cf4 100644 --- a/src/swarm/peer/handshake.rs +++ b/src/swarm/peer/handshake.rs @@ -142,6 +142,7 @@ async fn transmit_hello(state: &AppState, peer: &str) -> Result<()> { root: crate::swarm::roots::own(state) .await .map(|root| root.0.to_vec()), + party: party(state), }), ) .await; @@ -242,6 +243,7 @@ pub(super) async fn send_hello_reply( root: crate::swarm::roots::own(state) .await .map(|root| root.0.to_vec()), + party: party(state), }; debug!(to = %peer, ready, "Sending HELLO_REPLY"); @@ -471,3 +473,15 @@ pub(crate) async fn peer_swarm(state: &AppState, peer: &str) -> Option { let peer_state = peer_state_mutex.lock().await; peer_state.standing.swarm_id().map(str::to_owned) } + +/// The party this node is of, as its handshakes name it, in a swarm holding a store +/// (`--store-party`); None elsewhere. +fn party(state: &AppState) -> Option { + #[cfg(feature = "federation")] + return state.holding.party().map(str::to_owned); + #[cfg(not(feature = "federation"))] + { + let _ = state; + None + } +} diff --git a/src/transport/mod.rs b/src/transport/mod.rs index e366f72..ad45ce9 100644 --- a/src/transport/mod.rs +++ b/src/transport/mod.rs @@ -566,6 +566,9 @@ pub(crate) struct HelloRequest { /// a joining node takes as the root, where those it hears agree. #[serde(with = "serde_bytes")] pub(crate) root: Option>, + /// The party the sender is of, in a swarm holding a store (`--store-party`): nodes of + /// one sync with the nodes its parties list, each as its party's. None elsewhere. + pub(crate) party: Option, } /// A peer a HELLO_REPLY lists: who it is, and where the sender reaches it. @@ -654,6 +657,8 @@ pub(crate) struct HelloReply { /// As `HelloRequest::root`. #[serde(with = "serde_bytes")] pub(crate) root: Option>, + /// As `HelloRequest::party`. + pub(crate) party: Option, } /// Bytes shown as lowercase hex, e.g. run IDs in logs. @@ -688,6 +693,7 @@ impl std::fmt::Debug for HelloRequest { .field("run_id", &Hex(&self.run_id)) .field("handshake", &self.handshake) .field("root", &self.root.as_deref().map(Hex)) + .field("party", &self.party) .finish() } } @@ -705,6 +711,7 @@ impl std::fmt::Debug for HelloReply { .field("away_ms", &self.away_ms) .field("sender_run_id", &Hex(&self.sender_run_id)) .field("root", &self.root.as_deref().map(Hex)) + .field("party", &self.party) .finish() } } diff --git a/src/transport/wire.rs b/src/transport/wire.rs index 97bf6cc..0270e6c 100644 --- a/src/transport/wire.rs +++ b/src/transport/wire.rs @@ -14,7 +14,7 @@ use super::{EncodedMessage, MessageKind, ParsedMessage}; /// The wire format's version, the first byte of every payload. Bump it with every change /// to a message type or a codec (`golden_bytes` fails then). -pub(crate) const VERSION: u8 = 51; +pub(crate) const VERSION: u8 = 52; /// What the second byte of a payload says. fn tag(kind: MessageKind) -> u8 { @@ -458,6 +458,7 @@ pub(crate) fn samples() -> Vec { run_id: [4; 16], handshake: 7, root: None, + party: None, }), ParsedMessage::HelloReply(HelloReply { swarm_id: "swarm".into(), @@ -473,6 +474,7 @@ pub(crate) fn samples() -> Vec { away_ms: Some(5), sender_run_id: [6; 16], root: None, + party: None, }), ParsedMessage::Sync(SyncEnvelope { epoch: crate::transport::EpochTag::of(epoch), @@ -606,6 +608,7 @@ mod tests { run_id: [4; 16], handshake: 7, root: None, + party: Some("tv".into()), }); let ParsedMessage::Hello(decoded) = decode(&encode(&hello).unwrap()).unwrap() else { panic!("not a HELLO"); @@ -614,6 +617,7 @@ mod tests { assert_eq!((decoded.epoch, decoded.epoch_seq), (epoch, 1)); assert_eq!(decoded.auth, vec![1, 2, 3]); assert_eq!(decoded.run_id, [4; 16]); + assert_eq!(decoded.party.as_deref(), Some("tv")); assert_eq!(decoded.handshake, 7); let reply = ParsedMessage::HelloReply(HelloReply { @@ -630,6 +634,7 @@ mod tests { away_ms: Some(5), sender_run_id: [6; 16], root: None, + party: None, }); let ParsedMessage::HelloReply(decoded) = decode(&encode(&reply).unwrap()).unwrap() else { panic!("not a HELLO_REPLY"); @@ -746,11 +751,12 @@ mod tests { run_id: [4; 16], handshake: 7, root: None, + party: None, }); assert_eq!( hex(&encode(&hello).unwrap()), format!( - "{v}0098a5737761726d{epoch_hex}01c403010203c3{}07c0", + "{v}0099a5737761726d{epoch_hex}01c403010203c3{}07c0c0", run("04") ) ); @@ -769,11 +775,12 @@ mod tests { away_ms: Some(5), sender_run_id: [6; 16], root: None, + party: None, }); assert_eq!( hex(&encode(&reply).unwrap()), format!( - "{v}019aa5737761726d9192a17091a161{epoch_hex}01c400c2{}05{}c0", + "{v}019ba5737761726d9192a17091a161{epoch_hex}01c400c2{}05{}c0c0", run("04"), run("06") ) -- cgit v1.3.1