feat: add rewards-v2 related functionality

Makefile

@@ -52,7 +52,7 @@ MIDDLEWARE_CONTRACTS_ARGS:=$(patsubst %, --select '^%$$', $(shell echo $(MIDDLEW
 
 
 ### Core bindings ###
-CORE_CONTRACTS:="DelegationManager IRewardsCoordinator StrategyManager IEigenPod EigenPod IEigenPodManager EigenPodManager IStrategy AVSDirectory AllocationManager PermissionController"
+CORE_CONTRACTS:="DelegationManager IRewardsCoordinator StrategyManager IEigenPod EigenPod IEigenPodManager EigenPodManager IStrategy AVSDirectory AllocationManager PermissionController ERC20 Slasher ISlasher"
 CORE_CONTRACTS_LOCATION:=$(MIDDLEWARE_CONTRACTS_LOCATION)/lib/eigenlayer-contracts
 CORE_BINDINGS_PATH:=crates/utils/src/core
 # The echo is to remove quotes, and the patsubst to make the regex match the full text only

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

@@ -14,9 +14,9 @@ use eigen_types::operator::{
     bitmap_to_quorum_ids, bitmap_to_quorum_ids_from_u192, OperatorPubKeys,
 };
 use eigen_utils::{
-    deploy::stakeregistry::StakeRegistry, middleware::blsapkregistry::BLSApkRegistry,
+    middleware::blsapkregistry::BLSApkRegistry,
     middleware::operatorstateretriever::OperatorStateRetriever,
-    middleware::registrycoordinator::RegistryCoordinator,
+    middleware::registrycoordinator::RegistryCoordinator, middleware::stakeregistry::StakeRegistry,
 };
 
 use num_bigint::BigInt;

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

@@ -3,11 +3,11 @@ 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::core::islasher::ISlasher;
+use eigen_utils::core::{
     avsdirectory::AVSDirectory, delegationmanager::DelegationManager, erc20::ERC20,
-    islasher::ISlasher, istrategy::IStrategy,
+    istrategy::IStrategy,
 };
-
 #[derive(Debug, Clone)]
 pub struct ELChainReader {
     _logger: SharedLogger,
@@ -399,13 +399,13 @@ mod tests {
         },
     };
     use eigen_utils::{
-        deploy::mockavsservicemanager::MockAvsServiceManager,
-        middleware::{
+        core::{
             avsdirectory::AVSDirectory::{self, calculateOperatorAVSRegistrationDigestHashReturn},
             delegationmanager::DelegationManager::{
                 self, calculateDelegationApprovalDigestHashReturn,
             },
         },
+        sdk::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::core::irewardscoordinator::IRewardsCoordinator::{self, RewardsMerkleClaim};
+use eigen_utils::core::{
     delegationmanager::{
         DelegationManager::{self},
         IDelegationManager::OperatorDetails,
@@ -273,12 +273,14 @@ mod tests {
     };
     use eigen_types::operator::Operator;
     use eigen_utils::{
-        deploy::{
-            contractsregistry::ContractsRegistry::{self, get_test_valuesReturn},
+        core::{
+            delegationmanager::DelegationManager,
             irewardscoordinator::IRewardsCoordinator::{EarnerTreeMerkleLeaf, RewardsMerkleClaim},
+        },
+        sdk::{
+            contractsregistry::ContractsRegistry::{self, get_test_valuesReturn},
             mockavsservicemanager::MockAvsServiceManager,
         },
-        middleware::delegationmanager::DelegationManager,
     };
     use serial_test::serial;
     use std::str::FromStr;

crates/contracts/foundry.toml

@@ -3,5 +3,5 @@ src = "src"
 out = "out"
 libs = ["lib"]
 fs_permissions = [{ access = "read-write", path = "./" }]
-
+via-ir = true
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options

crates/contracts/script/DeployMockAvsRegistries.s.sol

@@ -9,8 +9,9 @@ import {IDelegationManager} from "eigenlayer-contracts/src/contracts/interfaces/
 import {IStrategyManager, IStrategy} from "eigenlayer-contracts/src/contracts/interfaces/IStrategyManager.sol";
 import {ISlasher} from "eigenlayer-contracts/src/contracts/interfaces/ISlasher.sol";
 import "eigenlayer-contracts/src/test/mocks/EmptyContract.sol";
-
+import {SocketRegistry} from "eigenlayer-middleware/src/SocketRegistry.sol";
 import "eigenlayer-middleware/src/RegistryCoordinator.sol" as blsregcoord;
+// import {ISocketRegistry} from "eigenlayer-middleware/src/interfaces/ISocketRegistry.sol";
 import {IServiceManager} from "eigenlayer-middleware/src/interfaces/IServiceManager.sol";
 import {IBLSApkRegistry, IIndexRegistry, IStakeRegistry} from "eigenlayer-middleware/src/RegistryCoordinator.sol";
 import {BLSApkRegistry} from "eigenlayer-middleware/src/BLSApkRegistry.sol";
@@ -153,12 +154,14 @@ contract DeployMockAvsRegistries is
                 address(stakeRegistryImplementation)
             );
         }
+        address socketRegistry  = address(new SocketRegistry(registryCoordinator));
 
         registryCoordinatorImplementation = new blsregcoord.RegistryCoordinator(
             blsregcoord.IServiceManager(address(mockAvsServiceManager)),
             blsregcoord.IStakeRegistry(address(stakeRegistry)),
             blsregcoord.IBLSApkRegistry(address(blsApkRegistry)),
-            blsregcoord.IIndexRegistry(address(indexRegistry))
+            blsregcoord.IIndexRegistry(address(indexRegistry)),
+            blsregcoord.ISocketRegistry(socketRegistry)
         );
 
         {

crates/contracts/src/MockAvsServiceManager.sol

@@ -17,14 +17,15 @@ contract MockAvsServiceManager is ServiceManagerBase, BLSSignatureChecker {
     )
         ServiceManagerBase(
             _avsDirectory,
+            _rewardsCoordinator,
             _registryCoordinator,
             _registryCoordinator.stakeRegistry()
         )
         BLSSignatureChecker(_registryCoordinator)
     {}
 
-    function initialize(address _initialOwner) external initializer {
+    function initialize(address _initialOwner,address _rewardsInitiator) external initializer {
         // TODO: setting _rewardsInitializer to be _initialOwner for now.
-        __ServiceManagerBase_init(_initialOwner);
+        __ServiceManagerBase_init(_initialOwner,_rewardsInitiator);
     }
 }

crates/eigen-cli/src/eigen_address.rs

@@ -4,7 +4,7 @@ use alloy::primitives::Address;
 use alloy::providers::Provider;
 use eigen_common::get_provider;
 use eigen_utils::{
-    middleware::delegationmanager::DelegationManager,
+    core::delegationmanager::DelegationManager,
     middleware::iblssignaturechecker::IBLSSignatureChecker,
     middleware::registrycoordinator::RegistryCoordinator,
 };

crates/utils/Cargo.toml

@@ -9,4 +9,4 @@ license-file.workspace = true
 
 [dependencies]
 alloy.workspace = true
-reqwest.workspace = true
+reqwest.workspace = true

crates/utils/src/middleware/ieigenpod.rs → crates/utils/src/core/ieigenpod.rs

@@ -13,7 +13,8 @@ library BeaconChainProofs {
     non_camel_case_types,
     non_snake_case,
     clippy::pub_underscore_fields,
-    clippy::style
+    clippy::style,
+    clippy::empty_structs_with_brackets
 )]
 pub mod BeaconChainProofs {
     use super::*;
@@ -1752,7 +1753,8 @@ interface IEigenPod {
     non_camel_case_types,
     non_snake_case,
     clippy::pub_underscore_fields,
-    clippy::style
+    clippy::style,
+    clippy::empty_structs_with_brackets
 )]
 pub mod IEigenPod {
     use super::*;
@@ -6430,7 +6432,7 @@ pub mod IEigenPod {
             Self::SELECTORS.binary_search(&selector).is_ok()
         }
         #[inline]
-        #[allow(unsafe_code, non_snake_case)]
+        #[allow(non_snake_case)]
         fn abi_decode_raw(
             selector: [u8; 4],
             data: &[u8],
@@ -6719,7 +6721,7 @@ pub mod IEigenPod {
                     selector,
                 ));
             };
-            (unsafe { DECODE_SHIMS.get_unchecked(idx) })(data, validate)
+            DECODE_SHIMS[idx](data, validate)
         }
         #[inline]
         fn abi_encoded_size(&self) -> usize {

crates/utils/src/deploy/ieigenpodmanager.rs → crates/utils/src/core/ieigenpodmanager.rs

@@ -587,7 +587,8 @@ interface IEigenPodManager {
     non_camel_case_types,
     non_snake_case,
     clippy::pub_underscore_fields,
-    clippy::style
+    clippy::style,
+    clippy::empty_structs_with_brackets
 )]
 pub mod IEigenPodManager {
     use super::*;
@@ -4331,7 +4332,7 @@ pub mod IEigenPodManager {
             Self::SELECTORS.binary_search(&selector).is_ok()
         }
         #[inline]
-        #[allow(unsafe_code, non_snake_case)]
+        #[allow(non_snake_case)]
         fn abi_decode_raw(
             selector: [u8; 4],
             data: &[u8],
@@ -4600,7 +4601,7 @@ pub mod IEigenPodManager {
                     selector,
                 ));
             };
-            (unsafe { DECODE_SHIMS.get_unchecked(idx) })(data, validate)
+            DECODE_SHIMS[idx](data, validate)
         }
         #[inline]
         fn abi_encoded_size(&self) -> usize {