From 0253db6ce5544efabb75be1d7437bf4905a15573 Mon Sep 17 00:00:00 2001 From: Josh Klopfenstein Date: Thu, 26 Mar 2026 08:11:25 -0500 Subject: [PATCH] Some fixes for bal-devnet-3 (#34090) Rename `balHash` to `blockAccessListHash` in json encoding of block header. Fix miner panic when attempting to create pre-amsterdam blocks. --- core/types/block.go | 2 +- core/types/gen_header_json.go | 4 ++-- miner/worker.go | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/types/block.go b/core/types/block.go index 41f799cf80..3b0ab54237 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -102,7 +102,7 @@ type Header struct { RequestsHash *common.Hash `json:"requestsHash" rlp:"optional"` // BlockAccessListHash was added by EIP-7928 and is ignored in legacy headers. - BlockAccessListHash *common.Hash `json:"balHash" rlp:"optional"` + BlockAccessListHash *common.Hash `json:"blockAccessListHash" rlp:"optional"` // SlotNumber was added by EIP-7843 and is ignored in legacy headers. SlotNumber *uint64 `json:"slotNumber" rlp:"optional"` diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 2e2f1cdca5..6856562215 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -37,7 +37,7 @@ func (h Header) MarshalJSON() ([]byte, error) { ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas" rlp:"optional"` ParentBeaconRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"` RequestsHash *common.Hash `json:"requestsHash" rlp:"optional"` - BlockAccessListHash *common.Hash `json:"balHash" rlp:"optional"` + BlockAccessListHash *common.Hash `json:"blockAccessListHash" rlp:"optional"` SlotNumber *hexutil.Uint64 `json:"slotNumber" rlp:"optional"` Hash common.Hash `json:"hash"` } @@ -93,7 +93,7 @@ func (h *Header) UnmarshalJSON(input []byte) error { ExcessBlobGas *hexutil.Uint64 `json:"excessBlobGas" rlp:"optional"` ParentBeaconRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"` RequestsHash *common.Hash `json:"requestsHash" rlp:"optional"` - BlockAccessListHash *common.Hash `json:"balHash" rlp:"optional"` + BlockAccessListHash *common.Hash `json:"blockAccessListHash" rlp:"optional"` SlotNumber *hexutil.Uint64 `json:"slotNumber" rlp:"optional"` } var dec Header diff --git a/miner/worker.go b/miner/worker.go index 9f466ebfd6..867cadf70d 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -217,8 +217,10 @@ func (miner *Miner) generateWork(ctx context.Context, genParam *generateParams, } postMut.Merge(mut) - work.accessList.AccumulateMutations(postMut, uint16(work.tcount)+1) - work.accessList.AccumulateReads(work.state.Reader().(state.StateReaderTracker).GetStateAccessList()) + if work.accessList != nil { + work.accessList.AccumulateMutations(postMut, uint16(work.tcount)+1) + work.accessList.AccumulateReads(work.state.Reader().(state.StateReaderTracker).GetStateAccessList()) + } } if requests != nil { reqHash := types.CalcRequestsHash(requests) @@ -348,7 +350,9 @@ func (miner *Miner) prepareWork(ctx context.Context, genParams *generateParams, if miner.chainConfig.IsPrague(header.Number, header.Time) { mut.Merge(core.ProcessParentBlockHash(header.ParentHash, env.evm)) } - env.accessList.AccumulateMutations(mut, 0) + if env.accessList != nil { + env.accessList.AccumulateMutations(mut, 0) + } return env, nil }