Skip to content
Open
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
16 changes: 16 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,13 @@ packages = [
"ethereum.forks.osaka.vm.instructions",
"ethereum.forks.osaka.vm.precompiled_contracts",
"ethereum.forks.osaka.vm.precompiled_contracts.bls12_381",
"ethereum.forks.amsterdam",
"ethereum.forks.amsterdam.block_access_lists",
"ethereum.forks.amsterdam.utils",
"ethereum.forks.amsterdam.vm",
"ethereum.forks.amsterdam.vm.instructions",
"ethereum.forks.amsterdam.vm.precompiled_contracts",
"ethereum.forks.amsterdam.vm.precompiled_contracts.bls12_381",
]

[tool.setuptools.package-data]
Expand Down Expand Up @@ -507,6 +514,15 @@ ignore = [
"src/ethereum_spec_tools/evm_tools/t8n/evm_trace.py" = [
"N815" # The traces must use camel case in JSON property names
]
"src/ethereum/forks/amsterdam/blocks.py" = [
"E501" # Line too long - needed for long ref links
]
"src/ethereum/forks/amsterdam/block_access_lists/builder.py" = [
"E501" # Line too long - needed for long ref links
]
"src/ethereum/forks/amsterdam/block_access_lists/rlp_utils.py" = [
"E501" # Line too long - needed for long ref links
]

[tool.ruff.lint.mccabe]
# Set the maximum allowed cyclomatic complexity. C901 default is 10.
Expand Down
4 changes: 2 additions & 2 deletions src/ethereum/fork_criteria.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ class Unscheduled(ForkCriteria):
Forks that have not been scheduled.
"""

def __init__(self) -> None:
self._internal = (ForkCriteria.UNSCHEDULED, 0)
def __init__(self, order_index: int = 0) -> None:
self._internal = (ForkCriteria.UNSCHEDULED, order_index)

@override
def check(self, block_number: Uint, timestamp: U256) -> Literal[False]:
Expand Down
7 changes: 7 additions & 0 deletions src/ethereum/forks/amsterdam/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
"""
The Amsterdam fork.
"""

from ethereum.fork_criteria import Unscheduled

FORK_CRITERIA = Unscheduled(order_index=1) # scheduled after Osaka
57 changes: 57 additions & 0 deletions src/ethereum/forks/amsterdam/block_access_lists/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
"""
Block Access Lists (EIP-7928) implementation for Ethereum Amsterdam fork.
"""

from .builder import (
BlockAccessListBuilder,
add_balance_change,
add_code_change,
add_nonce_change,
add_storage_read,
add_storage_write,
add_touched_account,
build_block_access_list,
)
from .rlp_utils import (
compute_block_access_list_hash,
rlp_encode_block_access_list,
validate_block_access_list_against_execution,
)
from .tracker import (
StateChangeTracker,
begin_call_frame,
commit_call_frame,
rollback_call_frame,
set_block_access_index,
track_address_access,
track_balance_change,
track_code_change,
track_nonce_change,
track_storage_read,
track_storage_write,
)

__all__ = [
"BlockAccessListBuilder",
"StateChangeTracker",
"add_balance_change",
"add_code_change",
"add_nonce_change",
"add_storage_read",
"add_storage_write",
"add_touched_account",
"begin_call_frame",
"build_block_access_list",
"commit_call_frame",
"compute_block_access_list_hash",
"rollback_call_frame",
"set_block_access_index",
"rlp_encode_block_access_list",
"track_address_access",
"track_balance_change",
"track_code_change",
"track_nonce_change",
"track_storage_read",
"track_storage_write",
"validate_block_access_list_against_execution",
]
Loading
Loading