staticaddr: use deposit conf heigh for reorg safety

Author: hieblmi

loopd/daemon.go

@@ -617,7 +617,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		Signer:                    d.lnd.Signer,
 		Store:                     withdrawalStore,
 	}
-	withdrawalManager = withdraw.NewManager(withdrawalCfg, blockHeight)
+	withdrawalManager = withdraw.NewManager(withdrawalCfg)
 
 	// Static address loop-in manager setup.
 	staticAddressLoopInStore := loopin.NewSqlStore(

staticaddr/withdraw/manager.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"strings"
 	"sync"
-	"sync/atomic"
 
 	"github.com/btcsuite/btcd/btcec/v2/schnorr"
 	"github.com/btcsuite/btcd/btcec/v2/schnorr/musig2"
@@ -133,24 +132,20 @@ type Manager struct {
 	// errChan forwards errors from the withdrawal manager to the server.
 	errChan chan error
 
-	// initiationHeight stores the currently best known block height.
-	initiationHeight atomic.Uint32
-
 	// finalizedWithdrawalTx are the finalized withdrawal transactions that
 	// are published to the network and re-published on block arrivals.
 	finalizedWithdrawalTxns map[chainhash.Hash]*wire.MsgTx
 }
 
 // NewManager creates a new deposit withdrawal manager.
-func NewManager(cfg *ManagerConfig, currentHeight uint32) *Manager {
+func NewManager(cfg *ManagerConfig) *Manager {
 	m := &Manager{
 		cfg:                      cfg,
 		finalizedWithdrawalTxns:  make(map[chainhash.Hash]*wire.MsgTx),
 		exitChan:                 make(chan struct{}),
 		newWithdrawalRequestChan: make(chan newWithdrawalRequest),
 		errChan:                  make(chan error),
 	}
-	m.initiationHeight.Store(currentHeight)
 
 	return m
 }
@@ -669,7 +664,7 @@ func (m *Manager) handleWithdrawal(ctx context.Context,
 				m.cfg.ChainNotifier.RegisterConfirmationsNtfn(
 					ctx, spentTx.SpenderTxHash,
 					withdrawalPkscript, MinConfs,
-					int32(m.initiationHeight.Load()),
+					int32(d.ConfirmationHeight),
 				)
 			select {
 			case tx := <-confChan: