fix(fill): pass resolved blobParams and non-bpo fork to t8n

Author: pdobacz

src/ethereum_clis/cli_types.py

@@ -15,14 +15,14 @@
     Hash,
     HexNumber,
 )
+from ethereum_test_base_types.composite_types import ForkBlobSchedule
 from ethereum_test_exceptions import (
     BlockException,
     ExceptionMapperValidator,
     ExceptionWithMessage,
     TransactionException,
     UndefinedException,
 )
-from ethereum_test_forks.helpers import Fork
 from ethereum_test_types import (
     Alloc,
     BlockAccessList,
@@ -262,21 +262,13 @@ class TransitionToolInput(CamelModel):
     env: Environment
 
 
-class TransitionToolConfig(CamelModel):
-    """Transition tool config."""
-
-    fork: Fork = Field(..., alias="network")
-    chain_id: int = Field(..., alias="chainid")
-    blob_schedule: BlobSchedule
-
-
 class TransitionToolCLIInput(CamelModel):
     """Transition tool CLI input."""
 
     alloc: Alloc
     txs: List[Transaction]
     env: Environment
-    config: TransitionToolConfig
+    blob_params: ForkBlobSchedule | None = None
 
 
 class TransitionToolOutput(CamelModel):

src/ethereum_clis/clis/evmone.py

@@ -40,6 +40,7 @@ class EvmOneTransitionTool(TransitionTool):
     cached_version: Optional[str] = None
     trace: bool
     supports_opcode_count: ClassVar[bool] = True
+    supports_blob_params: ClassVar[bool] = True
 
     def __init__(
         self,

src/ethereum_clis/transition_tool.py

@@ -19,6 +19,7 @@
 from requests_unixsocket import Session
 
 from ethereum_test_base_types import BlobSchedule
+from ethereum_test_base_types.composite_types import ForkBlobSchedule
 from ethereum_test_exceptions import ExceptionMapper
 from ethereum_test_forks import Fork
 from ethereum_test_forks.helpers import get_development_forks, get_forks
@@ -30,7 +31,6 @@
     TransactionReceipt,
     TransactionTraces,
     TransitionToolCLIInput,
-    TransitionToolConfig,
     TransitionToolContext,
     TransitionToolInput,
     TransitionToolOutput,
@@ -77,6 +77,7 @@ class TransitionTool(EthereumCLI):
     supports_opcode_count: ClassVar[bool] = False
 
     supports_xdist: ClassVar[bool] = True
+    supports_blob_params: ClassVar[bool] = False
 
     @abstractmethod
     def __init__(
@@ -177,6 +178,16 @@ def fork_name(self) -> str:
                 timestamp=self.env.timestamp,
             )
 
+        @property
+        def blob_params(self) -> ForkBlobSchedule | None:
+            """Return the blob parameters for the current fork."""
+            if self.blob_schedule:
+                fork_name = self.fork.fork_at(
+                    block_number=self.env.number, timestamp=self.env.timestamp
+                ).name()
+                return self.blob_schedule[fork_name]
+            return None
+
         def __post_init__(self) -> None:
             """Modify the reward if the environment number is 0."""
             if self.env.number == 0:
@@ -196,11 +207,7 @@ def to_cli_input(self) -> TransitionToolCLIInput:
                 alloc=self.alloc,
                 txs=self.txs,
                 env=self.env,
-                config=TransitionToolConfig(
-                    blob_schedule=self.blob_schedule or BlobSchedule(),
-                    chain_id=self.chain_id,
-                    network=self.fork,
-                ),
+                blob_params=self.blob_params,
             )
 
         def get_request_data(self) -> TransitionToolRequest:
@@ -253,8 +260,6 @@ def _evaluate_filesystem(
             input_paths["env"],
             "--input.txs",
             input_paths["txs"],
-            "--input.config",
-            input_paths["config"],
             "--output.basedir",
             temp_dir.name,
             "--output.result",
@@ -275,6 +280,13 @@ def _evaluate_filesystem(
                     "opcodes.json",
                 ]
             )
+        if self.supports_blob_params and input_paths.get("blobParams"):
+            args.extend(
+                [
+                    "--input.blobParams",
+                    input_paths["blobParams"],
+                ]
+            )
 
         if self.trace:
             args.append("--trace")

src/ethereum_test_forks/base_fork.py

@@ -827,6 +827,17 @@ def parent(cls) -> Type["BaseFork"] | None:
             return None
         return base_class
 
+    @classmethod
+    def non_bpo_ancestor(cls) -> Type["BaseFork"]:
+        """Return the nearest non-BPO ancestor fork."""
+        ancestor = cls
+        while ancestor.bpo_fork():
+            parent = ancestor.parent()
+            if parent is None:
+                break
+            ancestor = parent
+        return ancestor
+
     @classmethod
     def children(cls) -> Set[Type["BaseFork"]]:
         """Return the children forks."""

src/ethereum_test_forks/forks/forks.py

@@ -1870,6 +1870,18 @@ def blob_base_cost(cls, *, block_number: int = 0, timestamp: int = 0) -> int:
 class BPO1(Osaka, bpo_fork=True):
     """Mainnet BPO1 fork - Blob Parameter Only fork 1."""
 
+    @classmethod
+    def transition_tool_name(cls, *, block_number: int = 0, timestamp: int = 0) -> str:
+        """
+        Return fork name as it's meant to be passed to the transition tool for
+        execution.
+        """
+        return (
+            cls.fork_at(block_number=block_number, timestamp=timestamp)
+            .non_bpo_ancestor()
+            .transition_tool_name()
+        )
+
     @classmethod
     def blob_base_fee_update_fraction(cls, *, block_number: int = 0, timestamp: int = 0) -> int:
         """Return the blob base fee update fraction for BPO1."""