Skip to content

Commit

Permalink
Merge pull request #100 from GenerationSoftware/gen-1233-m-345-prize-…
Browse files Browse the repository at this point in the history
…claim-reentrancy

Revert if prize has already been claimed
  • Loading branch information
trmid committed Mar 21, 2024
2 parents 3344d3c + 8ffc465 commit 7e31113
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
9 changes: 8 additions & 1 deletion src/PrizePool.sol
Expand Up @@ -52,6 +52,13 @@ error InsufficientRewardsError(uint256 requested, uint256 available);
/// @param prizeIndex The prize index
error DidNotWin(address vault, address winner, uint8 tier, uint32 prizeIndex);

/// @notice Emitted when the prize being claimed has already been claimed
/// @param vault The vault address
/// @param winner The address checked for the prize
/// @param tier The prize tier
/// @param prizeIndex The prize index
error AlreadyClaimed(address vault, address winner, uint8 tier, uint32 prizeIndex);

/// @notice Emitted when the claim reward exceeds the maximum.
/// @param reward The reward being claimed
/// @param maxReward The max reward that can be claimed
Expand Down Expand Up @@ -510,7 +517,7 @@ contract PrizePool is TieredLiquidityDistributor {
}

if (_claimedPrizes[msg.sender][_winner][lastAwardedDrawId_][_tier][_prizeIndex]) {
return 0;
revert AlreadyClaimed(msg.sender, _winner, _tier, _prizeIndex);
}

_claimedPrizes[msg.sender][_winner][lastAwardedDrawId_][_tier][_prizeIndex] = true;
Expand Down
6 changes: 4 additions & 2 deletions test/PrizePool.t.sol
Expand Up @@ -25,6 +25,7 @@ import {
DrawTimeoutGTGrandPrizePeriodDraws,
PrizePoolNotShutdown,
DidNotWin,
AlreadyClaimed,
RangeSizeZero,
RewardTooLarge,
ContributionGTDeltaBalance,
Expand Down Expand Up @@ -1294,8 +1295,9 @@ contract PrizePoolTest is Test {
mockTwab(address(this), msg.sender, 0);
uint256 prize = prizePool.getTierPrizeSize(0);
assertEq(claimPrize(msg.sender, 0, 0), prize, "prize size");
// second claim is zero
assertEq(claimPrize(msg.sender, 0, 0), 0, "no more prize");
// second claim reverts
vm.expectRevert(abi.encodeWithSelector(AlreadyClaimed.selector, address(this), msg.sender, 0, 0));
claimPrize(msg.sender, 0, 0);
}

function testComputeNextNumberOfTiers_zero() public {
Expand Down

0 comments on commit 7e31113

Please sign in to comment.