multi: fix linter issues, bump tool dependencies

cmd/chantools/rescuetweakedkey.go

@@ -15,7 +15,7 @@ import (
 )
 
 var (
-	AddrNotFoundErr = fmt.Errorf("address not found")
+	ErrAddrNotFound = fmt.Errorf("address not found")
 )
 
 type rescueTweakedKeyCommand struct {
@@ -153,7 +153,7 @@ func testPattern(startKey *btcec.PrivateKey, targetAddr btcutil.Address,
 	}
 
 	return fmt.Errorf("%w: key for address %v not found after %d attempts",
-		AddrNotFoundErr, targetAddr.String(), max)
+		ErrAddrNotFound, targetAddr.String(), max)
 }
 
 func pubKeyMatchesAddr(pubKey *btcec.PublicKey, addr btcutil.Address) (bool,

cmd/chantools/walletinfo.go

@@ -235,7 +235,7 @@ func walletInfo(w *wallet.Wallet, dumpAddrs bool) (*btcec.PublicKey, string,
 
 			privKey, err := pka.PrivKey()
 			if err != nil {
-				return fmt.Errorf("error deriving priv key: %v",
+				return fmt.Errorf("error deriving priv key: %w",
 					err)
 			}
 

tools/go.mod

@@ -3,7 +3,7 @@ module github.com/guggero/chantools/tools
 go 1.17
 
 require (
-	github.com/btcsuite/btcd v0.23.1
+	github.com/btcsuite/btcd v0.23.4
 	github.com/golangci/golangci-lint v1.46.2
 	github.com/ory/go-acc v0.2.8
 	github.com/rinchsan/gosimports v0.1.5

tools/go.sum

@@ -128,8 +128,8 @@ github.com/breml/errchkjson v0.3.0 h1:YdDqhfqMT+I1vIxPSas44P+9Z9HzJwCeAzjB8PxP1x
 github.com/breml/errchkjson v0.3.0/go.mod h1:9Cogkyv9gcT8HREpzi3TiqBxCqDzo8awa92zSDFcofU=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
-github.com/btcsuite/btcd v0.23.1 h1:IB8cVQcC2X5mHbnfirLG5IZnkWYNTPlLZVrxUYSotbE=
-github.com/btcsuite/btcd v0.23.1/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
+github.com/btcsuite/btcd v0.23.4 h1:IzV6qqkfwbItOS/sg/aDfPDsjPP8twrCOE2R93hxMlQ=
+github.com/btcsuite/btcd v0.23.4/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
 github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3 h1:xM/n3yIhHAhHy04z4i43C8p4ehixJZMsnrVJkgl+MTE=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=