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
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ class Result(CamelModel):
requests: List[Bytes] | None = None
block_access_list: Bytes | None = None
block_access_list_hash: Hash | None = None
is_inclusion_list_satisfied: bool | None = None
inclusion_list_satisfied: bool | None = None
block_exception: Annotated[
BlockExceptionWithMessage | UndefinedException | None,
ExceptionMapperValidator,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -479,4 +479,4 @@ def test_transition_tool_output_parses_inclusion_list_satisfaction() -> None:
}
)

assert output.result.is_inclusion_list_satisfied is False
assert output.result.inclusion_list_satisfied is False
2 changes: 1 addition & 1 deletion packages/testing/src/execution_testing/specs/blockchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ def get_fixture_engine_new_payload(self) -> FixtureEngineNewPayload:
validation_error=self.expected_exception,
status=(
PayloadStatusEnum.INCLUSION_LIST_UNSATISFIED.value
if self.result.is_inclusion_list_satisfied is False
if self.result.inclusion_list_satisfied is False
else None
),
error_code=self.engine_api_error_code,
Expand Down
14 changes: 6 additions & 8 deletions src/ethereum/forks/amsterdam/fork.py
Original file line number Diff line number Diff line change
Expand Up @@ -907,13 +907,11 @@ def apply_body(
process_transaction(block_env, block_output, tx, Uint(i))

# Check if the block satisfies the inclusion list constraints (EIP-7805)
block_output.is_inclusion_list_satisfied = (
check_inclusion_list_transactions(
block_env=block_env,
block_output=block_output,
transactions=transactions,
inclusion_list_transactions=inclusion_list_transactions,
)
block_output.inclusion_list_satisfied = check_inclusion_list_transactions(
block_env=block_env,
block_output=block_output,
transactions=transactions,
inclusion_list_transactions=inclusion_list_transactions,
)

# EIP-7928: Post-execution operations use index N+1
Expand Down Expand Up @@ -1287,7 +1285,7 @@ def check_inclusion_list_transactions(

Returns
-------
is_inclusion_list_satisfied : `bool`
inclusion_list_satisfied : `bool`
True if the block passes the inclusion list check, False otherwise.

"""
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/forks/amsterdam/vm/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class BlockOutput:
Hash of all the requests in the block.
block_access_list: `BlockAccessList`
The block access list for the block.
is_inclusion_list_satisfied : `bool`
inclusion_list_satisfied : `bool`
Whether the block satisfies the inclusion list constraints.
"""

Expand All @@ -113,7 +113,7 @@ class BlockOutput:
blob_gas_used: U64 = U64(0)
requests: List[Bytes] = field(default_factory=list)
block_access_list: BlockAccessList = field(default_factory=list)
is_inclusion_list_satisfied: bool = True
inclusion_list_satisfied: bool = True


@final
Expand Down
6 changes: 3 additions & 3 deletions src/ethereum_spec_tools/evm_tools/loaders/fork_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@ def check_inclusion_list_transactions(self) -> Any:
return self._module("fork").check_inclusion_list_transactions

@property
def has_is_inclusion_list_satisfied(self) -> bool:
def has_inclusion_list_satisfied(self) -> bool:
"""
Check if the block output has an `is_inclusion_list_satisfied` field.
Check if the block output has an `inclusion_list_satisfied` field.
"""
return hasattr(self.BlockOutput, "is_inclusion_list_satisfied")
return hasattr(self.BlockOutput, "inclusion_list_satisfied")

@property
def Block(self) -> Any:
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum_spec_tools/evm_tools/t8n/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,8 +524,8 @@ def _run_blockchain_test(self, block_env: Any, block_output: Any) -> None:
U256(self.options.state_reward), block_env
)

if self.fork.has_is_inclusion_list_satisfied:
block_output.is_inclusion_list_satisfied = (
if self.fork.has_inclusion_list_satisfied:
block_output.inclusion_list_satisfied = (
self.fork.check_inclusion_list_transactions(
block_env,
block_output,
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum_spec_tools/evm_tools/t8n/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,8 +340,8 @@ def read_inclusion_list_transactions(self, data: Any, t8n: "T8N") -> None:
"""
self.inclusion_list_transactions = None

if not t8n.fork.has_is_inclusion_list_satisfied:
print("Block does not have an 'is_inclusion_list_satisfied' field")
if not t8n.fork.has_inclusion_list_satisfied:
print("Block does not have an 'inclusion_list_satisfied' field")
return

inclusion_list_transactions = []
Expand Down
12 changes: 6 additions & 6 deletions src/ethereum_spec_tools/evm_tools/t8n/t8n_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ class Result:
block_exception: Optional[str] = None
block_access_list: Optional[Any] = None
block_access_list_hash: Optional[Hash32] = None
is_inclusion_list_satisfied: Optional[bool] = None
inclusion_list_satisfied: Optional[bool] = None

def get_receipts_from_output(
self,
Expand Down Expand Up @@ -349,9 +349,9 @@ def update(self, t8n: "T8N", block_env: Any, block_output: Any) -> None:
block_output.block_access_list
)

if hasattr(block_output, "is_inclusion_list_satisfied"):
self.is_inclusion_list_satisfied = (
block_output.is_inclusion_list_satisfied
if hasattr(block_output, "inclusion_list_satisfied"):
self.inclusion_list_satisfied = (
block_output.inclusion_list_satisfied
)

def json_encode_receipts(self) -> Any:
Expand Down Expand Up @@ -446,7 +446,7 @@ def to_json(self) -> Any:
self.block_access_list_hash
)

if self.is_inclusion_list_satisfied is not None:
data["isInclusionListSatisfied"] = self.is_inclusion_list_satisfied
if self.inclusion_list_satisfied is not None:
data["isInclusionListSatisfied"] = self.inclusion_list_satisfied

return data
Loading