Merge pull request #28 from GenerationSoftware/gen-1233-m-345-prize-c…

…laim-reentrancy

Remove already claimed check to match prize pool changes

.gitmodules

@@ -16,8 +16,8 @@
 [submodule "lib/pt-v5-claimable-interface"]
 	path = lib/pt-v5-claimable-interface
 	url = https://github.com/GenerationSoftware/pt-v5-claimable-interface
-	branch = prod-deploy-2
+	branch = main
 [submodule "lib/pt-v5-prize-pool"]
 	path = lib/pt-v5-prize-pool
 	url = https://github.com/GenerationSoftware/pt-v5-prize-pool
-	branch = prod-deploy-2
+	branch = main

src/Claimer.sol

@@ -39,12 +39,6 @@ error TimeToReachMaxFeeZero();
 /// @notice This contract uses a variable rate gradual dutch auction to incentivize prize claims on behalf of others.  Fees for each canary tier is set to the respective tier's prize size.
 contract Claimer {
 
-  /// @notice Emitted when a prize has already been claimed
-  /// @param winner The winner of the prize
-  /// @param tier The prize tier
-  /// @param prizeIndex The prize index
-  event AlreadyClaimed(address winner, uint8 tier, uint32 prizeIndex);
-
   /// @notice Emitted when a claim reverts
   /// @param vault The vault for which the claim failed
   /// @param tier The tier for which the claim failed
@@ -190,12 +184,8 @@ contract Claimer {
       for (uint256 p = 0; p < prizeIndicesLength; p++) {
         try
           _vault.claimPrize(_winners[w], _tier, _prizeIndices[w][p], _feePerClaim, _feeRecipient)
-        returns (uint256 prizeSize) {
-          if (0 != prizeSize) {
-            actualClaimCount++;
-          } else {
-            emit AlreadyClaimed(_winners[w], _tier, _prizeIndices[w][p]);
-          }
+        returns (uint256 /* prizeSize */) {
+          actualClaimCount++;
         } catch (bytes memory reason) {
           emit ClaimError(_vault, _tier, _winners[w], _prizeIndices[w][p], reason);
         }

test/Claimer.t.sol

@@ -14,16 +14,14 @@ import {
 import { UD2x18, ud2x18 } from "prb-math/UD2x18.sol";
 import { SD59x18 } from "prb-math/SD59x18.sol";
 
-import { PrizePool } from "pt-v5-prize-pool/PrizePool.sol";
+import { PrizePool, AlreadyClaimed } from "pt-v5-prize-pool/PrizePool.sol";
 import { IClaimable } from "pt-v5-claimable-interface/interfaces/IClaimable.sol";
 import { LinearVRGDALib } from "../src/libraries/LinearVRGDALib.sol";
 
 // Custom Errors
 error ClaimArraySizeMismatch(uint256 winnersLength, uint256 prizeIndicesLength);
 
 contract ClaimerTest is Test {
-  event AlreadyClaimed(address winner, uint8 tier, uint32 prizeIndex);
-
   event ClaimError(
     IClaimable indexed vault,
     uint8 indexed tier,
@@ -209,14 +207,25 @@ contract ClaimerTest is Test {
     assertEq(claimer.claimPrizes(vault, 1, winners, prizeIndices, address(this), 100e18), 0);
   }
 
-  function testClaimPrizes_alreadyClaimed() public {
+  function testClaimPrizes_alreadyClaimedError() public {
     address[] memory winners = newWinners(winner1);
     uint32[][] memory prizeIndices = newPrizeIndices(1, 1);
     mockPrizePool(1, -100, 0);
-    mockClaimPrize(1, winner1, 0, uint96(UNSOLD_100_SECONDS_IN_FEE), address(this), 0);
+    vm.mockCallRevert(
+      address(vault),
+      abi.encodeWithSelector(
+        vault.claimPrize.selector,
+        winner1,
+        1,
+        0,
+        uint96(UNSOLD_100_SECONDS_IN_FEE),
+        address(this)
+      ),
+      abi.encodeWithSelector(AlreadyClaimed.selector, address(vault), winner1, 1, 0)
+    );
     vm.expectEmit(true, true, true, true);
-    emit AlreadyClaimed(winner1, 1, 0);
-    assertEq(claimer.claimPrizes(vault, 1, winners, prizeIndices, address(this), 0), 0);
+    emit ClaimError(vault, 1, winner1, 0, abi.encodeWithSelector(AlreadyClaimed.selector, address(vault), winner1, 1, 0));
+    claimer.claimPrizes(vault, 1, winners, prizeIndices, address(this), 0);
   }
 
   function testClaimPrizes_maxFee() public {