Reject 0conf channel in accept_inbound_channel

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -4203,8 +4203,17 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 				if accept_0conf {
 					channel.get_mut().set_0conf();
 				} else if channel.get().get_channel_type().requires_zero_conf() {
-					return Err(APIError::APIMisuseError { err: "This channel requires 0conf. Please use accept_inbound_channel_from_trusted_peer_0conf to accept.".to_owned() });
+					let send_msg_err_event = events::MessageSendEvent::HandleError {
+						node_id: channel.get().get_counterparty_node_id(),
+						action: msgs::ErrorAction::SendErrorMessage{
+							msg: msgs::ErrorMessage { channel_id: temporary_channel_id.clone(), data: "No zero confirmation channels accepted".to_owned(), }
+						}
+					};
+					channel_state.pending_msg_events.push(send_err_msg_event);
+					let _ = remove_channel!(self, channel_state, channel);
+					return Err(APIError::APIMisuseError { err: "Please use accept_inbound_channel_from_trusted_peer_0conf to accept channels with zero confirmations.".to_owned() });
 				}
+
 				channel_state.pending_msg_events.push(events::MessageSendEvent::SendAcceptChannel {
 					node_id: channel.get().get_counterparty_node_id(),
 					msg: channel.get_mut().accept_inbound_channel(user_channel_id),

lightning/src/ln/functional_tests.rs

@@ -10063,7 +10063,7 @@ fn test_zero_conf_accept_reject() {
 	let mut channel_type_features = ChannelTypeFeatures::only_static_remote_key();
 	channel_type_features.set_zero_conf_required();
 
-	// Check we reject zero conf channels by default
+	// 1. Check we reject zero conf channels by default
 	let chanmon_cfgs = create_chanmon_cfgs(2);
 	let node_cfgs = create_node_cfgs(2, &chanmon_cfgs);
 	let node_chanmgrs = create_node_chanmgrs(2, &node_cfgs, &[None, None]);
@@ -10076,15 +10076,15 @@ fn test_zero_conf_accept_reject() {
 
 	nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), InitFeatures::known(), &open_channel_msg);
 
-	let events = nodes[1].node.get_and_clear_pending_msg_events();
-	match events[0] {
+	let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
+	match msg_events[0] {
 		MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { ref msg, .. }, .. } => {
 			assert_eq!(msg.data, "No zero confirmation channels accepted".to_owned());
 		},
 		_ => panic!(),
 	}
 
-	// Check we can manually accept zero conf channels
+	// 2. Check we can manually accept zero conf channels via the right method
 	let mut manually_accept_conf = UserConfig::default();
 	manually_accept_conf.manually_accept_inbound_channels = true;
 
@@ -10094,12 +10094,13 @@ fn test_zero_conf_accept_reject() {
 		&[None, Some(manually_accept_conf.clone())]);
 	let nodes = create_network(2, &node_cfgs, &node_chanmgrs);
 
+	// 2.1 First try the non-0conf method to manually accept
 	nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 42,
 		Some(manually_accept_conf)).unwrap();
 	let mut open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel,
 		nodes[1].node.get_our_node_id());
 
-	open_channel_msg.channel_type = Some(channel_type_features);
+	open_channel_msg.channel_type = Some(channel_type_features.clone());
 
 	nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), InitFeatures::known(),
 		&open_channel_msg);
@@ -10114,14 +10115,41 @@ fn test_zero_conf_accept_reject() {
 			// Assert we fail to accept via the non-0conf method
 			assert!(nodes[1].node.accept_inbound_channel(&temporary_channel_id,
 				&nodes[0].node.get_our_node_id(), 0).is_err());
+		},
+		_ => panic!(),
+	}
+
+	let msg_events = nodes[1].node.get_and_clear_pending_msg_events();
+	match msg_events[0] {
+		MessageSendEvent::HandleError { action: ErrorAction::SendErrorMessage { ref msg, .. }, .. } => {
+			assert_eq!(msg.data, "No zero confirmation channels accepted".to_owned());
+		},
+		_ => panic!(),
+	}
+
+	// 2.2 Try again with the 0conf method to manually accept
+	nodes[0].node.create_channel(nodes[1].node.get_our_node_id(), 100000, 10001, 42,
+		Some(manually_accept_conf)).unwrap();
+	let mut open_channel_msg = get_event_msg!(nodes[0], MessageSendEvent::SendOpenChannel,
+		nodes[1].node.get_our_node_id());
+
+	open_channel_msg.channel_type = Some(channel_type_features);
+
+	nodes[1].node.handle_open_channel(&nodes[0].node.get_our_node_id(), InitFeatures::known(),
+		&open_channel_msg);
+
+	let events = nodes[1].node.get_and_clear_pending_events();
+	
+	match events[0] {
+		Event::OpenChannelRequest { temporary_channel_id, .. } => {
 			// Assert we can accept via the 0conf method
 			assert!(nodes[1].node.accept_inbound_channel_from_trusted_peer_0conf(
 				&temporary_channel_id, &nodes[0].node.get_our_node_id(), 0).is_ok());
 		},
 		_ => panic!(),
 	}
 
-	// Don't handle generated events
+	// Don't handle remaining events
 	nodes[1].node.get_and_clear_pending_msg_events();
 	nodes[1].node.get_and_clear_pending_events();
 }