Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ env:
GOBIN: /home/runner/work/go/bin
GO111MODULE: on

GO_VERSION: 1.23.12
# If you change this please run `make lint` to see where else it needs to be
# updated as well.
GO_VERSION: 1.24.6

BITCOIND_VERSION: '22.0'
BITCOIND_IMAGE: 'lightninglabs/bitcoin-core'

Expand Down
4 changes: 4 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
run:
# If you change this please run `make lint` to see where else it needs to be
# updated as well.
go: "1.24.6"

# timeout for analysis
timeout: 10m

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ GOIMPORTS_BIN := $(GO_BIN)/gosimports
LINT_BIN := $(GO_BIN)/golangci-lint
GOACC_BIN := $(GO_BIN)/go-acc

LINT_VERSION := v1.60.1
LINT_VERSION := v1.64.8
GOACC_VERSION := v0.2.8

GOIMPORTS_COMMIT := v0.1.10
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,6 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
)

go 1.22
// If you change this please run `make lint` to see where else it needs to be
// pdated as well.
go 1.24.6
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like this will break its usage in lnd?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think LND should also be updated, since it is primarily a daemon.

2 changes: 1 addition & 1 deletion internal/legacy/keystore/keystore.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcwallet/internal/legacy/rename"
secp "github.com/decred/dcrd/dcrec/secp256k1/v4"
"golang.org/x/crypto/ripemd160" //nolint:staticcheck
"golang.org/x/crypto/ripemd160" //nolint:staticcheck,gosec
)

const (
Expand Down
10 changes: 9 additions & 1 deletion wallet/wallet.go
Original file line number Diff line number Diff line change
Expand Up @@ -4091,7 +4091,15 @@ func (w *Wallet) DeriveFromKeyPath(scope waddrmgr.KeyScope,
return fmt.Errorf("error deriving private key: %w", err)
}

privKey, err = addr.(waddrmgr.ManagedPubKeyAddress).PrivKey()
mpka, ok := addr.(waddrmgr.ManagedPubKeyAddress)
if !ok {
err := fmt.Errorf("managed address type for %v is "+
"`%T` but want waddrmgr.ManagedPubKeyAddress",
addr, addr)

return err
}
privKey, err = mpka.PrivKey()

return err
})
Expand Down
Loading