cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Deneb review common/eth2 (#4698)

Browse Source 
* Update comments and small cleanup.

* Deserialize into `SsePayloadAttributesV3` for Deneb fork. Update `SignedBlockContents::blobs_cloned` to return blobs for `BlindedBlockAndBlobSidecars`.

* Improve code readability and error handling when converting blinded block into full block.
This commit is contained in:
Jimmy Chen 2023-09-06 14:39:25 +10:00 committed by GitHub
parent 13606533b5
commit f9bea3c174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
beacon_node/http_api/src/lib.rs
View File

@ -1729,7 +1729,7 @@ pub fn serve<T: BeaconChainTypes>(
); );
/* /*
* beacon/blobs * beacon/blob_sidecars
*/ */
// GET beacon/blob_sidecars/{block_id} // GET beacon/blob_sidecars/{block_id}

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

@ -373,8 +373,8 @@ pub async fn reconstruct_block<T: BeaconChainTypes>(
.try_into_full_block_and_blobs(Some(full_payload_contents)) .try_into_full_block_and_blobs(Some(full_payload_contents))
.map(ProvenancedBlock::builder), .map(ProvenancedBlock::builder),
} }
.ok_or_else(|| { .map_err(|e| {
warp_utils::reject::custom_server_error("Unable to add payload to block".to_string()) warp_utils::reject::custom_server_error(format!("Unable to add payload to block: {e:?}"))
}) })
} }

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

@ -918,7 +918,7 @@ impl BeaconNodeHttpClient {
Ok(Some(response.json().await?)) Ok(Some(response.json().await?))
} }
/// `GET v1/beacon/blobs/{block_id}` /// `GET v1/beacon/blob_sidecars/{block_id}`
/// ///
/// Returns `Ok(None)` on a 404 error. /// Returns `Ok(None)` on a 404 error.
pub async fn get_blobs<T: EthSpec>( pub async fn get_blobs<T: EthSpec>(
@ -931,8 +931,7 @@ impl BeaconNodeHttpClient {
None => return Ok(None), None => return Ok(None),
}; };
let GenericResponse { data } = response.json().await?; Ok(Some(response.json().await?))
Ok(Some(GenericResponse { data }))
} }
/// `GET v1/beacon/blinded_blocks/{block_id}` /// `GET v1/beacon/blinded_blocks/{block_id}`

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

@ -978,9 +978,12 @@ impl ForkVersionDeserialize for SsePayloadAttributes {
ForkName::Merge => serde_json::from_value(value) ForkName::Merge => serde_json::from_value(value)
.map(Self::V1) .map(Self::V1)
.map_err(serde::de::Error::custom), .map_err(serde::de::Error::custom),
ForkName::Capella | ForkName::Deneb => serde_json::from_value(value) ForkName::Capella => serde_json::from_value(value)
.map(Self::V2) .map(Self::V2)
.map_err(serde::de::Error::custom), .map_err(serde::de::Error::custom),
ForkName::Deneb => serde_json::from_value(value)
.map(Self::V3)
.map_err(serde::de::Error::custom),
ForkName::Base | ForkName::Altair => Err(serde::de::Error::custom(format!( ForkName::Base | ForkName::Altair => Err(serde::de::Error::custom(format!(
"SsePayloadAttributes deserialization for {fork_name} not implemented" "SsePayloadAttributes deserialization for {fork_name} not implemented"
))), ))),
@ -1519,8 +1522,10 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> SignedBlockContents<T, Payload
SignedBlockContents::BlockAndBlobSidecars(block_and_sidecars) => { SignedBlockContents::BlockAndBlobSidecars(block_and_sidecars) => {
Some(block_and_sidecars.signed_blob_sidecars.clone()) Some(block_and_sidecars.signed_blob_sidecars.clone())
} }
SignedBlockContents::BlindedBlockAndBlobSidecars(block_and_sidecars) => {
Some(block_and_sidecars.signed_blinded_blob_sidecars.clone())
}
SignedBlockContents::Block(_block) => None, SignedBlockContents::Block(_block) => None,
SignedBlockContents::BlindedBlockAndBlobSidecars(_) => None,
} }
} }
@ -1543,48 +1548,47 @@ impl<T: EthSpec> SignedBlockContents<T, BlindedPayload<T>> {
pub fn try_into_full_block_and_blobs( pub fn try_into_full_block_and_blobs(
self, self,
maybe_full_payload_contents: Option<FullPayloadContents<T>>, maybe_full_payload_contents: Option<FullPayloadContents<T>>,
) -> Option<SignedBlockContents<T, FullPayload<T>>> { ) -> Result<SignedBlockContents<T, FullPayload<T>>, String> {
match self { match self {
SignedBlockContents::BlindedBlockAndBlobSidecars(blinded_block_and_blob_sidecars) => { SignedBlockContents::BlindedBlockAndBlobSidecars(blinded_block_and_blob_sidecars) => {
maybe_full_payload_contents.and_then(|full_payload_contents| { match maybe_full_payload_contents {
match full_payload_contents.deconstruct() { None | Some(FullPayloadContents::Payload(_)) => {
(full_payload, Some(blobs_bundle)) => { Err("Can't build full block contents without payload and blobs".to_string())
let maybe_full_block = blinded_block_and_blob_sidecars }
.signed_blinded_block Some(FullPayloadContents::PayloadAndBlobs(payload_and_blobs)) => {
.try_into_full_block(Some(full_payload)); let signed_block = blinded_block_and_blob_sidecars
let full_blob_sidecars: Vec<_> = blinded_block_and_blob_sidecars .signed_blinded_block
.try_into_full_block(Some(payload_and_blobs.execution_payload))
.ok_or("Failed to build full block with payload".to_string())?;
let signed_blob_sidecars: SignedBlobSidecarList<T> =
blinded_block_and_blob_sidecars
.signed_blinded_blob_sidecars .signed_blinded_blob_sidecars
.into_iter() .into_iter()
.zip(blobs_bundle.blobs) .zip(payload_and_blobs.blobs_bundle.blobs)
.map(|(blinded_blob_sidecar, blob)| { .map(|(blinded_blob_sidecar, blob)| {
blinded_blob_sidecar.into_full_blob_sidecars(blob) blinded_blob_sidecar.into_full_blob_sidecars(blob)
}) })
.collect(); .collect::<Vec<_>>()
.into();
maybe_full_block.map(|signed_block| { Ok(SignedBlockContents::new(
SignedBlockContents::BlockAndBlobSidecars( signed_block,
SignedBeaconBlockAndBlobSidecars { Some(signed_blob_sidecars),
signed_block, ))
signed_blob_sidecars: VariableList::from(
full_blob_sidecars,
),
},
)
})
}
// Can't build full block contents without full blobs
_ => None,
} }
}) }
} }
SignedBlockContents::Block(blinded_block) => { SignedBlockContents::Block(blinded_block) => {
let full_payload_opt = maybe_full_payload_contents.map(|o| o.deconstruct().0); let full_payload_opt = maybe_full_payload_contents.map(|o| o.deconstruct().0);
blinded_block blinded_block
.try_into_full_block(full_payload_opt) .try_into_full_block(full_payload_opt)
.map(SignedBlockContents::Block) .map(SignedBlockContents::Block)
.ok_or("Can't build full block without payload".to_string())
} }
// Unexpected scenario for blinded block proposal SignedBlockContents::BlockAndBlobSidecars(_) => Err(
SignedBlockContents::BlockAndBlobSidecars(_) => None, "BlockAndBlobSidecars variant not expected when constructing full block"
.to_string(),
),
} }
} }
} }