forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-28 07:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

capture block end errors

Browse source
This commit is contained in:
Sina Mahmoodi 2023-06-30 15:29:38 +02:00
parent 54171ee4a8
commit 3cabef4c66
3 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/blockchain.go
View file

@ -158,8 +158,9 @@ var defaultCacheConfig = &CacheConfig{
type BlockchainLogger interface {
vm.EVMLogger
state.StateLogger
CaptureBlockStart(*types.Block)
CaptureBlockEnd()
OnBlockStart(*types.Block)
OnBlockEnd(td *big.Int, err error)
OnBlockValidationError(block *types.Block, err error)
OnGenesisBlock(*types.Block)
}
@ -1785,6 +1786,9 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error)
if err := bc.validator.ValidateState(block, statedb, receipts, usedGas); err != nil {
bc.reportBlock(block, receipts, err)
followupInterrupt.Store(true)
if bc.logger != nil {
bc.logger.OnBlockValidationError(block, err)
}
return it.index, err
}
vtime := time.Since(vstart)

21
core/state_processor.go
View file

@ -66,10 +66,18 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
blockNumber = block.Number()
allLogs []*types.Log
gp = new(GasPool).AddGas(block.GasLimit())
err error
)
if p.bc.logger != nil {
p.bc.logger.CaptureBlockStart(block)
defer p.bc.logger.CaptureBlockEnd()
p.bc.logger.OnBlockStart(block)
defer func() {
var td *big.Int
if err == nil {
td = p.bc.GetTd(block.ParentHash(), block.NumberU64()-1)
td.Add(td, block.Difficulty())
}
p.bc.logger.OnBlockEnd(td, err)
}()
}
// Mutate the block and state according to any hard-fork specs
if p.config.DAOForkSupport && p.config.DAOForkBlock != nil && p.config.DAOForkBlock.Cmp(block.Number()) == 0 {
@ -82,13 +90,15 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
)
// Iterate over and process the individual transactions
for i, tx := range block.Transactions() {
msg, err := TransactionToMessage(tx, signer, header.BaseFee)
var msg *Message
msg, err = TransactionToMessage(tx, signer, header.BaseFee)
if err != nil {
return nil, nil, 0, fmt.Errorf("could not apply tx %d [%v]: %w", i, tx.Hash().Hex(), err)
}
statedb.SetTxContext(tx.Hash(), i)
receipt, err := applyTransaction(msg, p.config, gp, statedb, blockNumber, blockHash, tx, usedGas, vmenv)
var receipt *types.Receipt
receipt, err = applyTransaction(msg, p.config, gp, statedb, blockNumber, blockHash, tx, usedGas, vmenv)
if vmenv.Config.Tracer != nil {
vmenv.Config.Tracer.CaptureTxEnd(receipt)
}
@ -101,7 +111,8 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
// Fail if Shanghai not enabled and len(withdrawals) is non-zero.
withdrawals := block.Withdrawals()
if len(withdrawals) > 0 && !p.config.IsShanghai(block.Number(), block.Time()) {
return nil, nil, 0, errors.New("withdrawals before shanghai")
err = errors.New("withdrawals before shanghai")
return nil, nil, 0, err
}
// Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
p.engine.Finalize(p.bc, header, statedb, block.Transactions(), block.Uncles(), withdrawals)

12
eth/tracers/printer.go
View file

@ -58,12 +58,16 @@ func (p *Printer) CaptureTxEnd(receipt *types.Receipt) {
fmt.Printf("CaptureTxEnd: receipt=%v\n", receipt)
}
func (p *Printer) CaptureBlockStart(b *types.Block) {
fmt.Printf("CaptureBlockStart: b=%v\n", b.NumberU64())
func (p *Printer) OnBlockStart(b *types.Block) {
fmt.Printf("OnBlockStart: b=%v\n", b.NumberU64())
}
func (p *Printer) CaptureBlockEnd() {
fmt.Printf("CaptureBlockEnd\n")
func (p *Printer) OnBlockEnd(td *big.Int, err error) {
fmt.Printf("OnBlockEnd: td=%v, err=%v\n", td, err)
}
func (p *Printer) OnBlockValidationError(block *types.Block, err error) {
fmt.Printf("OnBlockValidationError: b=%v, err=%v\n", block.NumberU64(), err)
}
func (p *Printer) OnGenesisBlock(b *types.Block) {