multi: update lnd to v0.18.4-beta

Author: guggero

.github/workflows/main.yml

@@ -16,7 +16,7 @@ env:
   # go needs absolute directories, using the $HOME variable doesn't work here.
   GOCACHE: /home/runner/work/go/pkg/build
   GOPATH: /home/runner/work/go
-  GO_VERSION: 1.22.3
+  GO_VERSION: 1.22.6
 
 jobs:
   ########################

cmd/chantools/root.go

@@ -37,7 +37,7 @@ const (
 	// lndVersion is the current version of lnd that we support. This is
 	// shown in some commands that affect the database and its migrations.
 	// Run "make docs" after changing this value.
-	lndVersion = "v0.18.3-beta"
+	lndVersion = "v0.18.4-beta"
 
 	Commit = ""
 )

cmd/chantools/zombierecovery_makeoffer.go

@@ -20,10 +20,12 @@ import (
 	"github.com/btcsuite/btcd/btcutil/hdkeychain"
 	"github.com/btcsuite/btcd/btcutil/psbt"
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btcwallet/wallet"
 	"github.com/lightninglabs/chantools/lnd"
+	"github.com/lightningnetwork/lnd/fn"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lnwallet"
@@ -650,7 +652,9 @@ func matchScript(address string, key1, key2 *btcec.PublicKey,
 			pkScript, nil
 
 	case *btcutil.AddressTaproot:
-		pkScript, _, err := input.GenTaprootFundingScript(key1, key2, 0)
+		pkScript, _, err := input.GenTaprootFundingScript(
+			key1, key2, 0, fn.None[chainhash.Hash](),
+		)
 		if err != nil {
 			return false, nil, nil, err
 		}

doc/chantools_deletepayments.md

@@ -10,7 +10,7 @@ If only the failed payments should be deleted (and not the successful ones), the
 
 CAUTION: Running this command will make it impossible to use the channel DB
 with an older version of lnd. Downgrading is not possible and you'll need to
-run lnd v0.18.3-beta or later after using this command!'
+run lnd v0.18.4-beta or later after using this command!'
 
 ```
 chantools deletepayments [flags]

doc/chantools_dropchannelgraph.md

@@ -12,7 +12,7 @@ without removing any other data.
 
 CAUTION: Running this command will make it impossible to use the channel DB
 with an older version of lnd. Downgrading is not possible and you'll need to
-run lnd v0.18.3-beta or later after using this command!'
+run lnd v0.18.4-beta or later after using this command!'
 
 ```
 chantools dropchannelgraph [flags]

doc/chantools_dropgraphzombies.md

@@ -12,7 +12,7 @@ be helpful to fix a graph that is out of sync with the network.
 
 CAUTION: Running this command will make it impossible to use the channel DB
 with an older version of lnd. Downgrading is not possible and you'll need to
-run lnd v0.18.3-beta or later after using this command!'
+run lnd v0.18.4-beta or later after using this command!'
 
 ```
 chantools dropgraphzombies [flags]

doc/chantools_fakechanbackup.md

@@ -61,7 +61,7 @@ chantools fakechanbackup --from_channel_graph lncli_describegraph.json \
       --channelpoint string         funding transaction outpoint of the channel to rescue (<txid>:<txindex>) as it is displayed on 1ml.com
       --from_channel_graph string   the full LN channel graph in the JSON format that the 'lncli describegraph' returns
   -h, --help                        help for fakechanbackup
-      --multi_file string           the fake channel backup file to create (default "results/fake-2024-10-28-13-17-27.backup")
+      --multi_file string           the fake channel backup file to create (default "results/fake-2024-12-27-13-52-07.backup")
       --remote_node_addr string     the remote node connection information in the format pubkey@host:port
       --rootkey string              BIP32 HD root key of the wallet to use for encrypting the backup; leave empty to prompt for lnd 24 word aezeed
       --short_channel_id string     the short channel ID in the format <blockheight>x<transactionindex>x<outputindex>

doc/chantools_migratedb.md

@@ -11,7 +11,7 @@ needs to read the database content.
 
 CAUTION: Running this command will make it impossible to use the channel DB
 with an older version of lnd. Downgrading is not possible and you'll need to
-run lnd v0.18.3-beta or later after using this command!'
+run lnd v0.18.4-beta or later after using this command!'
 
 ```
 chantools migratedb [flags]

doc/chantools_removechannel.md

@@ -11,7 +11,7 @@ channel was never confirmed on chain!
 
 CAUTION: Running this command will make it impossible to use the channel DB
 with an older version of lnd. Downgrading is not possible and you'll need to
-run lnd v0.18.3-beta or later after using this command!
+run lnd v0.18.4-beta or later after using this command!
 
 ```
 chantools removechannel [flags]

dump/dump.go

@@ -13,6 +13,7 @@ import (
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/lightningnetwork/lnd/chanbackup"
 	"github.com/lightningnetwork/lnd/channeldb"
+	"github.com/lightningnetwork/lnd/fn"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lntypes"
@@ -261,6 +262,7 @@ func CollectDebugInfo(channel *channeldb.OpenChannel,
 	toLocalScript, err := lnwallet.CommitScriptToSelf(
 		chanType, initiator, keyRing.ToLocalKey, keyRing.RevocationKey,
 		uint32(ourChanCfg.CsvDelay), leaseExpiry,
+		fn.None[txscript.TapLeaf](),
 	)
 	if err != nil {
 		return nil, err
@@ -269,6 +271,7 @@ func CollectDebugInfo(channel *channeldb.OpenChannel,
 	// Next, we create the script paying to the remote.
 	toRemoteScript, _, err := lnwallet.CommitScriptToRemote(
 		chanType, initiator, keyRing.ToRemoteKey, leaseExpiry,
+		fn.None[txscript.TapLeaf](),
 	)
 	if err != nil {
 		return nil, err