From 7a1a5991976d3bffa9742936651a5033275a9e19 Mon Sep 17 00:00:00 2001
From: jenikd <jd@fantom.foundation>
Date: Wed, 11 Dec 2024 14:50:46 +0100
Subject: [PATCH] Handle finalized and safe block nr. tags

---
 gossip/ethapi_backend.go | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gossip/ethapi_backend.go b/gossip/ethapi_backend.go
index 141904619..74b4fe961 100644
--- a/gossip/ethapi_backend.go
+++ b/gossip/ethapi_backend.go
@@ -59,7 +59,7 @@ func (b *EthAPIBackend) CurrentBlock() *evmcore.EvmBlock {
 
 func (b *EthAPIBackend) ResolveRpcBlockNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (idx.Block, error) {
 	latest := b.svc.store.GetLatestBlockIndex()
-	if number, ok := blockNrOrHash.Number(); ok && (number == rpc.LatestBlockNumber || number == rpc.PendingBlockNumber) {
+	if number, ok := blockNrOrHash.Number(); ok && isLatestBlockNumber(number) {
 		return latest, nil
 	} else if number, ok := blockNrOrHash.Number(); ok {
 		if idx.Block(number) > latest {
@@ -99,12 +99,9 @@ func (b *EthAPIBackend) HeaderByHash(ctx context.Context, h common.Hash) (*evmco
 
 // BlockByNumber returns evm block by its number, or nil if not exists.
 func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumber) (*evmcore.EvmBlock, error) {
-	if number == rpc.PendingBlockNumber {
-		number = rpc.LatestBlockNumber
-	}
 	// Otherwise, resolve and return the block
 	var blk *evmcore.EvmBlock
-	if number == rpc.LatestBlockNumber {
+	if isLatestBlockNumber(number) {
 		blk = b.state.CurrentBlock()
 	} else {
 		n := uint64(number.Int64())
@@ -114,10 +111,18 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe
 	return blk, nil
 }
 
+// isLatestBlockNumber returns true if the block number is latest, pending, finalized or safe
+func isLatestBlockNumber(number rpc.BlockNumber) bool {
+	return number == rpc.LatestBlockNumber ||
+		number == rpc.PendingBlockNumber ||
+		number == rpc.FinalizedBlockNumber ||
+		number == rpc.SafeBlockNumber
+}
+
 // StateAndHeaderByNumberOrHash returns evm state and block header by block number or block hash, err if not exists.
 func (b *EthAPIBackend) StateAndHeaderByNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) (state.StateDB, *evmcore.EvmHeader, error) {
 	var header *evmcore.EvmHeader
-	if number, ok := blockNrOrHash.Number(); ok && (number == rpc.LatestBlockNumber || number == rpc.PendingBlockNumber) {
+	if number, ok := blockNrOrHash.Number(); ok && isLatestBlockNumber(number) {
 		var err error
 		header, err = b.state.LastHeaderWithArchiveState()
 		if err != nil {
@@ -288,10 +293,7 @@ func (b *EthAPIBackend) GetReceiptsByNumber(ctx context.Context, number rpc.Bloc
 		return nil, errors.New("transactions index is disabled (enable TxIndex and re-process the DAGs)")
 	}
 
-	if number == rpc.PendingBlockNumber {
-		number = rpc.LatestBlockNumber
-	}
-	if number == rpc.LatestBlockNumber {
+	if isLatestBlockNumber(number) {
 		header := b.state.CurrentHeader()
 		number = rpc.BlockNumber(header.Number.Uint64())
 	}