X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fonchaintx.rs;h=2f08fe291d2e922682c41290f597ab30594c235f;hb=ba880e3662d7f01c8963fcac37d0b32ad2c9086c;hp=b2115c0f8ac973c86d0827e0b3aaa0d8dd8291f9;hpb=9faf6ca85f61058f0b4eba227b8dc848f07942e5;p=rust-lightning

diff --git a/lightning/src/ln/onchaintx.rs b/lightning/src/ln/onchaintx.rs
index b2115c0f..2f08fe29 100644
--- a/lightning/src/ln/onchaintx.rs
+++ b/lightning/src/ln/onchaintx.rs
@@ -537,18 +537,15 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 						return None;
 					},
 					&InputMaterial::Funding { ref channel_value } => {
-						if let Some(ref mut local_commitment) = self.local_commitment {
-							self.key_storage.sign_local_commitment(local_commitment, &self.funding_redeemscript, *channel_value, &self.secp_ctx);
-							let signed_tx = local_commitment.with_valid_witness().clone();
-							let mut amt_outputs = 0;
-							for outp in signed_tx.output.iter() {
-								amt_outputs += outp.value;
-							}
-							let feerate = (channel_value - amt_outputs) * 1000 / signed_tx.get_weight() as u64;
-							// Timer set to $NEVER given we can't bump tx without anchor outputs
-							log_trace!(self, "Going to broadcast Local Transaction {} claiming funding output {} from {}...", signed_tx.txid(), outp.vout, outp.txid);
-							return Some((None, feerate, signed_tx));
+						let signed_tx = self.get_fully_signed_local_tx(*channel_value).unwrap();
+						let mut amt_outputs = 0;
+						for outp in signed_tx.output.iter() {
+							amt_outputs += outp.value;
 						}
+						let feerate = (channel_value - amt_outputs) * 1000 / signed_tx.get_weight() as u64;
+						// Timer set to $NEVER given we can't bump tx without anchor outputs
+						log_trace!(self, "Going to broadcast Local Transaction {} claiming funding output {} from {}...", signed_tx.txid(), outp.vout, outp.txid);
+						return Some((None, feerate, signed_tx));
 					}
 					_ => unreachable!()
 				}
@@ -793,6 +790,10 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 		Ok(())
 	}
 
+	//TODO: getting lastest local transactions should be infaillible and result in us "force-closing the channel", but we may
+	// have empty local commitment transaction if a ChannelMonitor is asked to force-close just after Channel::get_outbound_funding_created,
+	// before providing a initial commitment transaction. For outbound channel, init ChannelMonitor at Channel::funding_signed, there is nothing
+	// to monitor before.
 	pub(super) fn get_fully_signed_local_tx(&mut self, channel_value_satoshis: u64) -> Option<Transaction> {
 		if let Some(ref mut local_commitment) = self.local_commitment {
 			self.key_storage.sign_local_commitment(local_commitment, &self.funding_redeemscript, channel_value_satoshis, &self.secp_ctx);