Test/demeter balancer

.gitignore

@@ -141,4 +141,6 @@ artifacts/
 
 # Foundry
 out/
-forge-cache/
+forge-cache/
+tests/
+coverage/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std

contracts/BaseFarm.sol

@@ -212,6 +212,7 @@ abstract contract BaseFarm is Ownable, ReentrancyGuard, Initializable {
         external
         onlyOwner
     {
+        //@audit-info: Check CooldownPeriod before ClosedFarm
         _farmNotClosed();
         uint256 oldCooldownPeriod = cooldownPeriod;
         if (oldCooldownPeriod == 0) {

contracts/e20-farms/BaseE20Farm.sol

@@ -51,6 +51,9 @@ contract BaseE20Farm is BaseFarm {
         address _farmToken,
         RewardTokenData[] memory _rwdTokenData
     ) external initializer {
+        // Initialize farm global params
+        tokenNum = 0;
+
         // initialize farmToken related data
         farmToken = _farmToken;
         _setupFarm(_farmStartTime, _cooldownPeriod, _rwdTokenData);
@@ -60,11 +63,13 @@ contract BaseE20Farm is BaseFarm {
     /// @param _amount Amount of farmToken to be deposited
     /// @param _lockup The lockup flag (bool).
     function deposit(uint256 _amount, bool _lockup) external nonReentrant {
+        address account = msg.sender;
+        uint256 tokenId = ++tokenNum;
         // Execute common deposit logic.
-        _deposit(msg.sender, _lockup, ++tokenNum, _amount);
+        _deposit(account, _lockup, tokenId, _amount);
 
         // Transfer the lp tokens to the farm
-        IERC20(farmToken).safeTransferFrom(msg.sender, address(this), _amount);
+        IERC20(farmToken).safeTransferFrom(account, address(this), _amount);
     }
 
     /// @notice Allow user to increase liquidity for a deposit
@@ -75,6 +80,7 @@ contract BaseE20Farm is BaseFarm {
         external
         nonReentrant
     {
+        address account = msg.sender;
         // Validations
         _farmNotClosed();
         _isValidDeposit(msg.sender, _depositId);
@@ -87,14 +93,14 @@ contract BaseE20Farm is BaseFarm {
         }
 
         // claim the pending rewards for the deposit
-        _claimRewards(msg.sender, _depositId);
+        _claimRewards(account, _depositId);
 
         // Update deposit Information
         _updateSubscriptionForIncrease(userDeposit.tokenId, _amount);
-        deposits[msg.sender][_depositId].liquidity += _amount;
+        deposits[account][_depositId].liquidity += _amount;
 
         // Transfer the lp tokens to the farm
-        IERC20(farmToken).safeTransferFrom(msg.sender, address(this), _amount);
+        IERC20(farmToken).safeTransferFrom(account, address(this), _amount);
     }
 
     /// @notice Withdraw liquidity partially from an existing deposit.
@@ -105,6 +111,7 @@ contract BaseE20Farm is BaseFarm {
         external
         nonReentrant
     {
+        address account = msg.sender;
         //Validations
         _farmNotClosed();
         _isValidDeposit(msg.sender, _depositId);
@@ -119,14 +126,14 @@ contract BaseE20Farm is BaseFarm {
         }
 
         // claim the pending rewards for the deposit
-        _claimRewards(msg.sender, _depositId);
+        _claimRewards(account, _depositId);
 
         // Update deposit info
         _updateSubscriptionForDecrease(userDeposit.tokenId, _amount);
-        userDeposit.liquidity -= _amount;
+        deposits[account][_depositId].liquidity -= _amount;
 
         // Transfer the lp tokens to the user
-        IERC20(farmToken).safeTransfer(msg.sender, _amount);
+        IERC20(farmToken).safeTransfer(account, _amount);
     }
 
     /// @notice Function to lock a staked deposit
@@ -139,13 +146,14 @@ contract BaseE20Farm is BaseFarm {
     /// @notice Function to withdraw a deposit from the farm.
     /// @param _depositId The id of the deposit to be withdrawn
     function withdraw(uint256 _depositId) external nonReentrant {
-        _isValidDeposit(msg.sender, _depositId);
-        Deposit memory userDeposit = deposits[msg.sender][_depositId];
+        address account = msg.sender;
+        _isValidDeposit(account, _depositId);
+        Deposit memory userDeposit = deposits[account][_depositId];
 
-        _withdraw(msg.sender, _depositId, userDeposit);
+        _withdraw(account, _depositId, userDeposit);
 
         // Transfer the farmTokens to the user.
-        IERC20(farmToken).safeTransfer(msg.sender, userDeposit.liquidity);
+        IERC20(farmToken).safeTransfer(account, userDeposit.liquidity);
     }
 
     // --------------------- Admin  Functions ---------------------
@@ -180,20 +188,20 @@ contract BaseE20Farm is BaseFarm {
     function _updateSubscriptionForIncrease(uint256 _tokenId, uint256 _amount)
         private
     {
+        Subscription[] storage depositSubs = subscriptions[_tokenId];
         uint256 numRewards = rewardTokens.length;
-        uint256 numSubs = subscriptions[_tokenId].length;
-        for (uint256 iSub; iSub < numSubs; ) {
-            uint256[] storage _rewardDebt = subscriptions[_tokenId][iSub]
-                .rewardDebt;
-            uint8 _fundId = subscriptions[_tokenId][iSub].fundId;
-            for (uint8 iRwd; iRwd < numRewards; ) {
-                _rewardDebt[iRwd] += ((_amount *
-                    rewardFunds[_fundId].accRewardPerShare[iRwd]) / PREC);
+        uint256 numSubs = depositSubs.length;
+        for (uint256 iSub = 0; iSub < numSubs; ) {
+            for (uint8 iRwd = 0; iRwd < numRewards; ) {
+                depositSubs[iSub].rewardDebt[iRwd] += ((_amount *
+                    rewardFunds[depositSubs[iSub].fundId].accRewardPerShare[
+                        iRwd
+                    ]) / PREC);
                 unchecked {
                     ++iRwd;
                 }
             }
-            rewardFunds[_fundId].totalLiquidity += _amount;
+            rewardFunds[depositSubs[iSub].fundId].totalLiquidity += _amount;
             unchecked {
                 ++iSub;
             }
@@ -206,20 +214,20 @@ contract BaseE20Farm is BaseFarm {
     function _updateSubscriptionForDecrease(uint256 _tokenId, uint256 _amount)
         private
     {
+        Subscription[] storage depositSubs = subscriptions[_tokenId];
         uint256 numRewards = rewardTokens.length;
-        uint256 numSubs = subscriptions[_tokenId].length;
-        for (uint256 iSub; iSub < numSubs; ) {
-            uint256[] storage _rewardDebt = subscriptions[_tokenId][iSub]
-                .rewardDebt;
-            uint8 _fundId = subscriptions[_tokenId][iSub].fundId;
-            for (uint8 iRwd; iRwd < numRewards; ) {
-                _rewardDebt[iRwd] -= ((_amount *
-                    rewardFunds[_fundId].accRewardPerShare[iRwd]) / PREC);
+        uint256 numSubs = depositSubs.length;
+        for (uint256 iSub = 0; iSub < numSubs; ) {
+            for (uint8 iRwd = 0; iRwd < numRewards; ) {
+                depositSubs[iSub].rewardDebt[iRwd] -= ((_amount *
+                    rewardFunds[depositSubs[iSub].fundId].accRewardPerShare[
+                        iRwd
+                    ]) / PREC);
                 unchecked {
                     ++iRwd;
                 }
             }
-            rewardFunds[_fundId].totalLiquidity -= _amount;
+            rewardFunds[depositSubs[iSub].fundId].totalLiquidity -= _amount;
             unchecked {
                 ++iSub;
             }

foundry.toml

@@ -5,4 +5,5 @@ libs = ["node_modules", "lib"]
 test = "test"
 cache_path = "forge-cache"
 
+
 # See more config options https://github.com/foundry-rs/foundry/blob/master/crates/config/README.md#all-options