staticaddr: remove GetStaticAddress and GetStaticAddressParameters

Author: hieblmi

loopd/daemon.go

@@ -677,7 +677,6 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		LndClient:                            d.lnd.Client,
 		InvoicesClient:                       d.lnd.Invoices,
 		NodePubkey:                           d.lnd.NodePubkey,
-		AddressManager:                       staticAddressManager,
 		DepositManager:                       depositManager,
 		Store:                                staticAddressLoopInStore,
 		WalletKit:                            d.lnd.WalletKit,

loopd/swapclient_server.go

@@ -931,24 +931,13 @@ func (s *swapClientServer) GetLoopInQuote(ctx context.Context,
 				"deposits: %w", err)
 		}
 
-		// TODO(hieblmi): add params to deposit for multi-address
-		//      support.
-		params, err := s.staticAddressManager.GetStaticAddressParameters(
-			ctx,
-		)
-		if err != nil {
-			return nil, fmt.Errorf("unable to retrieve static "+
-				"address parameters: %w", err)
-		}
-
 		info, err := s.lnd.Client.GetInfo(ctx)
 		if err != nil {
 			return nil, fmt.Errorf("unable to get lnd info: %w",
 				err)
 		}
 		selectedDeposits, err := loopin.SelectDeposits(
-			selectedAmount, deposits, params.Expiry,
-			info.BlockHeight,
+			selectedAmount, deposits, info.BlockHeight,
 		)
 		if err != nil {
 			return nil, fmt.Errorf("unable to select deposits: %w",
@@ -1792,6 +1781,11 @@ func (s *swapClientServer) ListStaticAddressDeposits(ctx context.Context,
 		return nil, err
 	}
 
+	lndInfo, err := s.lnd.Client.GetInfo(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	// Deposits filtered by state or outpoints.
 	var filteredDeposits []*looprpc.Deposit
 	if len(outpoints) > 0 {
@@ -1803,7 +1797,7 @@ func (s *swapClientServer) ListStaticAddressDeposits(ctx context.Context,
 			}
 			return false
 		}
-		filteredDeposits = filter(allDeposits, network, f)
+		filteredDeposits = filter(allDeposits, network, lndInfo, f)
 
 		if len(outpoints) != len(filteredDeposits) {
 			return nil, fmt.Errorf("not all outpoints found in " +
@@ -1819,7 +1813,7 @@ func (s *swapClientServer) ListStaticAddressDeposits(ctx context.Context,
 
 			return d.IsInState(toServerState(req.StateFilter))
 		}
-		filteredDeposits = filter(allDeposits, network, f)
+		filteredDeposits = filter(allDeposits, network, lndInfo, f)
 	}
 
 	// Calculate the blocks until expiry for each deposit.
@@ -1912,13 +1906,6 @@ func (s *swapClientServer) ListStaticAddressSwaps(ctx context.Context,
 		return nil, err
 	}
 
-	addrParams, err := s.staticAddressManager.GetStaticAddressParameters(
-		ctx,
-	)
-	if err != nil {
-		return nil, err
-	}
-
 	// Fetch all deposits at once and index them by swap hash for a quick
 	// lookup.
 	allDeposits, err := s.depositManager.GetAllDeposits(ctx)
@@ -1957,7 +1944,7 @@ func (s *swapClientServer) ListStaticAddressSwaps(ctx context.Context,
 			for _, d := range ds {
 				state := toClientDepositState(d.GetState())
 				blocksUntilExpiry := d.ConfirmationHeight +
-					int64(addrParams.Expiry) -
+					int64(d.AddressParams.Expiry) -
 					int64(lndInfo.BlockHeight)
 
 				pd := &looprpc.Deposit{
@@ -2102,7 +2089,7 @@ func (s *swapClientServer) GetStaticAddressSummary(ctx context.Context,
 		}
 	}
 
-	deprecatedParams, err := s.staticAddressManager.GetStaticAddressParameters(ctx)
+	deprecatedParams, err := s.staticAddressManager.GetLegacyParameters(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -2186,8 +2173,19 @@ func (s *swapClientServer) StaticAddressLoopIn(ctx context.Context,
 	}
 
 	// Build a list of used deposits for the response.
+	network, err := s.network.ChainParams()
+	if err != nil {
+		return nil, err
+	}
+
+	lndInfo, err := s.lnd.Client.GetInfo(ctx)
+	if err != nil {
+		return nil, err
+	}
+
 	usedDeposits := filter(
-		loopIn.Deposits, func(d *deposit.Deposit) bool { return true },
+		loopIn.Deposits, network, lndInfo,
+		func(d *deposit.Deposit) bool { return true },
 	)
 
 	err = s.populateBlocksUntilExpiry(ctx, usedDeposits)
@@ -2240,14 +2238,10 @@ func (s *swapClientServer) populateBlocksUntilExpiry(ctx context.Context,
 	}
 
 	bestBlockHeight := int64(lndInfo.BlockHeight)
-	params, err := s.staticAddressManager.GetStaticAddressParameters(ctx)
-	if err != nil {
-		return err
-	}
 	for i := 0; i < len(deposits); i++ {
 		deposits[i].BlocksUntilExpiry =
 			deposits[i].ConfirmationHeight +
-				int64(params.Expiry) - bestBlockHeight
+				deposits[i].BlocksUntilExpiry - bestBlockHeight
 	}
 	return nil
 }
@@ -2284,7 +2278,7 @@ func (s *swapClientServer) StaticOpenChannel(ctx context.Context,
 type filterFunc func(deposits *deposit.Deposit) bool
 
 func filter(deposits []*deposit.Deposit, network *chaincfg.Params,
-	f filterFunc) []*looprpc.Deposit {
+	lndInfo *lndclient.Info, f filterFunc) []*looprpc.Deposit {
 
 	var clientDeposits []*looprpc.Deposit
 	for _, d := range deposits {
@@ -2310,6 +2304,9 @@ func filter(deposits []*deposit.Deposit, network *chaincfg.Params,
 			ConfirmationHeight: d.ConfirmationHeight,
 			SwapHash:           swapHash,
 			StaticAddress:      staticAddr,
+			BlocksUntilExpiry: d.ConfirmationHeight +
+				int64(d.AddressParams.Expiry) -
+				int64(lndInfo.BlockHeight),
 		}
 
 		clientDeposits = append(clientDeposits, deposit)

loopd/swapclient_server_test.go

@@ -957,6 +957,12 @@ func (s *mockAddressStore) GetAllStaticAddresses(_ context.Context) (
 	return s.params, nil
 }
 
+func (s *mockAddressStore) GetLegacyParameters(_ context.Context) (
+	*address.Parameters, error) {
+
+	return s.params[0], nil
+}
+
 // mockDepositStore implements deposit.Store minimally for DepositsForOutpoints.
 type mockDepositStore struct {
 	byOutpoint map[string]*deposit.Deposit

loopdb/sqlc/querier.go

@@ -24,4 +24,10 @@ INSERT INTO static_addresses (
              $6,
              $7,
              $8
-         );
+         );
+
+-- name: GetLegacyAddress :one
+SELECT * FROM static_addresses
+ORDER BY id ASC
+LIMIT 1;
+

loopdb/sqlc/queries/static_addresses.sql

@@ -25,8 +25,11 @@ type Store interface {
 	GetStaticAddressID(ctx context.Context, pkScript []byte) (int32, error)
 
 	// GetAllStaticAddresses retrieves all static addresses from the store.
-	GetAllStaticAddresses(ctx context.Context) ([]*Parameters,
-		error)
+	GetAllStaticAddresses(ctx context.Context) ([]*Parameters, error)
+
+	// GetLegacyParameters retrieves the parameters of the legacy static
+	// address.
+	GetLegacyParameters(ctx context.Context) (*Parameters, error)
 }
 
 // Parameters hold all the necessary information for the 2-of-2 multisig

loopdb/sqlc/static_addresses.sql.go

@@ -3,7 +3,6 @@ package address
 import (
 	"context"
 	"errors"
-	"fmt"
 	"sync/atomic"
 
 	"github.com/btcsuite/btcd/btcec/v2"
@@ -348,20 +347,17 @@ func (m *Manager) ListUnspentRaw(ctx context.Context, minConfs,
 	return resultList, nil
 }
 
-// GetStaticAddressParameters returns the parameters of the static address.
-func (m *Manager) GetStaticAddressParameters(ctx context.Context) (*Parameters,
+// GetLegacyParameters returns the first address parameters that were created
+// under this L402.
+func (m *Manager) GetLegacyParameters(ctx context.Context) (*Parameters,
 	error) {
 
-	params, err := m.cfg.Store.GetAllStaticAddresses(ctx)
+	params, err := m.cfg.Store.GetLegacyParameters(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	if len(params) == 0 {
-		return nil, fmt.Errorf("no static address parameters found")
-	}
-
-	return params[0], nil
+	return params, nil
 }
 
 func (m *Manager) GetParameters(pkScript []byte) *Parameters {
@@ -374,25 +370,11 @@ func (m *Manager) GetStaticAddressID(ctx context.Context,
 	return m.cfg.Store.GetStaticAddressID(ctx, pkScript)
 }
 
-// GetStaticAddress returns a taproot address for the given client and server
-// public keys and expiry.
-func (m *Manager) GetStaticAddress(ctx context.Context) (*script.StaticAddress,
-	error) {
-
-	params, err := m.GetStaticAddressParameters(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	address, err := script.NewStaticAddress(
-		input.MuSig2Version100RC2, int64(params.Expiry),
-		params.ClientPubkey, params.ServerPubkey,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	return address, nil
+// IsOurPkScript returns true if the given pkScript is one of our active
+// static addresses.
+func (m *Manager) IsOurPkScript(pkScript []byte) bool {
+	_, ok := m.activeStaticAddresses[string(pkScript)]
+	return ok
 }
 
 // ListUnspent returns a list of utxos at the static address.

staticaddr/address/interface.go

@@ -74,6 +74,22 @@ func (s *SqlStore) GetAllStaticAddresses(ctx context.Context) ([]*Parameters,
 	return result, nil
 }
 
+// GetLegacyParameters returns all address known to the server.
+func (s *SqlStore) GetLegacyParameters(ctx context.Context) (*Parameters,
+	error) {
+
+	legacyAddress, err := s.baseDB.Queries.GetLegacyAddress(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	res, err := s.toAddressParameters(legacyAddress)
+	if err != nil {
+		return nil, err
+	}
+	return res, nil
+}
+
 // Close closes the database connection.
 func (s *SqlStore) Close() {
 	s.baseDB.DB.Close()

staticaddr/address/manager.go

@@ -65,25 +65,25 @@ func (f *FSM) PublishDepositExpirySweepAction(ctx context.Context,
 
 	prevOut := []*wire.TxOut{txOut}
 
-	signDesc, err := f.SignDescriptor(ctx)
+	addressScript, err := f.deposit.GetStaticAddressScript()
 	if err != nil {
 		return f.HandleError(err)
 	}
 
-	rawSigs, err := f.cfg.Signer.SignOutputRaw(
-		ctx, msgTx, []*lndclient.SignDescriptor{signDesc}, prevOut,
-	)
+	signDesc, err := f.SignDescriptor(addressScript)
 	if err != nil {
 		return f.HandleError(err)
 	}
 
-	address, err := f.cfg.AddressManager.GetStaticAddress(ctx)
+	rawSigs, err := f.cfg.Signer.SignOutputRaw(
+		ctx, msgTx, []*lndclient.SignDescriptor{signDesc}, prevOut,
+	)
 	if err != nil {
 		return f.HandleError(err)
 	}
 
 	sig := rawSigs[0]
-	msgTx.TxIn[0].Witness, err = address.GenTimeoutWitness(sig)
+	msgTx.TxIn[0].Witness, err = addressScript.GenTimeoutWitness(sig)
 	if err != nil {
 		return f.HandleError(err)
 	}