Skip to content

Commit 3a15085

Browse files
ProofOfKeagsProofOfKeags
committed
input+lnwallet: refactor select methods in input to use ChannelParty
1 parent 1a5b5c5 commit 3a15085

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

‎input/script_utils.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/btcsuite/btcd/btcutil"
1414
"github.com/btcsuite/btcd/txscript"
1515
"github.com/btcsuite/btcd/wire"
16+
"github.com/lightningnetwork/lnd/lntypes"
1617
"github.com/lightningnetwork/lnd/lnutils"
1718
"golang.org/x/crypto/ripemd160"
1819
)
@@ -789,10 +790,10 @@ func senderHtlcTapScriptTree(senderHtlcKey, receiverHtlcKey,
789790
// unilaterally spend the created output.
790791
func SenderHTLCScriptTaproot(senderHtlcKey, receiverHtlcKey,
791792
revokeKey *btcec.PublicKey, payHash []byte,
792-
localCommit bool) (*HtlcScriptTree, error) {
793+
whoseCommit lntypes.ChannelParty) (*HtlcScriptTree, error) {
793794

794795
var hType htlcType
795-
if localCommit {
796+
if whoseCommit.IsLocal() {
796797
hType = htlcLocalOutgoing
797798
} else {
798799
hType = htlcRemoteIncoming
@@ -1348,10 +1349,11 @@ func receiverHtlcTapScriptTree(senderHtlcKey, receiverHtlcKey,
13481349
// the tap leaf are returned.
13491350
func ReceiverHTLCScriptTaproot(cltvExpiry uint32,
13501351
senderHtlcKey, receiverHtlcKey, revocationKey *btcec.PublicKey,
1351-
payHash []byte, ourCommit bool) (*HtlcScriptTree, error) {
1352+
payHash []byte, whoseCommit lntypes.ChannelParty,
1353+
) (*HtlcScriptTree, error) {
13521354

13531355
var hType htlcType
1354-
if ourCommit {
1356+
if whoseCommit.IsLocal() {
13551357
hType = htlcLocalIncoming
13561358
} else {
13571359
hType = htlcRemoteOutgoing

‎input/size_test.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/lightningnetwork/lnd/channeldb"
1414
"github.com/lightningnetwork/lnd/input"
1515
"github.com/lightningnetwork/lnd/keychain"
16+
"github.com/lightningnetwork/lnd/lntypes"
1617
"github.com/lightningnetwork/lnd/lnwallet"
1718
"github.com/stretchr/testify/require"
1819
)
@@ -1073,7 +1074,7 @@ var witnessSizeTests = []witnessSizeTest{
10731074

10741075
htlcScriptTree, err := input.SenderHTLCScriptTaproot(
10751076
senderKey.PubKey(), receiverKey.PubKey(),
1076-
revokeKey.PubKey(), payHash[:], false,
1077+
revokeKey.PubKey(), payHash[:], lntypes.Remote,
10771078
)
10781079
require.NoError(t, err)
10791080

@@ -1115,7 +1116,7 @@ var witnessSizeTests = []witnessSizeTest{
11151116
htlcScriptTree, err := input.ReceiverHTLCScriptTaproot(
11161117
testCLTVExpiry, senderKey.PubKey(),
11171118
receiverKey.PubKey(), revokeKey.PubKey(),
1118-
payHash[:], false,
1119+
payHash[:], lntypes.Remote,
11191120
)
11201121
require.NoError(t, err)
11211122

@@ -1157,7 +1158,7 @@ var witnessSizeTests = []witnessSizeTest{
11571158
htlcScriptTree, err := input.ReceiverHTLCScriptTaproot(
11581159
testCLTVExpiry, senderKey.PubKey(),
11591160
receiverKey.PubKey(), revokeKey.PubKey(),
1160-
payHash[:], false,
1161+
payHash[:], lntypes.Remote,
11611162
)
11621163
require.NoError(t, err)
11631164

@@ -1203,7 +1204,7 @@ var witnessSizeTests = []witnessSizeTest{
12031204

12041205
htlcScriptTree, err := input.SenderHTLCScriptTaproot(
12051206
senderKey.PubKey(), receiverKey.PubKey(),
1206-
revokeKey.PubKey(), payHash[:], false,
1207+
revokeKey.PubKey(), payHash[:], lntypes.Remote,
12071208
)
12081209
require.NoError(t, err)
12091210

@@ -1263,7 +1264,7 @@ var witnessSizeTests = []witnessSizeTest{
12631264

12641265
htlcScriptTree, err := input.SenderHTLCScriptTaproot(
12651266
senderKey.PubKey(), receiverKey.PubKey(),
1266-
revokeKey.PubKey(), payHash[:], false,
1267+
revokeKey.PubKey(), payHash[:], lntypes.Remote,
12671268
)
12681269
require.NoError(t, err)
12691270

@@ -1309,7 +1310,7 @@ var witnessSizeTests = []witnessSizeTest{
13091310
htlcScriptTree, err := input.ReceiverHTLCScriptTaproot(
13101311
testCLTVExpiry, senderKey.PubKey(),
13111312
receiverKey.PubKey(), revokeKey.PubKey(),
1312-
payHash[:], false,
1313+
payHash[:], lntypes.Remote,
13131314
)
13141315
require.NoError(t, err)
13151316

@@ -1394,7 +1395,8 @@ func genTimeoutTx(t *testing.T,
13941395
)
13951396
if chanType.IsTaproot() {
13961397
tapscriptTree, err = input.SenderHTLCScriptTaproot(
1397-
testPubkey, testPubkey, testPubkey, testHash160, false,
1398+
testPubkey, testPubkey, testPubkey, testHash160,
1399+
lntypes.Remote,
13981400
)
13991401
require.NoError(t, err)
14001402

@@ -1463,7 +1465,7 @@ func genSuccessTx(t *testing.T, chanType channeldb.ChannelType) *wire.MsgTx {
14631465
if chanType.IsTaproot() {
14641466
tapscriptTree, err = input.ReceiverHTLCScriptTaproot(
14651467
testCLTVExpiry, testPubkey, testPubkey, testPubkey,
1466-
testHash160, false,
1468+
testHash160, lntypes.Remote,
14671469
)
14681470
require.NoError(t, err)
14691471

‎input/taproot_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func newTestSenderHtlcScriptTree(t *testing.T) *testSenderHtlcScriptTree {
4848
payHash := preImage.Hash()
4949
htlcScriptTree, err := SenderHTLCScriptTaproot(
5050
senderKey.PubKey(), receiverKey.PubKey(), revokeKey.PubKey(),
51-
payHash[:], false,
51+
payHash[:], lntypes.Remote,
5252
)
5353
require.NoError(t, err)
5454

@@ -471,7 +471,7 @@ func newTestReceiverHtlcScriptTree(t *testing.T) *testReceiverHtlcScriptTree {
471471
payHash := preImage.Hash()
472472
htlcScriptTree, err := ReceiverHTLCScriptTaproot(
473473
cltvExpiry, senderKey.PubKey(), receiverKey.PubKey(),
474-
revokeKey.PubKey(), payHash[:], false,
474+
revokeKey.PubKey(), payHash[:], lntypes.Remote,
475475
)
476476
require.NoError(t, err)
477477

‎lnwallet/commitment.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,7 +1095,7 @@ func genTaprootHtlcScript(isIncoming, ourCommit bool, timeout uint32,
10951095
case isIncoming && ourCommit:
10961096
htlcScriptTree, err = input.ReceiverHTLCScriptTaproot(
10971097
timeout, keyRing.RemoteHtlcKey, keyRing.LocalHtlcKey,
1098-
keyRing.RevocationKey, rHash[:], ourCommit,
1098+
keyRing.RevocationKey, rHash[:], lntypes.Local,
10991099
)
11001100

11011101
// We're being paid via an HTLC by the remote party, and the HTLC is
@@ -1104,7 +1104,7 @@ func genTaprootHtlcScript(isIncoming, ourCommit bool, timeout uint32,
11041104
case isIncoming && !ourCommit:
11051105
htlcScriptTree, err = input.SenderHTLCScriptTaproot(
11061106
keyRing.RemoteHtlcKey, keyRing.LocalHtlcKey,
1107-
keyRing.RevocationKey, rHash[:], ourCommit,
1107+
keyRing.RevocationKey, rHash[:], lntypes.Remote,
11081108
)
11091109

11101110
// We're sending an HTLC which is being added to our commitment
@@ -1113,7 +1113,7 @@ func genTaprootHtlcScript(isIncoming, ourCommit bool, timeout uint32,
11131113
case !isIncoming && ourCommit:
11141114
htlcScriptTree, err = input.SenderHTLCScriptTaproot(
11151115
keyRing.LocalHtlcKey, keyRing.RemoteHtlcKey,
1116-
keyRing.RevocationKey, rHash[:], ourCommit,
1116+
keyRing.RevocationKey, rHash[:], lntypes.Local,
11171117
)
11181118

11191119
// Finally, we're paying the remote party via an HTLC, which is being
@@ -1122,7 +1122,7 @@ func genTaprootHtlcScript(isIncoming, ourCommit bool, timeout uint32,
11221122
case !isIncoming && !ourCommit:
11231123
htlcScriptTree, err = input.ReceiverHTLCScriptTaproot(
11241124
timeout, keyRing.LocalHtlcKey, keyRing.RemoteHtlcKey,
1125-
keyRing.RevocationKey, rHash[:], ourCommit,
1125+
keyRing.RevocationKey, rHash[:], lntypes.Remote,
11261126
)
11271127
}
11281128

0 commit comments

Comments
 (0)