add OnBlockchainInit for chainConfig

s1na · Feb 6, 2024 · f3c0a89 · f3c0a89
1 parent 188cd41
commit f3c0a89
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -190,9 +190,10 @@ func DefaultCacheConfigWithScheme(scheme string) *CacheConfig {
 type BlockchainLogger interface {
  vm.EVMLogger
  state.StateLogger
+ OnBlockchainInit(chainConfig *params.ChainConfig)
  // OnBlockStart is called before executing `block`.
  // `td` is the total difficulty prior to `block`.
- OnBlockStart(block *types.Block, td *big.Int, finalized *types.Header, safe *types.Header, chainConfig *params.ChainConfig)
+ OnBlockStart(block *types.Block, td *big.Int, finalized *types.Header, safe *types.Header)
  OnBlockEnd(err error)
  OnGenesisBlock(genesis *types.Block, alloc GenesisAlloc)
  OnBeaconBlockRootStart(root common.Hash)
@@ -502,6 +503,9 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, genesis *Genesis
  }
  rawdb.WriteChainConfig(db, genesisHash, chainConfig)
  }
+ if bc.logger != nil {
+ bc.logger.OnBlockchainInit(chainConfig)
+ }
  // Start tx indexer if it's enabled.
  if txLookupLimit != nil {
  bc.txIndexer = newTxIndexer(*txLookupLimit, bc)
@@ -1762,7 +1766,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, setHead bool) (int, error)
  }
  stats.processed++
  if bc.logger != nil {
- bc.logger.OnBlockStart(block, bc.GetTd(block.ParentHash(), block.NumberU64()-1), bc.CurrentFinalBlock(), bc.CurrentSafeBlock(), bc.chainConfig)
+ bc.logger.OnBlockStart(block, bc.GetTd(block.ParentHash(), block.NumberU64()-1), bc.CurrentFinalBlock(), bc.CurrentSafeBlock())
  bc.logger.OnBlockEnd(nil)
  }
 
@@ -1891,7 +1895,7 @@ type blockProcessingResult struct {
 func (bc *BlockChain) processBlock(block *types.Block, statedb *state.StateDB, start time.Time, setHead bool) (_ *blockProcessingResult, blockEndErr error) {
  if bc.logger != nil {
  td := bc.GetTd(block.ParentHash(), block.NumberU64()-1)
- bc.logger.OnBlockStart(block, td, bc.CurrentFinalBlock(), bc.CurrentSafeBlock(), bc.chainConfig)
+ bc.logger.OnBlockStart(block, td, bc.CurrentFinalBlock(), bc.CurrentSafeBlock())
  defer func() {
  bc.logger.OnBlockEnd(blockEndErr)
  }()

diff --git a/eth/tracers/live/printer.go b/eth/tracers/live/printer.go
@@ -84,7 +84,7 @@ func (p *Printer) CaptureTxEnd(receipt *types.Receipt, err error) {
  fmt.Printf("CaptureTxEnd: receipt=%s\n", buf)
 }
 
-func (p *Printer) OnBlockStart(b *types.Block, td *big.Int, finalized, safe *types.Header, _ *params.ChainConfig) {
+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 {
@@ -96,6 +96,10 @@ func (p *Printer) OnBlockEnd(err error) {
  fmt.Printf("OnBlockEnd: err=%v\n", err)
 }
 
+func (p *Printer) OnBlockchainInit(chainConfig *params.ChainConfig) {
+ fmt.Printf("OnBlockchainInit: chainConfig=%v\n", chainConfig)
+}
+
 func (p *Printer) OnGenesisBlock(b *types.Block, alloc core.GenesisAlloc) {
  fmt.Printf("OnGenesisBlock: b=%v, allocLength=%d\n", b.NumberU64(), len(alloc))
 }