staticaddr: multi-address loop-in

Author: hieblmi

loopd/daemon.go

@@ -677,6 +677,7 @@ 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,

loopdb/sqlc/migrations/000022_static_change_address.down.sql

@@ -0,0 +1 @@
+ALTER TABLE static_address_swaps DROP COLUMN change_address;

loopdb/sqlc/migrations/000022_static_change_address.up.sql

@@ -0,0 +1,3 @@
+-- change_address stores the change output address for the HTLC transaction of a
+-- static address loop-in swap.
+ALTER TABLE static_address_swaps ADD change_address TEXT NOT NULL DEFAULT '';

loopdb/sqlc/models.go

@@ -7,6 +7,7 @@ INSERT INTO static_address_swaps (
     quoted_swap_fee_satoshis,
     deposit_outpoints,
     selected_amount,
+    change_address,
     htlc_tx_fee_rate_sat_kw,
     htlc_timeout_sweep_tx_id,
     htlc_timeout_sweep_address,
@@ -22,7 +23,8 @@ INSERT INTO static_address_swaps (
     $8,
     $9,
     $10,
-    $11
+    $11,
+    $12
 );
 
 -- name: UpdateStaticAddressLoopIn :exec

loopdb/sqlc/queries/static_address_loopin.sql

@@ -312,6 +312,9 @@ func newManagerTestContext(t *testing.T) *ManagerTestContext {
 		},
 	}
 	require.NoError(t, err)
+
+	_, clientPub := test.CreateKey(1)
+	_, serverPub := test.CreateKey(2)
 	storedDeposits := []*Deposit{
 		{
 			ID:                   ID,
@@ -324,6 +327,9 @@ func newManagerTestContext(t *testing.T) *ManagerTestContext {
 			AddressParams: &address.Parameters{
 				ProtocolVersion: version.ProtocolVersion_V0,
 				Expiry:          100,
+				ClientPubkey:    clientPub,
+				ServerPubkey:    serverPub,
+				PkScript:        utxo.PkScript,
 			},
 		},
 	}

loopdb/sqlc/static_address_loopin.sql.go

@@ -232,6 +232,8 @@ func (s *SqlStore) DepositForOutpoint(ctx context.Context,
 				ExpirySweepTxid:       row.ExpirySweepTxid,
 				FinalizedWithdrawalTx: row.FinalizedWithdrawalTx,
 				SwapHash:              row.SwapHash,
+				ClientKeyFamily:       row.ClientKeyFamily,
+				ClientKeyIndex:        row.ClientKeyIndex,
 				StaticAddressID:       row.StaticAddressID,
 				ClientPubkey:          row.ClientPubkey,
 				ServerPubkey:          row.ServerPubkey,

staticaddr/deposit/manager_test.go

@@ -16,6 +16,7 @@ import (
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/fsm"
+	"github.com/lightninglabs/loop/staticaddr/address"
 	"github.com/lightninglabs/loop/staticaddr/deposit"
 	"github.com/lightninglabs/loop/staticaddr/version"
 	"github.com/lightninglabs/loop/swap"
@@ -63,15 +64,55 @@ func (f *FSM) InitHtlcAction(ctx context.Context,
 
 	// Calculate the swap invoice amount. The server needs to pay us the
 	// swap amount minus the fees that the server charges for the swap. The
-	// swap amount is either the total value of the selected deposits, or
-	// the selected amount if a specific amount was requested.
-	swapAmount := f.loopIn.TotalDepositAmount()
-	var hasChange bool
+	// swap amount is either the total value of the selected deposits or the
+	// selected amount if a specific amount was requested. If the selection
+	// results in change, we create a new static address for it.
+	var (
+		swapAmount       = f.loopIn.TotalDepositAmount()
+		hasChange        bool
+		changeAddrParams *address.Parameters
+		changeAddress    string
+	)
 	if f.loopIn.SelectedAmount > 0 {
 		swapAmount = f.loopIn.SelectedAmount
 		remainingAmount := f.loopIn.TotalDepositAmount() - swapAmount
 		hasChange = remainingAmount > 0 && remainingAmount <
 			f.loopIn.TotalDepositAmount()
+
+		if hasChange {
+			changeAddrParams, err = f.cfg.AddressManager.NewAddress(
+				ctx,
+			)
+			if err != nil {
+				err = fmt.Errorf("unable to create change "+
+					"address: %w", err)
+
+				return f.HandleError(err)
+			}
+
+			taprootAddress, err := changeAddrParams.TaprootAddress(
+				f.cfg.ChainParams,
+			)
+			if err != nil {
+				err = fmt.Errorf("unable to create taproot "+
+					"address: %w", err)
+
+				return f.HandleError(err)
+			}
+
+			changeAddr, err := btcutil.DecodeAddress(
+				taprootAddress, f.cfg.ChainParams,
+			)
+			if err != nil {
+				err = fmt.Errorf("unable to decode change "+
+					"address: %w", err)
+
+				return f.HandleError(err)
+			}
+
+			f.loopIn.ChangeAddress = changeAddr
+			changeAddress = changeAddr.String()
+		}
 	}
 	swapInvoiceAmt := swapAmount - f.loopIn.QuotedSwapFee
 
@@ -124,6 +165,7 @@ func (f *FSM) InitHtlcAction(ctx context.Context,
 		SwapHash:              f.loopIn.SwapHash[:],
 		DepositOutpoints:      f.loopIn.DepositOutpoints,
 		Amount:                uint64(f.loopIn.SelectedAmount),
+		ChangeAddress:         changeAddress,
 		HtlcClientPubKey:      f.loopIn.ClientPubkey.SerializeCompressed(),
 		SwapInvoice:           f.loopIn.SwapInvoice,
 		ProtocolVersion:       version.CurrentRPCProtocolVersion(),

staticaddr/deposit/sql_store.go

@@ -6,6 +6,7 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/lightninglabs/loop"
 	"github.com/lightninglabs/loop/fsm"
+	"github.com/lightninglabs/loop/staticaddr/address"
 	"github.com/lightninglabs/loop/staticaddr/deposit"
 	"github.com/lightninglabs/loop/swapserverrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
@@ -32,6 +33,9 @@ type (
 
 // AddressManager handles fetching of address parameters.
 type AddressManager interface {
+	// NewAddress returns a new static address.
+	NewAddress(ctx context.Context) (*address.Parameters, error)
+
 	// IsOurPkScript returns true if the given pkScript is our static
 	// address script.
 	IsOurPkScript(pkScript []byte) bool