Rename latestBlockHeader to referenceBlock to avoid misconceptions

Author: m-Peter

services/requester/batch_tx_pool.go

@@ -184,7 +184,7 @@ func (t *BatchTxPool) processPooledTransactions(ctx context.Context) {
 			for address, pooledTxs := range txsGroupedByAddress {
 				err := t.batchSubmitTransactionsForSameAddress(
 					ctx,
-					t.getLatestBlockHeader(),
+					t.getReferenceBlock(),
 					account,
 					pooledTxs,
 				)
@@ -260,7 +260,7 @@ func (t *BatchTxPool) submitSingleTransaction(
 
 	script := replaceAddresses(runTxScript, t.config.FlowNetworkID)
 	flowTx, err := t.buildTransaction(
-		t.getLatestBlockHeader(),
+		t.getReferenceBlock(),
 		account,
 		script,
 		cadence.NewArray([]cadence.Value{hexEncodedTx}),

services/requester/single_tx_pool.go

@@ -21,7 +21,7 @@ import (
 	"github.com/onflow/flow-evm-gateway/services/requester/keystore"
 )
 
-var blockHeaderUpdateFrequency = time.Second * 15
+var referenceBlockUpdateFrequency = time.Second * 15
 
 // SingleTxPool is a simple implementation of the `TxPool` interface that submits
 // transactions as soon as they arrive, without any delays or batching strategies.
@@ -34,9 +34,9 @@ type SingleTxPool struct {
 	mux         sync.Mutex
 	keystore    *keystore.KeyStore
 	collector   metrics.Collector
-	// latestBlockHeader is stored atomically to avoid races
+	// referenceBlockHeader is stored atomically to avoid races
 	// between request path and ticker updates.
-	latestBlockHeader atomic.Value // stores *flow.BlockHeader
+	referenceBlockHeader atomic.Value // stores *flow.BlockHeader
 	// todo add methods to inspect transaction pool state
 }
 
@@ -51,7 +51,7 @@ func NewSingleTxPool(
 	collector metrics.Collector,
 	keystore *keystore.KeyStore,
 ) (*SingleTxPool, error) {
-	latestBlockHeader, err := client.GetLatestBlockHeader(ctx, false)
+	referenceBlockHeader, err := client.GetLatestBlockHeader(ctx, false)
 	if err != nil {
 		return nil, err
 	}
@@ -68,9 +68,9 @@ func NewSingleTxPool(
 		collector:   collector,
 		keystore:    keystore,
 	}
-	singleTxPool.latestBlockHeader.Store(latestBlockHeader)
+	singleTxPool.referenceBlockHeader.Store(referenceBlockHeader)
 
-	go singleTxPool.trackLatestBlockHeader(ctx)
+	go singleTxPool.updateReferenceBlock(ctx)
 
 	return singleTxPool, nil
 }
@@ -116,7 +116,7 @@ func (t *SingleTxPool) Add(
 
 	script := replaceAddresses(runTxScript, t.config.FlowNetworkID)
 	flowTx, err := t.buildTransaction(
-		t.getLatestBlockHeader(),
+		t.getReferenceBlock(),
 		account,
 		script,
 		cadence.NewArray([]cadence.Value{hexEncodedTx}),
@@ -216,8 +216,8 @@ func (t *SingleTxPool) buildTransaction(
 	return flowTx, nil
 }
 
-func (t *SingleTxPool) trackLatestBlockHeader(ctx context.Context) {
-	ticker := time.NewTicker(blockHeaderUpdateFrequency)
+func (t *SingleTxPool) updateReferenceBlock(ctx context.Context) {
+	ticker := time.NewTicker(referenceBlockUpdateFrequency)
 	defer ticker.Stop()
 
 	for {
@@ -228,17 +228,17 @@ func (t *SingleTxPool) trackLatestBlockHeader(ctx context.Context) {
 			blockHeader, err := t.client.GetLatestBlockHeader(ctx, false)
 			if err != nil {
 				t.logger.Error().Err(err).Msg(
-					"failed to update latest Flow block header",
+					"failed to update the reference block",
 				)
 				continue
 			}
-			t.latestBlockHeader.Store(blockHeader)
+			t.referenceBlockHeader.Store(blockHeader)
 		}
 	}
 }
 
-func (t *SingleTxPool) getLatestBlockHeader() *flow.BlockHeader {
-	if v := t.latestBlockHeader.Load(); v != nil {
+func (t *SingleTxPool) getReferenceBlock() *flow.BlockHeader {
+	if v := t.referenceBlockHeader.Load(); v != nil {
 		return v.(*flow.BlockHeader)
 	}
 	return nil