akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lnwallet: update NewBreachRetribution to include pkScripts for htlc outputs

Browse Source 
In this commit, we update the NewBreachRetribution method to include
pkScripts for htlc outputs. We do this now, as the breach arbiter will
need the raw pkScript when attempting to request spend notifications for
each HTLC.
This commit is contained in:
Olaoluwa Osuntokun 2018-07-17 19:22:17 -07:00
parent 84c458cc9f
commit 343c1b80d2
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lnwallet/channel.go
View File

@ -2043,8 +2043,8 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
htlcRetributions := make([]HtlcRetribution, 0, len(revokedSnapshot.Htlcs)) htlcRetributions := make([]HtlcRetribution, 0, len(revokedSnapshot.Htlcs))
for _, htlc := range revokedSnapshot.Htlcs { for _, htlc := range revokedSnapshot.Htlcs {
var ( var (
htlcScript []byte htlcWitnessScript []byte
err error err error
) )
// If the HTLC is dust, then we'll skip it as it doesn't have // If the HTLC is dust, then we'll skip it as it doesn't have
@ -2072,7 +2072,7 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
// the sender of the HTLC (relative to us). So we'll // the sender of the HTLC (relative to us). So we'll
// re-generate the sender HTLC script. // re-generate the sender HTLC script.
if htlc.Incoming { if htlc.Incoming {
htlcScript, err = senderHTLCScript( htlcWitnessScript, err = senderHTLCScript(
keyRing.RemoteHtlcKey, keyRing.LocalHtlcKey, keyRing.RemoteHtlcKey, keyRing.LocalHtlcKey,
keyRing.RevocationKey, htlc.RHash[:], keyRing.RevocationKey, htlc.RHash[:],
) )
@ -2084,7 +2084,7 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
// Otherwise, is this was an outgoing HTLC that we // Otherwise, is this was an outgoing HTLC that we
// sent, then from the PoV of the remote commitment // sent, then from the PoV of the remote commitment
// state, they're the receiver of this HTLC. // state, they're the receiver of this HTLC.
htlcScript, err = receiverHTLCScript( htlcWitnessScript, err = receiverHTLCScript(
htlc.RefundTimeout, keyRing.LocalHtlcKey, htlc.RefundTimeout, keyRing.LocalHtlcKey,
keyRing.RemoteHtlcKey, keyRing.RevocationKey, keyRing.RemoteHtlcKey, keyRing.RevocationKey,
htlc.RHash[:], htlc.RHash[:],
@ -2094,13 +2094,19 @@ func NewBreachRetribution(chanState *channeldb.OpenChannel, stateNum uint64,
} }
} }
htlcPkScript, err := WitnessScriptHash(htlcWitnessScript)
if err != nil {
return nil, err
}
htlcRetributions = append(htlcRetributions, HtlcRetribution{ htlcRetributions = append(htlcRetributions, HtlcRetribution{
SignDesc: SignDescriptor{ SignDesc: SignDescriptor{
KeyDesc: chanState.LocalChanCfg.RevocationBasePoint, KeyDesc: chanState.LocalChanCfg.RevocationBasePoint,
DoubleTweak: commitmentSecret, DoubleTweak: commitmentSecret,
WitnessScript: htlcScript, WitnessScript: htlcWitnessScript,
Output: &wire.TxOut{ Output: &wire.TxOut{
Value: int64(htlc.Amt.ToSatoshis()), PkScript: htlcPkScript,
Value: int64(htlc.Amt.ToSatoshis()),
}, },
HashType: txscript.SigHashAll, HashType: txscript.SigHashAll,
}, },
@ -5295,7 +5301,8 @@ func newOutgoingHtlcResolution(signer Signer, localChanCfg *channeldb.ChannelCon
// With the sign desc created, we can now construct the full witness // With the sign desc created, we can now construct the full witness
// for the timeout transaction, and populate it as well. // for the timeout transaction, and populate it as well.
timeoutWitness, err := senderHtlcSpendTimeout( timeoutWitness, err := senderHtlcSpendTimeout(
htlc.Signature, signer, &timeoutSignDesc, timeoutTx) htlc.Signature, signer, &timeoutSignDesc, timeoutTx,
)
if err != nil { if err != nil {
return nil, err return nil, err
} }