chore: regenerate bindings

crates/chainio/clients/elcontracts/src/reader.rs

@@ -3,7 +3,7 @@ use alloy_primitives::{Address, FixedBytes, U256};
 use eigen_common::get_provider;
 use eigen_logging::logger::SharedLogger;
 use eigen_types::operator::Operator;
-use eigen_utils::middleware::{
+use eigen_utils::{
     avsdirectory::AVSDirectory, delegationmanager::DelegationManager, erc20::ERC20,
     islasher::ISlasher, istrategy::IStrategy,
 };
@@ -399,13 +399,9 @@ mod tests {
         },
     };
     use eigen_utils::{
-        deploy::mockavsservicemanager::MockAvsServiceManager,
-        middleware::{
-            avsdirectory::AVSDirectory::{self, calculateOperatorAVSRegistrationDigestHashReturn},
-            delegationmanager::DelegationManager::{
-                self, calculateDelegationApprovalDigestHashReturn,
-            },
-        },
+        avsdirectory::AVSDirectory::{self, calculateOperatorAVSRegistrationDigestHashReturn},
+        delegationmanager::DelegationManager::{self, calculateDelegationApprovalDigestHashReturn},
+        mockavsservicemanager::MockAvsServiceManager,
     };
     use std::str::FromStr;
 

crates/chainio/clients/elcontracts/src/writer.rs

@@ -3,8 +3,8 @@ use crate::reader::ELChainReader;
 use alloy_primitives::{Address, FixedBytes, TxHash, U256};
 use eigen_common::get_signer;
 pub use eigen_types::operator::Operator;
