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

29
beacon_node/lighthouse_network/src/rpc/codec.rs
View File

@@ -21,8 +21,8 @@ use types::{
ForkName, Hash256, LightClientBootstrap, LightClientFinalityUpdate,
LightClientOptimisticUpdate, LightClientUpdate, SignedBeaconBlock, SignedBeaconBlockAltair,
SignedBeaconBlockBase, SignedBeaconBlockBellatrix, SignedBeaconBlockCapella,
SignedBeaconBlockDeneb, SignedBeaconBlockEip7805, SignedBeaconBlockElectra,
SignedBeaconBlockFulu, SignedBeaconBlockGloas,
SignedBeaconBlockDeneb, SignedBeaconBlockElectra, SignedBeaconBlockFulu,
SignedBeaconBlockGloas, SignedBeaconBlockHeze,
};
use unsigned_varint::codec::Uvi;
@@ -890,8 +890,8 @@ fn handle_rpc_response<E: EthSpec>(
decoded_buffer,
)?),
)))),
Some(ForkName::Eip7805) => Ok(Some(RpcSuccessResponse::BlocksByRange(Arc::new(
SignedBeaconBlock::Eip7805(SignedBeaconBlockEip7805::from_ssz_bytes(
Some(ForkName::Heze) => Ok(Some(RpcSuccessResponse::BlocksByRange(Arc::new(
SignedBeaconBlock::Heze(SignedBeaconBlockHeze::from_ssz_bytes(
decoded_buffer,
)?),
)))),
@@ -901,6 +901,9 @@ fn handle_rpc_response<E: EthSpec>(
Some(ForkName::Gloas) => Ok(Some(RpcSuccessResponse::BlocksByRange(Arc::new(
SignedBeaconBlock::Gloas(SignedBeaconBlockGloas::from_ssz_bytes(decoded_buffer)?),
)))),
Some(ForkName::Heze) => Ok(Some(RpcSuccessResponse::BlocksByRange(Arc::new(
SignedBeaconBlock::Heze(SignedBeaconBlockHeze::from_ssz_bytes(decoded_buffer)?),
)))),
None => Err(RPCError::ErrorResponse(
RpcErrorResponse::InvalidRequest,
format!(
@@ -934,8 +937,8 @@ fn handle_rpc_response<E: EthSpec>(
decoded_buffer,
)?),
)))),
Some(ForkName::Eip7805) => Ok(Some(RpcSuccessResponse::BlocksByRoot(Arc::new(
SignedBeaconBlock::Eip7805(SignedBeaconBlockEip7805::from_ssz_bytes(
Some(ForkName::Heze) => Ok(Some(RpcSuccessResponse::BlocksByRoot(Arc::new(
SignedBeaconBlock::Heze(SignedBeaconBlockHeze::from_ssz_bytes(
decoded_buffer,
)?),
)))),
@@ -945,6 +948,9 @@ fn handle_rpc_response<E: EthSpec>(
Some(ForkName::Gloas) => Ok(Some(RpcSuccessResponse::BlocksByRoot(Arc::new(
SignedBeaconBlock::Gloas(SignedBeaconBlockGloas::from_ssz_bytes(decoded_buffer)?),
)))),
Some(ForkName::Heze) => Ok(Some(RpcSuccessResponse::BlocksByRoot(Arc::new(
SignedBeaconBlock::Heze(SignedBeaconBlockHeze::from_ssz_bytes(decoded_buffer)?),
)))),
None => Err(RPCError::ErrorResponse(
RpcErrorResponse::InvalidRequest,
format!(
@@ -1001,8 +1007,8 @@ mod tests {
chain_spec.deneb_fork_epoch = Some(Epoch::new(4));
chain_spec.electra_fork_epoch = Some(Epoch::new(5));
chain_spec.fulu_fork_epoch = Some(Epoch::new(6));
chain_spec.eip7805_fork_epoch = Some(Epoch::new(7));
chain_spec.gloas_fork_epoch = Some(Epoch::new(8));
chain_spec.gloas_fork_epoch = Some(Epoch::new(7));
chain_spec.heze_fork_epoch = Some(Epoch::new(8));
// check that we have all forks covered
assert!(chain_spec.fork_epoch(ForkName::latest()).is_some());
@@ -1018,8 +1024,9 @@ mod tests {
ForkName::Deneb => spec.deneb_fork_epoch,
ForkName::Electra => spec.electra_fork_epoch,
ForkName::Fulu => spec.fulu_fork_epoch,
ForkName::Eip7805 => spec.eip7805_fork_epoch,
ForkName::Heze => spec.heze_fork_epoch,
ForkName::Gloas => spec.gloas_fork_epoch,
ForkName::Heze => spec.heze_fork_epoch,
};
let current_slot = current_epoch.unwrap().start_slot(Spec::slots_per_epoch());
ForkContext::new::<Spec>(current_slot, Hash256::zero(), spec)
@@ -1617,7 +1624,7 @@ mod tests {
RpcResponse::Success(RpcSuccessResponse::DataColumnsByRange(
empty_data_column_sidecar(&chain_spec)
)),
ForkName::Eip7805,
ForkName::Heze,
&chain_spec
),
Ok(Some(RpcSuccessResponse::DataColumnsByRange(
@@ -1673,7 +1680,7 @@ mod tests {
RpcResponse::Success(RpcSuccessResponse::DataColumnsByRoot(
empty_data_column_sidecar(&chain_spec)
)),
ForkName::Eip7805,
ForkName::Heze,
&chain_spec
),
Ok(Some(RpcSuccessResponse::DataColumnsByRoot(

12
beacon_node/lighthouse_network/src/rpc/protocol.rs
View File

@@ -155,8 +155,8 @@ pub fn rpc_block_limits_by_fork(current_fork: ForkName) -> RpcLimits {
| ForkName::Deneb
| ForkName::Electra
| ForkName::Fulu
| ForkName::Eip7805
| ForkName::Gloas => RpcLimits::new(
| ForkName::Gloas
| ForkName::Heze => RpcLimits::new(
*SIGNED_BEACON_BLOCK_BASE_MIN,
*SIGNED_BEACON_BLOCK_BELLATRIX_MAX,
),
@@ -185,7 +185,7 @@ fn rpc_light_client_updates_by_range_limits_by_fork(current_fork: ForkName) -> R
ForkName::Deneb => {
RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_UPDATES_BY_RANGE_DENEB_MAX)
}
ForkName::Electra | ForkName::Fulu | ForkName::Eip7805 | ForkName::Gloas => {
ForkName::Electra | ForkName::Fulu | ForkName::Gloas | ForkName::Heze => {
RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_UPDATES_BY_RANGE_ELECTRA_MAX)
}
}
@@ -205,7 +205,7 @@ fn rpc_light_client_finality_update_limits_by_fork(current_fork: ForkName) -> Rp
ForkName::Deneb => {
RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_FINALITY_UPDATE_DENEB_MAX)
}
ForkName::Electra | ForkName::Fulu | ForkName::Eip7805 | ForkName::Gloas => {
ForkName::Electra | ForkName::Fulu | ForkName::Gloas | ForkName::Heze => {
RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_FINALITY_UPDATE_ELECTRA_MAX)
}
}
@@ -226,7 +226,7 @@ fn rpc_light_client_optimistic_update_limits_by_fork(current_fork: ForkName) ->
ForkName::Deneb => {
RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_OPTIMISTIC_UPDATE_DENEB_MAX)
}
ForkName::Electra | ForkName::Fulu | ForkName::Eip7805 | ForkName::Gloas => RpcLimits::new(
ForkName::Electra | ForkName::Fulu | ForkName::Gloas | ForkName::Heze => RpcLimits::new(
altair_fixed_len,
*LIGHT_CLIENT_OPTIMISTIC_UPDATE_ELECTRA_MAX,
),
@@ -243,7 +243,7 @@ fn rpc_light_client_bootstrap_limits_by_fork(current_fork: ForkName) -> RpcLimit
}
ForkName::Capella => RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_BOOTSTRAP_CAPELLA_MAX),
ForkName::Deneb => RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_BOOTSTRAP_DENEB_MAX),
ForkName::Electra | ForkName::Fulu | ForkName::Eip7805 | ForkName::Gloas => {
ForkName::Electra | ForkName::Fulu | ForkName::Gloas | ForkName::Heze => {
RpcLimits::new(altair_fixed_len, *LIGHT_CLIENT_BOOTSTRAP_ELECTRA_MAX)
}
}

12
beacon_node/lighthouse_network/src/types/pubsub.rs
View File

@@ -13,8 +13,8 @@ use types::{
PartialDataColumnSidecar, PayloadAttestationMessage, ProposerSlashing, SignedAggregateAndProof,
SignedAggregateAndProofBase, SignedAggregateAndProofElectra, SignedBeaconBlock,
SignedBeaconBlockAltair, SignedBeaconBlockBase, SignedBeaconBlockBellatrix,
SignedBeaconBlockCapella, SignedBeaconBlockDeneb, SignedBeaconBlockEip7805,
SignedBeaconBlockElectra, SignedBeaconBlockFulu, SignedBeaconBlockGloas,
SignedBeaconBlockCapella, SignedBeaconBlockDeneb, SignedBeaconBlockElectra,
SignedBeaconBlockFulu, SignedBeaconBlockGloas, SignedBeaconBlockHeze,
SignedBlsToExecutionChange, SignedContributionAndProof, SignedExecutionPayloadBid,
SignedExecutionPayloadEnvelope, SignedInclusionList, SignedProposerPreferences,
SignedVoluntaryExit, SingleAttestation, SubnetId, SyncCommitteeMessage, SyncSubnetId,
@@ -256,14 +256,18 @@ impl<E: EthSpec> PubsubMessage<E> {
SignedBeaconBlockFulu::from_ssz_bytes(data)
.map_err(|e| format!("{:?}", e))?,
),
Some(ForkName::Eip7805) => SignedBeaconBlock::<E>::Eip7805(
SignedBeaconBlockEip7805::from_ssz_bytes(data)
Some(ForkName::Heze) => SignedBeaconBlock::<E>::Heze(
SignedBeaconBlockHeze::from_ssz_bytes(data)
.map_err(|e| format!("{:?}", e))?,
),
Some(ForkName::Gloas) => SignedBeaconBlock::<E>::Gloas(
SignedBeaconBlockGloas::from_ssz_bytes(data)
.map_err(|e| format!("{:?}", e))?,
),
Some(ForkName::Heze) => SignedBeaconBlock::<E>::Heze(
SignedBeaconBlockHeze::from_ssz_bytes(data)
.map_err(|e| format!("{:?}", e))?,
),
None => {
return Err(format!(
"Unknown gossipsub fork digest: {:?}",

2
beacon_node/lighthouse_network/src/types/topics.rs
View File

@@ -90,7 +90,7 @@ pub fn core_topics_to_subscribe<E: EthSpec>(
}
}
if fork_name.eip7805_enabled() {
if fork_name.heze_enabled() {
topics.push(GossipKind::InclusionList);
}