Merge pull request #145 from Merit-Systems/shafu/add-token-to-reclaim-funds-event

Add token to reclaim funds event

Author: shafu0x

interface/IEscrow.sol

@@ -68,7 +68,8 @@ interface IEscrow {
     event ReclaimedRepoFunds(
         uint256 indexed repoId,
         uint256 indexed instanceId,
-        address indexed admin,
+        address indexed token,
+        address admin,
         uint256 amount
     );
 

src/Escrow.sol

@@ -405,7 +405,7 @@ contract Escrow is Owned, IEscrow {
 
         ERC20(token).safeTransfer(msg.sender, amount);
 
-        emit ReclaimedRepoFunds(repoId, instanceId, msg.sender, amount);
+        emit ReclaimedRepoFunds(repoId, instanceId, token, msg.sender, amount);
     }
 
     /* -------------------------------------------------------------------------- */

test/06_Claim.t.sol

@@ -131,7 +131,7 @@ contract Claim_Test is Base_Test {
         uint256 initialFeeRecipientBalance = wETH.balanceOf(escrow.feeRecipient());
 
         vm.expectEmit(true, true, true, true);
-        emit Claimed(escrow.batchCount(), distributionId, recipient, expectedNetAmount, escrow.fee());
+        emit Claimed(escrow.batchCount(), distributionId, recipient, expectedNetAmount, expectedFee);
 
         vm.prank(recipient);
         escrow.claim(distributionIds, deadline, v, r, s, "");

test/07_ReclaimRepoFunds.t.sol

@@ -94,7 +94,7 @@ contract ReclaimFund_Test is Base_Test {
         uint256 initialRepoBalance = escrow.getAccountBalance(REPO_ID, ACCOUNT_ID, address(wETH));
 
         vm.expectEmit(true, true, true, true);
-        emit ReclaimedRepoFunds(REPO_ID, ACCOUNT_ID, repoAdmin, reclaimAmount);
+        emit ReclaimedRepoFunds(REPO_ID, ACCOUNT_ID, address(wETH), repoAdmin, reclaimAmount);
 
         vm.prank(repoAdmin);
         escrow.reclaimRepoFunds(REPO_ID, ACCOUNT_ID, address(wETH), reclaimAmount);
@@ -677,7 +677,7 @@ contract ReclaimFund_Test is Base_Test {
     /*                                    EVENTS                                  */
     /* -------------------------------------------------------------------------- */
 
-    event ReclaimedRepoFunds(uint256 indexed repoId, uint256 indexed instanceId, address indexed admin, uint256 amount);
+    event ReclaimedRepoFunds(uint256 indexed repoId, uint256 indexed instanceId, address indexed token, address admin, uint256 amount);
 
     function _toArray(address addr) internal pure returns (address[] memory) {
         address[] memory arr = new address[](1);