Fix #807 (#808)

* Fix #807 * PR link
smol-dot · Jun 23, 2023 · cc217dd · cc217dd
1 parent e93b7e5
commit cc217dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/src/sync/all.rs b/lib/src/sync/all.rs
@@ -1816,6 +1816,9 @@ impl<TRq, TSrc, TBl> AllSync<TRq, TSrc, TBl> {
                     .position(|(_, id, ..)| *id == request_id)
                     .unwrap();
                 let (_, _, user_data, _) = sync.in_progress_requests.remove(pos);
+                self.inner = AllSyncInner::GrandpaWarpSync {
+                    inner: warp_sync::WarpSync::Finished(sync),
+                };
                 (user_data.user_data, ResponseOutcome::Outdated)
             }
             // Only the GrandPa warp syncing ever starts GrandPa warp sync requests.
@@ -1893,6 +1896,9 @@ impl<TRq, TSrc, TBl> AllSync<TRq, TSrc, TBl> {
                     .position(|(_, id, ..)| *id == request_id)
                     .unwrap();
                 let (_, _, user_data, _) = sync.in_progress_requests.remove(pos);
+                self.inner = AllSyncInner::GrandpaWarpSync {
+                    inner: warp_sync::WarpSync::Finished(sync),
+                };
                 (user_data.user_data, ResponseOutcome::Outdated)
             }
             // Only the GrandPa warp syncing ever starts call proof requests.

diff --git a/wasm-node/CHANGELOG.md b/wasm-node/CHANGELOG.md
@@ -6,6 +6,7 @@
 
 - Fix not absorbing the JavaScript exception triggered by the browser when connecting to a `ws://` node when smoldot is embedded in a web page served over `https://`. ([#795](https://github.com/smol-dot/smoldot/pull/795), [#800](https://github.com/smol-dot/smoldot/pull/800))
 - Smoldot no longer calls `close()` on WebSockets that aren't fully established yet (even though it is legal to do so according to the WHATWG specification) in order to avoid browsers printing warnings in the console when you do so. ([#799](https://github.com/smol-dot/smoldot/pull/799))
+- Fix panic-inducing race condition when a networking event happens right when the warp syncing finishes. ([#808](https://github.com/smol-dot/smoldot/pull/808))
 
 ## 1.0.10 - 2023-06-19