X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fchannelmonitor.rs;h=b3cff4c2b42065406cd7b4b568700de0d80a81f9;hb=2be1f72005d407ed0183b383deeaca6b88becc31;hp=2fa416edb2dd79f26c8c0f5433b31e60c135bc2b;hpb=e46e183084ed858f41aa304acd78503aea1a96ed;p=rust-lightning

diff --git a/lightning/src/ln/channelmonitor.rs b/lightning/src/ln/channelmonitor.rs
index 2fa416ed..b3cff4c2 100644
--- a/lightning/src/ln/channelmonitor.rs
+++ b/lightning/src/ln/channelmonitor.rs
@@ -443,6 +443,9 @@ pub(crate) enum InputMaterial {
 		sigs: (Signature, Signature),
 		preimage: Option<PaymentPreimage>,
 		amount: u64,
+	},
+	Funding {
+		channel_value: u64,
 	}
 }
 
@@ -472,6 +475,10 @@ impl Writeable for InputMaterial  {
 				sigs.1.write(writer)?;
 				preimage.write(writer)?;
 				writer.write_all(&byte_utils::be64_to_array(*amount))?;
+			},
+			&InputMaterial::Funding { ref channel_value } => {
+				writer.write_all(&[3; 1])?;
+				channel_value.write(writer)?;
 			}
 		}
 		Ok(())
@@ -521,6 +528,12 @@ impl Readable for InputMaterial {
 					preimage,
 					amount
 				}
+			},
+			3 => {
+				let channel_value = Readable::read(reader)?;
+				InputMaterial::Funding {
+					channel_value
+				}
 			}
 			_ => return Err(DecodeError::InvalidValue),
 		};
@@ -1894,15 +1907,11 @@ impl<ChanSigner: ChannelKeys> ChannelMonitor<ChanSigner> {
 		let should_broadcast = if let Some(_) = self.current_local_signed_commitment_tx {
 			self.would_broadcast_at_height(height)
 		} else { false };
-		if let Some(ref mut cur_local_tx) = self.current_local_signed_commitment_tx {
-			if should_broadcast {
-				self.onchain_detection.keys.sign_local_commitment(&mut cur_local_tx.tx, self.funding_redeemscript.as_ref().unwrap(), self.channel_value_satoshis.unwrap(), &mut self.secp_ctx);
-			}
+		if should_broadcast {
+			claimable_outpoints.push(ClaimRequest { absolute_timelock: height, aggregable: false, outpoint: BitcoinOutPoint { txid: self.onchain_detection.funding_info.as_ref().unwrap().0.txid.clone(), vout: self.onchain_detection.funding_info.as_ref().unwrap().0.index as u32 }, witness_data: InputMaterial::Funding { channel_value: self.channel_value_satoshis.unwrap() }});
 		}
 		if let Some(ref cur_local_tx) = self.current_local_signed_commitment_tx {
 			if should_broadcast {
-				log_trace!(self, "Broadcast onchain {}", log_tx!(cur_local_tx.tx.with_valid_witness()));
-				broadcaster.broadcast_transaction(&cur_local_tx.tx.with_valid_witness());
 				let (txs, new_outputs, _) = self.broadcast_by_local_state(&cur_local_tx);
 				if !new_outputs.is_empty() {
 					watch_outputs.push((cur_local_tx.txid.clone(), new_outputs));