Skip to content

Commit b952e4e

Browse files
guggeroguggero
authored
Merge pull request #85 from lightninglabs/lnd-16
prepare for lnd 0.16
2 parents f7883eb + 27f3a1e commit b952e4e

File tree

8 files changed

+204
-291
lines changed

8 files changed

+204
-291
lines changed

‎aperture.go

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -538,13 +538,23 @@ func getTLSConfig(serverName, baseDir string, autoCert bool) (
538538
tlsExtraDomains := []string{serverName}
539539
if !fileExists(tlsCertFile) && !fileExists(tlsKeyFile) {
540540
log.Infof("Generating TLS certificates...")
541-
err := cert.GenCertPair(
542-
selfSignedCertOrganization, tlsCertFile, tlsKeyFile,
543-
nil, tlsExtraDomains, false, selfSignedCertValidity,
541+
certBytes, keyBytes, err := cert.GenCertPair(
542+
selfSignedCertOrganization, nil, tlsExtraDomains, false,
543+
selfSignedCertValidity,
544544
)
545545
if err != nil {
546546
return nil, err
547547
}
548+
549+
// Now that we have the certificate and key, we'll store them
550+
// to the file system.
551+
err = cert.WriteCertPair(
552+
tlsCertFile, tlsKeyFile, certBytes, keyBytes,
553+
)
554+
if err != nil {
555+
return nil, err
556+
}
557+
548558
log.Infof("Done generating TLS certificates")
549559
}
550560

@@ -585,13 +595,21 @@ func getTLSConfig(serverName, baseDir string, autoCert bool) (
585595
}
586596

587597
log.Infof("Renewing TLS certificates...")
588-
err = cert.GenCertPair(
589-
selfSignedCertOrganization, tlsCertFile, tlsKeyFile,
590-
nil, nil, false, selfSignedCertValidity,
598+
certBytes, keyBytes, err := cert.GenCertPair(
599+
selfSignedCertOrganization, nil, nil, false,
600+
selfSignedCertValidity,
591601
)
592602
if err != nil {
593603
return nil, err
594604
}
605+
606+
err = cert.WriteCertPair(
607+
tlsCertFile, tlsKeyFile, certBytes, keyBytes,
608+
)
609+
if err != nil {
610+
return nil, err
611+
}
612+
595613
log.Infof("Done renewing TLS certificates")
596614

597615
// Reload the certificate data.

‎go.mod

Lines changed: 49 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module github.com/lightninglabs/aperture
33
go 1.19
44

55
require (
6-
github.com/btcsuite/btcd v0.23.4
7-
github.com/btcsuite/btcd/btcec/v2 v2.2.2
6+
github.com/btcsuite/btcd v0.23.5-0.20230125025938-be056b0a0b2f
7+
github.com/btcsuite/btcd/btcec/v2 v2.3.2
88
github.com/btcsuite/btcd/btcutil v1.1.3
99
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2
1010
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
@@ -15,19 +15,19 @@ require (
1515
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
1616
github.com/jessevdk/go-flags v1.4.0
1717
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
18-
github.com/lightninglabs/lndclient v0.16.0-6
19-
github.com/lightningnetwork/lnd v0.15.0-beta.rc6.0.20221207163254-a0385a535b66
20-
github.com/lightningnetwork/lnd/cert v1.1.1
18+
github.com/lightninglabs/lndclient v0.16.0-8
19+
github.com/lightningnetwork/lnd v0.16.0-beta.rc1
20+
github.com/lightningnetwork/lnd/cert v1.2.1
2121
github.com/lightningnetwork/lnd/tlv v1.1.0
2222
github.com/lightningnetwork/lnd/tor v1.1.0
2323
github.com/prometheus/client_golang v1.11.1
24-
github.com/stretchr/testify v1.8.0
25-
go.etcd.io/etcd/client/v3 v3.5.1
26-
go.etcd.io/etcd/server/v3 v3.5.1
24+
github.com/stretchr/testify v1.8.1
25+
go.etcd.io/etcd/client/v3 v3.5.7
26+
go.etcd.io/etcd/server/v3 v3.5.7
2727
golang.org/x/crypto v0.1.0
2828
golang.org/x/net v0.7.0
2929
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
30-
google.golang.org/grpc v1.39.0
30+
google.golang.org/grpc v1.41.0
3131
google.golang.org/protobuf v1.27.1
3232
gopkg.in/macaroon.v2 v2.1.0
3333
gopkg.in/yaml.v2 v2.4.0
@@ -42,14 +42,15 @@ require (
4242
github.com/andybalholm/brotli v1.0.3 // indirect
4343
github.com/beorn7/perks v1.0.1 // indirect
4444
github.com/btcsuite/btcd/btcutil/psbt v1.1.5 // indirect
45-
github.com/btcsuite/btcwallet v0.16.6-0.20221203002441-6c7480c8a46b // indirect
45+
github.com/btcsuite/btcwallet v0.16.7 // indirect
4646
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.2 // indirect
4747
github.com/btcsuite/btcwallet/wallet/txrules v1.2.0 // indirect
4848
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.3 // indirect
4949
github.com/btcsuite/btcwallet/walletdb v1.4.0 // indirect
5050
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
5151
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
5252
github.com/btcsuite/winsvc v1.0.0 // indirect
53+
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
5354
github.com/cespare/xxhash/v2 v2.1.1 // indirect
5455
github.com/coreos/go-semver v0.3.0 // indirect
5556
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
@@ -61,11 +62,12 @@ require (
6162
github.com/dsnet/compress v0.0.1 // indirect
6263
github.com/dustin/go-humanize v1.0.0 // indirect
6364
github.com/fergusstrange/embedded-postgres v1.10.0 // indirect
64-
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
6565
github.com/go-errors/errors v1.0.1 // indirect
6666
github.com/gogo/protobuf v1.3.2 // indirect
67+
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
6768
github.com/golang/snappy v0.0.4 // indirect
6869
github.com/google/btree v1.0.1 // indirect
70+
github.com/google/uuid v1.3.0 // indirect
6971
github.com/gorilla/websocket v1.4.2 // indirect
7072
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
7173
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
@@ -83,19 +85,22 @@ require (
8385
github.com/jrick/logrotate v1.0.0 // indirect
8486
github.com/json-iterator/go v1.1.11 // indirect
8587
github.com/juju/loggo v0.0.0-20210728185423-eebad3a902c4 // indirect
88+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
8689
github.com/kkdai/bstream v1.0.0 // indirect
8790
github.com/klauspost/compress v1.13.6 // indirect
8891
github.com/klauspost/pgzip v1.2.5 // indirect
8992
github.com/lib/pq v1.10.3 // indirect
9093
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
91-
github.com/lightninglabs/neutrino v0.14.2 // indirect
94+
github.com/lightninglabs/neutrino v0.15.0 // indirect
95+
github.com/lightninglabs/neutrino/cache v1.1.0 // indirect
9296
github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1 // indirect
9397
github.com/lightningnetwork/lnd/clock v1.1.0 // indirect
9498
github.com/lightningnetwork/lnd/healthcheck v1.2.2 // indirect
95-
github.com/lightningnetwork/lnd/kvdb v1.3.1 // indirect
99+
github.com/lightningnetwork/lnd/kvdb v1.4.1 // indirect
96100
github.com/lightningnetwork/lnd/queue v1.1.0 // indirect
97101
github.com/lightningnetwork/lnd/ticker v1.1.0 // indirect
98102
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
103+
github.com/mattn/go-isatty v0.0.16 // indirect
99104
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
100105
github.com/mholt/archiver/v3 v3.5.0 // indirect
101106
github.com/miekg/dns v1.1.43 // indirect
@@ -107,11 +112,12 @@ require (
107112
github.com/prometheus/client_model v0.2.0 // indirect
108113
github.com/prometheus/common v0.26.0 // indirect
109114
github.com/prometheus/procfs v0.6.0 // indirect
115+
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
110116
github.com/rogpeppe/fastuuid v1.2.0 // indirect
111117
github.com/sirupsen/logrus v1.7.0 // indirect
112118
github.com/soheilhy/cmux v0.1.5 // indirect
113119
github.com/spf13/pflag v1.0.5 // indirect
114-
github.com/stretchr/objx v0.4.0 // indirect
120+
github.com/stretchr/objx v0.5.0 // indirect
115121
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
116122
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
117123
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 // indirect
@@ -121,35 +127,47 @@ require (
121127
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
122128
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
123129
go.etcd.io/bbolt v1.3.6 // indirect
124-
go.etcd.io/etcd/api/v3 v3.5.1 // indirect
125-
go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect
126-
go.etcd.io/etcd/client/v2 v2.305.1 // indirect
127-
go.etcd.io/etcd/pkg/v3 v3.5.1 // indirect
128-
go.etcd.io/etcd/raft/v3 v3.5.1 // indirect
129-
go.opentelemetry.io/contrib v0.20.0 // indirect
130-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
131-
go.opentelemetry.io/otel v0.20.0 // indirect
132-
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
133-
go.opentelemetry.io/otel/metric v0.20.0 // indirect
134-
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
135-
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
136-
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
137-
go.opentelemetry.io/otel/trace v0.20.0 // indirect
138-
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
130+
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
131+
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
132+
go.etcd.io/etcd/client/v2 v2.305.7 // indirect
133+
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
134+
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
135+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect
136+
go.opentelemetry.io/otel v1.0.1 // indirect
137+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 // indirect
138+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1 // indirect
139+
go.opentelemetry.io/otel/sdk v1.0.1 // indirect
140+
go.opentelemetry.io/otel/trace v1.0.1 // indirect
141+
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
139142
go.uber.org/atomic v1.7.0 // indirect
140143
go.uber.org/multierr v1.6.0 // indirect
141144
go.uber.org/zap v1.17.0 // indirect
145+
golang.org/x/exp v0.0.0-20221111094246-ab4555d3164f // indirect
146+
golang.org/x/mod v0.6.0 // indirect
142147
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
143148
golang.org/x/sys v0.5.0 // indirect
144149
golang.org/x/term v0.5.0 // indirect
145150
golang.org/x/text v0.7.0 // indirect
151+
golang.org/x/tools v0.2.0 // indirect
146152
google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
147153
gopkg.in/errgo.v1 v1.0.1 // indirect
148154
gopkg.in/macaroon-bakery.v2 v2.0.1 // indirect
149155
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
150156
gopkg.in/yaml.v3 v3.0.1 // indirect
157+
lukechampine.com/uint128 v1.2.0 // indirect
158+
modernc.org/cc/v3 v3.40.0 // indirect
159+
modernc.org/ccgo/v3 v3.16.13 // indirect
160+
modernc.org/libc v1.22.2 // indirect
161+
modernc.org/mathutil v1.5.0 // indirect
162+
modernc.org/memory v1.4.0 // indirect
163+
modernc.org/opt v0.1.3 // indirect
164+
modernc.org/sqlite v1.20.3 // indirect
165+
modernc.org/strutil v1.1.3 // indirect
166+
modernc.org/token v1.0.1 // indirect
151167
sigs.k8s.io/yaml v1.2.0 // indirect
152168
)
153169

154-
// Fix etcd token renewal issue https://github.com/etcd-io/etcd/pull/13262.
155-
replace go.etcd.io/etcd/client/v3 => github.com/lightninglabs/etcd/client/v3 v3.5.1-retry-patch
170+
// We need to use grpc v1.39.0 because of a change in how HTTP errors are
171+
// formatted and sent to the client. This change was introduced in grpc v1.40.0
172+
// with https://github.com/grpc/grpc-go/pull/4474.
173+
replace google.golang.org/grpc => google.golang.org/grpc v1.39.0

0 commit comments

Comments
 (0)