Merge pull request #315 from maticnetwork/mat-1927

overriden owner in upgradable proxy (mat-1980)

Author: jdkanani

contracts/common/misc/UpgradableProxy.sol

@@ -4,13 +4,13 @@ import {DelegateProxy} from "./DelegateProxy.sol";
 
 contract UpgradableProxy is DelegateProxy {
     event ProxyUpdated(address indexed _new, address indexed _old);
-    event OwnerUpdate(address _new, address _old);
+    event ProxyOwnerUpdate(address _new, address _old);
 
     bytes32 constant IMPLEMENTATION_SLOT = keccak256("matic.network.proxy.implementation");
     bytes32 constant OWNER_SLOT = keccak256("matic.network.proxy.owner");
 
     constructor(address _proxyTo) public {
-        setOwner(msg.sender);
+        setProxyOwner(msg.sender);
         setImplementation(_proxyTo);
     }
 
@@ -21,15 +21,15 @@ contract UpgradableProxy is DelegateProxy {
     }
 
     modifier onlyProxyOwner() {
-        require(loadOwner() == msg.sender, "NOT_OWNER");
+        require(loadProxyOwner() == msg.sender, "NOT_OWNER");
         _;
     }
 
-    function owner() external view returns(address) {
-        return loadOwner();
+    function proxyOwner() external view returns(address) {
+        return loadProxyOwner();
     }
 
-    function loadOwner() internal view returns(address) {
+    function loadProxyOwner() internal view returns(address) {
         address _owner;
         bytes32 position = OWNER_SLOT;
         assembly {
@@ -51,13 +51,13 @@ contract UpgradableProxy is DelegateProxy {
         return _impl;
     }
 
-    function transferOwnership(address newOwner) public onlyProxyOwner {
+    function transferProxyOwnership(address newOwner) public onlyProxyOwner {
         require(newOwner != address(0), "ZERO_ADDRESS");
-        emit OwnerUpdate(newOwner, loadOwner());
-        setOwner(newOwner);
+        emit ProxyOwnerUpdate(newOwner, loadProxyOwner());
+        setProxyOwner(newOwner);
     }
 
-    function setOwner(address newOwner) private {
+    function setProxyOwner(address newOwner) private {
         bytes32 position = OWNER_SLOT;
         assembly {
             sstore(position, newOwner)

contracts/staking/validatorShare/ValidatorShareFactory.sol

@@ -10,7 +10,7 @@ contract ValidatorShareFactory {
     function create(uint256 validatorId, address loggerAddress, address registry) public returns (address) {
         ValidatorShareProxy proxy = new ValidatorShareProxy(registry);
 
-        proxy.transferOwnership(msg.sender);
+        proxy.transferProxyOwnership(msg.sender);
 
         address proxyAddr = address(proxy);
         (bool success, bytes memory data) = proxyAddr.call.gas(gasleft())(

test/units/UpgradableProxy.test.js

@@ -64,25 +64,25 @@ contract('UpgradableProxy', function() {
     })
   })
 
-  describe('transferOwnership', function() {
+  describe('transferProxyOwnership', function() {
     before(doDeploy)
     before(async function() {
       this.newOwner = wallets[1].getChecksumAddressString()
     })
 
     describe('when from is not owner', function() {
       it('reverts', async function() {
-        await expectRevert(this.proxy.transferOwnership(this.newOwner, { from: this.newOwner }), 'NOT_OWNER')
+        await expectRevert(this.proxy.transferProxyOwnership(this.newOwner, { from: this.newOwner }), 'NOT_OWNER')
       })
     })
 
     describe('when from is owner', function() {
       it('must update owner', async function() {
-        await this.proxy.transferOwnership(this.newOwner)
+        await this.proxy.transferProxyOwnership(this.newOwner)
       })
 
       it('must have correct owner', async function() {
-        const owner = await this.proxy.owner()
+        const owner = await this.proxy.proxyOwner()
         owner.should.be.equal(this.newOwner)
       })
     })