Skip to content

Commit 34664e6

Browse files
ellemoutonellemouton
committed
multi: remove core package
In this commit, the dependency on the core package is removed and hence the imports of loop, pool and faraday are also removed from LNC. The mobile and wasm-clients now instead import the permissions and JsonCallbacks that they need from Litd.
1 parent 38d34d9 commit 34664e6

File tree

9 files changed

+169
-388
lines changed

9 files changed

+169
-388
lines changed

‎cmd/wasm-client/go.mod‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ require (
55
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
66
github.com/golang/protobuf v1.5.2
77
github.com/jessevdk/go-flags v1.4.0
8-
github.com/lightninglabs/faraday v0.2.8-alpha.0.20220909105059-fea194ffb084
9-
github.com/lightninglabs/lightning-node-connect v0.1.9-alpha.0.20220602120524-e9964c685b18
10-
github.com/lightninglabs/loop v0.20.1-beta.0.20220916122221-9c3010150016
11-
github.com/lightninglabs/pool v0.5.8-alpha
8+
github.com/lightninglabs/lightning-node-connect v0.1.12-alpha
9+
github.com/lightninglabs/lightning-terminal v0.8.4-alpha.0.20230111161455-fa90690c65d0
1210
github.com/lightningnetwork/lnd v0.15.5-beta
1311
google.golang.org/grpc v1.39.0
14-
gopkg.in/macaroon-bakery.v2 v2.0.1
12+
gopkg.in/macaroon-bakery.v2 v2.1.0
1513
gopkg.in/macaroon.v2 v2.1.0
1614
)
1715

