version bump

bitcoin-portal · Sep 24, 2024 · ce1e687 · ce1e687
1 parent 5b1eb00
commit ce1e687
Show file tree

Hide file tree

Showing 36 changed files with 4,668 additions and 103 deletions.
diff --git a/contracts/Babylonian.sol b/contracts/Babylonian.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 library Babylonian {
 

diff --git a/contracts/CodeCheck.sol b/contracts/CodeCheck.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: --BCOM--
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./SimpleFarm.sol";
 

diff --git a/contracts/Counter.sol b/contracts/Counter.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- WISE --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 contract Counter {
 

diff --git a/contracts/Counter.t.sol b/contracts/Counter.t.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- WISE --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "forge-std/Test.sol";
 import "./Counter.sol";

diff --git a/contracts/DualRewardFarm.sol b/contracts/DualRewardFarm.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./TokenWrapper.sol";
 
@@ -83,7 +83,7 @@ contract DualRewardFarm is TokenWrapper {
         uint256 tokenAmount
     );
 
-    event RewardAdded(
+    event RewardsAdded(
         uint256 rewardRateA,
         uint256 rewardRateB,
         uint256 tokenAmountA,
@@ -160,16 +160,22 @@ contract DualRewardFarm is TokenWrapper {
         managerAddress = _managerAddress;
     }
 
+    /**
+     * @dev Tracks timestamp for when reward was applied last time
+     */
     function lastTimeRewardApplicable()
         public
         view
-        returns (uint256)
+        returns (uint256 res)
     {
-        return block.timestamp < periodFinished
+        res = block.timestamp < periodFinished
             ? block.timestamp
             : periodFinished;
     }
 
+    /**
+     * @dev Relative value on reward for single staked token for token A
+     */
     function rewardPerTokenA()
         public
         view
@@ -190,6 +196,9 @@ contract DualRewardFarm is TokenWrapper {
         return perTokenStoredA + extraFund;
     }
 
+    /**
+     * @dev Relative value on reward for single staked token for token B
+     */
     function rewardPerTokenB()
         public
         view
@@ -210,6 +219,9 @@ contract DualRewardFarm is TokenWrapper {
         return perTokenStoredB + extraFund;
     }
 
+    /**
+     * @dev Reports earned amount of token A by wallet address not yet collected
+     */
     function earnedA(
         address _walletAddress
     )
@@ -226,6 +238,9 @@ contract DualRewardFarm is TokenWrapper {
             + userRewardsA[_walletAddress];
     }
 
+    /**
+     * @dev Reports earned amount of token B by wallet address not yet collected
+     */
     function earnedB(
         address _walletAddress
     )
@@ -242,6 +257,9 @@ contract DualRewardFarm is TokenWrapper {
             + userRewardsB[_walletAddress];
     }
 
+    /**
+     * @dev Performs deposit of staked token into the farm
+     */
     function farmDeposit(
         uint256 _stakeAmount
     )
@@ -372,10 +390,9 @@ contract DualRewardFarm is TokenWrapper {
         external
         onlyOwner
     {
-        require(
-            _newOwner != ZERO_ADDRESS,
-            "DualRewardFarm: WRONG_ADDRESS"
-        );
+        if (_newOwner == ZERO_ADDRESS) {
+            revert("DualRewardFarm: WRONG_ADDRESS");
+        }
 
         proposedOwner = _newOwner;
 
@@ -465,7 +482,7 @@ contract DualRewardFarm is TokenWrapper {
         );
     }
 
-    function setRewardRate(
+    function setRewardRates(
         uint256 _newRewardRateA,
         uint256 _newRewardRateB
     )
@@ -479,8 +496,13 @@ contract DualRewardFarm is TokenWrapper {
         );
 
         require(
-            _newRewardRateA > 0 && _newRewardRateB > 0,
-            "DualRewardFarm: INVALID_RATE"
+            _newRewardRateA > 0,
+            "DualRewardFarm: INVALID_RATE_A"
+        );
+
+        require(
+            _newRewardRateB > 0,
+            "DualRewardFarm: INVALID_RATE_B"
         );
 
         uint256 currentPeriodFinish = periodFinished;
@@ -489,17 +511,25 @@ contract DualRewardFarm is TokenWrapper {
         periodFinished = block.timestamp + rewardDuration;
 
         if (block.timestamp < currentPeriodFinish) {
+
+            require(
+                _newRewardRateA >= rewardRateA,
+                "DualRewardFarm: RATE_A_CANT_DECREASE"
+            );
+
             require(
-                _newRewardRateA >= rewardRateA &&
                 _newRewardRateB >= rewardRateB,
-                "DualRewardFarm: RATE_CANT_DECREASE"
+                "DualRewardFarm: RATE_B_CANT_DECREASE"
             );
 
             uint256 remainingTime = currentPeriodFinish
                 - block.timestamp;
 
-            uint256 rewardRemainsA = remainingTime * rewardRateA;
-            uint256 rewardRemainsB = remainingTime * rewardRateB;
+            uint256 rewardRemainsA = remainingTime
+                * rewardRateA;
+
+            uint256 rewardRemainsB = remainingTime
+                * rewardRateB;
 
             safeTransfer(
                 rewardTokenA,
@@ -517,11 +547,31 @@ contract DualRewardFarm is TokenWrapper {
         rewardRateA = _newRewardRateA;
         rewardRateB = _newRewardRateB;
 
-        emit RewardAdded(
+        uint256 newRewardAmountA = rewardDuration
+            * _newRewardRateA;
+
+        uint256 newRewardAmountB = rewardDuration
+            * _newRewardRateB;
+
+        safeTransferFrom(
+            rewardTokenA,
+            managerAddress,
+            address(this),
+            newRewardAmountA
+        );
+
+        safeTransferFrom(
+            rewardTokenB,
+            managerAddress,
+            address(this),
+            newRewardAmountB
+        );
+
+        emit RewardsAdded(
             rewardRateA,
             rewardRateB,
-            _newRewardRateA,
-            _newRewardRateB
+            newRewardAmountA,
+            newRewardAmountB
         );
     }
 

diff --git a/contracts/DummyToken.sol b/contracts/DummyToken.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: --BCOM--
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 contract DummyToken {
 

diff --git a/contracts/FarmFactory.sol b/contracts/FarmFactory.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 interface ISimpleFarm {
 

diff --git a/contracts/IERC20.sol b/contracts/IERC20.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 interface IERC20 {
 

diff --git a/contracts/ITimeLockFarmV2Dual.sol b/contracts/ITimeLockFarmV2Dual.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 interface ITimeLockFarmV2Dual {
 

diff --git a/contracts/ManagerHelper.sol b/contracts/ManagerHelper.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 struct Allocation {
     bool unlock20Percent;

diff --git a/contracts/ManagerSetup.sol b/contracts/ManagerSetup.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./SafeERC20.sol";
 import "./ITimeLockFarmV2Dual.sol";

diff --git a/contracts/MigrationSetup.sol b/contracts/MigrationSetup.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./SafeERC20.sol";
 import "./ManagerHelper.sol";

diff --git a/contracts/MigrationSetup.t.sol b/contracts/MigrationSetup.t.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "forge-std/Test.sol";
 

diff --git a/contracts/MigrationSetupLive.t.sol b/contracts/MigrationSetupLive.t.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "forge-std/Test.sol";
 

diff --git a/contracts/PrivateFarm2X.sol b/contracts/PrivateFarm2X.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./TokenWrapperSQRT.sol";
 import "./Babylonian.sol";

diff --git a/contracts/PrivateFarm2X.t.sol b/contracts/PrivateFarm2X.t.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- WISE --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "forge-std/Test.sol";
 import "./PrivateFarm2X.sol";

diff --git a/contracts/RescueSetup.sol b/contracts/RescueSetup.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./SafeERC20.sol";
 import "./ManagerSetup.sol";

diff --git a/contracts/SafeERC20.sol b/contracts/SafeERC20.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./IERC20.sol";
 

diff --git a/contracts/Scripts/Deployer.s.sol b/contracts/Scripts/Deployer.s.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "forge-std/Script.sol";
 
@@ -10,7 +10,6 @@ import { FarmFactory } from "../FarmFactory.sol";
 import "../RescueSetup.sol";
 import "../MigrationSetup.sol";
 import "../TimeLockFarmV2Dual.sol";
-
 contract DeployTimeLockFarmV2Dual is Script {
 
     function setUp() public {}
@@ -162,7 +161,7 @@ contract DeployFarmFactory is Script {
         );
 
         address implementation = address (
-            0x545465f965c3Fdfb97Af0328E458ed66514bE286
+            0x3087Fc9cA1DbE935D5E09Aa94Df813239368Aee9
         );
 
         FarmFactory factory = new FarmFactory(

diff --git a/contracts/SimpleFarm.sol b/contracts/SimpleFarm.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./TokenWrapper.sol";
 

diff --git a/contracts/SimpleFarm2X.sol b/contracts/SimpleFarm2X.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./TokenWrapper.sol";
 

diff --git a/contracts/SimpleManager.sol b/contracts/SimpleManager.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 interface ISimpleFarm {
 

diff --git a/contracts/TestToken.sol b/contracts/TestToken.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: --BCOM--
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 contract TestToken {
 

diff --git a/contracts/TimeLockFarm.sol b/contracts/TimeLockFarm.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./TokenWrapper.sol";
 

diff --git a/contracts/TimeLockFarmV2.sol b/contracts/TimeLockFarmV2.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: -- BCOM --
 
-pragma solidity =0.8.25;
+pragma solidity =0.8.26;
 
 import "./TokenWrapper.sol";