X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Fln%2Fonchaintx.rs;h=186793581cea9cd05f9d281b77074508c72ba8c7;hb=359b3d5702b585a67e4e6d4044c35caf86bd787d;hp=cb76dcb2a55255557ba1ca5209789cd3263f77d5;hpb=0d755456328d68151cdb66a1d8280912de7eb50c;p=rust-lightning

diff --git a/lightning/src/ln/onchaintx.rs b/lightning/src/ln/onchaintx.rs
index cb76dcb2..18679358 100644
--- a/lightning/src/ln/onchaintx.rs
+++ b/lightning/src/ln/onchaintx.rs
@@ -531,16 +531,11 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 						}
 						return None;
 					},
-					&InputMaterial::Funding { ref channel_value } => {
+					&InputMaterial::Funding {} => {
 						let signed_tx = self.get_fully_signed_local_tx().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));
+						return Some((None, self.local_commitment.as_ref().unwrap().feerate_per_kw, signed_tx));
 					}
 					_ => unreachable!()
 				}