Skip to content

Commit 244efde

Browse files
committed
build: Update Decred deps.
Test against Go 1.25
1 parent e3e7fe8 commit 244efde

9 files changed

Lines changed: 133 additions & 158 deletions

File tree

.github/workflows/go.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
go: ['1.21', '1.22']
12+
go: ['1.24', '1.25']
1313

1414
services:
1515
postgres:
16-
image: postgres:16.3
16+
image: postgres:18.1
1717
env:
1818
POSTGRES_USER: dcrpooluser
1919
POSTGRES_PASSWORD: 12345
@@ -27,13 +27,13 @@ jobs:
2727
- 5432:5432
2828
steps:
2929
- name: Set up Go
30-
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 #v5.0.1
30+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c #v6.1.0
3131
with:
3232
go-version: ${{ matrix.go }}
3333
- name: Check out source
34-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 #v4.1.6
34+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 #v6.0.0
3535
- name: Install Linters
36-
run: "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.59.0"
36+
run: "curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.7.2"
3737
- name: Build
3838
run: go build ./...
3939
- name: Test

.golangci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
version: "2"
12
run:
2-
deadline: 10m
3-
3+
timeout: 10m
44
linters:
5-
disable-all: true
5+
default: none
66
enable:
77
- asciicheck
88
- bidichk
@@ -11,10 +11,6 @@ linters:
1111
- durationcheck
1212
- errchkjson
1313
- errorlint
14-
- exportloopref
15-
- gofmt
16-
- goimports
17-
- gosimple
1814
- govet
1915
- grouper
2016
- ineffassign
@@ -23,7 +19,11 @@ linters:
2319
- reassign
2420
- rowserrcheck
2521
- sqlclosecheck
22+
- staticcheck
2623
- tparallel
27-
- typecheck
2824
- unconvert
2925
- unused
26+
formatters:
27+
enable:
28+
- gofmt
29+
- goimports

dcrpool.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ func newHub(cfg *config, db pool.Database) (*pool.Hub, error) {
2929
dcrdRPCCfg := rpcclient.ConnConfig{
3030
Host: cfg.DcrdRPCHost,
3131
Endpoint: "ws",
32+
AuthType: rpcclient.AuthTypeBasic,
3233
User: cfg.RPCUser,
3334
Pass: cfg.RPCPass,
3435
Certificates: cfg.dcrdRPCCerts,
@@ -81,7 +82,7 @@ func newGUI(cfg *config, hub *pool.Hub) (*gui.GUI, error) {
8182
Domain: cfg.Domain,
8283
TLSCertFile: cfg.GUITLSCert,
8384
TLSKeyFile: cfg.GUITLSKey,
84-
ActiveNetName: cfg.net.Params.Name,
85+
ActiveNetName: cfg.net.Name,
8586
BlockExplorerURL: cfg.net.blockExplorerURL,
8687
PaymentMethod: cfg.PaymentMethod,
8788
Designation: cfg.Designation,

go.mod

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module github.com/decred/dcrpool
22

3-
go 1.21
3+
go 1.24.0
44

55
require (
6-
decred.org/dcrwallet/v4 v4.1.0
7-
github.com/decred/dcrd/blockchain/standalone/v2 v2.2.1
8-
github.com/decred/dcrd/certgen v1.1.3
9-
github.com/decred/dcrd/chaincfg/chainhash v1.0.4
10-
github.com/decred/dcrd/chaincfg/v3 v3.2.1
11-
github.com/decred/dcrd/crypto/blake256 v1.0.1
12-
github.com/decred/dcrd/dcrjson/v4 v4.1.0
13-
github.com/decred/dcrd/dcrutil/v4 v4.0.2
14-
github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.3.0
15-
github.com/decred/dcrd/rpcclient/v8 v8.0.1
16-
github.com/decred/dcrd/txscript/v4 v4.1.1
17-
github.com/decred/dcrd/wire v1.7.0
6+
decred.org/dcrwallet/v5 v5.0.2
7+
github.com/decred/dcrd/blockchain/standalone/v2 v2.2.2
8+
github.com/decred/dcrd/certgen v1.2.0
9+
github.com/decred/dcrd/chaincfg/chainhash v1.0.5
10+
github.com/decred/dcrd/chaincfg/v3 v3.3.0
11+
github.com/decred/dcrd/crypto/blake256 v1.1.0
12+
github.com/decred/dcrd/dcrjson/v4 v4.2.0
13+
github.com/decred/dcrd/dcrutil/v4 v4.0.3
14+
github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.4.0
15+
github.com/decred/dcrd/rpcclient/v8 v8.1.0
16+
github.com/decred/dcrd/txscript/v4 v4.1.2
17+
github.com/decred/dcrd/wire v1.7.2
1818
github.com/decred/slog v1.2.0
1919
github.com/gorilla/csrf v1.7.2
2020
github.com/gorilla/mux v1.8.1
@@ -23,31 +23,32 @@ require (
2323
github.com/jessevdk/go-flags v1.5.0
2424
github.com/jrick/logrotate v1.0.0
2525
github.com/lib/pq v1.10.9
26-
go.etcd.io/bbolt v1.3.10
27-
golang.org/x/crypto v0.23.0
26+
go.etcd.io/bbolt v1.3.12
27+
golang.org/x/crypto v0.45.0
2828
golang.org/x/time v0.5.0
29-
google.golang.org/grpc v1.45.0
29+
google.golang.org/grpc v1.76.0
3030
)
3131

3232
require (
3333
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect
3434
github.com/dchest/siphash v1.2.3 // indirect
35-
github.com/decred/base58 v1.0.5 // indirect
36-
github.com/decred/dcrd/blockchain/stake/v5 v5.0.1 // indirect
35+
github.com/decred/base58 v1.0.6 // indirect
36+
github.com/decred/dcrd/blockchain/stake/v5 v5.0.2 // indirect
37+
github.com/decred/dcrd/crypto/rand v1.0.1 // indirect
3738
github.com/decred/dcrd/crypto/ripemd160 v1.0.2 // indirect
38-
github.com/decred/dcrd/database/v3 v3.0.2 // indirect
39+
github.com/decred/dcrd/database/v3 v3.0.3 // indirect
3940
github.com/decred/dcrd/dcrec v1.0.1 // indirect
40-
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3 // indirect
41-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
42-
github.com/decred/dcrd/gcs/v4 v4.1.0 // indirect
41+
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.4 // indirect
42+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
43+
github.com/decred/dcrd/gcs/v4 v4.1.1 // indirect
4344
github.com/decred/go-socks v1.1.0 // indirect
44-
github.com/golang/protobuf v1.5.2 // indirect
45+
github.com/golang/protobuf v1.5.4 // indirect
4546
github.com/gorilla/securecookie v1.1.2 // indirect
46-
github.com/klauspost/cpuid/v2 v2.2.5 // indirect
47-
golang.org/x/net v0.25.0 // indirect
48-
golang.org/x/sys v0.20.0 // indirect
49-
golang.org/x/text v0.15.0 // indirect
47+
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
48+
golang.org/x/net v0.47.0 // indirect
49+
golang.org/x/sys v0.38.0 // indirect
50+
golang.org/x/text v0.31.0 // indirect
5051
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
51-
google.golang.org/protobuf v1.27.1 // indirect
52+
google.golang.org/protobuf v1.36.10 // indirect
5253
lukechampine.com/blake3 v1.3.0 // indirect
5354
)

0 commit comments

Comments
 (0)