Merge pull request #236 from ralexstokes/fix-auction-context

misc clean ups
ralexstokes · May 3, 2024 · 779a632 · 779a632
2 parents fb76b2a + c037d23
commit 779a632
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git 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-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);
             }
         }

diff --git 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,

diff --git 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 {