mod+frdrpc: bump lnd version to v0.13.0-beta.rc2

Author: guggero

faraday.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/jessevdk/go-flags"
 	"github.com/lightninglabs/lndclient"
+	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/signal"
 
 	"github.com/lightninglabs/faraday/chain"
@@ -34,6 +35,14 @@ func Main() error {
 		os.Exit(0)
 	}
 
+	// Hook interceptor for os signals.
+	shutdownInterceptor, err := signal.Intercept()
+	if err != nil {
+		return err
+	}
+	logWriter := build.NewRotatingLogWriter()
+	SetupLoggers(logWriter, shutdownInterceptor)
+
 	if err := ValidateConfig(&config); err != nil {
 		return fmt.Errorf("error validating config: %v", err)
 	}
@@ -82,16 +91,13 @@ func Main() error {
 
 	server := frdrpc.NewRPCServer(cfg)
 
-	// Catch intercept signals, then start the server.
-	if err := signal.Intercept(); err != nil {
-		return err
-	}
+	// Start the server.
 	if err := server.Start(); err != nil {
 		return err
 	}
 
 	// Run until the user terminates.
-	<-signal.ShutdownChannel()
+	<-shutdownInterceptor.ShutdownChannel()
 	log.Infof("Received shutdown signal.")
 
 	if err := server.Stop(); err != nil {

frdrpc/macaroons.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/macaroons"
+	"github.com/lightningnetwork/lnd/rpcperms"
 	"google.golang.org/grpc"
 	"gopkg.in/macaroon-bakery.v2/bakery"
 )
@@ -154,15 +155,28 @@ func (s *RPCServer) stopMacaroonService() error {
 
 // macaroonInterceptor creates gRPC server options with the macaroon security
 // interceptors.
-func (s *RPCServer) macaroonInterceptor() []grpc.ServerOption {
-	unaryInterceptor := s.macaroonService.UnaryServerInterceptor(
-		RequiredPermissions,
-	)
-	streamInterceptor := s.macaroonService.StreamServerInterceptor(
-		RequiredPermissions,
-	)
+func (s *RPCServer) macaroonInterceptor() ([]grpc.ServerOption, error) {
+	interceptor := rpcperms.NewInterceptorChain(log, false)
+
+	err := interceptor.Start()
+	if err != nil {
+		return nil, err
+	}
+
+	interceptor.SetWalletUnlocked()
+	interceptor.AddMacaroonService(s.macaroonService)
+
+	for method, permissions := range RequiredPermissions {
+		err := interceptor.AddPermission(method, permissions)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	unaryInterceptor := interceptor.MacaroonUnaryServerInterceptor()
+	streamInterceptor := interceptor.MacaroonStreamServerInterceptor()
 	return []grpc.ServerOption{
 		grpc.UnaryInterceptor(unaryInterceptor),
 		grpc.StreamInterceptor(streamInterceptor),
-	}
+	}, nil
 }

frdrpc/rpcserver.go

@@ -179,7 +179,10 @@ func (s *RPCServer) Start() error {
 
 	// First we add the security interceptor to our gRPC server options that
 	// checks the macaroons for validity.
-	serverOpts := s.macaroonInterceptor()
+	serverOpts, err := s.macaroonInterceptor()
+	if err != nil {
+		return fmt.Errorf("error with macaroon interceptor: %v", err)
+	}
 
 	// Add our TLS configuration and then create our server instance. It's
 	// important that we let gRPC create the TLS listener and we don't just
@@ -190,7 +193,6 @@ func (s *RPCServer) Start() error {
 	s.grpcServer = grpc.NewServer(serverOpts...)
 
 	// Start the gRPC RPCServer listening for HTTP/2 connections.
-	var err error
 	log.Info("Starting gRPC listener")
 	s.rpcListener, err = net.Listen("tcp", s.cfg.RPCListen)
 	if err != nil {

go.mod

@@ -1,24 +1,26 @@
 module github.com/lightninglabs/faraday
 
 require (
-	github.com/btcsuite/btcd v0.21.0-beta.0.20201208033208-6bd4c64a54fa
+	github.com/btcsuite/btcd v0.21.0-beta.0.20210429225535-ce697fe7e82b
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
-	github.com/btcsuite/btcutil v1.0.2
-	github.com/golang/protobuf v1.3.3
-	github.com/google/go-cmp v0.3.1 // indirect
+	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
+	github.com/golang/protobuf v1.4.3
 	github.com/grpc-ecosystem/grpc-gateway v1.14.3
 	github.com/jessevdk/go-flags v1.4.0
-	github.com/lightninglabs/lndclient v0.11.0-5
-	github.com/lightninglabs/protobuf-hex-display v1.3.3-0.20191212020323-b444784ce75d
-	github.com/lightningnetwork/lnd v0.12.0-beta.rc5
+	github.com/lightninglabs/lndclient v0.11.0-8
+	github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
+	github.com/lightningnetwork/lnd v0.13.0-beta.rc2
 	github.com/lightningnetwork/lnd/cert v1.0.3
 	github.com/shopspring/decimal v1.2.0
-	github.com/stretchr/testify v1.5.1
+	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli v1.20.0
-	golang.org/x/text v0.3.2 // indirect
 	google.golang.org/grpc v1.29.1
 	gopkg.in/macaroon-bakery.v2 v2.0.1
 	gopkg.in/macaroon.v2 v2.1.0
 )
 
+// Fix incompatibility of etcd go.mod package.
+// See https://github.com/etcd-io/etcd/issues/11154
+replace go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20201125193152-8a03d2e9614b
+
 go 1.15