transfer ownership after deploymnt

latticexyz · Sep 13, 2023 · 790ae47 · 790ae47
1 parent 8a5598a
commit 790ae47
Show file tree

Hide file tree

Showing 5 changed files with 152 additions and 5 deletions.
diff --git a/packages/world/abi/Create2Factory.sol/Create2Factory.abi.json.d.ts b/packages/world/abi/Create2Factory.sol/Create2Factory.abi.json.d.ts
diff --git a/packages/world/abi/IWorldFactory.sol/IWorldFactory.abi.json.d.ts b/packages/world/abi/IWorldFactory.sol/IWorldFactory.abi.json.d.ts
diff --git a/packages/world/abi/WorldFactory.sol/WorldFactory.abi.json.d.ts b/packages/world/abi/WorldFactory.sol/WorldFactory.abi.json.d.ts
diff --git a/packages/world/src/factories/WorldFactory.sol b/packages/world/src/factories/WorldFactory.sol
@@ -6,6 +6,7 @@ import { World } from "../World.sol";
 import { IWorldFactory } from "./IWorldFactory.sol";
 import { IBaseWorld } from "../interfaces/IBaseWorld.sol";
 import { IModule } from "../interfaces/IModule.sol";
+import { ROOT_NAMESPACE } from "../constants.sol";
 
 contract WorldFactory is IWorldFactory {
   IModule public coreModule;
@@ -16,14 +17,18 @@ contract WorldFactory is IWorldFactory {
   }
 
   /**
-    @dev Deploy a new World and install coreModule.
+    @dev Deploy a new World, install the CoreModule and transfer ownership to the caller
   */
   function deployWorld() public {
+    // Deploy a new World and increase the WorldCount
     bytes memory bytecode = type(World).creationCode;
-    address worldAddress = Create2.deploy(bytecode, worldCount);
+    address worldAddress = Create2.deploy(bytecode, worldCount++);
     IBaseWorld world = IBaseWorld(worldAddress);
+
+    // Initialize the World and transfer ownership to the caller
     world.installRootModule(coreModule, new bytes(0));
+    world.transferOwnership(ROOT_NAMESPACE, msg.sender);
+
     emit WorldDeployed(worldAddress);
-    worldCount++;
   }
 }
diff --git a/packages/world/test/Factories.t.sol b/packages/world/test/Factories.t.sol
@@ -2,13 +2,16 @@
 pragma solidity >=0.8.0;
 
 import { Test, console } from "forge-std/Test.sol";
+
+import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
 import { World } from "../src/World.sol";
+import { CoreModule } from "../src/modules/core/CoreModule.sol";
 import { Create2Factory } from "../src/factories/Create2Factory.sol";
 import { WorldFactory } from "../src/factories/WorldFactory.sol";
 import { IWorldFactory } from "../src/factories/IWorldFactory.sol";
-import { CoreModule } from "../src/modules/core/CoreModule.sol";
 import { InstalledModules, InstalledModulesData } from "../src/tables/InstalledModules.sol";
-import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
+import { NamespaceOwner } from "../src/tables/NamespaceOwner.sol";
+import { ROOT_NAMESPACE } from "../src/constants.sol";
 
 contract FactoriesTest is Test {
   event ContractDeployed(address addr, uint256 salt);
@@ -74,5 +77,8 @@ contract FactoriesTest is Test {
 
     // Confirm worldCount (which is salt) has incremented
     assertEq(uint256(worldFactory.worldCount()), uint256(1));
+
+    // Confirm the msg.sender is owner of the root namespace of the new world
+    assertEq(NamespaceOwner.get(ROOT_NAMESPACE), address(this));
   }
 }