Skip to content

Commit 548fa9b

Browse files
authored
Merge pull request #242 from starius/bump-lnd
build: bump lnd
2 parents 6d515e9 + 943daf1 commit 548fa9b

File tree

13 files changed

+527
-439
lines changed

13 files changed

+527
-439
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ defaults:
1313
shell: bash
1414

1515
env:
16-
GO_VERSION: 1.23.6
16+
GO_VERSION: 1.24.6
1717

1818
jobs:
1919
build:

.golangci.yml

Lines changed: 110 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,122 @@
1+
version: "2"
12
run:
2-
# timeout for analysis
3-
timeout: 4m
4-
go: "1.23"
3+
go: "1.24"
4+
linters:
5+
default: all
6+
disable:
7+
# Global variables are used in many places throughout the code base.
8+
- gochecknoglobals
59

6-
linters-settings:
7-
lll:
8-
line-length: 80
9-
govet:
10-
# Don't report about shadowed variables
11-
shadow: false
12-
gofmt:
13-
# simplify code: gofmt with `-s` option, true by default
14-
simplify: true
15-
tagliatelle:
16-
case:
17-
rules:
18-
json: snake
19-
whitespace:
20-
multi-func: true
21-
multi-if: true
22-
gosec:
23-
excludes:
24-
- G402 # Look for bad TLS connection settings.
25-
- G306 # Poor file permissions used when writing to a new file.
26-
- G115 # Integer overflow conversion.
27-
staticcheck:
28-
checks: ["-SA1019"]
29-
revive:
30-
rules:
31-
- name: exported # To enforce conventions around exported comments.
10+
# We want to allow short variable names.
11+
- varnamelen
3212

33-
issues:
34-
include:
35-
- EXC0012 # revive: Exported vars should have a docstring.
36-
- EXC0014 # revive: Exported vars's docstring should start with its name.
13+
# We want to allow TODOs.
14+
- godox
3715

38-
linters:
39-
enable-all: true
40-
disable:
41-
# Global variables are used in many places throughout the code base.
42-
- gochecknoglobals
16+
# We have long functions, especially in tests. Moving or renaming those would
17+
# trigger funlen problems that we may not want to solve at that time.
18+
- funlen
4319

44-
# We want to allow short variable names.
45-
- varnamelen
20+
# Disable for now as we haven't yet tuned the sensitivity to our codebase
21+
# yet. Enabling by default for example, would also force new contributors to
22+
# potentially extensively refactor code, when they want to smaller change to
23+
# land.
24+
- gocyclo
25+
- gocognit
26+
- cyclop
4627

47-
# We want to allow TODOs.
48-
- godox
28+
# Instances of table driven tests that don't pre-allocate shouldn't trigger
29+
# the linter.
30+
- prealloc
4931

50-
# We have long functions, especially in tests. Moving or renaming those would
51-
# trigger funlen problems that we may not want to solve at that time.
52-
- funlen
32+
# Init functions are used by loggers throughout the codebase.
33+
- gochecknoinits
5334

54-
# Disable for now as we haven't yet tuned the sensitivity to our codebase
55-
# yet. Enabling by default for example, would also force new contributors to
56-
# potentially extensively refactor code, when they want to smaller change to
57-
# land.
58-
- gocyclo
59-
- gocognit
60-
- cyclop
35+
# Causes stack overflow, see https://github.com/polyfloyd/go-errorlint/issues/19.
36+
- errorlint
6137

62-
# Instances of table driven tests that don't pre-allocate shouldn't trigger
63-
# the linter.
64-
- prealloc
38+
# Don't forbid an empty line after function signature. We add it in multi-line case.
39+
- wsl_v5
6540

66-
# Init functions are used by loggers throughout the codebase.
67-
- gochecknoinits
41+
# Don't forbid "if err := ...; err != nil" checks.
42+
- noinlineerr
6843

69-
# Causes stack overflow, see https://github.com/polyfloyd/go-errorlint/issues/19.
70-
- errorlint
44+
# Don't demand any particular functions order.
45+
- funcorder
7146

