refactor(ATokenVaultMerklRewardClaimer): address feedback

Author: aa-eyup

src/ATokenVaultMerklRewardClaimer.sol

@@ -33,22 +33,13 @@ contract ATokenVaultMerklRewardClaimer is ATokenVault, IATokenVaultMerklRewardCl
         onlyOwner
     {
         require(_s.merklDistributor != address(0), "MERKL_DISTRIBUTOR_NOT_SET");
+        require(rewardTokens.length == amounts.length && rewardTokens.length == proofs.length, "ARRAY_LENGTH_MISMATCH");
 
         address[] memory users = new address[](rewardTokens.length);
         for (uint256 i = 0; i < rewardTokens.length; i++) {
-            // users represent depositors into Aave which is this contract
             users[i] = address(this);
         }
-
-        // The claim function does not return a list of tokens and amounts actually received.
-        // It is possible for rewards to be in aTokens, the underlying asset or some other token.
-        // If necessary the owner can use IATokenVault.emergencyRescue(...) to rescue the non-aToken rewards and non-native rewards.
         IMerklDistributor(_s.merklDistributor).claim(users, rewardTokens, amounts, proofs);
-        // Do not attempt to accrue yield as it can be delegated to subsequent calls to this contract.
-        // We do not need to accrue before claiming because new shares are not granted anywhere (rewards are socialized across all current share holders).
-        // We do not need to accrue after claiming because any subsequent call will trigger an accrual before state updates
-        // and preview functions read the balance of aTokens on the vault at runtime.
-
         emit MerklRewardsClaimed(_s.merklDistributor, rewardTokens, amounts);
     }
 
@@ -60,14 +51,6 @@ contract ATokenVaultMerklRewardClaimer is ATokenVault, IATokenVaultMerklRewardCl
         emit MerklDistributorUpdated(currentMerklDistributor, merklDistributor);
     }
 
-    /// @inheritdoc IATokenVaultMerklRewardClaimer
-    function toggleOperator(address operator) external override onlyOwner {
-        require(_s.merklDistributor != address(0), "MERKL_DISTRIBUTOR_NOT_SET");
-        require(operator != address(0), "ZERO_ADDRESS_NOT_VALID");
-        IMerklDistributor(_s.merklDistributor).toggleOperator(address(this), operator);
-        emit MerklRewardsOperatorToggled(_s.merklDistributor, operator);
-    }
-
     /// @inheritdoc IATokenVaultMerklRewardClaimer
     function getMerklDistributor() external view override returns (address) {
         return _s.merklDistributor;

src/dependencies/merkl/DistributorInterface.sol

@@ -1,7 +1,5 @@
-// SPDX-License-Identifier: UNLICENSED
+// SPDX-License-Identifier: BUSL-1.1
 // Based on implementation from https://github.com/AngleProtocol/merkl-contracts/blob/b7bd0e65a3f366e4041bc83494cbd981f8852b16/contracts/Distributor.sol#L202
-// All Rights Reserved © AaveCo
-
 pragma solidity ^0.8.10;
 
 interface IMerklDistributor {
@@ -11,6 +9,4 @@ interface IMerklDistributor {
         uint256[] calldata amounts,
         bytes32[][] calldata proofs
     ) external;
-
-    function toggleOperator(address user, address operator) external;
 }

src/interfaces/IATokenVaultMerklRewardClaimer.sol

@@ -20,13 +20,6 @@ interface IATokenVaultMerklRewardClaimer {
      */
     event MerklRewardsClaimed(address indexed distributor, address[] tokens, uint256[] amounts);
 
-    /**
-     * @dev Emitted when the operator status for the vault is toggled
-     * @param distributor Address of the Merkl distributor contract
-     * @param operator Address of the operator to toggle
-     */
-    event MerklRewardsOperatorToggled(address indexed distributor, address indexed operator);
-
     /**
      * @dev Emitted when the Merkl distributor address is updated
      * @param oldMerklDistributor The old address of the Merkl distributor contract
@@ -35,7 +28,7 @@ interface IATokenVaultMerklRewardClaimer {
     event MerklDistributorUpdated(address indexed oldMerklDistributor, address indexed newMerklDistributor);
 
     /**
-     * @notice Claims Merkl rewards earned by deposits from this contract through the Merkl distributor contract
+     * @notice Claims Merkl protocol rewards accrued from vault deposits.
      * @dev Only callable by the owner
      * @dev Merkl distributor address must be set
      * @dev The IMerklDistributor.claim(...) function does not return a list of tokens and amounts the users actually receive
@@ -55,15 +48,8 @@ interface IATokenVaultMerklRewardClaimer {
     function setMerklDistributor(address merklDistributor) external;
 
     /**
-     * @notice Toggles the operator status for the vault
-     * @dev Only callable by the owner
-     * @param operator Address of the operator to toggle
-     */
-    function toggleOperator(address operator) external;
-
-    /**
-     * @notice Getter for the contract address called to claim Merkl rewards
-     * @return Address of the Merkl distributor contract
+     * @notice Returns the address of the Merkl distributor contract.
+     * @return The address of the Merkl distributor contract
      */
     function getMerklDistributor() external view returns (address);
 }