@@ -76,11 +74,14 @@ require (
7674
github.com/klauspost/compress v1.13.6 // indirect
7775
github.com/klauspost/pgzip v1.2.5 // indirect
7876
github.com/lib/pq v1.10.3 // indirect
77+
github.com/lightninglabs/faraday v0.2.9-alpha // indirect
7978
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
8079
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 // indirect
81-
github.com/lightninglabs/loop/swapserverrpc v1.0.1 // indirect
80+
github.com/lightninglabs/loop v0.20.2-beta // indirect
81+
github.com/lightninglabs/loop/swapserverrpc v1.0.3 // indirect
8282
github.com/lightninglabs/neutrino v0.14.2 // indirect
83-
github.com/lightninglabs/pool/auctioneerrpc v1.0.7 // indirect
83+
github.com/lightninglabs/pool v0.6.1-beta.0.20221202155747-aec0aee8d9a1 // indirect
84+
github.com/lightninglabs/pool/auctioneerrpc v1.1.0 // indirect
8485
github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display // indirect
8586
github.com/lightningnetwork/lightning-onion v1.0.2-0.20220211021909-bb84a1ccb0c5 // indirect
8687
github.com/lightningnetwork/lnd/cert v1.1.1 // indirect
@@ -139,11 +140,11 @@ require (
139140
go.uber.org/multierr v1.6.0 // indirect
140141
go.uber.org/zap v1.17.0 // indirect
141142
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
142-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
143-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
144-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
145-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
146-
golang.org/x/text v0.3.7 // indirect
143+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
144+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
145+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
146+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
147+
golang.org/x/text v0.3.8 // indirect
147148
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
148149
google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
149150
google.golang.org/protobuf v1.27.1 // indirect

‎cmd/wasm-client/go.sum‎

Lines changed: 34 additions & 24 deletions
Large diffs are not rendered by default.

‎cmd/wasm-client/main.go‎

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,18 @@ import (
1313
"regexp"
1414
"runtime/debug"
1515
"strings"
16+
"sync"
1617
"syscall/js"
1718

1819
"github.com/btcsuite/btcd/btcec/v2"
1920
"github.com/golang/protobuf/proto"
2021
"github.com/jessevdk/go-flags"
21-
"github.com/lightninglabs/faraday/frdrpc"
22-
"github.com/lightninglabs/lightning-node-connect/core"
2322
"github.com/lightninglabs/lightning-node-connect/mailbox"
24-
"github.com/lightninglabs/loop/looprpc"
25-
"github.com/lightninglabs/pool/poolrpc"
23+
"github.com/lightninglabs/lightning-terminal/litclient"
24+
"github.com/lightninglabs/lightning-terminal/perms"
2625
"github.com/lightningnetwork/lnd/build"
2726
"github.com/lightningnetwork/lnd/keychain"
2827
"github.com/lightningnetwork/lnd/lnrpc"
29-
"github.com/lightningnetwork/lnd/lnrpc/autopilotrpc"
30-
"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
31-
"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
32-
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
33-
"github.com/lightningnetwork/lnd/lnrpc/signrpc"
34-
"github.com/lightningnetwork/lnd/lnrpc/verrpc"
35-
"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
36-
"github.com/lightningnetwork/lnd/lnrpc/watchtowerrpc"
37-
"github.com/lightningnetwork/lnd/lnrpc/wtclientrpc"
3828
"github.com/lightningnetwork/lnd/macaroons"
3929
"github.com/lightningnetwork/lnd/signal"
4030
"google.golang.org/grpc"
@@ -43,28 +33,12 @@ import (
4333
"gopkg.in/macaroon.v2"
4434
)
4535

46-
type stubPackageRegistration func(map[string]func(context.Context,
47-
*grpc.ClientConn, string, func(string, error)))
48-
4936
var (
50-
registrations = []stubPackageRegistration{
51-
lnrpc.RegisterLightningJSONCallbacks,
52-
lnrpc.RegisterStateJSONCallbacks,
53-
autopilotrpc.RegisterAutopilotJSONCallbacks,
54-
chainrpc.RegisterChainNotifierJSONCallbacks,
55-
invoicesrpc.RegisterInvoicesJSONCallbacks,
56-
routerrpc.RegisterRouterJSONCallbacks,
57-
signrpc.RegisterSignerJSONCallbacks,
58-
verrpc.RegisterVersionerJSONCallbacks,
59-
walletrpc.RegisterWalletKitJSONCallbacks,
60-
watchtowerrpc.RegisterWatchtowerJSONCallbacks,
61-
wtclientrpc.RegisterWatchtowerClientJSONCallbacks,
62-
looprpc.RegisterSwapClientJSONCallbacks,
63-
poolrpc.RegisterTraderJSONCallbacks,
64-
frdrpc.RegisterFaradayServerJSONCallbacks,
65-
}
66-
67-
perms = core.GetAllMethodPermissions()
37+
// initMu is to be used to guard global variables at initialisation
38+
// time.
39+
initMu sync.Mutex
40+
41+
permsMgr *perms.Manager
6842

6943
jsonCBRegex = regexp.MustCompile("(\\w+)\\.(\\w+)\\.(\\w+)")
7044
)
@@ -77,6 +51,12 @@ func main() {
7751
}
7852
}()
7953

54+
// Initialise any global variables if they have not yet been
55+
// initialised.
56+
if err := initGlobals(); err != nil {
57+
exit(err)
58+
}
59+
8060
// Parse command line flags.
8161
cfg := config{}
8262
parser := flags.NewParser(&cfg, flags.Default)
@@ -123,7 +103,7 @@ func main() {
123103
callbacks.Set("wasmClientIsCustom", js.FuncOf(wc.IsCustom))
124104
js.Global().Set(cfg.NameSpace, callbacks)
125105

126-
for _, registration := range registrations {
106+
for _, registration := range litclient.Registrations {
127107
registration(wc.registry)
128108
}
129109

@@ -137,6 +117,22 @@ func main() {
137117
}
138118
}
139119

120+
// initGlobals initialises any global variables that have not yet been
121+
// initialised.
122+
func initGlobals() error {
123+
initMu.Lock()
124+
defer initMu.Unlock()
125+
126+
if permsMgr != nil {
127+
return nil
128+
}
129+
130+
var err error
131+
permsMgr, err = perms.NewManager(true)
132+
133+
return err
134+
}
135+
140136
type wasmClient struct {
141137
cfg *config
142138

@@ -399,7 +395,7 @@ func (w *wasmClient) HasPermissions(_ js.Value, args []js.Value) interface{} {
399395
// first `/` back to a `.` and then we prepend the result with a `/`.
400396
uri := jsonCBRegex.ReplaceAllString(args[0].String(), "/$1.$2/$3")
401397

402-
ops, ok := perms[uri]
398+
ops, ok := permsMgr.URIPermissions(uri)
403399
if !ok {
404400
log.Errorf("uri %s not found in known permissions list", uri)
405401
return js.ValueOf(false)

‎core/permissions.go‎

Lines changed: 0 additions & 146 deletions
This file was deleted.

‎go.mod‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,14 @@ require (
77
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
88
github.com/kkdai/bstream v1.0.0
99
github.com/lightninglabs/aperture v0.1.18-beta
10-
github.com/lightninglabs/faraday v0.2.8-alpha.0.20220909105059-fea194ffb084
1110
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
12-
github.com/lightninglabs/loop v0.20.1-beta.0.20220916122221-9c3010150016
13-
github.com/lightninglabs/pool v0.5.8-alpha
1411
github.com/lightningnetwork/lnd v0.15.5-beta
1512
github.com/lightningnetwork/lnd/ticker v1.1.0
16-
github.com/lightningnetwork/lnd/tor v1.0.2
13+
github.com/lightningnetwork/lnd/tor v1.0.1
1714
github.com/stretchr/testify v1.8.0
1815
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
1916
google.golang.org/grpc v1.39.0
2017
google.golang.org/protobuf v1.27.1
21-
gopkg.in/macaroon-bakery.v2 v2.0.1
2218
nhooyr.io/websocket v1.8.7
2319
)
2420

@@ -84,7 +80,7 @@ require (
8480
github.com/klauspost/pgzip v1.2.5 // indirect
8581
github.com/lib/pq v1.10.3 // indirect
8682
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
87-
github.com/lightninglabs/lndclient v0.15.0-12 // indirect
83+
github.com/lightninglabs/lndclient v0.15.4-0 // indirect
8884
github.com/lightninglabs/neutrino v0.14.2 // indirect
8985
github.com/lightningnetwork/lightning-onion v1.0.2-0.20220211021909-bb84a1ccb0c5 // indirect
9086
github.com/lightningnetwork/lnd/cert v1.1.1 // indirect
@@ -115,6 +111,7 @@ require (
115111
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
116112
github.com/tv42/zbase32 v0.0.0-20160707012821-501572607d02 // indirect
117113
github.com/ulikunitz/xz v0.5.10 // indirect
114+
github.com/xdg-go/stringprep v1.0.4 // indirect
118115
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
119116
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
120117
gitlab.com/yawning/bsaes.git v0.0.0-20190805113838-0a714cd429ec // indirect
@@ -139,14 +136,15 @@ require (
139136
go.uber.org/atomic v1.7.0 // indirect
140137
go.uber.org/multierr v1.6.0 // indirect
141138
go.uber.org/zap v1.17.0 // indirect
142-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
143-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
144-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
145-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
146-
golang.org/x/text v0.3.7 // indirect
139+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
140+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
141+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
142+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
143+
golang.org/x/text v0.3.8 // indirect
147144
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
148145
google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
149146
gopkg.in/errgo.v1 v1.0.1 // indirect
147+
gopkg.in/macaroon-bakery.v2 v2.1.0 // indirect
150148
gopkg.in/macaroon.v2 v2.1.0 // indirect
151149
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
152150
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)