Enforce MINIMALIF-compliant witness for timeout tx

Antoine Riard · Antoine Riard · commit 0bc82ee1bc35 · 2020-04-02T17:10:35.000-04:00
diff --git a/lightning/src/ln/onchaintx.rs b/lightning/src/ln/onchaintx.rs
@@ -470,7 +470,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {
 					if let &Some(preimage) = preimage {
 						bumped_tx.input[i].witness.push(preimage.clone().0.to_vec());
 					} else {
-						bumped_tx.input[i].witness.push(vec![0]);
+						bumped_tx.input[i].witness.push(vec![]);
 					}
 					bumped_tx.input[i].witness.push(witness_script.clone().into_bytes());
 					log_trace!(self, "Going to broadcast Claim Transaction {} claiming remote {} htlc output {} from {} with new feerate {}...", bumped_tx.txid(), if preimage.is_some() { "offered" } else { "received" }, outp.vout, outp.txid, new_feerate);

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ impl<ChanSigner: ChannelKeys> OnchainTxHandler<ChanSigner> {`
`470`	`470`	`if let &Some(preimage) = preimage {`
`471`	`471`	`bumped_tx.input[i].witness.push(preimage.clone().0.to_vec());`
`472`	`472`	`} else {`
`473`		`- bumped_tx.input[i].witness.push(vec![0]);`
	`473`	`+ bumped_tx.input[i].witness.push(vec![]);`
`474`	`474`	`}`
`475`	`475`	`bumped_tx.input[i].witness.push(witness_script.clone().into_bytes());`
`476`	`476`	`log_trace!(self, "Going to broadcast Claim Transaction {} claiming remote {} htlc output {} from {} with new feerate {}...", bumped_tx.txid(), if preimage.is_some() { "offered" } else { "received" }, outp.vout, outp.txid, new_feerate);`