Merge pull request #181 from ralexstokes/update-ssz

update to latest ssz with transparent derive and alloy types

Cargo.toml

@@ -14,8 +14,8 @@ default-members = ["bin/mev"]
 version = "0.3.0"
 
 [workspace.dependencies]
-ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "6338befe3db58b74a40376ebd4330843e3c3844a" }
-beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "6338befe3db58b74a40376ebd4330843e3c3844a" }
+ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "b9baee3f3b9fc76bd9b5bc22b78edc05446af815" }
+beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "b9baee3f3b9fc76bd9b5bc22b78edc05446af815" }
 
 reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "5dd5555c5c7d8e43420e273e7005b8af63a847a5" }
 reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "5dd5555c5c7d8e43420e273e7005b8af63a847a5" }

mev-boost-rs/src/relay_mux.rs

@@ -53,7 +53,7 @@ fn validate_bid(
 // Select the most valuable bids in `bids`, breaking ties by `block_hash`
 fn select_best_bids(bids: impl Iterator<Item = (usize, U256)>) -> Vec<usize> {
     let (best_indices, _value) =
-        bids.fold((vec![], U256::zero()), |(mut best_indices, max), (index, value)| {
+        bids.fold((vec![], U256::ZERO), |(mut best_indices, max), (index, value)| {
             match value.cmp(&max) {
                 Ordering::Greater => (vec![index], value),
                 Ordering::Equal => {
@@ -200,7 +200,7 @@ impl BlindedBlockProvider for RelayMux {
 
         // TODO: change `value` so it does the copy internally
         let mut best_bid_indices =
-            select_best_bids(bids.iter().map(|(_, bid)| bid.message.value.clone()).enumerate());
+            select_best_bids(bids.iter().map(|(_, bid)| bid.message.value).enumerate());
 
         // if multiple distinct bids with same bid value, break tie by randomly picking one
         let mut rng = rand::thread_rng();

mev-build-rs/src/reth_builder/reth_compat.rs

@@ -22,7 +22,7 @@ fn to_byte_vector(value: Bloom) -> ByteVector<256> {
 }
 
 pub(crate) fn to_u256(value: &U256) -> ssz_rs::U256 {
-    ssz_rs::U256::try_from_bytes_le(&value.to_le_bytes::<32>()).unwrap()
+    *value
 }
 
 pub(crate) fn to_execution_payload(value: &SealedBlock) -> ExecutionPayload {

mev-relay-rs/src/relay.rs

@@ -416,8 +416,7 @@ impl Relay {
             }
         }
         let header = to_header(&mut execution_payload)?;
-        let mut bid =
-            BuilderBid { header, value: value.clone(), public_key: self.public_key.clone() };
+        let mut bid = BuilderBid { header, value, public_key: self.public_key.clone() };
         let signature = sign_builder_message(&mut bid, &self.secret_key, &self.context)?;
         let signed_builder_bid = SignedBuilderBid { message: bid, signature };
 
@@ -572,7 +571,7 @@ impl BlindedBlockRelayer for Relay {
                 &signed_submission.execution_payload,
             )?;
             debug!(%auction_request, "validated builder submission");
-            (auction_request, bid_trace.value.clone(), bid_trace.builder_public_key.clone())
+            (auction_request, bid_trace.value, bid_trace.builder_public_key.clone())
         };
 
         signed_submission.verify_signature(&self.context)?;

mev-rs/src/types/block_submission.rs

@@ -28,7 +28,7 @@ pub struct BidTrace {
     pub value: U256,
 }
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, SimpleSerialize)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct SignedBidSubmission {
     pub message: BidTrace,

mev-rs/src/types/builder_bid.rs

@@ -10,7 +10,7 @@ use ethereum_consensus::{
 };
 use std::fmt;
 
-#[derive(Debug, Clone, Merkleized)]
+#[derive(Debug, Clone, SimpleSerialize)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct BuilderBid {
     pub header: ExecutionPayloadHeader,
@@ -30,7 +30,7 @@ impl BuilderBid {
     }
 }
 
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, SimpleSerialize, serde::Serialize, serde::Deserialize)]
 pub struct SignedBuilderBid {
     pub message: BuilderBid,
     pub signature: BlsSignature,