Merge pull request #138 from starius/update-lnd-v0.18.0-beta

update dependencies (LND v0.18.0-beta and co)

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.21.3
+  GO_VERSION: 1.22.3
 
 jobs:
   ########################

.golangci.yml

@@ -1,6 +1,6 @@
 run:
   # timeout for analysis
-  deadline: 4m
+  timeout: 4m
 
 linters-settings:
   govet:
@@ -12,7 +12,7 @@ linters-settings:
   whitespace:
     multi-func: true
     multi-if: true
-  tagliatelle: 
+  tagliatelle:
     case:
       rules:
         json: snake
@@ -31,17 +31,15 @@ linters:
     - gochecknoglobals
     - gosec
     - funlen
-    - maligned
     - varnamelen
     - wrapcheck
     - testpackage
     - gomnd
-    - goerr113
+    - err113
     - exhaustruct
     - forbidigo
     - gocognit
     - nestif
-    - ifshort
     - wsl
     - cyclop
     - gocyclo
@@ -53,16 +51,9 @@ linters:
     - noctx
     - gofumpt
     - exhaustive
-    
-    # deprecated
-    - interfacer
-    - scopelint
-    - golint
-    - exhaustivestruct
-    - nosnakecase
-    - deadcode
-    - structcheck
-    - varcheck
+    - protogetter
+    - depguard
+    - mnd
 
 issues:
   exclude-rules:

README.md

@@ -39,7 +39,7 @@ $ sudo mv chantools-*/chantools /usr/local/bin/
 
 If there isn't a pre-built binary for your operating system or architecture
 available or you want to build `chantools` from source for another reason, you
