Merge pull request #476 from ellemouton/addJsonRegistrations

multi: add some litd client helpers

Author: guggero

itest/litd_mode_integrated_test.go

@@ -974,7 +974,7 @@ func bakeSuperMacaroon(cfg *LitNodeConfig, readOnly bool) (string, error) {
 	lndAdminCtx := macaroonContext(ctxt, lndAdminMacBytes)
 	lndConn := lnrpc.NewLightningClient(rawConn)
 
-	permsMgr, err := perms.NewManager()
+	permsMgr, err := perms.NewManager(false)
 	if err != nil {
 		return "", err
 	}

litclient/jsoncallbacks.go

@@ -0,0 +1,44 @@
+package litclient
+
+import (
+	"context"
+
+	"github.com/lightninglabs/faraday/frdrpc"
+	"github.com/lightninglabs/loop/looprpc"
+	"github.com/lightninglabs/pool/poolrpc"
+	"github.com/lightningnetwork/lnd/lnrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/autopilotrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/chainrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/signrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/verrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/watchtowerrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/wtclientrpc"
+	"google.golang.org/grpc"
+)
+
+// StubPackageRegistration defines the signature of a function that maps JSON
+// method URIs to the function that should be called to handle the method.
+type StubPackageRegistration func(map[string]func(context.Context,
+	*grpc.ClientConn, string, func(string, error)))
+
+// Registrations defines a list of StubPackageRegistrations that a lit client
+// will have access to when using Lit.
+var Registrations = []StubPackageRegistration{
+	lnrpc.RegisterLightningJSONCallbacks,
+	lnrpc.RegisterStateJSONCallbacks,
+	autopilotrpc.RegisterAutopilotJSONCallbacks,
+	chainrpc.RegisterChainNotifierJSONCallbacks,
+	invoicesrpc.RegisterInvoicesJSONCallbacks,
+	routerrpc.RegisterRouterJSONCallbacks,
+	signrpc.RegisterSignerJSONCallbacks,
+	verrpc.RegisterVersionerJSONCallbacks,
+	walletrpc.RegisterWalletKitJSONCallbacks,
+	watchtowerrpc.RegisterWatchtowerJSONCallbacks,
+	wtclientrpc.RegisterWatchtowerClientJSONCallbacks,
+	looprpc.RegisterSwapClientJSONCallbacks,
+	poolrpc.RegisterTraderJSONCallbacks,
+	frdrpc.RegisterFaradayServerJSONCallbacks,
+}

perms/permissions.go

@@ -135,8 +135,12 @@ type Manager struct {
 }
 
 // NewManager constructs a new Manager instance and collects any of the fixed
-// permissions.
-func NewManager() (*Manager, error) {
+// permissions. If withAllSubServers is true, then all the LND sub-server
+// permissions will be added to the available permissions set regardless of
+// whether LND was compiled with those sub-servers. If it is not set, however,
+// then OnLNDBuildTags can be used to specify the exact sub-servers that LND
+// was compiled with and then only the corresponding permissions will be added.
+func NewManager(withAllSubServers bool) (*Manager, error) {
 	permissions := make(map[subServerName]map[string][]bakery.Op)
 	permissions[faradayPerms] = faraday.RequiredPermissions
 	permissions[loopPerms] = loop.RequiredPermissions
@@ -166,8 +170,11 @@ func NewManager() (*Manager, error) {
 
 			// If this sub-server is one that we know is
 			// automatically compiled in LND then we add it to our
-			// map of active permissions.
-			if lndAutoCompiledSubServers[name] {
+			// map of active permissions. We also add the permission
+			// if withAllSubServers is true.
+			if withAllSubServers ||
+				lndAutoCompiledSubServers[name] {
+
 				permissions[lndPerms][key] = value
 			}
 		}

terminal.go

@@ -212,7 +212,7 @@ func (g *LightningTerminal) Run() error {
 	defer g.errQueue.Stop()
 
 	// Construct a new Manager.
-	g.permsMgr, err = perms.NewManager()
+	g.permsMgr, err = perms.NewManager(false)
 	if err != nil {
 		return fmt.Errorf("could not create permissions manager")
 	}