minor fixes and efficiency improvements

Author: devinaconley

.env.template

@@ -3,6 +3,9 @@
 // infura ethereum API key
 INFURA_KEY=
 
+// etherscan api key
+ETHERSCAN_KEY=
+
 // ledger derivation path account index
 DEPLOYER_INDEX=
 

contracts/ERC20BaseRewardModule.sol

@@ -114,7 +114,7 @@ abstract contract ERC20BaseRewardModule is IRewardModule {
     }
 
     /**
-     * @notice fund Geyser by locking up reward tokens for future distribution
+     * @notice fund pool by locking up reward tokens for future distribution
      * @param token contract address of reward token
      * @param amount number of reward tokens to lock up as funding
      * @param duration period (seconds) over which funding will be unlocked

contracts/ERC20CompetitiveRewardModule.sol

@@ -162,14 +162,16 @@ contract ERC20CompetitiveRewardModule is ERC20BaseRewardModule {
     /**
      * @inheritdoc IRewardModule
      */
-    function update(address) external override onlyOwner {
+    function update(address) external override {
+        requireOwner();
         _update();
     }
 
     /**
      * @inheritdoc IRewardModule
      */
-    function clean() external override onlyOwner {
+    function clean() external override {
+        requireOwner();
         _update();
         _clean(address(_token));
     }

contracts/ERC20FriendlyRewardModule.sol

@@ -295,8 +295,8 @@ contract ERC20FriendlyRewardModule is ERC20BaseRewardModule {
         bytes calldata data
     ) external override onlyOwner returns (uint256 spent, uint256 vested) {
         _update();
-        _unstake(account, user, shares);
-        (spent, vested) = _stake(account, user, shares, data);
+        (, vested) = _unstake(account, user, shares);
+        (spent, ) = _stake(account, user, shares, data);
     }
 
     /**
@@ -312,9 +312,8 @@ contract ERC20FriendlyRewardModule is ERC20BaseRewardModule {
         uint256 rewardTally
     ) internal view returns (uint256) {
         return
-            ((rewardsPerStakedShare - rewardTally) * shares * bonus) /
-            10**DECIMALS / // counteract bonus coefficient
-            10**DECIMALS; // counteract rewardsPerStakedShare coefficient
+            ((((rewardsPerStakedShare - rewardTally) * shares) / 10**DECIMALS) * // counteract rewardsPerStakedShare coefficient
+                bonus) / 10**DECIMALS; // counteract bonus coefficient
     }
 
     /**
@@ -339,15 +338,17 @@ contract ERC20FriendlyRewardModule is ERC20BaseRewardModule {
     /**
      * @inheritdoc IRewardModule
      */
-    function update(address) external override onlyOwner {
+    function update(address) external override {
+        requireOwner();
         _update();
     }
 
     /**
      * @notice method called ad hoc to clean up and perform additional accounting
      * @dev will only be called manually, and should not contain any essential logic
      */
-    function clean() external override onlyOwner {
+    function clean() external override {
+        requireOwner();
         _update();
         _clean(address(_token));
     }

contracts/ERC20StakingModule.sol

@@ -77,7 +77,12 @@ contract ERC20StakingModule is IStakingModule {
     /**
      * @inheritdoc IStakingModule
      */
-    function totals() public view override returns (uint256[] memory totals_) {
+    function totals()
+        external
+        view
+        override
+        returns (uint256[] memory totals_)
+    {
         totals_ = new uint256[](1);
         totals_[0] = _token.balanceOf(address(this));
     }
@@ -155,12 +160,12 @@ contract ERC20StakingModule is IStakingModule {
     /**
      * @inheritdoc IStakingModule
      */
-    function update(address) external override onlyOwner {}
+    function update(address) external override {}
 
     /**
      * @inheritdoc IStakingModule
      */
-    function clean() external override onlyOwner {}
+    function clean() external override {}
 
     /**
      * @dev internal helper to get user balance

contracts/OwnerController.sol

@@ -62,15 +62,15 @@ contract OwnerController {
      * @dev Modifier that throws if called by any account other than the owner.
      */
     modifier onlyOwner() {
-        requireOwner();
+        require(_owner == msg.sender, "oc1");
         _;
     }
 
     /**
      * @dev Modifier that throws if called by any account other than the controller.
      */
     modifier onlyController() {
-        requireController();
+        require(_controller == msg.sender, "oc2");
         _;
     }
 

package-lock.json

@@ -21,6 +21,7 @@
     "react": "^16.13.1",
     "truffle": "^5.1.39",
     "truffle-contract-size": "^2.0.0",
+    "truffle-plugin-verify": "^0.5.8",
     "web3": "^1.2.11",
     "web3-utils": "^1.3.4"
   },