Allow ZeroConf channel type and test for it.

Author: tnull

lightning/src/ln/channel.rs

@@ -1084,10 +1084,8 @@ impl<Signer: Sign> Channel<Signer> {
 			// We currently only allow two channel types, so write it all out here - we allow
 			// `only_static_remote_key` in all contexts, and further allow
 			// `static_remote_key|scid_privacy` if the channel is not publicly announced.
-			let mut allowed_type = ChannelTypeFeatures::only_static_remote_key();
-			if *channel_type != allowed_type {
-				allowed_type.set_scid_privacy_required();
-				if *channel_type != allowed_type {
+			if *channel_type != ChannelTypeFeatures::only_static_remote_key() {
+				if !channel_type.requires_scid_privacy() && !channel_type.requires_zero_conf() {
 					return Err(ChannelError::Close("Channel Type was not understood".to_owned()));
 				}
 				if announced_channel {
@@ -6407,7 +6405,7 @@ mod tests {
 	use ln::channelmanager::{HTLCSource, PaymentId};
 	use ln::channel::{Channel, InboundHTLCOutput, OutboundHTLCOutput, InboundHTLCState, OutboundHTLCState, HTLCCandidate, HTLCInitiator};
 	use ln::channel::{MAX_FUNDING_SATOSHIS_NO_WUMBO, TOTAL_BITCOIN_SUPPLY_SATOSHIS};
-	use ln::features::InitFeatures;
+	use ln::features::{InitFeatures, ChannelTypeFeatures};
 	use ln::msgs::{ChannelUpdate, DataLossProtect, DecodeError, OptionalField, UnsignedChannelUpdate};
 	use ln::script::ShutdownScript;
 	use ln::chan_utils;
@@ -7722,4 +7720,30 @@ mod tests {
 		assert_eq!(chan_utils::derive_private_revocation_key(&secp_ctx, &per_commitment_secret, &base_secret).unwrap(),
 				SecretKey::from_slice(&hex::decode("d09ffff62ddb2297ab000cc85bcb4283fdeb6aa052affbc9dddcf33b61078110").unwrap()[..]).unwrap());
 	}
+
+	#[test]
+	fn test_zero_conf_channel_type_support() {
+		let feeest = TestFeeEstimator{fee_est: 15000};
+		let secp_ctx = Secp256k1::new();
+		let seed = [42; 32];
+		let network = Network::Testnet;
+		let keys_provider = test_utils::TestKeysInterface::new(&seed, network);
+		let logger = test_utils::TestLogger::new();
+
+		// Create Node A's channel pointing to Node B's pubkey
+		let node_b_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[42; 32]).unwrap());
+		let config = UserConfig::default();
+		let node_a_chan = Channel::<EnforcingSigner>::new_outbound(&&feeest, &&keys_provider, node_b_node_id, &InitFeatures::known(), 10000000, 100000, 42, &config, 0, 42).unwrap();
+
+		// Create Node B's channel by receiving Node A's open_channel message
+		// Make sure A's dust limit is as we expect.
+		let mut channel_type_features = ChannelTypeFeatures::only_static_remote_key();
+		channel_type_features.set_zero_conf_required();
+
+		let mut open_channel_msg = node_a_chan.get_open_channel(genesis_block(network).header.block_hash());
+		open_channel_msg.channel_type = Some(channel_type_features);
+		let node_b_node_id = PublicKey::from_secret_key(&secp_ctx, &SecretKey::from_slice(&[7; 32]).unwrap());
+		let res = Channel::<EnforcingSigner>::new_from_req(&&feeest, &&keys_provider, node_b_node_id, &InitFeatures::known(), &open_channel_msg, 7, &config, 0, &&logger, 42);
+		assert!(res.is_ok());
+	}
 }

lightning/src/util/events.rs

@@ -469,8 +469,8 @@ pub enum Event {
 		/// Furthermore, note that if [`ChannelTypeFeatures::supports_zero_conf`] returns true on this type,
 		/// the resulting [`ChannelManager`] will not be readable by versions of LDK prior to
 		/// 0.0.107. Channels setting this type also need to get manually accepted via
-		/// [`crate::ln::channelmanager::ChannelManager::accept_inbound_channel_from_trusted_peer_0conf`], or will be rejected
-		/// otherwise.
+		/// [`crate::ln::channelmanager::ChannelManager::accept_inbound_channel_from_trusted_peer_0conf`],
+		/// or will be rejected otherwise.
 		///
 		/// [`ChannelManager`]: crate::ln::channelmanager::ChannelManager
 		channel_type: ChannelTypeFeatures,