WIP: Htlc v3 taproot

client.go

@@ -9,7 +9,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcd/btcutil"
 	"github.com/lightninglabs/aperture/lsat"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/loopdb"
@@ -405,9 +405,9 @@ func (s *Client) LoopOut(globalCtx context.Context,
 	// Return hash so that the caller can identify this swap in the updates
 	// stream.
 	return &LoopOutSwapInfo{
-		SwapHash:         swap.hash,
-		HtlcAddressP2WSH: swap.htlc.Address,
-		ServerMessage:    initResult.serverMessage,
+		SwapHash:        swap.hash,
+		HtlcAddressP2TR: swap.htlc.Address,
+		ServerMessage:   initResult.serverMessage,
 	}, nil
 }
 

client_test.go

@@ -7,9 +7,9 @@ import (
 	"errors"
 	"testing"
 
+	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
-	"github.com/btcsuite/btcutil"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/loopdb"
 	"github.com/lightninglabs/loop/swap"
@@ -216,12 +216,10 @@ func testResume(t *testing.T, confs uint32, expired, preimageRevealed,
 	}
 
 	_, senderPubKey := test.CreateKey(1)
-	var senderKey [33]byte
-	copy(senderKey[:], senderPubKey.SerializeCompressed())
+	senderKey := senderPubKey.SerializeCompressed()
 
 	_, receiverPubKey := test.CreateKey(2)
-	var receiverKey [33]byte
-	copy(receiverKey[:], receiverPubKey.SerializeCompressed())
+	receiverKey := receiverPubKey.SerializeCompressed()
 
 	update := loopdb.LoopEvent{
 		SwapStateData: loopdb.SwapStateData{

cmd/loop/loopout.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcd/btcutil"
 	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/labels"
 	"github.com/lightninglabs/loop/loopdb"

cmd/loop/main.go

@@ -22,7 +22,7 @@ import (
 	"github.com/lightningnetwork/lnd/lncfg"
 	"github.com/lightningnetwork/lnd/macaroons"
 
-	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcd/btcutil"
 
 	"github.com/urfave/cli"
 	"google.golang.org/grpc"

cmd/loop/terms.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/btcsuite/btcutil"
+	"github.com/btcsuite/btcd/btcutil"
 	"github.com/lightninglabs/loop/looprpc"
 	"github.com/urfave/cli"
 )

go.mod

@@ -1,29 +1,34 @@
 module github.com/lightninglabs/loop
 
 require (
-	github.com/btcsuite/btcd v0.22.0-beta.0.20211005184431-e3449998be39
+	github.com/btcsuite/btcd v0.22.0-beta.0.20220316175102-8d5c75c28923
+	github.com/btcsuite/btcd/btcec/v2 v2.1.3
+	github.com/btcsuite/btcd/btcutil v1.1.1
+	// github.com/btcsuite/btcd/txscript v1.1.0
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
 	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.20210822222949-9b5a201c344c
+	github.com/btcsuite/btcwallet/wtxmgr v1.5.0
 	github.com/coreos/bbolt v1.3.3
 	github.com/davecgh/go-spew v1.1.1
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1
 	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.14.2-3
 	github.com/lightninglabs/loop/swapserverrpc v1.0.0
 	github.com/lightninglabs/protobuf-hex-display v1.4.3-hex-display
-	github.com/lightningnetwork/lnd v0.14.2-beta
-	github.com/lightningnetwork/lnd/cert v1.1.0
+	github.com/lightningnetwork/lnd v0.14.2-beta.rc1
+	github.com/lightningnetwork/lnd/cert v1.1.1
 	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.0
 	github.com/stretchr/testify v1.7.0
 	github.com/urfave/cli v1.22.4
-	golang.org/x/net v0.0.0-20210913180222-943fd674d43e
-	google.golang.org/grpc v1.38.0
-	google.golang.org/protobuf v1.26.0
+	golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f
+	google.golang.org/grpc v1.39.0
+	google.golang.org/protobuf v1.27.1
 	gopkg.in/macaroon-bakery.v2 v2.0.1
 	gopkg.in/macaroon.v2 v2.1.0
 )
@@ -32,5 +37,8 @@ go 1.15
 
 replace github.com/lightninglabs/loop/swapserverrpc => ./swapserverrpc
 
-// TODO(bhandras): remove once v0.14.3-beta or v0.15.0-beta is tagged.
-replace github.com/lightningnetwork/lnd => github.com/lightningnetwork/lnd v0.14.1-beta.0.20220131141659-60625b6c1a0b
+replace github.com/lightningnetwork/lnd => github.com/guggero/lnd v0.11.0-beta.rc4.0.20220322204826-af4562a8b1b2
+
+replace github.com/lightninglabs/lndclient => github.com/lightninglabs/lndclient v1.0.1-0.20220316193259-eeb62a615ee6
+
+replace github.com/lightninglabs/aperture => github.com/positiveblue/aperture v0.1.17-beta.0.20220311010926-8edab73a0ccc