Merge pull request #172 from lightninglabs/lnd-12

Add lnd v0.12.0-beta compatibility, allow single macaroon

Author: guggero

app/src/types/generated/lnd_pb.d.ts

@@ -97,6 +97,9 @@ export const lndChannel: LND.Channel.AsObject = {
       amount: 498730,
       hashLock: 'pl8fmsyoSqEQFQCw6Zu9e1aIlFnMz5H+hW2mmh3kRlI=',
       expirationHeight: 285,
+      htlcIndex: 0,
+      forwardingChannel: 124244814004224,
+      forwardingHtlcIndex: 0,
     },
   ],
   csvDelay: 1802,

app/src/types/generated/lnd_pb.js

@@ -8,6 +8,7 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 
@@ -171,7 +172,14 @@ type RemoteDaemonConfig struct {
 
 	// MacaroonDir is the directory that contains all the macaroon files
 	// required for the remote connection.
-	MacaroonDir string `long:"macaroondir" description:"The directory containing all lnd macaroons to use for the remote connection."`
+	MacaroonDir string `long:"macaroondir" description:"DEPRECATED: Use macaroonpath. The directory containing all lnd macaroons to use for the remote connection."`
+
+	// MacaroonPath is the path to the single macaroon that should be used
+	// instead of needing to specify the macaroon directory that contains
+	// all of lnd's macaroons. The specified macaroon MUST have all
+	// permissions that all the subservers use, otherwise permission errors
+	// will occur.
+	MacaroonPath string `long:"macaroonpath" description:"The full path to the single macaroon to use, either the admin.macaroon or a custom baked one. Cannot be specified at the same time as macaroondir. A custom macaroon must contain ALL permissions required for all subservers to work, otherwise permission errors will occur."`
 
 	// TLSCertPath is the path to the tls cert of the remote daemon that
 	// should be used to verify the TLS identity of the remote RPC server.
@@ -186,10 +194,24 @@ func (c *Config) lndConnectParams() (string, lndclient.Network, string, string,
 	// In remote lnd mode, we just pass along what was configured in the
 	// remote section of the lnd config.
 	if c.LndMode == ModeRemote {
+		// Because we now have the option to specify a single, custom
+		// macaroon to the lndclient, we either use the single macaroon
+		// indicated by the user or the admin macaroon from the mac dir
+		// that was specified.
+		macPath := path.Join(
+			lncfg.CleanAndExpandPath(c.Remote.Lnd.MacaroonDir),
+			defaultLndMacaroon,
+		)
+		if c.Remote.Lnd.MacaroonPath != "" {
+			macPath = lncfg.CleanAndExpandPath(
+				c.Remote.Lnd.MacaroonPath,
+			)
+		}
+
 		return c.Remote.Lnd.RPCServer,
 			lndclient.Network(c.network),
 			lncfg.CleanAndExpandPath(c.Remote.Lnd.TLSCertPath),
-			lncfg.CleanAndExpandPath(c.Remote.Lnd.MacaroonDir), nil
+			macPath, nil
 	}
 
 	// When we start lnd internally, we take the listen address as
@@ -211,7 +233,7 @@ func (c *Config) lndConnectParams() (string, lndclient.Network, string, string,
 	}
 
 	return lndDialAddr, lndclient.Network(c.network),
-		c.Lnd.TLSCertPath, filepath.Dir(c.Lnd.AdminMacPath), nil
+		c.Lnd.TLSCertPath, c.Lnd.AdminMacPath, nil
 }
 
 // defaultConfig returns a configuration struct with all default values set.
@@ -442,6 +464,15 @@ func validateRemoteModeConfig(cfg *Config) error {
 	}
 	cfg.network = r.Lnd.Network
 
+	// Users can either specify the macaroon directory or the custom
+	// macaroon to use, but not both.
+	if r.Lnd.MacaroonDir != defaultRemoteLndMacDir &&
+		r.Lnd.MacaroonPath != "" {
+
+		return fmt.Errorf("cannot set both macaroon dir and macaroon " +
+			"path")
+	}
+
 	// If the remote lnd's network isn't the default, we also check if we
 	// need to adjust the default macaroon directory so the user can only
 	// specify --network=testnet for example if everything else is using

app/src/types/generated/lnd_pb_service.d.ts

@@ -19,12 +19,9 @@ directory on your remote machine to `/some/folder/with/lnd/data/` on your local
 
 - tls.cert
 - admin.macaroon
-- chainnotifier.macaroon
-- invoices.macaroon
-- readonly.macaroon
-- router.macaroon
-- signer.macaroon
-- walletkit.macaroon
+
+(Note that with LiT prior to `v0.3.5-alpha` all `*.macaroon` files need to be
+copied from the lnd machine.)
 
 Create a `lit.conf` file. The default location LiT will look for the configuration file
 depends on your operating system:
@@ -38,7 +35,7 @@ creating `lit.conf` populate it with the following configuration settings:
 
 ```text
 remote.lnd.rpcserver=<externally-reachable-ip-address>:10009
-remote.lnd.macaroondir=/some/folder/with/lnd/data
+remote.lnd.macaroonpath=/some/folder/with/lnd/data/admin.macaroon
 remote.lnd.tlscertpath=/some/folder/with/lnd/data/tls.cert
 ```
 
@@ -95,7 +92,7 @@ and `faraday` (optional):
   --remote.lit-debuglevel=debug \
   --remote.lnd.network=testnet \
   --remote.lnd.rpcserver=some-other-host:10009 \
-  --remote.lnd.macaroondir=/some/folder/with/lnd/data \
+  --remote.lnd.macaroonpath=/some/folder/with/lnd/data/admin.macaroon \
   --remote.lnd.tlscertpath=/some/folder/with/lnd/data/tls.cert \
   --loop.loopoutmaxparts=5 \
   --pool.newnodesonly=true \
@@ -106,12 +103,6 @@ and `faraday` (optional):
   --faraday.bitcoin.password=testnetpw
 ```
 
-NOTE: Even though LiT itself only needs `lnd`'s `admin.macaroon`, the `loop`,
-`pool`, and `faraday` daemons will require other macaroons and will look for
-them in the folder specified with `--remote.lnd.macaroondir`. It is advised to
-copy all `*.macaroon` files and the `tls.cert` file from the remote host to the
-host that is running `litd`.
-
 ## Use a configuration file
 
 You can also store the configuration in a persistent `~/.lit/lit.conf` file, so you do not
@@ -151,7 +142,7 @@ remote.lit-debuglevel=debug
 # Remote lnd options
 remote.lnd.network=testnet
 remote.lnd.rpcserver=some-other-host:10009
-remote.lnd.macaroondir=/some/folder/with/lnd/data
+remote.lnd.macaroonpath=/some/folder/with/lnd/data/admin.macaroon
 remote.lnd.tlscertpath=/some/folder/with/lnd/data/tls.cert
 
 # Loop
@@ -192,7 +183,7 @@ lit-dir=~/.lit
 
 remote.lnd.network=testnet
 remote.lnd.rpcserver=some-other-host:10009
-remote.lnd.macaroondir=/some/folder/with/lnd/data
+remote.lnd.macaroonpath=/some/folder/with/lnd/data/admin.macaroon
 remote.lnd.tlscertpath=/some/folder/with/lnd/data/tls.cert
 ```
 

app/src/types/generated/lnd_pb_service.js

@@ -7,12 +7,12 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway v1.14.6
 	github.com/improbable-eng/grpc-web v0.12.0
 	github.com/jessevdk/go-flags v1.4.0
-	github.com/lightninglabs/aperture v0.1.3-beta
-	github.com/lightninglabs/faraday v0.2.2-alpha
-	github.com/lightninglabs/lndclient v0.11.0-3
-	github.com/lightninglabs/loop v0.11.2-beta
-	github.com/lightninglabs/pool v0.3.4-alpha
-	github.com/lightningnetwork/lnd v0.11.1-beta
+	github.com/lightninglabs/aperture v0.1.5-beta
+	github.com/lightninglabs/faraday v0.2.3-alpha
+	github.com/lightninglabs/lndclient v0.11.0-5
+	github.com/lightninglabs/loop v0.11.2-beta.0.20210114072419-d85cc010b0d4
+	github.com/lightninglabs/pool v0.4.2-alpha.0.20210125123142-33fcaed7a613
+	github.com/lightningnetwork/lnd v0.12.0-beta.rc5
 	github.com/lightningnetwork/lnd/cert v1.0.3
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
 	github.com/mwitkow/grpc-proxy v0.0.0-20181017164139-0f1106ef9c76