Skip to content

Commit 0059ae7

Browse files
committed
litrpc: move jsoncallbacks.go into litrpc to reduce LNC import scope
Moved jsoncallbacks.go into the litrpc package, allowing Lightning Node Connect to stop importing the litclient package. This change avoids pulling in the rest of lit and taproot-assets, as litclient was not a separate module. The now-empty litclient directory has also been removed.
1 parent c0bd649 commit 0059ae7

File tree

3 files changed

+195
-195
lines changed

3 files changed

+195
-195
lines changed

litrpc/go.mod

Lines changed: 52 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -7,54 +7,57 @@ require (
77
github.com/lightninglabs/faraday/frdrpc v1.0.0
88
github.com/lightninglabs/loop/looprpc v1.0.0
99
github.com/lightninglabs/pool/poolrpc v1.0.0
10-
github.com/lightningnetwork/lnd v0.18.0-beta.rc4.0.20250304192711-9feb761b4ec4
10+
github.com/lightninglabs/taproot-assets/taprpc v1.0.1
11+
github.com/lightningnetwork/lnd v0.19.0-beta.rc2.0.20250423092132-a35ace7371af
1112
google.golang.org/grpc v1.65.0
1213
google.golang.org/protobuf v1.34.2
1314
)
1415

1516
require (
17+
dario.cat/mergo v1.0.1 // indirect
1618
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
1719
github.com/Microsoft/go-winio v0.6.1 // indirect
1820
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
1921
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect
2022
github.com/aead/siphash v1.0.1 // indirect
2123
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/btcsuite/btcd v0.24.3-0.20241210095828-e646d437e95b // indirect
24+
github.com/btcsuite/btcd v0.24.3-0.20250318170759-4f4ea81776d6 // indirect
2325
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
2426
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
25-
github.com/btcsuite/btcd/btcutil/psbt v1.1.8 // indirect
27+
github.com/btcsuite/btcd/btcutil/psbt v1.1.10 // indirect
2628
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
2729
github.com/btcsuite/btclog v0.0.0-20241003133417-09c4e92e319c // indirect
2830
github.com/btcsuite/btclog/v2 v2.0.1-0.20250110154127-3ae4bf1cb318 // indirect
29-
github.com/btcsuite/btcwallet v0.16.10-0.20241127094224-93c858b2ad63 // indirect
31+
github.com/btcsuite/btcwallet v0.16.13 // indirect
3032
github.com/btcsuite/btcwallet/wallet/txauthor v1.3.5 // indirect
3133
github.com/btcsuite/btcwallet/wallet/txrules v1.2.2 // indirect
3234
github.com/btcsuite/btcwallet/wallet/txsizes v1.2.5 // indirect
33-
github.com/btcsuite/btcwallet/walletdb v1.4.4 // indirect
34-
github.com/btcsuite/btcwallet/wtxmgr v1.5.4 // indirect
35+
github.com/btcsuite/btcwallet/walletdb v1.5.1 // indirect
36+
github.com/btcsuite/btcwallet/wtxmgr v1.5.6 // indirect
3537
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
3638
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
3739
github.com/btcsuite/winsvc v1.0.0 // indirect
38-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
40+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3941
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4042
github.com/containerd/continuity v0.3.0 // indirect
4143
github.com/coreos/go-semver v0.3.0 // indirect
42-
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
44+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4345
github.com/davecgh/go-spew v1.1.1 // indirect
4446
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
4547
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
4648
github.com/decred/dcrd/lru v1.1.2 // indirect
47-
github.com/docker/cli v20.10.17+incompatible // indirect
48-
github.com/docker/docker v24.0.9+incompatible // indirect
49+
github.com/docker/cli v28.0.1+incompatible // indirect
50+
github.com/docker/docker v28.0.1+incompatible // indirect
4951
github.com/docker/go-connections v0.4.0 // indirect
5052
github.com/docker/go-units v0.5.0 // indirect
5153
github.com/dustin/go-humanize v1.0.1 // indirect
54+
github.com/felixge/httpsnoop v1.0.4 // indirect
5255
github.com/fergusstrange/embedded-postgres v1.25.0 // indirect
5356
github.com/frankban/quicktest v1.11.3 // indirect
5457
github.com/go-errors/errors v1.0.1 // indirect
55-
github.com/go-logr/logr v1.3.0 // indirect
58+
github.com/go-logr/logr v1.4.2 // indirect
5659
github.com/go-logr/stdr v1.2.2 // indirect
57-
github.com/gofrs/uuid v4.2.0+incompatible // indirect
60+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
5861
github.com/gogo/protobuf v1.3.2 // indirect
5962
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
6063
github.com/golang-migrate/migrate/v4 v4.17.0 // indirect
@@ -64,13 +67,11 @@ require (
6467
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6568
github.com/google/uuid v1.6.0 // indirect
6669
github.com/gorilla/websocket v1.5.0 // indirect
67-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
70+
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
6871
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
6972
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
7073
github.com/hashicorp/errwrap v1.1.0 // indirect
7174
github.com/hashicorp/go-multierror v1.1.1 // indirect
72-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
73-
github.com/imdario/mergo v0.3.13 // indirect
7475
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
7576
github.com/jackc/pgconn v1.14.3 // indirect
7677
github.com/jackc/pgerrcode v0.0.0-20240316143900-6e2875d9b438 // indirect
@@ -86,55 +87,52 @@ require (
8687
github.com/jonboulle/clockwork v0.2.2 // indirect
8788
github.com/jrick/logrotate v1.1.2 // indirect
8889
github.com/json-iterator/go v1.1.12 // indirect
89-
github.com/juju/clock v1.1.1 // indirect
90-
github.com/juju/errors v1.0.0 // indirect
9190
github.com/juju/loggo v1.0.0 // indirect
92-
github.com/juju/testing v1.0.2 // indirect
93-
github.com/juju/utils/v3 v3.2.0 // indirect
9491
github.com/kkdai/bstream v1.0.0 // indirect
9592
github.com/klauspost/compress v1.17.9 // indirect
9693
github.com/lib/pq v1.10.9 // indirect
9794
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
9895
github.com/lightninglabs/loop/swapserverrpc v1.0.8 // indirect
99-
github.com/lightninglabs/neutrino v0.16.1-0.20240425105051-602843d34ffd // indirect
96+
github.com/lightninglabs/neutrino v0.16.1 // indirect
10097
github.com/lightninglabs/neutrino/cache v1.1.2 // indirect
10198
github.com/lightninglabs/pool/auctioneerrpc v1.1.2 // indirect
10299
github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb // indirect
103100
github.com/lightningnetwork/lnd/clock v1.1.1 // indirect
104101
github.com/lightningnetwork/lnd/fn/v2 v2.0.8 // indirect
105102
github.com/lightningnetwork/lnd/healthcheck v1.2.6 // indirect
106-
github.com/lightningnetwork/lnd/kvdb v1.4.12 // indirect
103+
github.com/lightningnetwork/lnd/kvdb v1.4.16 // indirect
107104
github.com/lightningnetwork/lnd/queue v1.1.1 // indirect
108-
github.com/lightningnetwork/lnd/sqldb v1.0.7 // indirect
105+
github.com/lightningnetwork/lnd/sqldb v1.0.9 // indirect
109106
github.com/lightningnetwork/lnd/ticker v1.1.1 // indirect
110107
github.com/lightningnetwork/lnd/tlv v1.3.0 // indirect
111-
github.com/lightningnetwork/lnd/tor v1.1.4 // indirect
108+
github.com/lightningnetwork/lnd/tor v1.1.6 // indirect
112109
github.com/ltcsuite/ltcd v0.0.0-20190101042124-f37f8bf35796 // indirect
113110
github.com/mattn/go-isatty v0.0.20 // indirect
114111
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
115-
github.com/miekg/dns v1.1.43 // indirect
116-
github.com/mitchellh/mapstructure v1.4.1 // indirect
112+
github.com/miekg/dns v1.1.50 // indirect
113+
github.com/moby/docker-image-spec v1.3.1 // indirect
114+
github.com/moby/sys/user v0.3.0 // indirect
117115
github.com/moby/term v0.5.0 // indirect
118116
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
119117
github.com/modern-go/reflect2 v1.0.2 // indirect
120118
github.com/ncruces/go-strftime v0.1.9 // indirect
121119
github.com/opencontainers/go-digest v1.0.0 // indirect
122120
github.com/opencontainers/image-spec v1.0.2 // indirect
123-
github.com/opencontainers/runc v1.1.14 // indirect
121+
github.com/opencontainers/runc v1.2.0 // indirect
124122
github.com/ory/dockertest/v3 v3.10.0 // indirect
125123
github.com/pkg/errors v0.9.1 // indirect
126124
github.com/pmezard/go-difflib v1.0.0 // indirect
127-
github.com/prometheus/client_golang v1.11.1 // indirect
125+
github.com/prometheus/client_golang v1.14.0 // indirect
128126
github.com/prometheus/client_model v0.3.0 // indirect
129-
github.com/prometheus/common v0.30.0 // indirect
130-
github.com/prometheus/procfs v0.7.3 // indirect
127+
github.com/prometheus/common v0.37.0 // indirect
128+
github.com/prometheus/procfs v0.8.0 // indirect
131129
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
132130
github.com/rogpeppe/fastuuid v1.2.0 // indirect
133-
github.com/sirupsen/logrus v1.9.2 // indirect
131+
github.com/sirupsen/logrus v1.9.3 // indirect
134132
github.com/soheilhy/cmux v0.1.5 // indirect
135133
github.com/spf13/pflag v1.0.5 // indirect
136134
github.com/stretchr/objx v0.5.2 // indirect
137-
github.com/stretchr/testify v1.9.0 // indirect
135+
github.com/stretchr/testify v1.10.0 // indirect
138136
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
139137
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
140138
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
@@ -143,36 +141,36 @@ require (
143141
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
144142
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
145143
go.etcd.io/bbolt v1.3.11 // indirect
146-
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
147-
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
148-
go.etcd.io/etcd/client/v2 v2.305.7 // indirect
149-
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
150-
go.etcd.io/etcd/pkg/v3 v3.5.7 // indirect
151-
go.etcd.io/etcd/raft/v3 v3.5.7 // indirect
152-
go.etcd.io/etcd/server/v3 v3.5.7 // indirect
144+
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
145+
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
146+
go.etcd.io/etcd/client/v2 v2.305.12 // indirect
147+
go.etcd.io/etcd/client/v3 v3.5.12 // indirect
148+
go.etcd.io/etcd/pkg/v3 v3.5.12 // indirect
149+
go.etcd.io/etcd/raft/v3 v3.5.12 // indirect
150+
go.etcd.io/etcd/server/v3 v3.5.12 // indirect
151+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
153152
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
154-
go.opentelemetry.io/otel v1.21.0 // indirect
155-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0 // indirect
156-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0 // indirect
157-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0 // indirect
158-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
159-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
160-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
161-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
162-
go.uber.org/atomic v1.7.0 // indirect
153+
go.opentelemetry.io/otel v1.35.0 // indirect
154+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
155+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
156+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
157+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
158+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
159+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
160+
go.uber.org/atomic v1.10.0 // indirect
163161
go.uber.org/multierr v1.6.0 // indirect
164-
go.uber.org/zap v1.17.0 // indirect
162+
go.uber.org/zap v1.23.0 // indirect
165163
golang.org/x/crypto v0.36.0 // indirect
166164
golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
167-
golang.org/x/mod v0.17.0 // indirect
165+
golang.org/x/mod v0.21.0 // indirect
168166
golang.org/x/net v0.38.0 // indirect
169167
golang.org/x/sync v0.12.0 // indirect
170168
golang.org/x/sys v0.31.0 // indirect
171169
golang.org/x/term v0.30.0 // indirect
172170
golang.org/x/text v0.23.0 // indirect
173171
golang.org/x/time v0.3.0 // indirect
174-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
175-
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
172+
golang.org/x/tools v0.24.0 // indirect
173+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
176174
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
177175
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
178176
gopkg.in/errgo.v1 v1.0.1 // indirect
@@ -181,13 +179,11 @@ require (
181179
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
182180
gopkg.in/yaml.v2 v2.4.0 // indirect
183181
gopkg.in/yaml.v3 v3.0.1 // indirect
184-
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
185-
modernc.org/libc v1.49.3 // indirect
182+
modernc.org/libc v1.55.3 // indirect
186183
modernc.org/mathutil v1.6.0 // indirect
187184
modernc.org/memory v1.8.0 // indirect
188-
modernc.org/sqlite v1.29.10 // indirect
189-
modernc.org/strutil v1.2.0 // indirect
190-
modernc.org/token v1.1.0 // indirect
185+
modernc.org/sqlite v1.34.5 // indirect
186+
pgregory.net/rapid v1.2.0 // indirect
191187
sigs.k8s.io/yaml v1.2.0 // indirect
192188
)
193189

0 commit comments

Comments
 (0)