feat(cli,specs): Pass blob schedule to t8n

Author: marioevz

src/ethereum_clis/clis/besu.py

@@ -11,6 +11,7 @@
 
 import requests
 
+from ethereum_test_base_types import BlobSchedule
 from ethereum_test_exceptions import (
     EOFException,
     ExceptionMapper,
@@ -101,8 +102,9 @@ def evaluate(
         txs: List[Transaction],
         env: Environment,
         fork: Fork,
-        chain_id: int = 1,
-        reward: int = 0,
+        chain_id: int,
+        reward: int,
+        blob_schedule: BlobSchedule | None = None,
         eips: Optional[List[int]] = None,
         debug_output_path: str = "",
         state_test: bool = False,

src/ethereum_clis/tests/test_execution_specs.py

@@ -170,6 +170,9 @@ def test_evm_t8n(
             txs=txs,
             env=env,
             fork=Berlin,
+            chain_id=1,
+            reward=0,
+            blob_schedule=Berlin.blob_schedule(),
         )
         assert to_json(t8n_output.alloc) == expected.get("alloc")
         if isinstance(t8n, ExecutionSpecsTransitionTool):

src/ethereum_clis/transition_tool.py

@@ -8,7 +8,7 @@
 import textwrap
 import time
 from abc import abstractmethod
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Dict, List, Mapping, Optional, Type
 from urllib.parse import urlencode
@@ -17,14 +17,21 @@
 from requests.exceptions import ConnectionError as RequestsConnectionError
 from requests_unixsocket import Session  # type: ignore
 
+from ethereum_test_base_types import BlobSchedule
 from ethereum_test_exceptions import ExceptionMapper
 from ethereum_test_fixtures import FixtureFormat, FixtureVerifier
 from ethereum_test_forks import Fork
 from ethereum_test_types import Alloc, Environment, Transaction
 
 from .ethereum_cli import EthereumCLI
 from .file_utils import dump_files_to_directory, write_json_file
-from .types import TransactionReceipt, TransitionToolInput, TransitionToolOutput
+from .types import (
+    TransactionReceipt,
+    TransitionToolInput,
+    TransitionToolOutput,
+    TransitionToolPost,
+    TransitionToolState,
+)
 
 model_dump_config: Mapping = {"by_alias": True, "exclude_none": True}
 
@@ -130,9 +137,10 @@ class TransitionToolData:
         txs: List[Transaction]
         env: Environment
         fork_name: str
-        chain_id: int = field(default=1)
-        reward: int = field(default=0)
-        state_test: bool = field(default=False)
+        chain_id: int
+        reward: int
+        blob_schedule: BlobSchedule | None
+        state_test: bool
 
         def to_input(self) -> TransitionToolInput:
             """Convert the data to a TransactionToolInput object."""
@@ -142,6 +150,18 @@ def to_input(self) -> TransitionToolInput:
                 env=self.env,
             )
 
+        def get_post(self) -> TransitionToolPost:
+            """Convert the data to a TransitionToolState object."""
+            return TransitionToolPost(
+                state=TransitionToolState(
+                    fork=self.fork_name,
+                    chain_id=self.chain_id,
+                    reward=self.reward,
+                    blob_schedule=self.blob_schedule,
+                ),
+                input=self.to_input(),
+            )
+
     def _evaluate_filesystem(
         self,
         *,
@@ -298,37 +318,29 @@ def _evaluate_server(
         timeout: int,
     ) -> TransitionToolOutput:
         """Execute the transition tool sending inputs and outputs via a server."""
-        input_contents = t8n_data.to_input()
-        input_json = input_contents.model_dump(mode="json", **model_dump_config)
-        post_data = {
-            "state": {
-                "fork": t8n_data.fork_name,
-                "chainid": t8n_data.chain_id,
-                "reward": t8n_data.reward,
-            },
-            "input": input_json,
-        }
+        post_data = t8n_data.get_post()
+        post_json = post_data.model_dump(mode="json", **model_dump_config)
 
         if debug_output_path:
             request_info = (
                 f"Server URL: {self.server_url}\n\n"
-                f"Request Data:\n{json.dumps(post_data, indent=2)}\n"
+                f"Request Data:\n{json.dumps(post_json, indent=2)}\n"
             )
             dump_files_to_directory(
                 debug_output_path,
                 {
-                    "input/alloc.json": input_contents.alloc,
-                    "input/env.json": input_contents.env,
+                    "input/alloc.json": post_data.input.alloc,
+                    "input/env.json": post_data.input.env,
                     "input/txs.json": [
                         tx.model_dump(mode="json", **model_dump_config)
-                        for tx in input_contents.txs
+                        for tx in post_data.input.txs
                     ],
                     "request_info.txt": request_info,
                 },
             )
 
         response = self._server_post(
-            data=post_data, url_args=self._generate_post_args(t8n_data), timeout=timeout
+            data=post_json, url_args=self._generate_post_args(t8n_data), timeout=timeout
         )
         output: TransitionToolOutput = TransitionToolOutput.model_validate(response.json())
 
@@ -465,8 +477,9 @@ def evaluate(
         txs: List[Transaction],
         env: Environment,
         fork: Fork,
-        chain_id: int = 1,
-        reward: int = 0,
+        chain_id: int,
+        reward: int,
+        blob_schedule: BlobSchedule | None,
         eips: Optional[List[int]] = None,
         debug_output_path: str = "",
         state_test: bool = False,
@@ -493,6 +506,7 @@ def evaluate(
             fork_name=fork_name,
             chain_id=chain_id,
             reward=reward,
+            blob_schedule=blob_schedule,
             state_test=state_test,
         )
 

src/ethereum_clis/types.py

@@ -4,7 +4,15 @@
 
 from pydantic import Field
 
-from ethereum_test_base_types import Address, Bloom, Bytes, CamelModel, Hash, HexNumber
+from ethereum_test_base_types import (
+    Address,
+    BlobSchedule,
+    Bloom,
+    Bytes,
+    CamelModel,
+    Hash,
+    HexNumber,
+)
 from ethereum_test_types import Alloc, Environment, Transaction
 
 
@@ -93,3 +101,19 @@ class TransitionToolOutput(CamelModel):
     alloc: Alloc
     result: Result
     body: Bytes | None = None
+
+
+class TransitionToolState(CamelModel):
+    """Transition tool state."""
+
+    fork: str
+    chain_id: int = Field(..., alias="chainid")
+    reward: int
+    blob_schedule: BlobSchedule | None
+
+
+class TransitionToolPost(CamelModel):
+    """Transition tool post."""
+
+    state: TransitionToolState
+    input: TransitionToolInput

src/ethereum_test_specs/blockchain.py

@@ -386,6 +386,7 @@ def generate_block_data(
             fork=fork,
             chain_id=self.chain_id,
             reward=fork.get_reward(env.number, env.timestamp),
+            blob_schedule=fork.blob_schedule(),
             eips=eips,
             debug_output_path=self.get_next_transition_tool_output_path(),
             slow_request=slow,

src/ethereum_test_specs/state.py

@@ -135,6 +135,7 @@ def make_state_test_fixture(
             fork=fork,
             chain_id=self.chain_id,
             reward=0,  # Reward on state tests is always zero
+            blob_schedule=fork.blob_schedule(),
             eips=eips,
             debug_output_path=self.get_next_transition_tool_output_path(),
             state_test=True,