Skip to content

Update BlindedBlobsBundle SSZ and deserialize signed blinded block (Deneb) #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ralexstokes merged 7 commits into from
Sep 12, 2023
Merged

Update BlindedBlobsBundle SSZ and deserialize signed blinded block (Deneb) #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c1ff22
Handle deneb signed blocks
jimmygchen Aug 24, 2023
b9c749d
Update BlindedBlobsBundle list max lengths to `MAX_BLOB_COMMITMENTS_P…
jimmygchen Sep 5, 2023
eb75005
Update `ethereum-consensus` dependency
jimmygchen Sep 5, 2023
e0c95b3
Merge branch 'main' into deserialize_deneb_block
jimmygchen Sep 5, 2023
dedc77a
Update `ethereum-consensus` and `beacon-api-client` dependencies
jimmygchen Sep 5, 2023
1778e1e
Merge branch 'main' into deserialize_deneb_block
jimmygchen Sep 12, 2023
ac8b580
Revert blinded block deserialization to the existing strategy.
jimmygchen Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions mev-rs/src/blinded_block_provider/api/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::{
blinded_block_provider::BlindedBlockProvider,
error::Error,
types::{
bellatrix, capella, BidRequest, ExecutionPayload, SignedBlindedBeaconBlock,
bellatrix, capella, deneb, BidRequest, ExecutionPayload, SignedBlindedBeaconBlock,
SignedBuilderBid, SignedValidatorRegistration,
},
};
Expand Down Expand Up @@ -49,14 +49,17 @@ async fn handle_open_bid<B: BlindedBlockProvider>(
State(builder): State<B>,
Json(block): Json<serde_json::Value>,
) -> Result<Json<VersionedValue<ExecutionPayload>>, Error> {
let maybe_capella_block = capella::SignedBlindedBeaconBlock::deserialize(&block);
let mut block = match maybe_capella_block {
Ok(block) => SignedBlindedBeaconBlock::Capella(block),
Err(err) => match bellatrix::SignedBlindedBeaconBlock::deserialize(block) {
Ok(block) => SignedBlindedBeaconBlock::Bellatrix(block),
Err(_) => return Err(ApiClientError::from(err).into()),
},
};
let mut block = deneb::SignedBlindedBlockAndBlobSidecars::deserialize(&block)
Copy link
Copy Markdown
Owner

@ralexstokes ralexstokes Sep 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is nice!

.map(SignedBlindedBeaconBlock::Deneb)
.or_else(|_| {
capella::SignedBlindedBeaconBlock::deserialize(&block)
.map(SignedBlindedBeaconBlock::Capella)
})
.or_else(|_| {
bellatrix::SignedBlindedBeaconBlock::deserialize(&block)
.map(SignedBlindedBeaconBlock::Bellatrix)
})
.map_err(ApiClientError::from)?;

let payload = builder.open_bid(&mut block).await?;
let block_hash = payload.block_hash();
Expand Down
14 changes: 7 additions & 7 deletions mev-rs/src/types/deneb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pub use ethereum_consensus::{builder::SignedValidatorRegistration, deneb::mainnet as spec};
use ethereum_consensus::{
deneb::mainnet::MAX_BLOBS_PER_BLOCK,
deneb::mainnet::{MAX_BLOBS_PER_BLOCK, MAX_BLOB_COMMITMENTS_PER_BLOCK},
kzg::{KzgCommitment, KzgProof},
primitives::{BlsPublicKey, BlsSignature, Root, U256},
};
Expand All @@ -26,9 +26,9 @@ pub struct BuilderBid {
#[derive(Debug, Default, Clone, SimpleSerialize)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct BlindedBlobsBundle {
pub commitments: List<KzgCommitment, MAX_BLOBS_PER_BLOCK>,
pub proofs: List<KzgProof, MAX_BLOBS_PER_BLOCK>,
pub blob_roots: List<Root, MAX_BLOBS_PER_BLOCK>,
pub commitments: List<KzgCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
pub proofs: List<KzgProof, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
pub blob_roots: List<Root, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
}

#[derive(Debug, Default, Clone, SimpleSerialize)]
Expand All @@ -48,9 +48,9 @@ pub struct SignedBlindedBlockAndBlobSidecars {
#[derive(Debug, Default, Clone, SimpleSerialize)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
pub struct BlobsBundle {
pub commitments: List<KzgCommitment, MAX_BLOBS_PER_BLOCK>,
pub proofs: List<KzgProof, MAX_BLOBS_PER_BLOCK>,
pub blobs: List<Blob, MAX_BLOBS_PER_BLOCK>,
pub commitments: List<KzgCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
pub proofs: List<KzgProof, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
pub blobs: List<Blob, MAX_BLOB_COMMITMENTS_PER_BLOCK>,
}

#[derive(Debug, Default, Clone, SimpleSerialize)]
Expand Down