lndservices+tapcfg: use block header cache in LndRpcChainBridge

Adds a block header cache to LndRpcChainBridge, which indirectly
improves performance of methods like GetBlockTimestamp by avoiding
repeated block header fetches.

Author: ffranr

lndservices/chain_bridge.go

@@ -42,17 +42,22 @@ type LndRpcChainBridge struct {
 
 	// assetStore is a handle to the asset store.
 	assetStore *tapdb.AssetStore
+
+	// headerCache is a cache for block headers to reduce RPC calls.
+	headerCache *BlockHeaderCache
 }
 
 // NewLndRpcChainBridge creates a new chain bridge from an active lnd services
 // client.
 func NewLndRpcChainBridge(lnd *lndclient.LndServices,
-	assetStore *tapdb.AssetStore) *LndRpcChainBridge {
+	assetStore *tapdb.AssetStore,
+	headerCache *BlockHeaderCache) *LndRpcChainBridge {
 
 	return &LndRpcChainBridge{
 		lnd:         lnd,
 		retryConfig: fn.DefaultRetryConfig(),
 		assetStore:  assetStore,
+		headerCache: headerCache,
 	}
 }
 
@@ -118,6 +123,11 @@ func (l *LndRpcChainBridge) GetBlock(ctx context.Context,
 func (l *LndRpcChainBridge) GetBlockHeader(ctx context.Context,
 	hash chainhash.Hash) (*wire.BlockHeader, error) {
 
+	// First, check the cache for the requested block header.
+	if header, ok := l.headerCache.GetByHash(hash); ok {
+		return &header, nil
+	}
+
 	return fn.RetryFuncN(
 		ctx, l.retryConfig, func() (*wire.BlockHeader, error) {
 			header, err := l.lnd.ChainKit.GetBlockHeader(ctx, hash)
@@ -136,6 +146,14 @@ func (l *LndRpcChainBridge) GetBlockHeader(ctx context.Context,
 func (l *LndRpcChainBridge) GetBlockHeaderByHeight(ctx context.Context,
 	blockHeight int64) (*wire.BlockHeader, error) {
 
+	// Convert to uint32 for cache operations.
+	height := uint32(blockHeight)
+
+	// First, check the cache for the requested block header by height.
+	if header, ok := l.headerCache.GetByHeight(height); ok {
+		return &header, nil
+	}
+
 	// First, we need to resolve the block hash at the given height.
 	blockHash, err := fn.RetryFuncN(
 		ctx, l.retryConfig, func() (chainhash.Hash, error) {
@@ -171,6 +189,13 @@ func (l *LndRpcChainBridge) GetBlockHeaderByHeight(ctx context.Context,
 				)
 			}
 
+			// Store the retrieved header in the cache.
+			err = l.headerCache.Put(height, *header)
+			if err != nil {
+				return nil, fmt.Errorf("failed to cache block "+
+					"header: %w", err)
+			}
+
 			return header, nil
 		},
 	)

lndservices/daemon_adapters.go

@@ -51,14 +51,16 @@ type LndFsmDaemonAdapters struct {
 }
 
 // NewLndFsmDaemonAdapters creates a new instance of LndFsmDaemonAdapters.
-func NewLndFsmDaemonAdapters(lnd *lndclient.LndServices) *LndFsmDaemonAdapters {
+func NewLndFsmDaemonAdapters(lnd *lndclient.LndServices,
+	headerCache *BlockHeaderCache) *LndFsmDaemonAdapters {
+
 	retryConfig := fn.DefaultRetryConfig()
 
 	msgTransport := NewLndMsgTransportClient(lnd)
 
 	// Initialize the chain bridge without the asset store, as it is not
 	// needed for the FSM adapters.
-	chainBridge := NewLndRpcChainBridge(lnd, nil)
+	chainBridge := NewLndRpcChainBridge(lnd, nil, headerCache)
 	chainBridge.retryConfig = retryConfig
 
 	return &LndFsmDaemonAdapters{

tapcfg/server.go

@@ -112,14 +112,30 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
 		lndServices,
 		lndservices.WithPsbtMaxFeeRatio(cfg.Wallet.PsbtMaxFeeRatio),
 	)
-	chainBridge := lndservices.NewLndRpcChainBridge(lndServices, assetStore)
+
+	// Create a block header cache with default configuration.
+	headerCache, err := lndservices.NewBlockHeaderCache(
+		lndservices.DefaultBlockHeaderCacheConfig(),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create block header cache: "+
+			"%w", err)
+	}
+
+	chainBridge := lndservices.NewLndRpcChainBridge(
+		lndServices, assetStore, headerCache,
+	)
+
 	msgTransportClient := lndservices.NewLndMsgTransportClient(lndServices)
 	lndRouterClient := lndservices.NewLndRouterClient(lndServices)
 	lndInvoicesClient := lndservices.NewLndInvoicesClient(lndServices)
 	lndFeatureBitsVerifier := lndservices.NewLndFeatureBitVerifier(
 		lndServices,
 	)
-	lndFsmDaemonAdapters := lndservices.NewLndFsmDaemonAdapters(lndServices)
+
+	lndFsmDaemonAdapters := lndservices.NewLndFsmDaemonAdapters(
+		lndServices, headerCache,
+	)
 
 	uniDB := tapdb.NewTransactionExecutor(
 		db, func(tx *sql.Tx) tapdb.BaseUniverseStore {