X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannel.rs;h=2b9920aa2bae50879764b632f6f071588a14f89d;hb=2c15bb437eeab20cc3cfd33026546b4337933550;hp=515e10264fac63070d0588d9b0a3c57471d27eeb;hpb=685b08d8c13c62a3a4c4cf283c3d86b96fd3de23;p=rust-lightning

diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 515e1026..2b9920aa 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -5965,9 +5965,16 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 			return Err(APIError::ChannelUnavailable{err: "Cannot begin shutdown while peer is disconnected or we're waiting on a monitor update, maybe force-close instead?".to_owned()});
 		}
 
+		// If we haven't funded the channel yet, we don't need to bother ensuring the shutdown
+		// script is set, we just force-close and call it a day.
+		let mut chan_closed = false;
+		if self.channel_state < ChannelState::FundingSent as u32 {
+			chan_closed = true;
+		}
+
 		let update_shutdown_script = match self.shutdown_scriptpubkey {
 			Some(_) => false,
-			None => {
+			None if !chan_closed => {
 				let shutdown_scriptpubkey = signer_provider.get_shutdown_scriptpubkey();
 				if !shutdown_scriptpubkey.is_compatible(their_features) {
 					return Err(APIError::IncompatibleShutdownScript { script: shutdown_scriptpubkey.clone() });
@@ -5975,6 +5982,7 @@ impl<Signer: WriteableEcdsaChannelSigner> Channel<Signer> {
 				self.shutdown_scriptpubkey = Some(shutdown_scriptpubkey);
 				true
 			},
+			None => false,
 		};
 
 		// From here on out, we may not fail!
@@ -7167,7 +7175,7 @@ mod tests {
 		let secp_ctx = Secp256k1::new();
 		let seed = [42; 32];
 		let network = Network::Testnet;
-		let best_block = BestBlock::from_genesis(network);
+		let best_block = BestBlock::from_network(network);
 		let chain_hash = best_block.block_hash();
 		let keys_provider = test_utils::TestKeysInterface::new(&seed, network);