Skip to content

Commit 8d254b2

Browse files
committed
multi: Update dependencies and workflows to v2.2.0
1 parent ed55949 commit 8d254b2

31 files changed

+243
-204
lines changed

.github/workflows/go.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ jobs:
99
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
go: ['1.21', '1.22']
12+
go: ['1.24', '1.25']
1313
steps:
1414
- name: Set up Go
15-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 #v5.0.0
15+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 #5.5.0
1616
with:
1717
go-version: ${{ matrix.go }}
1818

1919
- name: Check out source
20-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
20+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
2121

2222
- name: Install Linters
23-
run: "go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.56.0"
23+
run: "go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8"
2424

2525
- name: Check golangci-lint version
2626
run: golangci-lint --version
@@ -50,7 +50,7 @@ jobs:
5050
strategy:
5151
fail-fast: false
5252
matrix:
53-
go: ['1.21']
53+
go: ['1.25']
5454
testsuite:
5555
- unit-race # unit tests
5656
- itest-parallel-run # embedded wallet using dcrd for sync and chain ops
@@ -60,12 +60,12 @@ jobs:
6060
- itest-parallel-run walletimpl=remotewallet backend=spv # remote wallet spv sync
6161
steps:
6262
- name: Set up Go
63-
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 #v5.0.0
63+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 #5.5.0
6464
with:
6565
go-version: ${{ matrix.go }}
6666

6767
- name: Check out source
68-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
68+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
6969

7070
- name: Download the test binaries
7171
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 #v4.1.8

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ linters:
1414
- bidichk
1515
- bodyclose
1616
- errchkjson
17-
- exportloopref
17+
# - exportloopref
1818
- gofmt
1919
- gosimple
2020
- govet
@@ -30,7 +30,7 @@ linters:
3030

3131
issues:
3232
# Only show newly introduced problems.
33-
new-from-rev: 01f696afce2f9c0d4ed854edefa3846891d01d8a
33+
# new-from-rev: 01f696afce2f9c0d4ed854edefa3846891d01d8a
3434

3535
exclude-rules:
3636
# Exclude gosec from running for tests so that tests with weak randomness

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ ITEST_LDFLAGS := -ldflags "-X $(PKG)/build.Commit=$(COMMIT)"
3535
RELEASE_LDFLAGS := $(call make_ldflags, $(RELEASE_TAGS), -s -w -buildid=)
3636

3737
DCRD_REPO := github.com/decred/dcrd
38-
DCRD_COMMIT := release-v2.0.3
38+
DCRD_COMMIT := release-v2.1.0
3939
DCRD_META := "$(DCRD_COMMIT).from-dcrlnd"
4040
DCRD_LDFLAGS := "-X github.com/decred/dcrd/internal/version.BuildMetadata=$(DCRD_META)"
4141
DCRD_TMPDIR := $(shell mktemp -d)
4242

4343
DCRWALLET_REPO := github.com/decred/dcrwallet
44-
DCRWALLET_COMMIT := release-v2.0.3
44+
DCRWALLET_COMMIT := release-v2.1.0
4545
DCRWALLET_META := $(DCRWALLET_COMMIT).from-dcrlnd
4646
DCRWALLET_LDFLAGS := "-X decred.org/dcrwallet/version.BuildMetadata=$(DCRWALLET_META)"
4747
DCRWALLET_TMPDIR := $(shell mktemp -d)

