Add a proxy admin contract

0xPolygon · Sep 1, 2023 · b759292 · b759292
1 parent 4e8eb8a
commit b759292
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.21;
 
 import {Script} from "forge-std/Script.sol";
 
-import {TransparentUpgradeableProxy} from "openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import {ProxyAdmin, TransparentUpgradeableProxy} from "openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol";
 import {Polygon} from "../src/Polygon.sol";
 import {DefaultInflationManager} from "../src/DefaultInflationManager.sol";
 import {PolygonMigration} from "../src/PolygonMigration.sol";
@@ -18,19 +18,22 @@ contract Deploy is Script {
     function run(address matic, address governance, address treasury, address stakeManager) public {
         vm.startBroadcast(deployerPrivateKey);
 
+        ProxyAdmin admin = new ProxyAdmin();
+        admin.transferOwnership(governance);
+
         address migrationImplementation = address(new PolygonMigration());
 
         address migrationProxy = address(
             new TransparentUpgradeableProxy(
                 migrationImplementation,
-                governance,
+                address(admin),
                 abi.encodeCall(PolygonMigration.initialize, matic)
             )
         );
 
         address inflationManagerImplementation = address(new DefaultInflationManager());
         address inflationManagerProxy = address(
-            new TransparentUpgradeableProxy(address(inflationManagerImplementation), governance, "")
+            new TransparentUpgradeableProxy(address(inflationManagerImplementation), address(admin), "")
         );
 
         Polygon polygonToken = new Polygon(migrationProxy, inflationManagerProxy);

diff --git a/test/DefaultInflationManager.t.sol b/test/DefaultInflationManager.t.sol
@@ -5,7 +5,7 @@ import {Polygon} from "src/Polygon.sol";
 import {DefaultInflationManager} from "src/DefaultInflationManager.sol";
 import {PolygonMigration} from "src/PolygonMigration.sol";
 import {ERC20PresetMinterPauser} from "openzeppelin-contracts/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
-import {TransparentUpgradeableProxy} from "openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import {ProxyAdmin, TransparentUpgradeableProxy} from "openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol";
 import {Test} from "forge-std/Test.sol";
 
 contract DefaultInflationManagerTest is Test {
@@ -30,12 +30,13 @@ contract DefaultInflationManagerTest is Test {
         stakeManager = makeAddr("stakeManager");
         governance = makeAddr("governance");
         inflationManagerImplementation = new DefaultInflationManager();
+        ProxyAdmin admin = new ProxyAdmin();
         inflationManager = DefaultInflationManager(
-            address(new TransparentUpgradeableProxy(address(inflationManagerImplementation), msg.sender, ""))
+            address(new TransparentUpgradeableProxy(address(inflationManagerImplementation), address(admin), ""))
         );
         matic = new ERC20PresetMinterPauser("Matic Token", "MATIC");
         migration = PolygonMigration(
-            address(new TransparentUpgradeableProxy(address(new PolygonMigration()), msg.sender, ""))
+            address(new TransparentUpgradeableProxy(address(new PolygonMigration()), address(admin), ""))
         );
         migration.initialize(address(matic));
         polygon = new Polygon(address(migration), address(inflationManager));

diff --git a/test/Polygon.t.sol b/test/Polygon.t.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.21;
 import {Polygon} from "src/Polygon.sol";
 import {IPolygon} from "src/interfaces/IPolygon.sol";
 import {DefaultInflationManager} from "src/DefaultInflationManager.sol";
-import {TransparentUpgradeableProxy} from "openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import {TransparentUpgradeableProxy, ProxyAdmin} from "openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol";
 import {Test} from "forge-std/Test.sol";
 
 contract PolygonTest is Test {
@@ -21,8 +21,9 @@ contract PolygonTest is Test {
         treasury = makeAddr("treasury");
         stakeManager = makeAddr("stakeManager");
         matic = makeAddr("matic");
+        ProxyAdmin admin = new ProxyAdmin();
         inflationManager = DefaultInflationManager(
-            address(new TransparentUpgradeableProxy(address(new DefaultInflationManager()), msg.sender, ""))
+            address(new TransparentUpgradeableProxy(address(new DefaultInflationManager()), address(admin), ""))
         );
         polygon = new Polygon(migration, address(inflationManager));
         inflationManager.initialize(address(polygon), migration, stakeManager, treasury, msg.sender);

diff --git a/test/PolygonMigration.t.sol b/test/PolygonMigration.t.sol
@@ -5,7 +5,7 @@ import {Polygon} from "src/Polygon.sol";
 import {PolygonMigration} from "src/PolygonMigration.sol";
 import {IPolygonMigration} from "src/interfaces/IPolygonMigration.sol";
 import {ERC20PresetMinterPauser} from "openzeppelin-contracts/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol";
-import {TransparentUpgradeableProxy} from "openzeppelin-contracts/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+import {TransparentUpgradeableProxy, ProxyAdmin} from "openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol";
 import {SigUtils} from "test/SigUtils.t.sol";
 import {Test} from "forge-std/Test.sol";
 
@@ -14,6 +14,7 @@ contract PolygonMigrationTest is Test {
     Polygon public polygon;
     PolygonMigration public migration;
     SigUtils public sigUtils;
+    ProxyAdmin public admin;
     address public treasury;
     address public stakeManager;
     address public inflationManager;
@@ -25,11 +26,12 @@ contract PolygonMigrationTest is Test {
         inflationManager = makeAddr("inflationManager");
         governance = makeAddr("governance");
         matic = new ERC20PresetMinterPauser("Matic Token", "MATIC");
+        admin = new ProxyAdmin();
         migration = PolygonMigration(
             address(
                 new TransparentUpgradeableProxy(
                     address(new PolygonMigration()),
-                    msg.sender,
+                    address(admin),
                     abi.encodeCall(PolygonMigration.initialize, address(matic))
                 )
             )
@@ -115,6 +117,7 @@ contract PolygonMigrationTest is Test {
     }
 
     function testRevert_Unmigrate(address user, uint256 amount) external {
+        vm.assume(user != address(admin));
         bool unmigrationLock = true;
         vm.assume(
             amount <= 10000000000 * 10 ** 18 && user != address(0) && user != address(migration) && user != governance