WIP: add chain notifier readiness guard

- add waitForChainNotifierReady helper that retries
  RegisterBlockEpochNtfn until the notifier accepts a stream or the
  context cancels
- call the helper immediately after the full lnd client connects so
  every integrated subserver starts only after lnd’s chain notifier is
  ready

Author: ffranr

chain_notifier_wait.go

@@ -0,0 +1,113 @@
+package terminal
+
+import (
+	"context"
+	"strings"
+	"time"
+
+	"github.com/lightninglabs/lndclient"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+)
+
+const (
+	chainNotifierStartupMessage = "chain notifier RPC is still in the " +
+		"process of starting"
+)
+
+// waitForChainNotifierReady blocks until lnd's chain notifier accepts a block
+// epoch subscription or the provided context is canceled.
+func waitForChainNotifierReady(ctx context.Context,
+	notifier lndclient.ChainNotifierClient) error {
+
+	const (
+		initialBackoff = 200 * time.Millisecond
+		maxBackoff     = 5 * time.Second
+		streamGrace    = 2 * time.Second
+	)
+
+	backoff := initialBackoff
+
+	for {
+		select {
+		case <-ctx.Done():
+			return ctx.Err()
+
+		default:
+		}
+
+		attemptCtx, cancel := context.WithCancel(ctx)
+		blockChan, errChan, err := notifier.RegisterBlockEpochNtfn(attemptCtx)
+		if err != nil {
+			cancel()
+
+			isStartupErr := status.Code(err) == codes.Unavailable ||
+				strings.Contains(err.Error(),
+					chainNotifierStartupMessage)
+			if !isStartupErr {
+				return err
+			}
+
+			log.Warnf("Chain notifier RPC not ready, retrying in %v: %v",
+				backoff, err)
+		} else {
+			timer := time.NewTimer(streamGrace)
+
+			select {
+			case <-blockChan:
+				go drainReadinessNtfn(
+					attemptCtx, cancel, blockChan, errChan,
+				)
+				return nil
+
+			case err = <-errChan:
+				cancel()
+
+				log.Warnf("Chain notifier stream ended early, "+
+					"retrying: %v", err)
+
+			case <-timer.C:
+				go drainReadinessNtfn(
+					attemptCtx, cancel, blockChan, errChan,
+				)
+				return nil
+
+			case <-ctx.Done():
+				cancel()
+				return ctx.Err()
+			}
+		}
+
+		select {
+		case <-time.After(backoff):
+
+		case <-ctx.Done():
+			return ctx.Err()
+		}
+
+		backoff *= 2
+		if backoff > maxBackoff {
+			backoff = maxBackoff
+		}
+	}
+}
+
+// drainReadinessNtfn discards notifications until the daemon shuts down,
+// allowing the readiness subscription to stay open without affecting lnd logs.
+func drainReadinessNtfn(ctx context.Context, cancel func(),
+	blockChan <-chan int32, errChan <-chan error) {
+
+	defer cancel()
+
+	for {
+		select {
+		case <-blockChan:
+
+		case <-errChan:
+			return
+
+		case <-ctx.Done():
+			return
+		}
+	}
+}

docs/release-notes/release-notes-0.16.0.md

@@ -41,11 +41,15 @@ and also added coverage to verify support for channel versioning:
 
 * Updated [`lnd` to
   `v0.20.0-beta.rc2`](https://github.com/lightninglabs/lightning-terminal/pull/1163).
+* Updated [`lnd` to
+  `v0.20.0-beta`](https://github.com/lightninglabs/lightning-terminal/pull/1173).
 
 ### Loop
 
 * Updated [`loop` to
   `v0.31.5-beta`](https://github.com/lightninglabs/lightning-terminal/pull/1163).
+* Updated [`loop` to
+  `v0.31.6-beta`](https://github.com/lightninglabs/lightning-terminal/pull/1173).
 
 ### Pool
 
@@ -55,5 +59,7 @@ and also added coverage to verify support for channel versioning:
 
 * Updated [`taproot-assets` to
   `v0.7.0-rc2`](https://github.com/lightninglabs/lightning-terminal/pull/1163).
+* Updated [`taproot-assets` to
+  `v0.7.0`](https://github.com/lightninglabs/lightning-terminal/pull/1173).
 
 # Contributors (Alphabetical Order)

terminal.go

@@ -956,6 +956,16 @@ func (g *LightningTerminal) setupFullLNDClient(ctx context.Context,
 		if err == nil {
 			log.Infof("Full lnd client connected")
 
+			log.Infof("Waiting for chain notifier to become available")
+			err = waitForChainNotifierReady(
+				ctx, g.lndClient.ChainNotifier,
+			)
+			if err != nil {
+				return fmt.Errorf("waiting for chain notifier: %w",
+					err)
+			}
+			log.Infof("Chain notifier ready")
+
 			break
 		}