fix(contracts): check address are not zero in initialization (#1094)

Co-authored-by: Urix <[email protected]>

Author: MarcosNicolau

Makefile

@@ -472,9 +472,9 @@ build_aligned_contracts:
 
 show_aligned_error_codes:
 	@echo "\nAlignedLayerServiceManager errors:"
-	@cd contracts/src/core && forge inspect IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
+	@cd contracts && forge inspect src/core/IAlignedLayerServiceManager.sol:IAlignedLayerServiceManager errors
 	@echo "\nBatcherPaymentService errors:"
-	@cd contracts/src/core && forge inspect BatcherPaymentService.sol:BatcherPaymentService errors
+	@cd contracts && forge inspect src/core/BatcherPaymentService.sol:BatcherPaymentService errors
 
 __BUILD__:
 build_binaries:

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

@@ -36,6 +36,18 @@ contract AlignedLayerServiceManager is
             __stakeRegistry
         )
     {
+        if (address(__avsDirectory) == address(0)) {
+            revert InvalidAddress("avsDirectory");
+        }
+        if (address(__rewardsCoordinator) == address(0)) {
+            revert InvalidAddress("rewardsCoordinator");
+        }
+        if (address(__registryCoordinator) == address(0)) {
+            revert InvalidAddress("registryCoordinator");
+        }
+        if (address(__stakeRegistry) == address(0)) {
+            revert InvalidAddress("stakeRegistry");
+        }
         _disableInitializers();
     }
 
@@ -45,6 +57,15 @@ contract AlignedLayerServiceManager is
         address _rewardsInitiator,
         address _alignedAggregator
     ) public initializer {
+        if (_initialOwner == address(0)) {
+            revert InvalidAddress("initialOwner");
+        }
+        if (_rewardsInitiator == address(0)) {
+            revert InvalidAddress("rewardsInitiator");
+        }
+        if (_alignedAggregator == address(0)) {
+            revert InvalidAddress("alignedAggregator");
+        }
         __ServiceManagerBase_init(_initialOwner, _rewardsInitiator);
         alignedAggregator = _alignedAggregator; //can't do setAggregator(aggregator) since caller is not the owner
     }
@@ -129,7 +150,7 @@ contract AlignedLayerServiceManager is
         if (currentBatch.responded) {
             revert BatchAlreadyResponded(batchIdentifierHash);
         }
-        currentBatch.responded = true; 
+        currentBatch.responded = true;
 
         // Check that batcher has enough funds to fund response
         if (batchersBalances[senderAddress] < currentBatch.respondToTaskFeeLimit) {
@@ -181,7 +202,7 @@ contract AlignedLayerServiceManager is
             senderAddress,
             batchersBalances[senderAddress]
         );
-        
+
         payable(alignedAggregator).transfer(txCost);
     }
 
@@ -240,16 +261,17 @@ contract AlignedLayerServiceManager is
         bytes memory merkleProof,
         uint256 verificationDataBatchIndex
     ) external view returns (bool) {
-        return this.verifyBatchInclusion(
-            proofCommitment,
-            pubInputCommitment,
-            provingSystemAuxDataCommitment,
-            proofGeneratorAddr,
-            batchMerkleRoot,
-            merkleProof,
-            verificationDataBatchIndex,
-            address(0)
-        );
+        return
+            this.verifyBatchInclusion(
+                proofCommitment,
+                pubInputCommitment,
+                provingSystemAuxDataCommitment,
+                proofGeneratorAddr,
+                batchMerkleRoot,
+                merkleProof,
+                verificationDataBatchIndex,
+                address(0)
+            );
     }
 
     function setAggregator(address _alignedAggregator) public onlyOwner {

contracts/src/core/AlignedLayerServiceManager.sol

@@ -50,6 +50,7 @@ contract BatcherPaymentService is
         uint256 required
     ); // 955c0664
     error InvalidMerkleRoot(bytes32 expected, bytes32 actual); // 9f13b65c
+    error InvalidAddress(string param); // 161eb542
 
     // CONSTRUCTOR & INITIALIZER
     constructor() EIP712("Aligned", "1") {
@@ -70,6 +71,15 @@ contract BatcherPaymentService is
         address _batcherWallet,
         bytes32 _noncedVerificationDataTypeHash
     ) public initializer {
+        if (address(_alignedLayerServiceManager) == address(0)) {
+            revert InvalidAddress("alignedServiceManager");
+        }
+        if (_batcherPaymentServiceOwner == address(0)) {
+            revert InvalidAddress("batcherPaymentServiceOwner");
+        }
+        if (_batcherWallet == address(0)) {
+            revert InvalidAddress("batcherWallet");
+        }
         __Ownable_init(); // default is msg.sender
         __UUPSUpgradeable_init();
         _transferOwnership(_batcherPaymentServiceOwner);

contracts/src/core/BatcherPaymentService.sol

@@ -34,6 +34,7 @@ interface IAlignedLayerServiceManager {
     error SenderIsNotAggregator(address sender, address alignedAggregator); // 2cbe4195
     error InvalidDepositAmount(uint256 amount); // 412ed242
     error ExceededMaxRespondFee(uint256 respondToTaskFeeLimit, uint256 txCost); // 86fc507e
+    error InvalidAddress(string param); // 161eb542
 
     function createNewTask(
         bytes32 batchMerkleRoot,

contracts/src/core/IAlignedLayerServiceManager.sol

@@ -43,7 +43,7 @@ contract AlignedLayerServiceManagerTest is BLSMockAVSDeployer {
 
         alignedLayerServiceManager = new AlignedLayerServiceManager(
             avsDirectory,
-            IRewardsCoordinator(address(rewardsCoordinator)),
+            IRewardsCoordinator(address(rewardsCoordinatorMock)),
             IRegistryCoordinator(address(registryCoordinator)),
             IStakeRegistry(address(stakeRegistry))
         );