backport batch develop fix to 111

Cargo.toml

@@ -40,8 +40,8 @@ members = [
     "util/occupied-capacity/macros",
     "util/fixed-hash/macros",
     "util/logger-service",
-    "util/stop-handler",
     "util/runtime",
+    "util/stop-handler",
     "util/metrics",
     "util/metrics-service",
     "util/fixed-hash",
@@ -93,6 +93,7 @@ members = [
 
 [workspace.dependencies]
 tempfile = "3"
+itertools = "0.11.0"
 
 [profile.release]
 overflow-checks = true

Makefile

@@ -168,6 +168,10 @@ docker-publish:
 	docker tag nervos/ckb:$$(git describe) nervos/ckb:latest
 	docker push nervos/ckb:latest
 
+.PHONY: docker-publish-rc
+docker-publish-rc:
+	docker push nervos/ckb:$$(git describe)
+
 ##@ Code Quality
 .PHONY: fmt
 fmt: setup-ckb-test ## Check Rust source code format to keep to the same style.

benches/benches/benchmarks/overall.rs

@@ -6,7 +6,7 @@ use ckb_chain_spec::consensus::{ConsensusBuilder, ProposalWindow};
 use ckb_dao_utils::genesis_dao_data;
 use ckb_jsonrpc_types::JsonBytes;
 use ckb_launcher::SharedBuilder;
-use ckb_network::{DefaultExitHandler, Flags, NetworkController, NetworkService, NetworkState};
+use ckb_network::{Flags, NetworkController, NetworkService, NetworkState};
 use ckb_shared::Shared;
 use ckb_store::ChainStore;
 use ckb_types::{
@@ -77,7 +77,6 @@ fn dummy_network(shared: &Shared) -> NetworkController {
             "test".to_string(),
             Flags::COMPATIBILITY,
         ),
-        DefaultExitHandler::default(),
     )
     .start(shared.async_handle())
     .expect("Start network service failed")

block-filter/src/filter.rs

@@ -1,7 +1,7 @@
-use ckb_async_runtime::tokio::{self, sync::oneshot, task::block_in_place};
+use ckb_async_runtime::tokio::{self, task::block_in_place};
 use ckb_logger::{debug, warn};
 use ckb_shared::Shared;
-use ckb_stop_handler::{SignalSender, StopHandler};
+use ckb_stop_handler::{new_tokio_exit_rx, CancellationToken};
 use ckb_store::{ChainDB, ChainStore};
 use ckb_types::{
     core::HeaderView,
@@ -43,10 +43,10 @@ impl BlockFilter {
     }
 
     /// start background single-threaded service to create block filter data
-    pub fn start(self) -> StopHandler<()> {
+    pub fn start(self) {
         let notify_controller = self.shared.notify_controller().clone();
         let async_handle = self.shared.async_handle().clone();
-        let (stop, mut stop_rx) = oneshot::channel::<()>();
+        let stop_rx: CancellationToken = new_tokio_exit_rx();
         let filter_data_builder = self.clone();
 
         let build_filter_data =
@@ -62,12 +62,14 @@ impl BlockFilter {
                         block_in_place(|| self.build_filter_data());
                         new_block_watcher.borrow_and_update();
                     }
-                    _ = &mut stop_rx => break,
+                    _ = stop_rx.cancelled() => {
+                        debug!("BlockFilter received exit signal, exit now");
+                        break
+                    },
                     else => break,
                 }
             }
         });
-        StopHandler::new(SignalSender::Tokio(stop), None, NAME.to_string())
     }
 
     /// build block filter data to the latest block