gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 04:37:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-30 09:48:04 +02:00
parent bab71429f8 a3c91f6ecb
commit 027fdc1a68
86 changed files with 2835 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
validator_client/beacon_node_fallback/src/lib.rs
View File

@@ -400,6 +400,13 @@ impl CandidateBeaconNode {
hint = UPDATE_REQUIRED_LOG_HINT,
"Beacon node has mismatched Gloas fork epoch"
);
} else if beacon_node_spec.heze_fork_epoch != spec.heze_fork_epoch {
warn!(
endpoint = %self.beacon_node,
endpoint_heze_fork_epoch = ?beacon_node_spec.heze_fork_epoch,
hint = UPDATE_REQUIRED_LOG_HINT,
"Beacon node has mismatched Heze fork epoch"
);
}
Ok(())

11
validator_client/signing_method/src/web3signer.rs
View File

@@ -34,9 +34,9 @@ pub enum ForkName {
Capella,
Deneb,
Electra,
Eip7805,
Fulu,
Gloas,
Heze,
}
#[derive(Debug, PartialEq, Serialize)]
@@ -118,8 +118,8 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload<E>> Web3SignerObject<'a, E, Pa
block: None,
block_header: Some(block.block_header()),
}),
BeaconBlock::Eip7805(_) => Ok(Web3SignerObject::BeaconBlock {
version: ForkName::Eip7805,
BeaconBlock::Heze(_) => Ok(Web3SignerObject::BeaconBlock {
version: ForkName::Heze,
block: None,
block_header: Some(block.block_header()),
}),
@@ -133,6 +133,11 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload<E>> Web3SignerObject<'a, E, Pa
block: None,
block_header: Some(block.block_header()),
}),
BeaconBlock::Heze(_) => Ok(Web3SignerObject::BeaconBlock {
version: ForkName::Heze,
block: None,
block_header: Some(block.block_header()),
}),
}
}