Merge pull request #426 from lightninglabs/lnd-14

multi: bump lnd compile time dependency to v0.14.0-beta.rc1

Author: guggero

cmd/loop/main.go

@@ -434,6 +434,10 @@ 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
 }

go.mod

@@ -1,25 +1,26 @@
 module github.com/lightninglabs/loop
 
 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/btcsuite/btcwallet/wtxmgr v1.3.1-0.20210706234807-aaf03fee735a
+	github.com/btcsuite/btcwallet/wtxmgr v1.3.1-0.20210822222949-9b5a201c344c
 	github.com/coreos/bbolt v1.3.3
 	github.com/fortytw2/leaktest v1.3.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/lightninglabs/aperture v0.1.6-beta
-	github.com/lightninglabs/lndclient v0.12.0-13
+	github.com/lightninglabs/lndclient v0.14.0-3
 	github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
-	github.com/lightningnetwork/lnd v0.13.0-beta.rc5.0.20210728112744-ebabda671786
-	github.com/lightningnetwork/lnd/cert v1.0.3
-	github.com/lightningnetwork/lnd/clock v1.0.1
-	github.com/lightningnetwork/lnd/queue v1.0.4
-	github.com/lightningnetwork/lnd/ticker v1.0.0
+	github.com/lightningnetwork/lnd v0.14.0-beta.rc1
+	github.com/lightningnetwork/lnd/cert v1.1.0
+	github.com/lightningnetwork/lnd/clock v1.1.0
+	github.com/lightningnetwork/lnd/kvdb v1.2.0
+	github.com/lightningnetwork/lnd/queue v1.1.0
+	github.com/lightningnetwork/lnd/ticker v1.1.0
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli v1.20.0
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
+	golang.org/x/net v0.0.0-20210913180222-943fd674d43e
 	google.golang.org/grpc v1.38.0
 	google.golang.org/protobuf v1.26.0
 	gopkg.in/macaroon-bakery.v2 v2.0.1

go.sum

@@ -72,6 +72,11 @@ var (
 	DefaultMacaroonPath = filepath.Join(
 		LoopDirBase, DefaultNetwork, DefaultMacaroonFilename,
 	)
+
+	// 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
 )
 
 type lndConfig struct {
@@ -345,7 +350,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

loopd/config.go

@@ -16,6 +16,7 @@ import (
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/looprpc"
+	"github.com/lightningnetwork/lnd/kvdb"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/macaroons"
 	"google.golang.org/grpc"
@@ -85,6 +86,7 @@ type Daemon struct {
 	restCtxCancel func()
 
 	macaroonService *macaroons.Service
+	macaroonDB      kvdb.Backend
 }
 
 // New creates a new instance of the loop client daemon.

loopd/daemon.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/coreos/bbolt"
 	"github.com/lightninglabs/loop/loopdb"
+	"github.com/lightningnetwork/lnd/kvdb"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/macaroons"
 	"github.com/lightningnetwork/lnd/rpcperms"
@@ -151,18 +152,27 @@ var (
 // exist yet. If macaroons are disabled in general in the configuration, none of
 // these actions are taken.
 func (d *Daemon) startMacaroonService() error {
-	// Create the macaroon authentication/authorization service.
 	var err error
-	d.macaroonService, err = macaroons.NewService(
-		d.cfg.DataDir, loopMacaroonLocation, false,
-		loopdb.DefaultLoopDBTimeout, macaroons.IPLockChecker,
-	)
+	d.macaroonDB, err = kvdb.GetBoltBackend(&kvdb.BoltBackendConfig{
+		DBPath:     d.cfg.DataDir,
+		DBFileName: "macaroons.db",
+		DBTimeout:  loopdb.DefaultLoopDBTimeout,
+	})
+	if err != nil {
+		return fmt.Errorf("unable to load macaroon db: %v", err)
+	}
 	if err == bbolt.ErrTimeout {
 		return fmt.Errorf("%w: couldn't obtain exclusive lock on "+
 			"%s/%s, timed out after %v", bbolt.ErrTimeout,
 			d.cfg.DataDir, "macaroons.db",
 			loopdb.DefaultLoopDBTimeout)
 	}
+
+	// Create the macaroon authentication/authorization service.
+	d.macaroonService, err = macaroons.NewService(
+		d.macaroonDB, loopMacaroonLocation, false,
+		macaroons.IPLockChecker,
+	)
 	if err != nil {
 		return fmt.Errorf("unable to set up macaroon authentication: "+
 			"%v", err)
@@ -213,7 +223,18 @@ func (d *Daemon) startMacaroonService() error {
 
 // stopMacaroonService closes the macaroon database.
 func (d *Daemon) stopMacaroonService() error {
-	return d.macaroonService.Close()
+	var shutdownErr error
+	if err := d.macaroonService.Close(); err != nil {
+		log.Errorf("Error closing macaroon service: %v", err)
+		shutdownErr = err
+	}
+
+	if err := d.macaroonDB.Close(); err != nil {
+		log.Errorf("Error closing macaroon DB: %v", err)
+		shutdownErr = err
+	}
+
+	return shutdownErr
 }
 
 // macaroonInterceptor creates gRPC server options with the macaroon security
@@ -225,7 +246,7 @@ func (d *Daemon) macaroonInterceptor() ([]grpc.ServerOption, error) {
 		RequiredPermissions[endpoint] = perm
 	}
 
-	interceptor := rpcperms.NewInterceptorChain(log, false)
+	interceptor := rpcperms.NewInterceptorChain(log, false, nil)
 	err := interceptor.Start()
 	if err != nil {
 		return nil, err

loopd/macaroons.go

@@ -29,3 +29,5 @@ This file tracks release notes for the loop client.
 #### Bug Fixes
 
 #### Maintenance
+
+* Updated compile time dependencies of `lnd` to `v0.14.0-beta.rc1`.

release_notes.md

@@ -693,7 +693,7 @@ func getSwapServerConn(address, proxyAddress string, insecure bool,
 			address, proxyAddress)
 		torDialer := func(_ context.Context, addr string) (net.Conn, error) {
 			return tor.Dial(
-				addr, proxyAddress, false,
+				addr, proxyAddress, false, false,
 				tor.DefaultConnTimeout,
 			)
 		}

swap_server_client.go

@@ -13,6 +13,7 @@ import (
 	"github.com/btcsuite/btcwallet/wtxmgr"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightningnetwork/lnd/keychain"
+	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/lnwallet"
 	"github.com/lightningnetwork/lnd/lnwallet/chainfee"
 )
@@ -38,7 +39,7 @@ func (m *mockWalletKit) ListUnspent(ctx context.Context, minConfs,
 }
 
 func (m *mockWalletKit) LeaseOutput(ctx context.Context, lockID wtxmgr.LockID,
-	op wire.OutPoint) (time.Time, error) {
+	op wire.OutPoint, duration time.Duration) (time.Time, error) {
 
 	return time.Now(), nil
 }
@@ -161,3 +162,12 @@ func (m *mockWalletKit) BumpFee(context.Context, wire.OutPoint,
 
 	return nil
 }
+
+// ListAccounts retrieves all accounts belonging to the wallet by default.
+// Optional name and addressType can be provided to filter through all of the
+// wallet accounts and return only those matching.
+func (m *mockWalletKit) ListAccounts(context.Context, string,
+	walletrpc.AddressType) ([]*walletrpc.Account, error) {
+
+	return nil, nil
+}