Skip to content

Commit dedfad0

Browse files
guggeroguggero
committed
multi: bump lnd version to v0.17.0-beta.rc5
1 parent 58b7400 commit dedfad0

File tree

8 files changed

+967
-1308
lines changed

8 files changed

+967
-1308
lines changed

‎cmd/loop/main.go‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"bytes"
5+
"encoding/json"
56
"errors"
67
"fmt"
78
"io/ioutil"
@@ -17,14 +18,13 @@ import (
1718
"github.com/lightninglabs/loop/loopd"
1819
"github.com/lightninglabs/loop/looprpc"
1920
"github.com/lightninglabs/loop/swap"
20-
"github.com/lightninglabs/protobuf-hex-display/json"
21-
"github.com/lightninglabs/protobuf-hex-display/jsonpb"
22-
"github.com/lightninglabs/protobuf-hex-display/proto"
2321
"github.com/lightningnetwork/lnd/lncfg"
22+
"github.com/lightningnetwork/lnd/lnrpc"
2423
"github.com/lightningnetwork/lnd/macaroons"
2524
"github.com/urfave/cli"
2625
"google.golang.org/grpc"
2726
"google.golang.org/grpc/credentials"
27+
"google.golang.org/protobuf/proto"
2828
"gopkg.in/macaroon.v2"
2929
)
3030

@@ -111,19 +111,13 @@ func printJSON(resp interface{}) {
111111
}
112112

113113
func printRespJSON(resp proto.Message) {
114-
jsonMarshaler := &jsonpb.Marshaler{
115-
OrigName: true,
116-
EmitDefaults: true,
117-
Indent: " ",
118-
}
119-
120-
jsonStr, err := jsonMarshaler.MarshalToString(resp)
114+
jsonBytes, err := lnrpc.ProtoJSONMarshalOpts.Marshal(resp)
121115
if err != nil {
122116
fmt.Println("unable to decode response: ", err)
123117
return
124118
}
125119

126-
fmt.Println(jsonStr)
120+
fmt.Println(string(jsonBytes))
127121
}
128122

