From b30c4ce7672806c8c5eb4a85cd3bca50015d7f5f Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Sat, 29 Oct 2022 14:43:10 +0200 Subject: [PATCH] multi: fix linter errors --- cmd/chantools/derivekey.go | 1 + cmd/chantools/walletinfo.go | 9 +++++++-- lnd/hdkeychain.go | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cmd/chantools/derivekey.go b/cmd/chantools/derivekey.go index 1bc6955..39bbe6f 100644 --- a/cmd/chantools/derivekey.go +++ b/cmd/chantools/derivekey.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/guggero/chantools/lnd" diff --git a/cmd/chantools/walletinfo.go b/cmd/chantools/walletinfo.go index d9f7b4e..6be06df 100644 --- a/cmd/chantools/walletinfo.go +++ b/cmd/chantools/walletinfo.go @@ -228,7 +228,10 @@ func walletInfo(w *wallet.Wallet, dumpAddrs bool) (*btcec.PublicKey, string, scopeAddrs := "\n" if dumpAddrs { printAddr := func(a waddrmgr.ManagedAddress) error { - pka := a.(waddrmgr.ManagedPubKeyAddress) + pka, ok := a.(waddrmgr.ManagedPubKeyAddress) + if !ok { + return fmt.Errorf("key is not a managed pubkey") + } scope, path, _ := pka.DerivationInfo() scopeAddrs += fmt.Sprintf( "path=m/%d'/%d'/%d'/%d/%d, pubkey=%x, "+ @@ -243,7 +246,6 @@ func walletInfo(w *wallet.Wallet, dumpAddrs bool) (*btcec.PublicKey, string, for _, mgr := range w.Manager.ActiveScopedKeyManagers() { err = walletdb.View( w.Database(), func(tx walletdb.ReadTx) error { - waddrmgrNs := tx.ReadBucket( waddrmgrNamespaceKey, ) @@ -253,6 +255,9 @@ func walletInfo(w *wallet.Wallet, dumpAddrs bool) (*btcec.PublicKey, string, ) }, ) + if err != nil { + return nil, "", err + } } } diff --git a/lnd/hdkeychain.go b/lnd/hdkeychain.go index 53509b5..14d5c14 100644 --- a/lnd/hdkeychain.go +++ b/lnd/hdkeychain.go @@ -3,11 +3,11 @@ package lnd import ( "crypto/sha256" "fmt" - "github.com/btcsuite/btcd/btcec/v2/schnorr" "strconv" "strings" "github.com/btcsuite/btcd/btcec/v2" + "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/btcutil/hdkeychain" "github.com/btcsuite/btcd/chaincfg"