gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 12:47:05 +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

2
common/eth2/src/lib.rs
View File

@@ -146,7 +146,7 @@ impl Timeouts {
sync_committee_contribution: base_timeout
/ HTTP_SYNC_COMMITTEE_CONTRIBUTION_TIMEOUT_QUOTIENT,
sync_duties: base_timeout / HTTP_SYNC_DUTIES_TIMEOUT_QUOTIENT,
// TODO(EIP7805) check timeouts
// TODO(HEZE) check timeouts
inclusion_list_duties: base_timeout,
inclusion_list: base_timeout,
sync_aggregators: base_timeout / HTTP_SYNC_AGGREGATOR_TIMEOUT_QUOTIENT,

23
common/eth2/src/types.rs
View File

@@ -1044,6 +1044,7 @@ impl SseDataColumnSidecar {
let kzg_commitments: Vec<KzgCommitment> = match data_column_sidecar {
DataColumnSidecar::Fulu(dc) => dc.kzg_commitments.to_vec(),
DataColumnSidecar::Gloas(_) => vec![],
DataColumnSidecar::Heze(_) => vec![],
};
let versioned_hashes = kzg_commitments
.iter()
@@ -1209,8 +1210,8 @@ impl<'de> ContextDeserialize<'de, ForkName> for SsePayloadAttributes {
ForkName::Deneb
| ForkName::Electra
| ForkName::Fulu
| ForkName::Eip7805
| ForkName::Gloas => {
| ForkName::Gloas
| ForkName::Heze => {
Self::V3(Deserialize::deserialize(deserializer).map_err(convert_err)?)
}
})
@@ -2587,13 +2588,14 @@ mod test {
ExecutionPayload::Electra(ExecutionPayloadElectra::<MainnetEthSpec>::random_for_test(
rng,
)),
ExecutionPayload::Eip7805(ExecutionPayloadEip7805::<MainnetEthSpec>::random_for_test(
ExecutionPayload::Heze(ExecutionPayloadHeze::<MainnetEthSpec>::random_for_test(
rng,
)),
ExecutionPayload::Fulu(ExecutionPayloadFulu::<MainnetEthSpec>::random_for_test(rng)),
ExecutionPayload::Gloas(ExecutionPayloadGloas::<MainnetEthSpec>::random_for_test(
rng,
)),
ExecutionPayload::Heze(ExecutionPayloadHeze::<MainnetEthSpec>::random_for_test(rng)),
];
let merged_forks = &ForkName::list_all()[2..];
assert_eq!(
@@ -2639,8 +2641,8 @@ mod test {
},
{
let execution_payload =
ExecutionPayload::Eip7805(
ExecutionPayloadEip7805::<MainnetEthSpec>::random_for_test(rng),
ExecutionPayload::Heze(
ExecutionPayloadHeze::<MainnetEthSpec>::random_for_test(rng),
);
let blobs_bundle = BlobsBundle::random_for_test(rng);
ExecutionPayloadAndBlobs {
@@ -2670,6 +2672,17 @@ mod test {
blobs_bundle,
}
},
{
let execution_payload =
ExecutionPayload::Heze(
ExecutionPayloadHeze::<MainnetEthSpec>::random_for_test(rng),
);
let blobs_bundle = BlobsBundle::random_for_test(rng);
ExecutionPayloadAndBlobs {
execution_payload,
blobs_bundle,
}
},
];
let blob_forks = &ForkName::list_all()[4..];