Merge pull request #21 from ionicprotocol/fix/gauge-factory-access

gauge factory access fix

contracts/VoteEscrow.sol

@@ -5,7 +5,7 @@ import { IERC721Receiver } from "@openzeppelin/contracts/token/ERC721/IERC721Rec
 import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 import { IVotesUpgradeable } from "@openzeppelin/contracts-upgradeable/governance/utils/IVotesUpgradeable.sol";
 
-import { IERC20 } from "./interfaces/IERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { IVoteEscrow } from "./interfaces/IVoteEscrow.sol";
 import { XERC721Upgradeable } from "./XERC721Upgradeable.sol";
 

contracts/Voter.sol

@@ -3,7 +3,6 @@ pragma solidity 0.8.19;
 
 import "./interfaces/IGauge.sol";
 import "./interfaces/IGaugeFactory.sol";
-import "./interfaces/IERC20.sol";
 import "./interfaces/IMinter.sol";
 import "./interfaces/IMarket.sol";
 import "./interfaces/IVoter.sol";

contracts/VoterRolesAuthority.sol

@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.19;
 
+import "./factories/GaugeFactory.sol";
+
 import { RolesAuthority, Authority } from "solmate/auth/authorities/RolesAuthority.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
@@ -9,8 +11,25 @@ contract VoterRolesAuthority is RolesAuthority, Initializable {
     _disableInitializers();
   }
 
+  uint8 public VOTER_ROLE = 1;
+
+  modifier onlyOwner() virtual {
+    require(msg.sender == owner, "UNAUTHORIZED");
+
+    _;
+  }
+
   function initialize(address _owner) public initializer {
     owner = _owner;
     authority = this;
   }
+
+  function configureRoles(address _gaugesFactory) external onlyOwner {
+    setRoleCapability(VOTER_ROLE, _gaugesFactory, GaugeFactory.createMarketGauge.selector, true);
+    setRoleCapability(VOTER_ROLE, _gaugesFactory, GaugeFactory.createPairGauge.selector, true);
+  }
+
+  function configureVoterPermissions(address _voter) external onlyOwner {
+    setUserRole(_voter, VOTER_ROLE, true);
+  }
 }

contracts/factories/GaugeFactory.sol

@@ -62,7 +62,7 @@ contract GaugeFactory is IGaugeFactory, OwnableUpgradeable {
     address _ve,
     address _token,
     address _distribution
-  ) external returns (address) {
+  ) external onlyAllowed returns (address) {
     TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(gaugeLogic), _getProxyAdmin(), "");
     PairGauge(address(proxy)).initialize(_rewardToken, _ve, _token, _distribution);
     last_gauge = address(proxy);
@@ -76,7 +76,7 @@ contract GaugeFactory is IGaugeFactory, OwnableUpgradeable {
     address _ve,
     address _token,
     address _distribution
-  ) external returns (address) {
+  ) external onlyAllowed returns (address) {
     TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(gaugeLogic), _getProxyAdmin(), "");
     MarketGauge(address(proxy)).initialize(_flywheel, _rewardToken, _ve, _token, _distribution);
     last_gauge = address(proxy);

contracts/test/BaseTest.sol

@@ -56,6 +56,8 @@ contract BaseTest is Test {
       TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), proxyAdmin, "");
       gaugeFactory = GaugeFactory(address(proxy));
       gaugeFactory.initialize(voterRolesAuth);
+
+      voterRolesAuth.configureRoles(address(gaugeFactory));
     }
 
     {
@@ -86,6 +88,7 @@ contract BaseTest is Test {
     voter.initialize(address(ve), address(gaugeFactory), address(timer), voterRolesAuth);
 
     ve.setVoter(address(voter));
+    voterRolesAuth.configureVoterPermissions(address(voter));
 
     vm.prank(ve.owner());
     ve.addBridge(bridge1);

deploy/deploy.ts

@@ -2,6 +2,7 @@ import { DeployFunction } from "hardhat-deploy/types";
 
 import { IonicToken } from "../typechain/IonicToken";
 import { VoteEscrow } from "../typechain/VoteEscrow";
+import { VoterRolesAuthority } from "../typechain/VoterRolesAuthority";
 
 const func: DeployFunction = async ({ ethers, getNamedAccounts, deployments, getChainId }): Promise<void> => {
   console.log("RPC URL: ", ethers.provider.connection.url);
@@ -78,6 +79,11 @@ const func: DeployFunction = async ({ ethers, getNamedAccounts, deployments, get
     }
   });
   console.log(`GaugeFactory deployed at ${gaugeFactory.address}`);
+  const voterRolesAuthority = (await ethers.getContract("VoterRolesAuthority")) as VoterRolesAuthority;
+  let tx = await voterRolesAuthority.configureRoles(gaugeFactory.address);
+  console.log(`setting the gauge factory in the voter roles auth`, tx.hash);
+  await tx.wait();
+  console.log(`tx mined`);
 
   const voteEscrow = await deployments.deploy("VoteEscrow", {
     contract: "VoteEscrow",
@@ -141,9 +147,12 @@ const func: DeployFunction = async ({ ethers, getNamedAccounts, deployments, get
     }
   });
   console.log(`Voter deployed at ${voter.address}`);
+  tx = await voterRolesAuthority.configureVoterPermissions(voter.address);
+  console.log(`configuring the voter permissions`, tx.hash);
+  await tx.wait();
+  console.log(`tx mined`);
 
   const voteEscrowContract = (await ethers.getContractOrNull("VoteEscrow")) as VoteEscrow;
-
   const currentVoter = await voteEscrowContract.callStatic.voter();
   if (currentVoter != voter.address) {
     const tx = await voteEscrowContract.setVoter(voter.address);