enh: include the merkl distributor address in events

Author: aa-eyup

src/ATokenVaultMerklRewardClaimer.sol

@@ -49,7 +49,7 @@ contract ATokenVaultMerklRewardClaimer is ATokenVault, IATokenVaultMerklRewardCl
         // 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(rewardTokens, amounts);
+        emit MerklRewardsClaimed(_s.merklDistributor, rewardTokens, amounts);
     }
 
     /// @inheritdoc IATokenVaultMerklRewardClaimer
@@ -65,7 +65,7 @@ contract ATokenVaultMerklRewardClaimer is ATokenVault, IATokenVaultMerklRewardCl
         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(operator);
+        emit MerklRewardsOperatorToggled(_s.merklDistributor, operator);
     }
 
     /// @inheritdoc IATokenVaultMerklRewardClaimer

src/interfaces/IATokenVaultMerklRewardClaimer.sol

@@ -14,16 +14,18 @@ interface IATokenVaultMerklRewardClaimer {
      * @dev Emitted when Merkl rewards are claimed by the vault contract
      * @dev The token addresses do not always match the actual tokens received by the vault contract after rewards are claimed
      * @dev The amounts do not always match the actual amounts received (the amounts may be the cumulative rewards earned by the user)
+     * @param distributor Address of the Merkl distributor contract
      * @param tokens Addresses of the ERC-20 reward tokens claimed (the tokens passed as params to the Merkl distributor contract)
      * @param amounts Amounts of the reward tokens claimed for each token (the amounts passed as params to the Merkl distributor contract)
      */
-    event MerklRewardsClaimed(address[] tokens, uint256[] amounts);
+    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 operator);
+    event MerklRewardsOperatorToggled(address indexed distributor, address indexed operator);
 
     /**
      * @dev Emitted when the Merkl distributor address is updated

test/ATokenVaultMerklRewardClaimerFork.t.sol

@@ -96,8 +96,8 @@ contract ATokenVaultMerklRewardClaimerForkTest is ATokenVaultBaseTest {
         (address[] memory tokens, uint256[] memory amounts, bytes32[][] memory proofs) = _buildMerklRewardsClaimData();
 
         vm.prank(OWNER);
-        vm.expectEmit(true, false, false, true, ADDRESS_WITH_CLAIMABLE_REWARDS);
-        emit IATokenVaultMerklRewardClaimer.MerklRewardsClaimed(tokens, amounts);
+        vm.expectEmit(true, true, false, true, ADDRESS_WITH_CLAIMABLE_REWARDS);
+        emit IATokenVaultMerklRewardClaimer.MerklRewardsClaimed(MERKL_DISTRIBUTOR, tokens, amounts);
         IATokenVaultMerklRewardClaimer(ADDRESS_WITH_CLAIMABLE_REWARDS).claimMerklRewards(tokens, amounts, proofs);
     }
 
@@ -129,7 +129,7 @@ contract ATokenVaultMerklRewardClaimerForkTest is ATokenVaultBaseTest {
 
     function testSetMerklDistributorEmitsEvent() public {
         vm.prank(OWNER);
-        vm.expectEmit(true, false, false, true, address(vault));
+        vm.expectEmit(true, true, false, true, address(vault));
         emit IATokenVaultMerklRewardClaimer.MerklDistributorUpdated(address(0), MERKL_DISTRIBUTOR);
         IATokenVaultMerklRewardClaimer(address(vault)).setMerklDistributor(MERKL_DISTRIBUTOR);
     }

test/ATokenVaultMerklRewardsClaimer.t.sol

@@ -74,7 +74,7 @@ contract ATokenVaultMerklRewardsClaimerTest is ATokenVaultBaseTest {
         (address[] memory rewardTokens, uint256[] memory amounts, bytes32[][] memory proofs) = _buildMerklRewardsClaimData(address(dai), 1000, proof);
         vm.prank(OWNER);
         vm.expectEmit(true, true, false, true, address(vaultMerklRewardClaimer));
-        emit IATokenVaultMerklRewardClaimer.MerklRewardsClaimed(rewardTokens, amounts);
+        emit IATokenVaultMerklRewardClaimer.MerklRewardsClaimed(address(merklDistributor), rewardTokens, amounts);
         vaultMerklRewardClaimer.claimMerklRewards(rewardTokens, amounts, proofs);
     }
 
@@ -123,7 +123,7 @@ contract ATokenVaultMerklRewardsClaimerTest is ATokenVaultBaseTest {
         address operator = makeAddr("newOperator");
         vm.prank(OWNER);
         vm.expectEmit(true, true, false, true, address(vaultMerklRewardClaimer));
-        emit IATokenVaultMerklRewardClaimer.MerklRewardsOperatorToggled(operator);
+        emit IATokenVaultMerklRewardClaimer.MerklRewardsOperatorToggled(address(merklDistributor), operator);
         vaultMerklRewardClaimer.toggleOperator(operator);
     }