feat: add onlyAggregator to respondToTask

Makefile

@@ -71,6 +71,10 @@ anvil_upgrade_index_registry:
 	@echo "Upgrading Index Registry Contracts..."
 	. contracts/scripts/anvil/upgrade_index_registry.sh
 
+anvil_upgrade_add_aggregator:
+	@echo "Adding Aggregator to Aligned Contracts..."
+	. contracts/scripts/anvil/upgrade_add_aggregator_to_service_manager.sh
+
 lint_contracts:
 	@cd contracts && npm run lint:sol
 
@@ -429,6 +433,10 @@ upgrade_stake_registry: ## Upgrade Stake Registry
 	@echo "Upgrading Stake Registry..."
 	@. contracts/scripts/.env && . contracts/scripts/upgrade_stake_registry.sh
 
+upgrade_add_aggregator: ## Add Aggregator to Aligned Contracts
+	@echo "Adding Aggregator to Aligned Contracts..."
+	@. contracts/scripts/.env && . contracts/scripts/upgrade_add_aggregator_to_service_manager.sh
+
 deploy_verify_batch_inclusion_caller:
 	@echo "Deploying VerifyBatchInclusionCaller contract..."
 	@. examples/verify/.env && . examples/verify/scripts/deploy_verify_batch_inclusion_caller.sh

contracts/script/deploy/AlignedLayerDeployer.s.sol

@@ -34,6 +34,7 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
     address public pauser;
     uint256 public initalPausedStatus;
     address public deployer;
+    address public alignedLayerAggregator;
 
     BLSApkRegistry public apkRegistry;
     AlignedLayerServiceManager public alignedLayerServiceManager;
@@ -95,6 +96,11 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
         );
         emit log_named_address("You are deploying from", deployer);
 
+        alignedLayerAggregator = stdJson.readAddress(
+            config_data,
+            ".permissions.aggregator"
+        );
+
         vm.startBroadcast();
 
         // deploy proxy admin for ability to upgrade proxy contracts
@@ -242,7 +248,8 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
             abi.encodeWithSelector(
                 AlignedLayerServiceManager.initialize.selector,
                 deployer,
-                deployer
+                deployer,
+                alignedLayerAggregator
             )
         );
 
@@ -792,6 +799,10 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
             config_data,
             ".permissions.ejector"
         );
