fixup! fixup! lnwallet+channeldb: add new AuxLeafStore for dynamic au…

…x leaves
lightningnetwork · Apr 16, 2024 · f7f875b · f7f875b
1 parent 48a1317
commit f7f875b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/contractcourt/breach_arbitrator_test.go b/contractcourt/breach_arbitrator_test.go
@@ -22,6 +22,7 @@ import (
  "github.com/go-errors/errors"
  "github.com/lightningnetwork/lnd/chainntnfs"
  "github.com/lightningnetwork/lnd/channeldb"
+ "github.com/lightningnetwork/lnd/fn"
  "github.com/lightningnetwork/lnd/input"
  "github.com/lightningnetwork/lnd/keychain"
  "github.com/lightningnetwork/lnd/lntest/channels"
@@ -1585,6 +1586,7 @@ func testBreachSpends(t *testing.T, test breachTest) {
  // Notify the breach arbiter about the breach.
  retribution, err := lnwallet.NewBreachRetribution(
  alice.State(), height, 1, forceCloseTx,
+ fn.None[lnwallet.AuxLeafStore](),
  )
  require.NoError(t, err, "unable to create breach retribution")
 
@@ -1794,6 +1796,7 @@ func TestBreachDelayedJusticeConfirmation(t *testing.T) {
  // Notify the breach arbiter about the breach.
  retribution, err := lnwallet.NewBreachRetribution(
  alice.State(), height, uint32(blockHeight), forceCloseTx,
+ fn.None[lnwallet.AuxLeafStore](),
  )
  require.NoError(t, err, "unable to create breach retribution")
 

diff --git a/input/size_test.go b/input/size_test.go
@@ -1388,6 +1388,7 @@ func genTimeoutTx(t *testing.T,
  timeoutTx, err := lnwallet.CreateHtlcTimeoutTx(
  chanType, false, testOutPoint, testAmt, testCLTVExpiry,
  testCSVDelay, 0, testPubkey, testPubkey,
+ fn.None[txscript.TapLeaf](),
  )
  require.NoError(t, err)
 
@@ -1456,7 +1457,7 @@ func genSuccessTx(t *testing.T, chanType channeldb.ChannelType) *wire.MsgTx {
  // Create the unsigned success tx.
  successTx, err := lnwallet.CreateHtlcSuccessTx(
  chanType, false, testOutPoint, testAmt, testCSVDelay, 0,
- testPubkey, testPubkey,
+ testPubkey, testPubkey, fn.None[txscript.TapLeaf](),
  )
  require.NoError(t, err)
 

diff --git a/lnwallet/channel_test.go b/lnwallet/channel_test.go
@@ -26,6 +26,7 @@ import (
  "github.com/lightningnetwork/lnd/lntypes"
  "github.com/lightningnetwork/lnd/lnwallet/chainfee"
  "github.com/lightningnetwork/lnd/lnwire"
+ "github.com/lightningnetwork/lnd/tlv"
  "github.com/stretchr/testify/require"
 )
 

diff --git a/watchtower/lookout/justice_descriptor_test.go b/watchtower/lookout/justice_descriptor_test.go
@@ -11,6 +11,7 @@ import (
  "github.com/btcsuite/btcd/txscript"
  "github.com/btcsuite/btcd/wire"
  secp "github.com/decred/dcrd/dcrec/secp256k1/v4"
+ "github.com/lightningnetwork/lnd/fn"
  "github.com/lightningnetwork/lnd/input"
  "github.com/lightningnetwork/lnd/keychain"
  "github.com/lightningnetwork/lnd/lnwallet"
@@ -123,7 +124,7 @@ func testJusticeDescriptor(t *testing.T, blobType blob.Type) {
 
  if isTaprootChannel {
  toLocalCommitTree, err = input.NewLocalCommitScriptTree(
- csvDelay, toLocalPK, revPK,
+ csvDelay, toLocalPK, revPK, fn.None[txscript.TapLeaf](),
  )
  require.NoError(t, err)
 
@@ -174,7 +175,7 @@ func testJusticeDescriptor(t *testing.T, blobType blob.Type) {
  toRemoteSequence = 1
 
  commitScriptTree, err := input.NewRemoteCommitScriptTree(
- toRemotePK,
+ toRemotePK, fn.None[txscript.TapLeaf](),
  )
  require.NoError(t, err)
 

diff --git a/watchtower/wtclient/backup_task_internal_test.go b/watchtower/wtclient/backup_task_internal_test.go
@@ -10,6 +10,7 @@ import (
  "github.com/btcsuite/btcd/txscript"
  "github.com/btcsuite/btcd/wire"
  "github.com/lightningnetwork/lnd/channeldb"
+ "github.com/lightningnetwork/lnd/fn"
  "github.com/lightningnetwork/lnd/input"
  "github.com/lightningnetwork/lnd/keychain"
  "github.com/lightningnetwork/lnd/lnwallet"
@@ -136,6 +137,7 @@ func genTaskTest(
  if chanType.IsTaproot() {
  scriptTree, _ := input.NewLocalCommitScriptTree(
  csvDelay, toLocalPK, revPK,
+ fn.None[txscript.TapLeaf](),
  )
 
  pkScript, _ := input.PayToTaprootScript(
@@ -189,7 +191,7 @@ func genTaskTest(
 
  if chanType.IsTaproot() {
  scriptTree, _ := input.NewRemoteCommitScriptTree(
- toRemotePK,
+ toRemotePK, fn.None[txscript.TapLeaf](),
  )
 
  pkScript, _ := input.PayToTaprootScript(

diff --git a/watchtower/wtclient/client_test.go b/watchtower/wtclient/client_test.go
@@ -19,6 +19,7 @@ import (
  "github.com/lightningnetwork/lnd/chainntnfs"
  "github.com/lightningnetwork/lnd/channeldb"
  "github.com/lightningnetwork/lnd/channelnotifier"
+ "github.com/lightningnetwork/lnd/fn"
  "github.com/lightningnetwork/lnd/input"
  "github.com/lightningnetwork/lnd/keychain"
  "github.com/lightningnetwork/lnd/kvdb"
@@ -230,12 +231,14 @@ func (c *mockChannel) createRemoteCommitTx(t *testing.T) {
 
  // Construct the to-local witness script.
  toLocalScriptTree, err := input.NewLocalCommitScriptTree(
- c.csvDelay, c.toLocalPK, c.revPK,
+ c.csvDelay, c.toLocalPK, c.revPK, fn.None[txscript.TapLeaf](),
  )
  require.NoError(t, err, "unable to create to-local script")
 
  // Construct the to-remote witness script.
- toRemoteScriptTree, err := input.NewRemoteCommitScriptTree(c.toRemotePK)
+ toRemoteScriptTree, err := input.NewRemoteCommitScriptTree(
+ c.toRemotePK, fn.None[txscript.TapLeaf](),
+ )
  require.NoError(t, err, "unable to create to-remote script")
 
  // Compute the to-local witness script hash.