Calculate BlockAccessListHash only when Amsterdam is activated

Author: m-Peter

.github/workflows/ci.yml

@@ -35,5 +35,5 @@ jobs:
         uses: golangci/golangci-lint-action@v8
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v2.4
+          version: v2.9.0
           args: --timeout=10m

bootstrap/bootstrap.go

@@ -192,6 +192,7 @@ func (b *Bootstrap) StartEventIngestion(ctx context.Context) error {
 		b.logger,
 		b.collector,
 		replayerConfig,
+		b.config.EVMNetworkID,
 	)
 
 	StartEngine(ctx, b.events, l)

services/ingestion/engine.go

@@ -3,13 +3,15 @@ package ingestion
 import (
 	"context"
 	"fmt"
+	"math/big"
 	"time"
 
 	flowGo "github.com/onflow/flow-go/model/flow"
 
 	pebbleDB "github.com/cockroachdb/pebble"
 	gethTypes "github.com/ethereum/go-ethereum/core/types"
 	gethBAL "github.com/ethereum/go-ethereum/core/types/bal"
+	gethParams "github.com/ethereum/go-ethereum/params"
 	"github.com/onflow/flow-go-sdk"
 	"github.com/rs/zerolog"
 
@@ -19,6 +21,7 @@ import (
 	"github.com/onflow/flow-evm-gateway/storage"
 	"github.com/onflow/flow-evm-gateway/storage/pebble"
 
+	"github.com/onflow/flow-go/fvm/evm/emulator"
 	"github.com/onflow/flow-go/fvm/evm/offchain/sync"
 )
 
@@ -54,6 +57,7 @@ type Engine struct {
 	logsPublisher   *models.Publisher[[]*gethTypes.Log]
 	collector       metrics.Collector
 	replayerConfig  replayer.Config
+	chainConfig     *gethParams.ChainConfig
 }
 
 func NewEventIngestionEngine(
@@ -69,6 +73,7 @@ func NewEventIngestionEngine(
 	log zerolog.Logger,
 	collector metrics.Collector,
 	replayerConfig replayer.Config,
+	chainID *big.Int,
 ) *Engine {
 	log = log.With().Str("component", "ingestion").Logger()
 
@@ -87,6 +92,7 @@ func NewEventIngestionEngine(
 		logsPublisher:   logsPublisher,
 		collector:       collector,
 		replayerConfig:  replayerConfig,
+		chainConfig:     emulator.MakeChainConfig(chainID),
 	}
 }
 
@@ -232,9 +238,10 @@ func (e *Engine) indexEvents(events *models.CadenceEvents, batch *pebbleDB.Batch
 	}
 
 	// Step 1: Re-execute all transactions on the latest EVM block
+	block := events.Block()
 
 	// Step 1.1: Notify the `BlocksProvider` of the newly received EVM block
-	if err := e.blocksProvider.OnBlockReceived(events.Block()); err != nil {
+	if err := e.blocksProvider.OnBlockReceived(block); err != nil {
 		return err
 	}
 
@@ -253,16 +260,20 @@ func (e *Engine) indexEvents(events *models.CadenceEvents, batch *pebbleDB.Batch
 	blockEvents := events.BlockEventPayload()
 	replayResult, txResults, err := replayer.ReplayBlockEvents(events.TxEventPayloads(), blockEvents)
 	if err != nil {
-		return fmt.Errorf("failed to replay block on height: %d, with: %w", events.Block().Height, err)
+		return fmt.Errorf("failed to replay block on height: %d, with: %w", block.Height, err)
 	}
-	stateAccessList := gethBAL.NewConstructionBlockAccessList()
-	for _, txRes := range txResults {
-		if txRes.StateAccessList != nil {
-			stateAccessList.Merge(txRes.StateAccessList)
+
+	// compute the `BlockAccessListHash` field when Amsterdam is activated
+	if e.chainConfig.IsAmsterdam(new(big.Int).SetUint64(block.Height), block.Timestamp) {
+		stateAccessList := gethBAL.NewConstructionBlockAccessList()
+		for _, txRes := range txResults {
+			if txRes.StateAccessList != nil {
+				stateAccessList.Merge(txRes.StateAccessList)
+			}
 		}
+		accessListHash := stateAccessList.ToEncodingObj().Hash()
+		block.AccessListHash = &accessListHash
 	}
-	accessListHash := stateAccessList.ToEncodingObj().Hash()
-	events.Block().AccessListHash = &accessListHash
 
 	// Step 2: Write all the necessary changes to each storage
 
@@ -273,7 +284,7 @@ func (e *Engine) indexEvents(events *models.CadenceEvents, batch *pebbleDB.Batch
 		batch,
 	)
 	if err != nil {
-		return fmt.Errorf("failed to store state changes on block: %d", events.Block().Height)
+		return fmt.Errorf("failed to store state changes on block: %d", block.Height)
 	}
 
 	// Step 2.2: Write the latest EVM block to `Blocks` storage
@@ -282,11 +293,11 @@ func (e *Engine) indexEvents(events *models.CadenceEvents, batch *pebbleDB.Batch
 	err = e.indexBlock(
 		events.CadenceHeight(),
 		events.CadenceBlockID(),
-		events.Block(),
+		block,
 		batch,
 	)
 	if err != nil {
-		return fmt.Errorf("failed to index block %d event: %w", events.Block().Height, err)
+		return fmt.Errorf("failed to index block %d event: %w", block.Height, err)
 	}
 
 	// Step 2.3: Write all EVM transactions of the current block,
@@ -304,10 +315,10 @@ func (e *Engine) indexEvents(events *models.CadenceEvents, batch *pebbleDB.Batch
 	// to `Receipts` storage
 	err = e.indexReceipts(events.Receipts(), batch)
 	if err != nil {
-		return fmt.Errorf("failed to index receipts for block %d event: %w", events.Block().Height, err)
+		return fmt.Errorf("failed to index receipts for block %d event: %w", block.Height, err)
 	}
 
-	blockCreation := time.Unix(int64(events.Block().Timestamp), 0)
+	blockCreation := time.Unix(int64(block.Timestamp), 0)
 	e.collector.BlockIngestionTime(blockCreation)
 
 	return nil

services/ingestion/engine_test.go

@@ -74,6 +74,7 @@ func TestSerialBlockIngestion(t *testing.T) {
 			zerolog.Nop(),
 			metrics.NopCollector,
 			defaultReplayerConfig(),
+			types.FlowEVMPreviewNetChainID,
 		)
 
 		done := make(chan struct{})
@@ -153,6 +154,7 @@ func TestSerialBlockIngestion(t *testing.T) {
 			zerolog.Nop(),
 			metrics.NopCollector,
 			defaultReplayerConfig(),
+			types.FlowEVMPreviewNetChainID,
 		)
 
 		waitErr := make(chan struct{})
@@ -265,6 +267,7 @@ func TestBlockAndTransactionIngestion(t *testing.T) {
 			zerolog.Nop(),
 			metrics.NopCollector,
 			defaultReplayerConfig(),
+			types.FlowEVMPreviewNetChainID,
 		)
 
 		done := make(chan struct{})
@@ -364,6 +367,7 @@ func TestBlockAndTransactionIngestion(t *testing.T) {
 			zerolog.Nop(),
 			metrics.NopCollector,
 			defaultReplayerConfig(),
+			types.FlowEVMPreviewNetChainID,
 		)
 
 		done := make(chan struct{})
@@ -455,6 +459,7 @@ func TestBlockAndTransactionIngestion(t *testing.T) {
 			zerolog.Nop(),
 			metrics.NopCollector,
 			defaultReplayerConfig(),
+			types.FlowEVMPreviewNetChainID,
 		)
 
 		done := make(chan struct{})