Skip to content

Commit c6954af

Browse files
committed
feat(fill): pass blobSchedule into t8n binary
1 parent ca37419 commit c6954af

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
@@ -38,6 +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)).
4142

4243
#### `consume`
4344

src/ethereum_clis/cli_types.py

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

263263

264+
class TransitionToolCLIInput(CamelModel):
265+
"""Transition tool CLI input."""
266+
267+
alloc: Alloc
268+
txs: List[Transaction]
269+
env: Environment
270+
blob_schedule: BlobSchedule
271+
272+
264273
class TransitionToolOutput(CamelModel):
265274
"""Transition tool output."""
266275

src/ethereum_clis/transition_tool.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
Traces,
3030
TransactionReceipt,
3131
TransactionTraces,
32+
TransitionToolCLIInput,
3233
TransitionToolContext,
3334
TransitionToolInput,
3435
TransitionToolOutput,
@@ -188,6 +189,15 @@ def to_input(self) -> TransitionToolInput:
188189
env=self.env,
189190
)
190191

192+
def to_cli_input(self) -> TransitionToolCLIInput:
193+
"""Convert the data to a TransitionToolCLIInput object."""
194+
return TransitionToolCLIInput(
195+
alloc=self.alloc,
196+
txs=self.txs,
197+
env=self.env,
198+
blob_schedule=self.blob_schedule or BlobSchedule(),
199+
)
200+
191201
def get_request_data(self) -> TransitionToolRequest:
192202
"""Convert the data to a TransitionToolRequest object."""
193203
return TransitionToolRequest(
@@ -214,7 +224,7 @@ def _evaluate_filesystem(
214224
os.mkdir(os.path.join(temp_dir.name, "input"))
215225
os.mkdir(os.path.join(temp_dir.name, "output"))
216226

217-
input_contents = t8n_data.to_input().model_dump(mode="json", **model_dump_config)
227+
input_contents = t8n_data.to_cli_input().model_dump(mode="json", **model_dump_config)
218228

219229
input_paths = {
220230
k: os.path.join(temp_dir.name, "input", f"{k}.json") for k in input_contents.keys()
@@ -238,6 +248,8 @@ def _evaluate_filesystem(
238248
input_paths["env"],
239249
"--input.txs",
240250
input_paths["txs"],
251+
"--input.blobSchedule",
252+
input_paths["blobSchedule"],
241253
"--output.basedir",
242254
temp_dir.name,
243255
"--output.result",

0 commit comments

Comments
 (0)