loop: versioned MuSig2 HTLCs

.github/workflows/main.yml

@@ -20,7 +20,7 @@ env:
 
   # If you change this value, please change it in the following files as well:
   # /Dockerfile
-  GO_VERSION: 1.17
+  GO_VERSION: 1.19.2
 
 jobs:
   ########################
@@ -123,4 +123,4 @@ jobs:
           go-version: '~${{ env.GO_VERSION }}'
 
       - name: run unit tests
-        run: make unit
+        run: make unit

.travis.yml

@@ -13,7 +13,7 @@ git:
   depth: false
 
 go:
-  - "1.17.x"
+  - "1.19.2"
 
 env:
   global:

client_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/swap"
 	"github.com/lightninglabs/loop/test"
+	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/stretchr/testify/require"
@@ -285,6 +286,7 @@ func testLoopOutResume(t *testing.T, confs uint32, expired, preimageRevealed,
 
 	case swap.HtlcV3:
 		htlc, err = swap.NewHtlcV3(
+			input.MuSig2Version040,
 			pendingSwap.Contract.CltvExpiry, senderKey,
 			receiverKey, senderKey, receiverKey, hash,
 			&chaincfg.TestNet3Params,

go.mod

@@ -1,12 +1,13 @@
 module github.com/lightninglabs/loop
 
 require (
-	github.com/btcsuite/btcd v0.23.3
-	github.com/btcsuite/btcd/btcec/v2 v2.2.1
-	github.com/btcsuite/btcd/btcutil v1.1.2
+	github.com/btcsuite/btcd v0.23.5-0.20230125025938-be056b0a0b2f
+	github.com/btcsuite/btcd/btcec/v2 v2.3.2
+	github.com/btcsuite/btcd/btcutil v1.1.3
 	github.com/btcsuite/btcd/btcutil/psbt v1.1.5
-	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
+	github.com/btcsuite/btcwallet v0.16.6-0.20221208210930-6f3f55efb230
 	github.com/btcsuite/btcwallet/wtxmgr v1.5.0
 	github.com/coreos/bbolt v1.3.3
 	github.com/davecgh/go-spew v1.1.1
@@ -15,19 +16,19 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0
 	github.com/jessevdk/go-flags v1.4.0
 	github.com/lightninglabs/aperture v0.1.18-beta
-	github.com/lightninglabs/lndclient v0.15.1-5
+	github.com/lightninglabs/lndclient v0.16.0-8
 	github.com/lightninglabs/loop/swapserverrpc v1.0.1
 	github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
-	github.com/lightningnetwork/lnd v0.15.4-beta
-	github.com/lightningnetwork/lnd/cert v1.1.1
+	github.com/lightningnetwork/lnd v0.15.0-beta.rc6.0.20230206122140-0cf0a7dd3b08
+	github.com/lightningnetwork/lnd/cert v1.2.0
 	github.com/lightningnetwork/lnd/clock v1.1.0
 	github.com/lightningnetwork/lnd/queue v1.1.0
 	github.com/lightningnetwork/lnd/ticker v1.1.0
-	github.com/lightningnetwork/lnd/tor v1.0.1
-	github.com/stretchr/testify v1.7.1
+	github.com/lightningnetwork/lnd/tor v1.1.0
+	github.com/stretchr/testify v1.8.0
 	github.com/urfave/cli v1.22.9
-	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
-	google.golang.org/grpc v1.39.0
+	golang.org/x/net v0.4.0
+	google.golang.org/grpc v1.41.0
 	google.golang.org/protobuf v1.27.1
 	gopkg.in/macaroon-bakery.v2 v2.0.1
 	gopkg.in/macaroon.v2 v2.1.0

loopd/config.go

@@ -381,7 +381,7 @@ func loadCertWithCreate(cfg *Config) (tls.Certificate, *x509.Certificate,
 		!lnrpc.FileExists(cfg.TLSKeyPath) {
 
 		log.Infof("Generating TLS certificates...")
-		err := cert.GenCertPair(
+		certBytes, keyBytes, err := cert.GenCertPair(
 			defaultSelfSignedOrganization, cfg.TLSCertPath,
 			cfg.TLSKeyPath, cfg.TLSExtraIPs,
 			cfg.TLSExtraDomains, cfg.TLSDisableAutofill,
@@ -390,6 +390,14 @@ func loadCertWithCreate(cfg *Config) (tls.Certificate, *x509.Certificate,
 		if err != nil {
 			return tls.Certificate{}, nil, err
 		}
+
+		err = cert.WriteCertPair(
+			cfg.TLSCertPath, cfg.TLSKeyPath, certBytes, keyBytes,
+		)
+		if err != nil {
+			return tls.Certificate{}, nil, err
+		}
+
 		log.Infof("Done generating TLS certificates")
 	}
 

loopd/daemon.go

@@ -389,14 +389,26 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		perms.RequiredPermissions[endpoint] = perm
 	}
 
+	rks, db, err := lndclient.NewBoltMacaroonStore(
+		d.cfg.DataDir, "macarooons.db", loopdb.DefaultLoopDBTimeout,
+	)
+	if err != nil {
+		return err
+	}
+
+	cleanupMacaroonStore := func() {
+		err := db.Close()
+		if err != nil {
+			log.Errorf("Error closing macaroon store: %v", err)
+		}
+	}
+
 	if withMacaroonService {
 		// Start the macaroon service and let it create its default
 		// macaroon in case it doesn't exist yet.
 		d.macaroonService, err = lndclient.NewMacaroonService(
 			&lndclient.MacaroonServiceConfig{
-				DBPath:           d.cfg.DataDir,
-				DBFileName:       "macaroons.db",
-				DBTimeout:        loopdb.DefaultLoopDBTimeout,
+				RootKeyStore:     rks,
 				MacaroonLocation: loopMacaroonLocation,
 				MacaroonPath:     d.cfg.MacaroonPath,
 				Checkers: []macaroons.Checker{
@@ -410,13 +422,15 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			},
 		)
 		if err != nil {
+			cleanupMacaroonStore()
 			return err
 		}
 
 		if err = d.macaroonService.Start(); err != nil {
 			// The client is the only thing we started yet, so if we
 			// clean up its connection now, nothing else needs to be
 			// shut down at this point.
+			cleanupMacaroonStore()
 			clientCleanup()
 			return err
 		}
@@ -438,6 +452,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 	swapsList, err := d.impl.FetchSwaps()
 	if err != nil {
 		if d.macaroonService == nil {
+			cleanupMacaroonStore()
 			clientCleanup()
 			return err
 		}
@@ -449,6 +464,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			log.Errorf("Error shutting down macaroon service: %v",
 				err)
 		}
+		cleanupMacaroonStore()
 		clientCleanup()
 		return err
 	}
@@ -520,6 +536,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		// We need to shutdown before sending the error on the channel,
 		// otherwise a caller might exit the process too early.
 		d.stop()
+		cleanupMacaroonStore()
 		log.Info("Daemon exited")
 
 		// The caller expects exactly one message. So we send the error

loopd/run.go

@@ -27,7 +27,7 @@ var (
 	LoopMinRequiredLndVersion = &verrpc.Version{
 		AppMajor: 0,
 		AppMinor: 15,
-		AppPatch: 4,
+		AppPatch: 99,
 		BuildTags: []string{
 			"signrpc", "walletrpc", "chainrpc", "invoicesrpc",
 		},

loopin.go

@@ -18,7 +18,7 @@ import (
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/swap"
 	"github.com/lightningnetwork/lnd/chainntnfs"
-	"github.com/lightningnetwork/lnd/channeldb"
+	invpkg "github.com/lightningnetwork/lnd/invoices"
 	"github.com/lightningnetwork/lnd/lnrpc/invoicesrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
@@ -304,7 +304,7 @@ func awaitProbe(ctx context.Context, lnd lndclient.LndServices,
 			select {
 			case update := <-updateChan:
 				switch update.State {
-				case channeldb.ContractAccepted:
+				case invpkg.ContractAccepted:
 					log.Infof("Server probe successful")
 					probeResult <- nil
 
@@ -321,13 +321,13 @@ func awaitProbe(ctx context.Context, lnd lndclient.LndServices,
 
 					return
 
-				case channeldb.ContractCanceled:
+				case invpkg.ContractCanceled:
 					probeResult <- errors.New(
 						"probe invoice expired")
 
 					return
 
-				case channeldb.ContractSettled:
+				case invpkg.ContractSettled:
 					probeResult <- errors.New(
 						"impossible that probe " +
 							"invoice was settled")
@@ -870,7 +870,7 @@ func (s *loopInSwap) waitForSwapComplete(ctx context.Context,
 
 			switch update.State {
 			// Swap invoice was paid, so update server cost balance.
-			case channeldb.ContractSettled:
+			case invpkg.ContractSettled:
 				s.cost.Server -= update.AmtPaid
 
 				// If invoice settlement and htlc spend happen
@@ -891,7 +891,7 @@ func (s *loopInSwap) waitForSwapComplete(ctx context.Context,
 
 			// Canceled invoice has no effect on server cost
 			// balance.
-			case channeldb.ContractCanceled:
+			case invpkg.ContractCanceled:
 				invoiceFinalized = true
 			}
 
@@ -929,7 +929,7 @@ func (s *loopInSwap) processHtlcSpend(ctx context.Context,
 		// already settled. This means that the server didn't succeed in
 		// sweeping the htlc after paying the invoice.
 		err := s.lnd.Invoices.CancelInvoice(ctx, s.hash)
-		if err != nil && err != channeldb.ErrInvoiceAlreadySettled {
+		if err != nil && err != invpkg.ErrInvoiceAlreadySettled {
 			return err
 		}
 	}

loopin_test.go

@@ -11,7 +11,8 @@ import (
 	"github.com/lightninglabs/loop/swap"
 	"github.com/lightninglabs/loop/test"
 	"github.com/lightningnetwork/lnd/chainntnfs"
-	"github.com/lightningnetwork/lnd/channeldb"
+	"github.com/lightningnetwork/lnd/input"
+	invpkg "github.com/lightningnetwork/lnd/invoices"
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/stretchr/testify/require"
 )
@@ -116,7 +117,7 @@ func testLoopInSuccess(t *testing.T) {
 
 	// Server has already paid invoice before spending the htlc. Signal
 	// settled.
-	ctx.updateInvoiceState(49000, channeldb.ContractSettled)
+	ctx.updateInvoiceState(49000, invpkg.ContractSettled)
 
 	// Swap is expected to move to the state InvoiceSettled
 	ctx.assertState(loopdb.StateInvoiceSettled)
@@ -327,7 +328,7 @@ func testLoopInTimeout(t *testing.T, externalValue int64) {
 	<-ctx.lnd.FailInvoiceChannel
 
 	// Signal that the invoice was canceled.
-	ctx.updateInvoiceState(0, channeldb.ContractCanceled)
+	ctx.updateInvoiceState(0, invpkg.ContractCanceled)
 
 	ctx.assertState(loopdb.StateFailTimeout)
 	state := ctx.store.assertLoopInState(loopdb.StateFailTimeout)
@@ -459,6 +460,7 @@ func testLoopInResume(t *testing.T, state loopdb.SwapState, expired bool,
 
 	case swap.HtlcV3:
 		htlc, err = swap.NewHtlcV3(
+			input.MuSig2Version040,
 			contract.CltvExpiry, contract.SenderKey,
 			contract.ReceiverKey, contract.SenderKey,
 			contract.ReceiverKey, testPreimage.Hash(),
@@ -559,7 +561,7 @@ func testLoopInResume(t *testing.T, state loopdb.SwapState, expired bool,
 	// Server has already paid invoice before spending the htlc. Signal
 	// settled.
 	amtPaid := btcutil.Amount(49000)
-	ctx.updateInvoiceState(amtPaid, channeldb.ContractSettled)
+	ctx.updateInvoiceState(amtPaid, invpkg.ContractSettled)
 
 	// Swap is expected to move to the state InvoiceSettled
 	ctx.assertState(loopdb.StateInvoiceSettled)

loopin_testcontext_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/sweep"
 	"github.com/lightninglabs/loop/test"
-	"github.com/lightningnetwork/lnd/channeldb"
+	invpkg "github.com/lightningnetwork/lnd/invoices"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/stretchr/testify/require"
 )
@@ -75,7 +75,7 @@ func (c *loopInTestContext) assertSubscribeInvoice(hash lntypes.Hash) {
 
 // updateInvoiceState mocks an update to our swap invoice state.
 func (c *loopInTestContext) updateInvoiceState(amount btcutil.Amount,
-	state channeldb.ContractState) {
+	state invpkg.ContractState) {
 
 	c.swapInvoiceSubscription.Update <- lndclient.InvoiceUpdate{
 		AmtPaid: amount,
@@ -84,8 +84,8 @@ func (c *loopInTestContext) updateInvoiceState(amount btcutil.Amount,
 
 	// If we're in a final state, close our update channels as lndclient
 	// would.
-	if state == channeldb.ContractCanceled ||
-		state == channeldb.ContractSettled {
+	if state == invpkg.ContractCanceled ||
+		state == invpkg.ContractSettled {
 
 		close(c.swapInvoiceSubscription.Update)
 		close(c.swapInvoiceSubscription.Err)

loopout.go

@@ -1351,9 +1351,9 @@ func (s *loopOutSwap) createMuSig2SweepTxn(
 		return nil, err
 	}
 
-	var schnorrSenderKey, schnorrReceiverKey [32]byte
-	copy(schnorrSenderKey[:], s.SenderKey[1:])
-	copy(schnorrReceiverKey[:], s.ReceiverKey[1:])
+	signers := [][]byte{
+		s.SenderKey[1:], s.ReceiverKey[1:],
+	}
 
 	htlc, ok := s.htlc.HtlcScript.(*swap.HtlcScriptV3)
 	if !ok {
@@ -1363,9 +1363,8 @@ func (s *loopOutSwap) createMuSig2SweepTxn(
 	// Now we're creating a local MuSig2 session using the receiver key's
 	// key locator and the htlc's root hash.
 	musig2SessionInfo, err := s.lnd.Signer.MuSig2CreateSession(
-		ctx, &s.ClientKeyLocator,
-		[][32]byte{schnorrSenderKey, schnorrReceiverKey},
-		lndclient.MuSig2TaprootTweakOpt(htlc.RootHash[:], false),
+		ctx, input.MuSig2Version040, &s.ClientKeyLocator,
+		signers, lndclient.MuSig2TaprootTweakOpt(htlc.RootHash[:], false),
 	)
 	if err != nil {
 		return nil, err

server_mock_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/test"
-	"github.com/lightningnetwork/lnd/channeldb"
+	invpkg "github.com/lightningnetwork/lnd/invoices"
 	"github.com/lightningnetwork/lnd/lntypes"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/routing/route"
@@ -170,7 +170,7 @@ func (s *serverMock) NewLoopInSwap(_ context.Context, swapHash lntypes.Hash,
 	// cancel the probe payment.
 	probeSub := <-s.lnd.SingleInvoiceSubcribeChannel
 	probeSub.Update <- lndclient.InvoiceUpdate{
-		State: channeldb.ContractAccepted,
+		State: invpkg.ContractAccepted,
 	}
 	<-s.lnd.FailInvoiceChannel
 

swap.go

@@ -8,6 +8,7 @@ import (
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/swap"
+	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/lntypes"
 )
 
@@ -82,6 +83,7 @@ func GetHtlc(hash lntypes.Hash, contract *loopdb.SwapContract,
 
 	case swap.HtlcV3:
 		return swap.NewHtlcV3(
+			input.MuSig2Version040,
 			contract.CltvExpiry, contract.SenderKey,
 			contract.ReceiverKey, contract.SenderKey,
 			contract.ReceiverKey, hash,