Skip to content

Commit 030733b

Browse files
committed
feat(fill): pass blobSchedule into t8n binary
1 parent 68489a2 commit 030733b

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

docs/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +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)).
2122

2223
#### `consume`
2324

src/ethereum_clis/cli_types.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,15 @@ class TransitionToolInput(CamelModel):
212212
env: Environment
213213

214214

215+
class TransitionToolCLIInput(CamelModel):
216+
"""Transition tool CLI input."""
217+
218+
alloc: Alloc
219+
txs: List[Transaction]
220+
env: Environment
221+
blob_schedule: BlobSchedule
222+
223+
215224
class TransitionToolOutput(CamelModel):
216225
"""Transition tool output."""
217226

src/ethereum_clis/transition_tool.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
Traces,
2929
TransactionReceipt,
3030
TransactionTraces,
31+
TransitionToolCLIInput,
3132
TransitionToolContext,
3233
TransitionToolInput,
3334
TransitionToolOutput,
@@ -185,6 +186,15 @@ def to_input(self) -> TransitionToolInput:
185186
env=self.env,
186187
)
187188

189+
def to_cli_input(self) -> TransitionToolCLIInput:
190+
"""Convert the data to a TransitionToolCLIInput object."""
191+
return TransitionToolCLIInput(
192+
alloc=self.alloc,
193+
txs=self.txs,
194+
env=self.env,
195+
blob_schedule=self.blob_schedule or BlobSchedule(),
196+
)
197+
188198
def get_request_data(self) -> TransitionToolRequest:
189199
"""Convert the data to a TransitionToolRequest object."""
190200
return TransitionToolRequest(
@@ -211,7 +221,7 @@ def _evaluate_filesystem(
211221
os.mkdir(os.path.join(temp_dir.name, "input"))
212222
os.mkdir(os.path.join(temp_dir.name, "output"))
213223

214-
input_contents = t8n_data.to_input().model_dump(mode="json", **model_dump_config)
224+
input_contents = t8n_data.to_cli_input().model_dump(mode="json", **model_dump_config)
215225

216226
input_paths = {
217227
k: os.path.join(temp_dir.name, "input", f"{k}.json") for k in input_contents.keys()
@@ -235,6 +245,8 @@ def _evaluate_filesystem(
235245
input_paths["env"],
236246
"--input.txs",
237247
input_paths["txs"],
248+
"--input.blobSchedule",
249+
input_paths["blobSchedule"],
238250
"--output.basedir",
239251
temp_dir.name,
240252
"--output.result",

0 commit comments

Comments
 (0)