@latticexyz/world-modules 2.0.0-main-711f6e2a → 2.0.0-march-19-skystrife-playtest-f0a343b1

package/src/modules/erc20-puppet/IERC20Events.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 interface IERC20Events {
   /**

package/src/modules/erc20-puppet/IERC20Mintable.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (token/ERC20/IERC20.sol)
 
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 import { IERC20 } from "./IERC20.sol";
 

package/src/modules/erc20-puppet/constants.sol

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 import { RESOURCE_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 import { RESOURCE_SYSTEM, RESOURCE_NAMESPACE } from "@latticexyz/world/src/worldResourceTypes.sol";
 
+bytes16 constant MODULE_NAME = "erc20-puppet";
 bytes14 constant MODULE_NAMESPACE = "erc20-puppet";
 ResourceId constant MODULE_NAMESPACE_ID = ResourceId.wrap(
   bytes32(abi.encodePacked(RESOURCE_NAMESPACE, MODULE_NAMESPACE))

package/src/modules/erc20-puppet/registerERC20.sol

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

package/src/modules/erc20-puppet/tables/Allowances.sol

@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 /* Autogenerated file. Do not edit manually. */
 
+// Import schema type
+import { SchemaType } from "@latticexyz/schema-type/src/solidity/SchemaType.sol";
+
 // Import store internals
 import { IStore } from "@latticexyz/store/src/IStore.sol";
 import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
@@ -11,19 +14,47 @@ import { Bytes } from "@latticexyz/store/src/Bytes.sol";
 import { Memory } from "@latticexyz/store/src/Memory.sol";
 import { SliceLib } from "@latticexyz/store/src/Slice.sol";
 import { EncodeArray } from "@latticexyz/store/src/tightcoder/EncodeArray.sol";
-import { FieldLayout } from "@latticexyz/store/src/FieldLayout.sol";
-import { Schema } from "@latticexyz/store/src/Schema.sol";
+import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.sol";
+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
+);
 
 library Allowances {
-  FieldLayout constant _fieldLayout =
-    FieldLayout.wrap(0x0020010020000000000000000000000000000000000000000000000000000000);
+  /**
+   * @notice Get the table values' field layout.
+   * @return _fieldLayout The field layout for the table.
+   */
+  function getFieldLayout() internal pure returns (FieldLayout) {
+    return _fieldLayout;
+  }
+
+  /**
+   * @notice Get the table's key schema.
+   * @return _keySchema The key schema for the table.
+   */
+  function getKeySchema() internal pure returns (Schema) {
+    SchemaType[] memory _keySchema = new SchemaType[](2);
+    _keySchema[0] = SchemaType.ADDRESS;
+    _keySchema[1] = SchemaType.ADDRESS;
+
+    return SchemaLib.encode(_keySchema);
+  }
 
-  // Hex-encoded key schema of (address, address)
-  Schema constant _keySchema = Schema.wrap(0x0028020061610000000000000000000000000000000000000000000000000000);
-  // Hex-encoded value schema of (uint256)
-  Schema constant _valueSchema = Schema.wrap(0x002001001f000000000000000000000000000000000000000000000000000000);
+  /**
+   * @notice Get the table's value schema.
+   * @return _valueSchema The value schema for the table.
+   */
+  function getValueSchema() internal pure returns (Schema) {
+    SchemaType[] memory _valueSchema = new SchemaType[](1);
+    _valueSchema[0] = SchemaType.UINT256;
+
+    return SchemaLib.encode(_valueSchema);
+  }
 
   /**
    * @notice Get the table's key field names.
@@ -48,14 +79,14 @@ library Allowances {
    * @notice Register the table with its config.
    */
   function register(ResourceId _tableId) internal {
-    StoreSwitch.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
+    StoreSwitch.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
   }
 
   /**
    * @notice Register the table with its config.
    */
   function _register(ResourceId _tableId) internal {
-    StoreCore.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
+    StoreCore.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
   }
 
   /**
@@ -184,7 +215,7 @@ library Allowances {
    * @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 dynamic (variable length) data, encoded into a sequence of bytes.
+   * @return The dyanmic (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/erc20-puppet/tables/ERC20Metadata.sol

@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 /* Autogenerated file. Do not edit manually. */
 
+// Import schema type
+import { SchemaType } from "@latticexyz/schema-type/src/solidity/SchemaType.sol";
+
 // Import store internals
 import { IStore } from "@latticexyz/store/src/IStore.sol";
 import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
@@ -11,10 +14,15 @@ import { Bytes } from "@latticexyz/store/src/Bytes.sol";
 import { Memory } from "@latticexyz/store/src/Memory.sol";
 import { SliceLib } from "@latticexyz/store/src/Slice.sol";
 import { EncodeArray } from "@latticexyz/store/src/tightcoder/EncodeArray.sol";
-import { FieldLayout } from "@latticexyz/store/src/FieldLayout.sol";
-import { Schema } from "@latticexyz/store/src/Schema.sol";
+import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.sol";
+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(
+  0x0001010201000000000000000000000000000000000000000000000000000000
+);
 
 struct ERC20MetadataData {
   uint8 decimals;
@@ -23,13 +31,36 @@ struct ERC20MetadataData {
 }
 
 library ERC20Metadata {
-  FieldLayout constant _fieldLayout =
-    FieldLayout.wrap(0x0001010201000000000000000000000000000000000000000000000000000000);
+  /**
+   * @notice Get the table values' field layout.
+   * @return _fieldLayout The field layout for the table.
+   */
+  function getFieldLayout() internal pure returns (FieldLayout) {
+    return _fieldLayout;
+  }
+
+  /**
+   * @notice Get the table's key schema.
+   * @return _keySchema The key schema for the table.
+   */
+  function getKeySchema() internal pure returns (Schema) {
+    SchemaType[] memory _keySchema = new SchemaType[](0);
+
+    return SchemaLib.encode(_keySchema);
+  }
 
-  // Hex-encoded key schema of ()
-  Schema constant _keySchema = Schema.wrap(0x0000000000000000000000000000000000000000000000000000000000000000);
-  // Hex-encoded value schema of (uint8, string, string)
-  Schema constant _valueSchema = Schema.wrap(0x0001010200c5c500000000000000000000000000000000000000000000000000);
+  /**
+   * @notice Get the table's value schema.
+   * @return _valueSchema The value schema for the table.
+   */
+  function getValueSchema() internal pure returns (Schema) {
+    SchemaType[] memory _valueSchema = new SchemaType[](3);
+    _valueSchema[0] = SchemaType.UINT8;
+    _valueSchema[1] = SchemaType.STRING;
+    _valueSchema[2] = SchemaType.STRING;
+
+    return SchemaLib.encode(_valueSchema);
+  }
 
   /**
    * @notice Get the table's key field names.
@@ -54,14 +85,14 @@ library ERC20Metadata {
    * @notice Register the table with its config.
    */
   function register(ResourceId _tableId) internal {
-    StoreSwitch.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
+    StoreSwitch.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
   }
 
   /**
    * @notice Register the table with its config.
    */
   function _register(ResourceId _tableId) internal {
-    StoreCore.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
+    StoreCore.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
   }
 
   /**
@@ -486,7 +517,7 @@ library ERC20Metadata {
    * @notice Decode the tightly packed blob of static data using this table's field layout.
    */
   function decodeStatic(bytes memory _blob) internal pure returns (uint8 decimals) {
-    decimals = (uint8(Bytes.getBytes1(_blob, 0)));
+    decimals = (uint8(Bytes.slice1(_blob, 0)));
   }
 
   /**
@@ -578,7 +609,7 @@ library ERC20Metadata {
    * @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 dynamic (variable length) data, encoded into a sequence of bytes.
+   * @return The dyanmic (variable length) data, encoded into a sequence of bytes.
    */
   function encode(
     uint8 decimals,

package/src/modules/erc20-puppet/tables/ERC20Registry.sol

@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 /* Autogenerated file. Do not edit manually. */
 
+// Import schema type
+import { SchemaType } from "@latticexyz/schema-type/src/solidity/SchemaType.sol";
+
 // Import store internals
 import { IStore } from "@latticexyz/store/src/IStore.sol";
 import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
@@ -11,22 +14,49 @@ import { Bytes } from "@latticexyz/store/src/Bytes.sol";
 import { Memory } from "@latticexyz/store/src/Memory.sol";
 import { SliceLib } from "@latticexyz/store/src/Slice.sol";
 import { EncodeArray } from "@latticexyz/store/src/tightcoder/EncodeArray.sol";
-import { FieldLayout } from "@latticexyz/store/src/FieldLayout.sol";
-import { Schema } from "@latticexyz/store/src/Schema.sol";
+import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.sol";
+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";
 
+FieldLayout constant _fieldLayout = FieldLayout.wrap(
+  0x0014010014000000000000000000000000000000000000000000000000000000
+);
+
 library ERC20Registry {
-  FieldLayout constant _fieldLayout =
-    FieldLayout.wrap(0x0014010014000000000000000000000000000000000000000000000000000000);
+  /**
+   * @notice Get the table values' field layout.
+   * @return _fieldLayout The field layout for the table.
+   */
+  function getFieldLayout() internal pure returns (FieldLayout) {
+    return _fieldLayout;
+  }
+
+  /**
+   * @notice Get the table's key schema.
+   * @return _keySchema The key schema for the table.
+   */
+  function getKeySchema() internal pure returns (Schema) {
+    SchemaType[] memory _keySchema = new SchemaType[](1);
+    _keySchema[0] = SchemaType.BYTES32;
+
+    return SchemaLib.encode(_keySchema);
+  }
 
-  // Hex-encoded key schema of (bytes32)
-  Schema constant _keySchema = Schema.wrap(0x002001005f000000000000000000000000000000000000000000000000000000);
-  // Hex-encoded value schema of (address)
-  Schema constant _valueSchema = Schema.wrap(0x0014010061000000000000000000000000000000000000000000000000000000);
+  /**
+   * @notice Get the table's value schema.
+   * @return _valueSchema The value schema for the table.
+   */
+  function getValueSchema() internal pure returns (Schema) {
+    SchemaType[] memory _valueSchema = new SchemaType[](1);
+    _valueSchema[0] = SchemaType.ADDRESS;
+
+    return SchemaLib.encode(_valueSchema);
+  }
 
   /**
    * @notice Get the table's key field names.
@@ -50,14 +80,14 @@ library ERC20Registry {
    * @notice Register the table with its config.
    */
   function register(ResourceId _tableId) internal {
-    StoreSwitch.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
+    StoreSwitch.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
   }
 
   /**
    * @notice Register the table with its config.
    */
   function _register(ResourceId _tableId) internal {
-    StoreCore.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
+    StoreCore.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
   }
 
   /**
@@ -176,7 +206,7 @@ library ERC20Registry {
    * @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 dynamic (variable length) data, encoded into a sequence of bytes.
+   * @return The dyanmic (variable length) data, encoded into a sequence of bytes.
    */
   function encode(address tokenAddress) internal pure returns (bytes memory, PackedCounter, bytes memory) {
     bytes memory _staticData = encodeStatic(tokenAddress);

package/src/modules/erc20-puppet/tables/TotalSupply.sol

@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 /* Autogenerated file. Do not edit manually. */
 
+// Import schema type
+import { SchemaType } from "@latticexyz/schema-type/src/solidity/SchemaType.sol";
+
 // Import store internals
 import { IStore } from "@latticexyz/store/src/IStore.sol";
 import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
@@ -11,19 +14,45 @@ import { Bytes } from "@latticexyz/store/src/Bytes.sol";
 import { Memory } from "@latticexyz/store/src/Memory.sol";
 import { SliceLib } from "@latticexyz/store/src/Slice.sol";
 import { EncodeArray } from "@latticexyz/store/src/tightcoder/EncodeArray.sol";
-import { FieldLayout } from "@latticexyz/store/src/FieldLayout.sol";
-import { Schema } from "@latticexyz/store/src/Schema.sol";
+import { FieldLayout, FieldLayoutLib } from "@latticexyz/store/src/FieldLayout.sol";
+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
+);
 
 library TotalSupply {
-  FieldLayout constant _fieldLayout =
-    FieldLayout.wrap(0x0020010020000000000000000000000000000000000000000000000000000000);
+  /**
+   * @notice Get the table values' field layout.
+   * @return _fieldLayout The field layout for the table.
+   */
+  function getFieldLayout() internal pure returns (FieldLayout) {
+    return _fieldLayout;
+  }
+
+  /**
+   * @notice Get the table's key schema.
+   * @return _keySchema The key schema for the table.
+   */
+  function getKeySchema() internal pure returns (Schema) {
+    SchemaType[] memory _keySchema = new SchemaType[](0);
+
+    return SchemaLib.encode(_keySchema);
+  }
 
-  // Hex-encoded key schema of ()
-  Schema constant _keySchema = Schema.wrap(0x0000000000000000000000000000000000000000000000000000000000000000);
-  // Hex-encoded value schema of (uint256)
-  Schema constant _valueSchema = Schema.wrap(0x002001001f000000000000000000000000000000000000000000000000000000);
+  /**
+   * @notice Get the table's value schema.
+   * @return _valueSchema The value schema for the table.
+   */
+  function getValueSchema() internal pure returns (Schema) {
+    SchemaType[] memory _valueSchema = new SchemaType[](1);
+    _valueSchema[0] = SchemaType.UINT256;
+
+    return SchemaLib.encode(_valueSchema);
+  }
 
   /**
    * @notice Get the table's key field names.
@@ -46,14 +75,14 @@ library TotalSupply {
    * @notice Register the table with its config.
    */
   function register(ResourceId _tableId) internal {
-    StoreSwitch.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
+    StoreSwitch.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
   }
 
   /**
    * @notice Register the table with its config.
    */
   function _register(ResourceId _tableId) internal {
-    StoreCore.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
+    StoreCore.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
   }
 
   /**
@@ -162,7 +191,7 @@ library TotalSupply {
    * @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 dynamic (variable length) data, encoded into a sequence of bytes.
+   * @return The dyanmic (variable length) data, encoded into a sequence of bytes.
    */
   function encode(uint256 totalSupply) internal pure returns (bytes memory, PackedCounter, bytes memory) {
     bytes memory _staticData = encodeStatic(totalSupply);

package/src/modules/erc20-puppet/utils.sol

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

package/src/modules/erc721-puppet/ERC721Module.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 import { ResourceIds } from "@latticexyz/store/src/codegen/tables/ResourceIds.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
@@ -7,13 +7,13 @@ import { Module } from "@latticexyz/world/src/Module.sol";
 import { WorldResourceIdLib } from "@latticexyz/world/src/WorldResourceId.sol";
 import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
 import { InstalledModules } from "@latticexyz/world/src/codegen/tables/InstalledModules.sol";
-import { revertWithBytes } from "@latticexyz/world/src/revertWithBytes.sol";
 
 import { Puppet } from "../puppet/Puppet.sol";
 import { createPuppet } from "../puppet/createPuppet.sol";
+import { MODULE_NAME as PUPPET_MODULE_NAME } from "../puppet/constants.sol";
 import { Balances } from "../tokens/tables/Balances.sol";
 
-import { MODULE_NAMESPACE, MODULE_NAMESPACE_ID, ERC721_REGISTRY_TABLE_ID } from "./constants.sol";
+import { MODULE_NAME, MODULE_NAMESPACE, MODULE_NAMESPACE_ID, ERC721_REGISTRY_TABLE_ID } from "./constants.sol";
 import { _erc721SystemId, _balancesTableId, _metadataTableId, _tokenUriTableId, _operatorApprovalTableId, _ownersTableId, _tokenApprovalTableId } from "./utils.sol";
 import { ERC721System } from "./ERC721System.sol";
 
@@ -29,24 +29,37 @@ contract ERC721Module is Module {
 
   address immutable registrationLibrary = address(new ERC721ModuleRegistrationLibrary());
 
-  function install(bytes memory encodedArgs) public {
+  function getName() public pure override returns (bytes16) {
+    return MODULE_NAME;
+  }
+
+  function _requireDependencies() internal {
+    // Require PuppetModule to be installed
+    if (InstalledModules.get(PUPPET_MODULE_NAME, keccak256(new bytes(0))) == address(0)) {
+      revert Module_MissingDependency(string(bytes.concat(PUPPET_MODULE_NAME)));
+    }
+  }
+
+  function install(bytes memory args) public {
     // Require the module to not be installed with these args yet
-    requireNotInstalled(__self, encodedArgs);
+    if (InstalledModules.get(MODULE_NAME, keccak256(args)) != address(0)) {
+      revert Module_AlreadyInstalled();
+    }
 
-    // Decode args
-    (bytes14 namespace, ERC721MetadataData memory metadata) = abi.decode(encodedArgs, (bytes14, ERC721MetadataData));
+    // Extract args
+    (bytes14 namespace, ERC721MetadataData memory metadata) = abi.decode(args, (bytes14, ERC721MetadataData));
 
     // Require the namespace to not be the module's namespace
     if (namespace == MODULE_NAMESPACE) {
       revert ERC721Module_InvalidNamespace(namespace);
     }
 
+    // Require dependencies
+    _requireDependencies();
+
     // Register the ERC721 tables and system
     IBaseWorld world = IBaseWorld(_world());
-    (bool success, bytes memory returnData) = registrationLibrary.delegatecall(
-      abi.encodeCall(ERC721ModuleRegistrationLibrary.register, (world, namespace))
-    );
-    if (!success) revertWithBytes(returnData);
+    registrationLibrary.delegatecall(abi.encodeCall(ERC721ModuleRegistrationLibrary.register, (world, namespace)));
 
     // Initialize the Metadata
     ERC721Metadata.set(_metadataTableId(namespace), metadata);
@@ -61,7 +74,6 @@ contract ERC721Module is Module {
 
     // Register the ERC721 in the ERC20Registry
     if (!ResourceIds.getExists(ERC721_REGISTRY_TABLE_ID)) {
-      world.registerNamespace(MODULE_NAMESPACE_ID);
       ERC721Registry.register(ERC721_REGISTRY_TABLE_ID);
     }
     ERC721Registry.set(ERC721_REGISTRY_TABLE_ID, namespaceId, puppet);
@@ -77,11 +89,8 @@ contract ERC721ModuleRegistrationLibrary {
    * Register systems and tables for a new ERC721 token in a given namespace
    */
   function register(IBaseWorld world, bytes14 namespace) public {
-    // Register the namespace if it doesn't exist yet
-    ResourceId tokenNamespace = WorldResourceIdLib.encodeNamespace(namespace);
-    world.registerNamespace(tokenNamespace);
-
     // Register the tables
+
     OperatorApproval.register(_operatorApprovalTableId(namespace));
     Owners.register(_ownersTableId(namespace));
     TokenApproval.register(_tokenApprovalTableId(namespace));

package/src/modules/erc721-puppet/ERC721System.sol

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

package/src/modules/erc721-puppet/IERC721.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (token/ERC721/IERC721.sol)
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 import { IERC721Events } from "./IERC721Events.sol";
 import { IERC721Errors } from "./IERC721Errors.sol";

package/src/modules/erc721-puppet/IERC721Errors.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (interfaces/draft-IERC6093.sol)
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 /**
  * @dev Standard ERC721 Errors

package/src/modules/erc721-puppet/IERC721Events.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (token/ERC721/IERC721.sol)
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 /**
  * @dev Events emitted by an ERC721 compliant contract.

package/src/modules/erc721-puppet/IERC721Metadata.sol

@@ -1,12 +1,11 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (token/ERC721/extensions/IERC721Metadata.sol)
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 import { IERC721 } from "./IERC721.sol";
 
 /**
  * @title ERC-721 Non-Fungible Token Standard, optional metadata extension
- * @author MUD (https://mud.dev) by Lattice (https://lattice.xyz)
  * @dev See https://eips.ethereum.org/EIPS/eip-721
  */
 interface IERC721Metadata is IERC721 {

package/src/modules/erc721-puppet/IERC721Mintable.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (token/ERC20/IERC20.sol)
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 import { IERC721 } from "./IERC721.sol";
 

package/src/modules/erc721-puppet/IERC721Receiver.sol

@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (token/ERC721/IERC721Receiver.sol)
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 
 /**
  * @title ERC721 token receiver interface
- * @author MUD (https://mud.dev) by Lattice (https://lattice.xyz)
  * @dev Interface for any contract that wants to support safeTransfers
  * from ERC721 asset contracts.
  */

package/src/modules/erc721-puppet/constants.sol

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: MIT
-pragma solidity >=0.8.24;
+pragma solidity >=0.8.21;
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 import { RESOURCE_TABLE } from "@latticexyz/store/src/storeResourceTypes.sol";
 import { RESOURCE_SYSTEM, RESOURCE_NAMESPACE } from "@latticexyz/world/src/worldResourceTypes.sol";
 
+bytes16 constant MODULE_NAME = "erc721-puppet";
 bytes14 constant MODULE_NAMESPACE = "erc721-puppet";
 ResourceId constant MODULE_NAMESPACE_ID = ResourceId.wrap(
   bytes32(abi.encodePacked(RESOURCE_NAMESPACE, MODULE_NAMESPACE))

package/src/modules/erc721-puppet/registerERC721.sol

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