Fix operator contract upgrader logic

Make sure each service contract has its own operator contract upgrader.

Author: ngrinkevich

contracts/solidity/contracts/KeepRandomBeaconServiceImplV1.sol

@@ -95,10 +95,10 @@ contract KeepRandomBeaconServiceImplV1 is DelayedWithdrawal, ReentrancyGuard {
     hex"15c30f4b6cf6dbbcbdcc10fe22f54c8170aea44e198139b776d512d8f027319a1b9e8bfaf1383978231ce98e42bafc8129f473fc993cf60ce327f7d223460663";
 
     /**
-     * @dev Throws if called by any account other than the operator contract upgrader.
+     * @dev Throws if called by any account other than the operator contract upgrader authorized for this service contract.
      */
     modifier onlyOperatorContractUpgrader() {
-        address operatorContractUpgrader = Registry(_registry).operatorContractUpgrader();
+        address operatorContractUpgrader = Registry(_registry).operatorContractUpgraderFor(address(this));
         require(operatorContractUpgrader == msg.sender, "Caller is not operator contract upgrader");
         _;
     }

contracts/solidity/contracts/Registry.sol

@@ -18,9 +18,11 @@ contract Registry {
     // that have been previously approved by the Registry Keeper.
     address internal panicButton;
 
-    // Operator Contract Upgrader can add approved operator contracts to
-    // the service contract and deprecate old ones.
-    address public operatorContractUpgrader;
+    // Each service contract has a Operator Contract Upgrader whose purpose
+    // is to manage operator contracts for that specific service contract.
+    // The Operator Contract Upgrader can add new operator contracts to the
+    // service contract’s operator contract list, and deprecate old ones.
+    mapping(address => address) public operatorContractUpgraders;
 
     // The registry of operator contracts
     // 0 - NULL (default), 1 - APPROVED, 2 - DISABLED
@@ -45,7 +47,6 @@ contract Registry {
         governance = msg.sender;
         registryKeeper = msg.sender;
         panicButton = msg.sender;
-        operatorContractUpgrader = msg.sender;
     }
 
     function setGovernance(address _governance) public onlyGovernance {
@@ -60,8 +61,8 @@ contract Registry {
         panicButton = _panicButton;
     }
 
-    function setOperatorContractUpgrader(address _operatorContractUpgrader) public onlyGovernance {
-        operatorContractUpgrader = _operatorContractUpgrader;
+    function setOperatorContractUpgrader(address _serviceContract, address _operatorContractUpgrader) public onlyGovernance {
+        operatorContractUpgraders[_serviceContract] = _operatorContractUpgrader;
     }
 
     function approveOperatorContract(address operatorContract) public onlyRegistryKeeper {
@@ -75,4 +76,8 @@ contract Registry {
     function isApprovedOperatorContract(address operatorContract) public view returns (bool) {
         return operatorContracts[operatorContract] == 1;
     }
+
+    function operatorContractUpgraderFor(address _serviceContract) public view returns (address) {
+        return operatorContractUpgraders[_serviceContract];
+    }
 }

contracts/solidity/migrations/3_initialize.js

@@ -28,7 +28,12 @@ module.exports = async function(deployer, network) {
 
     await keepRandomBeaconOperator.setPriceFeedEstimate(priceFeedEstimate);
     await registry.approveOperatorContract(keepRandomBeaconOperator.address);
+
+    // Set service contract owner as operator contract upgrader by default
+    const operatorContractUpgrader = await keepRandomBeaconService.owner();
+    await registry.setOperatorContractUpgrader(keepRandomBeaconService.address, operatorContractUpgrader);
     keepRandomBeaconService.addOperatorContract(
-        keepRandomBeaconOperator.address
+        keepRandomBeaconOperator.address,
+        {from: operatorContractUpgrader}
     );
 };

contracts/solidity/test/TestKeepContractsAuthorization.js

@@ -31,7 +31,7 @@ contract('Registry', function(accounts) {
 
     await registry.setRegistryKeeper(registryKeeper)
     await registry.setPanicButton(panicButton)
-    await registry.setOperatorContractUpgrader(operatorContractUpgrader)
+    await registry.setOperatorContractUpgrader(serviceContract.address, operatorContractUpgrader)
   })
 
   beforeEach(async () => {

contracts/solidity/test/helpers/initContracts.js

@@ -48,6 +48,11 @@ async function initContracts(KeepToken, TokenStaking, KeepRandomBeaconService,
 
   await registry.approveOperatorContract(operatorContract.address);
   await serviceContract.initialize(priceFeedEstimate, fluctuationMargin, dkgContributionMargin, withdrawalDelay, registry.address);
+
+  // Set service contract owner as operator contract upgrader by default
+  const operatorContractUpgrader = await serviceContract.owner()
+  await registry.setOperatorContractUpgrader(serviceContract.address, operatorContractUpgrader);
+
   await serviceContract.addOperatorContract(operatorContract.address);
 
   let dkgGasEstimate = await operatorContract.dkgGasEstimate();