Skip to content

Commit c755b2c

Browse files
gurukamathfselmo
andauthored
fix(tests): remove bal from block body (#2017)
* tests(eip-7928): remove bal from block body * fix(tests): clean up json_infra and genesis bal in block * fix(tests): fix add_genesis_block empty bal hash --------- Co-authored-by: fselmo <fselmo2@gmail.com>
1 parent 41a5637 commit c755b2c

4 files changed

Lines changed: 1 addition & 21 deletions

File tree

packages/testing/src/execution_testing/fixtures/blockchain.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -554,9 +554,6 @@ def strip_block_number_computed_field(cls, data: Any) -> Any:
554554
)
555555
withdrawals: List[FixtureWithdrawal] | None = None
556556
execution_witness: WitnessChunk | None = None
557-
block_access_list: BlockAccessList | None = Field(
558-
None, description="EIP-7928 Block Access List"
559-
)
560557
fork: Fork | None = Field(None, exclude=True)
561558

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

581-
if self.block_access_list is not None:
582-
block.append(self.block_access_list.to_list())
583-
584578
return FixtureBlock(
585579
**self.model_dump(),
586580
rlp=eth_rlp.encode(block),

packages/testing/src/execution_testing/specs/blockchain.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,6 @@ def get_fixture_block(self) -> FixtureBlock | InvalidFixtureBlock:
380380
if self.withdrawals is not None
381381
else None
382382
),
383-
block_access_list=self.block_access_list
384-
if self.block_access_list
385-
else None,
386383
fork=self.fork,
387384
).with_rlp(txs=self.txs)
388385

@@ -563,16 +560,11 @@ def make_genesis(
563560
state_root = pre_alloc.state_root()
564561
genesis = FixtureHeader.genesis(self.fork, env, state_root)
565562

566-
genesis_bal = None
567-
if self.fork.header_bal_hash_required(block_number=0, timestamp=0):
568-
genesis_bal = BlockAccessList()
569-
570563
return (
571564
pre_alloc,
572565
FixtureBlockBase(
573566
header=genesis,
574567
withdrawals=None if env.withdrawals is None else [],
575-
block_access_list=genesis_bal,
576568
).with_rlp(txs=[]),
577569
)
578570

src/ethereum/genesis.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ def add_genesis_block(
260260
fields["requests_hash"] = Hash32(b"\0" * 32)
261261

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

265265
genesis_header = hardfork.Header(**fields)
266266

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

279-
if has_field(hardfork.Block, "block_access_list"):
280-
block_fields["block_access_list"] = rlp.encode([])
281-
282279
genesis_block = hardfork.Block(**block_fields)
283280

284281
chain.blocks.append(genesis_block)

tests/json_infra/helpers/load_blockchain_tests.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,6 @@ def runtest(self) -> None:
138138
if hasattr(genesis_header, "requests_root"):
139139
parameters.append(())
140140

141-
if hasattr(genesis_header, "block_access_list_hash"):
142-
parameters.append([])
143-
144141
genesis_block = load.fork.Block(*parameters)
145142

146143
genesis_header_hash = hex_to_bytes(

0 commit comments

Comments
 (0)