@latticexyz/schema-type 2.0.0-main-8d51a034 → 2.0.0-main-db19ea39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/schema-type",
-  "version": "2.0.0-main-8d51a034",
+  "version": "2.0.0-main-db19ea39",
   "description": "SchemaType enum for various languages",
   "repository": {
     "type": "git",
@@ -32,7 +32,8 @@
     "forge-std": "https://github.com/foundry-rs/forge-std.git#b4f121555729b3afb3c5ffccb62ff4b6e2818fd3",
     "rimraf": "^3.0.2",
     "tsup": "^6.7.0",
-    "vitest": "0.31.4"
+    "vitest": "0.31.4",
+    "@latticexyz/gas-report": "2.0.0-main-db19ea39"
   },
   "gitHead": "914a1e0ae4a573d685841ca2ea921435057deb8f",
   "scripts": {
@@ -41,6 +42,7 @@
     "clean": "pnpm run clean:js",
     "clean:js": "rimraf dist/typescript",
     "dev": "tsup --watch",
+    "gas-report": "mud-gas-report --save gas-report.json",
     "test": "vitest typecheck --run && vitest --run && forge test"
   }
 }

package/src/solidity/SchemaType.sol

@@ -214,24 +214,17 @@ enum SchemaType {
 function getStaticByteLength(SchemaType schemaType) pure returns (uint256) {
   uint256 index = uint8(schemaType);
 
-  if (index < 32) {
-    // uint8-256
-    return index + 1;
-  } else if (index < 64) {
-    // int8-256, offset by 32
-    return index + 1 - 32;
-  } else if (index < 96) {
-    // bytes1-32, offset by 64
-    return index + 1 - 64;
-  }
-
-  // Other static types
-  if (schemaType == SchemaType.BOOL) {
-    return 1;
+  if (index < 97) {
+    // SchemaType enum elements are cyclically ordered for optimal static length lookup
+    // indexes: 00-31, 32-63, 64-95, 96, 97, ...
+    // lengths: 01-32, 01-32, 01-32, 01, 20, (the rest are 0s)
+    unchecked {
+      return (index & 31) + 1;
+    }
   } else if (schemaType == SchemaType.ADDRESS) {
     return 20;
+  } else {
+    // Return 0 for all dynamic types
+    return 0;
   }
-
-  // Return 0 for all dynamic types
-  return 0;
 }