Skip to content

Commit c38009c

Browse files
committed
feat(fill): pass blobSchedule into t8n binary
1 parent 15bafa9 commit c38009c

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
@@ -248,6 +248,15 @@ class TransitionToolInput(CamelModel):
248248
env: Environment
249249

250250

251+
class TransitionToolCLIInput(CamelModel):
252+
"""Transition tool CLI input."""
253+
254+
alloc: Alloc
255+
txs: List[Transaction]
256+
env: Environment
257+
blob_schedule: BlobSchedule
258+
259+
251260
class TransitionToolOutput(CamelModel):
252261
"""Transition tool output."""
253262

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,
@@ -187,6 +188,15 @@ def to_input(self) -> TransitionToolInput:
187188
env=self.env,
188189
)
189190

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

216-
input_contents = t8n_data.to_input().model_dump(mode="json", **model_dump_config)
226+
input_contents = t8n_data.to_cli_input().model_dump(mode="json", **model_dump_config)
217227

218228
input_paths = {
219229
k: os.path.join(temp_dir.name, "input", f"{k}.json") for k in input_contents.keys()
@@ -237,6 +247,8 @@ def _evaluate_filesystem(
237247
input_paths["env"],
238248
"--input.txs",
239249
input_paths["txs"],
250+
"--input.blobSchedule",
251+
input_paths["blobSchedule"],
240252
"--output.basedir",
241253
temp_dir.name,
242254
"--output.result",

0 commit comments

Comments
 (0)