@latticexyz/world-modules 2.0.0-march-19-skystrife-playtest-f486281e → 2.0.0-next-17-awakening-9c07ab3a2

package/src/modules/keyswithvalue/tables/KeysWithValue.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 /* Autogenerated file. Do not edit manually. */
 
@@ -18,7 +18,6 @@ import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.s
 import { Schema, SchemaLib } from "@latticexyz/store/src/Schema.sol";
 import { PackedCounter, PackedCounterLib } from "@latticexyz/store/src/PackedCounter.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { RESOURCE_TABLE, RESOURCE_OFFCHAIN_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 
 FieldLayout constant _fieldLayout = FieldLayout.wrap(
   0x0000000100000000000000000000000000000000000000000000000000000000
@@ -676,7 +675,7 @@ library KeysWithValue {
    * @notice Encode all of a record's fields.
    * @return The static (fixed length) data, encoded into a sequence of bytes.
    * @return The lengths of the dynamic fields (packed into a single bytes32 value).
-   * @return The dyanmic (variable length) data, encoded into a sequence of bytes.
+   * @return The dynamic (variable length) data, encoded into a sequence of bytes.
    */
   function encode(bytes32[] memory keysWithValue) internal pure returns (bytes memory, PackedCounter, bytes memory) {
     bytes memory _staticData;

package/src/modules/puppet/Puppet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";

package/src/modules/puppet/PuppetDelegationControl.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { DelegationControl } from "@latticexyz/world/src/DelegationControl.sol";
 import { ResourceId } from "@latticexyz/world/src/WorldResourceId.sol";

package/src/modules/puppet/PuppetFactorySystem.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 import { System } from "@latticexyz/world/src/System.sol";

package/src/modules/puppet/PuppetMaster.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 import { SystemRegistry } from "@latticexyz/world/src/codegen/tables/SystemRegistry.sol";

package/src/modules/puppet/PuppetModule.sol

@@ -1,14 +1,16 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
-
 import { Module } from "@latticexyz/world/src/Module.sol";
 import { revertWithBytes } from "@latticexyz/world/src/revertWithBytes.sol";
+import { WorldResourceIdInstance } from "@latticexyz/world/src/WorldResourceId.sol";
+
+import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 
 import { PuppetFactorySystem } from "./PuppetFactorySystem.sol";
 import { PuppetDelegationControl } from "./PuppetDelegationControl.sol";
-import { MODULE_NAME, PUPPET_DELEGATION, PUPPET_FACTORY, PUPPET_TABLE_ID } from "./constants.sol";
+import { PUPPET_DELEGATION, PUPPET_FACTORY, PUPPET_TABLE_ID, NAMESPACE_ID } from "./constants.sol";
 
 import { PuppetRegistry } from "./tables/PuppetRegistry.sol";
 
@@ -16,21 +18,31 @@ import { PuppetRegistry } from "./tables/PuppetRegistry.sol";
  * This module registers tables and delegation control systems required for puppet delegations
  */
 contract PuppetModule is Module {
+  using WorldResourceIdInstance for ResourceId;
+
   PuppetDelegationControl private immutable puppetDelegationControl = new PuppetDelegationControl();
   PuppetFactorySystem private immutable puppetFactorySystem = new PuppetFactorySystem();
 
-  function getName() public pure returns (bytes16) {
-    return MODULE_NAME;
-  }
-
   function installRoot(bytes memory) public {
     IBaseWorld world = IBaseWorld(_world());
 
+    // Register namespace
+    (bool success, bytes memory returnData) = address(world).delegatecall(
+      abi.encodeCall(world.registerNamespace, (NAMESPACE_ID))
+    );
+    if (!success) revertWithBytes(returnData);
+
     // Register table
     PuppetRegistry.register(PUPPET_TABLE_ID);
 
-    // Register system
-    (bool success, bytes memory returnData) = address(world).delegatecall(
+    // Register puppet factory
+    (success, returnData) = address(world).delegatecall(
+      abi.encodeCall(world.registerSystem, (PUPPET_FACTORY, puppetFactorySystem, true))
+    );
+    if (!success) revertWithBytes(returnData);
+
+    // Register puppet delegation control
+    (success, returnData) = address(world).delegatecall(
       abi.encodeCall(world.registerSystem, (PUPPET_DELEGATION, puppetDelegationControl, true))
     );
     if (!success) revertWithBytes(returnData);
@@ -39,6 +51,9 @@ contract PuppetModule is Module {
   function install(bytes memory) public {
     IBaseWorld world = IBaseWorld(_world());
 
+    // Register namespace
+    world.registerNamespace(NAMESPACE_ID);
+
     // Register table
     PuppetRegistry.register(PUPPET_TABLE_ID);
 

package/src/modules/puppet/constants.sol

@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 import { RESOURCE_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
-import { RESOURCE_SYSTEM } from "@latticexyz/world/src/worldResourceTypes.sol";
+import { RESOURCE_SYSTEM, RESOURCE_NAMESPACE } from "@latticexyz/world/src/worldResourceTypes.sol";
 import { ROOT_NAMESPACE } from "@latticexyz/world/src/constants.sol";
 
-bytes16 constant MODULE_NAME = bytes16("puppet");
 bytes14 constant NAMESPACE = bytes14("puppet");
 
+ResourceId constant NAMESPACE_ID = ResourceId.wrap(bytes32(abi.encodePacked(RESOURCE_NAMESPACE, NAMESPACE)));
+
 ResourceId constant PUPPET_DELEGATION = ResourceId.wrap(
   bytes32(abi.encodePacked(RESOURCE_SYSTEM, NAMESPACE, bytes16("Delegation")))
 );

package/src/modules/puppet/createPuppet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";

package/src/modules/puppet/tables/PuppetRegistry.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 /* Autogenerated file. Do not edit manually. */
 
@@ -18,7 +18,6 @@ import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.s
 import { Schema, SchemaLib } from "@latticexyz/store/src/Schema.sol";
 import { PackedCounter, PackedCounterLib } from "@latticexyz/store/src/PackedCounter.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { RESOURCE_TABLE, RESOURCE_OFFCHAIN_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 
 // Import user types
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
@@ -206,7 +205,7 @@ library PuppetRegistry {
    * @notice Encode all of a record's fields.
    * @return The static (fixed length) data, encoded into a sequence of bytes.
    * @return The lengths of the dynamic fields (packed into a single bytes32 value).
-   * @return The dyanmic (variable length) data, encoded into a sequence of bytes.
+   * @return The dynamic (variable length) data, encoded into a sequence of bytes.
    */
   function encode(address puppet) internal pure returns (bytes memory, PackedCounter, bytes memory) {
     bytes memory _staticData = encodeStatic(puppet);

package/src/modules/puppet/utils.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 function toTopic(address value) pure returns (bytes32) {
   return bytes32(uint256(uint160(value)));

package/src/modules/std-delegations/CallboundDelegationControl.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { DelegationControl } from "@latticexyz/world/src/DelegationControl.sol";
 import { ResourceId } from "@latticexyz/world/src/WorldResourceId.sol";

package/src/modules/std-delegations/StandardDelegationsModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
 
@@ -10,7 +10,7 @@ import { revertWithBytes } from "@latticexyz/world/src/revertWithBytes.sol";
 import { CallboundDelegationControl } from "./CallboundDelegationControl.sol";
 import { SystemboundDelegationControl } from "./SystemboundDelegationControl.sol";
 import { TimeboundDelegationControl } from "./TimeboundDelegationControl.sol";
-import { MODULE_NAME, CALLBOUND_DELEGATION, SYSTEMBOUND_DELEGATION, TIMEBOUND_DELEGATION } from "./constants.sol";
+import { CALLBOUND_DELEGATION, SYSTEMBOUND_DELEGATION, TIMEBOUND_DELEGATION } from "./constants.sol";
 
 import { CallboundDelegations } from "./tables/CallboundDelegations.sol";
 import { SystemboundDelegations } from "./tables/SystemboundDelegations.sol";
@@ -24,10 +24,6 @@ contract StandardDelegationsModule is Module {
   SystemboundDelegationControl private immutable systemboundDelegationControl = new SystemboundDelegationControl();
   TimeboundDelegationControl private immutable timeboundDelegationControl = new TimeboundDelegationControl();
 
-  function getName() public pure returns (bytes16) {
-    return MODULE_NAME;
-  }
-
   function installRoot(bytes memory) public {
     IBaseWorld world = IBaseWorld(_world());
 

package/src/modules/std-delegations/SystemboundDelegationControl.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { DelegationControl } from "@latticexyz/world/src/DelegationControl.sol";
 import { ResourceId } from "@latticexyz/world/src/WorldResourceId.sol";

package/src/modules/std-delegations/TimeboundDelegationControl.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { DelegationControl } from "@latticexyz/world/src/DelegationControl.sol";
 import { ResourceId } from "@latticexyz/world/src/WorldResourceId.sol";

package/src/modules/std-delegations/constants.sol

@@ -1,12 +1,10 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 import { RESOURCE_SYSTEM } from "@latticexyz/world/src/worldResourceTypes.sol";
 import { ROOT_NAMESPACE } from "@latticexyz/world/src/constants.sol";
 
-bytes16 constant MODULE_NAME = bytes16("stddelegations.m");
-
 // Callbound delegation
 ResourceId constant CALLBOUND_DELEGATION = ResourceId.wrap(
   bytes32(abi.encodePacked(RESOURCE_SYSTEM, ROOT_NAMESPACE, bytes16("callbound")))

package/src/modules/std-delegations/tables/CallboundDelegations.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 /* Autogenerated file. Do not edit manually. */
 
@@ -18,14 +18,12 @@ import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.s
 import { Schema, SchemaLib } from "@latticexyz/store/src/Schema.sol";
 import { PackedCounter, PackedCounterLib } from "@latticexyz/store/src/PackedCounter.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { RESOURCE_TABLE, RESOURCE_OFFCHAIN_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 
 // Import user types
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 
-ResourceId constant _tableId = ResourceId.wrap(
-  bytes32(abi.encodePacked(RESOURCE_TABLE, bytes14(""), bytes16("CallboundDelegat")))
-);
+// Hex below is the result of `WorldResourceIdLib.encode({ namespace: "", name: "CallboundDelegat", typeId: RESOURCE_TABLE });`
+ResourceId constant _tableId = ResourceId.wrap(0x7462000000000000000000000000000043616c6c626f756e6444656c65676174);
 ResourceId constant CallboundDelegationsTableId = _tableId;
 
 FieldLayout constant _fieldLayout = FieldLayout.wrap(
@@ -291,7 +289,7 @@ library CallboundDelegations {
    * @notice Encode all of a record's fields.
    * @return The static (fixed length) data, encoded into a sequence of bytes.
    * @return The lengths of the dynamic fields (packed into a single bytes32 value).
-   * @return The dyanmic (variable length) data, encoded into a sequence of bytes.
+   * @return The dynamic (variable length) data, encoded into a sequence of bytes.
    */
   function encode(uint256 availableCalls) internal pure returns (bytes memory, PackedCounter, bytes memory) {
     bytes memory _staticData = encodeStatic(availableCalls);

package/src/modules/std-delegations/tables/SystemboundDelegations.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 /* Autogenerated file. Do not edit manually. */
 
@@ -18,14 +18,12 @@ import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.s
 import { Schema, SchemaLib } from "@latticexyz/store/src/Schema.sol";
 import { PackedCounter, PackedCounterLib } from "@latticexyz/store/src/PackedCounter.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { RESOURCE_TABLE, RESOURCE_OFFCHAIN_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 
 // Import user types
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 
-ResourceId constant _tableId = ResourceId.wrap(
-  bytes32(abi.encodePacked(RESOURCE_TABLE, bytes14(""), bytes16("SystemboundDeleg")))
-);
+// Hex below is the result of `WorldResourceIdLib.encode({ namespace: "", name: "SystemboundDeleg", typeId: RESOURCE_TABLE });`
+ResourceId constant _tableId = ResourceId.wrap(0x7462000000000000000000000000000053797374656d626f756e6444656c6567);
 ResourceId constant SystemboundDelegationsTableId = _tableId;
 
 FieldLayout constant _fieldLayout = FieldLayout.wrap(
@@ -261,7 +259,7 @@ library SystemboundDelegations {
    * @notice Encode all of a record's fields.
    * @return The static (fixed length) data, encoded into a sequence of bytes.
    * @return The lengths of the dynamic fields (packed into a single bytes32 value).
-   * @return The dyanmic (variable length) data, encoded into a sequence of bytes.
+   * @return The dynamic (variable length) data, encoded into a sequence of bytes.
    */
   function encode(uint256 availableCalls) internal pure returns (bytes memory, PackedCounter, bytes memory) {
     bytes memory _staticData = encodeStatic(availableCalls);

package/src/modules/std-delegations/tables/TimeboundDelegations.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 /* Autogenerated file. Do not edit manually. */
 
@@ -18,11 +18,9 @@ import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.s
 import { Schema, SchemaLib } from "@latticexyz/store/src/Schema.sol";
 import { PackedCounter, PackedCounterLib } from "@latticexyz/store/src/PackedCounter.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { RESOURCE_TABLE, RESOURCE_OFFCHAIN_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 
-ResourceId constant _tableId = ResourceId.wrap(
-  bytes32(abi.encodePacked(RESOURCE_TABLE, bytes14(""), bytes16("TimeboundDelegat")))
-);
+// Hex below is the result of `WorldResourceIdLib.encode({ namespace: "", name: "TimeboundDelegat", typeId: RESOURCE_TABLE });`
+ResourceId constant _tableId = ResourceId.wrap(0x7462000000000000000000000000000054696d65626f756e6444656c65676174);
 ResourceId constant TimeboundDelegationsTableId = _tableId;
 
 FieldLayout constant _fieldLayout = FieldLayout.wrap(
@@ -220,7 +218,7 @@ library TimeboundDelegations {
    * @notice Encode all of a record's fields.
    * @return The static (fixed length) data, encoded into a sequence of bytes.
    * @return The lengths of the dynamic fields (packed into a single bytes32 value).
-   * @return The dyanmic (variable length) data, encoded into a sequence of bytes.
+   * @return The dynamic (variable length) data, encoded into a sequence of bytes.
    */
   function encode(uint256 maxTimestamp) internal pure returns (bytes memory, PackedCounter, bytes memory) {
     bytes memory _staticData = encodeStatic(maxTimestamp);

package/src/modules/tokens/tables/Balances.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 /* Autogenerated file. Do not edit manually. */
 
@@ -18,7 +18,6 @@ import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.s
 import { Schema, SchemaLib } from "@latticexyz/store/src/Schema.sol";
 import { PackedCounter, PackedCounterLib } from "@latticexyz/store/src/PackedCounter.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { RESOURCE_TABLE, RESOURCE_OFFCHAIN_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 
 FieldLayout constant _fieldLayout = FieldLayout.wrap(
   0x0020010020000000000000000000000000000000000000000000000000000000
@@ -203,7 +202,7 @@ library Balances {
    * @notice Encode all of a record's fields.
    * @return The static (fixed length) data, encoded into a sequence of bytes.
    * @return The lengths of the dynamic fields (packed into a single bytes32 value).
-   * @return The dyanmic (variable length) data, encoded into a sequence of bytes.
+   * @return The dynamic (variable length) data, encoded into a sequence of bytes.
    */
   function encode(uint256 value) internal pure returns (bytes memory, PackedCounter, bytes memory) {
     bytes memory _staticData = encodeStatic(value);

package/src/modules/uniqueentity/UniqueEntityModule.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
 import { InstalledModules } from "@latticexyz/world/src/codegen/index.sol";
@@ -11,7 +11,7 @@ import { revertWithBytes } from "@latticexyz/world/src/revertWithBytes.sol";
 import { UniqueEntity } from "./tables/UniqueEntity.sol";
 import { UniqueEntitySystem } from "./UniqueEntitySystem.sol";
 
-import { MODULE_NAME, TABLE_ID, SYSTEM_ID } from "./constants.sol";
+import { TABLE_ID, SYSTEM_ID, NAMESPACE_ID } from "./constants.sol";
 
 /**
  * This module creates a table that stores a nonce, and
@@ -22,24 +22,24 @@ contract UniqueEntityModule is Module {
   // known tables, we can deploy it once and register it in multiple Worlds.
   UniqueEntitySystem private immutable uniqueEntitySystem = new UniqueEntitySystem();
 
-  function getName() public pure returns (bytes16) {
-    return MODULE_NAME;
-  }
-
-  function installRoot(bytes memory args) public {
+  function installRoot(bytes memory encodedArgs) public {
     // Naive check to ensure this is only installed once
     // TODO: only revert if there's nothing to do
-    if (InstalledModules.getModuleAddress(getName(), keccak256(args)) != address(0)) {
-      revert Module_AlreadyInstalled();
-    }
+    requireNotInstalled(__self, encodedArgs);
 
     IBaseWorld world = IBaseWorld(_world());
 
+    // Register namespace
+    (bool success, bytes memory data) = address(world).delegatecall(
+      abi.encodeCall(world.registerNamespace, (NAMESPACE_ID))
+    );
+    if (!success) revertWithBytes(data);
+
     // Register table
     UniqueEntity._register(TABLE_ID);
 
     // Register system
-    (bool success, bytes memory data) = address(world).delegatecall(
+    (success, data) = address(world).delegatecall(
       abi.encodeCall(world.registerSystem, (SYSTEM_ID, uniqueEntitySystem, true))
     );
     if (!success) revertWithBytes(data);
@@ -51,15 +51,16 @@ contract UniqueEntityModule is Module {
     if (!success) revertWithBytes(data);
   }
 
-  function install(bytes memory args) public {
+  function install(bytes memory encodedArgs) public {
     // Naive check to ensure this is only installed once
     // TODO: only revert if there's nothing to do
-    if (InstalledModules.getModuleAddress(getName(), keccak256(args)) != address(0)) {
-      revert Module_AlreadyInstalled();
-    }
+    requireNotInstalled(__self, encodedArgs);
 
     IBaseWorld world = IBaseWorld(_world());
 
+    // Register namespace
+    world.registerNamespace(NAMESPACE_ID);
+
     // Register table
     UniqueEntity.register(TABLE_ID);
 

package/src/modules/uniqueentity/UniqueEntitySystem.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { System } from "@latticexyz/world/src/System.sol";
 import { TABLE_ID } from "./constants.sol";

package/src/modules/uniqueentity/constants.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { ResourceId } from "@latticexyz/world/src/WorldResourceId.sol";
-import { RESOURCE_TABLE, RESOURCE_SYSTEM } from "@latticexyz/world/src/worldResourceTypes.sol";
+import { RESOURCE_TABLE, RESOURCE_SYSTEM, RESOURCE_NAMESPACE } from "@latticexyz/world/src/worldResourceTypes.sol";
 
 bytes14 constant NAMESPACE = bytes14("uniqueEntity");
-bytes16 constant MODULE_NAME = bytes16("uniqueEntity");
 bytes16 constant SYSTEM_NAME = bytes16("system");
 bytes16 constant TABLE_NAME = bytes16("table");
 
+ResourceId constant NAMESPACE_ID = ResourceId.wrap(bytes32(abi.encodePacked(RESOURCE_NAMESPACE, NAMESPACE)));
 ResourceId constant TABLE_ID = ResourceId.wrap(bytes32(abi.encodePacked(RESOURCE_TABLE, NAMESPACE, TABLE_NAME)));
 ResourceId constant SYSTEM_ID = ResourceId.wrap((bytes32(abi.encodePacked(RESOURCE_SYSTEM, NAMESPACE, SYSTEM_NAME))));

package/src/modules/uniqueentity/getUniqueEntity.sol

@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
 
-import { IUniqueEntitySystem } from "../../interfaces/IUniqueEntitySystem.sol";
 import { UniqueEntitySystem } from "./UniqueEntitySystem.sol";
 
 import { SystemSwitch } from "../../utils/SystemSwitch.sol";
@@ -23,5 +22,5 @@ function getUniqueEntity() returns (bytes32 uniqueEntity) {
  * Increment and get an entity nonce.
  */
 function getUniqueEntity(IBaseWorld world) returns (bytes32 uniqueEntity) {
-  return IUniqueEntitySystem(address(world)).uniqueEntity_system_getUniqueEntity();
+  return abi.decode(world.call(SYSTEM_ID, abi.encodeCall(UniqueEntitySystem.getUniqueEntity, ())), (bytes32));
 }

package/src/modules/uniqueentity/tables/UniqueEntity.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 /* Autogenerated file. Do not edit manually. */
 
@@ -18,7 +18,6 @@ import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.s
 import { Schema, SchemaLib } from "@latticexyz/store/src/Schema.sol";
 import { PackedCounter, PackedCounterLib } from "@latticexyz/store/src/PackedCounter.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
-import { RESOURCE_TABLE, RESOURCE_OFFCHAIN_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 
 FieldLayout constant _fieldLayout = FieldLayout.wrap(
   0x0020010020000000000000000000000000000000000000000000000000000000
@@ -245,7 +244,7 @@ library UniqueEntity {
    * @notice Encode all of a record's fields.
    * @return The static (fixed length) data, encoded into a sequence of bytes.
    * @return The lengths of the dynamic fields (packed into a single bytes32 value).
-   * @return The dyanmic (variable length) data, encoded into a sequence of bytes.
+   * @return The dynamic (variable length) data, encoded into a sequence of bytes.
    */
   function encode(uint256 value) internal pure returns (bytes memory, PackedCounter, bytes memory) {
     bytes memory _staticData = encodeStatic(value);

package/src/modules/utils/ArrayLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 library ArrayLib {
   function equal(bytes32[] memory arr1, bytes32[] memory arr2) internal pure returns (bool) {
@@ -36,7 +36,7 @@ library ArrayLib {
 
   function filter(bytes32[] memory arr, bytes32 element) internal pure returns (bytes32[] memory) {
     bytes32[] memory filtered = new bytes32[](arr.length);
-    uint256 filteredIndex = 0;
+    uint256 filteredIndex;
     for (uint256 i; i < arr.length; i++) {
       if (arr[i] != element) {
         filtered[filteredIndex] = arr[i];

package/src/utils/AccessControlLib.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { ResourceId, WorldResourceIdInstance } from "@latticexyz/world/src/WorldResourceId.sol";
 import { IWorldErrors } from "@latticexyz/world/src/IWorldErrors.sol";

package/src/utils/SystemSwitch.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.21;
+pragma solidity >=0.8.24;
 
 import { Hook } from "@latticexyz/store/src/Hook.sol";
 import { Bytes } from "@latticexyz/store/src/Bytes.sol";
@@ -11,6 +11,7 @@ import { AccessControl } from "@latticexyz/world/src/AccessControl.sol";
 import { ROOT_NAMESPACE } from "@latticexyz/world/src/constants.sol";
 import { revertWithBytes } from "@latticexyz/world/src/revertWithBytes.sol";
 import { BEFORE_CALL_SYSTEM, AFTER_CALL_SYSTEM } from "@latticexyz/world/src/systemHookTypes.sol";
+import { SystemCall } from "@latticexyz/world/src/SystemCall.sol";
 
 import { IWorldErrors } from "@latticexyz/world/src/IWorldErrors.sol";
 import { ISystemHook } from "@latticexyz/world/src/ISystemHook.sol";
@@ -39,17 +40,13 @@ library SystemSwitch {
   function call(ResourceId systemId, bytes memory callData) internal returns (bytes memory returnData) {
     address worldAddress = WorldContextConsumerLib._world();
 
-    // If we're in the World context, call the system directly via delegatecall
+    // If we're in the World context, call via the internal library
     if (address(this) == worldAddress) {
-      (address systemAddress, ) = Systems.get(systemId);
-      // Check if the system exists
-      if (systemAddress == address(0)) revert IWorldErrors.World_ResourceNotFound(systemId, systemId.toString());
-
       bool success;
-      (success, returnData) = WorldContextProviderLib.delegatecallWithContext({
-        msgSender: WorldContextConsumerLib._msgSender(),
-        msgValue: WorldContextConsumerLib._msgValue(),
-        target: systemAddress,
+      (success, returnData) = SystemCall.call({
+        caller: WorldContextConsumerLib._msgSender(),
+        value: 0,
+        systemId: systemId,
         callData: callData
       });