Update deploy script (#158)

* implemented trading rewards inflation diversion

* make visibility explicit

* 🔨 Update Deploy Script

* Use Owned instead of Ownable (rest of project uses Owned)

* ✅ Update tests

* Update Deploy Script & Remove Unused Code

* 🗑 Remove Libraries

Co-authored-by: JChiaramonte7 <[email protected]>

Author: JaredBorders

.solhint.json

@@ -4,6 +4,7 @@
         "not-rely-on-time": "off",
         "reason-string": "off",
         "max-states-count": "off",
+        "contract-name-camelcase": "off",
         "compiler-version": [
             "error",
             "^0.8.0"

README.md

@@ -48,10 +48,6 @@ Any escrowed Kwenta can also be staked back into StakingRewards, boosting potent
 
 Another new feature introduced here is a linearly decaying vesting fee that allows beneficiaries to vest early – at a cost. Immediate vesting is subject to a fee that is 80% of the escrowed amount. It falls to 0% as the reward reaches the end of the escrow duration. The fee is burned. 
 
-### ExchangerProxy.sol
-
-A simple contract that forwards trades to the Synthetix Exchanger, but updates each person’s trader score (currently measured as fees paid), and subsequently `rewardScore` in StakingRewards.
-
 ## Testing
 
 ```

contracts/ControlL2MerkleDistributor.sol

@@ -12,10 +12,10 @@ contract ControlL2MerkleDistributor is IControlL2MerkleDistributor {
     /// @notice communication between L1 and L2 is enabled by two special
     /// smart contracts called the "messengers"
     /// and below is the address for the messenger on L1
-    address immutable crossDomainMessengerAddr;
+    address internal immutable crossDomainMessengerAddr;
 
     /// @notice MerkleDistributor deployed on L2
-    address immutable merkleDistributorL2Address;
+    address internal immutable merkleDistributorL2Address;
 
     /// @notice set addresses for deployed MerkleDistributor on L2 and
     /// OE cross domain messenger address on L1

contracts/MultipleMerkleDistributor.sol

@@ -18,7 +18,7 @@ contract MultipleMerkleDistributor is IMultipleMerkleDistributor, Owned {
     address public immutable override token;
 
     /// @notice an index that is incremented for each new merkle root
-    uint256 distributionEpoch;
+    uint256 public distributionEpoch;
 
     /// @notice an epoch to merkle root mapping
     /// of a merkle tree containing account balances available to claim

contracts/StakingRewards.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import "@openzeppelin/contracts/security/Pausable.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
+import "./utils/Owned.sol";
 import "./interfaces/IStakingRewards.sol";
 import "./interfaces/ISupplySchedule.sol";
 import "./interfaces/IRewardEscrow.sol";
@@ -13,7 +13,7 @@ import "./interfaces/IRewardEscrow.sol";
 /// @author SYNTHETIX, JaredBorders ([email protected]), JChiaramonte7 ([email protected])
 /// @notice Updated version of Synthetix's StakingRewards with new features specific
 /// to Kwenta
-contract StakingRewards is IStakingRewards, Ownable, ReentrancyGuard, Pausable {
+contract StakingRewards is IStakingRewards, Owned, ReentrancyGuard, Pausable {
     using SafeERC20 for IERC20;
 
     /*///////////////////////////////////////////////////////////////
@@ -143,7 +143,7 @@ contract StakingRewards is IStakingRewards, Ownable, ReentrancyGuard, Pausable {
         address _token,
         address _rewardEscrow,
         address _supplySchedule
-    ) {
+    ) Owned(msg.sender) {
         // define reward/staking token
         token = IERC20(_token);
 
@@ -464,7 +464,7 @@ contract StakingRewards is IStakingRewards, Ownable, ReentrancyGuard, Pausable {
             tokenAddress != address(token),
             "StakingRewards: Cannot unstake the staking token"
         );
-        IERC20(tokenAddress).safeTransfer(owner(), tokenAmount);
+        IERC20(tokenAddress).safeTransfer(owner, tokenAmount);
         emit Recovered(tokenAddress, tokenAmount);
     }
 }