multi: update lnd version to v0.13.1-beta

Author: guggero

cmd/chantools/deletepayments.go

@@ -25,7 +25,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.12.1-beta or later after using this command!'`,
+run lnd v0.13.1-beta or later after using this command!'`,
 		Example: `chantools deletepayments --failedonly \
 	--channeldb ~/.lnd/data/graph/mainnet/channel.db`,
 		RunE: cc.Execute,

cmd/chantools/dropchannelgraph.go

@@ -29,7 +29,7 @@ forcing the lnd node to do a full graph sync.
 
 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.12.1-beta or later after using this command!'`,
+run lnd v0.13.1-beta or later after using this command!'`,
 		Example: `chantools dropchannelgraph \
 	--channeldb ~/.lnd/data/graph/mainnet/channel.db`,
 		RunE: cc.Execute,

cmd/chantools/migratedb.go

@@ -25,7 +25,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.12.1-beta or later after using this command!'`,
+run lnd v0.13.1-beta or later after using this command!'`,
 		Example: `chantools migratedb \
 	--channeldb ~/.lnd/data/graph/mainnet/channel.db`,
 		RunE: cc.Execute,

cmd/chantools/removechannel.go

@@ -31,7 +31,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.12.1-beta or later after using this command!`,
+run lnd v0.13.1-beta or later after using this command!`,
 		Example: `chantools removechannel \
 	--channeldb ~/.lnd/data/graph/mainnet/channel.db \
 	--channel 3149764effbe82718b280de425277e5e7b245a4573aa4a0203ac12cee1c37816:0`,

cmd/chantools/root.go

@@ -26,7 +26,7 @@ import (
 
 const (
 	defaultAPIURL = "https://blockstream.info/api"
-	version       = "0.8.6"
+	version       = "0.9.0"
 	na            = "n/a"
 
 	Commit = ""
@@ -37,7 +37,7 @@ var (
 	Regtest bool
 
 	logWriter   = build.NewRotatingLogWriter()
-	log         = build.NewSubLogger("CHAN", logWriter.GenSubLogger)
+	log         = build.NewSubLogger("CHAN", genSubLogger(logWriter))
 	chainParams = &chaincfg.MainNetParams
 )
 
@@ -270,12 +270,19 @@ func setupLogging() {
 	}
 }
 
+// genSubLogger creates a sub logger with an empty shutdown function.
+func genSubLogger(logWriter *build.RotatingLogWriter) func(string) btclog.Logger {
+	return func(s string) btclog.Logger {
+		return logWriter.GenSubLogger(s, func() {})
+	}
+}
+
 // addSubLogger is a helper method to conveniently create and register the
 // logger of one or more sub systems.
 func addSubLogger(subsystem string, useLoggers ...func(btclog.Logger)) {
 	// Create and register just a single logger to prevent them from
 	// overwriting each other internally.
-	logger := build.NewSubLogger(subsystem, logWriter.GenSubLogger)
+	logger := build.NewSubLogger(subsystem, genSubLogger(logWriter))
 	setSubLogger(subsystem, logger, useLoggers...)
 }
 

cmd/chantools/signrescuefunding.go

@@ -158,7 +158,7 @@ func findLocalMultisigKey(multisigBranch *hdkeychain.ExtendedKey,
 
 	// Loop through the local multisig keys to find the target key.
 	for index := uint32(0); index < MaxChannelLookup; index++ {
-		currentKey, err := multisigBranch.Child(index)
+		currentKey, err := multisigBranch.Derive(index)
 		if err != nil {
 			return nil, fmt.Errorf("error deriving child key: %v",
 				err)

go.mod

@@ -3,34 +3,37 @@ module github.com/guggero/chantools
 require (
 	git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6 // indirect
 	github.com/Yawning/aez v0.0.0-20180408160647-ec7426b44926 // indirect
-	github.com/btcsuite/btcd v0.21.0-beta.0.20201208033208-6bd4c64a54fa
+	github.com/btcsuite/btcd v0.21.0-beta.0.20210513141527-ee5896bad5be
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
-	github.com/btcsuite/btcutil v1.0.2
-	github.com/btcsuite/btcutil/psbt v1.0.3-0.20200826194809-5f93e33af2b0
-	github.com/btcsuite/btcwallet v0.11.1-0.20201207233335-415f37ff11a1
-	github.com/btcsuite/btcwallet/walletdb v1.3.4
+	github.com/btcsuite/btcutil v1.0.3-0.20210527170813-e2ba6805a890
+	github.com/btcsuite/btcutil/psbt v1.0.3-0.20210527170813-e2ba6805a890
+	github.com/btcsuite/btcwallet v0.12.1-0.20210519225359-6ab9b615576f
+	github.com/btcsuite/btcwallet/walletdb v1.3.5
 	github.com/coreos/bbolt v1.3.3
 	github.com/davecgh/go-spew v1.1.1
 	github.com/frankban/quicktest v1.11.2 // indirect
-	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/gogo/protobuf v1.2.1
 	github.com/google/go-cmp v0.5.3 // indirect
-	github.com/lightningnetwork/lnd v0.12.1-beta
+	github.com/lightningnetwork/lnd v0.13.1-beta
 	github.com/ltcsuite/ltcd v0.0.0-20191228044241-92166e412499 // indirect
 	github.com/miekg/dns v1.1.26 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/spf13/cobra v1.1.1
-	github.com/stretchr/testify v1.6.1
+	github.com/stretchr/testify v1.7.0
 	go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50
 	golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899
-	golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect
 	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
-	golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect
 	golang.org/x/text v0.3.4 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
-replace github.com/lightningnetwork/lnd => github.com/guggero/lnd v0.11.0-beta.rc4.0.20210609102733-8d0a492ec962
+replace github.com/lightningnetwork/lnd => github.com/guggero/lnd v0.11.0-beta.rc4.0.20210726083410-a74ce5305eaa
+
+replace github.com/lightningnetwork/lnd/kvdb => github.com/guggero/lnd/kvdb v0.0.0-20210726083410-a74ce5305eaa
+
+// Fix incompatibility of etcd go.mod package.
+// See https://github.com/etcd-io/etcd/issues/11154
+replace go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20201125193152-8a03d2e9614b
 
 go 1.13