From: Antoine Riard Date: Sun, 11 Nov 2018 20:59:03 +0000 (-0500) Subject: Add TxOut in DynamicOutput X-Git-Tag: v0.0.12~271^2~10 X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=f88f826b28e6bd784b3ed771ece29a93b5e43f24;p=rust-lightning Add TxOut in DynamicOutput --- diff --git a/src/chain/keysinterface.rs b/src/chain/keysinterface.rs index 556be6dc5..7d669d9d7 100644 --- a/src/chain/keysinterface.rs +++ b/src/chain/keysinterface.rs @@ -50,6 +50,8 @@ pub enum SpendableOutputDescriptor { witness_script: Script, /// nSequence input must commit to self_delay to satisfy script's OP_CSV to_self_delay: u16, + /// The output which is referenced by the given outpoint + output: TxOut, } } diff --git a/src/ln/channelmonitor.rs b/src/ln/channelmonitor.rs index 2bdbfec2c..9dfb6eebf 100644 --- a/src/ln/channelmonitor.rs +++ b/src/ln/channelmonitor.rs @@ -1239,7 +1239,8 @@ impl ChannelMonitor { outpoint: BitcoinOutPoint { txid: $father_tx.txid(), vout: $vout }, local_delayedkey, witness_script: chan_utils::get_revokeable_redeemscript(&local_tx.revocation_key, self.our_to_self_delay, &local_tx.delayed_payment_key), - to_self_delay: self.our_to_self_delay + to_self_delay: self.our_to_self_delay, + output: $father_tx.output[$vout as usize].clone(), }); } }