+        address alignedLayerAggregator = stdJson.readAddress(
+            config_data,
+            ".permissions.aggregator"
+        );
         string memory permissions = "permissions";
         vm.serializeAddress(
             permissions,
@@ -804,7 +815,11 @@ contract AlignedLayerDeployer is ExistingDeploymentParser {
             alignedLayerUpgrader
         );
         vm.serializeAddress(permissions, "alignedLayerChurner", churner);
+
         vm.serializeAddress(permissions, "pauserRegistry", pauser);
+
+        vm.serializeAddress(permissions, "alignedLayerAggregator", alignedLayerAggregator);
+
         string memory permissions_output = vm.serializeAddress(
             permissions,
             "alignedLayerEjector",

contracts/script/deploy/config/devnet/aligned.devnet.config.json

@@ -4,7 +4,7 @@
   },
   "permissions": {
     "owner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-    "aggregator": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+    "aggregator": "0x15d34aaf54267db7d7c367839aaf71a00a2c6a65",
     "upgrader": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
     "churner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
     "ejector": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",

contracts/script/output/devnet/alignedlayer_deployment_output.json

@@ -21,6 +21,7 @@
     "deploymentBlock": 0
   },
   "permissions": {
+    "alignedLayerAggregator": "0x15d34aaf54267db7d7c367839aaf71a00a2c6a65",
     "alignedLayerChurner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
     "alignedLayerEjector": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
     "alignedLayerOwner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",

contracts/script/upgrade/AlignedLayerUpgradeAddAggregator.s.sol

@@ -0,0 +1,118 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity =0.8.12;
+
+import {Script} from "forge-std/Script.sol";
+import "eigenlayer-contracts/src/contracts/core/AVSDirectory.sol";
+import {RegistryCoordinator} from "eigenlayer-middleware/RegistryCoordinator.sol";
+import {StakeRegistry} from "eigenlayer-middleware/StakeRegistry.sol";
+import {IRewardsCoordinator} from "eigenlayer-contracts/src/contracts/interfaces/IRewardsCoordinator.sol";
+import {AlignedLayerServiceManager} from "src/core/AlignedLayerServiceManager.sol";
+import "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
+import "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import "forge-std/StdJson.sol";
+
+contract AlignedLayerSetAggregator is Script {
+    function run(
+        string memory eigenLayerDeploymentFilePath,
+        string memory alignedLayerDeploymentFilePath,
+        string memory alignedConfigFilePath
+    ) external returns (address, address) {
+        string memory eigen_deployment_file = vm.readFile(
+            eigenLayerDeploymentFilePath
+        );
+
+        string memory aligned_deployment_file = vm.readFile(
+            alignedLayerDeploymentFilePath
+        );
+
+        string memory aligned_config_file = vm.readFile(
+            alignedConfigFilePath
+        );
+
+        ProxyAdmin alignedLayerProxyAdmin = ProxyAdmin(
+            stdJson.readAddress(
+                aligned_deployment_file,
+                ".addresses.alignedLayerProxyAdmin"
+            )
+        );
+
+        RegistryCoordinator registryCoordinator = RegistryCoordinator(
+            stdJson.readAddress(
+                aligned_deployment_file,
+                ".addresses.registryCoordinator"
+            )
+        );
+
+        AVSDirectory avsDirectory = AVSDirectory(
+            stdJson.readAddress(
+                eigen_deployment_file,
+                ".addresses.avsDirectory"
+            )
+        );
+
+        StakeRegistry stakeRegistry = StakeRegistry(
+            stdJson.readAddress(
+                aligned_deployment_file,
+                ".addresses.stakeRegistry"
+            )
+        );
+
+        IRewardsCoordinator rewardsCoordinator = IRewardsCoordinator(
+            stdJson.readAddress(
+                eigen_deployment_file,
+                ".addresses.rewardsCoordinator"
+            )
+        );
+
+        address alignedLayerAggregator = stdJson.readAddress(
+            aligned_config_file,
+            ".permissions.aggregator"
+        );
+
+        vm.startBroadcast();
+
+        AlignedLayerServiceManager alignedLayerServiceManagerImplementation = new AlignedLayerServiceManager(
+                avsDirectory,
+                rewardsCoordinator,
+                registryCoordinator,
+                stakeRegistry
+            );
+
+        vm.stopBroadcast();
+        vm.startBroadcast();
+
+        // alignedLayerServiceManager is the proxy
+        AlignedLayerServiceManager alignedLayerServiceManager = AlignedLayerServiceManager(
+                payable(
+                    stdJson.readAddress(
+                        aligned_deployment_file,
+                        ".addresses.alignedLayerServiceManager"
+                    )
+                )
+            );
+
+        vm.stopBroadcast();
+        vm.startBroadcast();
+
+        alignedLayerProxyAdmin.upgrade(
+            TransparentUpgradeableProxy(
+                payable(address(alignedLayerServiceManager))
+            ),
+            address(alignedLayerServiceManagerImplementation)
+        );
+
+        vm.stopBroadcast();
+        vm.startBroadcast();
+
+        alignedLayerServiceManager.initializeAggregator(
+            alignedLayerAggregator
+        );
+
+        vm.stopBroadcast();
+
+        return (
+            address(alignedLayerServiceManager),
+            address(alignedLayerServiceManagerImplementation)
+        );
+    }
+}

contracts/scripts/anvil/deploy_aligned_contracts.sh

@@ -48,18 +48,21 @@ forge_output=$(forge script script/deploy/BatcherPaymentServiceDeployer.s.sol \
 batcher_payment_service_proxy=$(echo "$forge_output" | awk '/0: address/ {print $3}')
 batcher_payment_service_implementation=$(echo "$forge_output" | awk '/1: address/ {print $3}')
 
-# Use the extracted value to replace the  batcher payment service values in alignedlayer_deployment_output.json and save it to a temporary file
-jq --arg batcher_payment_service_proxy "$batcher_payment_service_proxy" '.addresses.batcherPaymentService = $batcher_payment_service_proxy' "script/output/devnet/alignedlayer_deployment_output.json" > "script/output/devnet/alignedlayer_deployment_output.temp.temp.json"
-jq --arg batcher_payment_service_implementation "$batcher_payment_service_implementation" '.addresses.batcherPaymentServiceImplementation = $batcher_payment_service_implementation' "script/output/devnet/alignedlayer_deployment_output.temp.temp.json" > "script/output/devnet/alignedlayer_deployment_output.temp.json"
+# Save ALIGNED_LAYER_AGGREGATOR_ADDRESS
+ALIGNED_LAYER_AGGREGATOR_ADDRESS=$(jq -r '.address' ../config-files/anvil.aggregator.ecdsa.key.json)
+jq --arg alignedLayerAggregator "0x$ALIGNED_LAYER_AGGREGATOR_ADDRESS" '.permissions += {"alignedLayerAggregator": $alignedLayerAggregator}' "script/output/devnet/alignedlayer_deployment_output.json" > "script/output/devnet/alignedlayer_deployment_output.temp1.json"
 
+# Use the extracted value to replace the  batcher payment service values in alignedlayer_deployment_output.json and save it to a temporary file
+jq --arg batcher_payment_service_proxy "$batcher_payment_service_proxy" '.addresses.batcherPaymentService = $batcher_payment_service_proxy' "script/output/devnet/alignedlayer_deployment_output.temp1.json" > "script/output/devnet/alignedlayer_deployment_output.temp2.json"
+jq --arg batcher_payment_service_implementation "$batcher_payment_service_implementation" '.addresses.batcherPaymentServiceImplementation = $batcher_payment_service_implementation' "script/output/devnet/alignedlayer_deployment_output.temp2.json" > "script/output/devnet/alignedlayer_deployment_output.temp3.json"
 
 # Replace the original file with the temporary file
-mv "script/output/devnet/alignedlayer_deployment_output.temp.json" "script/output/devnet/alignedlayer_deployment_output.json"
+mv "script/output/devnet/alignedlayer_deployment_output.temp3.json" "script/output/devnet/alignedlayer_deployment_output.json"
 
 # Delete the temporary file
-rm -f "script/output/devnet/alignedlayer_deployment_output.temp.json"
-rm -f "script/output/devnet/alignedlayer_deployment_output.temp.temp.json"
-
+rm -f "script/output/devnet/alignedlayer_deployment_output.temp1.json"
+rm -f "script/output/devnet/alignedlayer_deployment_output.temp2.json"
+rm -f "script/output/devnet/alignedlayer_deployment_output.temp3.json"
 
 
 # Kill the anvil process to save state

contracts/scripts/anvil/upgrade_add_aggregator_to_service_manager.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# cd to the directory of this script so that this can be run from anywhere
+parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
+
+cd "$parent_path"
+
+cd ../../
+
+jq 'del(.block)' scripts/anvil/state/alignedlayer-deployed-anvil-state.json > scripts/anvil/state/alignedlayer-deployed-anvil-state-tmp.json
+
+cp -f scripts/anvil/state/alignedlayer-deployed-anvil-state-tmp.json scripts/anvil/state/alignedlayer-deployed-anvil-state.json
+
+rm scripts/anvil/state/alignedlayer-deployed-anvil-state-tmp.json
+
+anvil --load-state scripts/anvil/state/alignedlayer-deployed-anvil-state.json --dump-state scripts/anvil/state/alignedlayer-deployed-anvil-state.json &
+
+sleep 2
+
+# Save the output to a variable to later extract the address of the new deployed contract
+forge_output=$(forge script script/upgrade/AlignedLayerUpgradeAddAggregator.s.sol \
+    "./script/output/devnet/eigenlayer_deployment_output.json" \
+    "./script/output/devnet/alignedlayer_deployment_output.json" \
+    "./script/deploy/config/devnet/aligned.devnet.config.json" \
+    --rpc-url "http://localhost:8545" \
+    --private-key "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80" \
+    --broadcast \
+    --sig "run(string memory eigenLayerDeploymentFilePath, string memory alignedLayerDeploymentFilePath, string memory alignedConfigFilePath)")
+
+echo "$forge_output"
+
+pkill anvil
+
+ALIGNED_LAYER_AGGREGATOR_ADDRESS=$(jq -r '.permissions.aggregator' ./script/deploy/config/devnet/aligned.devnet.config.json)
+jq --arg alignedLayerAggregator "$ALIGNED_LAYER_AGGREGATOR_ADDRESS" '.permissions += {"alignedLayerAggregator": $alignedLayerAggregator}' "script/output/devnet/alignedlayer_deployment_output.json" > "script/output/devnet/alignedlayer_deployment_output.temp.json"
+
+mv "script/output/devnet/alignedlayer_deployment_output.temp.json" "script/output/devnet/alignedlayer_deployment_output.json"
+rm -f "script/output/devnet/alignedlayer_deployment_output.temp.json"

contracts/scripts/upgrade_add_aggregator_to_service_manager.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# cd to the directory of this script so that this can be run from anywhere
+parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
+
+cd "$parent_path"
+
+cd ../../contracts
+
+# Save the output to a variable to later extract the address of the new deployed contract
+forge_output=$(forge script script/upgrade/AlignedLayerUpgradeAddAggregator.s.sol \
+    $EXISTING_DEPLOYMENT_INFO_PATH \
+    $OUTPUT_PATH \
+    $DEPLOY_CONFIG_PATH \
+    --rpc-url $RPC_URL \
+    --private-key $PRIVATE_KEY \
+    --broadcast \
+    --verify \
+    --etherscan-api-key $ETHERSCAN_API_KEY \
+    --sig "run(string memory eigenLayerDeploymentFilePath, string memory alignedLayerDeploymentFilePath, string memory alignedConfigFilePath)")
+
+echo "$forge_output"
+
+# Extract the alignedLayerServiceManagerImplementation value from the output
+new_aligned_layer_service_manager_implementation=$(echo "$forge_output" | awk '/1: address/ {print $3}')
+
+# Use the extracted value to replace the alignedLayerServiceManagerImplementation value in alignedlayer_deployment_output.json and save it to a temporary file
+jq --arg new_aligned_layer_service_manager_implementation "$new_aligned_layer_service_manager_implementation" '.addresses.alignedLayerServiceManagerImplementation = $new_aligned_layer_service_manager_implementation' $OUTPUT_PATH > "script/output/holesky/alignedlayer_deployment_output.temp.json"
+
+# Write aggregator addres to deployment output file
+ALIGNED_LAYER_AGGREGATOR_ADDRESS=$(jq -r '.permissions.aggregator' $DEPLOY_CONFIG_PATH)
+jq --arg alignedLayerAggregator "$ALIGNED_LAYER_AGGREGATOR_ADDRESS" '.permissions += {"alignedLayerAggregator": $alignedLayerAggregator}' "script/output/holesky/alignedlayer_deployment_output.temp.json" > "script/output/holesky/alignedlayer_deployment_output.temp2.json"
+
+# Replace the original file with the temporary file
+mv "script/output/holesky/alignedlayer_deployment_output.temp2.json" $OUTPUT_PATH
+
+# Delete the temporary file
+rm -f "script/output/holesky/alignedlayer_deployment_output.temp.json"

contracts/src/core/AlignedLayerServiceManager.sol

@@ -42,9 +42,20 @@ contract AlignedLayerServiceManager is
     // @param _rewardsInitiator The address which is allowed to create AVS rewards submissions.
     function initialize(
         address _initialOwner,
-        address _rewardsInitiator
+        address _rewardsInitiator,
+        address _alignedAggregator
     ) public initializer {
         __ServiceManagerBase_init(_initialOwner, _rewardsInitiator);
+        alignedAggregator = _alignedAggregator; //can't do setAggregator(aggregator) since caller is not the owner
+    }
+
+    // This function is to be run only on upgrade
+    // If a new contract is deployed, this function should be removed
+    // Because this new value is also added in the constructor
+    function initializeAggregator(
+        address _alignedAggregator
+    ) public reinitializer(2) {
+        setAggregator(_alignedAggregator);
     }
 
     function createNewTask(
@@ -91,7 +102,7 @@ contract AlignedLayerServiceManager is
         bytes32 batchMerkleRoot,
         address senderAddress,
         NonSignerStakesAndSignature memory nonSignerStakesAndSignature
-    ) external {
+    ) external onlyAggregator {
         uint256 initialGasLeft = gasleft();
 
         bytes32 batchIdentifierHash = keccak256(
@@ -161,7 +172,7 @@ contract AlignedLayerServiceManager is
             senderAddress,
             batchersBalances[senderAddress]
         );
-        payable(msg.sender).transfer(txCost);
+        payable(alignedAggregator).transfer(txCost);
     }
 
     function verifyBatchInclusion(
@@ -231,6 +242,10 @@ contract AlignedLayerServiceManager is
         );
     }
 
+    function setAggregator(address _alignedAggregator) public onlyOwner {
+        alignedAggregator = _alignedAggregator;
+    }
+
     function withdraw(uint256 amount) external {
         if (batchersBalances[msg.sender] < amount) {
             revert InsufficientFunds(
@@ -272,4 +287,11 @@ contract AlignedLayerServiceManager is
     ) public pure returns (bool) {
         return keccak256(publicInput) == hash;
     }
+
+    modifier onlyAggregator() {
+        if (msg.sender != alignedAggregator) {
+            revert SenderIsNotAggregator(msg.sender, alignedAggregator);
+        }
+        _;
+    }
 }

contracts/src/core/AlignedLayerServiceManagerStorage.sol

@@ -13,7 +13,9 @@ abstract contract AlignedLayerServiceManagerStorage {
     // Storage for batchers balances. Used by aggregator to pay for respondToTask
     mapping(address => uint256) internal batchersBalances;
 
+    address public alignedAggregator;
+
     // storage gap for upgradeability
     // solhint-disable-next-line var-name-mixedcase
-    uint256[48] private __GAP;
+    uint256[47] private __GAP;
 }