feat(cli,specs): EIP-7691: 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

@@ -176,6 +176,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,6 +17,7 @@
 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
@@ -136,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."""
@@ -155,6 +157,7 @@ def get_request_data(self) -> TransitionToolRequest:
                     fork=self.fork_name,
                     chain_id=self.chain_id,
                     reward=self.reward,
+                    blob_schedule=self.blob_schedule,
                 ),
                 input=self.to_input(),
             )
@@ -474,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,
@@ -502,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,7 @@
 
 from pydantic import Field
 
-from ethereum_test_base_types import Bloom, Bytes, CamelModel, Hash, HexNumber
+from ethereum_test_base_types import BlobSchedule, Bloom, Bytes, CamelModel, Hash, HexNumber
 from ethereum_test_types import Alloc, Environment, Transaction, TransactionReceipt
 
 
@@ -60,6 +60,7 @@ class TransitionToolContext(CamelModel):
     fork: str
     chain_id: int = Field(..., alias="chainid")
     reward: int
+    blob_schedule: BlobSchedule | None
 
 
 class TransitionToolRequest(CamelModel):

src/ethereum_test_specs/blockchain.py

@@ -391,6 +391,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

@@ -136,6 +136,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,