bluealloy · rakita · Feb 8, 2025 · Feb 8, 2025
diff --git a/.github/workflows/ethereum-tests.yml b/.github/workflows/ethereum-tests.yml
@@ -49,7 +49,7 @@ jobs:
             ethtests/EIPTests/StateTests/stEIP4844-blobtransactions/ \
             ethtests/EIPTests/StateTests/stEOF \
             tests/eof_suite/eest/state_tests \
-            tests/pectra_devnet5/state_tests/prague/eip7623_increase_calldata_cost
+            tests/pectra/state_tests/prague/eip7623_increase_calldata_cost
       - name: Run EOF validation tests
         run: |
           cross run --target ${{matrix.target}} --profile ${{ matrix.profile }} -p revme -- eof-validation \

diff --git a/crates/context/src/journaled_state.rs b/crates/context/src/journaled_state.rs
@@ -1,7 +1,4 @@
-use bytecode::{
-    eip7702::{EIP7702_MAGIC_BYTES, EIP7702_MAGIC_HASH},
-    Bytecode, EOF_MAGIC_BYTES, EOF_MAGIC_HASH,
-};
+use bytecode::{Bytecode, EOF_MAGIC_BYTES, EOF_MAGIC_HASH};
 use context_interface::journaled_state::{AccountLoad, Journal, JournalCheckpoint, TransferError};
 use database_interface::Database;
 use interpreter::{SStoreResult, SelfDestructResult, StateLoad};
@@ -433,8 +430,6 @@ impl<DB: Database> JournaledState<DB> {
 
         let code = if code.is_eof() {
             EOF_MAGIC_BYTES.clone()
-        } else if code.is_eip7702() {
-            EIP7702_MAGIC_BYTES.clone()
         } else {
             code.original_bytes()
         };
@@ -460,8 +455,6 @@ impl<DB: Database> JournaledState<DB> {
 
         let hash = if code.is_eof() {
             EOF_MAGIC_HASH
-        } else if code.is_eip7702() {
-            EIP7702_MAGIC_HASH
         } else {
             acc.info.code_hash
         };

diff --git a/...ectra_devnet5/.meta/eels_resolutions.json → tests/pectra/.meta/eels_resolutions.json b/...ectra_devnet5/.meta/eels_resolutions.json → tests/pectra/.meta/eels_resolutions.json
@@ -36,6 +36,6 @@
     },
     "Prague": {
         "git_url": "https://github.com/ethereum/execution-specs.git",
-        "branch": "devnets/prague/5"
+        "branch": "devnets/prague/6"
     }
 }
diff --git a/tests/pectra/.meta/fixtures.ini b/tests/pectra/.meta/fixtures.ini
@@ -0,0 +1,31 @@
+; This file describes fixture build properties
+
+[fixtures]
+timestamp = 2025-01-30T17:16:02.137521
+build = pectra-devnet-6
+ref = refs/tags/pectra-devnet-6@v1.0.0
+commit = ca0bdec9427edee31984149e71801debaf464bc3
+command_line_args = fill -n auto --evm-bin=ethereum-spec-evm-resolver --solc-version=0.8.21 --skip-evm-dump --until=Prague -m "not eip_version_check" --output=fixtures_pectra-devnet-6.tar.gz --build-name pectra-devnet-6
+
+[packages]
+pytest = 7.4.4
+pluggy = 1.5.0
+
+[plugins]
+metadata = 3.1.1
+xdist = 3.6.1
+json-report = 1.5.0
+custom-report = 1.0.1
+html = 4.1.1
+typeguard = 4.3.0
+
+[tools]
+eels resolutions = /home/marioevz/actions-runner/_work/execution-spec-tests/execution-spec-tests/eels_resolutions.json
+t8n = ethereum-spec-evm-resolver 0.0.5
+solc = 0.8.21
+
+[environment]
+python = 3.10.15
+platform = Linux-5.10.0-21-amd64-x86_64-with-glibc2.31
+ci = true
+
diff --git a/tests/pectra_devnet5/.meta/index.json → tests/pectra/.meta/index.json b/tests/pectra_devnet5/.meta/index.json → tests/pectra/.meta/index.json
diff --git a/.../eip2930_access_list/acl/access_list.json → .../eip2930_access_list/acl/access_list.json b/.../eip2930_access_list/acl/access_list.json → .../eip2930_access_list/acl/access_list.json
@@ -85,22 +85,29 @@
         "_info": {
             "hash": "0x8f78d574a1337b5c910460b08513bec2e2de0e2666403b4f521a7bfc89268e22",
             "comment": "`execution-spec-tests` generated test",
-            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.1",
+            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.5",
             "description": "Test function documentation:\nTest type 1 transaction.",
-            "url": "https://github.com/ethereum/execution-spec-tests/blob/d9add545219932e7fa1394bc9bc57a3ab6cb425e/tests/berlin/eip2930_access_list/test_acl.py#L19",
+            "url": "https://github.com/ethereum/execution-spec-tests/blob/pectra-devnet-6@v1.0.0/tests/berlin/eip2930_access_list/test_acl.py#L19",
             "fixture_format": "state_test",
             "reference-spec": "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2930.md",
-            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534"
+            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534",
+            "eels-resolution": {
+                "git-url": "https://github.com/ethereum/execution-specs.git",
+                "branch": "master",
+                "commit": "9b95554a88d2a8485f8180254d0f6a493a593fda"
+            }
         }
     },
