added a way to get latest executed block post POS (erigontech#5343)

* added a way to get latest executed block post POS * added erigon_ExecutedBlockNumber into readme * optional rpc.BlockNumber * better message * updated readme
lh77x7 · Sep 14, 2022 · 0c64c3f · 0c64c3f
1 parent 566cd65
commit 0c64c3f
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 0 deletions.
diff --git a/cmd/rpcdaemon/README.md b/cmd/rpcdaemon/README.md
@@ -313,6 +313,7 @@ The following table shows the current implementation status of Erigon's RPC daem
 | erigon_forks                               | Yes     | Erigon only                          |
 | erigon_issuance                            | Yes     | Erigon only                          |
 | erigon_GetBlockByTimestamp                 | Yes     | Erigon only                          |
+| erigon_BlockNumber                         | Yes     | Erigon only                          |
 |                                            |         |                                      |
 | bor_getSnapshot                            | Yes     | Bor only                             |
 | bor_getAuthor                              | Yes     | Bor only                             |

diff --git a/cmd/rpcdaemon/commands/erigon_system.go b/cmd/rpcdaemon/commands/erigon_system.go
@@ -4,7 +4,10 @@ import (
 	"context"
 
 	"github.com/ledgerwatch/erigon/common"
+	"github.com/ledgerwatch/erigon/common/hexutil"
 	"github.com/ledgerwatch/erigon/core/forkid"
+	"github.com/ledgerwatch/erigon/rpc"
+	"github.com/ledgerwatch/erigon/turbo/rpchelper"
 )
 
 // Forks is a data type to record a list of forks passed by this node
@@ -29,3 +32,46 @@ func (api *ErigonImpl) Forks(ctx context.Context) (Forks, error) {
 
 	return Forks{genesis.Hash(), forksBlocks}, nil
 }
+
+// Post the merge eth_blockNumber will return latest forkChoiceHead block number
+// erigon_blockNumber will return latest executed block number or any block number requested
+func (api *ErigonImpl) BlockNumber(ctx context.Context, rpcBlockNumPtr *rpc.BlockNumber) (hexutil.Uint64, error) {
+	tx, err := api.db.BeginRo(ctx)
+	if err != nil {
+		return 0, err
+	}
+	defer tx.Rollback()
+
+	var rpcBlockNum rpc.BlockNumber
+	if rpcBlockNumPtr == nil {
+		rpcBlockNum = rpc.LatestExecutedBlockNumber
+	}
+
+	var blockNum uint64
+	switch rpcBlockNum {
+	case rpc.LatestBlockNumber:
+		blockNum, err = rpchelper.GetLatestBlockNumber(tx)
+		if err != nil {
+			return 0, err
+		}
+	case rpc.EarliestBlockNumber:
+		blockNum = 0
+	case rpc.SafeBlockNumber:
+		blockNum, err = rpchelper.GetSafeBlockNumber(tx)
+		if err != nil {
+			return 0, err
+		}
+	case rpc.FinalizedBlockNumber:
+		blockNum, err = rpchelper.GetFinalizedBlockNumber(tx)
+		if err != nil {
+			return 0, err
+		}
+	default:
+		blockNum, err = rpchelper.GetLatestExecutedBlockNumber(tx)
+		if err != nil {
+			return 0, err
+		}
+	}
+
+	return hexutil.Uint64(blockNum), nil
+}
diff --git a/turbo/rpchelper/rpc_block.go b/turbo/rpchelper/rpc_block.go
@@ -54,3 +54,11 @@ func GetSafeBlockNumber(tx kv.Tx) (uint64, error) {
 	}
 	return 0, UnknownBlockError
 }
+
+func GetLatestExecutedBlockNumber(tx kv.Tx) (uint64, error) {
+	blockNum, err := stages.GetStageProgress(tx, stages.Execution)
+	if err != nil {
+		return 0, err
+	}
+	return blockNum, err
+}