fix: release rgb_send_lock on all channel open failure paths

Author: bitwalt

src/ldk.rs

@@ -690,8 +690,8 @@ async fn handle_ldk_events(
             {
                 tracing::error!(
                         "ERROR: Channel went away before we could fund it. The peer disconnected or refused the channel.");
-                *unlocked_state.rgb_send_lock.lock().unwrap() = false;
             }
+            *unlocked_state.rgb_send_lock.lock().unwrap() = false;
         }
         Event::FundingTxBroadcastSafe { .. } => {
             // We don't use the manual broadcasting feature, so this event should never be seen.
@@ -1055,21 +1055,28 @@ async fn handle_ldk_events(
                     is_channel_rgb(&channel_id, &PathBuf::from(&static_state.ldk_data_dir));
                 tracing::info!("Initiator of the channel (colored: {})", is_chan_colored);
 
-                let _txid = tokio::task::spawn_blocking(move || {
+                *unlocked_state.rgb_send_lock.lock().unwrap() = false;
+
+                let txid_result = tokio::task::spawn_blocking(move || {
                     if is_chan_colored {
                         state_copy.rgb_send_end(psbt_str_copy).map(|r| r.txid)
                     } else {
                         state_copy.rgb_send_btc_end(psbt_str_copy)
                     }
                 })
-                .await
-                .unwrap()
-                .map_err(|e| {
-                    tracing::error!("Error completing channel opening: {e:?}");
-                    ReplayEvent()
-                })?;
+                .await;
 
-                *unlocked_state.rgb_send_lock.lock().unwrap() = false;
+                match txid_result {
+                    Ok(Ok(_txid)) => {}
+                    Ok(Err(e)) => {
+                        tracing::error!("Error completing channel opening: {e:?}");
+                        return Err(ReplayEvent());
+                    }
+                    Err(e) => {
+                        tracing::error!("Channel opening task panicked: {e:?}");
+                        return Err(ReplayEvent());
+                    }
+                }
             } else {
                 // acceptor
                 let consignment_path = static_state
@@ -1102,20 +1109,25 @@ async fn handle_ldk_events(
                 hex_str(&counterparty_node_id.serialize()),
             );
 
-            tokio::task::spawn_blocking(move || {
+            match tokio::task::spawn_blocking(move || {
                 unlocked_state.rgb_refresh(false).unwrap();
                 unlocked_state.rgb_refresh(true).unwrap()
             })
             .await
-            .unwrap();
+            {
+                Ok(_) => {}
+                Err(e) => {
+                    tracing::error!("RGB refresh task panicked on channel ready: {e:?}");
+                }
+            }
         }
         Event::ChannelClosed {
             channel_id,
             reason,
             user_channel_id: _,
             counterparty_node_id,
             channel_capacity_sats: _,
-            channel_funding_txo: _,
+            channel_funding_txo,
             last_local_balance_msat: _,
         } => {
             tracing::info!(
@@ -1127,6 +1139,10 @@ async fn handle_ldk_events(
                 reason
             );
 
+            if channel_funding_txo.is_none() {
+                *unlocked_state.rgb_send_lock.lock().unwrap() = false;
+            }
+
             unlocked_state.delete_channel_id(channel_id);
         }
         Event::DiscardFunding { channel_id, .. } => {