set subnet owner explicitly

consensus-shipyard · Mar 11, 2024 · b718ddb · b718ddb
1 parent d28073b
commit b718ddb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/contracts/src/SubnetActorDiamond.sol b/contracts/src/SubnetActorDiamond.sol
@@ -38,7 +38,7 @@ contract SubnetActorDiamond {
         SubnetID parentId;
     }
 
-    constructor(IDiamond.FacetCut[] memory _diamondCut, ConstructorParams memory params) {
+    constructor(IDiamond.FacetCut[] memory _diamondCut, ConstructorParams memory params, address owner) {
         if (params.ipcGatewayAddr == address(0)) {
             revert GatewayCannotBeZero();
         }
@@ -58,7 +58,7 @@ contract SubnetActorDiamond {
 
         params.supplySource.validate();
 
-        LibDiamond.setContractOwner(msg.sender);
+        LibDiamond.setContractOwner(owner);
         LibDiamond.diamondCut({_diamondCut: _diamondCut, _init: address(0), _calldata: new bytes(0)});
 
         LibDiamond.DiamondStorage storage ds = LibDiamond.diamondStorage();

diff --git a/contracts/src/subnetregistry/RegisterSubnetFacet.sol b/contracts/src/subnetregistry/RegisterSubnetFacet.sol
@@ -58,7 +58,7 @@ contract RegisterSubnetFacet is ReentrancyGuard {
         });
 
         // slither-disable-next-line reentrancy-benign
-        subnetAddr = address(new SubnetActorDiamond(diamondCut, _params));
+        subnetAddr = address(new SubnetActorDiamond(diamondCut, _params, msg.sender));
 
         //nonces start with 1, similar to eip 161
         ++s.userNonces[msg.sender];

diff --git a/contracts/test/IntegrationTestBase.sol b/contracts/test/IntegrationTestBase.sol
@@ -407,7 +407,7 @@ contract IntegrationTestBase is Test, TestParams, TestRegistry, TestSubnetActor,
             })
         );
 
-        saDiamond = new SubnetActorDiamond(diamondCut, params);
+        saDiamond = new SubnetActorDiamond(diamondCut, params, address(this));
         return saDiamond;
     }
 
@@ -478,7 +478,7 @@ contract IntegrationTestBase is Test, TestParams, TestRegistry, TestSubnetActor,
             })
         );
 
-        SubnetActorDiamond diamond = new SubnetActorDiamond(diamondCut, params);
+        SubnetActorDiamond diamond = new SubnetActorDiamond(diamondCut, params, address(this));
 
         return diamond;
     }
@@ -555,7 +555,7 @@ contract IntegrationTestBase is Test, TestParams, TestRegistry, TestSubnetActor,
 
         SubnetActorDiamond.ConstructorParams memory params = defaultSubnetActorParamsWith(gw);
 
-        SubnetActorDiamond d = new SubnetActorDiamond(diamondCut, params);
+        SubnetActorDiamond d = new SubnetActorDiamond(diamondCut, params, address(this));
 
         return d;
     }