chore(ci): bump prague to stable and osaka to develop (#1573)

spencer-tb · marioevz · danceratopz · web-flow · commit 575eb8ab6228 · 2025-07-15T12:41:50.000+01:00
* chore: bump prague to stable and osaka to develop.

* chore: update resolutions in github ci.

* fix(types): Use ZeroPaddedHexNumber for block_hashes keys

* chore: bump eels ref in github ci.

* chore(ci): temp osaka eels res in config.

* chore: temp fix for BLS timeouts.

* chore: update eels in ci again.

* chore: fix `test_types` framework test.

* chore: bump eels ref in github ci again.

* fix: Unit test response (eels includes invalid txs in trie root)

* fix(clis/execution_specs): Update `TYPE_4_TX_PRE_FORK`

* chore: more eels bumps.

* is this the last commit?

* no, but this really should be the last commit

---------

Co-authored-by: Mario Vega &lt;marioevz@gmail.com&gt;
Co-authored-by: danceratopz &lt;danceratopz@gmail.com&gt;
diff --git a/.github/configs/eels_resolutions.json b/.github/configs/eels_resolutions.json
@@ -30,7 +30,11 @@
         "path": "$GITHUB_WORKSPACE/execution-specs/"
     },
     "Prague": {
-        "git_url": "https://github.com/ethereum/execution-specs.git",
-        "branch": "devnets/prague/6"
+        "path": "$GITHUB_WORKSPACE/execution-specs/"
+    },
+    "Osaka": {
+        "git_url": "https://github.com/spencer-tb/execution-specs.git",
+        "branch": "forks/osaka",
+        "commit": "07699170182691533023fa5d83086258c3edcfd3"
     }
 }
diff --git a/.github/configs/feature.yaml b/.github/configs/feature.yaml
@@ -1,15 +1,15 @@
 # Unless filling for special features, all features should fill for previous forks (starting from Frontier) too
 stable:
   evm-type: stable
-  fill-params: --until=Cancun
+  fill-params: --until=Prague
   solc: 0.8.21
 develop:
   evm-type: develop
-  fill-params: --until=Prague
+  fill-params: --until=Osaka
   solc: 0.8.21
 static:
   evm-type: static
-  fill-params: --until=Prague --fill-static-tests ./tests/static
+  fill-params: --until=Osaka --fill-static-tests ./tests/static
   solc: 0.8.21
 benchmark_1M:
   evm-type: benchmark
diff --git a/.github/workflows/tox_verify.yaml b/.github/workflows/tox_verify.yaml
@@ -122,7 +122,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           repository: ethereum/execution-specs
-          ref: fa847a0e48309debee8edc510ceddb2fd5db2f2e
+          ref: e13d33ab21ef1fdd2f073c96a3346e23eb7727f6
           path: execution-specs
           fetch-depth: 1
       - name: Install uv ${{ vars.UV_VERSION }} and python ${{ matrix.python }}
@@ -165,7 +165,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
           repository: ethereum/execution-specs
