Skip to content

Commit a17ecf6

Browse files
committed
mod+aperture: bump lnd compile time dependency to latest master
Due to a change in the logging library of lnd, we need to pass in a new parameter to be compatible with the latest lnd master version.
1 parent 6ec9117 commit a17ecf6

File tree

4 files changed

+180
-213
lines changed

4 files changed

+180
-213
lines changed

aperture.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ func setupLogging(cfg *Config, interceptor signal.Interceptor) error {
627627
}
628628

629629
err := logWriter.InitLogRotator(
630-
logFile, defaultMaxLogFileSize, defaultMaxLogFiles,
630+
logFile, build.Gzip, defaultMaxLogFileSize, defaultMaxLogFiles,
631631
)
632632
if err != nil {
633633
return err

go.mod

Lines changed: 52 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
module github.com/lightninglabs/aperture
22

3-
go 1.22
3+
go 1.22.6
44

5-
toolchain go1.22.3
5+
toolchain go1.22.7
66

77
require (
8-
github.com/btcsuite/btcd v0.24.1-0.20240123000108-62e6af035ec5
9-
github.com/btcsuite/btcd/btcec/v2 v2.3.2
8+
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026
9+
github.com/btcsuite/btcd/btcec/v2 v2.3.3
1010
github.com/btcsuite/btcd/btcutil v1.1.5
1111
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
1212
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
13-
github.com/btcsuite/btcwallet/wtxmgr v1.5.0
13+
github.com/btcsuite/btcwallet/wtxmgr v1.5.3
1414
github.com/fortytw2/leaktest v1.3.0
15-
github.com/golang-migrate/migrate/v4 v4.16.1
15+
github.com/golang-migrate/migrate/v4 v4.17.0
1616
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
1717
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
1818
github.com/jackc/pgconn v1.14.3
19-
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa
19+
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438
2020
github.com/jessevdk/go-flags v1.4.0
21-
github.com/lib/pq v1.10.7
21+
github.com/lib/pq v1.10.9
2222
github.com/lightninglabs/lightning-node-connect v0.2.5-alpha
2323
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
2424
github.com/lightninglabs/lndclient v0.17.4-4
25-
github.com/lightningnetwork/lnd v0.17.4-beta
25+
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240918100428-838a32d13ca5
2626
github.com/lightningnetwork/lnd/cert v1.2.2
2727
github.com/lightningnetwork/lnd/clock v1.1.1
28-
github.com/lightningnetwork/lnd/tlv v1.1.1
28+
github.com/lightningnetwork/lnd/tlv v1.2.6
2929
github.com/lightningnetwork/lnd/tor v1.1.2
3030
github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9
3131
github.com/ory/dockertest/v3 v3.10.0
3232
github.com/prometheus/client_golang v1.11.1
33-
github.com/stretchr/testify v1.8.4
33+
github.com/stretchr/testify v1.9.0
3434
go.etcd.io/etcd/client/v3 v3.5.7
3535
go.etcd.io/etcd/server/v3 v3.5.7
3636
golang.org/x/crypto v0.22.0
3737
golang.org/x/net v0.24.0
38-
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65
38+
golang.org/x/time v0.3.0
3939
google.golang.org/grpc v1.59.0
4040
google.golang.org/protobuf v1.33.0
4141
gopkg.in/macaroon-bakery.v2 v2.1.0
4242
gopkg.in/macaroon.v2 v2.1.0
4343
gopkg.in/yaml.v2 v2.4.0
44-
modernc.org/sqlite v1.20.3
44+
modernc.org/sqlite v1.29.10
4545
)
4646

4747
require (
@@ -54,14 +54,13 @@ require (
5454
github.com/Yawning/aez v0.0.0-20211027044916-e49e68abd344 // indirect
5555
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
5656
github.com/aead/siphash v1.0.1 // indirect
57-
github.com/andybalholm/brotli v1.0.3 // indirect
5857
github.com/beorn7/perks v1.0.1 // indirect
5958
github.com/btcsuite/btcd/btcutil/psbt v1.1.8 // indirect
60-
github.com/btcsuite/btcwallet v0.16.10-0.20240127010340-16b422a2e8bf // indirect
61-
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.2 // indirect
62-
github.com/btcsuite/btcwallet/wallet/txrules v1.2.0 // indirect
63-
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.3 // indirect
64-
github.com/btcsuite/btcwallet/walletdb v1.4.0 // indirect
59+
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2 // indirect
60+
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.4 // indirect
61+
github.com/btcsuite/btcwallet/wallet/txrules v1.2.1 // indirect
62+
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.4 // indirect
63+
github.com/btcsuite/btcwallet/walletdb v1.4.2 // indirect
6564
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
6665
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
6766
github.com/btcsuite/winsvc v1.0.0 // indirect
@@ -72,16 +71,15 @@ require (
7271
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
7372
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
7473
github.com/davecgh/go-spew v1.1.1 // indirect
75-
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
76-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
77-
github.com/decred/dcrd/lru v1.0.0 // indirect
74+
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
75+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
76+
github.com/decred/dcrd/lru v1.1.2 // indirect
7877
github.com/docker/cli v20.10.17+incompatible // indirect
7978
github.com/docker/docker v24.0.9+incompatible // indirect
8079
github.com/docker/go-connections v0.4.0 // indirect
8180
github.com/docker/go-units v0.5.0 // indirect
82-
github.com/dsnet/compress v0.0.1 // indirect
83-
github.com/dustin/go-humanize v1.0.0 // indirect
84-
github.com/fergusstrange/embedded-postgres v1.10.0 // indirect
81+
github.com/dustin/go-humanize v1.0.1 // indirect
82+
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
8583
github.com/frankban/quicktest v1.14.3 // indirect
8684
github.com/go-errors/errors v1.0.1 // indirect
8785
github.com/go-logr/logr v1.3.0 // indirect
@@ -92,12 +90,13 @@ require (
9290
github.com/golang/snappy v0.0.4 // indirect
9391
github.com/google/btree v1.0.1 // indirect
9492
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
95-
github.com/google/uuid v1.3.1 // indirect
93+
github.com/google/uuid v1.6.0 // indirect
9694
github.com/gorilla/websocket v1.5.0 // indirect
9795
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
9896
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
9997
github.com/hashicorp/errwrap v1.1.0 // indirect
10098
github.com/hashicorp/go-multierror v1.1.1 // indirect
99+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
101100
github.com/imdario/mergo v0.3.13 // indirect
102101
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
103102
github.com/jackc/pgio v1.0.0 // indirect
@@ -106,55 +105,53 @@ require (
106105
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
107106
github.com/jackc/pgtype v1.14.0 // indirect
108107
github.com/jackc/pgx/v4 v4.18.2 // indirect
108+
github.com/jackc/pgx/v5 v5.3.1 // indirect
109109
github.com/jackpal/gateway v1.0.5 // indirect
110110
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
111111
github.com/jonboulle/clockwork v0.2.2 // indirect
112-
github.com/jrick/logrotate v1.0.0 // indirect
112+
github.com/jrick/logrotate v1.1.2 // indirect
113113
github.com/json-iterator/go v1.1.11 // indirect
114114
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
115-
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
116115
github.com/kkdai/bstream v1.0.0 // indirect
117-
github.com/klauspost/compress v1.13.6 // indirect
118-
github.com/klauspost/pgzip v1.2.5 // indirect
116+
github.com/klauspost/compress v1.17.9 // indirect
119117
github.com/kr/pretty v0.3.1 // indirect
120118
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
121-
github.com/lightninglabs/neutrino v0.16.0 // indirect
122-
github.com/lightninglabs/neutrino/cache v1.1.1 // indirect
123-
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f // indirect
124-
github.com/lightningnetwork/lnd/healthcheck v1.2.3 // indirect
125-
github.com/lightningnetwork/lnd/kvdb v1.4.4 // indirect
119+
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
120+
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
121+
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
122+
github.com/lightningnetwork/lnd/fn v1.2.1 // indirect
123+
github.com/lightningnetwork/lnd/healthcheck v1.2.5 // indirect
124+
github.com/lightningnetwork/lnd/kvdb v1.4.10 // indirect
126125
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
126+
github.com/lightningnetwork/lnd/sqldb v1.0.4 // indirect
127127
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
128128
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
129-
github.com/mattn/go-isatty v0.0.17 // indirect
129+
github.com/mattn/go-isatty v0.0.20 // indirect
130130
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
131-
github.com/mholt/archiver/v3 v3.5.0 // indirect
132131
github.com/miekg/dns v1.1.43 // indirect
133132
github.com/mitchellh/mapstructure v1.4.1 // indirect
134133
github.com/moby/term v0.5.0 // indirect
135134
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
136135
github.com/modern-go/reflect2 v1.0.1 // indirect
137-
github.com/nwaples/rardecode v1.1.2 // indirect
136+
github.com/ncruces/go-strftime v0.1.9 // indirect
138137
github.com/opencontainers/go-digest v1.0.0 // indirect
139138
github.com/opencontainers/image-spec v1.0.2 // indirect
140139
github.com/opencontainers/runc v1.1.14 // indirect
141-
github.com/pierrec/lz4/v4 v4.1.8 // indirect
142140
github.com/pkg/errors v0.9.1 // indirect
143141
github.com/pmezard/go-difflib v1.0.0 // indirect
144142
github.com/prometheus/client_model v0.2.0 // indirect
145143
github.com/prometheus/common v0.26.0 // indirect
146144
github.com/prometheus/procfs v0.6.0 // indirect
147-
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
145+
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
148146
github.com/rogpeppe/fastuuid v1.2.0 // indirect
149147
github.com/shopspring/decimal v1.3.1 // indirect
150148
github.com/sirupsen/logrus v1.9.2 // indirect
151149
github.com/soheilhy/cmux v0.1.5 // indirect
152150
github.com/spf13/pflag v1.0.5 // indirect
153-
github.com/stretchr/objx v0.5.0 // indirect
151+
github.com/stretchr/objx v0.5.2 // indirect
154152
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
155153
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
156154
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 // indirect
157-
github.com/ulikunitz/xz v0.5.11 // indirect
158155
github.com/xdg-go/stringprep v1.0.4 // indirect
159156
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
160157
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -179,28 +176,25 @@ require (
179176
go.uber.org/atomic v1.7.0 // indirect
180177
go.uber.org/multierr v1.6.0 // indirect
181178
go.uber.org/zap v1.17.0 // indirect
182-
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 // indirect
183-
golang.org/x/mod v0.10.0 // indirect
184-
golang.org/x/sync v0.3.0 // indirect
179+
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
180+
golang.org/x/mod v0.16.0 // indirect
181+
golang.org/x/sync v0.7.0 // indirect
185182
golang.org/x/sys v0.19.0 // indirect
186183
golang.org/x/term v0.19.0 // indirect
187184
golang.org/x/text v0.14.0 // indirect
188-
golang.org/x/tools v0.9.1 // indirect
189-
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
190-
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
191-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
185+
golang.org/x/tools v0.19.0 // indirect
186+
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
187+
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
188+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
192189
gopkg.in/errgo.v1 v1.0.1 // indirect
193190
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
194191
gopkg.in/yaml.v3 v3.0.1 // indirect
195-
lukechampine.com/uint128 v1.2.0 // indirect
196-
modernc.org/cc/v3 v3.40.0 // indirect
197-
modernc.org/ccgo/v3 v3.16.13 // indirect
198-
modernc.org/libc v1.22.2 // indirect
199-
modernc.org/mathutil v1.5.0 // indirect
200-
modernc.org/memory v1.4.0 // indirect
201-
modernc.org/opt v0.1.3 // indirect
202-
modernc.org/strutil v1.1.3 // indirect
203-
modernc.org/token v1.0.1 // indirect
192+
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
193+
modernc.org/libc v1.49.3 // indirect
194+
modernc.org/mathutil v1.6.0 // indirect
195+
modernc.org/memory v1.8.0 // indirect
196+
modernc.org/strutil v1.2.0 // indirect
197+
modernc.org/token v1.1.0 // indirect
204198
nhooyr.io/websocket v1.8.7 // indirect
205199
sigs.k8s.io/yaml v1.2.0 // indirect
206200
)

0 commit comments

Comments
 (0)