-use eigen_utils::deploy::irewardscoordinator::IRewardsCoordinator::{self, RewardsMerkleClaim};
-use eigen_utils::middleware::{
+use eigen_utils::irewardscoordinator::IRewardsCoordinator::{self, RewardsMerkleClaim};
+use eigen_utils::{
     delegationmanager::{
         DelegationManager::{self},
         IDelegationManager::OperatorDetails,
@@ -274,12 +274,10 @@ mod tests {
     };
     use eigen_types::operator::Operator;
     use eigen_utils::{
-        deploy::{
-            contractsregistry::ContractsRegistry::{self, get_test_valuesReturn},
-            irewardscoordinator::IRewardsCoordinator::{EarnerTreeMerkleLeaf, RewardsMerkleClaim},
-            mockavsservicemanager::MockAvsServiceManager,
-        },
-        middleware::delegationmanager::DelegationManager,
+        contractsregistry::ContractsRegistry::{self, get_test_valuesReturn},
+        delegationmanager::DelegationManager,
+        irewardscoordinator::IRewardsCoordinator::{EarnerTreeMerkleLeaf, RewardsMerkleClaim},
+        mockavsservicemanager::MockAvsServiceManager,
     };
     use serial_test::serial;
     use std::str::FromStr;

crates/crypto/bls/src/lib.rs

@@ -14,13 +14,11 @@ use ark_ec::{AffineRepr, CurveGroup};
 use ark_ff::{fields::PrimeField, BigInt, BigInteger256, Fp2};
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use eigen_crypto_bn254::utils::map_to_curve;
-use eigen_utils::middleware::blsapkregistry::BN254::{
-    G1Point as G1PointRegistry, G2Point as G2PointRegistry,
-};
-use eigen_utils::middleware::iblssignaturechecker::BN254::{
+use eigen_utils::blsapkregistry::BN254::{G1Point as G1PointRegistry, G2Point as G2PointRegistry};
+use eigen_utils::iblssignaturechecker::BN254::{
     G1Point as G1PointChecker, G2Point as G2PointChecker,
 };
-use eigen_utils::middleware::registrycoordinator::BN254::{G1Point, G2Point};
+use eigen_utils::registrycoordinator::BN254::{G1Point, G2Point};
 use serde::de::{self, Visitor};
 use serde::{Deserialize, Serialize};
 pub type PrivateKey = Fr;

crates/eigen-cli/src/eigen_address.rs

@@ -4,9 +4,8 @@ use alloy::primitives::Address;
 use alloy::providers::Provider;
 use eigen_common::get_provider;
 use eigen_utils::{
-    middleware::delegationmanager::DelegationManager,
-    middleware::iblssignaturechecker::IBLSSignatureChecker,
-    middleware::registrycoordinator::RegistryCoordinator,
+    delegationmanager::DelegationManager, iblssignaturechecker::IBLSSignatureChecker,
+    registrycoordinator::RegistryCoordinator,
 };
 use serde::{Deserialize, Serialize};
 

crates/utils/src/deploy/address.rs → crates/utils/src/address.rs

@@ -13,35 +13,36 @@ interface Address {}
     non_camel_case_types,
     non_snake_case,
     clippy::pub_underscore_fields,
-    clippy::style
+    clippy::style,
+    clippy::empty_structs_with_brackets
 )]
 pub mod Address {
     use super::*;
     use alloy::sol_types as alloy_sol_types;
     /// The creation / init bytecode of the contract.
     ///
     /// ```text
-    ///0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122047d8ac401f7873c1502260f0a1f3da4a60558815e958cdab50bc32ed4afa955d64736f6c634300081b0033
+    ///0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122054abbd9a6b4e4bb3ade16989756ad4da77cc1357a0bfca7fa9f6480d97bfe90864736f6c634300081c0033
     /// ```
     #[rustfmt::skip]
     #[allow(clippy::all)]
     pub static BYTECODE: alloy_sol_types::private::Bytes = alloy_sol_types::private::Bytes::from_static(
-        b"`U`2`\x0B\x82\x82\x829\x80Q_\x1A`s\x14`&WcNH{q`\xE0\x1B_R_`\x04R`$_\xFD[0_R`s\x81S\x82\x81\xF3\xFEs\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x000\x14`\x80`@R__\xFD\xFE\xA2dipfsX\"\x12 G\xD8\xAC@\x1Fxs\xC1P\"`\xF0\xA1\xF3\xDAJ`U\x88\x15\xE9X\xCD\xABP\xBC2\xEDJ\xFA\x95]dsolcC\0\x08\x1B\x003",
+        b"`U`2`\x0B\x82\x82\x829\x80Q_\x1A`s\x14`&WcNH{q`\xE0\x1B_R_`\x04R`$_\xFD[0_R`s\x81S\x82\x81\xF3\xFEs\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x000\x14`\x80`@R__\xFD\xFE\xA2dipfsX\"\x12 T\xAB\xBD\x9AkNK\xB3\xAD\xE1i\x89uj\xD4\xDAw\xCC\x13W\xA0\xBF\xCA\x7F\xA9\xF6H\r\x97\xBF\xE9\x08dsolcC\0\x08\x1C\x003",
     );
     /// The runtime bytecode of the contract, as deployed on the network.
     ///
     /// ```text
-    ///0x730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122047d8ac401f7873c1502260f0a1f3da4a60558815e958cdab50bc32ed4afa955d64736f6c634300081b0033
+    ///0x730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122054abbd9a6b4e4bb3ade16989756ad4da77cc1357a0bfca7fa9f6480d97bfe90864736f6c634300081c0033
     /// ```
     #[rustfmt::skip]
     #[allow(clippy::all)]
     pub static DEPLOYED_BYTECODE: alloy_sol_types::private::Bytes = alloy_sol_types::private::Bytes::from_static(
-        b"s\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x000\x14`\x80`@R__\xFD\xFE\xA2dipfsX\"\x12 G\xD8\xAC@\x1Fxs\xC1P\"`\xF0\xA1\xF3\xDAJ`U\x88\x15\xE9X\xCD\xABP\xBC2\xEDJ\xFA\x95]dsolcC\0\x08\x1B\x003",
+        b"s\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x000\x14`\x80`@R__\xFD\xFE\xA2dipfsX\"\x12 T\xAB\xBD\x9AkNK\xB3\xAD\xE1i\x89uj\xD4\xDAw\xCC\x13W\xA0\xBF\xCA\x7F\xA9\xF6H\r\x97\xBF\xE9\x08dsolcC\0\x08\x1C\x003",
     );
     use alloy::contract as alloy_contract;
     /**Creates a new wrapper around an on-chain [`Address`](self) contract instance.
 
-    See the [wrapper's documentation](`AddressInstance`) for more details.*/
+See the [wrapper's documentation](`AddressInstance`) for more details.*/
     #[inline]
     pub const fn new<
         T: alloy_contract::private::Transport + ::core::clone::Clone,
@@ -55,46 +56,45 @@ pub mod Address {
     }
     /**Deploys this contract using the given `provider` and constructor arguments, if any.
 
-    Returns a new instance of the contract, if the deployment was successful.
+Returns a new instance of the contract, if the deployment was successful.
 
-    For more fine-grained control over the deployment process, use [`deploy_builder`] instead.*/
+For more fine-grained control over the deployment process, use [`deploy_builder`] instead.*/
     #[inline]
     pub fn deploy<
         T: alloy_contract::private::Transport + ::core::clone::Clone,
         P: alloy_contract::private::Provider<T, N>,
         N: alloy_contract::private::Network,
     >(
         provider: P,
-    ) -> impl ::core::future::Future<Output = alloy_contract::Result<AddressInstance<T, P, N>>>
-    {
+    ) -> impl ::core::future::Future<
+        Output = alloy_contract::Result<AddressInstance<T, P, N>>,
+    > {
         AddressInstance::<T, P, N>::deploy(provider)
     }
     /**Creates a `RawCallBuilder` for deploying this contract using the given `provider`
-    and constructor arguments, if any.
+and constructor arguments, if any.
 
-    This is a simple wrapper around creating a `RawCallBuilder` with the data set to
-    the bytecode concatenated with the constructor's ABI-encoded arguments.*/
+This is a simple wrapper around creating a `RawCallBuilder` with the data set to
+the bytecode concatenated with the constructor's ABI-encoded arguments.*/
     #[inline]
     pub fn deploy_builder<
         T: alloy_contract::private::Transport + ::core::clone::Clone,
         P: alloy_contract::private::Provider<T, N>,
         N: alloy_contract::private::Network,
-    >(
-        provider: P,
-    ) -> alloy_contract::RawCallBuilder<T, P, N> {
+    >(provider: P) -> alloy_contract::RawCallBuilder<T, P, N> {
         AddressInstance::<T, P, N>::deploy_builder(provider)
     }
     /**A [`Address`](self) instance.
 
-    Contains type-safe methods for interacting with an on-chain instance of the
-    [`Address`](self) contract located at a given `address`, using a given
-    provider `P`.
+Contains type-safe methods for interacting with an on-chain instance of the
+[`Address`](self) contract located at a given `address`, using a given
+provider `P`.
 
-    If the contract bytecode is available (see the [`sol!`](alloy_sol_types::sol!)
-    documentation on how to provide it), the `deploy` and `deploy_builder` methods can
-    be used to deploy a new instance of the contract.
+If the contract bytecode is available (see the [`sol!`](alloy_sol_types::sol!)
+documentation on how to provide it), the `deploy` and `deploy_builder` methods can
+be used to deploy a new instance of the contract.
 
-    See the [module-level documentation](self) for all the available methods.*/
+See the [module-level documentation](self) for all the available methods.*/
     #[derive(Clone)]
     pub struct AddressInstance<T, P, N = alloy_contract::private::Ethereum> {
         address: alloy_sol_types::private::Address,
@@ -105,24 +105,24 @@ pub mod Address {
     impl<T, P, N> ::core::fmt::Debug for AddressInstance<T, P, N> {
         #[inline]
         fn fmt(&self, f: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result {
-            f.debug_tuple("AddressInstance")
-                .field(&self.address)
-                .finish()
+            f.debug_tuple("AddressInstance").field(&self.address).finish()
         }
     }
     /// Instantiation and getters/setters.
     #[automatically_derived]
     impl<
-            T: alloy_contract::private::Transport + ::core::clone::Clone,
-            P: alloy_contract::private::Provider<T, N>,
-            N: alloy_contract::private::Network,
-        > AddressInstance<T, P, N>
-    {
+        T: alloy_contract::private::Transport + ::core::clone::Clone,
+        P: alloy_contract::private::Provider<T, N>,
+        N: alloy_contract::private::Network,
+    > AddressInstance<T, P, N> {
         /**Creates a new wrapper around an on-chain [`Address`](self) contract instance.
 
-        See the [wrapper's documentation](`AddressInstance`) for more details.*/
+See the [wrapper's documentation](`AddressInstance`) for more details.*/
         #[inline]
-        pub const fn new(address: alloy_sol_types::private::Address, provider: P) -> Self {
+        pub const fn new(
+            address: alloy_sol_types::private::Address,
+            provider: P,
+        ) -> Self {
             Self {
                 address,
                 provider,
@@ -131,20 +131,22 @@ pub mod Address {
         }
         /**Deploys this contract using the given `provider` and constructor arguments, if any.
 
-        Returns a new instance of the contract, if the deployment was successful.
+Returns a new instance of the contract, if the deployment was successful.
 
-        For more fine-grained control over the deployment process, use [`deploy_builder`] instead.*/
+For more fine-grained control over the deployment process, use [`deploy_builder`] instead.*/
         #[inline]
-        pub async fn deploy(provider: P) -> alloy_contract::Result<AddressInstance<T, P, N>> {
+        pub async fn deploy(
+            provider: P,
+        ) -> alloy_contract::Result<AddressInstance<T, P, N>> {
             let call_builder = Self::deploy_builder(provider);
             let contract_address = call_builder.deploy().await?;
             Ok(Self::new(contract_address, call_builder.provider))
         }
         /**Creates a `RawCallBuilder` for deploying this contract using the given `provider`
-        and constructor arguments, if any.
+and constructor arguments, if any.
 
-        This is a simple wrapper around creating a `RawCallBuilder` with the data set to
-        the bytecode concatenated with the constructor's ABI-encoded arguments.*/
+This is a simple wrapper around creating a `RawCallBuilder` with the data set to
+the bytecode concatenated with the constructor's ABI-encoded arguments.*/
         #[inline]
         pub fn deploy_builder(provider: P) -> alloy_contract::RawCallBuilder<T, P, N> {
             alloy_contract::RawCallBuilder::new_raw_deploy(
@@ -187,11 +189,10 @@ pub mod Address {
     /// Function calls.
     #[automatically_derived]
     impl<
-            T: alloy_contract::private::Transport + ::core::clone::Clone,
-            P: alloy_contract::private::Provider<T, N>,
-            N: alloy_contract::private::Network,
-        > AddressInstance<T, P, N>
-    {
+        T: alloy_contract::private::Transport + ::core::clone::Clone,
+        P: alloy_contract::private::Provider<T, N>,
+        N: alloy_contract::private::Network,
+    > AddressInstance<T, P, N> {
         /// Creates a new call builder using this contract instance's provider and address.
         ///
         /// Note that the call can be any function call, not just those defined in this
@@ -206,11 +207,10 @@ pub mod Address {
     /// Event filters.
     #[automatically_derived]
     impl<
-            T: alloy_contract::private::Transport + ::core::clone::Clone,
-            P: alloy_contract::private::Provider<T, N>,
-            N: alloy_contract::private::Network,
-        > AddressInstance<T, P, N>
-    {
+        T: alloy_contract::private::Transport + ::core::clone::Clone,
+        P: alloy_contract::private::Provider<T, N>,
+        N: alloy_contract::private::Network,
+    > AddressInstance<T, P, N> {
         /// Creates a new event filter using this contract instance's provider and address.
         ///
         /// Note that the type can be any event, not just those defined in this contract.