From 33d50c9f1f4016cd57b884c7963626513e43a493 Mon Sep 17 00:00:00 2001 From: Guruprasad Kamath <48196632+gurukamath@users.noreply.github.com> Date: Thu, 30 Jan 2025 12:41:53 +0100 Subject: [PATCH 1/3] update EXTCODE* behavior in 7702 (#1094) See https://github.com/ethereum/EIPs/pull/9248/files --- src/ethereum/prague/vm/eoa_delegation.py | 1 - src/ethereum/prague/vm/instructions/environment.py | 7 ------- 2 files changed, 8 deletions(-) diff --git a/src/ethereum/prague/vm/eoa_delegation.py b/src/ethereum/prague/vm/eoa_delegation.py index b06cd144eb..8728375a25 100644 --- a/src/ethereum/prague/vm/eoa_delegation.py +++ b/src/ethereum/prague/vm/eoa_delegation.py @@ -21,7 +21,6 @@ SET_CODE_TX_MAGIC = b"\x05" EOA_DELEGATION_MARKER = b"\xEF\x01\x00" -EOA_DELEGATION_SENTINEL = b"\xEF\x01" EOA_DELEGATION_MARKER_LENGTH = len(EOA_DELEGATION_MARKER) EOA_DELEGATED_CODE_LENGTH = 23 PER_EMPTY_ACCOUNT_COST = 25000 diff --git a/src/ethereum/prague/vm/instructions/environment.py b/src/ethereum/prague/vm/instructions/environment.py index 08d6e9ae0d..6a524f1496 100644 --- a/src/ethereum/prague/vm/instructions/environment.py +++ b/src/ethereum/prague/vm/instructions/environment.py @@ -21,7 +21,6 @@ from ...fork_types import EMPTY_ACCOUNT from ...state import get_account from ...utils.address import to_address -from ...vm.eoa_delegation import EOA_DELEGATION_SENTINEL, is_valid_delegation from ...vm.memory import buffer_read, memory_write from .. import Evm from ..exceptions import OutOfBoundsRead @@ -353,8 +352,6 @@ def extcodesize(evm: Evm) -> None: # OPERATION code = get_account(evm.env.state, address).code - if is_valid_delegation(code): - code = EOA_DELEGATION_SENTINEL codesize = U256(len(code)) push(evm.stack, codesize) @@ -397,8 +394,6 @@ def extcodecopy(evm: Evm) -> None: # OPERATION evm.memory += b"\x00" * extend_memory.expand_by code = get_account(evm.env.state, address).code - if is_valid_delegation(code): - code = EOA_DELEGATION_SENTINEL value = buffer_read(code, code_start_index, size) memory_write(evm.memory, memory_start_index, value) @@ -490,8 +485,6 @@ def extcodehash(evm: Evm) -> None: codehash = U256(0) else: code = account.code - if is_valid_delegation(code): - code = EOA_DELEGATION_SENTINEL codehash = U256.from_be_bytes(keccak256(code)) push(evm.stack, codehash) From fa33d824decac0a6ac55adc943e7f139b0719f0e Mon Sep 17 00:00:00 2001 From: Mario Vega Date: Thu, 30 Jan 2025 10:50:43 -0600 Subject: [PATCH 2/3] Update EIP-2935, EIP-7002, EIP-7251 system contract addresses (#1100) --- src/ethereum/prague/fork.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ethereum/prague/fork.py b/src/ethereum/prague/fork.py index f18c28d11d..d71648eb23 100644 --- a/src/ethereum/prague/fork.py +++ b/src/ethereum/prague/fork.py @@ -84,13 +84,13 @@ VERSIONED_HASH_VERSION_KZG = b"\x01" WITHDRAWAL_REQUEST_PREDEPLOY_ADDRESS = hex_to_address( - "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA" + "0x00000961Ef480Eb55e80D19ad83579A64c007002" ) CONSOLIDATION_REQUEST_PREDEPLOY_ADDRESS = hex_to_address( - "0x00431F263cE400f4455c2dCf564e53007Ca4bbBb" + "0x0000BBdDc7CE488642fb579F8B00f3a590007251" ) HISTORY_STORAGE_ADDRESS = hex_to_address( - "0x0F792be4B0c0cb4DAE440Ef133E90C0eCD48CCCC" + "0x0000F90827F1C53a10cb7A02335B175320002935" ) HISTORY_SERVE_WINDOW = 8192 From ad4d15b45a7ed158c0275eac334108e99842516b Mon Sep 17 00:00:00 2001 From: Guruprasad Kamath Date: Wed, 5 Feb 2025 10:24:03 +0100 Subject: [PATCH 3/3] run pectra-devnet-6@v1.0.0 tests --- tests/helpers/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/helpers/__init__.py b/tests/helpers/__init__.py index 06d833b7bb..b551825535 100644 --- a/tests/helpers/__init__.py +++ b/tests/helpers/__init__.py @@ -17,7 +17,7 @@ }, "latest_fork_tests": { "url": "https://github.com/gurukamath/latest_fork_tests.git", - "commit_hash": "e7ccbb6", + "commit_hash": "e15efcb", "fixture_path": "tests/fixtures/latest_fork_tests", }, }