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

Merge 2

Browse source
This commit is contained in:
David Zhou 2025-06-06 11:09:32 -04:00
parent a709465c8b
commit 16de33504e
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
consensus/bor/statefull/processor.go
View file

@ -148,7 +148,7 @@ func ApplyMessage(
} }
receipt.Logs = state.GetLogs(tx.Hash(), header.Number.Uint64(), blockHash) 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.BlockHash = blockHash
receipt.BlockNumber = header.Number receipt.BlockNumber = header.Number
receipt.TransactionIndex = 0 receipt.TransactionIndex = 0

3
core/state/statedb.go
View file

@ -1052,9 +1052,6 @@ func (s *StateDB) mvRecordWritten(object *stateObject) *stateObject {
// existing account with the given address, otherwise it will be silently overwritten. // existing account with the given address, otherwise it will be silently overwritten.
func (s *StateDB) createObject(addr common.Address) *stateObject { func (s *StateDB) createObject(addr common.Address) *stateObject {
obj := newObject(s, addr, nil) obj := newObject(s, addr, nil)
if s.logger != nil && s.logger.OnNewAccount != nil {
s.logger.OnNewAccount(addr)
}
s.journal.append(createObjectChange{account: addr}) s.journal.append(createObjectChange{account: addr})
s.setStateObject(obj) s.setStateObject(obj)

2
internal/ethapi/simulate.go
View file

@ -354,7 +354,7 @@ func (sim *simulator) processBlock(ctx context.Context, block *simBlock, header,
} }
blockBody := &types.Body{Transactions: txes, Withdrawals: *block.BlockOverrides.Withdrawals} blockBody := &types.Body{Transactions: txes, Withdrawals: *block.BlockOverrides.Withdrawals}
chainHeadReader := &simChainHeadReader{ctx, sim.b} 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 { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err
} }