feat: upgrade to use new eigen version (#199)

Co-authored-by: JuArce <52429267+JuArce@users.noreply.github.com>

Author: taturosati

Makefile

@@ -34,10 +34,6 @@ anvil_deploy_eigen_contracts:
 	@echo "Deploying Eigen Contracts..."
 	. contracts/scripts/anvil/deploy_eigen_contracts.sh
 
-anvil_deploy_mock_strategy:
-	@echo "Deploying Mock Strategy..."
-	. contracts/scripts/anvil/deploy_mock_strategy.sh
-
 anvil_deploy_aligned_contracts:
 	@echo "Deploying Aligned Contracts..."
 	. contracts/scripts/anvil/deploy_aligned_contracts.sh
@@ -50,6 +46,18 @@ anvil_upgrade_registry_coordinator:
 	@echo "Upgrading Registry Coordinator Contracts..."
 	. contracts/scripts/anvil/upgrade_registry_coordinator.sh
 
+anvil_upgrade_bls_apk_registry:
+	@echo "Upgrading Bls Apk Registry Contract..."
+	. contracts/scripts/anvil/upgrade_bls_apk_registry.sh
+
+anvil_upgrade_stake_registry:
+	@echo "Upgrading Stake Registry Contract..."
+	. contracts/scripts/anvil/upgrade_stake_registry.sh
+
+anvil_upgrade_index_registry:
+	@echo "Upgrading Index Registry Contracts..."
+	. contracts/scripts/anvil/upgrade_index_registry.sh
+
 anvil_start:
 	@echo "Starting Anvil..."
 	anvil --load-state contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json
@@ -119,7 +127,7 @@ operator_whitelist:
 
 operator_deposit_into_mock_strategy:
 	@echo "Depositing into strategy"
-	$(eval STRATEGY_ADDRESS = $(shell jq -r '.erc20MockStrategy' contracts/script/output/devnet/strategy_deployment_output.json))
+	$(eval STRATEGY_ADDRESS = $(shell jq -r '.addresses.strategies.MOCK' contracts/script/output/devnet/eigenlayer_deployment_output.json))
 
 	@go run operator/cmd/main.go deposit-into-strategy \
 		--config $(CONFIG_FILE) \
@@ -457,6 +465,18 @@ upgrade_registry_coordinator: ## Upgrade Registry Coordinator
 	@echo "Upgrading Registry Coordinator..."
 	@. contracts/scripts/.env && . contracts/scripts/upgrade_registry_coordinator.sh
 
+upgrade_bls_apk_registry: ## Upgrade Registry Coordinator
+	@echo "Upgrading BLS Apk Registry Coordinator..."
+	@. contracts/scripts/.env && . contracts/scripts/upgrade_bls_apk_registry.sh
+
+upgrade_index_registry: ## Upgrade Registry Coordinator
+	@echo "Upgrading Index Registry..."
+	@. contracts/scripts/.env && . contracts/scripts/upgrade_index_registry.sh
+
+upgrade_stake_registry: ## Upgrade Stake Registry
+	@echo "Upgrading Stake Registry..."
+	@. contracts/scripts/.env && . contracts/scripts/upgrade_stake_registry.sh
+
 build_aligned_contracts:
 	@cd contracts/src/core && forge build
 

batcher/Cargo.lock

@@ -28,11 +28,9 @@ import "forge-std/Script.sol";
 import "forge-std/StdJson.sol";
 
 contract AlignedLayerDeployer is ExistingDeploymentParser {
-
     ProxyAdmin public alignedLayerProxyAdmin;
     address public alignedLayerOwner;
     address public alignedLayerUpgrader;
-    address public aggregator;
     address public pauser;
     uint256 public initalPausedStatus;
     address public deployer;
@@ -83,10 +81,6 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
             config_data,
             ".permissions.upgrader"
         );
-        aggregator = stdJson.readAddress(
-            config_data,
-            ".permissions.aggregator"
-        );
         initalPausedStatus = stdJson.readUint(
             config_data,
             ".permissions.initalPausedStatus"
@@ -234,6 +228,7 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
         //deploy the alignedLayer service manager implementation
         alignedLayerServiceManagerImplementation = new AlignedLayerServiceManager(
             avsDirectory,
+            rewardsCoordinator,
             registryCoordinator,
             stakeRegistry
         );
@@ -246,8 +241,7 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
             address(alignedLayerServiceManagerImplementation),
             abi.encodeWithSelector(
                 AlignedLayerServiceManager.initialize.selector,
-                deployer,
-                aggregator
+                deployer
             )
         );
 
@@ -318,10 +312,6 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
             config_data,
             ".permissions.upgrader"
         );
-        aggregator = stdJson.readAddress(
-            config_data,
-            ".permissions.aggregator"
-        );
         initalPausedStatus = stdJson.readUint(
             config_data,
             ".permissions.initalPausedStatus"
@@ -463,6 +453,7 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
         //deploy the alignedLayer service manager implementation
         alignedLayerServiceManagerImplementation = new AlignedLayerServiceManager(
             avsDirectory,
+            rewardsCoordinator,
             registryCoordinator,
             stakeRegistry
         );
@@ -475,8 +466,7 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
             address(alignedLayerServiceManagerImplementation),
             abi.encodeWithSelector(
                 AlignedLayerServiceManager.initialize.selector,
-                deployer,
-                aggregator
+                deployer
             )
         );
 
@@ -634,10 +624,6 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
             "alignedLayerServiceManager.owner() != alignedLayerOwner"
         );
         // require(alignedLayerServiceManager.pauserRegistry() == IPauserRegistry(pauser), "alignedLayerServiceManager: pauser registry not set correctly");
-        require(
-            alignedLayerServiceManager.isAggregator(aggregator) == true,
-            "alignedLayerServiceManager.aggregator() != aggregator"
-        );
         // require(alignedLayerServiceManager.paused() == initalPausedStatus, "alignedLayerServiceManager: init paused status set incorrectly");
 
         require(
@@ -813,7 +799,6 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
             alignedLayerUpgrader
         );
         vm.serializeAddress(permissions, "alignedLayerChurner", churner);
-        vm.serializeAddress(permissions, "alignedLayerAggregator", aggregator);
         vm.serializeAddress(permissions, "pauserRegistry", pauser);
         string memory permissions_output = vm.serializeAddress(
             permissions,