refactor InstanceAdmin constructor to take address instead of IAuthor…

…ization
etherisc · Aug 9, 2024 · 2b32028 · 2b32028
1 parent f62dcdf
commit 2b32028
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/contracts/instance/InstanceAdmin.sol b/contracts/instance/InstanceAdmin.sol
@@ -43,11 +43,11 @@ contract InstanceAdmin is
     /// @dev Only used for master instance admin.
     /// Contracts created via constructor come with disabled initializers.
     constructor(
-        IAuthorization instanceAuthorization
+        address instanceAuthorization
     )
         AccessAdmin()
     {
-        _instanceAuthorization = instanceAuthorization;
+        _instanceAuthorization = IAuthorization(instanceAuthorization);
     }
 
     /// @dev Initializes this instance admin with the provided instances authorization specification.
@@ -56,7 +56,7 @@ contract InstanceAdmin is
     /// Important: Initialization of this instance admin is only complete after calling function initializeInstance. 
     function initialize(
         AccessManagerCloneable accessManager,
-        IAuthorization instanceAuthorization
+        address instanceAuthorization
     )
         external
         initializer() 

diff --git a/contracts/instance/InstanceService.sol b/contracts/instance/InstanceService.sol
@@ -293,9 +293,11 @@ contract InstanceService is
         clonedAccessManager.initialize(
             address(clonedInstanceAdmin)); // grant ADMIN_ROLE to instance admin
 
+        address authorization = address(
+            InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization());
         clonedInstanceAdmin.initialize(
             clonedAccessManager,
-            InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization());
+            authorization);
     }
 
 

diff --git a/test/authorization/InstanceAdmin.t.sol b/test/authorization/InstanceAdmin.t.sol
@@ -19,14 +19,14 @@ contract TestInstanceAdmin is
     GifTest
 {
     AccessManagerCloneable public someAccessManager;
-    InstanceAuthorizationV3 public someInstanceAuthz;
+    address public someInstanceAuthz;
     InstanceAdmin public someInstanceAdminMaster;
 
     function setUp() public override {
         super.setUp();
 
         someAccessManager = new AccessManagerCloneable();
-        someInstanceAuthz = new InstanceAuthorizationV3();
+        someInstanceAuthz = address(new InstanceAuthorizationV3());
         someInstanceAdminMaster = new InstanceAdmin(someInstanceAuthz);
         someAccessManager = AccessManagerCloneable(someInstanceAdminMaster.authority());
     }

diff --git a/test/base/GifTest.sol b/test/base/GifTest.sol
@@ -82,7 +82,7 @@ contract GifTest is GifDeployer {
 
     AccessManagerCloneable public masterAccessManager;
     InstanceAdmin public masterInstanceAdmin;
-    InstanceAuthorizationV3 public instanceAuthorizationV3;
+    address public instanceAuthorizationV3; //InstanceAuthorizationV3
     BundleSet public masterBundleSet;
     InstanceStore public masterInstanceStore;
     Instance public masterInstance;
@@ -300,7 +300,7 @@ contract GifTest is GifDeployer {
     function _deployMasterInstance() internal 
     {
         // create instance supporting contracts
-        instanceAuthorizationV3 = new InstanceAuthorizationV3();
+        instanceAuthorizationV3 = address(new InstanceAuthorizationV3());
         masterInstanceAdmin = new InstanceAdmin(instanceAuthorizationV3);
         masterInstanceStore = new InstanceStore();
         masterBundleSet = new BundleSet();