X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannel.rs;h=9935d3c019cbd3747394963186726b1e30fc3b40;hb=f54ebf78f69f08f7b12556b5abe5eb7a3e54c466;hp=d3a9df14f90032dbe4ebe2fecd26c8ca92221564;hpb=7ac4c3bba006d7306eb860e0127be8478d49bb39;p=rust-lightning

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index d3a9df14..9935d3c0 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -1895,6 +1895,16 @@ impl<Signer: Sign> Channel<Signer> {
 			return Err(ChannelError::Close("Minimum confirmation depth must be at least 1".to_owned()));
 		}
 
+		if let Some(ty) = &msg.channel_type {
+			if *ty != self.channel_type {
+				return Err(ChannelError::Close("Channel Type in accept_channel didn't match the one sent in open_channel.".to_owned()));
+			}
+		} else if their_features.supports_channel_type() {
+			// Assume they've accepted the channel type as they said they understand it.
+		} else {
+			self.channel_type = ChannelTypeFeatures::from_counterparty_init(&their_features)
+		}
+
 		let counterparty_shutdown_scriptpubkey = if their_features.supports_upfront_shutdown_script() {
 			match &msg.shutdown_scriptpubkey {
 				&OptionalField::Present(ref script) => {
@@ -2174,11 +2184,11 @@ impl<Signer: Sign> Channel<Signer> {
 
 	/// Returns transaction if there is pending funding transaction that is yet to broadcast
 	pub fn unbroadcasted_funding(&self) -> Option<Transaction> {
-		 if self.channel_state & (ChannelState::FundingCreated as u32) != 0 {
-			 self.funding_transaction.clone()
-		 } else {
-			 None
-		 }
+		if self.channel_state & (ChannelState::FundingCreated as u32) != 0 {
+			self.funding_transaction.clone()
+		} else {
+			None
+		}
 	}
 
 	/// Returns a HTLCStats about inbound pending htlcs
@@ -3447,6 +3457,7 @@ impl<Signer: Sign> Channel<Signer> {
 			Some(msgs::FundingLocked {
 				channel_id: self.channel_id(),
 				next_per_commitment_point,
+				short_channel_id_alias: None,
 			})
 		} else { None };
 
@@ -3668,6 +3679,7 @@ impl<Signer: Sign> Channel<Signer> {
 				funding_locked: Some(msgs::FundingLocked {
 					channel_id: self.channel_id(),
 					next_per_commitment_point,
+					short_channel_id_alias: None,
 				}),
 				raa: None, commitment_update: None, mon_update: None,
 				order: RAACommitmentOrder::CommitmentFirst,
@@ -3703,6 +3715,7 @@ impl<Signer: Sign> Channel<Signer> {
 			Some(msgs::FundingLocked {
 				channel_id: self.channel_id(),
 				next_per_commitment_point,
+				short_channel_id_alias: None,
 			})
 		} else { None };
 
@@ -4437,6 +4450,7 @@ impl<Signer: Sign> Channel<Signer> {
 					return Some(msgs::FundingLocked {
 						channel_id: self.channel_id,
 						next_per_commitment_point,
+						short_channel_id_alias: None,
 					});
 				}
 			} else {
@@ -4720,6 +4734,7 @@ impl<Signer: Sign> Channel<Signer> {
 				Some(script) => script.clone().into_inner(),
 				None => Builder::new().into_script(),
 			}),
+			channel_type: Some(self.channel_type.clone()),
 		}
 	}