staticaddr: attach address params to deposit

Author: hieblmi

loopd/swapclient_server_test.go

@@ -993,13 +993,15 @@ func TestListUnspentDeposits(t *testing.T) {
 	}, 0)
 
 	initChan := make(chan struct{})
-	go addrMgr.Run(t.Context(), initChan)
+	go func() {
+		err := addrMgr.Run(ctx, initChan)
+		require.NoError(t, err)
+	}()
 
 	select {
 	case <-initChan:
-	case <-t.Context().Done():
-		t.Fatalf("failed to initialize address manager: %v",
-			t.Context().Err())
+	case <-ctx.Done():
+		t.Fatalf("failed to initialize address manager: %v", ctx.Err())
 	}
 
 	// Construct several UTXOs with different confirmation counts.

staticaddr/deposit/actions.go

@@ -26,19 +26,14 @@ func (f *FSM) PublishDepositExpirySweepAction(ctx context.Context,
 
 	msgTx := wire.NewMsgTx(2)
 
-	params, err := f.cfg.AddressManager.GetStaticAddressParameters(ctx)
-	if err != nil {
-		return fsm.OnError
-	}
-
 	// Add the deposit outpoint as input to the transaction.
 	msgTx.AddTxIn(&wire.TxIn{
 		PreviousOutPoint: f.deposit.OutPoint,
-		Sequence:         params.Expiry,
+		Sequence:         f.deposit.AddressParams.Expiry,
 		SignatureScript:  nil,
 	})
 
-	// Estimate the fee rate of an expiry spend transaction.
+	// Estimate the fee rate of an expiry spending transaction.
 	feeRateEstimator, err := f.cfg.WalletKit.EstimateFeeRate(
 		ctx, DefaultConfTarget,
 	)
@@ -65,7 +60,7 @@ func (f *FSM) PublishDepositExpirySweepAction(ctx context.Context,
 
 	txOut := &wire.TxOut{
 		Value:    int64(f.deposit.Value),
-		PkScript: params.PkScript,
+		PkScript: f.deposit.AddressParams.PkScript,
 	}
 
 	prevOut := []*wire.TxOut{txOut}

staticaddr/deposit/deposit.go

@@ -9,6 +9,7 @@ import (
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/loop/fsm"
+	"github.com/lightninglabs/loop/staticaddr/address"
 	"github.com/lightningnetwork/lnd/lntypes"
 )
 
@@ -62,6 +63,10 @@ type Deposit struct {
 	// FinalizedWithdrawalTx is the coop-signed withdrawal transaction. It
 	// is republished on new block arrivals and on client restarts.
 	FinalizedWithdrawalTx *wire.MsgTx
+
+	// AddressParams are the parameters of the address that are backing this
+	// deposit.
+	AddressParams *address.Parameters
 }
 
 // IsInFinalState returns true if the deposit is final.

staticaddr/deposit/fsm.go

@@ -3,14 +3,12 @@ package deposit
 import (
 	"context"
 	"errors"
-	"fmt"
 
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/fsm"
 	"github.com/lightninglabs/loop/staticaddr/address"
-	"github.com/lightninglabs/loop/staticaddr/script"
 	"github.com/lightninglabs/loop/staticaddr/version"
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/keychain"
@@ -137,15 +135,13 @@ type FSM struct {
 
 	params *address.Parameters
 
-	address *script.StaticAddress
-
 	blockNtfnChan chan uint32
 
 	// quitChan stops after the FSM stops consuming blockNtfnChan.
 	quitChan chan struct{}
 
 	// finalizedDepositChan is used to signal that the deposit has been
-	// finalized and the FSM can be removed from the manager's memory.
+	// finalized, and the FSM can be removed from the manager's memory.
 	finalizedDepositChan chan wire.OutPoint
 }
 
@@ -155,29 +151,17 @@ func NewFSM(ctx context.Context, deposit *Deposit, cfg *ManagerConfig,
 	finalizedDepositChan chan wire.OutPoint,
 	recoverStateMachine bool) (*FSM, error) {
 
-	params, err := cfg.AddressManager.GetStaticAddressParameters(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("unable to get static address "+
-			"parameters: %w", err)
-	}
-
-	address, err := cfg.AddressManager.GetStaticAddress(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("unable to get static address: %w", err)
-	}
-
 	depoFsm := &FSM{
 		cfg:                  cfg,
 		deposit:              deposit,
-		params:               params,
-		address:              address,
+		params:               deposit.AddressParams,
 		blockNtfnChan:        make(chan uint32),
 		quitChan:             make(chan struct{}),
 		finalizedDepositChan: finalizedDepositChan,
 	}
 
 	depositStates := depoFsm.DepositStatesV0()
-	switch params.ProtocolVersion {
+	switch deposit.AddressParams.ProtocolVersion {
 	case version.ProtocolVersion_V0:
 
 	default:

staticaddr/deposit/interface.go

@@ -34,9 +34,9 @@ type Store interface {
 
 // AddressManager handles fetching of address parameters.
 type AddressManager interface {
-	// GetStaticAddressParameters returns the static address parameters.
-	GetStaticAddressParameters(ctx context.Context) (*address.Parameters,
-		error)
+	// GetParameters returns the static address parameters for the given
+	// pkScript.
+	GetParameters(pkScript []byte) *address.Parameters
 
 	// GetStaticAddress returns the deposit address for the given
 	// client and server public keys.

staticaddr/deposit/manager.go

@@ -179,7 +179,7 @@ func (m *Manager) recoverDeposits(ctx context.Context) error {
 	for i, d := range deposits {
 		m.deposits[d.OutPoint] = deposits[i]
 
-		// If the current deposit is final it wasn't active when we
+		// If the current deposit is final, it wasn't active when we
 		// shut down the client last. So we don't need to start a fsm
 		// for it.
 		if d.IsInFinalState() {
@@ -307,13 +307,21 @@ func (m *Manager) createNewDeposit(ctx context.Context,
 	if err != nil {
 		return nil, err
 	}
+
+	params := m.cfg.AddressManager.GetParameters(utxo.PkScript)
+	if params == nil {
+		return nil, fmt.Errorf("couldn't find static address "+
+			"parameters for deposit with pkscript %x", utxo.PkScript)
+	}
+
 	deposit := &Deposit{
 		ID:                   id,
 		state:                Deposited,
 		OutPoint:             utxo.OutPoint,
 		Value:                utxo.Value,
 		ConfirmationHeight:   int64(blockHeight),
 		TimeOutSweepPkScript: timeoutSweepPkScript,
+		AddressParams:        params,
 	}
 
 	err = m.cfg.Store.CreateDeposit(ctx, deposit)
@@ -332,12 +340,10 @@ func (m *Manager) createNewDeposit(ctx context.Context,
 func (m *Manager) getBlockHeight(ctx context.Context,
 	utxo *lnwallet.Utxo) (uint32, error) {
 
-	addressParams, err := m.cfg.AddressManager.GetStaticAddressParameters(
-		ctx,
-	)
-	if err != nil {
-		return 0, fmt.Errorf("couldn't get confirmation height for "+
-			"deposit, %w", err)
+	addressParams := m.cfg.AddressManager.GetParameters(utxo.PkScript)
+	if addressParams == nil {
+		return 0, fmt.Errorf("couldn't get confirmation height for " +
+			"deposit")
 	}
 
 	notifChan, errChan, err :=

staticaddr/deposit/manager_test.go

@@ -116,6 +116,14 @@ func (m *mockAddressManager) GetStaticAddressParameters(ctx context.Context) (
 		args.Error(1)
 }
 
+func (m *mockAddressManager) GetParameters(
+	pkScript []byte) *address.Parameters {
+
+	args := m.Called(pkScript)
+
+	return args.Get(0).(*address.Parameters)
+}
+
 func (m *mockAddressManager) GetStaticAddress(ctx context.Context) (
 	*script.StaticAddress, error) {