From c65177c035d63712c1bd1260cc70d25d5abc767e Mon Sep 17 00:00:00 2001
From: Manav Darji <manavdarji.india@gmail.com>
Date: Wed, 26 Mar 2025 11:05:56 +0530
Subject: [PATCH] core, eth, internal/cli: chain event fixes

---
 core/events.go                 |  3 +++
 eth/gasprice/gasprice.go       |  4 ++--
 eth/tracers/tracers_test.go    |  3 ++-
 internal/cli/server/service.go | 12 ++++++------
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/events.go b/core/events.go
index a773ea5d3b..62fb2d3cf5 100644
--- a/core/events.go
+++ b/core/events.go
@@ -23,6 +23,9 @@ import (
 // NewTxsEvent is posted when a batch of transactions enter the transaction pool.
 type NewTxsEvent struct{ Txs []*types.Transaction }
 
+// NewMinedBlockEvent is posted when a block has been imported.
+type NewMinedBlockEvent struct{ Block *types.Block }
+
 // RemovedLogsEvent is posted when a reorg happens
 type RemovedLogsEvent struct{ Logs []*types.Log }
 
diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go
index ab2953550d..c7a4dc2ca0 100644
--- a/eth/gasprice/gasprice.go
+++ b/eth/gasprice/gasprice.go
@@ -158,11 +158,11 @@ func (oracle *Oracle) ProcessCache() {
 	go func() {
 		var lastHead common.Hash
 		for ev := range headEvent {
-			if ev.Block.ParentHash() != lastHead {
+			if ev.Header.ParentHash != lastHead {
 				oracle.historyCache.Purge()
 			}
 
-			lastHead = ev.Block.Hash()
+			lastHead = ev.Header.Hash()
 		}
 	}()
 }
diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go
index 2ba95081c6..78741003da 100644
--- a/eth/tracers/tracers_test.go
+++ b/eth/tracers/tracers_test.go
@@ -17,6 +17,7 @@
 package tracers
 
 import (
+	"context"
 	"math/big"
 	"testing"
 
@@ -104,7 +105,7 @@ func BenchmarkTransactionTrace(b *testing.B) {
 		snap := state.StateDB.Snapshot()
 		tracer.OnTxStart(evm.GetVMContext(), tx, msg.From)
 		st := core.NewStateTransition(evm, msg, new(core.GasPool).AddGas(tx.Gas()))
-		res, err := st.TransitionDb()
+		res, err := st.TransitionDb(context.Background())
 		if err != nil {
 			b.Fatal(err)
 		}
diff --git a/internal/cli/server/service.go b/internal/cli/server/service.go
index bf72a0e848..dd2c02d722 100644
--- a/internal/cli/server/service.go
+++ b/internal/cli/server/service.go
@@ -311,13 +311,13 @@ func gatherForks(configList ...interface{}) []*proto.StatusResponse_Fork {
 	return forks
 }
 
-func convertBlockToBlockStub(blocks []*types.Block) []*proto.BlockStub {
+func convertHeaderToBlockStub(headers []*types.Header) []*proto.BlockStub {
 	var blockStubs []*proto.BlockStub
 
-	for _, block := range blocks {
+	for _, header := range headers {
 		blockStub := &proto.BlockStub{
-			Hash:   block.Hash().String(),
-			Number: block.NumberU64(),
+			Hash:   header.Hash().String(),
+			Number: header.Number.Uint64(),
 		}
 		blockStubs = append(blockStubs, blockStub)
 	}
@@ -337,8 +337,8 @@ func (s *Server) ChainWatch(req *proto.ChainWatchRequest, reply proto.Bor_ChainW
 		msg := <-chain2HeadCh
 
 		err := reply.Send(&proto.ChainWatchResponse{Type: msg.Type,
-			Newchain: convertBlockToBlockStub(msg.NewChain),
-			Oldchain: convertBlockToBlockStub(msg.OldChain),
+			Newchain: convertHeaderToBlockStub(msg.NewChain),
+			Oldchain: convertHeaderToBlockStub(msg.OldChain),
 		})
 		if err != nil {
 			return err