fixes

latticexyz · Jan 9, 2024 · 8fbff3e · 8fbff3e
1 parent 1e85721
commit 8fbff3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/packages/cli/src/deploy/ensureWorldFactory.ts b/packages/cli/src/deploy/ensureWorldFactory.ts
@@ -26,14 +26,8 @@ export const coreModule2 = getCreate2Address({ from: deployer, bytecode: coreMod
 export const worldFactoryDeployedBytecodeSize = size(worldFactoryBuild.deployedBytecode.object as Hex);
 export const worldFactoryBytecode = encodeDeployData({
   bytecode: worldFactoryBuild.bytecode.object as Hex,
-  abi: parseAbi(["constructor(address)"]),
-  args: [coreModule],
-});
-
-export const worldFactoryBytecode2 = encodeDeployData({
-  bytecode: worldFactoryBuild.bytecode.object as Hex,
-  abi: parseAbi(["constructor(address)"]),
-  args: [coreModule2],
+  abi: parseAbi(["constructor(address,address)"]),
+  args: [coreModule, coreModule2],
 });
 
 export const worldFactory = getCreate2Address({ from: deployer, bytecode: worldFactoryBytecode, salt });

diff --git a/packages/world/src/modules/core/CoreModule.sol b/packages/world/src/modules/core/CoreModule.sol
@@ -16,7 +16,7 @@ import { NamespaceDelegationControl } from "../../codegen/tables/NamespaceDelega
 
 import { CoreSystem } from "./CoreSystem.sol";
 import { CoreSystem2 } from "./CoreSystem2.sol";
-import { CORE_MODULE_NAME, CORE_SYSTEM_ID, CORE_SYSTEM_2_ID } from "./constants.sol";
+import { CORE_MODULE_NAME, CORE_SYSTEM_ID } from "./constants.sol";
 
 import { Systems } from "../../codegen/tables/Systems.sol";
 import { FunctionSelectors } from "../../codegen/tables/FunctionSelectors.sol";