Skip to content

Commit 47abba4

Browse files
committed
fix(fill): pass entire config containing blobSchedule instead
1 parent 030733b commit 47abba4

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
@@ -18,7 +18,7 @@ Test fixtures for use by clients are available for each release on the [Github r
1818
- ✨ 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)).
1919
- 🔀 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)).
2020
- 🔀 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)).
21-
- ✨ Added an `--input.blobSchedule` CLI argument to the transition tool (`t8n`) invocation ([#2264](https://github.com/ethereum/execution-spec-tests/pull/2264)).
21+
- ✨ Added an `--input.config` CLI argument to the transition tool (`t8n`) invocation ([#2264](https://github.com/ethereum/execution-spec-tests/pull/2264)).
2222

2323
#### `consume`
2424

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,
@@ -212,13 +213,21 @@ class TransitionToolInput(CamelModel):
212213
env: Environment
213214

214215

216+
class TransitionToolConfig(CamelModel):
217+
"""Transition tool config."""
218+
219+
fork: Fork = Field(..., alias="network")
220+
chain_id: int = Field(..., alias="chainid")
221+
blob_schedule: BlobSchedule
222+
223+
215224
class TransitionToolCLIInput(CamelModel):
216225
"""Transition tool CLI input."""
217226

218227
alloc: Alloc
219228
txs: List[Transaction]
220229
env: Environment
221-
blob_schedule: BlobSchedule
230+
config: TransitionToolConfig
222231

223232

224233
class TransitionToolOutput(CamelModel):

src/ethereum_clis/transition_tool.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
TransactionReceipt,
3030
TransactionTraces,
3131
TransitionToolCLIInput,
32+
TransitionToolConfig,
3233
TransitionToolContext,
3334
TransitionToolInput,
3435
TransitionToolOutput,
@@ -192,7 +193,11 @@ def to_cli_input(self) -> TransitionToolCLIInput:
192193
alloc=self.alloc,
193194
txs=self.txs,
194195
env=self.env,
195-
blob_schedule=self.blob_schedule or BlobSchedule(),
196+
config=TransitionToolConfig(
197+
blob_schedule=self.blob_schedule or BlobSchedule(),
198+
chain_id=self.chain_id,
199+
network=self.fork,
200+
),
196201
)
197202

198203
def get_request_data(self) -> TransitionToolRequest:
@@ -245,8 +250,8 @@ def _evaluate_filesystem(
245250
input_paths["env"],
246251
"--input.txs",
247252
input_paths["txs"],
248-
"--input.blobSchedule",
249-
input_paths["blobSchedule"],
253+
"--input.config",
254+
input_paths["config"],
250255
"--output.basedir",
251256
temp_dir.name,
252257
"--output.result",

0 commit comments

Comments
 (0)