-          ref: fa847a0e48309debee8edc510ceddb2fd5db2f2e
+          ref: e13d33ab21ef1fdd2f073c96a3346e23eb7727f6
           path: execution-specs
           fetch-depth: 1
       - name: Install uv ${{ vars.UV_VERSION }} and python ${{ matrix.python }}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -9,6 +9,8 @@ Test fixtures for use by clients are available for each release on the [Github r
 ### 💥 Breaking Changes
 
 - Python 3.10 support was removed in this release ([#1808](https://github.com/ethereum/execution-spec-tests/pull/1808)).
+- Tests for the Prague fork are now marked as stable will be included in the `fixtures_stable.tar.gz` tarball from now on.
+- Tests for the Osaka fork are now included in the `fixtures_develop.tar.gz` tarball.
 
 #### 💥 Important Change for EEST developers
 
@@ -111,7 +113,7 @@ Users can select any of the artifacts depending on their testing needs for their
 - 🔀 Move `TransactionType` enum from test file to proper module location in `ethereum_test_types.transaction_types` for better code organization and reusability ([#1763](https://github.com/ethereum/execution-spec-tests/pull/1673)).
 - ✨ Opcode classes now validate keyword arguments and raise `ValueError` with clear error messages ([#1739](https://github.com/ethereum/execution-spec-tests/pull/1739), [#1856](https://github.com/ethereum/execution-spec-tests/pull/1856)).
 - ✨ All commands (`fill`, `consume`, `execute`) now work without having to clone the repository, e.g. `uv run --with git+https://github.com/ethereum/execution-spec-tests.git consume` now works from any folder ([#1863](https://github.com/ethereum/execution-spec-tests/pull/1863)).
-- 🔀 Enforce a minimum version of `uv>=0.7.0` ([#1904](https://github.com/ethereum/execution-spec-tests/pull/1904)).
+- 🔀 Move Prague to stable and Osaka to develop ([#1573](https://github.com/ethereum/execution-spec-tests/pull/1573)).
 
 ### 🧪 Test Cases
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -172,4 +172,4 @@ addopts = [
 required-version = ">=0.7.0"
 
 [tool.uv.sources]
-ethereum-spec-evm-resolver = { git = "https://github.com/spencer-tb/ethereum-spec-evm-resolver", rev = "ee273e7344e24a739ebfbf0ea1f758530c4d032b" }
+ethereum-spec-evm-resolver = { git = "https://github.com/spencer-tb/ethereum-spec-evm-resolver", rev = "38d4d19d9bc9e2aea900aac5c4b511665c294322" }
diff --git a/src/config/docs.py b/src/config/docs.py
@@ -11,7 +11,7 @@
 class DocsConfig(BaseModel):
     """A class for accessing documentation-related configurations."""
 
-    TARGET_FORK: str = "Prague"
+    TARGET_FORK: str = "Osaka"
     """The target fork for the documentation."""
 
     GENERATE_UNTIL_FORK: str = "Osaka"
diff --git a/src/ethereum_clis/clis/execution_specs.py b/src/ethereum_clis/clis/execution_specs.py
@@ -149,7 +149,9 @@ class ExecutionSpecsExceptionMapper(ExceptionMapper):
         TransactionException.TYPE_3_TX_PRE_FORK: (
             "module 'ethereum.shanghai.transactions' has no attribute 'BlobTransaction'"
         ),
-        TransactionException.TYPE_4_TX_PRE_FORK: "Unknown transaction type: 0x4",
+        TransactionException.TYPE_4_TX_PRE_FORK: (
+            "'ethereum.cancun.transactions' has no attribute 'SetCodeTransaction'"
+        ),
         TransactionException.TYPE_3_TX_INVALID_BLOB_VERSIONED_HASH: "d transaction: ",
         # This message is the same as TYPE_3_TX_MAX_BLOB_GAS_ALLOWANCE_EXCEEDED
         TransactionException.TYPE_3_TX_BLOB_COUNT_EXCEEDED: " transaction: ",
diff --git a/src/ethereum_clis/tests/fixtures/1/exp.json b/src/ethereum_clis/tests/fixtures/1/exp.json
@@ -21,7 +21,7 @@
     },
     "result": {
         "stateRoot": "0x84208a19bc2b46ada7445180c1db162be5b39b9abc8c0a54b05d32943eae4e13",
-        "txRoot": "0xc4761fd7b87ff2364c7c60b6c5c8d02e522e815328aaea3f20e3b7b7ef52c42d",
+        "txRoot": "0xe9bd66ea8f932b2b610632074c8b2c10bd3a1de96365a31568b1c776d80779b8",
         "receiptsRoot": "0x056b23fbba480696b65fe5a59b8f2148a1299103c4f57df839233af2cf4ca2d2",
         "logsHash": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
         "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/ethereum_clis/transition_tool.py b/src/ethereum_clis/transition_tool.py
@@ -35,7 +35,9 @@
 
 model_dump_config: Mapping = {"by_alias": True, "exclude_none": True}
 
-NORMAL_SERVER_TIMEOUT = 20
+# TODO: reduce NORMAL_SERVER_TIMEOUT back down to 20 once BLS timeout issue is resolved:
+# https://github.com/ethereum/execution-spec-tests/issues/1894
+NORMAL_SERVER_TIMEOUT = 180
 SLOW_REQUEST_TIMEOUT = 180
 
 
diff --git a/src/ethereum_test_forks/forks/forks.py b/src/ethereum_test_forks/forks/forks.py
@@ -1151,14 +1151,6 @@ class Prague(Cancun):
         "BLOB_BASE_FEE_UPDATE_FRACTION": 5007716,
     }
 
-    @classmethod
-    def is_deployed(cls) -> bool:
-        """
-        Flag that the fork has not been deployed to mainnet; it is under active
-        development.
-        """
-        return False
-
     @classmethod
     def precompiles(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]:
         """
diff --git a/src/ethereum_test_forks/tests/test_forks.py b/src/ethereum_test_forks/tests/test_forks.py
@@ -38,9 +38,9 @@
 from ..transition_base_fork import transition_fork
 
 FIRST_DEPLOYED = Frontier
-LAST_DEPLOYED = Cancun
-LAST_DEVELOPMENT = Prague
-DEVELOPMENT_FORKS = [Prague]
+LAST_DEPLOYED = Prague
+LAST_DEVELOPMENT = Osaka
+DEVELOPMENT_FORKS = [Osaka]
 
 
 def test_transition_forks():
diff --git a/src/ethereum_test_types/block_types.py b/src/ethereum_test_types/block_types.py
@@ -17,7 +17,6 @@
     EmptyOmmersRoot,
     Hash,
     HexNumber,
-    Number,
     NumberBoundTypeVar,
     ZeroPaddedHexNumber,
 )
@@ -109,7 +108,7 @@ class Environment(EnvironmentGeneric[ZeroPaddedHexNumber]):
     parent_excess_blob_gas: ZeroPaddedHexNumber | None = Field(None)
     parent_beacon_block_root: Hash | None = Field(None)
 
-    block_hashes: Dict[Number, Hash] = Field(default_factory=dict)
+    block_hashes: Dict[ZeroPaddedHexNumber, Hash] = Field(default_factory=dict)
     ommers: List[Hash] = Field(default_factory=list)
     withdrawals: List[Withdrawal] | None = Field(None)
     extra_data: Bytes = Field(Bytes(b"\x00"), exclude=True)
diff --git a/src/ethereum_test_types/tests/test_types.py b/src/ethereum_test_types/tests/test_types.py
@@ -519,8 +519,8 @@ def test_account_merge(
                 "currentBlobGasUsed": "0x10",
                 "currentExcessBlobGas": "0x11",
                 "blockHashes": {
-                    "1": "0x0000000000000000000000000000000000000000000000000000000000000002",
-                    "3": "0x0000000000000000000000000000000000000000000000000000000000000004",
+                    "0x01": "0x0000000000000000000000000000000000000000000000000000000000000002",
+                    "0x03": "0x0000000000000000000000000000000000000000000000000000000000000004",
                 },
                 "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000004",
                 "ommers": [],
diff --git a/src/pytest_plugins/eels_resolutions.json b/src/pytest_plugins/eels_resolutions.json
@@ -2,7 +2,7 @@
     "EELSMaster": {
         "git_url": "https://github.com/ethereum/execution-specs.git",
         "branch": "master",
-        "commit": "1fb3704da97f78654e5987868840c5683679f31e"
+        "commit": "e13d33ab21ef1fdd2f073c96a3346e23eb7727f6"
     },
     "Frontier": {
         "same_as": "EELSMaster"
@@ -38,8 +38,8 @@
         "same_as": "EELSMaster"
     },
     "Osaka": {
-        "git_url": "https://github.com/ethereum/execution-specs.git",
+        "git_url": "https://github.com/spencer-tb/execution-specs.git",
         "branch": "forks/osaka",
-        "commit": "f947ab1744aaf12f652a85e28ac5d155af26dd25"
+        "commit": "07699170182691533023fa5d83086258c3edcfd3"
     }
 }
diff --git a/tox.ini b/tox.ini
@@ -75,7 +75,7 @@ commands =
 
 
 [forks]
-develop = Prague
+develop = Osaka
 eip7692 = EOFv1
 
 [testenv:tests-deployed]
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,11 @@`
`30`	`30`	`"path": "$GITHUB_WORKSPACE/execution-specs/"`
`31`	`31`	`},`
`32`	`32`	`"Prague": {`
`33`		`- "git_url": "https://github.com/ethereum/execution-specs.git",`
`34`		`- "branch": "devnets/prague/6"`
	`33`	`+ "path": "$GITHUB_WORKSPACE/execution-specs/"`
	`34`	`+ },`
	`35`	`+ "Osaka": {`
	`36`	`+ "git_url": "https://github.com/spencer-tb/execution-specs.git",`
	`37`	`+ "branch": "forks/osaka",`
	`38`	`+ "commit": "07699170182691533023fa5d83086258c3edcfd3"`
`35`	`39`	`}`
`36`	`40`	`}`