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

lnwallet: set 2nd level sequence according to channel type

Browse Source
This commit is contained in:
Johan T. Halseth 2020-03-06 16:11:47 +01:00
parent bddd3e128c
commit c5d58b4762
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lnwallet/commitment.go
View File

@ -235,6 +235,16 @@ func HtlcSigHashType(chanType channeldb.ChannelType) txscript.SigHashType {
return txscript.SigHashAll return txscript.SigHashAll
} }
// HtlcSecondLevelInputSequence dictates the sequence number we must use on the
// input to a second level HTLC transaction.
func HtlcSecondLevelInputSequence(chanType channeldb.ChannelType) uint32 {
if chanType.HasAnchors() {
return 1
}
return 0
}
// CommitWeight returns the base commitment weight before adding HTLCs. // CommitWeight returns the base commitment weight before adding HTLCs.
func CommitWeight(chanType channeldb.ChannelType) int64 { func CommitWeight(chanType channeldb.ChannelType) int64 {
// If this commitment has anchors, it will be slightly heavier. // If this commitment has anchors, it will be slightly heavier.

18
lnwallet/transactions.go
View File

@ -54,10 +54,13 @@ func createHtlcSuccessTx(chanType channeldb.ChannelType,
successTx := wire.NewMsgTx(2) successTx := wire.NewMsgTx(2)
// The input to the transaction is the outpoint that creates the // The input to the transaction is the outpoint that creates the
// original HTLC on the sender's commitment transaction. // original HTLC on the sender's commitment transaction. Set the
successTx.AddTxIn(&wire.TxIn{ // sequence number based on the channel type.
txin := &wire.TxIn{
PreviousOutPoint: htlcOutput, PreviousOutPoint: htlcOutput,
}) Sequence: HtlcSecondLevelInputSequence(chanType),
}
successTx.AddTxIn(txin)
// Next, we'll generate the script used as the output for all second // Next, we'll generate the script used as the output for all second
// level HTLC which forces a covenant w.r.t what can be done with all // level HTLC which forces a covenant w.r.t what can be done with all
@ -110,10 +113,13 @@ func createHtlcTimeoutTx(chanType channeldb.ChannelType,
timeoutTx.LockTime = cltvExpiry timeoutTx.LockTime = cltvExpiry
// The input to the transaction is the outpoint that creates the // The input to the transaction is the outpoint that creates the
// original HTLC on the sender's commitment transaction. // original HTLC on the sender's commitment transaction. Set the
timeoutTx.AddTxIn(&wire.TxIn{ // sequence number based on the channel type.
txin := &wire.TxIn{
PreviousOutPoint: htlcOutput, PreviousOutPoint: htlcOutput,
}) Sequence: HtlcSecondLevelInputSequence(chanType),
}
timeoutTx.AddTxIn(txin)
// Next, we'll generate the script used as the output for all second // Next, we'll generate the script used as the output for all second
// level HTLC which forces a covenant w.r.t what can be done with all // level HTLC which forces a covenant w.r.t what can be done with all