Skip to content

Commit ed97350

Browse files
guggeroguggero
committed
multi: bump lnd to latest custom channel version
1 parent 163d1ad commit ed97350

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+687
-575
lines changed

‎docs/examples/basic-price-oracle/go.mod‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module basic-price-oracle
22

3-
go 1.22
4-
5-
toolchain go1.22.3
3+
go 1.22.6
64

75
replace github.com/lightninglabs/taproot-assets => ../../../
86

@@ -15,7 +13,7 @@ require (
1513
github.com/golang/protobuf v1.5.4 // indirect
1614
github.com/google/go-cmp v0.6.0 // indirect
1715
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
18-
golang.org/x/net v0.23.0 // indirect
16+
golang.org/x/net v0.24.0 // indirect
1917
golang.org/x/sys v0.19.0 // indirect
2018
golang.org/x/text v0.14.0 // indirect
2119
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect

‎docs/examples/basic-price-oracle/go.sum‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
13
github.com/golang/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
24
github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
35
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
@@ -6,8 +8,12 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
68
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
79
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms=
810
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg=
9-
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
10-
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
11+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
12+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
13+
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
14+
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
15+
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
16+
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
1117
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
1218
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
1319
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
@@ -22,3 +28,5 @@ google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
2228
google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
2329
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
2430
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
31+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
32+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎go.mod‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
module github.com/lightninglabs/taproot-assets
22

3-
go 1.22
4-
5-
toolchain go1.22.3
3+
go 1.22.6
64

75
require (
8-
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240403021926-ae5533602c46
6+
github.com/btcsuite/btcd v0.24.2-beta.rc1.0.20240625142744-cc26860b4026
97
github.com/btcsuite/btcd/btcec/v2 v2.3.3
108
github.com/btcsuite/btcd/btcutil v1.1.5
119
github.com/btcsuite/btcd/btcutil/psbt v1.1.8
1210
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
1311
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
14-
github.com/btcsuite/btcwallet v0.16.10-0.20240410030101-6fe19a472a62
12+
github.com/btcsuite/btcwallet v0.16.10-0.20240809133323-7d3434c65ae2
1513
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.4
1614
github.com/btcsuite/btcwallet/wtxmgr v1.5.3
1715
github.com/caddyserver/certmagic v0.17.2
@@ -26,23 +24,23 @@ require (
2624
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438
2725
github.com/jessevdk/go-flags v1.4.0
2826
github.com/lib/pq v1.10.9
29-
github.com/lightninglabs/aperture v0.1.21-beta.0.20230705004936-87bb996a4030
27+
github.com/lightninglabs/aperture v0.3.2-beta.0.20240919071136-db27bb9a78bd
3028
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
31-
github.com/lightninglabs/lndclient v1.0.1-0.20240725080034-64a756aa4c36
29+
github.com/lightninglabs/lndclient v1.0.1-0.20240919113647-5bc7b3fa5a7d
3230
github.com/lightninglabs/neutrino/cache v1.1.2
33-
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240723043204-f09d4042aee4
31+
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240919095711-611852fd34b1
3432
github.com/lightningnetwork/lnd/cert v1.2.2
3533
github.com/lightningnetwork/lnd/clock v1.1.1
36-
github.com/lightningnetwork/lnd/fn v1.1.0
34+
github.com/lightningnetwork/lnd/fn v1.2.1
3735
github.com/lightningnetwork/lnd/tlv v1.2.6
3836
github.com/lightningnetwork/lnd/tor v1.1.2
3937
github.com/ory/dockertest/v3 v3.10.0
4038
github.com/prometheus/client_golang v1.14.0
4139
github.com/stretchr/testify v1.9.0
4240
github.com/urfave/cli v1.22.9
4341
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8
44-
golang.org/x/net v0.23.0
45-
golang.org/x/sync v0.6.0
42+
golang.org/x/net v0.24.0
43+
golang.org/x/sync v0.7.0
4644
golang.org/x/term v0.19.0
4745
golang.org/x/time v0.3.0
4846
google.golang.org/grpc v1.59.0
@@ -79,7 +77,7 @@ require (
7977
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
8078
github.com/decred/dcrd/lru v1.1.2 // indirect
8179
github.com/docker/cli v20.10.17+incompatible // indirect
82-
github.com/docker/docker v24.0.7+incompatible // indirect
80+
github.com/docker/docker v24.0.9+incompatible // indirect
8381
github.com/docker/go-connections v0.4.0 // indirect
8482
github.com/docker/go-units v0.5.0 // indirect
8583
github.com/dustin/go-humanize v1.0.1 // indirect
@@ -108,25 +106,26 @@ require (
108106
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
109107
github.com/jackc/pgtype v1.14.0 // indirect
110108
github.com/jackc/pgx/v4 v4.18.2 // indirect
109+
github.com/jackc/pgx/v5 v5.3.1 // indirect
111110
github.com/jackc/puddle v1.3.0 // indirect
112111
github.com/jackpal/gateway v1.0.5 // indirect
113112
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
114113
github.com/jonboulle/clockwork v0.2.2 // indirect
115-
github.com/jrick/logrotate v1.0.0 // indirect
114+
github.com/jrick/logrotate v1.1.2 // indirect
116115
github.com/json-iterator/go v1.1.12 // indirect
117116
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
118117
github.com/kkdai/bstream v1.0.0 // indirect
119-
github.com/klauspost/compress v1.15.11 // indirect
118+
github.com/klauspost/compress v1.17.9 // indirect
120119
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
121120
github.com/libdns/libdns v0.2.1 // indirect
122121
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
123122
github.com/lightninglabs/lightning-node-connect v0.2.5-alpha // indirect
124123
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
125-
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f // indirect
126-
github.com/lightningnetwork/lnd/healthcheck v1.2.4 // indirect
127-
github.com/lightningnetwork/lnd/kvdb v1.4.8 // indirect
124+
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
125+
github.com/lightningnetwork/lnd/healthcheck v1.2.5 // indirect
126+
github.com/lightningnetwork/lnd/kvdb v1.4.10 // indirect
128127
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
129-
github.com/lightningnetwork/lnd/sqldb v1.0.2 // indirect
128+
github.com/lightningnetwork/lnd/sqldb v1.0.4 // indirect
130129
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
131130
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
132131
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -141,7 +140,7 @@ require (
141140
github.com/ncruces/go-strftime v0.1.9 // indirect
142141
github.com/opencontainers/go-digest v1.0.0 // indirect
143142
github.com/opencontainers/image-spec v1.0.2 // indirect
144-
github.com/opencontainers/runc v1.1.12 // indirect
143+
github.com/opencontainers/runc v1.1.14 // indirect
145144
github.com/pkg/errors v0.9.1 // indirect
146145
github.com/pmezard/go-difflib v1.0.0 // indirect
147146
github.com/prometheus/client_model v0.3.0 // indirect
@@ -172,13 +171,13 @@ require (
172171
go.etcd.io/etcd/pkg/v3 v3.5.12 // indirect
173172
go.etcd.io/etcd/raft/v3 v3.5.12 // indirect
174173
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
175-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect
176-
go.opentelemetry.io/otel v1.20.0 // indirect
174+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
175+
go.opentelemetry.io/otel v1.21.0 // indirect
177176
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
178177
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
179-
go.opentelemetry.io/otel/metric v1.20.0 // indirect
180-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
181-
go.opentelemetry.io/otel/trace v1.20.0 // indirect
178+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
179+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
180+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
182181
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
183182
go.uber.org/atomic v1.10.0 // indirect
184183
go.uber.org/multierr v1.6.0 // indirect
@@ -208,3 +207,8 @@ require (
208207
// We want to format raw bytes as hex instead of base64. The forked version
209208
// allows us to specify that as an option.
210209
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display
210+
211+
// We need this replace until the final custom channel PR (part5) is merged and
212+
// the lnd-18-4 branch of `lndclient` points to that. Otherwise go mod tidy will
213+
// revert the version to what `lndclient` has in its go.mod file.
214+
replace github.com/lightningnetwork/lnd => github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20240919094616-a1e9232a52ac

0 commit comments

Comments
 (0)