fix: use latest executed block for eth_getTransactionCount when runni…

…ng as sequencer
0xPolygonHermez · Oct 21, 2024 · 367cbf6 · 367cbf6
1 parent 7d2fc91
commit 367cbf6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/rpc/types.go b/rpc/types.go
@@ -161,7 +161,7 @@ func (bn *BlockNumber) MarshallJson() string {
 	case -5:
 		return "latestExecuted"
 	default:
-		return fmt.Sprintf("0x%x", int64(*bn))
+		return fmt.Sprintf("0x%x", bn.Int64())
 	}
 }
 

diff --git a/turbo/jsonrpc/eth_accounts.go b/turbo/jsonrpc/eth_accounts.go
@@ -79,6 +79,17 @@ func (api *APIImpl) GetTransactionCount(ctx context.Context, address libcommon.A
 		return nil, fmt.Errorf("getTransactionCount cannot open tx: %w", err1)
 	}
 	defer tx.Rollback()
+
+	latestExecutedBlockNumber, err := rpchelper.GetLatestExecutedBlockNumber(tx)
+	if err != nil {
+		return nil, fmt.Errorf("getTransactionCount cannot get latest executed block number: %w", err)
+	}
+
+	if blockNrOrHash.BlockNumber != nil && *blockNrOrHash.BlockNumber == rpc.BlockNumber(latestExecutedBlockNumber) {
+		blockNumber := rpc.BlockNumber(rpc.LatestExecutedBlockNumber)
+		blockNrOrHash.BlockNumber = &blockNumber
+	}
+
 	reader, err := rpchelper.CreateStateReader(ctx, tx, *blockNrOrHash, 0, api.filters, api.stateCache, api.historyV3(tx), "")
 	if err != nil {
 		return nil, err