Merge pull request #254 from ralexstokes/update-ec-dep

update `ethereum-consensus` dep with kzg refactor
ralexstokes · May 12, 2024 · 44101b0 · 44101b0
2 parents 27cc7d1 + 1a2a31f
commit 44101b0
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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 = "2ce2ca4d59ef2985088168b0f69a4a8c4f953241" }
-beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "2ce2ca4d59ef2985088168b0f69a4a8c4f953241" }
+ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "cf3c404043230559660810bc0c9d6d5a8498d819" }
+beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "cf3c404043230559660810bc0c9d6d5a8498d819" }
 
 reth = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" }
 reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "5f82993c23164ce8ccdc7bf3ae5085205383a5c8" }

diff --git a/mev-build-rs/src/utils/mod.rs b/mev-build-rs/src/utils/mod.rs
@@ -1,7 +1,7 @@
 pub mod compat {
     use crate::Error;
     use ethereum_consensus::{
-        deneb::polynomial_commitments::{KzgCommitment, KzgProof},
+        crypto::{KzgCommitment, KzgProof},
         primitives::{Bytes32, ExecutionAddress},
         ssz::prelude::{ByteList, ByteVector, SimpleSerializeError, U256},
     };

diff --git a/mev-rs/src/relay.rs b/mev-rs/src/relay.rs
@@ -7,7 +7,7 @@ use crate::{
 use async_trait::async_trait;
 use beacon_api_client::Client as BeaconClient;
 use ethereum_consensus::{
-    crypto::Error as CryptoError, primitives::BlsPublicKey, serde::try_bytes_from_hex_str,
+    crypto::BlsError, primitives::BlsPublicKey, serde::try_bytes_from_hex_str,
 };
 use std::{cmp, fmt, hash, ops::Deref};
 use tracing::{error, warn};
@@ -19,7 +19,7 @@ pub struct RelayEndpoint {
 }
 
 impl TryFrom<Url> for RelayEndpoint {
-    type Error = CryptoError;
+    type Error = BlsError;
 
     fn try_from(url: Url) -> Result<Self, Self::Error> {
         let public_key = try_bytes_from_hex_str(url.username())?;

diff --git a/mev-rs/src/types/auction_contents.rs b/mev-rs/src/types/auction_contents.rs
@@ -14,7 +14,7 @@ pub mod capella {
 pub mod deneb {
     use super::ExecutionPayload;
     use ethereum_consensus::{
-        deneb::polynomial_commitments::{KzgCommitment, KzgProof},
+        crypto::{KzgCommitment, KzgProof},
         ssz::prelude::*,
     };
 

diff --git a/mev-rs/src/types/builder_bid.rs b/mev-rs/src/types/builder_bid.rs
@@ -3,7 +3,7 @@ use crate::{
     types::ExecutionPayloadHeader,
 };
 use ethereum_consensus::{
-    deneb::polynomial_commitments::KzgCommitment,
+    crypto::KzgCommitment,
     primitives::{BlsPublicKey, BlsSignature},
     ssz::prelude::*,
     state_transition::Context,