feat: allow running cch as a separate service

Author: doitian

.github/workflows/e2e.yml

@@ -14,6 +14,7 @@ jobs:
           - udt
           - reestablish
           - cross-chain-hub
+          - cross-chain-hub-separate
           - router-pay
           - udt-router-pay
           - watchtower
@@ -60,7 +61,7 @@ jobs:
           wget "https://github.com/nervosnetwork/ckb/releases/download/v${version}/ckb_v${version}_x86_64-unknown-linux-gnu-portable.tar.gz"
           tar -xvaf "ckb_v${version}_x86_64-unknown-linux-gnu-portable.tar.gz"
           sudo mv "ckb_v${version}_x86_64-unknown-linux-gnu-portable"/* /usr/local/bin/
-          if [ ${{ matrix.workflow }} = "cross-chain-hub" ]; then
+          if [[ "${{ matrix.workflow }}" = cross-chain-hub* ]]; then
             wget "https://bitcoin.org/bin/bitcoin-core-27.0/bitcoin-27.0-x86_64-linux-gnu.tar.gz"
             tar -xvaf "bitcoin-27.0-x86_64-linux-gnu.tar.gz"
             echo "$(pwd)/bitcoin-27.0/bin" >> $GITHUB_PATH
@@ -82,13 +83,15 @@ jobs:
           export ON_GITHUB_ACTION=y
           # Pass it to tests/funding-tx-builder as args
           export EXTRA_BRU_ARGS="${{ matrix.extra_bru_args }}"
+
+          port_file=./tests/nodes/.ports
+          rm -f "$port_file"
           ./tests/nodes/start.sh "e2e/${{ matrix.workflow }}" &
 
           # Wait for the nodes to start, the initialization takes some time
           # check all the ports are open
 
           # when .ports file is not generated, we will retry 20 times to check if all ports are open
-          port_file=./tests/nodes/.ports
           retry_count=0
           while [ $retry_count -lt 100 ]; do
             if [ -f $port_file ]; then
@@ -105,6 +108,7 @@ jobs:
             ports+=("$line")
           done < ./tests/nodes/.ports
 
+          cat ./tests/nodes/.ports_map
           echo "Checking if all ports are open ... ${ports[@]}"
 
           try_number=120

.gitignore

@@ -10,7 +10,9 @@
 /tests/nodes/*/dev.toml
 /tests/nodes/*.log
 /tests/deploy/udt-init/target
-tests/nodes/.ports
+/tests/nodes/.ports
+/tests/nodes/.ports_map
+/tests/nodes/.ports_tmp
 /coverage-report
 /*.info
 .vscode

crates/fiber-bin/src/main.rs

@@ -78,12 +78,9 @@ pub async fn main() -> Result<(), ExitMessage> {
     let _span = info_span!("node", node = fnn::get_node_prefix()).entered();
 
     let config = Config::parse();
+    let fiber_fallback_config = config.fiber_fallback_config.clone();
 
-    let store_path = config
-        .fiber
-        .as_ref()
-        .ok_or_else(|| ExitMessage("fiber config is required but absent".to_string()))?
-        .store_path();
+    let store_path = fiber_fallback_config.store_path();
 
     let store = Store::new(store_path).map_err(|err| ExitMessage(err.to_string()))?;
     let store = StoreWithPubSub::new(store);
@@ -102,10 +99,7 @@ pub async fn main() -> Result<(), ExitMessage> {
     });
 
     #[allow(unused_variables)]
-    let (network_actor, ckb_chain_actor, network_graph, node_public_key) = match config
-        .fiber
-        .clone()
-    {
+    let (network_actor, ckb_chain_actor, network_graph) = match config.fiber.clone() {
         Some(fiber_config) => {
             // TODO: this is not a super user friendly error message which has actionable information
             // for the user to fix the error and start the node.
@@ -296,26 +290,31 @@ pub async fn main() -> Result<(), ExitMessage> {
                 Some(network_actor),
                 Some(ckb_chain_actor),
                 Some(network_graph),
-                Some(node_public_key),
             )
         }
-        None => (None, None, None, None),
+        None => (None, None, None),
     };
 
     let cch_actor = match config.cch {
         Some(cch_config) => {
             info!("Starting cch");
             let ignore_startup_failure = cch_config.ignore_startup_failure;
+            let node_keypair =
+                if let Some(fiber) = config.fiber.as_ref() {
+                    Some(fiber.read_or_generate_secret_key().map_err(|err| {
+                        ExitMessage(format!("failed to read secret key: {}", err))
+                    })?)
+                } else {
+                    None
+                };
             match start_cch(
                 CchArgs {
                     config: cch_config,
                     tracker: new_tokio_task_tracker(),
                     token: new_tokio_cancellation_token(),
-                    network_actor: network_actor
-                        .clone()
-                        .expect("Cch service requires network actor"),
-                    pubkey: node_public_key.expect("Cch service requires node public key"),
+                    network_actor: network_actor.clone(),
                     store: store.clone(),
+                    node_keypair,
                 },
                 root_actor.get_cell(),
             )
@@ -333,8 +332,6 @@ pub async fn main() -> Result<(), ExitMessage> {
                     }
                 }
                 Ok(actor) => {
-                    // Subscribe the actor to the store so it can receive updates
-                    store.subscribe(Box::new(actor.clone()));
                     info!("cch started successfully ...");
                     Some(actor)
                 }
@@ -344,8 +341,8 @@ pub async fn main() -> Result<(), ExitMessage> {
     };
 
     // Start rpc service
-    let rpc_server_handle = match (config.rpc, network_graph) {
-        (Some(rpc_config), Some(network_graph)) => {
+    let rpc_server_handle = match config.rpc {
+        Some(rpc_config) => {
             match start_rpc(
                 rpc_config,
                 config.ckb,
@@ -355,20 +352,19 @@ pub async fn main() -> Result<(), ExitMessage> {
                 store,
                 network_graph,
                 root_actor.get_cell(),
-                #[cfg(debug_assertions)] ckb_chain_actor,
-                #[cfg(debug_assertions)] rpc_dev_module_commitment_txs,
+                #[cfg(debug_assertions)]
+                ckb_chain_actor,
+                #[cfg(debug_assertions)]
+                rpc_dev_module_commitment_txs,
             )
-            .await {
+            .await
+            {
                 Ok(handle) => Some(handle),
                 Err(err) => {
                     return ExitMessage::err(format!("rpc server failed to start: {}", err));
                 }
             }
-        },
-        (Some(_), None) => return ExitMessage::err(
-            "RPC requires network graph in the fiber service which is not enabled in the config file"
-            .to_string()
-        ),
+        }
         _ => None,
     };