From b692a68a3bff62041905ee4c7c8768477dd575be Mon Sep 17 00:00:00 2001 From: Sina Mahmoodi Date: Wed, 12 Jul 2023 17:22:52 +0200 Subject: [PATCH] add final & safe headers to BlockStart --- core/blockchain.go | 4 ++-- eth/tracers/printer.go | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/blockchain.go b/core/blockchain.go index 6db5be78e8..4abf32ed80 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -160,7 +160,7 @@ type BlockchainLogger interface { state.StateLogger // OnBlockStart is called before executing `block`. // `td` is the total difficulty prior to `block`. - OnBlockStart(block *types.Block, td *big.Int) + OnBlockStart(block *types.Block, td *big.Int, finalized *types.Header, safe *types.Header) OnBlockEnd(err error) OnGenesisBlock(genesis *types.Block) } @@ -1778,7 +1778,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error) if bc.logger != nil { td := bc.GetTd(block.ParentHash(), block.NumberU64()-1) - bc.logger.OnBlockStart(block, td) + bc.logger.OnBlockStart(block, td, bc.CurrentFinalBlock(), bc.CurrentSafeBlock()) } receipts, logs, usedGas, err := bc.processor.Process(block, statedb, bc.vmConfig) if err != nil { diff --git a/eth/tracers/printer.go b/eth/tracers/printer.go index f9ecf3b1dc..ce38f3b1a3 100644 --- a/eth/tracers/printer.go +++ b/eth/tracers/printer.go @@ -70,8 +70,12 @@ func (p *Printer) CaptureTxEnd(receipt *types.Receipt) { fmt.Printf("CaptureTxEnd: receipt=%s\n", buf) } -func (p *Printer) OnBlockStart(b *types.Block, td *big.Int) { - fmt.Printf("OnBlockStart: b=%v, td=%v\n", b.NumberU64(), td) +func (p *Printer) OnBlockStart(b *types.Block, td *big.Int, finalized, safe *types.Header) { + if finalized != nil && safe != nil { + fmt.Printf("OnBlockStart: b=%v, td=%v, finalized=%v, safe=%v\n", b.NumberU64(), td, finalized.Number.Uint64(), safe.Number.Uint64()) + } else { + fmt.Printf("OnBlockStart: b=%v, td=%v\n", b.NumberU64(), td) + } } func (p *Printer) OnBlockEnd(err error) {