fix errors during handle_funding

Author: zoedberg

lightning/src/ln/channel.rs

@@ -967,7 +967,7 @@ impl fmt::Display for ChannelError {
 }
 
 impl ChannelError {
-	pub(super) fn close(err: String) -> Self {
+	pub(crate) fn close(err: String) -> Self {
 		ChannelError::Close((err.clone(), ClosureReason::ProcessingError { err }))
 	}
 }

lightning/src/ln/channelmanager.rs

@@ -954,14 +954,14 @@ impl Into<LocalHTLCFailureReason> for FailureCode {
 /// immediately (ie with no further calls on it made). Thus, this step happens inside a
 /// peer_state lock. We then return the set of things that need to be done outside the lock in
 /// this struct and call handle_error!() on it.
-pub(crate) struct MsgHandleErrInternal {
+struct MsgHandleErrInternal {
 	err: msgs::LightningError,
 	closes_channel: bool,
 	shutdown_finish: Option<(ShutdownResult, Option<msgs::ChannelUpdate>)>,
 	tx_abort: Option<msgs::TxAbort>,
 }
 impl MsgHandleErrInternal {
-	pub(crate) fn send_err_msg_no_close(err: String, channel_id: ChannelId) -> Self {
+	fn send_err_msg_no_close(err: String, channel_id: ChannelId) -> Self {
 		Self {
 			err: LightningError {
 				err: err.clone(),
@@ -10453,7 +10453,16 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 				Some(Ok(inbound_chan)) => {
 					let logger = WithChannelContext::from(&self.logger, &inbound_chan.context, None);
 					if let Some(consignment_endpoint) = &inbound_chan.funding.consignment_endpoint {
-						handle_funding(&msg.temporary_channel_id, msg.funding_txid.to_string(), &self.ldk_data_dir, consignment_endpoint.clone(), inbound_chan.funding.push_asset_amount)?;
+						match handle_funding(&msg.temporary_channel_id, msg.funding_txid.to_string(), &self.ldk_data_dir, consignment_endpoint.clone(), inbound_chan.funding.push_asset_amount) {
+							Ok(()) => (),
+							Err(e) => {
+								// at this point the channel initiator already transitioned its channel to the funded channel ID
+								let mut chan = Channel::from(inbound_chan);
+								let funding_txo = OutPoint { txid: msg.funding_txid, index: msg.funding_output_index };
+								chan.context_mut().channel_id = ChannelId::v1_from_funding_outpoint(funding_txo);
+								return Err(convert_channel_err!(self, peer_state, e, &mut chan).1);
+							},
+						}
 					}
 					match inbound_chan.funding_created(msg, best_block, &self.signer_provider, &&logger) {
 						Ok(res) => res,

lightning/src/rgb_utils/mod.rs

@@ -6,7 +6,6 @@ use crate::ln::chan_utils::{
 };
 use crate::ln::channel::{ChannelContext, ChannelError, FundingScope};
 use crate::ln::channel_state::ChannelDetails;
-use crate::ln::channelmanager::MsgHandleErrInternal;
 use crate::ln::types::ChannelId;
 use crate::sign::SignerProvider;
 use crate::types::features::ChannelTypeFeatures;
@@ -218,7 +217,7 @@ async fn _accept_transfer(
 			account_xpub_colored,
 			master_fingerprint,
 		);
-		wallet.go_online(true, indexer_url).unwrap();
+		wallet.go_online(true, indexer_url)?;
 		wallet.accept_transfer(
 			funding_txid.clone(),
 			funding_vout,
@@ -648,7 +647,7 @@ pub(crate) fn rename_rgb_files(
 pub(crate) fn handle_funding(
 	temporary_channel_id: &ChannelId, funding_txid: String, ldk_data_dir: &Path,
 	consignment_endpoint: RgbTransport, push_asset_amount: Option<u64>,
-) -> Result<(), MsgHandleErrInternal> {
+) -> Result<(), ChannelError> {
 	let handle = Handle::current();
 	let _ = handle.enter();
 	let accept_res = futures::executor::block_on(_accept_transfer(
@@ -659,35 +658,23 @@ pub(crate) fn handle_funding(
 	let (consignment, remote_rgb_assignments) = match accept_res {
 		Ok(res) => res,
 		Err(RgbLibError::InvalidConsignment) => {
-			return Err(MsgHandleErrInternal::send_err_msg_no_close(
-				"Invalid RGB consignment for funding".to_owned(),
-				*temporary_channel_id,
-			))
+			return Err(ChannelError::close("Invalid RGB consignment for funding".to_owned()))
 		},
 		Err(RgbLibError::NoConsignment) => {
-			return Err(MsgHandleErrInternal::send_err_msg_no_close(
-				"Failed to find RGB consignment".to_owned(),
-				*temporary_channel_id,
-			))
+			return Err(ChannelError::close("Failed to find RGB consignment".to_owned()))
 		},
 		Err(RgbLibError::UnknownRgbSchema { schema_id }) => {
-			return Err(MsgHandleErrInternal::send_err_msg_no_close(
-				format!("Unknown RGB schema: {schema_id}"),
-				*temporary_channel_id,
-			))
+			return Err(ChannelError::close(format!("Unknown RGB schema: {schema_id}")))
 		},
 		Err(RgbLibError::UnsupportedSchema { asset_schema }) => {
-			return Err(MsgHandleErrInternal::send_err_msg_no_close(
-				format!("Unsupported RGB schema: {asset_schema}"),
-				*temporary_channel_id,
-			))
+			return Err(ChannelError::close(format!("Unsupported RGB schema: {asset_schema}")))
 		},
-		Err(e) => {
-			return Err(MsgHandleErrInternal::send_err_msg_no_close(
-				format!("Unexpected error: {e}"),
-				*temporary_channel_id,
-			))
+		Err(RgbLibError::Indexer { details })
+		| Err(RgbLibError::InvalidIndexer { details })
+		| Err(RgbLibError::Network { details }) => {
+			return Err(ChannelError::close(format!("Failed to connect to indexer: {details}")))
 		},
+		Err(e) => return Err(ChannelError::close(format!("Unexpected error: {e}"))),
 	};
 
 	let consignment_path = ldk_data_dir.join(format!("consignment_{}", funding_txid));
@@ -697,10 +684,10 @@ pub(crate) fn handle_funding(
 	consignment.save_file(consignment_path).expect("unable to write file");
 
 	if remote_rgb_assignments.len() != 1 {
-		return Err(MsgHandleErrInternal::send_err_msg_no_close(
-			format!("Unexpected number of RGB assignments: {}", remote_rgb_assignments.len()),
-			*temporary_channel_id,
-		));
+		return Err(ChannelError::close(format!(
+			"Unexpected number of RGB assignments: {}",
+			remote_rgb_assignments.len()
+		)));
 	}
 	let channel_rgb_amount = match remote_rgb_assignments[0] {
 		Assignment::Fungible(amt) => amt,