staticaddr: wait for address manager initiation

Author: hieblmi

loopd/daemon.go

@@ -849,6 +849,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			}
 			infof("Static address manager stopped")
 		}()
+		staticAddressManager.WaitInitComplete()
 	}
 
 	// Start the static address deposit manager.
@@ -873,14 +874,12 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 		go func() {
 			defer d.wg.Done()
 
-			infof("Starting static address deposit withdrawal " +
-				"manager...")
+			infof("Starting static address withdrawal manager...")
 			err := withdrawalManager.Run(d.mainCtx)
 			if err != nil && !errors.Is(context.Canceled, err) {
 				d.internalErrChan <- err
 			}
-			infof("Static address deposit withdrawal manager " +
-				"stopped")
+			infof("Static address withdrawal manager stopped")
 		}()
 		withdrawalManager.WaitInitComplete()
 	}
@@ -896,8 +895,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			if err != nil && !errors.Is(context.Canceled, err) {
 				d.internalErrChan <- err
 			}
-			infof("Starting static address loop-in manager " +
-				"stopped")
+			infof("Static address loop-in manager stopped")
 		}()
 		staticLoopInManager.WaitInitComplete()
 	}

staticaddr/address/manager.go

@@ -54,12 +54,17 @@ type Manager struct {
 	sync.Mutex
 
 	currentHeight atomic.Int32
+
+	// initChan signals the daemon that the address manager has completed
+	// its initialization.
+	initChan chan struct{}
 }
 
 // NewManager creates a new address manager.
 func NewManager(cfg *ManagerConfig, currentHeight int32) *Manager {
 	m := &Manager{
-		cfg: cfg,
+		cfg:      cfg,
+		initChan: make(chan struct{}),
 	}
 	m.currentHeight.Store(currentHeight)
 
@@ -75,6 +80,10 @@ func (m *Manager) Run(ctx context.Context) error {
 		return err
 	}
 
+	// Communicate to the caller that the address manager has completed its
+	// initialization.
+	close(m.initChan)
+
 	for {
 		select {
 		case currentHeight := <-newBlockChan:
@@ -90,6 +99,14 @@ func (m *Manager) Run(ctx context.Context) error {
 	}
 }
 
+// WaitInitComplete waits until the address manager has completed its setup.
+func (m *Manager) WaitInitComplete() {
+	defer log.Debugf("Static address manager initiation " +
+		"complete.")
+
+	<-m.initChan
+}
+
 // NewAddress creates a new static address with the server or returns an
 // existing one.
 func (m *Manager) NewAddress(ctx context.Context) (*btcutil.AddressTaproot,

staticaddr/deposit/manager.go

@@ -77,7 +77,7 @@ type Manager struct {
 	// mu guards access to activeDeposits map.
 	mu sync.Mutex
 
-	// initChan signals the daemon that the address manager has completed
+	// initChan signals the daemon that the deposit manager has completed
 	// its initialization.
 	initChan chan struct{}