build/version.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ const (
2626
// versioning 2.0.0 spec (https://semver.org/).
2727
const (
2828
appMajor uint = 0
29-
appMinor uint = 7
30-
appPatch uint = 6
29+
appMinor uint = 8
30+
appPatch uint = 0
3131
)
3232

3333
var (

chanacceptor/rpcacceptor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ func (r *RPCAcceptor) validateAcceptorResponse(dustLimit dcrutil.Amount,
428428

429429
// If we reject the channel, and have a custom error, then we use it.
430430
case haveCustomError:
431-
return false, fmt.Errorf(req.Error), nil, nil
431+
return false, fmt.Errorf("%s", req.Error), nil, nil
432432

433433
// Otherwise, we have rejected the channel with no custom error, so we
434434
// just use a generic error to fail the channel.

cmd/dcrlncli/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package main
66

77
import (
88
"crypto/tls"
9+
"errors"
910
"fmt"
1011
"os"
1112
"path/filepath"
@@ -218,7 +219,7 @@ func extractPathArgs(ctx *cli.Context) (string, string, error) {
218219
if numNets > 1 {
219220
str := "extractPathArgs: The testnet, regtest, and simnet params" +
220221
"can't be used together -- choose one of the three"
221-
err := fmt.Errorf(str)
222+
err := errors.New(str)
222223

223224
return "", "", err
224225
}

contractcourt/breacharbiter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2114,7 +2114,7 @@ func assertBrarCleanup(t *testing.T, brar *BreachArbiter,
21142114

21152115
}, 5*time.Second)
21162116
if err != nil {
2117-
t.Fatalf(err.Error())
2117+
t.Fatal(err.Error())
21182118
}
21192119
}
21202120

discovery/syncer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ func TestGossipSyncerApplyNoHistoricalGossipFilter(t *testing.T) {
475475
// filter.
476476
err := <-errChan
477477
if err != nil {
478-
t.Fatalf(err.Error())
478+
t.Fatal(err.Error())
479479
}
480480
}
481481

go.mod

Lines changed: 46 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/decred/dcrlnd
22

3-
go 1.20
3+
go 1.24.0
44

55
require (
66
decred.org/dcrwallet/v4 v4.3.1
@@ -12,30 +12,30 @@ require (
1212
github.com/davecgh/go-spew v1.1.1
1313
github.com/decred/dcrd/addrmgr/v2 v2.0.4
1414
github.com/decred/dcrd/bech32 v1.1.3
15-
github.com/decred/dcrd/blockchain/stake/v5 v5.0.1
16-
github.com/decred/dcrd/blockchain/standalone/v2 v2.2.1
17-
github.com/decred/dcrd/chaincfg/chainhash v1.0.4
18-
github.com/decred/dcrd/chaincfg/v3 v3.2.1
15+
github.com/decred/dcrd/blockchain/stake/v5 v5.0.2
16+
github.com/decred/dcrd/blockchain/standalone/v2 v2.2.2
17+
github.com/decred/dcrd/chaincfg/chainhash v1.0.5
18+
github.com/decred/dcrd/chaincfg/v3 v3.3.0
1919
github.com/decred/dcrd/connmgr v1.1.1
2020
github.com/decred/dcrd/dcrec v1.0.1
2121
github.com/decred/dcrd/dcrec/secp256k1/v2 v2.0.1
22-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
23-
github.com/decred/dcrd/dcrjson/v4 v4.1.0
24-
github.com/decred/dcrd/dcrutil/v4 v4.0.2
25-
github.com/decred/dcrd/gcs/v4 v4.1.0
26-
github.com/decred/dcrd/hdkeychain/v3 v3.1.2
27-
github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.3.0
28-
github.com/decred/dcrd/rpcclient/v8 v8.0.2-0.20251120183434-709b0d251ee0
29-
github.com/decred/dcrd/txscript/v4 v4.1.1
30-
github.com/decred/dcrd/wire v1.7.0
22+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0
23+
github.com/decred/dcrd/dcrjson/v4 v4.2.0
24+
github.com/decred/dcrd/dcrutil/v4 v4.0.3
25+
github.com/decred/dcrd/gcs/v4 v4.1.1
26+
github.com/decred/dcrd/hdkeychain/v3 v3.1.3
27+
github.com/decred/dcrd/rpc/jsonrpc/types/v4 v4.4.0
28+
github.com/decred/dcrd/rpcclient/v8 v8.1.0
29+
github.com/decred/dcrd/txscript/v4 v4.1.2
30+
github.com/decred/dcrd/wire v1.7.1
3131
github.com/decred/dcrtest/dcrdtest v1.0.1-0.20240514160637-ade8c37ad1db
3232
github.com/decred/lightning-onion/v4 v4.0.1
3333
github.com/decred/slog v1.2.0
3434
github.com/fergusstrange/embedded-postgres v1.25.0
3535
github.com/ghodss/yaml v1.0.0
3636
github.com/go-errors/errors v1.4.2
37-
github.com/golang/glog v1.1.2
38-
github.com/golang/protobuf v1.5.3
37+
github.com/golang/glog v1.2.5
38+
github.com/golang/protobuf v1.5.4
3939
github.com/google/btree v1.1.2
4040
github.com/gorilla/websocket v1.5.1
4141
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
@@ -52,24 +52,24 @@ require (
5252
github.com/matheusd/protobuf-hex-display v1.3.3-0.20201012153224-75fb8d4840f1
5353
github.com/miekg/dns v1.1.53
5454
github.com/prometheus/client_golang v1.14.0
55-
github.com/stretchr/testify v1.8.4
55+
github.com/stretchr/testify v1.10.0
5656
github.com/tv42/zbase32 v0.0.0-20220222190657-f76a9fc892fa
5757
github.com/urfave/cli v1.20.0
58-
go.etcd.io/bbolt v1.3.8
58+
go.etcd.io/bbolt v1.3.12
5959
go.etcd.io/etcd/api/v3 v3.5.7
6060
go.etcd.io/etcd/client/pkg/v3 v3.5.7
6161
go.etcd.io/etcd/client/v3 v3.5.7
6262
go.etcd.io/etcd/server/v3 v3.5.7
63-
golang.org/x/crypto v0.33.0
63+
golang.org/x/crypto v0.45.0
6464
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
65-
golang.org/x/net v0.28.0
66-
golang.org/x/sync v0.11.0
67-
golang.org/x/sys v0.30.0
68-
golang.org/x/term v0.29.0
65+
golang.org/x/net v0.47.0
66+
golang.org/x/sync v0.18.0
67+
golang.org/x/sys v0.38.0
68+
golang.org/x/term v0.37.0
6969
golang.org/x/time v0.1.0
7070
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
71-
google.golang.org/grpc v1.59.0
72-
google.golang.org/protobuf v1.31.0
71+
google.golang.org/grpc v1.76.0
72+
google.golang.org/protobuf v1.36.10
7373
gopkg.in/macaroon-bakery.v2 v2.3.0
7474
gopkg.in/macaroon.v2 v2.1.0
7575
matheusd.com/testctx v0.1.0
@@ -81,36 +81,40 @@ require (
8181
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
8282
github.com/beorn7/perks v1.0.1 // indirect
8383
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
84-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
84+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
8585
github.com/companyzero/sntrup4591761 v0.0.0-20220309191932-9e0f3af2f07a // indirect
8686
github.com/coreos/go-semver v0.3.1 // indirect
8787
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
8888
github.com/dchest/siphash v1.2.3 // indirect
89-
github.com/decred/base58 v1.0.5 // indirect
89+
github.com/decred/base58 v1.0.6 // indirect
9090
github.com/decred/dcrd v1.8.0 // indirect
91+
github.com/decred/dcrd/blockchain/v5 v5.1.0 // indirect
9192
github.com/decred/dcrd/certgen v1.2.0 // indirect
9293
github.com/decred/dcrd/chaincfg v1.5.2 // indirect
93-
github.com/decred/dcrd/connmgr/v3 v3.1.2 // indirect
94+
github.com/decred/dcrd/connmgr/v3 v3.1.3 // indirect
9495
github.com/decred/dcrd/container/apbf v1.0.1 // indirect
9596
github.com/decred/dcrd/container/lru v1.0.0 // indirect
9697
github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect
9798
github.com/decred/dcrd/crypto/rand v1.0.1 // indirect
9899
github.com/decred/dcrd/crypto/ripemd160 v1.0.2 // indirect
99-
github.com/decred/dcrd/database/v3 v3.0.2 // indirect
100-
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.3 // indirect
100+
github.com/decred/dcrd/database/v3 v3.0.3 // indirect
101+
github.com/decred/dcrd/dcrec/edwards/v2 v2.0.4 // indirect
101102
github.com/decred/dcrd/lru v1.1.2 // indirect
102103
github.com/decred/dcrd/math/uint256 v1.0.1 // indirect
103-
github.com/decred/dcrd/mixing v0.5.0 // indirect
104+
github.com/decred/dcrd/mixing v0.6.0 // indirect
104105
github.com/decred/dcrd/peer/v3 v3.0.2 // indirect
105106
github.com/decred/go-socks v1.1.0 // indirect
106107
github.com/dustin/go-humanize v1.0.1 // indirect
108+
github.com/go-logr/logr v1.4.3 // indirect
109+
github.com/go-logr/stdr v1.2.2 // indirect
107110
github.com/go-macaroon-bakery/macaroonpb v1.0.0 // indirect
108111
github.com/go-openapi/errors v0.19.2 // indirect
109112
github.com/go-openapi/strfmt v0.19.5 // indirect
110113
github.com/go-stack/stack v1.8.0 // indirect
111114
github.com/gogo/protobuf v1.3.2 // indirect
112115
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
113116
github.com/golang/snappy v0.0.4 // indirect
117+
github.com/google/uuid v1.6.0 // indirect
114118
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
115119
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
116120
github.com/jackc/pgconn v1.14.0 // indirect
@@ -125,7 +129,6 @@ require (
125129
github.com/jrick/wsrpc/v2 v2.3.8 // indirect
126130
github.com/json-iterator/go v1.1.12 // indirect
127131
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
128-
github.com/kr/pretty v0.3.1 // indirect
129132
github.com/lib/pq v1.10.4 // indirect
130133
github.com/mattn/go-runewidth v0.0.9 // indirect
131134
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -140,7 +143,7 @@ require (
140143
github.com/sirupsen/logrus v1.9.0 // indirect
141144
github.com/soheilhy/cmux v0.1.5 // indirect
142145
github.com/spf13/pflag v1.0.5 // indirect
143-
github.com/stretchr/objx v0.5.0 // indirect
146+
github.com/stretchr/objx v0.5.2 // indirect
144147
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
145148
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
146149
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
@@ -152,22 +155,24 @@ require (
152155
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
153156
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
154157
go.mongodb.org/mongo-driver v1.5.1 // indirect
158+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
155159
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect
156-
go.opentelemetry.io/otel v1.0.1 // indirect
160+
go.opentelemetry.io/otel v1.37.0 // indirect
157161
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 // indirect
158162
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1 // indirect
159-
go.opentelemetry.io/otel/sdk v1.0.1 // indirect
160-
go.opentelemetry.io/otel/trace v1.0.1 // indirect
163+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
164+
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
165+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
161166
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
162167
go.uber.org/atomic v1.10.0 // indirect
163168
go.uber.org/multierr v1.11.0 // indirect
164169
go.uber.org/zap v1.24.0 // indirect
165-
golang.org/x/mod v0.17.0 // indirect
166-
golang.org/x/text v0.22.0 // indirect
167-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
170+
golang.org/x/mod v0.29.0 // indirect
171+
golang.org/x/text v0.31.0 // indirect
172+
golang.org/x/tools v0.38.0 // indirect
168173
google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect
169-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
170-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
174+
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
175+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
171176
gopkg.in/errgo.v1 v1.0.1 // indirect
172177
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
173178
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)