@latticexyz/world-modules 2.0.0-transaction-context-324984c5 → 2.0.1-main-4a6b4598

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

@@ -3,9 +3,6 @@ pragma solidity >=0.8.24;
 
 /* 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";
@@ -14,15 +11,11 @@ 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, 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 { FieldLayout } from "@latticexyz/store/src/FieldLayout.sol";
+import { Schema } from "@latticexyz/store/src/Schema.sol";
+import { EncodedLengths, EncodedLengthsLib } from "@latticexyz/store/src/EncodedLengths.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 
-FieldLayout constant _fieldLayout = FieldLayout.wrap(
-  0x0001010201000000000000000000000000000000000000000000000000000000
-);
-
 struct ERC20MetadataData {
   uint8 decimals;
   string name;
@@ -30,36 +23,13 @@ struct ERC20MetadataData {
 }
 
 library ERC20Metadata {
-  /**
-   * @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);
-  }
+  FieldLayout constant _fieldLayout =
+    FieldLayout.wrap(0x0001010201000000000000000000000000000000000000000000000000000000);
 
-  /**
-   * @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);
-  }
+  // 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 key field names.
@@ -84,14 +54,14 @@ library ERC20Metadata {
    * @notice Register the table with its config.
    */
   function register(ResourceId _tableId) internal {
-    StoreSwitch.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
+    StoreSwitch.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
   }
 
   /**
    * @notice Register the table with its config.
    */
   function _register(ResourceId _tableId) internal {
-    StoreCore.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
+    StoreCore.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
   }
 
   /**
@@ -434,7 +404,7 @@ library ERC20Metadata {
   function get(ResourceId _tableId) internal view returns (ERC20MetadataData memory _table) {
     bytes32[] memory _keyTuple = new bytes32[](0);
 
-    (bytes memory _staticData, PackedCounter _encodedLengths, bytes memory _dynamicData) = StoreSwitch.getRecord(
+    (bytes memory _staticData, EncodedLengths _encodedLengths, bytes memory _dynamicData) = StoreSwitch.getRecord(
       _tableId,
       _keyTuple,
       _fieldLayout
@@ -448,7 +418,7 @@ library ERC20Metadata {
   function _get(ResourceId _tableId) internal view returns (ERC20MetadataData memory _table) {
     bytes32[] memory _keyTuple = new bytes32[](0);
 
-    (bytes memory _staticData, PackedCounter _encodedLengths, bytes memory _dynamicData) = StoreCore.getRecord(
+    (bytes memory _staticData, EncodedLengths _encodedLengths, bytes memory _dynamicData) = StoreCore.getRecord(
       _tableId,
       _keyTuple,
       _fieldLayout
@@ -462,7 +432,7 @@ library ERC20Metadata {
   function set(ResourceId _tableId, uint8 decimals, string memory name, string memory symbol) internal {
     bytes memory _staticData = encodeStatic(decimals);
 
-    PackedCounter _encodedLengths = encodeLengths(name, symbol);
+    EncodedLengths _encodedLengths = encodeLengths(name, symbol);
     bytes memory _dynamicData = encodeDynamic(name, symbol);
 
     bytes32[] memory _keyTuple = new bytes32[](0);
@@ -476,7 +446,7 @@ library ERC20Metadata {
   function _set(ResourceId _tableId, uint8 decimals, string memory name, string memory symbol) internal {
     bytes memory _staticData = encodeStatic(decimals);
 
-    PackedCounter _encodedLengths = encodeLengths(name, symbol);
+    EncodedLengths _encodedLengths = encodeLengths(name, symbol);
     bytes memory _dynamicData = encodeDynamic(name, symbol);
 
     bytes32[] memory _keyTuple = new bytes32[](0);
@@ -490,7 +460,7 @@ library ERC20Metadata {
   function set(ResourceId _tableId, ERC20MetadataData memory _table) internal {
     bytes memory _staticData = encodeStatic(_table.decimals);
 
-    PackedCounter _encodedLengths = encodeLengths(_table.name, _table.symbol);
+    EncodedLengths _encodedLengths = encodeLengths(_table.name, _table.symbol);
     bytes memory _dynamicData = encodeDynamic(_table.name, _table.symbol);
 
     bytes32[] memory _keyTuple = new bytes32[](0);
@@ -504,7 +474,7 @@ library ERC20Metadata {
   function _set(ResourceId _tableId, ERC20MetadataData memory _table) internal {
     bytes memory _staticData = encodeStatic(_table.decimals);
 
-    PackedCounter _encodedLengths = encodeLengths(_table.name, _table.symbol);
+    EncodedLengths _encodedLengths = encodeLengths(_table.name, _table.symbol);
     bytes memory _dynamicData = encodeDynamic(_table.name, _table.symbol);
 
     bytes32[] memory _keyTuple = new bytes32[](0);
@@ -516,14 +486,14 @@ 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.slice1(_blob, 0)));
+    decimals = (uint8(Bytes.getBytes1(_blob, 0)));
   }
 
   /**
    * @notice Decode the tightly packed blob of dynamic data using the encoded lengths.
    */
   function decodeDynamic(
-    PackedCounter _encodedLengths,
+    EncodedLengths _encodedLengths,
     bytes memory _blob
   ) internal pure returns (string memory name, string memory symbol) {
     uint256 _start;
@@ -548,7 +518,7 @@ library ERC20Metadata {
    */
   function decode(
     bytes memory _staticData,
-    PackedCounter _encodedLengths,
+    EncodedLengths _encodedLengths,
     bytes memory _dynamicData
   ) internal pure returns (ERC20MetadataData memory _table) {
     (_table.decimals) = decodeStatic(_staticData);
@@ -589,10 +559,10 @@ library ERC20Metadata {
   function encodeLengths(
     string memory name,
     string memory symbol
-  ) internal pure returns (PackedCounter _encodedLengths) {
+  ) internal pure returns (EncodedLengths _encodedLengths) {
     // Lengths are effectively checked during copy by 2**40 bytes exceeding gas limits
     unchecked {
-      _encodedLengths = PackedCounterLib.pack(bytes(name).length, bytes(symbol).length);
+      _encodedLengths = EncodedLengthsLib.pack(bytes(name).length, bytes(symbol).length);
     }
   }
 
@@ -614,10 +584,10 @@ library ERC20Metadata {
     uint8 decimals,
     string memory name,
     string memory symbol
-  ) internal pure returns (bytes memory, PackedCounter, bytes memory) {
+  ) internal pure returns (bytes memory, EncodedLengths, bytes memory) {
     bytes memory _staticData = encodeStatic(decimals);
 
-    PackedCounter _encodedLengths = encodeLengths(name, symbol);
+    EncodedLengths _encodedLengths = encodeLengths(name, symbol);
     bytes memory _dynamicData = encodeDynamic(name, symbol);
 
     return (_staticData, _encodedLengths, _dynamicData);

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

@@ -3,9 +3,6 @@ pragma solidity >=0.8.24;
 
 /* 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";
@@ -14,48 +11,22 @@ 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, 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 { FieldLayout } from "@latticexyz/store/src/FieldLayout.sol";
+import { Schema } from "@latticexyz/store/src/Schema.sol";
+import { EncodedLengths, EncodedLengthsLib } from "@latticexyz/store/src/EncodedLengths.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 
 // Import user types
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 
-FieldLayout constant _fieldLayout = FieldLayout.wrap(
-  0x0014010014000000000000000000000000000000000000000000000000000000
-);
-
 library ERC20Registry {
-  /**
-   * @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);
-  }
+  FieldLayout constant _fieldLayout =
+    FieldLayout.wrap(0x0014010014000000000000000000000000000000000000000000000000000000);
 
-  /**
-   * @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);
-  }
+  // 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 key field names.
@@ -79,14 +50,14 @@ library ERC20Registry {
    * @notice Register the table with its config.
    */
   function register(ResourceId _tableId) internal {
-    StoreSwitch.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
+    StoreSwitch.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
   }
 
   /**
    * @notice Register the table with its config.
    */
   function _register(ResourceId _tableId) internal {
-    StoreCore.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
+    StoreCore.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
   }
 
   /**
@@ -207,10 +178,10 @@ library ERC20Registry {
    * @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.
    */
-  function encode(address tokenAddress) internal pure returns (bytes memory, PackedCounter, bytes memory) {
+  function encode(address tokenAddress) internal pure returns (bytes memory, EncodedLengths, bytes memory) {
     bytes memory _staticData = encodeStatic(tokenAddress);
 
-    PackedCounter _encodedLengths;
+    EncodedLengths _encodedLengths;
     bytes memory _dynamicData;
 
     return (_staticData, _encodedLengths, _dynamicData);

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

@@ -3,9 +3,6 @@ pragma solidity >=0.8.24;
 
 /* 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";
@@ -14,44 +11,19 @@ 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, 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 { FieldLayout } from "@latticexyz/store/src/FieldLayout.sol";
+import { Schema } from "@latticexyz/store/src/Schema.sol";
+import { EncodedLengths, EncodedLengthsLib } from "@latticexyz/store/src/EncodedLengths.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 
-FieldLayout constant _fieldLayout = FieldLayout.wrap(
-  0x0020010020000000000000000000000000000000000000000000000000000000
-);
-
 library TotalSupply {
-  /**
-   * @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);
-  }
+  FieldLayout constant _fieldLayout =
+    FieldLayout.wrap(0x0020010020000000000000000000000000000000000000000000000000000000);
 
-  /**
-   * @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);
-  }
+  // 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 key field names.
@@ -74,14 +46,14 @@ library TotalSupply {
    * @notice Register the table with its config.
    */
   function register(ResourceId _tableId) internal {
-    StoreSwitch.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
+    StoreSwitch.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
   }
 
   /**
    * @notice Register the table with its config.
    */
   function _register(ResourceId _tableId) internal {
-    StoreCore.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
+    StoreCore.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
   }
 
   /**
@@ -192,10 +164,10 @@ library TotalSupply {
    * @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.
    */
-  function encode(uint256 totalSupply) internal pure returns (bytes memory, PackedCounter, bytes memory) {
+  function encode(uint256 totalSupply) internal pure returns (bytes memory, EncodedLengths, bytes memory) {
     bytes memory _staticData = encodeStatic(totalSupply);
 
-    PackedCounter _encodedLengths;
+    EncodedLengths _encodedLengths;
     bytes memory _dynamicData;
 
     return (_staticData, _encodedLengths, _dynamicData);

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

@@ -79,9 +79,7 @@ contract ERC721ModuleRegistrationLibrary {
   function register(IBaseWorld world, bytes14 namespace) public {
     // Register the namespace if it doesn't exist yet
     ResourceId tokenNamespace = WorldResourceIdLib.encodeNamespace(namespace);
-    if (!ResourceIds.getExists(tokenNamespace)) {
-      world.registerNamespace(tokenNamespace);
-    }
+    world.registerNamespace(tokenNamespace);
 
     // Register the tables
     OperatorApproval.register(_operatorApprovalTableId(namespace));

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

@@ -6,6 +6,7 @@ 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/IERC721Receiver.sol

@@ -4,6 +4,7 @@ pragma solidity >=0.8.24;
 
 /**
  * @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/tables/ERC721Metadata.sol

@@ -3,9 +3,6 @@ pragma solidity >=0.8.24;
 
 /* 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";
@@ -14,15 +11,11 @@ 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, 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 { FieldLayout } from "@latticexyz/store/src/FieldLayout.sol";
+import { Schema } from "@latticexyz/store/src/Schema.sol";
+import { EncodedLengths, EncodedLengthsLib } from "@latticexyz/store/src/EncodedLengths.sol";
 import { ResourceId } from "@latticexyz/store/src/ResourceId.sol";
 
-FieldLayout constant _fieldLayout = FieldLayout.wrap(
-  0x0000000300000000000000000000000000000000000000000000000000000000
-);
-
 struct ERC721MetadataData {
   string name;
   string symbol;
@@ -30,36 +23,13 @@ struct ERC721MetadataData {
 }
 
 library ERC721Metadata {
-  /**
-   * @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);
-  }
+  FieldLayout constant _fieldLayout =
+    FieldLayout.wrap(0x0000000300000000000000000000000000000000000000000000000000000000);
 
-  /**
-   * @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.STRING;
-    _valueSchema[1] = SchemaType.STRING;
-    _valueSchema[2] = SchemaType.STRING;
-
-    return SchemaLib.encode(_valueSchema);
-  }
+  // Hex-encoded key schema of ()
+  Schema constant _keySchema = Schema.wrap(0x0000000000000000000000000000000000000000000000000000000000000000);
+  // Hex-encoded value schema of (string, string, string)
+  Schema constant _valueSchema = Schema.wrap(0x00000003c5c5c500000000000000000000000000000000000000000000000000);
 
   /**
    * @notice Get the table's key field names.
@@ -84,14 +54,14 @@ library ERC721Metadata {
    * @notice Register the table with its config.
    */
   function register(ResourceId _tableId) internal {
-    StoreSwitch.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
+    StoreSwitch.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
   }
 
   /**
    * @notice Register the table with its config.
    */
   function _register(ResourceId _tableId) internal {
-    StoreCore.registerTable(_tableId, _fieldLayout, getKeySchema(), getValueSchema(), getKeyNames(), getFieldNames());
+    StoreCore.registerTable(_tableId, _fieldLayout, _keySchema, _valueSchema, getKeyNames(), getFieldNames());
   }
 
   /**
@@ -544,7 +514,7 @@ library ERC721Metadata {
   function get(ResourceId _tableId) internal view returns (ERC721MetadataData memory _table) {
     bytes32[] memory _keyTuple = new bytes32[](0);
 
-    (bytes memory _staticData, PackedCounter _encodedLengths, bytes memory _dynamicData) = StoreSwitch.getRecord(
+    (bytes memory _staticData, EncodedLengths _encodedLengths, bytes memory _dynamicData) = StoreSwitch.getRecord(
       _tableId,
       _keyTuple,
       _fieldLayout
@@ -558,7 +528,7 @@ library ERC721Metadata {
   function _get(ResourceId _tableId) internal view returns (ERC721MetadataData memory _table) {
     bytes32[] memory _keyTuple = new bytes32[](0);
 
-    (bytes memory _staticData, PackedCounter _encodedLengths, bytes memory _dynamicData) = StoreCore.getRecord(
+    (bytes memory _staticData, EncodedLengths _encodedLengths, bytes memory _dynamicData) = StoreCore.getRecord(
       _tableId,
       _keyTuple,
       _fieldLayout
@@ -571,7 +541,7 @@ library ERC721Metadata {
    */
   function set(ResourceId _tableId, string memory name, string memory symbol, string memory baseURI) internal {
     bytes memory _staticData;
-    PackedCounter _encodedLengths = encodeLengths(name, symbol, baseURI);
+    EncodedLengths _encodedLengths = encodeLengths(name, symbol, baseURI);
     bytes memory _dynamicData = encodeDynamic(name, symbol, baseURI);
 
     bytes32[] memory _keyTuple = new bytes32[](0);
@@ -584,7 +554,7 @@ library ERC721Metadata {
    */
   function _set(ResourceId _tableId, string memory name, string memory symbol, string memory baseURI) internal {
     bytes memory _staticData;
-    PackedCounter _encodedLengths = encodeLengths(name, symbol, baseURI);
+    EncodedLengths _encodedLengths = encodeLengths(name, symbol, baseURI);
     bytes memory _dynamicData = encodeDynamic(name, symbol, baseURI);
 
     bytes32[] memory _keyTuple = new bytes32[](0);
@@ -597,7 +567,7 @@ library ERC721Metadata {
    */
   function set(ResourceId _tableId, ERC721MetadataData memory _table) internal {
     bytes memory _staticData;
-    PackedCounter _encodedLengths = encodeLengths(_table.name, _table.symbol, _table.baseURI);
+    EncodedLengths _encodedLengths = encodeLengths(_table.name, _table.symbol, _table.baseURI);
     bytes memory _dynamicData = encodeDynamic(_table.name, _table.symbol, _table.baseURI);
 
     bytes32[] memory _keyTuple = new bytes32[](0);
@@ -610,7 +580,7 @@ library ERC721Metadata {
    */
   function _set(ResourceId _tableId, ERC721MetadataData memory _table) internal {
     bytes memory _staticData;
-    PackedCounter _encodedLengths = encodeLengths(_table.name, _table.symbol, _table.baseURI);
+    EncodedLengths _encodedLengths = encodeLengths(_table.name, _table.symbol, _table.baseURI);
     bytes memory _dynamicData = encodeDynamic(_table.name, _table.symbol, _table.baseURI);
 
     bytes32[] memory _keyTuple = new bytes32[](0);
@@ -622,7 +592,7 @@ library ERC721Metadata {
    * @notice Decode the tightly packed blob of dynamic data using the encoded lengths.
    */
   function decodeDynamic(
-    PackedCounter _encodedLengths,
+    EncodedLengths _encodedLengths,
     bytes memory _blob
   ) internal pure returns (string memory name, string memory symbol, string memory baseURI) {
     uint256 _start;
@@ -653,7 +623,7 @@ library ERC721Metadata {
    */
   function decode(
     bytes memory,
-    PackedCounter _encodedLengths,
+    EncodedLengths _encodedLengths,
     bytes memory _dynamicData
   ) internal pure returns (ERC721MetadataData memory _table) {
     (_table.name, _table.symbol, _table.baseURI) = decodeDynamic(_encodedLengths, _dynamicData);
@@ -685,10 +655,10 @@ library ERC721Metadata {
     string memory name,
     string memory symbol,
     string memory baseURI
-  ) internal pure returns (PackedCounter _encodedLengths) {
+  ) internal pure returns (EncodedLengths _encodedLengths) {
     // Lengths are effectively checked during copy by 2**40 bytes exceeding gas limits
     unchecked {
-      _encodedLengths = PackedCounterLib.pack(bytes(name).length, bytes(symbol).length, bytes(baseURI).length);
+      _encodedLengths = EncodedLengthsLib.pack(bytes(name).length, bytes(symbol).length, bytes(baseURI).length);
     }
   }
 
@@ -714,9 +684,9 @@ library ERC721Metadata {
     string memory name,
     string memory symbol,
     string memory baseURI
-  ) internal pure returns (bytes memory, PackedCounter, bytes memory) {
+  ) internal pure returns (bytes memory, EncodedLengths, bytes memory) {
     bytes memory _staticData;
-    PackedCounter _encodedLengths = encodeLengths(name, symbol, baseURI);
+    EncodedLengths _encodedLengths = encodeLengths(name, symbol, baseURI);
     bytes memory _dynamicData = encodeDynamic(name, symbol, baseURI);
 
     return (_staticData, _encodedLengths, _dynamicData);