move to fork-agnostic KZG crypto

ralexstokes · May 7, 2024 · 4501234 · 4501234
1 parent 9aeeb84
commit 4501234
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 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 = "51fae41c70253d814271fcd0185fdffd50bb7232" }
-beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "51fae41c70253d814271fcd0185fdffd50bb7232" }
+ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "6936688e4a4ec4a53d82d24d7df4bccc559343b6" }
+beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "6936688e4a4ec4a53d82d24d7df4bccc559343b6" }
 
 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/compat.rs b/mev-build-rs/src/compat.rs
@@ -1,6 +1,6 @@
 use crate::Error;
 use ethereum_consensus::{
-    deneb::polynomial_commitments::{KzgCommitment, KzgProof},
+    crypto::{KzgCommitment, KzgProof},
     primitives::{Bytes32, ExecutionAddress},
     ssz::prelude::{ByteList, ByteVector, SimpleSerializeError, U256},
     Error as ConsensusError, Fork,

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::bls::Error as CryptoError, primitives::BlsPublicKey, serde::try_bytes_from_hex_str,
 };
 use std::{cmp, fmt, hash, ops::Deref};
 use tracing::{error, warn};

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,