@latticexyz/world-modules 2.0.0-main-251170e1 → 2.0.0-main-c07fa021

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/world-modules",
-  "version": "2.0.0-main-251170e1",
+  "version": "2.0.0-main-c07fa021",
   "description": "World modules",
   "repository": {
     "type": "git",
@@ -15,11 +15,11 @@
   },
   "dependencies": {
     "zod": "^3.21.4",
-    "@latticexyz/common": "2.0.0-main-251170e1",
-    "@latticexyz/config": "2.0.0-main-251170e1",
-    "@latticexyz/schema-type": "2.0.0-main-251170e1",
-    "@latticexyz/store": "2.0.0-main-251170e1",
-    "@latticexyz/world": "2.0.0-main-251170e1"
+    "@latticexyz/common": "2.0.0-main-c07fa021",
+    "@latticexyz/config": "2.0.0-main-c07fa021",
+    "@latticexyz/schema-type": "2.0.0-main-c07fa021",
+    "@latticexyz/store": "2.0.0-main-c07fa021",
+    "@latticexyz/world": "2.0.0-main-c07fa021"
   },
   "devDependencies": {
     "@types/ejs": "^3.1.1",
@@ -34,8 +34,8 @@
     "tsup": "^6.7.0",
     "tsx": "^3.12.6",
     "vitest": "0.31.4",
-    "@latticexyz/abi-ts": "2.0.0-main-251170e1",
-    "@latticexyz/gas-report": "2.0.0-main-251170e1"
+    "@latticexyz/abi-ts": "2.0.0-main-c07fa021",
+    "@latticexyz/gas-report": "2.0.0-main-c07fa021"
   },
   "publishConfig": {
     "access": "public"

package/src/interfaces/IBaseWorld.sol

@@ -6,12 +6,10 @@ pragma solidity >=0.8.21;
 import { IStore } from "@latticexyz/store/src/IStore.sol";
 import { IWorldKernel } from "@latticexyz/world/src/interfaces/IWorldKernel.sol";
 
-import { IUniqueEntitySystem } from "./IUniqueEntitySystem.sol";
-
 /**
  * The IBaseWorld interface includes all systems dynamically added to the World
  * during the deploy process.
  */
-interface IBaseWorld is IStore, IWorldKernel, IUniqueEntitySystem {
+interface IBaseWorld is IStore, IWorldKernel {
 
 }

package/src/interfaces/IUniqueEntitySystem.sol

@@ -1,8 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.21;
 
-/* Autogenerated file. Do not edit manually. */
-
+// TODO allow overriding namespace per-system (or a separate config for modules?)
 interface IUniqueEntitySystem {
-  function getUniqueEntity() external returns (bytes32);
+  function uniqueEntity_system_getUniqueEntity() external returns (bytes32 uniqueEntity);
 }

package/src/modules/keysintable/KeysInTableModule.sol

@@ -6,7 +6,7 @@ import { ResourceIds } from "@latticexyz/store/src/codegen/tables/ResourceIds.so
 
 import { Module } from "@latticexyz/world/src/Module.sol";
 
-import { IBaseWorld } from "@latticexyz/world/src/interfaces/IBaseWorld.sol";
+import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
 
 import { ResourceId, WorldResourceIdInstance } from "@latticexyz/world/src/WorldResourceId.sol";
 import { revertWithBytes } from "@latticexyz/world/src/revertWithBytes.sol";

package/src/modules/keyswithvalue/KeysWithValueHook.sol

@@ -7,7 +7,7 @@ import { FieldLayout } from "@latticexyz/store/src/FieldLayout.sol";
 import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
 import { PackedCounter } from "@latticexyz/store/src/PackedCounter.sol";
 import { Tables } from "@latticexyz/store/src/codegen/tables/Tables.sol";
-import { IBaseWorld } from "@latticexyz/world/src/interfaces/IBaseWorld.sol";
+import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
 
 import { ResourceId, WorldResourceIdInstance } from "@latticexyz/world/src/WorldResourceId.sol";
 

package/src/modules/keyswithvalue/KeysWithValueModule.sol

@@ -4,7 +4,7 @@ import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
 import { BEFORE_SET_RECORD, BEFORE_SPLICE_STATIC_DATA, AFTER_SPLICE_STATIC_DATA, BEFORE_SPLICE_DYNAMIC_DATA, AFTER_SPLICE_DYNAMIC_DATA, BEFORE_DELETE_RECORD } from "@latticexyz/store/src/storeHookTypes.sol";
 import { Module } from "@latticexyz/world/src/Module.sol";
 
-import { IBaseWorld } from "@latticexyz/world/src/interfaces/IBaseWorld.sol";
+import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
 
 import { WorldContextConsumer } from "@latticexyz/world/src/WorldContext.sol";
 import { ResourceId, WorldResourceIdInstance } from "@latticexyz/world/src/WorldResourceId.sol";

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

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.21;
 
-import { IBaseWorld } from "@latticexyz/world/src/interfaces/IBaseWorld.sol";
+import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
 
 import { Module } from "@latticexyz/world/src/Module.sol";
 import { WorldContextConsumer } from "@latticexyz/world/src/WorldContext.sol";

package/src/modules/uniqueentity/UniqueEntityModule.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.21;
 
-import { IBaseWorld } from "@latticexyz/world/src/interfaces/IBaseWorld.sol";
+import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
 
 import { Module } from "@latticexyz/world/src/Module.sol";
 import { WorldContextConsumer } from "@latticexyz/world/src/WorldContext.sol";

package/src/modules/uniqueentity/getUniqueEntity.sol

@@ -2,9 +2,9 @@
 pragma solidity >=0.8.21;
 
 import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
+import { IBaseWorld } from "@latticexyz/world/src/codegen/interfaces/IBaseWorld.sol";
 
-import { IBaseWorld } from "@latticexyz/world/src/interfaces/IBaseWorld.sol";
-import { IUniqueEntitySystem } from "@latticexyz/world/src/interfaces/IUniqueEntitySystem.sol";
+import { IUniqueEntitySystem } from "../../interfaces/IUniqueEntitySystem.sol";
 
 /**
  * Increment and get an entity nonce.

package/out/interfaces/IUniqueEntitySystem.sol/IUniqueEntitySystem.abi.json

@@ -1,15 +0,0 @@
-[
-  {
-    "inputs": [],
-    "name": "uniqueEntity_system_getUniqueEntity",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "uniqueEntity",
-        "type": "bytes32"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]

package/out/interfaces/IUniqueEntitySystem.sol/IUniqueEntitySystem.abi.json.d.ts

@@ -1,16 +0,0 @@
-declare const abi: [
-  {
-    inputs: [];
-    name: "uniqueEntity_system_getUniqueEntity";
-    outputs: [
-      {
-        internalType: "bytes32";
-        name: "uniqueEntity";
-        type: "bytes32";
-      }
-    ];
-    stateMutability: "nonpayable";
-    type: "function";
-  }
-];
-export default abi;

package/out/interfaces/IUniqueEntitySystem.sol/IUniqueEntitySystem.json

@@ -1,197 +0,0 @@
-{
-  "abi": [
-    {
-      "inputs": [],
-      "name": "uniqueEntity_system_getUniqueEntity",
-      "outputs": [
-        {
-          "internalType": "bytes32",
-          "name": "uniqueEntity",
-          "type": "bytes32"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    }
-  ],
-  "bytecode": {
-    "object": "0x",
-    "sourceMap": "",
-    "linkReferences": {}
-  },
-  "deployedBytecode": {
-    "object": "0x",
-    "sourceMap": "",
-    "linkReferences": {}
-  },
-  "methodIdentifiers": {
-    "uniqueEntity_system_getUniqueEntity()": "8459353e"
-  },
-  "rawMetadata": "{\"compiler\":{\"version\":\"0.8.21+commit.d9974bed\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"name\":\"uniqueEntity_system_getUniqueEntity\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"uniqueEntity\",\"type\":\"bytes32\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"node_modules/@latticexyz/world/src/interfaces/IUniqueEntitySystem.sol\":\"IUniqueEntitySystem\"},\"evmVersion\":\"paris\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"none\"},\"optimizer\":{\"enabled\":true,\"runs\":3000},\"remappings\":[\":@latticexyz/=node_modules/@latticexyz/\",\":ds-test/=node_modules/ds-test/src/\",\":forge-std/=node_modules/forge-std/src/\"]},\"sources\":{\"node_modules/@latticexyz/world/src/interfaces/IUniqueEntitySystem.sol\":{\"keccak256\":\"0x522fec5a5d0005c6902235f49e9c59570c158ff470472d91afb81c8934d1f8b9\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://c65e929a0196d5333f3642a62c21334df295fbdac98660e4ace31ad9d2a22cea\",\"dweb:/ipfs/QmeLXDZrnMQKaBF6nALVsV6HyutugrsCQaqch64YnZ69ya\"]}},\"version\":1}",
-  "metadata": {
-    "compiler": {
-      "version": "0.8.21+commit.d9974bed"
-    },
-    "language": "Solidity",
-    "output": {
-      "abi": [
-        {
-          "inputs": [],
-          "stateMutability": "nonpayable",
-          "type": "function",
-          "name": "uniqueEntity_system_getUniqueEntity",
-          "outputs": [
-            {
-              "internalType": "bytes32",
-              "name": "uniqueEntity",
-              "type": "bytes32"
-            }
-          ]
-        }
-      ],
-      "devdoc": {
-        "kind": "dev",
-        "methods": {},
-        "version": 1
-      },
-      "userdoc": {
-        "kind": "user",
-        "methods": {},
-        "version": 1
-      }
-    },
-    "settings": {
-      "remappings": [
-        "@latticexyz/=node_modules/@latticexyz/",
-        "ds-test/=node_modules/ds-test/src/",
-        "forge-std/=node_modules/forge-std/src/"
-      ],
-      "optimizer": {
-        "enabled": true,
-        "runs": 3000
-      },
-      "metadata": {
-        "bytecodeHash": "none"
-      },
-      "compilationTarget": {
-        "node_modules/@latticexyz/world/src/interfaces/IUniqueEntitySystem.sol": "IUniqueEntitySystem"
-      },
-      "libraries": {}
-    },
-    "sources": {
-      "node_modules/@latticexyz/world/src/interfaces/IUniqueEntitySystem.sol": {
-        "keccak256": "0x522fec5a5d0005c6902235f49e9c59570c158ff470472d91afb81c8934d1f8b9",
-        "urls": [
-          "bzz-raw://c65e929a0196d5333f3642a62c21334df295fbdac98660e4ace31ad9d2a22cea",
-          "dweb:/ipfs/QmeLXDZrnMQKaBF6nALVsV6HyutugrsCQaqch64YnZ69ya"
-        ],
-        "license": "MIT"
-      }
-    },
-    "version": 1
-  },
-  "ast": {
-    "absolutePath": "node_modules/@latticexyz/world/src/interfaces/IUniqueEntitySystem.sol",
-    "id": 49298,
-    "exportedSymbols": {
-      "IUniqueEntitySystem": [
-        49297
-      ]
-    },
-    "nodeType": "SourceUnit",
-    "src": "32:233:103",
-    "nodes": [
-      {
-        "id": 49291,
-        "nodeType": "PragmaDirective",
-        "src": "32:25:103",
-        "nodes": [],
-        "literals": [
-          "solidity",
-          ">=",
-          "0.8",
-          ".21"
-        ]
-      },
-      {
-        "id": 49297,
-        "nodeType": "ContractDefinition",
-        "src": "141:123:103",
-        "nodes": [
-          {
-            "id": 49296,
-            "nodeType": "FunctionDefinition",
-            "src": "175:87:103",
-            "nodes": [],
-            "functionSelector": "8459353e",
-            "implemented": false,
-            "kind": "function",
-            "modifiers": [],
-            "name": "uniqueEntity_system_getUniqueEntity",
-            "nameLocation": "184:35:103",
-            "parameters": {
-              "id": 49292,
-              "nodeType": "ParameterList",
-              "parameters": [],
-              "src": "219:2:103"
-            },
-            "returnParameters": {
-              "id": 49295,
-              "nodeType": "ParameterList",
-              "parameters": [
-                {
-                  "constant": false,
-                  "id": 49294,
-                  "mutability": "mutable",
-                  "name": "uniqueEntity",
-                  "nameLocation": "248:12:103",
-                  "nodeType": "VariableDeclaration",
-                  "scope": 49296,
-                  "src": "240:20:103",
-                  "stateVariable": false,
-                  "storageLocation": "default",
-                  "typeDescriptions": {
-                    "typeIdentifier": "t_bytes32",
-                    "typeString": "bytes32"
-                  },
-                  "typeName": {
-                    "id": 49293,
-                    "name": "bytes32",
-                    "nodeType": "ElementaryTypeName",
-                    "src": "240:7:103",
-                    "typeDescriptions": {
-                      "typeIdentifier": "t_bytes32",
-                      "typeString": "bytes32"
-                    }
-                  },
-                  "visibility": "internal"
-                }
-              ],
-              "src": "239:22:103"
-            },
-            "scope": 49297,
-            "stateMutability": "nonpayable",
-            "virtual": false,
-            "visibility": "external"
-          }
-        ],
-        "abstract": false,
-        "baseContracts": [],
-        "canonicalName": "IUniqueEntitySystem",
-        "contractDependencies": [],
-        "contractKind": "interface",
-        "fullyImplemented": false,
-        "linearizedBaseContracts": [
-          49297
-        ],
-        "name": "IUniqueEntitySystem",
-        "nameLocation": "151:19:103",
-        "scope": 49298,
-        "usedErrors": [],
-        "usedEvents": []
-      }
-    ],
-    "license": "MIT"
-  },
-  "id": 103
-}