staticaddr: multi-address handling in ListUnspentRaw

Author: hieblmi

loopd/swapclient_server.go

@@ -1527,7 +1527,7 @@ func (s *swapClientServer) NewStaticAddress(ctx context.Context,
 	}
 
 	return &looprpc.NewStaticAddressResponse{
-		Address: staticAddress.String(),
+		Address: staticAddress,
 		Expiry:  uint32(expiry),
 	}, nil
 }
@@ -1539,13 +1539,17 @@ func (s *swapClientServer) ListUnspentDeposits(ctx context.Context,
 
 	// List all unspent utxos the wallet sees, regardless of the number of
 	// confirmations.
-	staticAddress, utxos, err := s.staticAddressManager.ListUnspentRaw(
+	utxos, err := s.staticAddressManager.ListUnspentRaw(
 		ctx, req.MinConfs, req.MaxConfs,
 	)
 	if err != nil {
 		return nil, err
 	}
 
+	if len(utxos) == 0 {
+		return &looprpc.ListUnspentDepositsResponse{}, nil
+	}
+
 	// ListUnspentRaw returns the unspent wallet view of the backing lnd
 	// wallet. It might be that deposits show up there that are actually
 	// not spendable because they already have been used but not yet spent
@@ -1593,7 +1597,7 @@ func (s *swapClientServer) ListUnspentDeposits(ctx context.Context,
 	}
 
 	// Any remaining outpoints in confirmedToCheck are ones that lnd knows
-	// about but we don't. These are new, unspent deposits.
+	// about, but we don't. These are new, unspent deposits.
 	for op := range confirmedToCheck {
 		isUnspent[op] = struct{}{}
 	}
@@ -1605,8 +1609,24 @@ func (s *swapClientServer) ListUnspentDeposits(ctx context.Context,
 			continue
 		}
 
+		params := s.staticAddressManager.GetParameters(u.PkScript)
+		if params == nil {
+			return nil, fmt.Errorf("unknown pkscript %x",
+				u.PkScript)
+		}
+
+		network, err := s.network.ChainParams()
+		if err != nil {
+			return nil, err
+		}
+
+		staticAddress, err := params.TaprootAddress(network)
+		if err != nil {
+			return nil, err
+		}
+
 		utxo := &looprpc.Utxo{
-			StaticAddress: staticAddress.String(),
+			StaticAddress: staticAddress,
 			AmountSat:     int64(u.Value),
 			Confirmations: u.Confirmations,
 			Outpoint:      u.OutPoint.String(),
@@ -1946,15 +1966,18 @@ func (s *swapClientServer) GetStaticAddressSummary(ctx context.Context,
 		return nil, err
 	}
 
-	address, err := s.staticAddressManager.GetTaprootAddress(
-		params.ClientPubkey, params.ServerPubkey, int64(params.Expiry),
-	)
+	network, err := s.network.ChainParams()
+	if err != nil {
+		return nil, err
+	}
+
+	address, err := params.TaprootAddress(network)
 	if err != nil {
 		return nil, err
 	}
 
 	return &looprpc.StaticAddressSummaryResponse{
-		StaticAddress:                  address.String(),
+		StaticAddress:                  address,
 		RelativeExpiryBlocks:           uint64(params.Expiry),
 		TotalNumDeposits:               uint32(totalNumDeposits),
 		ValueUnconfirmedSatoshis:       valueUnconfirmed,

loopd/swapclient_server_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/btcsuite/btclog/v2"
+	"github.com/lightninglabs/aperture/l402"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/fsm"
@@ -967,6 +968,7 @@ func (s *mockDepositStore) AllDeposits(_ context.Context) ([]*deposit.Deposit,
 func TestListUnspentDeposits(t *testing.T) {
 	ctx := context.Background()
 	mock := mock_lnd.NewMockLnd()
+	currentTokenMock := func() (*l402.Token, error) { return nil, nil }
 
 	// Prepare a single static address parameter set.
 	_, client := mock_lnd.CreateKey(1)
@@ -983,12 +985,23 @@ func TestListUnspentDeposits(t *testing.T) {
 
 	// Build an address manager using our mock lnd and fake address store.
 	addrMgr := address.NewManager(&address.ManagerConfig{
-		Store:       addrStore,
-		WalletKit:   mock.WalletKit,
-		ChainParams: mock.ChainParams,
-		// ChainNotifier and AddressClient are not needed for this test.
+		Store:         addrStore,
+		WalletKit:     mock.WalletKit,
+		ChainParams:   mock.ChainParams,
+		ChainNotifier: mock.ChainNotifier,
+		CurrentToken:  currentTokenMock,
 	}, 0)
 
+	initChan := make(chan struct{})
+	go addrMgr.Run(t.Context(), initChan)
+
+	select {
+	case <-initChan:
+	case <-t.Context().Done():
+		t.Fatalf("failed to initialize address manager: %v",
+			t.Context().Err())
+	}
+
 	// Construct several UTXOs with different confirmation counts.
 	makeUtxo := func(idx uint32, confs int64) *lnwallet.Utxo {
 		return &lnwallet.Utxo{
@@ -1041,6 +1054,7 @@ func TestListUnspentDeposits(t *testing.T) {
 			server := &swapClientServer{
 				staticAddressManager: addrMgr,
 				depositManager:       depMgr,
+				network:              lndclient.NetworkRegtest,
 			}
 
 			resp, err := server.ListUnspentDeposits(
@@ -1081,6 +1095,7 @@ func TestListUnspentDeposits(t *testing.T) {
 			server := &swapClientServer{
 				staticAddressManager: addrMgr,
 				depositManager:       depMgr,
+				network:              lndclient.NetworkRegtest,
 			}
 
 			resp, err := server.ListUnspentDeposits(
@@ -1111,6 +1126,7 @@ func TestListUnspentDeposits(t *testing.T) {
 		server := &swapClientServer{
 			staticAddressManager: addrMgr,
 			depositManager:       depMgr,
+			network:              lndclient.NetworkRegtest,
 		}
 
 		resp, err := server.ListUnspentDeposits(

staticaddr/address/interface.go

@@ -4,7 +4,12 @@ import (
 	"context"
 
 	"github.com/btcsuite/btcd/btcec/v2"
+	"github.com/btcsuite/btcd/btcec/v2/schnorr"
+	"github.com/btcsuite/btcd/btcutil"
+	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/lightninglabs/loop/staticaddr/script"
 	"github.com/lightninglabs/loop/staticaddr/version"
+	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/keychain"
 )
 
@@ -25,7 +30,7 @@ type Store interface {
 		error)
 }
 
-// Parameters holds all the necessary information for the 2-of-2 multisig
+// Parameters hold all the necessary information for the 2-of-2 multisig
 // address.
 type Parameters struct {
 	// ClientPubkey is the client's pubkey for the static address. It is
@@ -53,3 +58,24 @@ type Parameters struct {
 	// InitiationHeight is the height at which the address was initiated.
 	InitiationHeight int32
 }
+
+// TaprootAddress returns the taproot address of the static address.
+// Example: bc1phl46hgna56hfs0aykgccq29xl7z5z265vvs47lhfkkna749zmqyqa380nh.
+func (p *Parameters) TaprootAddress(network *chaincfg.Params) (string, error) {
+	staticAddress, err := script.NewStaticAddress(
+		input.MuSig2Version100RC2, int64(p.Expiry), p.ClientPubkey,
+		p.ServerPubkey,
+	)
+	if err != nil {
+		return "", err
+	}
+
+	tpAddress, err := btcutil.NewAddressTaproot(
+		schnorr.SerializePubKey(staticAddress.TaprootKey), network,
+	)
+	if err != nil {
+		return "", err
+	}
+
+	return tpAddress.String(), nil
+}