From a898b62248faa98a61ce369bace8e2fc2ca1edb7 Mon Sep 17 00:00:00 2001 From: Age Manning Date: Tue, 3 Sep 2024 17:13:22 +1000 Subject: [PATCH 1/2] Remove the beta tag from gossipsub v1.2 --- beacon_node/lighthouse_network/gossipsub/CHANGELOG.md | 2 ++ beacon_node/lighthouse_network/gossipsub/src/behaviour.rs | 2 +- beacon_node/lighthouse_network/gossipsub/src/protocol.rs | 6 +++--- beacon_node/lighthouse_network/gossipsub/src/types.rs | 6 +++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/beacon_node/lighthouse_network/gossipsub/CHANGELOG.md b/beacon_node/lighthouse_network/gossipsub/CHANGELOG.md index 7ec10af741e..006eb20a70f 100644 --- a/beacon_node/lighthouse_network/gossipsub/CHANGELOG.md +++ b/beacon_node/lighthouse_network/gossipsub/CHANGELOG.md @@ -1,4 +1,6 @@ ## 0.5 Sigma Prime fork +- Remove the beta tag from the v1.2 upgrade. + See [PR 6344](https://github.com/sigp/lighthouse/pull/6344) - Implement IDONTWANT messages as per [spec](https://github.com/libp2p/specs/pull/548). See [PR 5422](https://github.com/sigp/lighthouse/pull/5422) diff --git a/beacon_node/lighthouse_network/gossipsub/src/behaviour.rs b/beacon_node/lighthouse_network/gossipsub/src/behaviour.rs index 94a7ee1fc39..996f701e890 100644 --- a/beacon_node/lighthouse_network/gossipsub/src/behaviour.rs +++ b/beacon_node/lighthouse_network/gossipsub/src/behaviour.rs @@ -2716,7 +2716,7 @@ where }; // Only gossipsub 1.2 peers support IDONTWANT. - if peer.kind != PeerKind::Gossipsubv1_2_beta { + if peer.kind != PeerKind::Gossipsubv1_2 { continue; } diff --git a/beacon_node/lighthouse_network/gossipsub/src/protocol.rs b/beacon_node/lighthouse_network/gossipsub/src/protocol.rs index 5611ae32c91..b72f4ccc9b5 100644 --- a/beacon_node/lighthouse_network/gossipsub/src/protocol.rs +++ b/beacon_node/lighthouse_network/gossipsub/src/protocol.rs @@ -40,9 +40,9 @@ use void::Void; pub(crate) const SIGNING_PREFIX: &[u8] = b"libp2p-pubsub:"; -pub(crate) const GOSSIPSUB_1_2_0_BETA_PROTOCOL: ProtocolId = ProtocolId { +pub(crate) const GOSSIPSUB_1_2_0_PROTOCOL: ProtocolId = ProtocolId { protocol: StreamProtocol::new("/meshsub/1.2.0"), - kind: PeerKind::Gossipsubv1_2_beta, + kind: PeerKind::Gossipsubv1_2, }; pub(crate) const GOSSIPSUB_1_1_0_PROTOCOL: ProtocolId = ProtocolId { protocol: StreamProtocol::new("/meshsub/1.1.0"), @@ -74,7 +74,7 @@ impl Default for ProtocolConfig { max_transmit_size: 65536, validation_mode: ValidationMode::Strict, protocol_ids: vec![ - GOSSIPSUB_1_2_0_BETA_PROTOCOL, + GOSSIPSUB_1_2_0_PROTOCOL, GOSSIPSUB_1_1_0_PROTOCOL, GOSSIPSUB_1_0_0_PROTOCOL, ], diff --git a/beacon_node/lighthouse_network/gossipsub/src/types.rs b/beacon_node/lighthouse_network/gossipsub/src/types.rs index 8df307d470b..d14a9293749 100644 --- a/beacon_node/lighthouse_network/gossipsub/src/types.rs +++ b/beacon_node/lighthouse_network/gossipsub/src/types.rs @@ -132,7 +132,7 @@ pub(crate) struct PeerConnections { #[allow(non_camel_case_types)] pub enum PeerKind { /// A gossipsub 1.2 peer. - Gossipsubv1_2_beta, + Gossipsubv1_2, /// A gossipsub 1.1 peer. Gossipsubv1_1, /// A gossipsub 1.0 peer. @@ -148,7 +148,7 @@ impl PeerKind { pub(crate) fn is_gossipsub(&self) -> bool { matches!( self, - Self::Gossipsubv1_2_beta | Self::Gossipsubv1_1 | Self::Gossipsub + Self::Gossipsubv1_2 | Self::Gossipsubv1_1 | Self::Gossipsub ) } } @@ -623,7 +623,7 @@ impl PeerKind { Self::Floodsub => "Floodsub", Self::Gossipsub => "Gossipsub v1.0", Self::Gossipsubv1_1 => "Gossipsub v1.1", - Self::Gossipsubv1_2_beta => "Gossipsub v1.2-beta", + Self::Gossipsubv1_2 => "Gossipsub v1.2", } } } From ba78d1740b7123a1e27ad34341fbd7d2e219e4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Oliveira?= Date: Thu, 5 Sep 2024 15:02:59 +0100 Subject: [PATCH 2/2] fix clippy --- .../lighthouse_network/gossipsub/src/behaviour/tests.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/beacon_node/lighthouse_network/gossipsub/src/behaviour/tests.rs b/beacon_node/lighthouse_network/gossipsub/src/behaviour/tests.rs index 19d09cd890f..00de3ba2dbc 100644 --- a/beacon_node/lighthouse_network/gossipsub/src/behaviour/tests.rs +++ b/beacon_node/lighthouse_network/gossipsub/src/behaviour/tests.rs @@ -5259,7 +5259,7 @@ fn sends_idontwant() { .to_subscribe(true) .gs_config(Config::default()) .explicit(1) - .peer_kind(PeerKind::Gossipsubv1_2_beta) + .peer_kind(PeerKind::Gossipsubv1_2) .create_network(); let local_id = PeerId::random(); @@ -5344,7 +5344,7 @@ fn doesnt_forward_idontwant() { .to_subscribe(true) .gs_config(Config::default()) .explicit(1) - .peer_kind(PeerKind::Gossipsubv1_2_beta) + .peer_kind(PeerKind::Gossipsubv1_2) .create_network(); let local_id = PeerId::random(); @@ -5393,7 +5393,7 @@ fn parses_idontwant() { .to_subscribe(true) .gs_config(Config::default()) .explicit(1) - .peer_kind(PeerKind::Gossipsubv1_2_beta) + .peer_kind(PeerKind::Gossipsubv1_2) .create_network(); let message_id = MessageId::new(&[0, 1, 2, 3]); @@ -5425,7 +5425,7 @@ fn clear_stale_idontwant() { .to_subscribe(true) .gs_config(Config::default()) .explicit(1) - .peer_kind(PeerKind::Gossipsubv1_2_beta) + .peer_kind(PeerKind::Gossipsubv1_2) .create_network(); let peer = gs.connected_peers.get_mut(&peers[2]).unwrap();