Accept pending ingoing substreams in gossip_open (#1369)

* Accept pending ingoing substreams in `gossip_open` * CHANGELOG
smol-dot · Nov 20, 2023 · 1294dea · 1294dea
1 parent 1ed33bd
commit 1294dea
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 0 deletions.
diff --git a/lib/src/network/service.rs b/lib/src/network/service.rs
@@ -3062,6 +3062,63 @@ where
             a
         });
 
+        for (protocol, in_substream_id) in [
+            NotificationsProtocol::BlockAnnounces {
+                chain_index: chain_id.0,
+            },
+            NotificationsProtocol::Transactions {
+                chain_index: chain_id.0,
+            },
+            NotificationsProtocol::Grandpa {
+                chain_index: chain_id.0,
+            },
+        ]
+        .into_iter()
+        .flat_map(|protocol| {
+            self.notification_substreams_by_peer_id
+                .range(
+                    (
+                        protocol,
+                        peer_index,
+                        SubstreamDirection::In,
+                        NotificationsSubstreamState::Pending,
+                        SubstreamId::min_value(),
+                    )
+                        ..=(
+                            protocol,
+                            peer_index,
+                            SubstreamDirection::In,
+                            NotificationsSubstreamState::Pending,
+                            SubstreamId::max_value(),
+                        ),
+                )
+                .map(move |&(_, _, _, _, substream_id)| (protocol, substream_id))
+        })
+        .collect::<Vec<_>>()
+        {
+            let _was_removed = self.notification_substreams_by_peer_id.remove(&(
+                protocol,
+                peer_index,
+                SubstreamDirection::In,
+                NotificationsSubstreamState::Pending,
+                in_substream_id,
+            ));
+            debug_assert!(_was_removed);
+
+            let _was_inserted = self.notification_substreams_by_peer_id.insert((
+                protocol,
+                peer_index,
+                SubstreamDirection::In,
+                NotificationsSubstreamState::Open,
+                in_substream_id,
+            ));
+            debug_assert!(_was_inserted);
+
+            self.inner
+                .accept_in_notifications(in_substream_id, handshake.clone(), 1024 * 1024)
+            // TODO: constant
+        }
+
         let substream_id = self.inner.open_out_notifications(
             connection_id,
             protocol_name,

diff --git a/wasm-node/CHANGELOG.md b/wasm-node/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### Fixed
 
 - Fix panic when the runtime of a chain provides consensus information that is inconsistent with the information found in the finalized block. ([#1317](https://github.com/smol-dot/smoldot/pull/1317))
+- Incoming notification substreams are now properly when accepted when a peer doesn't have a slot or gets a slot later on. ([#1369](https://github.com/smol-dot/smoldot/pull/1369))
 
 ## 2.0.10 - 2023-11-17