From ea032dabcddeb8163dd824e756ad22bc8bae02e5 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Thu, 2 May 2024 16:06:28 -0600 Subject: [PATCH 1/3] non-substantive but a bit clearer --- mev-build-rs/src/service.rs | 4 +++- mev-relay-rs/src/auction_context.rs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mev-build-rs/src/service.rs b/mev-build-rs/src/service.rs index e27ba093..7024602a 100644 --- a/mev-build-rs/src/service.rs +++ b/mev-build-rs/src/service.rs @@ -7,7 +7,9 @@ use crate::{ }, }; use ethereum_consensus::{ - clock::SystemClock, deneb::Slot, networks::Network, primitives::Epoch, + clock::SystemClock, + networks::Network, + primitives::{Epoch, Slot}, state_transition::Context, }; use eyre::OptionExt; diff --git a/mev-relay-rs/src/auction_context.rs b/mev-relay-rs/src/auction_context.rs index 49db103e..66159649 100644 --- a/mev-relay-rs/src/auction_context.rs +++ b/mev-relay-rs/src/auction_context.rs @@ -107,7 +107,7 @@ impl AuctionContext { execution_payload, value, }), - SignedBidSubmission::Capella(_) => Self::Capella(bellatrix::AuctionContext { + SignedBidSubmission::Capella(_) => Self::Capella(capella::AuctionContext { builder_public_key, signed_builder_bid, execution_payload, From 1907cbc8da8badac6877a0a1ce83612ca0162974 Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Thu, 2 May 2024 17:57:41 -0600 Subject: [PATCH 2/3] whitespace --- mev-rs/src/types/builder_bid.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/mev-rs/src/types/builder_bid.rs b/mev-rs/src/types/builder_bid.rs index e6c0be3e..0be4aebb 100644 --- a/mev-rs/src/types/builder_bid.rs +++ b/mev-rs/src/types/builder_bid.rs @@ -39,6 +39,7 @@ pub mod deneb { use super::{KzgCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK}; use crate::types::ExecutionPayloadHeader; use ethereum_consensus::{primitives::BlsPublicKey, ssz::prelude::*}; + #[derive(Debug, Clone, Serializable, HashTreeRoot, PartialEq, Eq)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct BuilderBid { From c037d23ad128cf39f0ecf70e7796083e55879d6d Mon Sep 17 00:00:00 2001 From: Alex Stokes Date: Thu, 2 May 2024 17:58:12 -0600 Subject: [PATCH 3/3] ensure we use the right preset for blobs --- mev-build-rs/src/utils/mod.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/mev-build-rs/src/utils/mod.rs b/mev-build-rs/src/utils/mod.rs index a138df83..86b27e09 100644 --- a/mev-build-rs/src/utils/mod.rs +++ b/mev-build-rs/src/utils/mod.rs @@ -1,9 +1,6 @@ pub mod compat { use ethereum_consensus::{ - deneb::{ - polynomial_commitments::{KzgCommitment, KzgProof}, - Blob, - }, + deneb::polynomial_commitments::{KzgCommitment, KzgProof}, primitives::{Bytes32, ExecutionAddress}, ssz::prelude::{ByteList, ByteVector, List, U256}, }; @@ -87,7 +84,7 @@ pub mod compat { proofs.push(proof); } for blob in &sidecar.blobs { - let blob = Blob::try_from(blob.as_ref()).unwrap(); + let blob = spec::Blob::try_from(blob.as_ref()).unwrap(); blobs.push(blob); } }