diff --git a/contracts/DualRewardFarm.sol b/contracts/DualRewardFarm.sol index 5e63b12..01bdc4c 100644 --- a/contracts/DualRewardFarm.sol +++ b/contracts/DualRewardFarm.sol @@ -73,16 +73,6 @@ contract DualRewardFarm is TokenWrapper { _; } - event Staked( - address indexed user, - uint256 tokenAmount - ); - - event Withdrawn( - address indexed user, - uint256 tokenAmount - ); - event RewardsAdded( uint256 rewardRateA, uint256 rewardRateB, @@ -96,27 +86,6 @@ contract DualRewardFarm is TokenWrapper { uint256 tokenAmountB ); - event Recovered( - IERC20 indexed token, - uint256 tokenAmount - ); - - event RewardsDurationUpdated( - uint256 newRewardDuration - ); - - event OwnerProposed( - address proposedOwner - ); - - event OwnerChanged( - address newOwner - ); - - event ManagerChanged( - address newManager - ); - function initialize( address _stakeToken, address _rewardTokenA, diff --git a/contracts/SimpleFarm.sol b/contracts/SimpleFarm.sol index c0d457b..755ca11 100644 --- a/contracts/SimpleFarm.sol +++ b/contracts/SimpleFarm.sol @@ -58,16 +58,6 @@ contract SimpleFarm is TokenWrapper { _; } - event Staked( - address indexed user, - uint256 tokenAmount - ); - - event Withdrawn( - address indexed user, - uint256 tokenAmount - ); - event RewardAdded( uint256 rewardRate, uint256 tokenAmount @@ -78,27 +68,6 @@ contract SimpleFarm is TokenWrapper { uint256 tokenAmount ); - event Recovered( - IERC20 indexed token, - uint256 tokenAmount - ); - - event RewardsDurationUpdated( - uint256 newRewardDuration - ); - - event OwnerProposed( - address proposedOwner - ); - - event OwnerChanged( - address newOwner - ); - - event ManagerChanged( - address newManager - ); - function initialize( address _stakeToken, address _rewardToken, diff --git a/contracts/SimpleFarm2X.sol b/contracts/SimpleFarm2X.sol index 84bd5b2..2a10efa 100644 --- a/contracts/SimpleFarm2X.sol +++ b/contracts/SimpleFarm2X.sol @@ -87,16 +87,6 @@ contract SimpleFarm2X is TokenWrapper { _; } - event Staked( - address indexed user, - uint256 tokenAmount - ); - - event Withdrawn( - address indexed user, - uint256 tokenAmount - ); - event RewardAdded( uint256 rewardRateA, uint256 rewardRateB, @@ -110,27 +100,6 @@ contract SimpleFarm2X is TokenWrapper { uint256 tokenAmountB ); - event Recovered( - IERC20 indexed token, - uint256 tokenAmount - ); - - event RewardsDurationUpdated( - uint256 newRewardDuration - ); - - event OwnerProposed( - address proposedOwner - ); - - event OwnerChanged( - address newOwner - ); - - event ManagerChanged( - address newManager - ); - constructor( IERC20 _stakeToken, IERC20 _rewardTokenA, diff --git a/contracts/TimeLockFarm.sol b/contracts/TimeLockFarm.sol index b216c71..f0ff71c 100644 --- a/contracts/TimeLockFarm.sol +++ b/contracts/TimeLockFarm.sol @@ -63,16 +63,6 @@ contract TimeLockFarm is TokenWrapper { _; } - event Staked( - address indexed user, - uint256 tokenAmount - ); - - event Withdrawn( - address indexed user, - uint256 tokenAmount - ); - event RewardAdded( uint256 rewardRate, uint256 tokenAmount @@ -83,19 +73,6 @@ contract TimeLockFarm is TokenWrapper { uint256 tokenAmount ); - event Recovered( - IERC20 indexed token, - uint256 tokenAmount - ); - - event RewardsDurationUpdated( - uint256 newRewardDuration - ); - - event ManagerChanged( - address newManager - ); - constructor( IERC20 _stakeToken, IERC20 _rewardToken, diff --git a/contracts/TimeLockFarmV2.sol b/contracts/TimeLockFarmV2.sol index 2de826b..5988a9b 100644 --- a/contracts/TimeLockFarmV2.sol +++ b/contracts/TimeLockFarmV2.sol @@ -65,16 +65,6 @@ contract TimeLockFarmV2 is TokenWrapper { _; } - event Staked( - address indexed user, - uint256 tokenAmount - ); - - event Withdrawn( - address indexed user, - uint256 tokenAmount - ); - event RewardAdded( uint256 rewardRate, uint256 tokenAmount @@ -85,19 +75,6 @@ contract TimeLockFarmV2 is TokenWrapper { uint256 tokenAmount ); - event Recovered( - IERC20 indexed token, - uint256 tokenAmount - ); - - event RewardsDurationUpdated( - uint256 newRewardDuration - ); - - event ManagerChanged( - address newManager - ); - constructor( IERC20 _stakeToken, IERC20 _rewardToken, diff --git a/contracts/TokenWrapper.sol b/contracts/TokenWrapper.sol index e4fc281..56c760e 100644 --- a/contracts/TokenWrapper.sol +++ b/contracts/TokenWrapper.sol @@ -3,7 +3,6 @@ pragma solidity =0.8.26; import "./SafeERC20.sol"; -import "./Babylonian.sol"; contract TokenWrapper is SafeERC20 { @@ -31,6 +30,49 @@ contract TokenWrapper is SafeERC20 { uint256 value ); + event Staked( + address indexed user, + uint256 tokenAmount + ); + + event Withdrawn( + address indexed user, + uint256 tokenAmount + ); + + event RewardAdded( + address indexed rewardToken, + uint256 rewardRate, + uint256 tokenAmount + ); + + event RewardPaid( + address indexed user, + address indexed rewardToken, + uint256 tokenAmount + ); + + event Recovered( + IERC20 indexed token, + uint256 tokenAmount + ); + + event RewardsDurationUpdated( + uint256 newRewardDuration + ); + + event OwnerProposed( + address proposedOwner + ); + + event OwnerChanged( + address newOwner + ); + + event ManagerChanged( + address newManager + ); + /** * @dev Returns total amount of staked tokens */