aea43b626b
## Issue Addressed As discussed on last-night's consensus call, the testnets next week will target the [Kiln Spec v2](https://hackmd.io/@n0ble/kiln-spec). Presently, we support Kiln V1. V2 is backwards compatible, except for renaming `random` to `prev_randao` in: - https://github.com/ethereum/execution-apis/pull/180 - https://github.com/ethereum/consensus-specs/pull/2835 With this PR we'll no longer be compatible with the existing Kintsugi and Kiln testnets, however we'll be ready for the testnets next week. I raised this breaking change in the call last night, we are all keen to move forward and break things. We now target the [`merge-kiln-v2`](https://github.com/MariusVanDerWijden/go-ethereum/tree/merge-kiln-v2) branch for interop with Geth. This required adding the `--http.aauthport` to the tester to avoid a port conflict at startup. ### Changes to exec integration tests There's some change in the `merge-kiln-v2` version of Geth that means it can't compile on a vanilla Github runner. Bumping the `go` version on the runner solved this issue. Whilst addressing this, I refactored the `testing/execution_integration` crate to be a *binary* rather than a *library* with tests. This means that we don't need to run the `build.rs` and build Geth whenever someone runs `make lint` or `make test-release`. This is nice for everyday users, but it's also nice for CI so that we can have a specific runner for these tests and we don't need to ensure *all* runners support everything required to build all execution clients. ## More Info - [x] ~~EF tests are failing since the rename has broken some tests that reference the old field name. I have been told there will be new tests released in the coming days (25/02/22 or 26/02/22).~~
35 lines
1.3 KiB
Rust
35 lines
1.3 KiB
Rust
use clap::ArgMatches;
|
|
use clap_utils::{parse_optional, parse_required};
|
|
use ssz::Encode;
|
|
use std::fs::File;
|
|
use std::io::Write;
|
|
use std::time::{SystemTime, UNIX_EPOCH};
|
|
use types::{EthSpec, ExecutionPayloadHeader};
|
|
|
|
pub fn run<T: EthSpec>(matches: &ArgMatches) -> Result<(), String> {
|
|
let eth1_block_hash = parse_required(matches, "execution-block-hash")?;
|
|
let genesis_time = parse_optional(matches, "genesis-time")?.unwrap_or(
|
|
SystemTime::now()
|
|
.duration_since(UNIX_EPOCH)
|
|
.map_err(|e| format!("Unable to get time: {:?}", e))?
|
|
.as_secs(),
|
|
);
|
|
let base_fee_per_gas = parse_required(matches, "base-fee-per-gas")?;
|
|
let gas_limit = parse_required(matches, "gas-limit")?;
|
|
let file_name = matches.value_of("file").ok_or("No file supplied")?;
|
|
|
|
let execution_payload_header: ExecutionPayloadHeader<T> = ExecutionPayloadHeader {
|
|
gas_limit,
|
|
base_fee_per_gas,
|
|
timestamp: genesis_time,
|
|
block_hash: eth1_block_hash,
|
|
prev_randao: eth1_block_hash.into_root(),
|
|
..ExecutionPayloadHeader::default()
|
|
};
|
|
let mut file = File::create(file_name).map_err(|_| "Unable to create file".to_string())?;
|
|
let bytes = execution_payload_header.as_ssz_bytes();
|
|
file.write_all(bytes.as_slice())
|
|
.map_err(|_| "Unable to write to file".to_string())?;
|
|
Ok(())
|
|
}
|