Skip to content

Commit 4c45bdd

Browse files
authored
Merge pull request #139 from guggero/lnd-17
Bump lnd compile time dependency to v0.17.0, update RPC compilation of test proto
2 parents 996f100 + 3627582 commit 4c45bdd

File tree

12 files changed

+426
-305
lines changed

12 files changed

+426
-305
lines changed

go.mod

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ module github.com/lightninglabs/aperture
33
go 1.19
44

55
require (
6-
github.com/btcsuite/btcd v0.24.0
6+
github.com/btcsuite/btcd v0.24.1-0.20240123000108-62e6af035ec5
77
github.com/btcsuite/btcd/btcec/v2 v2.3.2
88
github.com/btcsuite/btcd/btcutil v1.1.5
99
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
1010
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
1111
github.com/btcsuite/btcwallet/wtxmgr v1.5.0
1212
github.com/fortytw2/leaktest v1.3.0
13-
github.com/golang-migrate/migrate/v4 v4.16.0
14-
github.com/golang/protobuf v1.5.4
13+
github.com/golang-migrate/migrate/v4 v4.16.1
1514
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
1615
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
1716
github.com/jackc/pgconn v1.14.3
@@ -20,12 +19,12 @@ require (
2019
github.com/lib/pq v1.10.7
2120
github.com/lightninglabs/lightning-node-connect v0.2.5-alpha
2221
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
23-
github.com/lightninglabs/lndclient v0.16.0-10
24-
github.com/lightningnetwork/lnd v0.16.0-beta
25-
github.com/lightningnetwork/lnd/cert v1.2.1
26-
github.com/lightningnetwork/lnd/clock v1.1.0
27-
github.com/lightningnetwork/lnd/tlv v1.1.0
28-
github.com/lightningnetwork/lnd/tor v1.1.0
22+
github.com/lightninglabs/lndclient v0.17.4-4
23+
github.com/lightningnetwork/lnd v0.17.4-beta
24+
github.com/lightningnetwork/lnd/cert v1.2.2
25+
github.com/lightningnetwork/lnd/clock v1.1.1
26+
github.com/lightningnetwork/lnd/tlv v1.1.1
27+
github.com/lightningnetwork/lnd/tor v1.1.2
2928
github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9
3029
github.com/ory/dockertest/v3 v3.10.0
3130
github.com/prometheus/client_golang v1.11.1
@@ -34,7 +33,7 @@ require (
3433
go.etcd.io/etcd/server/v3 v3.5.7
3534
golang.org/x/crypto v0.21.0
3635
golang.org/x/net v0.23.0
37-
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
36+
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65
3837
google.golang.org/grpc v1.59.0
3938
google.golang.org/protobuf v1.33.0
4039
gopkg.in/macaroon-bakery.v2 v2.1.0
@@ -55,8 +54,8 @@ require (
5554
github.com/aead/siphash v1.0.1 // indirect
5655
github.com/andybalholm/brotli v1.0.3 // indirect
5756
github.com/beorn7/perks v1.0.1 // indirect
58-
github.com/btcsuite/btcd/btcutil/psbt v1.1.5 // indirect
59-
github.com/btcsuite/btcwallet v0.16.7 // indirect
57+
github.com/btcsuite/btcd/btcutil/psbt v1.1.8 // indirect
58+
github.com/btcsuite/btcwallet v0.16.10-0.20240127010340-16b422a2e8bf // indirect
6059
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.2 // indirect
6160
github.com/btcsuite/btcwallet/wallet/txrules v1.2.0 // indirect
6261
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.3 // indirect
@@ -87,6 +86,7 @@ require (
8786
github.com/go-logr/stdr v1.2.2 // indirect
8887
github.com/gogo/protobuf v1.3.2 // indirect
8988
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
89+
github.com/golang/protobuf v1.5.3 // indirect
9090
github.com/golang/snappy v0.0.4 // indirect
9191
github.com/google/btree v1.0.1 // indirect
9292
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -116,13 +116,13 @@ require (
116116
github.com/klauspost/pgzip v1.2.5 // indirect
117117
github.com/kr/pretty v0.3.1 // indirect
118118
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
119-
github.com/lightninglabs/neutrino v0.15.0 // indirect
119+
github.com/lightninglabs/neutrino v0.16.0 // indirect
120120
github.com/lightninglabs/neutrino/cache v1.1.1 // indirect
121-
github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1 // indirect
122-
github.com/lightningnetwork/lnd/healthcheck v1.2.2 // indirect
123-
github.com/lightningnetwork/lnd/kvdb v1.4.1 // indirect
124-
github.com/lightningnetwork/lnd/queue v1.1.0 // indirect
125-
github.com/lightningnetwork/lnd/ticker v1.1.0 // indirect
121+
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f // indirect
122+
github.com/lightningnetwork/lnd/healthcheck v1.2.3 // indirect
123+
github.com/lightningnetwork/lnd/kvdb v1.4.4 // indirect
124+
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
125+
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
126126
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
127127
github.com/mattn/go-isatty v0.0.17 // indirect
128128
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
@@ -152,15 +152,15 @@ require (
152152
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
153153
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
154154
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 // indirect
155-
github.com/ulikunitz/xz v0.5.10 // indirect
155+
github.com/ulikunitz/xz v0.5.11 // indirect
156156
github.com/xdg-go/stringprep v1.0.4 // indirect
157157
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
158158
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
159159
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
160160
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
161161
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
162162
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
163-
go.etcd.io/bbolt v1.3.6 // indirect
163+
go.etcd.io/bbolt v1.3.7 // indirect
164164
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
165165
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
166166
go.etcd.io/etcd/client/v2 v2.305.7 // indirect
@@ -202,3 +202,7 @@ require (
202202
nhooyr.io/websocket v1.8.7 // indirect
203203
sigs.k8s.io/yaml v1.2.0 // indirect
204204
)
205+
206+
// We want to format raw bytes as hex instead of base64. The forked version
207+
// allows us to specify that as an option.
208+
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display

0 commit comments

Comments
 (0)