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

Fix Gloas SSZ/JSON decoding for FullBlockContents and PublishBlockRequest

Browse Source
This commit is contained in:
Jimmy Chen
2026-04-28 17:11:35 +02:00
parent 85b6c4d93f
commit 819bd9a41b
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
beacon_node/http_api/src/build_block_contents.rs
View File

@@ -13,7 +13,9 @@ pub fn build_block_contents<E: EthSpec>(
} }
BeaconBlockResponseWrapper::Full(block) => { BeaconBlockResponseWrapper::Full(block) => {
if fork_name.deneb_enabled() { // TODO(gloas): revisit when produceBlockV4 PR is finalised
// https://github.com/ethereum/beacon-APIs/pull/580
if fork_name.deneb_enabled() && !fork_name.gloas_enabled() {
let BeaconBlockResponse { let BeaconBlockResponse {
block, block,
state: _, state: _,

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

@@ -1883,7 +1883,9 @@ impl<E: EthSpec> FullBlockContents<E> {
/// SSZ decode with fork variant passed in explicitly. /// SSZ decode with fork variant passed in explicitly.
pub fn from_ssz_bytes_for_fork(bytes: &[u8], fork_name: ForkName) -> Result<Self, DecodeError> { pub fn from_ssz_bytes_for_fork(bytes: &[u8], fork_name: ForkName) -> Result<Self, DecodeError> {
if fork_name.deneb_enabled() { // TODO(gloas): revisit when produceBlockV4 PR is finalised
// https://github.com/ethereum/beacon-APIs/pull/580
if fork_name.deneb_enabled() && !fork_name.gloas_enabled() {
let mut builder = ssz::SszDecoderBuilder::new(bytes); let mut builder = ssz::SszDecoderBuilder::new(bytes);
builder.register_anonymous_variable_length_item()?; builder.register_anonymous_variable_length_item()?;
@@ -2050,15 +2052,20 @@ impl<'de, E: EthSpec> ContextDeserialize<'de, ForkName> for PublishBlockRequest<
let value = let value =
serde_json::Value::deserialize(deserializer).map_err(serde::de::Error::custom)?; serde_json::Value::deserialize(deserializer).map_err(serde::de::Error::custom)?;
SignedBlockContents::<E>::context_deserialize(&value, context) if context.gloas_enabled() {
.map(PublishBlockRequest::BlockContents) Arc::<SignedBeaconBlock<E>>::context_deserialize(&value, context)
.or_else(|_| { .map(PublishBlockRequest::Block)
Arc::<SignedBeaconBlock<E>>::context_deserialize(&value, context) } else {
.map(PublishBlockRequest::Block) SignedBlockContents::<E>::context_deserialize(&value, context)
}) .map(PublishBlockRequest::BlockContents)
.map_err(|_| { .or_else(|_| {
serde::de::Error::custom("could not match any variant of PublishBlockRequest") Arc::<SignedBeaconBlock<E>>::context_deserialize(&value, context)
}) .map(PublishBlockRequest::Block)
})
.map_err(|_| {
serde::de::Error::custom("could not match any variant of PublishBlockRequest")
})
}
} }
} }
@@ -2496,7 +2503,7 @@ mod test {
for fork_name in ForkName::list_all() { for fork_name in ForkName::list_all() {
let signed_beacon_block = let signed_beacon_block =
map_fork_name!(fork_name, SignedBeaconBlock, <_>::random_for_test(rng)); map_fork_name!(fork_name, SignedBeaconBlock, <_>::random_for_test(rng));
let request = if fork_name.deneb_enabled() { let request = if fork_name.deneb_enabled() && !fork_name.gloas_enabled() {
let kzg_proofs = KzgProofs::<MainnetEthSpec>::random_for_test(rng); let kzg_proofs = KzgProofs::<MainnetEthSpec>::random_for_test(rng);
let blobs = BlobsList::<MainnetEthSpec>::random_for_test(rng); let blobs = BlobsList::<MainnetEthSpec>::random_for_test(rng);
let block_contents = SignedBlockContents { let block_contents = SignedBlockContents {