-need to make sure you have `go 1.21.x` (or later) and `make` installed and can
+need to make sure you have `go 1.22.3` (or later) and `make` installed and can
 then run the following commands:
 
 ```bash
@@ -519,4 +519,4 @@ Legend:
 
 [discussions]: https://github.com/lightningnetwork/lnd/discussions
 
-[zombie-recovery]: doc/zombierecovery.md
+[zombie-recovery]: doc/zombierecovery.md

bip39/wordlist_english.go

@@ -3,8 +3,8 @@
 package bip39
 
 import (
-	"fmt"
 	"hash/crc32"
+	"strconv"
 	"strings"
 )
 
@@ -14,7 +14,7 @@ func init() { //nolint:gochecknoinits
 	// $ crc32 english.txt
 	// c1dbd296
 	checksum := crc32.ChecksumIEEE([]byte(english))
-	if fmt.Sprintf("%x", checksum) != "c1dbd296" {
+	if strconv.FormatUint(uint64(checksum), 16) != "c1dbd296" {
 		panic("english checksum invalid")
 	}
 }

btc/bitcoind.go

@@ -25,9 +25,9 @@ const (
 
 type KeyExporter interface {
 	Header() string
-	Format(*hdkeychain.ExtendedKey, *chaincfg.Params, string, uint32,
-		uint32) (string, error)
-	Trailer(uint32) string
+	Format(hdKey *hdkeychain.ExtendedKey, params *chaincfg.Params,
+		path string, branch, index uint32) (string, error)
+	Trailer(birthdayBlock uint32) string
 }
 
 // ParseFormat parses the given format name and returns its associated print
@@ -67,7 +67,7 @@ func ExportKeys(extendedKey *hdkeychain.ExtendedKey, strPaths []string,
 		path := paths[idx]
 
 		// External branch first (<DerivationPath>/0/i).
-		for i := uint32(0); i < recoveryWindow; i++ {
+		for i := range recoveryWindow {
 			path := append(path, 0, i)
 			derivedKey, err := lnd.DeriveChildren(extendedKey, path)
 			if err != nil {
@@ -83,7 +83,7 @@ func ExportKeys(extendedKey *hdkeychain.ExtendedKey, strPaths []string,
 		}
 
 		// Now the internal branch (<DerivationPath>/1/i).
-		for i := uint32(0); i < recoveryWindow; i++ {
+		for i := range recoveryWindow {
 			path := append(path, 1, i)
 			derivedKey, err := lnd.DeriveChildren(extendedKey, path)
 			if err != nil {
@@ -254,7 +254,7 @@ func (p *Electrum) Header() string {
 }
 
 func (p *Electrum) Format(hdKey *hdkeychain.ExtendedKey,
-	params *chaincfg.Params, path string, branch, index uint32) (string,
+	params *chaincfg.Params, path string, _, _ uint32) (string,
 	error) {
 
 	privKey, err := hdKey.ECPrivKey()
@@ -285,7 +285,7 @@ func (d *Descriptors) Header() string {
 }
 
 func (d *Descriptors) Format(hdKey *hdkeychain.ExtendedKey,
-	params *chaincfg.Params, path string, branch, index uint32) (string,
+	params *chaincfg.Params, _ string, _, _ uint32) (string,
 	error) {
 
 	privKey, err := hdKey.ECPrivKey()

btc/descriptors.go

@@ -19,7 +19,7 @@ func descriptorSumPolymod(symbols []uint64) uint64 {
 	for _, value := range symbols {
 		top := chk >> 35
 		chk = (chk&0x7ffffffff)<<5 ^ value
-		for i := 0; i < 5; i++ {
+		for i := range 5 {
 			if (top>>i)&1 != 0 {
 				chk ^= generator[i]
 			}
@@ -57,7 +57,7 @@ func DescriptorSumCreate(s string) string {
 	symbols := append(descriptorSumExpand(s), 0, 0, 0, 0, 0, 0, 0, 0)
 	checksum := descriptorSumPolymod(symbols) ^ 1
 	builder := strings.Builder{}
-	for i := 0; i < 8; i++ {
+	for i := range 8 {
 		builder.WriteByte(checksumCharset[(checksum>>(5*(7-i)))&31])
 	}
 	return s + "#" + builder.String()

btc/explorer_api.go

@@ -103,7 +103,7 @@ func (a *ExplorerAPI) Outpoint(addr string) (*TX, int, error) {
 		}
 	}
 
-	return nil, 0, fmt.Errorf("no tx found")
+	return nil, 0, errors.New("no tx found")
 }
 
 func (a *ExplorerAPI) Spends(addr string) ([]*TX, error) {
@@ -193,7 +193,7 @@ func (a *ExplorerAPI) Address(outpoint string) (string, error) {
 }
 
 func (a *ExplorerAPI) PublishTx(rawTxHex string) (string, error) {
-	url := fmt.Sprintf("%s/tx", a.BaseURL)
+	url := a.BaseURL + "/tx"
 	resp, err := http.Post(url, "text/plain", strings.NewReader(rawTxHex))
 	if err != nil {
 		return "", fmt.Errorf("error posting data to API '%s', "+

cmd/chantools/chanbackup.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/lightninglabs/chantools/lnd"
@@ -50,12 +51,12 @@ func (c *chanBackupCommand) Execute(_ *cobra.Command, _ []string) error {
 
 	// Check that we have a backup file.
 	if c.MultiFile == "" {
-		return fmt.Errorf("backup file is required")
+		return errors.New("backup file is required")
 	}
 
 	// Check that we have a channel DB.
 	if c.ChannelDB == "" {
-		return fmt.Errorf("channel DB is required")
+		return errors.New("channel DB is required")
 	}
 	db, err := lnd.OpenDB(c.ChannelDB, true)
 	if err != nil {

cmd/chantools/closepoolaccount.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"encoding/hex"
+	"errors"
 	"fmt"
 
 	"github.com/btcsuite/btcd/btcec/v2"
@@ -292,7 +293,7 @@ func closePoolAccount(extendedKey *hdkeychain.ExtendedKey, apiURL string,
 		signDesc.SignMethod = input.TaprootScriptSpendSignMethod
 	}
 	feeRateKWeight := chainfee.SatPerKVByte(1000 * feeRate).FeePerKWeight()
-	totalFee := feeRateKWeight.FeeForWeight(int64(estimator.Weight()))
+	totalFee := feeRateKWeight.FeeForWeight(estimator.Weight())
 
 	// Add our sweep destination output.
 	sweepTx.TxOut = []*wire.TxOut{{
@@ -367,7 +368,7 @@ func bruteForceAccountScript(accountBaseKey *hdkeychain.ExtendedKey,
 	maxNumBatchKeys uint32, targetScript []byte) (*poolAccount, error) {
 
 	// The outermost loop is over the possible accounts.
-	for i := uint32(0); i < maxNumAccounts; i++ {
+	for i := range maxNumAccounts {
 		accountExtendedKey, err := accountBaseKey.DeriveNonStandard(i)
 		if err != nil {
 			return nil, fmt.Errorf("error deriving account key: "+
@@ -430,7 +431,7 @@ func bruteForceAccountScript(accountBaseKey *hdkeychain.ExtendedKey,
 		log.Debugf("Tried account index %d of %d", i, maxNumAccounts)
 	}
 
-	return nil, fmt.Errorf("account script not derived")
+	return nil, errors.New("account script not derived")
 }
 
 func fastScript(keyIndex, expiryFrom, expiryTo uint32, traderKey, auctioneerKey,
@@ -442,7 +443,7 @@ func fastScript(keyIndex, expiryFrom, expiryTo uint32, traderKey, auctioneerKey,
 		return nil, err
 	}
 	if script.Class() != txscript.WitnessV0ScriptHashTy {
-		return nil, fmt.Errorf("incompatible script class")
+		return nil, errors.New("incompatible script class")
 	}
 
 	traderKeyTweak := poolscript.TraderKeyTweak(batchKey, secret, traderKey)
@@ -492,7 +493,7 @@ func fastScript(keyIndex, expiryFrom, expiryTo uint32, traderKey, auctioneerKey,
 		}, nil
 	}
 
-	return nil, fmt.Errorf("account script not derived")
+	return nil, errors.New("account script not derived")
 }
 
 func fastScriptTaproot(scriptVersion poolscript.Version, keyIndex, expiryFrom,
@@ -504,7 +505,7 @@ func fastScriptTaproot(scriptVersion poolscript.Version, keyIndex, expiryFrom,
 		return nil, err
 	}
 	if parsedScript.Class() != txscript.WitnessV1TaprootTy {
-		return nil, fmt.Errorf("incompatible script class")
+		return nil, errors.New("incompatible script class")
 	}
 
 	traderKeyTweak := poolscript.TraderKeyTweak(batchKey, secret, traderKey)
@@ -601,5 +602,5 @@ func fastScriptTaproot(scriptVersion poolscript.Version, keyIndex, expiryFrom,
 		}, nil
 	}
 
-	return nil, fmt.Errorf("account script not derived")
+	return nil, errors.New("account script not derived")
 }

cmd/chantools/closepoolaccount_test.go

@@ -70,8 +70,6 @@ func TestClosePoolAccount(t *testing.T) {
 	)
 
 	for _, tc := range testAccounts {
-		tc := tc
-
 		t.Run(tc.name, func(tt *testing.T) {
 			tt.Parallel()
 

cmd/chantools/compactdb.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/coreos/bbolt"
@@ -52,10 +53,10 @@ to create a copy of it to a destination file, compacting it in the process.`,
 func (c *compactDBCommand) Execute(_ *cobra.Command, _ []string) error {
 	// Check that we have a source and destination channel DB.
 	if c.SourceDB == "" {
-		return fmt.Errorf("source channel DB is required")
+		return errors.New("source channel DB is required")
 	}
 	if c.DestDB == "" {
-		return fmt.Errorf("destination channel DB is required")
+		return errors.New("destination channel DB is required")
 	}
 	if c.TxMaxSize <= 0 {
 		c.TxMaxSize = defaultTxMaxSize

cmd/chantools/createwallet.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"os"
 	"strings"
@@ -63,7 +64,7 @@ func (c *createWalletCommand) Execute(_ *cobra.Command, _ []string) error {
 
 	// Check that we have a wallet DB.
 	if c.WalletDBDir == "" {
-		return fmt.Errorf("wallet DB directory is required")
+		return errors.New("wallet DB directory is required")
 	}
 
 	// Make sure the directory (and parents) exists.
@@ -143,7 +144,7 @@ func (c *createWalletCommand) Execute(_ *cobra.Command, _ []string) error {
 		}
 
 		if !bytes.Equal(pw, pw2) {
-			return fmt.Errorf("passwords don't match")
+			return errors.New("passwords don't match")
 		}
 
 		if len(pw) > 0 {

cmd/chantools/deletepayments.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/lightninglabs/chantools/lnd"
@@ -45,7 +46,7 @@ run lnd ` + lndVersion + ` or later after using this command!'`,
 func (c *deletePaymentsCommand) Execute(_ *cobra.Command, _ []string) error {
 	// Check that we have a channel DB.
 	if c.ChannelDB == "" {
-		return fmt.Errorf("channel DB is required")
+		return errors.New("channel DB is required")
 	}
 	db, err := lnd.OpenDB(c.ChannelDB, false)
 	if err != nil {

cmd/chantools/doc.go

@@ -10,7 +10,7 @@ func newDocCommand() *cobra.Command {
 		Use:    "doc",
 		Short:  "Generate the markdown documentation of all commands",
 		Hidden: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(_ *cobra.Command, _ []string) error {
 			return doc.GenMarkdownTree(rootCmd, "./doc")
 		},
 	}

cmd/chantools/doublespendinputs.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"strconv"
 
@@ -96,7 +97,7 @@ func (c *doubleSpendInputs) Execute(_ *cobra.Command, _ []string) error {
 
 	// Make sure we have at least one input.
 	if len(c.InputOutpoints) == 0 {
-		return fmt.Errorf("inputoutpoints are required")
+		return errors.New("inputoutpoints are required")
 	}
 
 	api := newExplorerAPI(c.APIURL)
@@ -226,7 +227,7 @@ func (c *doubleSpendInputs) Execute(_ *cobra.Command, _ []string) error {
 
 	// Calculate the fee.
 	feeRateKWeight := chainfee.SatPerKVByte(1000 * c.FeeRate).FeePerKWeight()
-	totalFee := feeRateKWeight.FeeForWeight(int64(estimator.Weight()))
+	totalFee := feeRateKWeight.FeeForWeight(estimator.Weight())
 
 	// Create the transaction.
 	tx := wire.NewMsgTx(2)
@@ -308,7 +309,7 @@ func (c *doubleSpendInputs) Execute(_ *cobra.Command, _ []string) error {
 func iterateOverPath(baseKey *hdkeychain.ExtendedKey, addr btcutil.Address,
 	path []uint32, maxTries uint32) (*hdkeychain.ExtendedKey, error) {
 
-	for i := uint32(0); i < maxTries; i++ {
+	for i := range maxTries {
 		// Check for both the external and internal branch.
 		for _, branch := range []uint32{0, 1} {
 			// Create the path to derive the key.