Add Fulu boilerplate (#6695)

* Add Fulu boilerplate

* Add more boilerplate

* Change fulu_time to osaka_time

* Merge branch 'unstable' into fulu-boilerplate

* Fix tests

* Merge branch 'unstable' into fulu-boilerplate

* More test fixes

* Apply suggestions

* Remove `get_payload` boilerplate

* Add lightclient fulu types and fix beacon-chain-tests

* Disable Fulu in ef-tests

* Reduce boilerplate for future forks

* Small fixes

* One more fix

* Apply suggestions

* Merge branch 'unstable' into fulu-boilerplate

* Fix lints
This commit is contained in:
Mac L
2025-01-10 09:25:23 +04:00
committed by GitHub
parent 722573f7ed
commit ecdf2d891f
91 changed files with 2365 additions and 674 deletions

View File

@@ -361,6 +361,14 @@ impl<E: EthSpec> CandidateBeaconNode<E> {
"endpoint_electra_fork_epoch" => ?beacon_node_spec.electra_fork_epoch,
"hint" => UPDATE_REQUIRED_LOG_HINT,
);
} else if beacon_node_spec.fulu_fork_epoch != spec.fulu_fork_epoch {
warn!(
log,
"Beacon node has mismatched Fulu fork epoch";
"endpoint" => %self.beacon_node,
"endpoint_fulu_fork_epoch" => ?beacon_node_spec.fulu_fork_epoch,
"hint" => UPDATE_REQUIRED_LOG_HINT,
);
}
Ok(())

View File

@@ -251,9 +251,9 @@ impl ApiTester {
pub async fn test_get_lighthouse_spec(self) -> Self {
let result = self
.client
.get_lighthouse_spec::<ConfigAndPresetElectra>()
.get_lighthouse_spec::<ConfigAndPresetFulu>()
.await
.map(|res| ConfigAndPreset::Electra(res.data))
.map(|res| ConfigAndPreset::Fulu(res.data))
.unwrap();
let expected = ConfigAndPreset::from_chain_spec::<E>(&E::default_spec(), None);

View File

@@ -214,9 +214,9 @@ impl ApiTester {
pub async fn test_get_lighthouse_spec(self) -> Self {
let result = self
.client
.get_lighthouse_spec::<ConfigAndPresetElectra>()
.get_lighthouse_spec::<ConfigAndPresetFulu>()
.await
.map(|res| ConfigAndPreset::Electra(res.data))
.map(|res| ConfigAndPreset::Fulu(res.data))
.unwrap();
let expected = ConfigAndPreset::from_chain_spec::<E>(&E::default_spec(), None);

View File

@@ -29,6 +29,7 @@ pub enum ForkName {
Capella,
Deneb,
Electra,
Fulu,
}
#[derive(Debug, PartialEq, Serialize)]
@@ -107,6 +108,11 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload<E>> Web3SignerObject<'a, E, Pa
block: None,
block_header: Some(block.block_header()),
}),
BeaconBlock::Fulu(_) => Ok(Web3SignerObject::BeaconBlock {
version: ForkName::Fulu,
block: None,
block_header: Some(block.block_header()),
}),
}
}