chore(protocol-contracts): make OperatorStaking and Rewarder owned by ProtocolStaking owner

Author: melanciani

protocol-contracts/staking/contracts/OperatorRewarder.sol

@@ -53,7 +53,7 @@ contract OperatorRewarder is Ownable {
         _;
     }
 
-    constructor(address owner, ProtocolStaking protocolStaking_, OperatorStaking operatorStaking_) Ownable(owner) {
+    constructor(ProtocolStaking protocolStaking_, OperatorStaking operatorStaking_) Ownable(protocolStaking_.owner()) {
         _token = IERC20(protocolStaking_.stakingToken());
         _protocolStaking = protocolStaking_;
         _operatorStaking = operatorStaking_;

protocol-contracts/staking/contracts/OperatorStaking.sol

@@ -68,20 +68,18 @@ contract OperatorStaking is ERC20, Ownable, ReentrancyGuardTransient {
      * @param name The name of the ERC20 token.
      * @param symbol The symbol of the ERC20 token.
      * @param protocolStaking_ The ProtocolStaking contract address.
-     * @param owner The owner address.
      */
     constructor(
         string memory name,
         string memory symbol,
-        ProtocolStaking protocolStaking_,
-        address owner
-    ) ERC20(name, symbol) Ownable(owner) {
+        ProtocolStaking protocolStaking_
+    ) ERC20(name, symbol) Ownable(protocolStaking_.owner()) {
         _asset = IERC20(protocolStaking_.stakingToken());
         _protocolStaking = protocolStaking_;
 
         IERC20(asset()).approve(address(protocolStaking_), type(uint256).max);
 
-        address rewarder_ = address(new OperatorRewarder(owner, protocolStaking_, this));
+        address rewarder_ = address(new OperatorRewarder(protocolStaking_, this));
         protocolStaking_.setRewardsRecipient(rewarder_);
         _rewarder = rewarder_;
 

protocol-contracts/staking/test/OperatorRewarder.test.ts

@@ -25,12 +25,7 @@ describe('OperatorRewarder', function () {
         ethers.parseEther('0.5'), // reward rate
       ]),
     );
-    const operatorStaking = await ethers.deployContract('$OperatorStaking', [
-      'OPStake',
-      'OP',
-      protocolStaking,
-      admin.address,
-    ]);
+    const operatorStaking = await ethers.deployContract('$OperatorStaking', ['OPStake', 'OP', protocolStaking]);
     const mock = await ethers.getContractAt('OperatorRewarder', await operatorStaking.rewarder());
     await expect(mock.token()).to.eventually.eq(token.target);
 
@@ -321,11 +316,7 @@ describe('OperatorRewarder', function () {
       await this.operatorStaking.connect(this.staker1).deposit(ethers.parseEther('1'), this.staker1);
       await timeIncreaseNoMine(9);
 
-      const newRewarder = await ethers.deployContract('OperatorRewarder', [
-        this.admin,
-        this.protocolStaking,
-        this.operatorStaking,
-      ]);
+      const newRewarder = await ethers.deployContract('OperatorRewarder', [this.protocolStaking, this.operatorStaking]);
 
       this.tx = this.operatorStaking.connect(this.admin).setRewarder(newRewarder);
     });

protocol-contracts/staking/test/OperatorStaking.test.ts

@@ -24,7 +24,7 @@ describe('OperatorStaking', function () {
         0n, // reward rate
       ]),
     );
-    const mock = await ethers.deployContract('$OperatorStaking', ['OPStake', 'OP', protocolStaking, admin.address]);
+    const mock = await ethers.deployContract('$OperatorStaking', ['OPStake', 'OP', protocolStaking]);
 
     await Promise.all(
       [staker1, staker2].flatMap(account => [
@@ -379,11 +379,7 @@ describe('OperatorStaking', function () {
 
     describe('with new rewarder', async function () {
       beforeEach(async function () {
-        const newRewarder = await ethers.deployContract('OperatorRewarder', [
-          this.admin,
-          this.protocolStaking,
-          this.mock,
-        ]);
+        const newRewarder = await ethers.deployContract('OperatorRewarder', [this.protocolStaking, this.mock]);
         const oldRewarder = await ethers.getContractAt('OperatorRewarder', await this.mock.rewarder());
 
         await this.protocolStaking.connect(this.admin).addEligibleAccount(this.mock);