Skip to content

Commit 5ebf6aa

Browse files
committed
fix(fill): pass entire config containing blobSchedule instead
1 parent c6954af commit 5ebf6aa

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

docs/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ This release additionally includes fixes for tests in hive, as well as new test
3838
- ✨ Added `--watch` flag that monitors test files for changes and automatically re-runs the fill command when developing tests ([#2173](https://github.com/ethereum/execution-spec-tests/pull/2173)).
3939
- 🔀 Upgraded ckzg version to 2.1.3 or newer for correct handling of points at infinity ([#2171](https://github.com/ethereum/execution-spec-tests/pull/2171)).
4040
- 🔀 Move pytest marker registration for `fill` and `execute-*` from their respective ini files to the shared `pytest_plugins.shared.execute_fill` pytest plugin ([#2110](https://github.com/ethereum/execution-spec-tests/pull/2110)).
41-
- ✨ Added an `--input.blobSchedule` CLI argument to the transition tool (`t8n`) invocation ([#2264](https://github.com/ethereum/execution-spec-tests/pull/2264)).
41+
- ✨ Added an `--input.config` CLI argument to the transition tool (`t8n`) invocation ([#2264](https://github.com/ethereum/execution-spec-tests/pull/2264)).
4242

4343
#### `consume`
4444

src/ethereum_clis/cli_types.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
TransactionException,
2323
UndefinedException,
2424
)
25+
from ethereum_test_forks.helpers import Fork
2526
from ethereum_test_types import (
2627
Alloc,
2728
BlockAccessList,
@@ -261,13 +262,21 @@ class TransitionToolInput(CamelModel):
261262
env: Environment
262263

263264

265+
class TransitionToolConfig(CamelModel):
266+
"""Transition tool config."""
267+
268+
fork: Fork = Field(..., alias="network")
269+
chain_id: int = Field(..., alias="chainid")
270+
blob_schedule: BlobSchedule
271+
272+
264273
class TransitionToolCLIInput(CamelModel):
265274
"""Transition tool CLI input."""
266275

267276
alloc: Alloc
268277
txs: List[Transaction]
269278
env: Environment
270-
blob_schedule: BlobSchedule
279+
config: TransitionToolConfig
271280

272281

273282
class TransitionToolOutput(CamelModel):

src/ethereum_clis/transition_tool.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
TransactionReceipt,
3131
TransactionTraces,
3232
TransitionToolCLIInput,
33+
TransitionToolConfig,
3334
TransitionToolContext,
3435
TransitionToolInput,
3536
TransitionToolOutput,
@@ -195,7 +196,11 @@ def to_cli_input(self) -> TransitionToolCLIInput:
195196
alloc=self.alloc,
196197
txs=self.txs,
197198
env=self.env,
198-
blob_schedule=self.blob_schedule or BlobSchedule(),
199+
config=TransitionToolConfig(
200+
blob_schedule=self.blob_schedule or BlobSchedule(),
201+
chain_id=self.chain_id,
202+
network=self.fork,
203+
),
199204
)
200205

201206
def get_request_data(self) -> TransitionToolRequest:
@@ -248,8 +253,8 @@ def _evaluate_filesystem(
248253
input_paths["env"],
249254
"--input.txs",
250255
input_paths["txs"],
251-
"--input.blobSchedule",
252-
input_paths["blobSchedule"],
256+
"--input.config",
257+
input_paths["config"],
253258
"--output.basedir",
254259
temp_dir.name,
255260
"--output.result",

0 commit comments

Comments
 (0)