-    "tests/berlin/eip2930_access_list/test_acl.py::test_access_list[fork_London-state_test]": {
+    "tests/berlin/eip2930_access_list/test_acl.py::test_access_list[fork_Cancun-state_test]": {
         "env": {
             "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentGasLimit": "0x016345785d8a0000",
             "currentNumber": "0x01",
             "currentTimestamp": "0x03e8",
-            "currentDifficulty": "0x020000",
-            "currentBaseFee": "0x07"
+            "currentRandom": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "currentDifficulty": "0x00",
+            "currentBaseFee": "0x07",
+            "currentExcessBlobGas": "0x00"
         },
         "pre": {
             "0x0000000000000000000000000000000000001000": {
@@ -143,7 +150,7 @@
             "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
         },
         "post": {
-            "London": [
+            "Cancun": [
                 {
                     "hash": "0xbba7329a789fb21eec852df40d72d9cdfdc51c993c77183b610e962210c819f6",
                     "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
@@ -170,26 +177,38 @@
                 }
             ]
         },
-        "config": {},
+        "config": {
+            "blobSchedule": {
+                "Cancun": {
+                    "target": "0x03",
+                    "max": "0x06",
+                    "baseFeeUpdateFraction": "0x32f0ed"
+                }
+            }
+        },
         "_info": {
-            "hash": "0xd5460bb8411f698b6cfbea37a9df87fb61d0190d3c12ce0edccc5eb23eb576d7",
+            "hash": "0x6e46ccf97e10e7550eed9053797df9c8ed625fa95e171e022cacedbd0c8f5572",
             "comment": "`execution-spec-tests` generated test",
-            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.1",
+            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.5",
             "description": "Test function documentation:\nTest type 1 transaction.",
-            "url": "https://github.com/ethereum/execution-spec-tests/blob/d9add545219932e7fa1394bc9bc57a3ab6cb425e/tests/berlin/eip2930_access_list/test_acl.py#L19",
+            "url": "https://github.com/ethereum/execution-spec-tests/blob/pectra-devnet-6@v1.0.0/tests/berlin/eip2930_access_list/test_acl.py#L19",
             "fixture_format": "state_test",
             "reference-spec": "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2930.md",
-            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534"
+            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534",
+            "eels-resolution": {
+                "git-url": "https://github.com/ethereum/execution-specs.git",
+                "branch": "master",
+                "commit": "9b95554a88d2a8485f8180254d0f6a493a593fda"
+            }
         }
     },
-    "tests/berlin/eip2930_access_list/test_acl.py::test_access_list[fork_Paris-state_test]": {
+    "tests/berlin/eip2930_access_list/test_acl.py::test_access_list[fork_London-state_test]": {
         "env": {
             "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentGasLimit": "0x016345785d8a0000",
             "currentNumber": "0x01",
             "currentTimestamp": "0x03e8",
-            "currentRandom": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "currentDifficulty": "0x00",
+            "currentDifficulty": "0x020000",
             "currentBaseFee": "0x07"
         },
         "pre": {
@@ -233,7 +252,7 @@
             "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
         },
         "post": {
-            "Paris": [
+            "London": [
                 {
                     "hash": "0xbba7329a789fb21eec852df40d72d9cdfdc51c993c77183b610e962210c819f6",
                     "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
@@ -262,17 +281,22 @@
         },
         "config": {},
         "_info": {
-            "hash": "0xc14759fe160b396188c9f94906603c7737f6b1d24b71efceac27167e4bc62888",
+            "hash": "0xd5460bb8411f698b6cfbea37a9df87fb61d0190d3c12ce0edccc5eb23eb576d7",
             "comment": "`execution-spec-tests` generated test",
-            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.1",
+            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.5",
             "description": "Test function documentation:\nTest type 1 transaction.",
-            "url": "https://github.com/ethereum/execution-spec-tests/blob/d9add545219932e7fa1394bc9bc57a3ab6cb425e/tests/berlin/eip2930_access_list/test_acl.py#L19",
+            "url": "https://github.com/ethereum/execution-spec-tests/blob/pectra-devnet-6@v1.0.0/tests/berlin/eip2930_access_list/test_acl.py#L19",
             "fixture_format": "state_test",
             "reference-spec": "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2930.md",
-            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534"
+            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534",
+            "eels-resolution": {
+                "git-url": "https://github.com/ethereum/execution-specs.git",
+                "branch": "master",
+                "commit": "9b95554a88d2a8485f8180254d0f6a493a593fda"
+            }
         }
     },
-    "tests/berlin/eip2930_access_list/test_acl.py::test_access_list[fork_Shanghai-state_test]": {
+    "tests/berlin/eip2930_access_list/test_acl.py::test_access_list[fork_Paris-state_test]": {
         "env": {
             "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentGasLimit": "0x016345785d8a0000",
@@ -323,7 +347,7 @@
             "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
         },
         "post": {
-            "Shanghai": [
+            "Paris": [
                 {
                     "hash": "0xbba7329a789fb21eec852df40d72d9cdfdc51c993c77183b610e962210c819f6",
                     "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
@@ -352,17 +376,22 @@
         },
         "config": {},
         "_info": {
-            "hash": "0x66220aa1a63c00e3a67b181bfeee28dea215b5ddea52c472ab14d9b2bda9c1e7",
+            "hash": "0xc14759fe160b396188c9f94906603c7737f6b1d24b71efceac27167e4bc62888",
             "comment": "`execution-spec-tests` generated test",
-            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.1",
+            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.5",
             "description": "Test function documentation:\nTest type 1 transaction.",
-            "url": "https://github.com/ethereum/execution-spec-tests/blob/d9add545219932e7fa1394bc9bc57a3ab6cb425e/tests/berlin/eip2930_access_list/test_acl.py#L19",
+            "url": "https://github.com/ethereum/execution-spec-tests/blob/pectra-devnet-6@v1.0.0/tests/berlin/eip2930_access_list/test_acl.py#L19",
             "fixture_format": "state_test",
             "reference-spec": "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2930.md",
-            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534"
+            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534",
+            "eels-resolution": {
+                "git-url": "https://github.com/ethereum/execution-specs.git",
+                "branch": "master",
+                "commit": "9b95554a88d2a8485f8180254d0f6a493a593fda"
+            }
         }
     },
-    "tests/berlin/eip2930_access_list/test_acl.py::test_access_list[fork_Cancun-state_test]": {
+    "tests/berlin/eip2930_access_list/test_acl.py::test_access_list[fork_Prague-state_test]": {
         "env": {
             "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentGasLimit": "0x016345785d8a0000",
@@ -414,7 +443,7 @@
             "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
         },
         "post": {
-            "Cancun": [
+            "Prague": [
                 {
                     "hash": "0xbba7329a789fb21eec852df40d72d9cdfdc51c993c77183b610e962210c819f6",
                     "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
@@ -447,30 +476,39 @@
                     "target": "0x03",
                     "max": "0x06",
                     "baseFeeUpdateFraction": "0x32f0ed"
+                },
+                "Prague": {
+                    "target": "0x06",
+                    "max": "0x09",
+                    "baseFeeUpdateFraction": "0x4c6964"
                 }
             }
         },
         "_info": {
-            "hash": "0x6e46ccf97e10e7550eed9053797df9c8ed625fa95e171e022cacedbd0c8f5572",
+            "hash": "0x4e0c326184e2ed4549456c8d53adbdf1b4604889c7cbbd54d6450db023a4664e",
             "comment": "`execution-spec-tests` generated test",
-            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.1",
+            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.5",
             "description": "Test function documentation:\nTest type 1 transaction.",
-            "url": "https://github.com/ethereum/execution-spec-tests/blob/d9add545219932e7fa1394bc9bc57a3ab6cb425e/tests/berlin/eip2930_access_list/test_acl.py#L19",
+            "url": "https://github.com/ethereum/execution-spec-tests/blob/pectra-devnet-6@v1.0.0/tests/berlin/eip2930_access_list/test_acl.py#L19",
             "fixture_format": "state_test",
             "reference-spec": "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2930.md",
-            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534"
+            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534",
+            "eels-resolution": {
+                "git-url": "https://github.com/ethereum/execution-specs.git",
+                "branch": "devnets/prague/6",
+                "commit": "fa33d824decac0a6ac55adc943e7f139b0719f0e"
+            }
         }
     },
-    "tests/berlin/eip2930_access_list/test_acl.py::test_access_list[fork_Prague-state_test]": {
+    "tests/berlin/eip2930_access_list/test_acl.py::test_access_list[fork_Shanghai-state_test]": {
         "env": {
             "currentCoinbase": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentGasLimit": "0x016345785d8a0000",
             "currentNumber": "0x01",
             "currentTimestamp": "0x03e8",
             "currentRandom": "0x0000000000000000000000000000000000000000000000000000000000000000",
             "currentDifficulty": "0x00",
-            "currentBaseFee": "0x07",
-            "currentExcessBlobGas": "0x00"
+            "currentBaseFee": "0x07"
         },
         "pre": {
             "0x0000000000000000000000000000000000001000": {
@@ -513,7 +551,7 @@
             "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8"
         },
         "post": {
-            "Prague": [
+            "Shanghai": [
                 {
                     "hash": "0xbba7329a789fb21eec852df40d72d9cdfdc51c993c77183b610e962210c819f6",
                     "logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
@@ -540,29 +578,21 @@
                 }
             ]
         },
-        "config": {
-            "blobSchedule": {
-                "Cancun": {
-                    "target": "0x03",
-                    "max": "0x06",
-                    "baseFeeUpdateFraction": "0x32f0ed"
-                },
-                "Prague": {
-                    "target": "0x06",
-                    "max": "0x09",
-                    "baseFeeUpdateFraction": "0x4c6964"
-                }
-            }
-        },
+        "config": {},
         "_info": {
-            "hash": "0x4e0c326184e2ed4549456c8d53adbdf1b4604889c7cbbd54d6450db023a4664e",
+            "hash": "0x66220aa1a63c00e3a67b181bfeee28dea215b5ddea52c472ab14d9b2bda9c1e7",
             "comment": "`execution-spec-tests` generated test",
-            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.1",
+            "filling-transition-tool": "ethereum-spec-evm-resolver 0.0.5",
             "description": "Test function documentation:\nTest type 1 transaction.",
-            "url": "https://github.com/ethereum/execution-spec-tests/blob/d9add545219932e7fa1394bc9bc57a3ab6cb425e/tests/berlin/eip2930_access_list/test_acl.py#L19",
+            "url": "https://github.com/ethereum/execution-spec-tests/blob/pectra-devnet-6@v1.0.0/tests/berlin/eip2930_access_list/test_acl.py#L19",
             "fixture_format": "state_test",
             "reference-spec": "https://github.com/ethereum/EIPs/blob/master/EIPS/eip-2930.md",
-            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534"
+            "reference-spec-version": "c9db53a936c5c9cbe2db32ba0d1b86c4c6e73534",
+            "eels-resolution": {
+                "git-url": "https://github.com/ethereum/execution-specs.git",
+                "branch": "master",
+                "commit": "9b95554a88d2a8485f8180254d0f6a493a593fda"
+            }
         }
     }
 }