72-
# New linters that need a code adjustment first.
73-
- wrapcheck
74-
- nolintlint
75-
- paralleltest
76-
- tparallel
77-
- testpackage
78-
- gofumpt
79-
- gomoddirectives
80-
- ireturn
81-
- maintidx
82-
- nlreturn
83-
- dogsled
84-
- gci
85-
- containedctx
86-
- contextcheck
87-
- errname
88-
- err113
89-
- mnd
90-
- noctx
91-
- nestif
92-
- wsl
93-
- exhaustive
94-
- forcetypeassert
95-
- nilerr
96-
- nilnil
97-
- stylecheck
98-
- thelper
99-
- exhaustruct
100-
- importas
101-
- interfacebloat
102-
- protogetter
103-
- depguard
104-
- mnd
105-
- perfsprint
106-
- inamedparam
47+
# New linters that need a code adjustment first.
48+
- containedctx
49+
- contextcheck
50+
- depguard
51+
- dogsled
52+
- err113
53+
- errname
54+
- exhaustive
55+
- exhaustruct
56+
- forcetypeassert
57+
- gomoddirectives
58+
- importas
59+
- inamedparam
60+
- interfacebloat
61+
- ireturn
62+
- maintidx
63+
- mnd
64+
- nestif
65+
- nilerr
66+
- nilnil
67+
- nlreturn
68+
- noctx
69+
- nolintlint
70+
- paralleltest
71+
- perfsprint
72+
- protogetter
73+
- testpackage
74+
- thelper
75+
- tparallel
76+
- wrapcheck
77+
- wsl
78+
settings:
79+
gosec:
80+
excludes:
81+
- G402 # Look for bad TLS connection settings.
82+
- G306 # Poor file permissions used when writing to a new file.
83+
- G115 # Integer overflow conversion.
84+
lll:
85+
line-length: 80
86+
revive:
87+
rules:
88+
- name: exported # To enforce conventions around exported comments.
89+
staticcheck:
90+
checks:
91+
- -SA1019
92+
tagliatelle:
93+
case:
94+
rules:
95+
json: snake
96+
whitespace:
97+
multi-if: true
98+
multi-func: true
99+
exclusions:
100+
generated: lax
101+
presets:
102+
- common-false-positives
103+
- legacy
104+
- std-error-handling
105+
paths:
106+
- third_party$
107+
- builtin$
108+
- examples$
109+
formatters:
110+
enable:
111+
- gofmt
112+
- goimports
113+
settings:
114+
gofmt:
115+
# simplify code: gofmt with `-s` option, true by default
116+
simplify: true
117+
exclusions:
118+
generated: lax
119+
paths:
120+
- third_party$
121+
- builtin$
122+
- examples$

