gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-03 00:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Eitan Seri- Levi
2025-11-04 10:38:30 -08:00
parent 3d75238a6d
commit 0300d4b322
2 changed files with 1 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
beacon_node/beacon_chain/src/beacon_chain.rs
View File

@@ -5786,60 +5786,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
execution_payload_value,
)
}
BeaconState::Gloas(_) => {
let (
payload,
kzg_commitments,
maybe_blobs_and_proofs,
maybe_requests,
execution_payload_value,
) = block_contents
.ok_or(BlockProductionError::MissingExecutionPayload)?
.deconstruct();
(
BeaconBlock::Gloas(BeaconBlockGloas {
slot,
proposer_index,
parent_root,
state_root: Hash256::zero(),
body: BeaconBlockBodyGloas {
randao_reveal,
eth1_data,
graffiti,
proposer_slashings: proposer_slashings
.try_into()
.map_err(BlockProductionError::SszTypesError)?,
attester_slashings: attester_slashings_electra
.try_into()
.map_err(BlockProductionError::SszTypesError)?,
attestations: attestations_electra
.try_into()
.map_err(BlockProductionError::SszTypesError)?,
deposits: deposits
.try_into()
.map_err(BlockProductionError::SszTypesError)?,
voluntary_exits: voluntary_exits
.try_into()
.map_err(BlockProductionError::SszTypesError)?,
sync_aggregate: sync_aggregate
.ok_or(BlockProductionError::MissingSyncAggregate)?,
execution_payload: payload
.try_into()
.map_err(|_| BlockProductionError::InvalidPayloadFork)?,
bls_to_execution_changes: bls_to_execution_changes
.try_into()
.map_err(BlockProductionError::SszTypesError)?,
blob_kzg_commitments: kzg_commitments
.ok_or(BlockProductionError::InvalidPayloadFork)?,
execution_requests: maybe_requests
.ok_or(BlockProductionError::MissingExecutionRequests)?,
},
}),
maybe_blobs_and_proofs,
execution_payload_value,
)
}
BeaconState::Gloas(_) => todo!("Gloas block production"),
};
let block = SignedBeaconBlock::from_block(

10
consensus/types/src/light_client_bootstrap.rs
View File

@@ -234,17 +234,7 @@ impl<E: EthSpec> LightClientBootstrap<E> {
.try_into()
.map_err(Error::SszTypesError)?,
}),
<<<<<<< HEAD
ForkName::Gloas => todo!("Gloas light client not implemented"),
=======
ForkName::Gloas => Self::Gloas(LightClientBootstrapGloas {
header: LightClientHeaderGloas::block_to_light_client_header(block)?,
current_sync_committee,
current_sync_committee_branch: current_sync_committee_branch
.try_into()
.map_err(Error::SszTypesError)?,
}),
>>>>>>> 0507eca7b4dfc6e923b02197d3f3f68bdeb1e67c
};
Ok(light_client_bootstrap)