Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions packages/testing/src/execution_testing/fixtures/blockchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -554,9 +554,6 @@ def strip_block_number_computed_field(cls, data: Any) -> Any:
)
withdrawals: List[FixtureWithdrawal] | None = None
execution_witness: WitnessChunk | None = None
block_access_list: BlockAccessList | None = Field(
None, description="EIP-7928 Block Access List"
)
fork: Fork | None = Field(None, exclude=True)

@computed_field(alias="blocknumber") # type: ignore[prop-decorator]
Expand All @@ -578,9 +575,6 @@ def with_rlp(self, txs: List[Transaction]) -> "FixtureBlock":
if self.withdrawals is not None:
block.append([w.to_serializable_list() for w in self.withdrawals])

if self.block_access_list is not None:
block.append(self.block_access_list.to_list())

return FixtureBlock(
**self.model_dump(),
rlp=eth_rlp.encode(block),
Expand Down
8 changes: 0 additions & 8 deletions packages/testing/src/execution_testing/specs/blockchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,9 +380,6 @@ def get_fixture_block(self) -> FixtureBlock | InvalidFixtureBlock:
if self.withdrawals is not None
else None
),
block_access_list=self.block_access_list
if self.block_access_list
else None,
fork=self.fork,
).with_rlp(txs=self.txs)

Expand Down Expand Up @@ -563,16 +560,11 @@ def make_genesis(
state_root = pre_alloc.state_root()
genesis = FixtureHeader.genesis(self.fork, env, state_root)

genesis_bal = None
if self.fork.header_bal_hash_required(block_number=0, timestamp=0):
genesis_bal = BlockAccessList()

return (
pre_alloc,
FixtureBlockBase(
header=genesis,
withdrawals=None if env.withdrawals is None else [],
block_access_list=genesis_bal,
).with_rlp(txs=[]),
)

Expand Down
5 changes: 1 addition & 4 deletions src/ethereum/genesis.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ def add_genesis_block(
fields["requests_hash"] = Hash32(b"\0" * 32)

if has_field(hardfork.Header, "block_access_list_hash"):
fields["block_access_list_hash"] = Hash32(b"\0" * 32)
fields["block_access_list_hash"] = keccak256(rlp.encode([]))

genesis_header = hardfork.Header(**fields)

Expand All @@ -276,9 +276,6 @@ def add_genesis_block(
if has_field(hardfork.Block, "requests"):
block_fields["requests"] = ()

if has_field(hardfork.Block, "block_access_list"):
block_fields["block_access_list"] = rlp.encode([])

genesis_block = hardfork.Block(**block_fields)

chain.blocks.append(genesis_block)
Expand Down
3 changes: 0 additions & 3 deletions tests/json_infra/helpers/load_blockchain_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,6 @@ def runtest(self) -> None:
if hasattr(genesis_header, "requests_root"):
parameters.append(())

if hasattr(genesis_header, "block_access_list_hash"):
parameters.append([])

genesis_block = load.fork.Block(*parameters)

genesis_header_hash = hex_to_bytes(
Expand Down
Loading