go.mod

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ require (
66
github.com/btcsuite/btcd/btcutil v1.1.5
77
github.com/btcsuite/btcd/btcutil/psbt v1.1.8
88
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
9-
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318
10-
github.com/btcsuite/btcwallet v0.16.13
9+
github.com/btcsuite/btclog/v2 v2.0.1-0.20250728225537-6090e87c6c5b
10+
github.com/btcsuite/btcwallet v0.16.15-0.20250811092146-05b3a40651e6
1111
github.com/btcsuite/btcwallet/wtxmgr v1.5.6
12-
github.com/lightningnetwork/lnd v0.19.0-beta
12+
github.com/lightningnetwork/lnd v0.19.0-beta.rc5.0.20250905045430-9d74ec47701c
1313
github.com/lightningnetwork/lnd/kvdb v1.4.16
1414
github.com/stretchr/testify v1.10.0
1515
google.golang.org/grpc v1.59.0
@@ -42,22 +42,20 @@ require (
4242
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
4343
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
4444
github.com/decred/dcrd/lru v1.1.2 // indirect
45-
github.com/distribution/reference v0.6.0 // indirect
46-
github.com/docker/cli v28.0.1+incompatible // indirect
47-
github.com/docker/docker v28.0.1+incompatible // indirect
45+
github.com/docker/cli v28.1.1+incompatible // indirect
46+
github.com/docker/docker v28.1.1+incompatible // indirect
4847
github.com/docker/go-connections v0.4.0 // indirect
4948
github.com/docker/go-units v0.5.0 // indirect
5049
github.com/dustin/go-humanize v1.0.1 // indirect
5150
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
52-
github.com/go-errors/errors v1.0.1 // indirect
5351
github.com/go-logr/logr v1.4.2 // indirect
5452
github.com/go-logr/stdr v1.2.2 // indirect
5553
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
5654
github.com/gofrs/uuid v4.2.0+incompatible // indirect
5755
github.com/gogo/protobuf v1.3.2 // indirect
5856
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
5957
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
60-
github.com/golang/protobuf v1.5.3 // indirect
58+
github.com/golang/protobuf v1.5.4 // indirect
6159
github.com/golang/snappy v0.0.4 // indirect
6260
github.com/google/btree v1.0.1 // indirect
6361
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -76,11 +74,11 @@ require (
7674
github.com/jackc/pgio v1.0.0 // indirect
7775
github.com/jackc/pgpassfile v1.0.0 // indirect
7876
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
79-
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
80-
github.com/jackc/pgtype v1.14.0 // indirect
81-
github.com/jackc/pgx/v4 v4.18.2 // indirect
82-
github.com/jackc/pgx/v5 v5.5.4 // indirect
83-
github.com/jackc/puddle/v2 v2.2.1 // indirect
77+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
78+
github.com/jackc/pgtype v1.14.4 // indirect
79+
github.com/jackc/pgx/v4 v4.18.3 // indirect
80+
github.com/jackc/pgx/v5 v5.7.4 // indirect
81+
github.com/jackc/puddle/v2 v2.2.2 // indirect
8482
github.com/jessevdk/go-flags v1.4.0 // indirect
8583
github.com/jonboulle/clockwork v0.2.2 // indirect
8684
github.com/jrick/logrotate v1.1.2 // indirect
@@ -99,14 +97,14 @@ require (
9997
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
10098
github.com/lightninglabs/neutrino v0.16.1 // indirect
10199
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
102-
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
100+
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240815225420-8b40adf04ab9 // indirect
103101
github.com/lightningnetwork/lnd/clock v1.1.1 // indirect
104102
github.com/lightningnetwork/lnd/fn/v2 v2.0.8 // indirect
105103
github.com/lightningnetwork/lnd/healthcheck v1.2.6 // indirect
106104
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
107-
github.com/lightningnetwork/lnd/sqldb v1.0.9 // indirect
105+
github.com/lightningnetwork/lnd/sqldb v1.0.11-0.20250905045430-9d74ec47701c // indirect
108106
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
109-
github.com/lightningnetwork/lnd/tlv v1.3.1 // indirect
107+
github.com/lightningnetwork/lnd/tlv v1.3.2 // indirect
110108
github.com/lightningnetwork/lnd/tor v1.1.6 // indirect
111109
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
112110
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -151,7 +149,6 @@ require (
151149
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
152150
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
153151
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
154-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
155152
go.opentelemetry.io/otel v1.35.0 // indirect
156153
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
157154
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
@@ -162,14 +159,14 @@ require (
162159
go.uber.org/atomic v1.7.0 // indirect
163160
go.uber.org/multierr v1.6.0 // indirect
164161
go.uber.org/zap v1.17.0 // indirect
165-
golang.org/x/crypto v0.36.0 // indirect
162+
golang.org/x/crypto v0.37.0 // indirect
166163
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
167164
golang.org/x/mod v0.17.0 // indirect
168-
golang.org/x/net v0.38.0 // indirect
169-
golang.org/x/sync v0.12.0 // indirect
170-
golang.org/x/sys v0.31.0 // indirect
171-
golang.org/x/term v0.30.0 // indirect
172-
golang.org/x/text v0.23.0 // indirect
165+
golang.org/x/net v0.39.0 // indirect
166+
golang.org/x/sync v0.13.0 // indirect
167+
golang.org/x/sys v0.32.0 // indirect
168+
golang.org/x/term v0.31.0 // indirect
169+
golang.org/x/text v0.24.0 // indirect
173170
golang.org/x/time v0.3.0 // indirect
174171
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
175172
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
@@ -195,4 +192,4 @@ require (
195192
// allows us to specify that as an option.
196193
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.33.0-hex-display
197194

198-
go 1.23.6
195+
go 1.24.6

0 commit comments

Comments
 (0)