From 5130c12a64a19db3837e8cb6ad3559dfd7855f6c Mon Sep 17 00:00:00 2001 From: pdobacz <5735525+pdobacz@users.noreply.github.com> Date: Mon, 2 Nov 2026 10:30:49 +0000 Subject: [PATCH] Rename MONAD_ELEVEN to MONAD_NEXT_AMSTERDAM Map it to monad revision 12. Co-Authored-By: Claude Opus 5.5 --- .github/configs/feature.yaml | 4 +-- .github/scripts/generate_build_matrix.py | 2 +- .../rust-harness/eest-runner/src/main.rs | 2 +- .../client_clis/clis/monad.py | 4 +-- .../src/execution_testing/forks/__init__.py | 8 ++--- .../execution_testing/forks/forks/forks.py | 12 +++---- .../forks/forks/transition.py | 8 ++--- .../forks/tests/test_forks.py | 36 +++++++++---------- .../__init__.py | 2 +- .../blocks.py | 28 ++++++++------- .../bloom.py | 0 .../exceptions.py | 0 .../fork.py | 0 .../fork_types.py | 0 .../requests.py | 25 +++++++------ .../state_tracker.py | 0 .../transactions.py | 0 .../utils/__init__.py | 0 .../utils/address.py | 4 +-- .../utils/hexadecimal.py | 2 +- .../utils/message.py | 4 +-- .../vm/__init__.py | 0 .../vm/eoa_delegation.py | 0 .../vm/exceptions.py | 0 .../vm/gas.py | 0 .../vm/instructions/__init__.py | 0 .../vm/instructions/arithmetic.py | 0 .../vm/instructions/bitwise.py | 0 .../vm/instructions/block.py | 32 ++++++++--------- .../vm/instructions/comparison.py | 0 .../vm/instructions/control_flow.py | 0 .../vm/instructions/environment.py | 0 .../vm/instructions/keccak.py | 0 .../vm/instructions/log.py | 0 .../vm/instructions/memory.py | 0 .../vm/instructions/stack.py | 0 .../vm/instructions/storage.py | 0 .../vm/instructions/system.py | 0 .../vm/interpreter.py | 4 +-- .../vm/memory.py | 0 .../vm/precompiled_contracts/__init__.py | 0 .../vm/precompiled_contracts/alt_bn128.py | 0 .../vm/precompiled_contracts/blake2f.py | 0 .../bls12_381/__init__.py | 0 .../bls12_381/bls12_381_g1.py | 0 .../bls12_381/bls12_381_g2.py | 0 .../bls12_381/bls12_381_pairing.py | 0 .../vm/precompiled_contracts/ecrecover.py | 0 .../vm/precompiled_contracts/identity.py | 0 .../vm/precompiled_contracts/mapping.py | 0 .../vm/precompiled_contracts/modexp.py | 0 .../vm/precompiled_contracts/p256verify.py | 0 .../precompiled_contracts/point_evaluation.py | 0 .../precompiled_contracts/reserve_balance.py | 0 .../vm/precompiled_contracts/ripemd160.py | 0 .../vm/precompiled_contracts/sha256.py | 0 .../vm/runtime.py | 0 .../vm/stack.py | 0 src/ethereum_spec_tools/utils.py | 6 ++-- tests/monad_eleven/__init__.py | 1 - tests/monad_next_amsterdam/__init__.py | 1 + .../eip7981_fee_solvency/__init__.py | 0 .../test_surcharged_fee.py | 0 .../eip7997_delegated_create/__init__.py | 0 .../test_factory_reach.py | 2 +- 65 files changed, 96 insertions(+), 91 deletions(-) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/__init__.py (93%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/blocks.py (92%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/bloom.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/exceptions.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/fork.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/fork_types.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/requests.py (91%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/state_tracker.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/transactions.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/utils/__init__.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/utils/address.py (94%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/utils/hexadecimal.py (97%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/utils/message.py (94%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/__init__.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/eoa_delegation.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/exceptions.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/gas.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/__init__.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/arithmetic.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/bitwise.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/block.py (81%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/comparison.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/control_flow.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/environment.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/keccak.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/log.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/memory.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/stack.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/storage.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/instructions/system.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/interpreter.py (99%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/memory.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/__init__.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/alt_bn128.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/blake2f.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/bls12_381/__init__.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/bls12_381/bls12_381_g1.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/bls12_381/bls12_381_g2.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/bls12_381/bls12_381_pairing.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/ecrecover.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/identity.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/mapping.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/modexp.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/p256verify.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/point_evaluation.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/reserve_balance.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/ripemd160.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/precompiled_contracts/sha256.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/runtime.py (100%) rename src/ethereum/forks/{monad_eleven => monad_next_amsterdam}/vm/stack.py (100%) delete mode 100644 tests/monad_eleven/__init__.py create mode 100644 tests/monad_next_amsterdam/__init__.py rename tests/{monad_eleven => monad_next_amsterdam}/eip7981_fee_solvency/__init__.py (100%) rename tests/{monad_eleven => monad_next_amsterdam}/eip7981_fee_solvency/test_surcharged_fee.py (100%) rename tests/{monad_eleven => monad_next_amsterdam}/eip7997_delegated_create/__init__.py (100%) rename tests/{monad_eleven => monad_next_amsterdam}/eip7997_delegated_create/test_factory_reach.py (98%) diff --git a/.github/configs/feature.yaml b/.github/configs/feature.yaml index e5e3c06fc0b..67999f1ac40 100644 --- a/.github/configs/feature.yaml +++ b/.github/configs/feature.yaml @@ -1,11 +1,11 @@ monad: evm-type: eels - fill-params: -m blockchain_test --from=MONAD_EIGHT --until=MONAD_ELEVEN --chain-id=143 -k "not invalid_header" + fill-params: -m blockchain_test --from=MONAD_EIGHT --until=MONAD_NEXT_AMSTERDAM --chain-id=143 -k "not invalid_header" monad_runloop: evm-type: eels # Like `monad`, but `--monad-runloop` and eestnet chain id `30143` - fill-params: -m blockchain_test --from=MONAD_EIGHT --until=MONAD_ELEVEN --chain-id=30143 --monad-runloop -k "not invalid_header" + fill-params: -m blockchain_test --from=MONAD_EIGHT --until=MONAD_NEXT_AMSTERDAM --chain-id=30143 --monad-runloop -k "not invalid_header" monad_benchmark: evm-type: eels diff --git a/.github/scripts/generate_build_matrix.py b/.github/scripts/generate_build_matrix.py index 5853dc99e3e..90abc2b0f54 100644 --- a/.github/scripts/generate_build_matrix.py +++ b/.github/scripts/generate_build_matrix.py @@ -75,7 +75,7 @@ "MONAD_EIGHT", "MONAD_NINE", "MONAD_TEN", - "MONAD_ELEVEN", + "MONAD_NEXT_AMSTERDAM", ] FORK_INDEX = {name: i for i, name in enumerate(FORK_ORDER)} diff --git a/monad-runloop/rust-harness/eest-runner/src/main.rs b/monad-runloop/rust-harness/eest-runner/src/main.rs index 045ecac48ca..767fe239322 100644 --- a/monad-runloop/rust-harness/eest-runner/src/main.rs +++ b/monad-runloop/rust-harness/eest-runner/src/main.rs @@ -242,7 +242,7 @@ fn main() { } // The canonical state root is the page-encoded secondary timeline's - // from MONAD_ELEVEN (MIP-8, revision 10) on, the slot-encoded + // from MONAD_TEN (MIP-8, revision 10) on, the slot-encoded // primary's before. The schedule is ascending, so the last entry is // the revision the run ends in. let final_revision = input diff --git a/packages/testing/src/execution_testing/client_clis/clis/monad.py b/packages/testing/src/execution_testing/client_clis/clis/monad.py index 4c7f95b9b76..252c32e6f9d 100644 --- a/packages/testing/src/execution_testing/client_clis/clis/monad.py +++ b/packages/testing/src/execution_testing/client_clis/clis/monad.py @@ -50,10 +50,10 @@ "MONAD_EIGHT": [(8, 0)], "MONAD_NINE": [(9, 0)], "MONAD_TEN": [(10, 0)], - "MONAD_ELEVEN": [(11, 0)], + "MONAD_NEXT_AMSTERDAM": [(12, 0)], "MONAD_EIGHTToMONAD_NINEAtTime15k": [(8, 0), (9, 15_000)], "MONAD_NINEToMONAD_TENAtTime15k": [(9, 0), (10, 15_000)], - "MONAD_TENToMONAD_ELEVENAtTime15k": [(10, 0), (11, 15_000)], + "MONAD_TENToMONAD_NEXT_AMSTERDAMAtTime15k": [(10, 0), (12, 15_000)], } diff --git a/packages/testing/src/execution_testing/forks/__init__.py b/packages/testing/src/execution_testing/forks/__init__.py index 041fe32a1d8..5ae39b23440 100644 --- a/packages/testing/src/execution_testing/forks/__init__.py +++ b/packages/testing/src/execution_testing/forks/__init__.py @@ -18,7 +18,7 @@ BPO4, BPO5, MONAD_EIGHT, - MONAD_ELEVEN, + MONAD_NEXT_AMSTERDAM, MONAD_NINE, MONAD_TEN, Amsterdam, @@ -52,7 +52,7 @@ CancunToPragueAtTime15k, MONAD_EIGHTToMONAD_NINEAtTime15k, MONAD_NINEToMONAD_TENAtTime15k, - MONAD_TENToMONAD_ELEVENAtTime15k, + MONAD_TENToMONAD_NEXT_AMSTERDAMAtTime15k, OsakaToBPO1AtTime15k, ParisToShanghaiAtTime15k, PragueToOsakaAtTime15k, @@ -161,8 +161,8 @@ "MONAD_NINE", "MONAD_NINEToMONAD_TENAtTime15k", "MONAD_TEN", - "MONAD_TENToMONAD_ELEVENAtTime15k", - "MONAD_ELEVEN", + "MONAD_TENToMONAD_NEXT_AMSTERDAMAtTime15k", + "MONAD_NEXT_AMSTERDAM", "BPO1", "BPO1ToBPO2AtTime15k", "BPO2", diff --git a/packages/testing/src/execution_testing/forks/forks/forks.py b/packages/testing/src/execution_testing/forks/forks/forks.py index 2e30a2a99ec..68153c92498 100644 --- a/packages/testing/src/execution_testing/forks/forks/forks.py +++ b/packages/testing/src/execution_testing/forks/forks/forks.py @@ -1943,7 +1943,7 @@ class Bogota( pass -class MONAD_ELEVEN( # noqa: N801 +class MONAD_NEXT_AMSTERDAM( # noqa: N801 eips.EIP7708, eips.EIP7843, eips.EIP7981, @@ -1954,24 +1954,24 @@ class MONAD_ELEVEN( # noqa: N801 deployed=False, ): """ - MONAD_ELEVEN fork. + MONAD_NEXT_AMSTERDAM fork. Amsterdam-based successor to MONAD_TEN, adopting the EIP-7708, EIP-7843, EIP-7981, EIP-7997, EIP-8024 and EIP-8246 changes. The Amsterdam changes it does not adopt stay out of the fork by not - being inherited at all; the fork order still places MONAD_ELEVEN + being inherited at all; the fork order still places MONAD_NEXT_AMSTERDAM after Amsterdam through `follows`. """ @classmethod def follows(cls) -> type[BaseFork] | None: - """MONAD_ELEVEN comes after Amsterdam without inheriting it.""" + """MONAD_NEXT_AMSTERDAM comes after Amsterdam without inheriting it.""" return Amsterdam @classmethod def header_bal_hash_required(cls) -> bool: """ - MONAD_ELEVEN headers carry the block access list hash field, fixed - at zero, without building block access lists (EIP-7928). + MONAD_NEXT_AMSTERDAM headers carry the block access list hash field, + fixed at zero, without building block access lists (EIP-7928). """ return True diff --git a/packages/testing/src/execution_testing/forks/forks/transition.py b/packages/testing/src/execution_testing/forks/forks/transition.py index 39227d304cf..bf00e877356 100644 --- a/packages/testing/src/execution_testing/forks/forks/transition.py +++ b/packages/testing/src/execution_testing/forks/forks/transition.py @@ -7,7 +7,7 @@ BPO3, BPO4, MONAD_EIGHT, - MONAD_ELEVEN, + MONAD_NEXT_AMSTERDAM, MONAD_NINE, MONAD_TEN, Amsterdam, @@ -75,10 +75,10 @@ class MONAD_NINEToMONAD_TENAtTime15k(TransitionBaseClass): # noqa: N801 @transition_fork( - to_fork=MONAD_ELEVEN, from_fork=MONAD_TEN, at_timestamp=15_000 + to_fork=MONAD_NEXT_AMSTERDAM, from_fork=MONAD_TEN, at_timestamp=15_000 ) -class MONAD_TENToMONAD_ELEVENAtTime15k(TransitionBaseClass): # noqa: N801 - """MONAD_TEN to MONAD_ELEVEN transition at Timestamp 15k.""" +class MONAD_TENToMONAD_NEXT_AMSTERDAMAtTime15k(TransitionBaseClass): # noqa: N801 + """MONAD_TEN to MONAD_NEXT_AMSTERDAM transition at Timestamp 15k.""" pass diff --git a/packages/testing/src/execution_testing/forks/tests/test_forks.py b/packages/testing/src/execution_testing/forks/tests/test_forks.py index 708e27add8f..7e63bb86de8 100644 --- a/packages/testing/src/execution_testing/forks/tests/test_forks.py +++ b/packages/testing/src/execution_testing/forks/tests/test_forks.py @@ -19,7 +19,7 @@ BPO4, BPO5, MONAD_EIGHT, - MONAD_ELEVEN, + MONAD_NEXT_AMSTERDAM, MONAD_TEN, Amsterdam, Berlin, @@ -311,19 +311,19 @@ def test_succession_does_not_imply_eip_membership() -> None: """ A fork placed after another by `follows` does not gain its EIPs. - Succession orders MONAD_ELEVEN after Amsterdam so the Amsterdam - suites can select it, while the EIPs it declines must still compare - as absent. An adopted EIP is reached through inheritance instead, so - it keeps comparing as present. + Succession orders MONAD_NEXT_AMSTERDAM after Amsterdam so the + Amsterdam suites can select it, while the EIPs it declines must still + compare as absent. An adopted EIP is reached through inheritance + instead, so it keeps comparing as present. """ - assert MONAD_ELEVEN > Amsterdam - assert MONAD_ELEVEN > MONAD_TEN + assert MONAD_NEXT_AMSTERDAM > Amsterdam + assert MONAD_NEXT_AMSTERDAM > MONAD_TEN - assert MONAD_ELEVEN >= EIP7708 - assert MONAD_ELEVEN.is_eip_enabled(7708) + assert MONAD_NEXT_AMSTERDAM >= EIP7708 + assert MONAD_NEXT_AMSTERDAM.is_eip_enabled(7708) - assert not MONAD_ELEVEN >= EIP2780 - assert not MONAD_ELEVEN.is_eip_enabled(2780) + assert not MONAD_NEXT_AMSTERDAM >= EIP2780 + assert not MONAD_NEXT_AMSTERDAM.is_eip_enabled(2780) def test_transition_fork_comparison() -> None: @@ -412,13 +412,13 @@ class PreAllocTransitionFork(TransitionBaseClass): pass -def test_monad_eleven_is_not_deployed() -> None: +def test_monad_next_amsterdam_is_not_deployed() -> None: """ A fork under development must stay out of the deployed fork range. """ deployed_forks = get_deployed_forks() assert MONAD_TEN in deployed_forks - assert MONAD_ELEVEN not in deployed_forks + assert MONAD_NEXT_AMSTERDAM not in deployed_forks def opcode_names(fork: Type[BaseFork]) -> set[str]: @@ -428,15 +428,15 @@ def opcode_names(fork: Type[BaseFork]) -> set[str]: def test_adopted_opcodes_depend_on_mixin_order() -> None: """ - The adopted opcodes reach MONAD_ELEVEN through its mixin order. + The adopted opcodes reach MONAD_NEXT_AMSTERDAM through its mixin order. MONAD_NINE returning Osaka's list directly is what ends the chain - there, which is what lets a mixin placed ahead of the Monad forks - contribute on the way out. Making that call cooperative, or - reordering MONAD_ELEVEN's bases, drops these opcodes silently. + there, which is what lets a mixin placed ahead of the Monad forks + contribute on the way out. Making that call cooperative, or reordering + MONAD_NEXT_AMSTERDAM's bases, drops these opcodes silently. """ adopted = {"DUPN", "SWAPN", "EXCHANGE"} - assert adopted <= opcode_names(MONAD_ELEVEN) + assert adopted <= opcode_names(MONAD_NEXT_AMSTERDAM) assert not adopted & opcode_names(MONAD_TEN) class MixinAfterFork(MONAD_TEN, EIP8024): # noqa: N801 diff --git a/src/ethereum/forks/monad_eleven/__init__.py b/src/ethereum/forks/monad_next_amsterdam/__init__.py similarity index 93% rename from src/ethereum/forks/monad_eleven/__init__.py rename to src/ethereum/forks/monad_next_amsterdam/__init__.py index 30282ec017e..1a3d1e39d58 100644 --- a/src/ethereum/forks/monad_eleven/__init__.py +++ b/src/ethereum/forks/monad_next_amsterdam/__init__.py @@ -1,5 +1,5 @@ """ -MONAD_ELEVEN fork builds on MONAD_TEN, adopting part of Amsterdam. +MONAD_NEXT_AMSTERDAM fork builds on MONAD_TEN, adopting part of Amsterdam. The Amsterdam changes it does not adopt stay out of the fork entirely. The [EIP-7928] block access list hash header slot is carried but always diff --git a/src/ethereum/forks/monad_eleven/blocks.py b/src/ethereum/forks/monad_next_amsterdam/blocks.py similarity index 92% rename from src/ethereum/forks/monad_eleven/blocks.py rename to src/ethereum/forks/monad_next_amsterdam/blocks.py index 168435cea9b..9618358005e 100644 --- a/src/ethereum/forks/monad_eleven/blocks.py +++ b/src/ethereum/forks/monad_next_amsterdam/blocks.py @@ -40,7 +40,7 @@ class Withdrawal: chain) to the execution layer, as validated by the consensus layer. Each withdrawal is listed in the block's list of withdrawals. See [`block`]. - [`block`]: ref:ethereum.forks.monad_eleven.blocks.Block.withdrawals + [`block`]: ref:ethereum.forks.monad_next_amsterdam.blocks.Block.withdrawals """ index: U64 @@ -90,7 +90,8 @@ class Header: [`keccak256`]: ref:ethereum.crypto.hash.keccak256 [RLP]: https://ethereum.github.io/ethereum-rlp/src/ethereum_rlp/rlp.py.html - [`EMPTY_OMMER_HASH`]: ref:ethereum.forks.monad_eleven.fork.EMPTY_OMMER_HASH + [`EMPTY_OMMER_HASH`]: + ref:ethereum.forks.monad_next_amsterdam.fork.EMPTY_OMMER_HASH """ coinbase: Address @@ -146,7 +147,7 @@ class Header: Bloom filter for logs generated by transactions in this block. Constructed from all logs in the block using the [logs bloom] mechanism. - [logs bloom]: ref:ethereum.forks.monad_eleven.bloom.logs_bloom + [logs bloom]: ref:ethereum.forks.monad_next_amsterdam.bloom.logs_bloom """ difficulty: Uint @@ -244,7 +245,8 @@ class Header: [EIP-7685]. See [`compute_requests_hash`][crh] for more details. [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685 - [crh]: ref:ethereum.forks.monad_eleven.requests.compute_requests_hash + [crh]: + ref:ethereum.forks.monad_next_amsterdam.requests.compute_requests_hash [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2 """ @@ -255,7 +257,7 @@ class Header: zero. See [`validate_header`][vh]. [EIP-7928]: https://eips.ethereum.org/EIPS/eip-7928 - [vh]: ref:ethereum.forks.monad_eleven.fork.validate_header + [vh]: ref:ethereum.forks.monad_next_amsterdam.fork.validate_header """ slot_number: U64 @@ -290,8 +292,8 @@ class Block: Withdrawals represent ETH transfers from validators to their recipients, introduced by the consensus layer. Ommers remain deprecated and empty. - [`header`]: ref:ethereum.forks.monad_eleven.blocks.Header - [withdrawals]: ref:ethereum.forks.monad_eleven.blocks.Withdrawal + [`header`]: ref:ethereum.forks.monad_next_amsterdam.blocks.Header + [withdrawals]: ref:ethereum.forks.monad_next_amsterdam.blocks.Withdrawal """ header: Header @@ -299,7 +301,7 @@ class Block: The block header containing metadata and cryptographic commitments. Refer to [headers] for more details on the fields included in the header. - [headers]: ref:ethereum.forks.monad_eleven.blocks.Header + [headers]: ref:ethereum.forks.monad_next_amsterdam.blocks.Header """ transactions: Tuple[Bytes | LegacyTransaction, ...] @@ -331,11 +333,11 @@ class Log: [`LOG1`], [`LOG2`], [`LOG3`] and [`LOG4`]), which can be efficiently searched using the bloom filter in the block header. - [`LOG0`]: ref:ethereum.forks.monad_eleven.vm.instructions.log.log0 - [`LOG1`]: ref:ethereum.forks.monad_eleven.vm.instructions.log.log1 - [`LOG2`]: ref:ethereum.forks.monad_eleven.vm.instructions.log.log2 - [`LOG3`]: ref:ethereum.forks.monad_eleven.vm.instructions.log.log3 - [`LOG4`]: ref:ethereum.forks.monad_eleven.vm.instructions.log.log4 + [`LOG0`]: ref:ethereum.forks.monad_next_amsterdam.vm.instructions.log.log0 + [`LOG1`]: ref:ethereum.forks.monad_next_amsterdam.vm.instructions.log.log1 + [`LOG2`]: ref:ethereum.forks.monad_next_amsterdam.vm.instructions.log.log2 + [`LOG3`]: ref:ethereum.forks.monad_next_amsterdam.vm.instructions.log.log3 + [`LOG4`]: ref:ethereum.forks.monad_next_amsterdam.vm.instructions.log.log4 """ address: Address diff --git a/src/ethereum/forks/monad_eleven/bloom.py b/src/ethereum/forks/monad_next_amsterdam/bloom.py similarity index 100% rename from src/ethereum/forks/monad_eleven/bloom.py rename to src/ethereum/forks/monad_next_amsterdam/bloom.py diff --git a/src/ethereum/forks/monad_eleven/exceptions.py b/src/ethereum/forks/monad_next_amsterdam/exceptions.py similarity index 100% rename from src/ethereum/forks/monad_eleven/exceptions.py rename to src/ethereum/forks/monad_next_amsterdam/exceptions.py diff --git a/src/ethereum/forks/monad_eleven/fork.py b/src/ethereum/forks/monad_next_amsterdam/fork.py similarity index 100% rename from src/ethereum/forks/monad_eleven/fork.py rename to src/ethereum/forks/monad_next_amsterdam/fork.py diff --git a/src/ethereum/forks/monad_eleven/fork_types.py b/src/ethereum/forks/monad_next_amsterdam/fork_types.py similarity index 100% rename from src/ethereum/forks/monad_eleven/fork_types.py rename to src/ethereum/forks/monad_next_amsterdam/fork_types.py diff --git a/src/ethereum/forks/monad_eleven/requests.py b/src/ethereum/forks/monad_next_amsterdam/requests.py similarity index 91% rename from src/ethereum/forks/monad_eleven/requests.py rename to src/ethereum/forks/monad_next_amsterdam/requests.py index 82a3fbb1ebc..4fb3ccb53f1 100644 --- a/src/ethereum/forks/monad_eleven/requests.py +++ b/src/ethereum/forks/monad_next_amsterdam/requests.py @@ -19,13 +19,15 @@ [EIP-4895]: https://eips.ethereum.org/EIPS/eip-4895 [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685 -[rh]: ref:ethereum.forks.monad_eleven.blocks.Header.requests_hash -[dt]: ref:ethereum.forks.monad_eleven.requests.DEPOSIT_REQUEST_TYPE -[wt]: ref:ethereum.forks.monad_eleven.requests.WITHDRAWAL_REQUEST_TYPE -[ct]: ref:ethereum.forks.monad_eleven.requests.CONSOLIDATION_REQUEST_TYPE -[pd]: ref:ethereum.forks.monad_eleven.requests.parse_deposit_requests -[crh]: ref:ethereum.forks.monad_eleven.requests.compute_requests_hash -[pgpr]: ref:ethereum.forks.monad_eleven.fork.process_general_purpose_requests +[rh]: ref:ethereum.forks.monad_next_amsterdam.blocks.Header.requests_hash +[dt]: ref:ethereum.forks.monad_next_amsterdam.requests.DEPOSIT_REQUEST_TYPE +[wt]: ref:ethereum.forks.monad_next_amsterdam.requests.WITHDRAWAL_REQUEST_TYPE +[ct]: + ref:ethereum.forks.monad_next_amsterdam.requests.CONSOLIDATION_REQUEST_TYPE +[pd]: ref:ethereum.forks.monad_next_amsterdam.requests.parse_deposit_requests +[crh]: ref:ethereum.forks.monad_next_amsterdam.requests.compute_requests_hash +[pgpr]: + ref:ethereum.forks.monad_next_amsterdam.fork.process_general_purpose_requests """ from hashlib import sha256 @@ -265,10 +267,11 @@ def parse_deposit_requests(block_output: BlockOutput) -> Bytes: prefixed with [`DEPOSIT_REQUEST_TYPE`][dt] before being appended to the block's request list. - [addr]: ref:ethereum.forks.monad_eleven.requests.DEPOSIT_CONTRACT_ADDRESS + [addr]: + ref:ethereum.forks.monad_next_amsterdam.requests.DEPOSIT_CONTRACT_ADDRESS [sig]: - ref:ethereum.forks.monad_eleven.requests.DEPOSIT_EVENT_SIGNATURE_HASH - [dt]: ref:ethereum.forks.monad_eleven.requests.DEPOSIT_REQUEST_TYPE + ref:ethereum.forks.monad_next_amsterdam.requests.DEPOSIT_EVENT_SIGNATURE_HASH + [dt]: ref:ethereum.forks.monad_next_amsterdam.requests.DEPOSIT_REQUEST_TYPE """ deposit_requests: Bytes = b"" for key in block_output.receipt_keys: @@ -300,7 +303,7 @@ def compute_requests_hash(requests: List[Bytes]) -> Bytes: [EIP-7685]: https://eips.ethereum.org/EIPS/eip-7685 [SHA2-256]: https://en.wikipedia.org/wiki/SHA-2 - [rh]: ref:ethereum.forks.monad_eleven.blocks.Header.requests_hash + [rh]: ref:ethereum.forks.monad_next_amsterdam.blocks.Header.requests_hash """ m = sha256() for request in requests: diff --git a/src/ethereum/forks/monad_eleven/state_tracker.py b/src/ethereum/forks/monad_next_amsterdam/state_tracker.py similarity index 100% rename from src/ethereum/forks/monad_eleven/state_tracker.py rename to src/ethereum/forks/monad_next_amsterdam/state_tracker.py diff --git a/src/ethereum/forks/monad_eleven/transactions.py b/src/ethereum/forks/monad_next_amsterdam/transactions.py similarity index 100% rename from src/ethereum/forks/monad_eleven/transactions.py rename to src/ethereum/forks/monad_next_amsterdam/transactions.py diff --git a/src/ethereum/forks/monad_eleven/utils/__init__.py b/src/ethereum/forks/monad_next_amsterdam/utils/__init__.py similarity index 100% rename from src/ethereum/forks/monad_eleven/utils/__init__.py rename to src/ethereum/forks/monad_next_amsterdam/utils/__init__.py diff --git a/src/ethereum/forks/monad_eleven/utils/address.py b/src/ethereum/forks/monad_next_amsterdam/utils/address.py similarity index 94% rename from src/ethereum/forks/monad_eleven/utils/address.py rename to src/ethereum/forks/monad_next_amsterdam/utils/address.py index 52f0dfa9113..e1f5dd0298f 100644 --- a/src/ethereum/forks/monad_eleven/utils/address.py +++ b/src/ethereum/forks/monad_next_amsterdam/utils/address.py @@ -8,7 +8,7 @@ Introduction ------------ -Address specific functions used in this MONAD_ELEVEN version of +Address specific functions used in this MONAD_NEXT_AMSTERDAM version of specification. """ @@ -81,7 +81,7 @@ def compute_create2_contract_address( Returns ------- - address: `ethereum.forks.monad_eleven.fork_types.Address` + address: `ethereum.forks.monad_next_amsterdam.fork_types.Address` The computed address of the new account. """ diff --git a/src/ethereum/forks/monad_eleven/utils/hexadecimal.py b/src/ethereum/forks/monad_next_amsterdam/utils/hexadecimal.py similarity index 97% rename from src/ethereum/forks/monad_eleven/utils/hexadecimal.py rename to src/ethereum/forks/monad_next_amsterdam/utils/hexadecimal.py index 3a8c3f3e112..08d27dd8389 100644 --- a/src/ethereum/forks/monad_eleven/utils/hexadecimal.py +++ b/src/ethereum/forks/monad_next_amsterdam/utils/hexadecimal.py @@ -9,7 +9,7 @@ ------------ Hexadecimal utility functions used in this specification, specific to -Monad Eleven types. +Monad Next Amsterdam types. """ from ethereum_types.bytes import Bytes diff --git a/src/ethereum/forks/monad_eleven/utils/message.py b/src/ethereum/forks/monad_next_amsterdam/utils/message.py similarity index 94% rename from src/ethereum/forks/monad_eleven/utils/message.py rename to src/ethereum/forks/monad_next_amsterdam/utils/message.py index 026efe80389..204a089b330 100644 --- a/src/ethereum/forks/monad_eleven/utils/message.py +++ b/src/ethereum/forks/monad_next_amsterdam/utils/message.py @@ -8,7 +8,7 @@ Introduction ------------ -Message specific functions used in this MONAD_ELEVEN version of +Message specific functions used in this MONAD_NEXT_AMSTERDAM version of specification. """ @@ -43,7 +43,7 @@ def prepare_message( Returns ------- - message: `ethereum.forks.monad_eleven.vm.Message` + message: `ethereum.forks.monad_next_amsterdam.vm.Message` Items containing contract creation or message call specific data. """ diff --git a/src/ethereum/forks/monad_eleven/vm/__init__.py b/src/ethereum/forks/monad_next_amsterdam/vm/__init__.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/__init__.py rename to src/ethereum/forks/monad_next_amsterdam/vm/__init__.py diff --git a/src/ethereum/forks/monad_eleven/vm/eoa_delegation.py b/src/ethereum/forks/monad_next_amsterdam/vm/eoa_delegation.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/eoa_delegation.py rename to src/ethereum/forks/monad_next_amsterdam/vm/eoa_delegation.py diff --git a/src/ethereum/forks/monad_eleven/vm/exceptions.py b/src/ethereum/forks/monad_next_amsterdam/vm/exceptions.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/exceptions.py rename to src/ethereum/forks/monad_next_amsterdam/vm/exceptions.py diff --git a/src/ethereum/forks/monad_eleven/vm/gas.py b/src/ethereum/forks/monad_next_amsterdam/vm/gas.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/gas.py rename to src/ethereum/forks/monad_next_amsterdam/vm/gas.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/__init__.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/__init__.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/__init__.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/__init__.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/arithmetic.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/arithmetic.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/arithmetic.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/arithmetic.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/bitwise.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/bitwise.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/bitwise.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/bitwise.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/block.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/block.py similarity index 81% rename from src/ethereum/forks/monad_eleven/vm/instructions/block.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/block.py index 497d83656ec..f489b66a7b6 100644 --- a/src/ethereum/forks/monad_eleven/vm/instructions/block.py +++ b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/block.py @@ -30,9 +30,9 @@ def block_hash(evm: Evm) -> None: Raises ------ - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.StackUnderflowError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.StackUnderflowError` If `len(stack)` is less than `1`. - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.OutOfGasError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.OutOfGasError` If `evm.gas_left` is less than `20`. """ @@ -79,9 +79,9 @@ def coinbase(evm: Evm) -> None: Raises ------ - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.StackOverflowError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.StackOverflowError` If `len(stack)` is equal to `1024`. - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.OutOfGasError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.OutOfGasError` If `evm.gas_left` is less than `2`. """ @@ -113,9 +113,9 @@ def timestamp(evm: Evm) -> None: Raises ------ - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.StackOverflowError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.StackOverflowError` If `len(stack)` is equal to `1024`. - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.OutOfGasError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.OutOfGasError` If `evm.gas_left` is less than `2`. """ @@ -146,9 +146,9 @@ def number(evm: Evm) -> None: Raises ------ - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.StackOverflowError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.StackOverflowError` If `len(stack)` is equal to `1024`. - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.OutOfGasError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.OutOfGasError` If `evm.gas_left` is less than `2`. """ @@ -179,9 +179,9 @@ def prev_randao(evm: Evm) -> None: Raises ------ - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.StackOverflowError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.StackOverflowError` If `len(stack)` is equal to `1024`. - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.OutOfGasError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.OutOfGasError` If `evm.gas_left` is less than `2`. """ @@ -212,9 +212,9 @@ def gas_limit(evm: Evm) -> None: Raises ------ - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.StackOverflowError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.StackOverflowError` If `len(stack)` is equal to `1024`. - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.OutOfGasError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.OutOfGasError` If `evm.gas_left` is less than `2`. """ @@ -242,9 +242,9 @@ def chain_id(evm: Evm) -> None: Raises ------ - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.StackOverflowError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.StackOverflowError` If `len(stack)` is equal to `1024`. - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.OutOfGasError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.OutOfGasError` If `evm.gas_left` is less than `2`. """ @@ -275,9 +275,9 @@ def slot_number(evm: Evm) -> None: Raises ------ - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.StackOverflowError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.StackOverflowError` If `len(stack)` is equal to `1024`. - :py:class:`~ethereum.forks.monad_eleven.vm.exceptions.OutOfGasError` + :py:class:`~ethereum.forks.monad_next_amsterdam.vm.exceptions.OutOfGasError` If `evm.gas_left` is less than `2`. """ diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/comparison.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/comparison.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/comparison.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/comparison.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/control_flow.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/control_flow.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/control_flow.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/control_flow.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/environment.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/environment.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/environment.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/environment.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/keccak.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/keccak.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/keccak.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/keccak.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/log.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/log.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/log.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/log.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/memory.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/memory.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/memory.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/memory.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/stack.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/stack.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/stack.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/stack.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/storage.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/storage.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/storage.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/storage.py diff --git a/src/ethereum/forks/monad_eleven/vm/instructions/system.py b/src/ethereum/forks/monad_next_amsterdam/vm/instructions/system.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/instructions/system.py rename to src/ethereum/forks/monad_next_amsterdam/vm/instructions/system.py diff --git a/src/ethereum/forks/monad_eleven/vm/interpreter.py b/src/ethereum/forks/monad_next_amsterdam/vm/interpreter.py similarity index 99% rename from src/ethereum/forks/monad_eleven/vm/interpreter.py rename to src/ethereum/forks/monad_next_amsterdam/vm/interpreter.py index e7ef450eb09..bf9bfe58ef7 100644 --- a/src/ethereum/forks/monad_eleven/vm/interpreter.py +++ b/src/ethereum/forks/monad_next_amsterdam/vm/interpreter.py @@ -275,7 +275,7 @@ def process_create_message(message: Message) -> Evm: Returns ------- - evm: :py:class:`~ethereum.forks.monad_eleven.vm.Evm` + evm: :py:class:`~ethereum.forks.monad_next_amsterdam.vm.Evm` Items containing execution specific objects. """ @@ -335,7 +335,7 @@ def process_message(message: Message) -> Evm: Returns ------- - evm: :py:class:`~ethereum.forks.monad_eleven.vm.Evm` + evm: :py:class:`~ethereum.forks.monad_next_amsterdam.vm.Evm` Items containing execution specific objects """ diff --git a/src/ethereum/forks/monad_eleven/vm/memory.py b/src/ethereum/forks/monad_next_amsterdam/vm/memory.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/memory.py rename to src/ethereum/forks/monad_next_amsterdam/vm/memory.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/__init__.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/__init__.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/__init__.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/__init__.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/alt_bn128.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/alt_bn128.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/alt_bn128.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/alt_bn128.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/blake2f.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/blake2f.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/blake2f.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/blake2f.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/bls12_381/__init__.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/bls12_381/__init__.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/bls12_381/__init__.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/bls12_381/bls12_381_g1.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g1.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/bls12_381/bls12_381_g1.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g1.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/bls12_381/bls12_381_g2.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g2.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/bls12_381/bls12_381_g2.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_g2.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/bls12_381/bls12_381_pairing.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_pairing.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/bls12_381/bls12_381_pairing.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/bls12_381/bls12_381_pairing.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/ecrecover.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/ecrecover.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/ecrecover.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/ecrecover.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/identity.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/identity.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/identity.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/identity.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/mapping.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/mapping.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/mapping.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/mapping.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/modexp.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/modexp.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/modexp.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/modexp.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/p256verify.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/p256verify.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/p256verify.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/p256verify.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/point_evaluation.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/point_evaluation.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/point_evaluation.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/reserve_balance.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/reserve_balance.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/reserve_balance.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/reserve_balance.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/ripemd160.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/ripemd160.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/ripemd160.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/ripemd160.py diff --git a/src/ethereum/forks/monad_eleven/vm/precompiled_contracts/sha256.py b/src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/sha256.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/precompiled_contracts/sha256.py rename to src/ethereum/forks/monad_next_amsterdam/vm/precompiled_contracts/sha256.py diff --git a/src/ethereum/forks/monad_eleven/vm/runtime.py b/src/ethereum/forks/monad_next_amsterdam/vm/runtime.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/runtime.py rename to src/ethereum/forks/monad_next_amsterdam/vm/runtime.py diff --git a/src/ethereum/forks/monad_eleven/vm/stack.py b/src/ethereum/forks/monad_next_amsterdam/vm/stack.py similarity index 100% rename from src/ethereum/forks/monad_eleven/vm/stack.py rename to src/ethereum/forks/monad_next_amsterdam/vm/stack.py diff --git a/src/ethereum_spec_tools/utils.py b/src/ethereum_spec_tools/utils.py index 7af3aa25f13..49646ee8834 100644 --- a/src/ethereum_spec_tools/utils.py +++ b/src/ethereum_spec_tools/utils.py @@ -24,8 +24,8 @@ W = TypeVar("W", Uint, U64, U256) EXCEPTION_MAPS = { - "MONAD_ELEVEN": { - "fork_blocks": [("monad_eleven", 0)], + "MONAD_NEXT_AMSTERDAM": { + "fork_blocks": [("monad_next_amsterdam", 0)], }, "MONAD_TEN": { "fork_blocks": [("monad_ten", 0)], @@ -156,7 +156,7 @@ def find_fork( "MONAD_EIGHT": "monad_eight", "MONAD_NINE": "monad_nine", "MONAD_TEN": "monad_ten", - "MONAD_ELEVEN": "monad_eleven", + "MONAD_NEXT_AMSTERDAM": "monad_next_amsterdam", } diff --git a/tests/monad_eleven/__init__.py b/tests/monad_eleven/__init__.py deleted file mode 100644 index e0c66f0fa89..00000000000 --- a/tests/monad_eleven/__init__.py +++ /dev/null @@ -1 +0,0 @@ -"""Tests for the Amsterdam EIPs MONAD_ELEVEN adopts.""" diff --git a/tests/monad_next_amsterdam/__init__.py b/tests/monad_next_amsterdam/__init__.py new file mode 100644 index 00000000000..1e5008d88e6 --- /dev/null +++ b/tests/monad_next_amsterdam/__init__.py @@ -0,0 +1 @@ +"""Tests for the Amsterdam EIPs MONAD_NEXT_AMSTERDAM adopts.""" diff --git a/tests/monad_eleven/eip7981_fee_solvency/__init__.py b/tests/monad_next_amsterdam/eip7981_fee_solvency/__init__.py similarity index 100% rename from tests/monad_eleven/eip7981_fee_solvency/__init__.py rename to tests/monad_next_amsterdam/eip7981_fee_solvency/__init__.py diff --git a/tests/monad_eleven/eip7981_fee_solvency/test_surcharged_fee.py b/tests/monad_next_amsterdam/eip7981_fee_solvency/test_surcharged_fee.py similarity index 100% rename from tests/monad_eleven/eip7981_fee_solvency/test_surcharged_fee.py rename to tests/monad_next_amsterdam/eip7981_fee_solvency/test_surcharged_fee.py diff --git a/tests/monad_eleven/eip7997_delegated_create/__init__.py b/tests/monad_next_amsterdam/eip7997_delegated_create/__init__.py similarity index 100% rename from tests/monad_eleven/eip7997_delegated_create/__init__.py rename to tests/monad_next_amsterdam/eip7997_delegated_create/__init__.py diff --git a/tests/monad_eleven/eip7997_delegated_create/test_factory_reach.py b/tests/monad_next_amsterdam/eip7997_delegated_create/test_factory_reach.py similarity index 98% rename from tests/monad_eleven/eip7997_delegated_create/test_factory_reach.py rename to tests/monad_next_amsterdam/eip7997_delegated_create/test_factory_reach.py index f047d3431e6..65e5ce6ccee 100644 --- a/tests/monad_eleven/eip7997_delegated_create/test_factory_reach.py +++ b/tests/monad_next_amsterdam/eip7997_delegated_create/test_factory_reach.py @@ -37,7 +37,7 @@ FACTORY = Address(Spec.FACTORY_ADDRESS) pytestmark = [ - pytest.mark.valid_from("MONAD_ELEVEN"), + pytest.mark.valid_from("MONAD_NEXT_AMSTERDAM"), pytest.mark.pre_alloc_group( "eip7997_delegated_create_tests", reason="Tests the EIP-7997 factory reached from a delegated frame",