From 17ad8cc2f00a67133ea3c260eaa566ea41c328ff Mon Sep 17 00:00:00 2001
From: Trevor Richard <trmidpoint@gmail.com>
Date: Thu, 21 Sep 2023 22:18:11 +0000
Subject: [PATCH] add WithdrawRewards event topic

---
 src/PrizePool.sol    |  5 +++--
 test/PrizePool.t.sol | 11 ++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/PrizePool.sol b/src/PrizePool.sol
index 9e8930a..06a2e8d 100644
--- a/src/PrizePool.sol
+++ b/src/PrizePool.sol
@@ -182,10 +182,11 @@ contract PrizePool is TieredLiquidityDistributor, Ownable {
   event ContributePrizeTokens(address indexed vault, uint24 indexed drawId, uint256 amount);
 
   /// @notice Emitted when an address withdraws their prize claim rewards.
+  /// @param account The account that is withdrawing rewards
   /// @param to The address the rewards are sent to
   /// @param amount The amount withdrawn
   /// @param available The total amount that was available to withdraw before the transfer
-  event WithdrawRewards(address indexed to, uint256 amount, uint256 available);
+  event WithdrawRewards(address indexed account, address indexed to, uint256 amount, uint256 available);
 
   /// @notice Emitted when an address receives new prize claim rewards.
   /// @param to The address the rewards are given to
@@ -527,7 +528,7 @@ contract PrizePool is TieredLiquidityDistributor, Ownable {
     }
 
     _transfer(_to, _amount);
-    emit WithdrawRewards(_to, _amount, _available);
+    emit WithdrawRewards(msg.sender, _to, _amount, _available);
   }
 
   /// @notice Allows anyone to deposit directly into the Prize Pool reserve.
diff --git a/test/PrizePool.t.sol b/test/PrizePool.t.sol
index 89f514a..e8cdf18 100644
--- a/test/PrizePool.t.sol
+++ b/test/PrizePool.t.sol
@@ -82,10 +82,11 @@ contract PrizePoolTest is Test {
   event ContributePrizeTokens(address indexed vault, uint24 indexed drawId, uint256 amount);
 
   /// @notice Emitted when an address withdraws their prize claim rewards.
+  /// @param account The account that is withdrawing rewards
   /// @param to The address the rewards are sent to
   /// @param amount The amount withdrawn
   /// @param available The total amount that was available to withdraw before the transfer
-  event WithdrawRewards(address indexed to, uint256 amount, uint256 available);
+  event WithdrawRewards(address indexed account, address indexed to, uint256 amount, uint256 available);
 
   /// @notice Emitted when an address receives new prize claim rewards.
   /// @param to The address the rewards are given to
@@ -1013,7 +1014,7 @@ contract PrizePoolTest is Test {
     assertEq(prizePool.claimCount(), 1);
 
     // Check if claim fees are accounted for
-    // (if they aren't anyone can call contributePrizes with the unaccounted fee amount and basically take it as their own)
+    // (if they aren't anyone can call contributePrizeTokens with the unaccounted fee amount and basically take it as their own)
     uint accountedBalance = prizePool.accountedBalance();
     uint actualBalance = prizeToken.balanceOf(address(prizePool));
     console2.log("accounted balance: ", accountedBalance);
@@ -1023,7 +1024,7 @@ contract PrizePoolTest is Test {
     // show that the claimer can still withdraw their fees:
     assertEq(prizeToken.balanceOf(address(this)), 0);
     vm.expectEmit();
-    emit WithdrawRewards(address(this), fee, fee);
+    emit WithdrawRewards(address(this), address(this), fee, fee);
     prizePool.withdrawRewards(address(this), fee);
     assertEq(prizeToken.balanceOf(address(this)), fee);
 
@@ -1117,8 +1118,8 @@ contract PrizePoolTest is Test {
     prizePool.claimPrize(msg.sender, 0, 0, msg.sender, 1e18, address(this));
 
     vm.expectEmit();
-    emit WithdrawRewards(address(this), 5e17, 1e18);
-    prizePool.withdrawRewards(address(this), 5e17);
+    emit WithdrawRewards(address(this), address(1), 5e17, 1e18);
+    prizePool.withdrawRewards(address(1), 5e17);
   }
 
   function testOpenDrawStartsAt_zeroDraw() public {