multi: prepare for upcoming lnd v0.14.0-beta release

Author: guggero

cmd/frcli/utils.go

@@ -235,7 +235,11 @@ func readMacaroon(macPath string) (grpc.DialOption, error) {
 	}
 
 	// Now we append the macaroon credentials to the dial options.
-	cred := macaroons.NewMacaroonCredential(constrainedMac)
+	cred, err := macaroons.NewMacaroonCredential(constrainedMac)
+	if err != nil {
+		return nil, fmt.Errorf("error creating macaroon credential: %v",
+			err)
+	}
 	return grpc.WithPerRPCCredentials(cred), nil
 }
 

config.go

@@ -30,6 +30,11 @@ const (
 	// By default we do not require connecting to a bitcoin node so that
 	// we can serve basic functionality by default.
 	defaultChainConn = false
+
+	// DefaultAutogenValidity is the default validity of a self-signed
+	// certificate. The value corresponds to 14 months
+	// (14 months * 30 days * 24 hours).
+	DefaultAutogenValidity = 14 * 30 * 24 * time.Hour
 )
 
 var (
@@ -353,7 +358,7 @@ func loadCertWithCreate(cfg *Config) (tls.Certificate, *x509.Certificate,
 			defaultSelfSignedOrganization, cfg.TLSCertPath,
 			cfg.TLSKeyPath, cfg.TLSExtraIPs,
 			cfg.TLSExtraDomains, cfg.TLSDisableAutofill,
-			cert.DefaultAutogenValidity,
+			DefaultAutogenValidity,
 		)
 		if err != nil {
 			return tls.Certificate{}, nil, err

frdrpc/macaroons.go

@@ -7,9 +7,11 @@ import (
 	"os"
 	"time"
 
+	"github.com/lightningnetwork/lnd/kvdb"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/macaroons"
 	"github.com/lightningnetwork/lnd/rpcperms"
+	"go.etcd.io/bbolt"
 	"google.golang.org/grpc"
 	"gopkg.in/macaroon-bakery.v2/bakery"
 )
@@ -95,11 +97,27 @@ var (
 // unlocks the macaroon database and creates the default macaroon if it doesn't
 // exist yet.
 func (s *RPCServer) startMacaroonService() error {
+	backend, err := kvdb.GetBoltBackend(&kvdb.BoltBackendConfig{
+		DBPath:     s.cfg.FaradayDir,
+		DBFileName: "macaroons.db",
+		DBTimeout:  macDatabaseOpenTimeout,
+	})
+	if err == bbolt.ErrTimeout {
+		return fmt.Errorf("error while trying to open %s/%s: "+
+			"timed out after %v when trying to obtain exclusive "+
+			"lock - make sure no other faraday daemon process "+
+			"(standalone or embedded in lightning-terminal) is "+
+			"running", s.cfg.FaradayDir, "macaroons.db",
+			macDatabaseOpenTimeout)
+	}
+	if err != nil {
+		return fmt.Errorf("unable to load macaroon db: %v", err)
+	}
+
 	// Create the macaroon authentication/authorization service.
-	var err error
 	s.macaroonService, err = macaroons.NewService(
-		s.cfg.FaradayDir, faradayMacaroonLocation, false,
-		macDatabaseOpenTimeout, macaroons.IPLockChecker,
+		backend, faradayMacaroonLocation, false,
+		macaroons.IPLockChecker,
 	)
 	if err != nil {
 		return fmt.Errorf("unable to set up macaroon authentication: "+
@@ -156,7 +174,7 @@ func (s *RPCServer) stopMacaroonService() error {
 // macaroonInterceptor creates gRPC server options with the macaroon security
 // interceptors.
 func (s *RPCServer) macaroonInterceptor() ([]grpc.ServerOption, error) {
-	interceptor := rpcperms.NewInterceptorChain(log, false)
+	interceptor := rpcperms.NewInterceptorChain(log, false, nil)
 
 	err := interceptor.Start()
 	if err != nil {

go.mod

@@ -1,18 +1,20 @@
 module github.com/lightninglabs/faraday
 
 require (
-	github.com/btcsuite/btcd v0.21.0-beta.0.20210513141527-ee5896bad5be
+	github.com/btcsuite/btcd v0.22.0-beta.0.20211005184431-e3449998be39
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
 	github.com/btcsuite/btcutil v1.0.3-0.20210527170813-e2ba6805a890
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
 	github.com/jessevdk/go-flags v1.4.0
-	github.com/lightninglabs/lndclient v0.13.0-9
+	github.com/lightninglabs/lndclient v0.14.0-2
 	github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
-	github.com/lightningnetwork/lnd v0.13.0-beta.rc5.0.20210802115842-44971f0c46c9
-	github.com/lightningnetwork/lnd/cert v1.0.3
+	github.com/lightningnetwork/lnd v0.13.0-beta.rc5.0.20211021015325-cac8da819ff9
+	github.com/lightningnetwork/lnd/cert v1.1.0
+	github.com/lightningnetwork/lnd/kvdb v1.2.0
 	github.com/shopspring/decimal v1.2.0
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli v1.20.0
+	go.etcd.io/bbolt v1.3.6
 	google.golang.org/grpc v1.38.0
 	google.golang.org/protobuf v1.26.0
 	gopkg.in/macaroon-bakery.v2 v2.0.1