From 4247715f5130f9e859fa8c2d58a72afe29de990c Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 5 Sep 2023 15:55:07 +0200
Subject: [PATCH 1/2] Fix transactions service being stuck before warp sync
 finishes

---
 light-base/src/transactions_service.rs | 72 +++++++++++++++++++-------
 wasm-node/CHANGELOG.md                 |  9 ++++
 2 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/light-base/src/transactions_service.rs b/light-base/src/transactions_service.rs
index bf8403f0ee..4b5735c6ee 100644
--- a/light-base/src/transactions_service.rs
+++ b/light-base/src/transactions_service.rs
@@ -85,6 +85,7 @@ use core::{
     time::Duration,
 };
 use futures_channel::mpsc;
+use futures_lite::FutureExt as _;
 use futures_util::stream::FuturesUnordered;
 use futures_util::{future, FutureExt as _, SinkExt as _, StreamExt as _};
 use itertools::Itertools as _;
@@ -352,19 +353,51 @@ async fn background_task<TPlat: PlatformRef>(mut config: BackgroundTaskConfig<TP
         // service. This happens when there is a gap in the blocks, either intentionally (e.g.
         // after a Grandpa warp sync) or because the transactions service was too busy to process
         // the new blocks.
+        let mut subscribe_all = {
+            let sub_future = async {
+                Some(
+                    // The buffer size should be large enough so that, if the CPU is busy, it
+                    // doesn't become full before the execution of the transactions service resumes.
+                    // The maximum number of pinned block is ignored, as this maximum is a way to
+                    // avoid malicious behaviors. This code is by definition not considered
+                    // malicious.
+                    worker
+                        .runtime_service
+                        .subscribe_all(
+                            "transactions-service",
+                            32,
+                            NonZeroUsize::new(usize::max_value()).unwrap(),
+                        )
+                        .await,
+                )
+            };
+
+            // Because `runtime_service.subscribe_all()` might take a long time (potentially
+            // forever), we need to process messages coming from the foreground in parallel.
+            let from_foreground = &mut config.from_foreground;
+            let messages_process = async move {
+                loop {
+                    match from_foreground.next().await {
+                        Some(ToBackground::SubmitTransaction {
+                            updates_report: Some(mut updates_report),
+                            ..
+                        }) => {
+                            let _ = updates_report
+                                .send(TransactionStatus::Dropped(DropReason::GapInChain))
+                                .await;
+                        }
+                        Some(ToBackground::SubmitTransaction { .. }) => {}
+                        None => break None,
+                    }
+                }
+            };
+
+            match sub_future.or(messages_process).await {
+                Some(s) => s,
+                None => return,
+            }
+        };
 
-        // The buffer size should be large enough so that, if the CPU is busy, it doesn't
-        // become full before the execution of the transactions service resumes.
-        // The maximum number of pinned block is ignored, as this maximum is a way to avoid
-        // malicious behaviors. This code is by definition not considered malicious.
-        let mut subscribe_all = worker
-            .runtime_service
-            .subscribe_all(
-                "transactions-service",
-                32,
-                NonZeroUsize::new(usize::max_value()).unwrap(),
-            )
-            .await;
         let initial_finalized_block_hash = header::hash_from_scale_encoded_header(
             &subscribe_all.finalized_block_scale_encoded_header,
         );
@@ -491,7 +524,7 @@ async fn background_task<TPlat: PlatformRef>(mut config: BackgroundTaskConfig<TP
                 let (to_execute, result_rx) = validation_future.remote_handle();
                 worker
                     .validations_in_progress
-                    .push(to_execute.map(move |()| to_start_validate).boxed());
+                    .push(Box::pin(to_execute.map(move |()| to_start_validate)));
                 let tx = worker
                     .pending_transactions
                     .transaction_user_data_mut(to_start_validate)
@@ -582,8 +615,9 @@ async fn background_task<TPlat: PlatformRef>(mut config: BackgroundTaskConfig<TP
                         NonZeroU32::new(3).unwrap(),
                     );
 
-                    async move { (block_hash, download_future.await.map(|b| b.body.unwrap())) }
-                        .boxed()
+                    Box::pin(
+                        async move { (block_hash, download_future.await.map(|b| b.body.unwrap())) },
+                    )
                 });
 
                 worker
@@ -756,10 +790,10 @@ async fn background_task<TPlat: PlatformRef>(mut config: BackgroundTaskConfig<TP
                     tx.when_reannounce = now + Duration::from_secs(5);
                     worker.next_reannounce.push({
                         let platform = worker.platform.clone();
-                        async move {
+                        Box::pin(async move {
                             platform.sleep(Duration::from_secs(5)).await;
                             maybe_reannounce_tx_id
-                        }.boxed()
+                        })
                     });
 
                     // Perform the announce.
@@ -844,9 +878,9 @@ async fn background_task<TPlat: PlatformRef>(mut config: BackgroundTaskConfig<TP
                                 .update_status(TransactionStatus::Validated);
 
                             // Schedule this transaction for announcement.
-                            worker.next_reannounce.push(async move {
+                            worker.next_reannounce.push(Box::pin(async move {
                                 maybe_validated_tx_id
-                            }.boxed());
+                            }));
 
                             Ok(result)
                         }
diff --git a/wasm-node/CHANGELOG.md b/wasm-node/CHANGELOG.md
index 3ff54add54..d509145b0e 100644
--- a/wasm-node/CHANGELOG.md
+++ b/wasm-node/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+### Changed
+
+- Transactions submitted through the JSON-RPC server before the warp syncing process is finished will now immediately be dropped.
+
+### Fixed
+
+- Fix `Chain.remove()` not actually removing the chain until the warp syncing process is finished (which might never happen if for example bootnodes are misconfigured).
+- Fix JSON-RPC server not processing requests if many transactions are submitted before the warp syncing process is finished.
+
 ## 1.0.17 - 2023-08-25
 
 ### Changed

From 765baf7c46ca18ef57fe8e989275c19a224602e6 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 5 Sep 2023 15:56:19 +0200
Subject: [PATCH 2/2] PR link

---
 wasm-node/CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wasm-node/CHANGELOG.md b/wasm-node/CHANGELOG.md
index d509145b0e..09fb6ca87c 100644
--- a/wasm-node/CHANGELOG.md
+++ b/wasm-node/CHANGELOG.md
@@ -4,12 +4,12 @@
 
 ### Changed
 
-- Transactions submitted through the JSON-RPC server before the warp syncing process is finished will now immediately be dropped.
+- Transactions submitted through the JSON-RPC server before the warp syncing process is finished will now immediately be dropped. ([#1110](https://github.com/smol-dot/smoldot/pull/1110))
 
 ### Fixed
 
-- Fix `Chain.remove()` not actually removing the chain until the warp syncing process is finished (which might never happen if for example bootnodes are misconfigured).
-- Fix JSON-RPC server not processing requests if many transactions are submitted before the warp syncing process is finished.
+- Fix `Chain.remove()` not actually removing the chain until the warp syncing process is finished (which might never happen if for example bootnodes are misconfigured). ([#1110](https://github.com/smol-dot/smoldot/pull/1110))
+- Fix JSON-RPC server not processing requests if many transactions are submitted before the warp syncing process is finished. ([#1110](https://github.com/smol-dot/smoldot/pull/1110))
 
 ## 1.0.17 - 2023-08-25