Skip to content

Commit 9819f88

Browse files
committed
fix(fill): pass entire config containing blobSchedule instead
1 parent c38009c commit 9819f88

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,
@@ -248,13 +249,21 @@ class TransitionToolInput(CamelModel):
248249
env: Environment
249250

250251

252+
class TransitionToolConfig(CamelModel):
253+
"""Transition tool config."""
254+
255+
fork: Fork = Field(..., alias="network")
256+
chain_id: int = Field(..., alias="chainid")
257+
blob_schedule: BlobSchedule
258+
259+
251260
class TransitionToolCLIInput(CamelModel):
252261
"""Transition tool CLI input."""
253262

254263
alloc: Alloc
255264
txs: List[Transaction]
256265
env: Environment
257-
blob_schedule: BlobSchedule
266+
config: TransitionToolConfig
258267

259268

260269
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,
@@ -194,7 +195,11 @@ def to_cli_input(self) -> TransitionToolCLIInput:
194195
alloc=self.alloc,
195196
txs=self.txs,
196197
env=self.env,
197-
blob_schedule=self.blob_schedule or BlobSchedule(),
198+
config=TransitionToolConfig(
199+
blob_schedule=self.blob_schedule or BlobSchedule(),
200+
chain_id=self.chain_id,
201+
network=self.fork,
202+
),
198203
)
199204

200205
def get_request_data(self) -> TransitionToolRequest:
@@ -247,8 +252,8 @@ def _evaluate_filesystem(
247252
input_paths["env"],
248253
"--input.txs",
249254
input_paths["txs"],
250-
"--input.blobSchedule",
251-
input_paths["blobSchedule"],
255+
"--input.config",
256+
input_paths["config"],
252257
"--output.basedir",
253258
temp_dir.name,
254259
"--output.result",

0 commit comments

Comments
 (0)