Merge pull request #34 from soramitsu/feature/merge_penaltyclaim_to_c…

…laim_ [Update] removed totalPenalties in claim event
soramitsu · Jun 19, 2024 · cbeae50 · cbeae50
2 parents f026729 + 3cc8601
commit cbeae50
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/contracts/interfaces/IERC20Pool.sol b/contracts/interfaces/IERC20Pool.sol
@@ -54,13 +54,11 @@ interface IPoolERC20 {
      * @param user The address of the user who claims rewards
      * @param amount The amount of rewards claimed
      * @param penaltyAmount The amount deducted as penalty fee
-     * @param totalPenalties The total amount of deducted penalty fee
      */
     event Claim(
         address indexed user, 
         uint256 amount, 
-        uint256 penaltyAmount,
-        uint256 totalPenalties
+        uint256 penaltyAmount
     );
 
     /**

diff --git a/contracts/interfaces/IERC721Pool.sol b/contracts/interfaces/IERC721Pool.sol
@@ -71,13 +71,11 @@ interface IPoolERC721 {
      * @param user The address of the user who claimed the rewards.
      * @param pending The amount of rewards claimed.
      * @param penaltyAmount The amount deducted as penalty fee
-     * @param totalPenalties The total amount of deducted penalty fee
      */
     event Claim(
         address indexed user, 
         uint256 pending,
-        uint256 penaltyAmount,
-        uint256 totalPenalties
+        uint256 penaltyAmount
     );
 
     /**

diff --git a/contracts/pools/ERC20LockUpStakingPool.sol b/contracts/pools/ERC20LockUpStakingPool.sol
@@ -167,7 +167,7 @@ contract ERC20LockUpPool is ReentrancyGuard, Ownable, IPoolERC20, ILockUpPoolSto
             }
             pool.totalClaimed += pending;
             IERC20(pool.rewardToken).safeTransfer(msg.sender, pending);
-            emit Claim(msg.sender, pending, 0, 0);
+            emit Claim(msg.sender, pending, 0);
         } else {
             revert NothingToClaim();
         }

diff --git a/contracts/pools/ERC20PenaltyFeePool.sol b/contracts/pools/ERC20PenaltyFeePool.sol
@@ -145,7 +145,7 @@ contract ERC20PenaltyFeePool is ReentrancyGuard, Ownable, IPoolERC20, IPenaltyFe
             pool.totalClaimed += pending;
             pool.totalPenalties += penaltyAmount;
             IERC20(pool.rewardToken).safeTransfer(msg.sender, pending);
-            emit Claim(msg.sender, pending, penaltyAmount, pool.totalPenalties);
+            emit Claim(msg.sender, pending, penaltyAmount);
         } else {
             revert NothingToClaim();
         }

diff --git a/contracts/pools/ERC721/ERC721LockUpStakingPool.sol b/contracts/pools/ERC721/ERC721LockUpStakingPool.sol
@@ -176,7 +176,7 @@ contract ERC721LockUpPool is
             }
             pool.totalClaimed += pending;
             IERC20(pool.rewardToken).safeTransfer(msg.sender, pending);
-            emit Claim(msg.sender, pending, 0, 0);
+            emit Claim(msg.sender, pending, 0);
         } else {
             revert NothingToClaim();
         }

diff --git a/contracts/pools/ERC721/ERC721PenaltyFeePool.sol b/contracts/pools/ERC721/ERC721PenaltyFeePool.sol
@@ -181,7 +181,7 @@ contract draftERC721PenaltyFeepPool is
             pool.totalClaimed += pending;
             pool.totalPenalties += penaltyAmount;
             IERC20(pool.rewardToken).safeTransfer(msg.sender, pending);
-            emit Claim(msg.sender, pending, penaltyAmount, pool.totalPenalties);
+            emit Claim(msg.sender, pending, penaltyAmount);
         } else {
             revert NothingToClaim();
         }