improve closechannel checks

Author: zoedberg

src/error.rs

@@ -36,6 +36,9 @@ pub enum APIError {
     #[error("Batch transfer not found")]
     BatchTransferNotFound,
 
+    #[error("Cannot close channel")]
+    CannotCloseChannel(String),
+
     #[error("Cannot estimate fees")]
     CannotEstimateFees,
 
@@ -270,6 +273,9 @@ pub enum APIError {
     #[error("Unexpected error: {0}")]
     Unexpected(String),
 
+    #[error("Unknown channel ID")]
+    UnknownChannelId,
+
     #[error("Unknown RGB contract ID")]
     UnknownContractId,
 
@@ -457,6 +463,7 @@ impl IntoResponse for APIError {
             | APIError::AlreadyUnlocked
             | APIError::AuthenticationDisabled
             | APIError::BatchTransferNotFound
+            | APIError::CannotCloseChannel(_)
             | APIError::CannotEstimateFees
             | APIError::CannotFailBatchTransfer
             | APIError::ChangingState
@@ -483,6 +490,7 @@ impl IntoResponse for APIError {
             | APIError::RecipientIDAlreadyUsed
             | APIError::SwapNotFound(_)
             | APIError::TemporaryChannelIdAlreadyUsed
+            | APIError::UnknownChannelId
             | APIError::UnknownContractId
             | APIError::UnknownLNInvoice
             | APIError::UnknownTemporaryChannelId

src/routes.rs

@@ -1438,6 +1438,24 @@ pub(crate) async fn close_channel(
             Err(_) => return Err(APIError::InvalidPubkey),
         };
 
+        if let Some(chan_details) = unlocked_state
+            .channel_manager
+            .list_channels()
+            .iter()
+            .find(|c| c.channel_id == requested_cid)
+        {
+            match chan_details.channel_shutdown_state {
+                Some(ChannelShutdownState::NotShuttingDown) => {}
+                _ => {
+                    return Err(APIError::CannotCloseChannel(s!(
+                        "Channel is already being closed"
+                    )))
+                }
+            }
+        } else {
+            return Err(APIError::UnknownChannelId);
+        }
+
         if payload.force {
             match unlocked_state
                 .channel_manager
@@ -1447,15 +1465,25 @@ pub(crate) async fn close_channel(
                     "Manually force-closed".to_string(),
                 ) {
                 Ok(()) => tracing::info!("EVENT: initiating channel force-close"),
-                Err(e) => return Err(APIError::FailedClosingChannel(format!("{e:?}"))),
+                Err(e) => match e {
+                    LDKAPIError::APIMisuseError { err } => {
+                        return Err(APIError::FailedClosingChannel(err))
+                    }
+                    _ => return Err(APIError::CannotCloseChannel(format!("{e:?}"))),
+                },
             }
         } else {
             match unlocked_state
                 .channel_manager
                 .close_channel(&requested_cid, &peer_pubkey)
             {
                 Ok(()) => tracing::info!("EVENT: initiating channel close"),
-                Err(e) => return Err(APIError::FailedClosingChannel(format!("{e:?}"))),
+                Err(e) => match e {
+                    LDKAPIError::APIMisuseError { err } => {
+                        return Err(APIError::FailedClosingChannel(err))
+                    }
+                    _ => return Err(APIError::CannotCloseChannel(format!("{e:?}"))),
+                },
             }
         }