Skip to content

Commit 9193423

Browse files
ellemoutonellemouton
committed
multi: bump LND, aperture and btclog deps
1 parent 3a21ba9 commit 9193423

15 files changed

+186
-162
lines changed

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
# go needs absolute directories, using the $HOME variable doesn't work here.
1717
GOCACHE: /home/runner/work/go/pkg/build
1818
GOPATH: /home/runner/work/go
19-
GO_VERSION: 1.22.6
19+
GO_VERSION: 1.23.6
2020

2121
jobs:
2222
########################

‎gbn/gbn_conn.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import (
88
"sync"
99
"time"
1010

11-
"github.com/btcsuite/btclog"
12-
"github.com/lightningnetwork/lnd/build"
11+
"github.com/btcsuite/btclog/v2"
1312
)
1413

1514
var (
@@ -80,8 +79,7 @@ func newGoBackNConn(ctx context.Context, cfg *config,
8079
ctxc, cancel := context.WithCancel(ctx)
8180

8281
// Construct a new prefixed logger.
83-
prefix := fmt.Sprintf("(%s)", loggerPrefix)
84-
plog := build.NewPrefixLog(prefix, log)
82+
plog := log.WithPrefix(fmt.Sprintf("(%s)", loggerPrefix))
8583

8684
timeoutManager := NewTimeOutManager(plog, cfg.timeoutOptions...)
8785

‎gbn/log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package gbn
22

33
import (
4-
"github.com/btcsuite/btclog"
4+
"github.com/btcsuite/btclog/v2"
55
"github.com/lightningnetwork/lnd/build"
66
)
77

‎gbn/queue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"sync"
55
"time"
66

7-
"github.com/btcsuite/btclog"
7+
"github.com/btcsuite/btclog/v2"
88
)
99

1010
type queueCfg struct {

‎gbn/syncer.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"sync"
55
"time"
66

7-
"github.com/btcsuite/btclog"
7+
"github.com/btcsuite/btclog/v2"
88
)
99

1010
const (

‎gbn/timeout_manager.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"sync"
66
"time"
77

8-
"github.com/btcsuite/btclog"
8+
"github.com/btcsuite/btclog/v2"
99
)
1010

1111
const (

‎go.mod

+46-41
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
module github.com/lightninglabs/lightning-node-connect
22

33
require (
4-
github.com/btcsuite/btcd/btcec/v2 v2.3.3
5-
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
4+
github.com/btcsuite/btcd/btcec/v2 v2.3.4
5+
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318
66
github.com/go-errors/errors v1.0.1
77
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
88
github.com/kkdai/bstream v1.0.0
9-
github.com/lightninglabs/aperture v0.1.20-beta
9+
github.com/lightninglabs/aperture v0.3.8-beta
1010
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
11-
github.com/lightningnetwork/lnd v0.18.2-beta
11+
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20250304192711-9feb761b4ec4
1212
github.com/lightningnetwork/lnd/ticker v1.1.1
13-
github.com/lightningnetwork/lnd/tor v1.1.2
13+
github.com/lightningnetwork/lnd/tor v1.1.4
1414
github.com/stretchr/testify v1.9.0
15-
golang.org/x/crypto v0.22.0
15+
golang.org/x/crypto v0.31.0
1616
google.golang.org/grpc v1.59.0
1717
google.golang.org/protobuf v1.33.0
1818
nhooyr.io/websocket v1.8.7
@@ -28,16 +28,17 @@ require (
2828
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
2929
github.com/aead/siphash v1.0.1 // indirect
3030
github.com/beorn7/perks v1.0.1 // indirect
31-
github.com/btcsuite/btcd v0.24.2 // indirect
31+
github.com/btcsuite/btcd v0.24.3-0.20241210095828-e646d437e95b // indirect
3232
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
3333
github.com/btcsuite/btcd/btcutil/psbt v1.1.8 // indirect
3434
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
35-
github.com/btcsuite/btcwallet v0.16.10-0.20240706055350-e391a1c31df2 // indirect
36-
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4 // indirect
37-
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1 // indirect
38-
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.4 // indirect
39-
github.com/btcsuite/btcwallet/walletdb v1.4.2 // indirect
40-
github.com/btcsuite/btcwallet/wtxmgr v1.5.3 // indirect
35+
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c // indirect
36+
github.com/btcsuite/btcwallet v0.16.10-0.20241127094224-93c858b2ad63 // indirect
37+
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 // indirect
38+
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 // indirect
39+
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 // indirect
40+
github.com/btcsuite/btcwallet/walletdb v1.4.4 // indirect
41+
github.com/btcsuite/btcwallet/wtxmgr v1.5.4 // indirect
4142
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
4243
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
4344
github.com/btcsuite/winsvc v1.0.0 // indirect
@@ -52,15 +53,16 @@ require (
5253
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
5354
github.com/decred/dcrd/lru v1.1.2 // indirect
5455
github.com/docker/cli v20.10.17+incompatible // indirect
55-
github.com/docker/docker v24.0.7+incompatible // indirect
56+
github.com/docker/docker v24.0.9+incompatible // indirect
5657
github.com/docker/go-connections v0.4.0 // indirect
5758
github.com/docker/go-units v0.5.0 // indirect
5859
github.com/dustin/go-humanize v1.0.1 // indirect
5960
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
6061
github.com/go-logr/logr v1.3.0 // indirect
6162
github.com/go-logr/stdr v1.2.2 // indirect
63+
github.com/goccy/go-yaml v1.15.23 // indirect
6264
github.com/gogo/protobuf v1.3.2 // indirect
63-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
65+
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
6466
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
6567
github.com/golang/protobuf v1.5.3 // indirect
6668
github.com/golang/snappy v0.0.4 // indirect
@@ -74,7 +76,7 @@ require (
7476
github.com/hashicorp/errwrap v1.1.0 // indirect
7577
github.com/hashicorp/go-multierror v1.1.1 // indirect
7678
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
77-
github.com/imdario/mergo v0.3.12 // indirect
79+
github.com/imdario/mergo v0.3.13 // indirect
7880
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
7981
github.com/jackc/pgconn v1.14.3 // indirect
8082
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
@@ -84,28 +86,30 @@ require (
8486
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
8587
github.com/jackc/pgtype v1.14.0 // indirect
8688
github.com/jackc/pgx/v4 v4.18.2 // indirect
89+
github.com/jackc/pgx/v5 v5.5.4 // indirect
90+
github.com/jackc/puddle/v2 v2.2.1 // indirect
8791
github.com/jackpal/gateway v1.0.5 // indirect
8892
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
8993
github.com/jessevdk/go-flags v1.4.0 // indirect
9094
github.com/jonboulle/clockwork v0.2.2 // indirect
91-
github.com/jrick/logrotate v1.0.0 // indirect
95+
github.com/jrick/logrotate v1.1.2 // indirect
9296
github.com/json-iterator/go v1.1.11 // indirect
9397
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
94-
github.com/klauspost/compress v1.15.11 // indirect
98+
github.com/klauspost/compress v1.17.9 // indirect
9599
github.com/lib/pq v1.10.9 // indirect
96100
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
97-
github.com/lightninglabs/lndclient v0.16.0-10 // indirect
101+
github.com/lightninglabs/lndclient v0.19.0-2 // indirect
98102
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
99103
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
100-
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f // indirect
104+
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
101105
github.com/lightningnetwork/lnd/cert v1.2.2 // indirect
102106
github.com/lightningnetwork/lnd/clock v1.1.1 // indirect
103-
github.com/lightningnetwork/lnd/fn v1.0.5 // indirect
104-
github.com/lightningnetwork/lnd/healthcheck v1.2.4 // indirect
105-
github.com/lightningnetwork/lnd/kvdb v1.4.8 // indirect
107+
github.com/lightningnetwork/lnd/fn/v2 v2.0.8 // indirect
108+
github.com/lightningnetwork/lnd/healthcheck v1.2.6 // indirect
109+
github.com/lightningnetwork/lnd/kvdb v1.4.12 // indirect
106110
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
107-
github.com/lightningnetwork/lnd/sqldb v1.0.2 // indirect
108-
github.com/lightningnetwork/lnd/tlv v1.2.3 // indirect
111+
github.com/lightningnetwork/lnd/sqldb v1.0.7 // indirect
112+
github.com/lightningnetwork/lnd/tlv v1.3.0 // indirect
109113
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
110114
github.com/mattn/go-isatty v0.0.20 // indirect
111115
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
@@ -114,10 +118,11 @@ require (
114118
github.com/moby/term v0.5.0 // indirect
115119
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
116120
github.com/modern-go/reflect2 v1.0.1 // indirect
121+
github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9 // indirect
117122
github.com/ncruces/go-strftime v0.1.9 // indirect
118123
github.com/opencontainers/go-digest v1.0.0 // indirect
119124
github.com/opencontainers/image-spec v1.0.2 // indirect
120-
github.com/opencontainers/runc v1.1.12 // indirect
125+
github.com/opencontainers/runc v1.1.14 // indirect
121126
github.com/ory/dockertest/v3 v3.10.0 // indirect
122127
github.com/pkg/errors v0.9.1 // indirect
123128
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -140,34 +145,34 @@ require (
140145
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
141146
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
142147
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
143-
go.etcd.io/bbolt v1.3.7 // indirect
148+
go.etcd.io/bbolt v1.3.11 // indirect
144149
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
145150
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
146151
go.etcd.io/etcd/client/v2 v2.305.7 // indirect
147152
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
148153
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
149154
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
150155
go.etcd.io/etcd/server/v3 v3.5.7 // indirect
151-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
152-
go.opentelemetry.io/otel v1.20.0 // indirect
156+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
157+
go.opentelemetry.io/otel v1.21.0 // indirect
153158
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 // indirect
154159
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1 // indirect
155-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
156-
go.opentelemetry.io/otel/sdk v1.0.1 // indirect
157-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
160+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
161+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
162+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
158163
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
159164
go.uber.org/atomic v1.7.0 // indirect
160165
go.uber.org/multierr v1.6.0 // indirect
161166
go.uber.org/zap v1.17.0 // indirect
162167
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
163-
golang.org/x/mod v0.16.0 // indirect
164-
golang.org/x/net v0.24.0 // indirect
165-
golang.org/x/sync v0.6.0 // indirect
166-
golang.org/x/sys v0.19.0 // indirect
167-
golang.org/x/term v0.19.0 // indirect
168-
golang.org/x/text v0.14.0 // indirect
168+
golang.org/x/mod v0.17.0 // indirect
169+
golang.org/x/net v0.25.0 // indirect
170+
golang.org/x/sync v0.10.0 // indirect
171+
golang.org/x/sys v0.28.0 // indirect
172+
golang.org/x/term v0.27.0 // indirect
173+
golang.org/x/text v0.21.0 // indirect
169174
golang.org/x/time v0.3.0 // indirect
170-
golang.org/x/tools v0.19.0 // indirect
175+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
171176
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
172177
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
173178
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
@@ -181,13 +186,13 @@ require (
181186
modernc.org/libc v1.49.3 // indirect
182187
modernc.org/mathutil v1.6.0 // indirect
183188
modernc.org/memory v1.8.0 // indirect
184-
modernc.org/sqlite v1.29.8 // indirect
189+
modernc.org/sqlite v1.29.10 // indirect
185190
modernc.org/strutil v1.2.0 // indirect
186191
modernc.org/token v1.1.0 // indirect
187192
sigs.k8s.io/yaml v1.2.0 // indirect
188193
)
189194

190-
go 1.22.6
195+
go 1.23.6
191196

192197
// We want to format raw bytes as hex instead of base64. The forked version
193198
// allows us to specify that as an option. This is required for the

0 commit comments

Comments
 (0)