From 16de33504ed0b21a1945cfbf7e57753c485dc67e Mon Sep 17 00:00:00 2001 From: David Zhou Date: Fri, 6 Jun 2025 11:09:32 -0400 Subject: [PATCH] Merge 2 --- consensus/bor/statefull/processor.go | 2 +- core/state/statedb.go | 3 --- internal/ethapi/simulate.go | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/consensus/bor/statefull/processor.go b/consensus/bor/statefull/processor.go index 2944d47699..36b19420fc 100644 --- a/consensus/bor/statefull/processor.go +++ b/consensus/bor/statefull/processor.go @@ -148,7 +148,7 @@ func ApplyMessage( } receipt.Logs = state.GetLogs(tx.Hash(), header.Number.Uint64(), blockHash) - receipt.Bloom = types.CreateBloom(types.Receipts{receipt}) + receipt.Bloom = types.CreateBloom(receipt) receipt.BlockHash = blockHash receipt.BlockNumber = header.Number receipt.TransactionIndex = 0 diff --git a/core/state/statedb.go b/core/state/statedb.go index 9e3e69dc66..9d8572c57f 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -1052,9 +1052,6 @@ func (s *StateDB) mvRecordWritten(object *stateObject) *stateObject { // existing account with the given address, otherwise it will be silently overwritten. func (s *StateDB) createObject(addr common.Address) *stateObject { obj := newObject(s, addr, nil) - if s.logger != nil && s.logger.OnNewAccount != nil { - s.logger.OnNewAccount(addr) - } s.journal.append(createObjectChange{account: addr}) s.setStateObject(obj) diff --git a/internal/ethapi/simulate.go b/internal/ethapi/simulate.go index e9ac724bdd..24537b7c54 100644 --- a/internal/ethapi/simulate.go +++ b/internal/ethapi/simulate.go @@ -354,7 +354,7 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header, } blockBody := &types.Body{Transactions: txes, Withdrawals: *block.BlockOverrides.Withdrawals} chainHeadReader := &simChainHeadReader{ctx, sim.b} - b, err := sim.b.Engine().FinalizeAndAssemble(chainHeadReader, header, sim.state, blockBody, receipts) + b, err := sim.b.Engine().FinalizeAndAssemble(chainHeadReader, header, sim.state, blockBody, receipts, nil) if err != nil { return nil, nil, nil, err }