hacky hacks

This commit is contained in:
Marius van der Wijden 2022-09-18 11:34:46 +02:00
parent 14aa4957b9
commit 285dbf43ed
3 changed files with 6 additions and 17 deletions

View File

@ -18,7 +18,7 @@ impl<T: BeaconChainTypes> ToStatusMessage for BeaconChain<T> {
/// Build a `StatusMessage` representing the state of the given `beacon_chain`. /// Build a `StatusMessage` representing the state of the given `beacon_chain`.
pub(crate) fn status_message<T: BeaconChainTypes>(beacon_chain: &BeaconChain<T>) -> StatusMessage { pub(crate) fn status_message<T: BeaconChainTypes>(beacon_chain: &BeaconChain<T>) -> StatusMessage {
let fork_digest = beacon_chain.enr_fork_id().fork_digest; let fork_digest = [0x9c, 0x67, 0x11, 0x28];
let cached_head = beacon_chain.canonical_head.cached_head(); let cached_head = beacon_chain.canonical_head.cached_head();
let mut finalized_checkpoint = cached_head.finalized_checkpoint(); let mut finalized_checkpoint = cached_head.finalized_checkpoint();

View File

@ -560,7 +560,7 @@ impl ChainSpec {
domain_sync_committee: 7, domain_sync_committee: 7,
domain_sync_committee_selection_proof: 8, domain_sync_committee_selection_proof: 8,
domain_contribution_and_proof: 9, domain_contribution_and_proof: 9,
altair_fork_version: [0x01, 0x00, 0x00, 0x00], altair_fork_version: [0x01, 0x00, 0x0f, 0xfd],
altair_fork_epoch: Some(Epoch::new(74240)), altair_fork_epoch: Some(Epoch::new(74240)),
/* /*
@ -571,7 +571,7 @@ impl ChainSpec {
min_slashing_penalty_quotient_bellatrix: u64::checked_pow(2, 5) min_slashing_penalty_quotient_bellatrix: u64::checked_pow(2, 5)
.expect("pow does not overflow"), .expect("pow does not overflow"),
proportional_slashing_multiplier_bellatrix: 3, proportional_slashing_multiplier_bellatrix: 3,
bellatrix_fork_version: [0x02, 0x00, 0x00, 0x00], bellatrix_fork_version: [0x02, 0x00, 0x0f, 0xfd],
bellatrix_fork_epoch: Some(Epoch::new(144896)), bellatrix_fork_epoch: Some(Epoch::new(144896)),
terminal_total_difficulty: Uint256::from_dec_str("58750000000000000000000") terminal_total_difficulty: Uint256::from_dec_str("58750000000000000000000")
.expect("terminal_total_difficulty is a valid integer"), .expect("terminal_total_difficulty is a valid integer"),
@ -583,7 +583,7 @@ impl ChainSpec {
* Eip4844 hard fork params * Eip4844 hard fork params
*/ */
eip4844_fork_epoch: None, eip4844_fork_epoch: None,
eip4844_fork_version: [0x03, 0x00, 0x00, 0x00], eip4844_fork_version: [0x83, 0x00, 0x0f, 0xfd],
/* /*
* Network specific * Network specific

View File

@ -227,7 +227,8 @@ impl<T: EthSpec> Encode for BlindedPayload<T> {
} }
} }
#[derive(Default, Debug, Clone, Serialize, Deserialize)] #[derive(Default, Debug, Clone, Serialize, Deserialize, Derivative)]
#[derivative(PartialEq, Hash(bound = "T: EthSpec"))]
#[serde(bound = "T: EthSpec")] #[serde(bound = "T: EthSpec")]
pub struct FullPayload<T: EthSpec> { pub struct FullPayload<T: EthSpec> {
pub execution_payload: ExecutionPayload<T> pub execution_payload: ExecutionPayload<T>
@ -239,18 +240,6 @@ impl <T: EthSpec> TestRandom for FullPayload<T> {
} }
} }
impl <T: EthSpec> PartialEq for FullPayload<T> {
fn eq(&self, other: &FullPayload<T>) -> bool {
todo!()
}
}
impl <T: EthSpec> Hash for FullPayload<T> {
fn hash<H: Hasher>(&self, into: &mut H) {
todo!()
}
}
impl<T: EthSpec> From<ExecutionPayload<T>> for FullPayload<T> { impl<T: EthSpec> From<ExecutionPayload<T>> for FullPayload<T> {
fn from(execution_payload: ExecutionPayload<T>) -> Self { fn from(execution_payload: ExecutionPayload<T>) -> Self {
Self { Self {