129123
func fatal(err error) {

‎go.mod‎

Lines changed: 55 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,47 @@
11
module github.com/lightninglabs/loop
22

33
require (
4-
github.com/btcsuite/btcd v0.23.5-0.20230125025938-be056b0a0b2f
4+
github.com/btcsuite/btcd v0.23.5-0.20230905170901-80f5a0ffdf36
55
github.com/btcsuite/btcd/btcec/v2 v2.3.2
6-
github.com/btcsuite/btcd/btcutil v1.1.3
7-
github.com/btcsuite/btcd/btcutil/psbt v1.1.5
6+
github.com/btcsuite/btcd/btcutil v1.1.4-0.20230904040416-d4f519f5dc05
7+
github.com/btcsuite/btcd/btcutil/psbt v1.1.8
88
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2
99
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
10-
github.com/btcsuite/btcwallet v0.16.7
10+
github.com/btcsuite/btcwallet v0.16.10-0.20230804184612-07be54bc22cf
1111
github.com/btcsuite/btcwallet/wtxmgr v1.5.0
1212
github.com/coreos/bbolt v1.3.3
1313
github.com/davecgh/go-spew v1.1.1
1414
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1
1515
github.com/fortytw2/leaktest v1.3.0
16-
github.com/golang-migrate/migrate/v4 v4.15.2
17-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
18-
github.com/jackc/pgconn v1.10.0
16+
github.com/golang-migrate/migrate/v4 v4.16.1
17+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3
18+
github.com/jackc/pgconn v1.14.0
1919
github.com/jackc/pgerrcode v0.0.0-20220416144525-469b46aa5efa
2020
github.com/jessevdk/go-flags v1.4.0
21-
github.com/lib/pq v1.10.3
22-
github.com/lightninglabs/aperture v0.1.20-beta
23-
github.com/lightninglabs/lndclient v0.16.0-10
24-
github.com/lightninglabs/loop/swapserverrpc v1.0.4
25-
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
26-
github.com/lightningnetwork/lnd v0.16.0-beta
27-
github.com/lightningnetwork/lnd/cert v1.2.1
28-
github.com/lightningnetwork/lnd/clock v1.1.0
29-
github.com/lightningnetwork/lnd/queue v1.1.0
30-
github.com/lightningnetwork/lnd/ticker v1.1.0
31-
github.com/lightningnetwork/lnd/tor v1.1.0
21+
github.com/lib/pq v1.10.7
22+
github.com/lightninglabs/aperture v0.1.21-beta.0.20230705004936-87bb996a4030
23+
github.com/lightninglabs/lndclient v0.17.0-0
24+
github.com/lightninglabs/loop/swapserverrpc v1.0.5
25+
github.com/lightningnetwork/lnd v0.17.0-beta.rc5
26+
github.com/lightningnetwork/lnd/cert v1.2.2
27+
github.com/lightningnetwork/lnd/clock v1.1.1
28+
github.com/lightningnetwork/lnd/queue v1.1.1
29+
github.com/lightningnetwork/lnd/ticker v1.1.1
30+
github.com/lightningnetwork/lnd/tor v1.1.2
3231
github.com/ory/dockertest/v3 v3.10.0
33-
github.com/stretchr/testify v1.8.1
32+
github.com/stretchr/testify v1.8.2
3433
github.com/urfave/cli v1.22.9
35-
golang.org/x/net v0.8.0
34+
golang.org/x/net v0.10.0
3635
google.golang.org/grpc v1.53.0
37-
google.golang.org/protobuf v1.28.1
38-
gopkg.in/macaroon-bakery.v2 v2.0.1
36+
google.golang.org/protobuf v1.30.0
37+
gopkg.in/macaroon-bakery.v2 v2.1.0
3938
gopkg.in/macaroon.v2 v2.1.0
4039
modernc.org/sqlite v1.20.3
4140
)
4241

4342
require (
44-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
45-
github.com/Microsoft/go-winio v0.6.0 // indirect
43+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
44+
github.com/Microsoft/go-winio v0.6.1 // indirect
4645
github.com/NebulousLabs/fastrand v0.0.0-20181203155948-6fb6489aac4e // indirect
4746
github.com/NebulousLabs/go-upnp v0.0.0-20180202185039-29b680b06c82 // indirect
4847
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
@@ -59,7 +58,7 @@ require (
5958
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
6059
github.com/btcsuite/winsvc v1.0.0 // indirect
6160
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
62-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
61+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6362
github.com/containerd/continuity v0.3.0 // indirect
6463
github.com/coreos/go-semver v0.3.0 // indirect
6564
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
@@ -70,7 +69,7 @@ require (
7069
github.com/docker/cli v20.10.17+incompatible // indirect
7170
github.com/docker/docker v20.10.24+incompatible // indirect
7271
github.com/docker/go-connections v0.4.0 // indirect
73-
github.com/docker/go-units v0.4.0 // indirect
72+
github.com/docker/go-units v0.5.0 // indirect
7473
github.com/dsnet/compress v0.0.1 // indirect
7574
github.com/dustin/go-humanize v1.0.0 // indirect
7675
github.com/fergusstrange/embedded-postgres v1.10.0 // indirect
@@ -90,14 +89,14 @@ require (
9089
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
9190
github.com/hashicorp/errwrap v1.1.0 // indirect
9291
github.com/hashicorp/go-multierror v1.1.1 // indirect
93-
github.com/imdario/mergo v0.3.12 // indirect
92+
github.com/imdario/mergo v0.3.13 // indirect
9493
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
9594
github.com/jackc/pgio v1.0.0 // indirect
9695
github.com/jackc/pgpassfile v1.0.0 // indirect
97-
github.com/jackc/pgproto3/v2 v2.1.1 // indirect
98-
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
99-
github.com/jackc/pgtype v1.8.1 // indirect
100-
github.com/jackc/pgx/v4 v4.13.0 // indirect
96+
github.com/jackc/pgproto3/v2 v2.3.2 // indirect
97+
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
98+
github.com/jackc/pgtype v1.14.0 // indirect
99+
github.com/jackc/pgx/v4 v4.18.1 // indirect
101100
github.com/jackpal/gateway v1.0.5 // indirect
102101
github.com/jackpal/go-nat-pmp v0.0.0-20170405195558-28a68d0c24ad // indirect
103102
github.com/jonboulle/clockwork v0.2.2 // indirect
@@ -109,19 +108,19 @@ require (
109108
github.com/klauspost/compress v1.13.6 // indirect
110109
github.com/klauspost/pgzip v1.2.5 // indirect
111110
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
112-
github.com/lightninglabs/neutrino v0.15.0 // indirect
111+
github.com/lightninglabs/neutrino v0.16.0 // indirect
113112
github.com/lightninglabs/neutrino/cache v1.1.1 // indirect
114-
github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1 // indirect
115-
github.com/lightningnetwork/lnd/healthcheck v1.2.2 // indirect
116-
github.com/lightningnetwork/lnd/kvdb v1.4.1 // indirect
117-
github.com/lightningnetwork/lnd/tlv v1.1.0 // indirect
113+
github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f // indirect
114+
github.com/lightningnetwork/lnd/healthcheck v1.2.3 // indirect
115+
github.com/lightningnetwork/lnd/kvdb v1.4.4 // indirect
116+
github.com/lightningnetwork/lnd/tlv v1.1.1 // indirect
118117
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
119-
github.com/mattn/go-isatty v0.0.16 // indirect
118+
github.com/mattn/go-isatty v0.0.17 // indirect
120119
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
121120
github.com/mholt/archiver/v3 v3.5.0 // indirect
122121
github.com/miekg/dns v1.1.43 // indirect
123122
github.com/mitchellh/mapstructure v1.4.1 // indirect
124-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
123+
github.com/moby/term v0.5.0 // indirect
125124
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
126125
github.com/modern-go/reflect2 v1.0.2 // indirect
127126
github.com/nwaples/rardecode v1.1.2 // indirect
@@ -139,21 +138,21 @@ require (
139138
github.com/rogpeppe/fastuuid v1.2.0 // indirect
140139
github.com/russross/blackfriday/v2 v2.0.1 // indirect
141140
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
142-
github.com/sirupsen/logrus v1.8.1 // indirect
141+
github.com/sirupsen/logrus v1.9.2 // indirect
143142
github.com/soheilhy/cmux v0.1.5 // indirect
144143
github.com/spf13/pflag v1.0.5 // indirect
145144
github.com/stretchr/objx v0.5.0 // indirect
146145
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
147146
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
148147
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 // indirect
149-
github.com/ulikunitz/xz v0.5.10 // indirect
148+
github.com/ulikunitz/xz v0.5.11 // indirect
150149
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
151150
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
152151
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
153152
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
154153
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
155154
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
156-
go.etcd.io/bbolt v1.3.6 // indirect
155+
go.etcd.io/bbolt v1.3.7 // indirect
157156
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
158157
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
159158
go.etcd.io/etcd/client/v2 v2.305.7 // indirect
@@ -168,20 +167,20 @@ require (
168167
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0 // indirect
169168
go.opentelemetry.io/otel/sdk v1.3.0 // indirect
170169
go.opentelemetry.io/otel/trace v1.3.0 // indirect
171-
go.opentelemetry.io/proto/otlp v0.11.0 // indirect
170+
go.opentelemetry.io/proto/otlp v0.15.0 // indirect
172171
go.uber.org/atomic v1.7.0 // indirect
173172
go.uber.org/multierr v1.6.0 // indirect
174173
go.uber.org/zap v1.17.0 // indirect
175-
golang.org/x/crypto v0.1.0 // indirect
176-
golang.org/x/exp v0.0.0-20221111094246-ab4555d3164f // indirect
177-
golang.org/x/mod v0.9.0 // indirect
178-
golang.org/x/sync v0.1.0 // indirect
179-
golang.org/x/sys v0.7.0 // indirect
180-
golang.org/x/term v0.6.0 // indirect
181-
golang.org/x/text v0.8.0 // indirect
182-
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
183-
golang.org/x/tools v0.7.0 // indirect
184-
google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106 // indirect
174+
golang.org/x/crypto v0.7.0 // indirect
175+
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 // indirect
176+
golang.org/x/mod v0.10.0 // indirect
177+
golang.org/x/sync v0.2.0 // indirect
178+
golang.org/x/sys v0.8.0 // indirect
179+
golang.org/x/term v0.8.0 // indirect
180+
golang.org/x/text v0.9.0 // indirect
181+
golang.org/x/time v0.1.0 // indirect
182+
golang.org/x/tools v0.9.1 // indirect
183+
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
185184
gopkg.in/errgo.v1 v1.0.1 // indirect
186185
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
187186
gopkg.in/yaml.v2 v2.4.0 // indirect
@@ -198,11 +197,10 @@ require (
198197
sigs.k8s.io/yaml v1.2.0 // indirect
199198
)
200199

201-
// We need to use grpc v1.39.0 because of a change in how HTTP errors are
202-
// formatted and sent to the client. This change was introduced in grpc v1.40.0
203-
// with https://github.com/grpc/grpc-go/pull/4474.
204-
replace google.golang.org/grpc => google.golang.org/grpc v1.39.0
200+
// We want to format raw bytes as hex instead of base64. The forked version
201+
// allows us to specify that as an option.
202+
replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display
205203

206204
replace github.com/lightninglabs/loop/swapserverrpc => ./swapserverrpc
207205

208-
go 1.18
206+
go 1.19

0 commit comments

Comments
 (0)