From f7264a841f58619d48be143f6c23d19fa8eec5f4 Mon Sep 17 00:00:00 2001 From: Arr00 <13561405+arr00@users.noreply.github.com> Date: Thu, 18 Apr 2024 13:38:56 -0400 Subject: [PATCH] make has claimed public --- src/Dropper.sol | 6 +++--- test/Dropper.t.sol | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Dropper.sol b/src/Dropper.sol index 4519b4b..e48105a 100644 --- a/src/Dropper.sol +++ b/src/Dropper.sol @@ -73,7 +73,7 @@ contract Dropper { error ExpirationRecipientIsZero(); mapping(uint256 => DropData) public drops; - mapping(uint256 => mapping(address => bool)) private _claimed; + mapping(uint256 => mapping(address => bool)) public hasClaimed; /// @notice The number of drops created on this contract uint256 public numDrops; @@ -214,13 +214,13 @@ contract Dropper { DropData storage drop = drops[dropId]; if (drop.expirationTimestamp <= block.timestamp || block.timestamp < drop.startTimestamp) revert DropNotLive(); - if (_claimed[dropId][msg.sender]) revert DropAlreadyClaimed(); + if (hasClaimed[dropId][msg.sender]) revert DropAlreadyClaimed(); if (drop.claimedTokens + amount > drop.totalTokens) revert InsufficientTokensRemaining(); bytes32 leaf = keccak256(abi.encodePacked(msg.sender, amount)); if (!MerkleProof.verifyCalldata(merkleProof, drop.merkleRoot, leaf)) revert InvalidMerkleProof(); - _claimed[dropId][msg.sender] = true; + hasClaimed[dropId][msg.sender] = true; drop.claimedTokens += amount; address tokenAddress = drop.tokenAddress; diff --git a/test/Dropper.t.sol b/test/Dropper.t.sol index f27ab73..fd3301f 100644 --- a/test/Dropper.t.sol +++ b/test/Dropper.t.sol @@ -202,6 +202,7 @@ contract DropperTest is PRBTest, StdCheats { dropper.claim(dropId, amount, proof); assertEq(token.balanceOf(member), amount); + assertTrue(dropper.hasClaimed(dropId, member)); } // All have claimed