gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 08:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
Eitan Seri- Levi
2026-02-03 20:47:42 -08:00
parent 1c1e6dda10 1dd0f7bcbb
commit 1e69734e18
19 changed files with 109 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
consensus/state_processing/src/per_block_processing/withdrawals.rs
View File

@@ -84,11 +84,8 @@ pub fn get_builder_withdrawals<E: EthSpec>(
return Ok(None);
};
// TODO(gloas): this has already changed on `master`, we need to update at next spec release
let withdrawals_limit = E::max_withdrawals_per_payload();
let withdrawals_limit = E::max_withdrawals_per_payload().safe_sub(1)?;
// TODO(gloas): this assert is from `master`, remove this comment once it is part of the tested
// spec version.
block_verify!(
withdrawals.len() <= withdrawals_limit,
BlockProcessingError::WithdrawalsLimitExceeded {
@@ -138,8 +135,6 @@ pub fn get_pending_partial_withdrawals<E: EthSpec>(
E::max_withdrawals_per_payload().safe_sub(1)?,
);
// TODO(gloas): this assert is from `master`, remove this comment once it is part of the tested
// spec version.
block_verify!(
withdrawals.len() <= withdrawals_limit,
BlockProcessingError::WithdrawalsLimitExceeded {
@@ -205,11 +200,8 @@ pub fn get_builders_sweep_withdrawals<E: EthSpec>(
let epoch = state.current_epoch();
let builders_limit = std::cmp::min(builders.len(), E::max_builders_per_withdrawals_sweep());
// TODO(gloas): this has already changed on `master`, we should update at the next spec release
let withdrawals_limit = E::max_withdrawals_per_payload();
let withdrawals_limit = E::max_withdrawals_per_payload().safe_sub(1)?;
// TODO(gloas): this assert is from `master`, remove this comment once it is part of the tested
// spec version.
block_verify!(
withdrawals.len() <= withdrawals_limit,
BlockProcessingError::WithdrawalsLimitExceeded {

10
consensus/types/src/data/data_column_sidecar.rs
View File

@@ -81,7 +81,9 @@ pub struct DataColumnSidecar<E: EthSpec> {
pub index: ColumnIndex,
#[serde(with = "ssz_types::serde_utils::list_of_hex_fixed_vec")]
pub column: DataColumn<E>,
/// All the KZG commitments and proofs associated with the block, used for verifying sample cells.
/// All the KZG commitments associated with the block, used for verifying sample cells.
/// In Gloas, commitments come from `block.body.signed_execution_payload_bid.message.blob_kzg_commitments`.
#[superstruct(only(Fulu))]
pub kzg_commitments: KzgCommitments<E>,
pub kzg_proofs: VariableList<KzgProof, E::MaxBlobCommitmentsPerBlock>,
#[superstruct(only(Fulu))]
@@ -210,7 +212,6 @@ impl<E: EthSpec> DataColumnSidecarGloas<E> {
Self {
index: 0,
column: VariableList::new(vec![Cell::<E>::default()]).unwrap(),
kzg_commitments: VariableList::new(vec![KzgCommitment::empty_for_testing()]).unwrap(),
kzg_proofs: VariableList::new(vec![KzgProof::empty()]).unwrap(),
slot: Slot::new(0),
beacon_block_root: Hash256::ZERO,
@@ -223,11 +224,6 @@ impl<E: EthSpec> DataColumnSidecarGloas<E> {
Self {
index: 0,
column: VariableList::new(vec![Cell::<E>::default(); max_blobs_per_block]).unwrap(),
kzg_commitments: VariableList::new(vec![
KzgCommitment::empty_for_testing();
max_blobs_per_block
])
.unwrap(),
kzg_proofs: VariableList::new(vec![KzgProof::empty(); max_blobs_per_block]).unwrap(),
slot: Slot::new(0),
beacon_block_root: Hash256::ZERO,