staticaddr: validate per-deposit quote expiry

Author: hieblmi

loopd/swapclient_server.go

@@ -1185,11 +1185,16 @@ func (s *swapClientServer) GetLoopInQuote(ctx context.Context,
 			)
 		}
 
-		err = validateStaticQuoteDepositsSwappable(
-			depositList.FilteredDeposits, staticAddrExpiry,
-			currentHeight,
+		selectedDeposits, err := s.depositManager.DepositsForOutpoints(
+			ctx, req.DepositOutpoints, false,
 		)
 		if err != nil {
+			return nil, fmt.Errorf("unable to retrieve selected "+
+				"deposits: %w", err)
+		}
+		if err := loopin.ValidateDepositsSwappable(
+			selectedDeposits, currentHeight,
+		); err != nil {
 			return nil, err
 		}
 
@@ -2834,29 +2839,6 @@ func depositBlocksUntilExpiry(confirmationHeight int64, expiry uint32,
 	return confirmationHeight + int64(expiry) - bestBlockHeight
 }
 
-// validateStaticQuoteDepositsSwappable rejects manual quote deposits that are
-// too close to expiry for the server's static-address loop-in HTLC timeout.
-func validateStaticQuoteDepositsSwappable(deposits []*looprpc.Deposit,
-	csvExpiry uint32, blockHeight uint32) error {
-
-	for _, deposit := range deposits {
-		if deposit.ConfirmationHeight <= 0 {
-			continue
-		}
-
-		confirmationHeight := uint32(deposit.ConfirmationHeight)
-		swappable := loopin.IsSwappable(
-			confirmationHeight, blockHeight, csvExpiry,
-		)
-		if !swappable {
-			return fmt.Errorf("deposit %s expires before htlc",
-				deposit.Outpoint)
-		}
-	}
-
-	return nil
-}
-
 // StaticOpenChannel initiates an open channel request using static address
 // deposits.
 func (s *swapClientServer) StaticOpenChannel(ctx context.Context,

loopd/swapclient_server_staticaddr_test.go

@@ -382,7 +382,7 @@ func TestValidateStaticAddressSendCoinsRequest(t *testing.T) {
 func TestNewStaticAddressFundsGeneratedAddress(t *testing.T) {
 	t.Parallel()
 
-	addrMgr, lnd := newTestStaticAddressContext(t)
+	addrMgr, lnd := newTestStaticAddressContext(t, 10)
 	rawClient := &sendCoinsRPCClient{
 		response: &lnrpc.SendCoinsResponse{Txid: "funding-txid"},
 	}
@@ -422,7 +422,7 @@ func TestStaticAddressForDeposit(t *testing.T) {
 	t.Parallel()
 
 	ctx := context.Background()
-	addrMgr, lnd := newTestStaticAddressContext(t)
+	addrMgr, lnd := newTestStaticAddressContext(t, 10)
 	server := &swapClientServer{
 		staticAddressManager: addrMgr,
 		lnd:                  &lnd.LndServices,
@@ -503,7 +503,7 @@ func TestListStaticAddressDepositsReturnsVisibleDeposits(t *testing.T) {
 func TestStaticAddressWithdrawalIncludesDepositAddress(t *testing.T) {
 	t.Parallel()
 
-	addrMgr, _ := newTestStaticAddressContext(t)
+	addrMgr, _ := newTestStaticAddressContext(t, 10)
 	addresses, err := addrMgr.GetAllAddresses(context.Background())
 	require.NoError(t, err)
 	require.Len(t, addresses, 1)
@@ -606,7 +606,7 @@ func TestPopulateBlocksUntilExpiryUsesOwningAddress(t *testing.T) {
 func TestStaticAddressLoopInResponseIncludesDepositAddress(t *testing.T) {
 	t.Parallel()
 
-	addrMgr, lnd := newTestStaticAddressContext(t)
+	addrMgr, lnd := newTestStaticAddressContext(t, 10)
 	addresses, err := addrMgr.GetAllAddresses(t.Context())
 	require.NoError(t, err)
 	require.Len(t, addresses, 1)
@@ -765,13 +765,17 @@ func TestGetLoopInQuoteRejectsExpiringSelectedDeposit(t *testing.T) {
 	expiring.SetState(deposit.Deposited)
 
 	addrMgr, lnd := newTestStaticAddressContext(t, 10)
+	addresses, err := addrMgr.GetAllAddresses(t.Context())
+	require.NoError(t, err)
+	require.Len(t, addresses, 1)
+	expiring.AddressParams = addresses[0]
 	server := &swapClientServer{
 		depositManager:       newTestDepositManager(expiring),
 		staticAddressManager: addrMgr,
 		lnd:                  &lnd.LndServices,
 	}
 
-	_, err := server.GetLoopInQuote(t.Context(), &looprpc.QuoteRequest{
+	_, err = server.GetLoopInQuote(t.Context(), &looprpc.QuoteRequest{
 		DepositOutpoints: []string{expiring.OutPoint.String()},
 	})
 	require.ErrorContains(t, err, "expires before htlc")
@@ -801,6 +805,10 @@ func TestGetLoopInQuoteAllowsFreshSelectedDeposit(t *testing.T) {
 
 	quoter := &staticAddrTestLoopInQuoter{}
 	addrMgr, lnd := newTestStaticAddressContext(t, staticAddrExpiry)
+	addresses, err := addrMgr.GetAllAddresses(t.Context())
+	require.NoError(t, err)
+	require.Len(t, addresses, 1)
+	fresh.AddressParams = addresses[0]
 	server := &swapClientServer{
 		depositManager:       newTestDepositManager(fresh),
 		staticAddressManager: addrMgr,

staticaddr/loopin/manager.go

@@ -686,16 +686,8 @@ func (m *Manager) initiateLoopIn(ctx context.Context,
 		// too close to the HTLC timeout. Automatic selection already
 		// filters those deposits, so manual outpoint selection must
 		// enforce the same rule before quoting and initiating a swap.
-		params, err := m.cfg.AddressManager.
-			GetStaticAddressParameters(ctx)
-		if err != nil {
-			return nil, fmt.Errorf("unable to retrieve static "+
-				"address parameters: %w", err)
-		}
-
 		err = ValidateDepositsSwappable(
-			selectedDeposits, params.Expiry,
-			m.currentHeight.Load(),
+			selectedDeposits, m.currentHeight.Load(),
 		)
 		if err != nil {
 			return nil, err
@@ -986,21 +978,27 @@ func IsSwappable(confirmationHeight, blockHeight, csvExpiry uint32) bool {
 
 // ValidateDepositsSwappable verifies that selected deposits still have enough
 // timeout runway to back a static-address loop-in HTLC.
-func ValidateDepositsSwappable(deposits []*deposit.Deposit, csvExpiry uint32,
+func ValidateDepositsSwappable(deposits []*deposit.Deposit,
 	blockHeight uint32) error {
 
-	for _, deposit := range deposits {
-		confirmationHeight := deposit.GetConfirmationHeight()
+	for _, d := range deposits {
+		if d.AddressParams == nil {
+			return fmt.Errorf("missing static address parameters for "+
+				"deposit %s", d.OutPoint.String())
+		}
+
+		confirmationHeight := d.GetConfirmationHeight()
 		if confirmationHeight <= 0 {
 			continue
 		}
 
 		swappable := IsSwappable(
-			uint32(confirmationHeight), blockHeight, csvExpiry,
+			uint32(confirmationHeight), blockHeight,
+			d.AddressParams.Expiry,
 		)
 		if !swappable {
 			return fmt.Errorf("deposit %s expires before htlc",
-				deposit.OutPoint)
+				d.OutPoint)
 		}
 	}
 

staticaddr/loopin/manager_test.go

@@ -271,6 +271,7 @@ func TestInitiateLoopInAllowsReservedAutoloopLabel(t *testing.T) {
 
 	const confirmationHeight = 0
 	selectedDeposit := makeDeposit(1, 0, 9_000, confirmationHeight)
+	selectedDeposit.AddressParams = &script.Parameters{Expiry: 10_000}
 	selectedOutpoint := selectedDeposit.OutPoint.String()
 	quoteErr := errors.New("quote failed")
 	quoteGetter := &mockQuoteGetter{
@@ -317,14 +318,17 @@ func TestInitiateLoopInRejectsExpiringSelectedDeposit(t *testing.T) {
 	selectedDeposit := makeDeposit(
 		2, 0, 9_000, confirmationHeight,
 	)
+	selectedDeposit.AddressParams = &script.Parameters{Expiry: csvExpiry}
 	selectedOutpoint := selectedDeposit.OutPoint.String()
 	quoteGetter := &mockQuoteGetter{
 		err: errors.New("quote should not be reached"),
 	}
 
 	manager, err := NewManager(&Config{
 		AddressManager: &mockAddressManager{
-			params: &script.Parameters{Expiry: csvExpiry},
+			// A global expiry would make this deposit look fresh. The
+			// deposit's owning address must take precedence.
+			params: &script.Parameters{Expiry: csvExpiry * 2},
 		},
 		DepositManager: &mockDepositManager{
 			byOutpoint: map[string]*deposit.Deposit{
@@ -361,13 +365,16 @@ func TestInitiateLoopInAllowsFreshSelectedDeposit(t *testing.T) {
 	selectedDeposit := makeDeposit(
 		3, 0, 9_000, confirmationHeight,
 	)
+	selectedDeposit.AddressParams = &script.Parameters{Expiry: csvExpiry}
 	selectedOutpoint := selectedDeposit.OutPoint.String()
 	quoteErr := errors.New("quote reached")
 	quoteGetter := &mockQuoteGetter{err: quoteErr}
 
 	manager, err := NewManager(&Config{
 		AddressManager: &mockAddressManager{
-			params: &script.Parameters{Expiry: csvExpiry},
+			// A global expiry would reject this deposit. The deposit's
+			// owning address must take precedence.
+			params: &script.Parameters{Expiry: 10},
 		},
 		DepositManager: &mockDepositManager{
 			byOutpoint: map[string]*deposit.Deposit{