@latticexyz/world-modules 2.0.0-main-c714e5d1 → 2.0.0-main-94d7f1ee

package/out/worldResourceTypes.sol/worldResourceTypes.json

@@ -10,40 +10,40 @@
   },
   "ast": {
     "absolutePath": "/home/runner/work/mud/mud/packages/world/src/worldResourceTypes.sol",
-    "id": 24422,
+    "id": 26741,
     "exportedSymbols": {
       "MASK_RESOURCE_MODULE": [
-        24415
+        26734
       ],
       "MASK_RESOURCE_NAMESPACE": [
-        24409
+        26728
       ],
       "MASK_RESOURCE_SYSTEM": [
-        24421
+        26740
       ],
       "RESOURCE_MODULE": [
-        24400
+        26719
       ],
       "RESOURCE_NAMESPACE": [
-        24397
+        26716
       ],
       "RESOURCE_OFFCHAIN_TABLE": [
-        36670
+        39186
       ],
       "RESOURCE_SYSTEM": [
-        24403
+        26722
       ],
       "RESOURCE_TABLE": [
-        36666
+        39182
       ]
     },
     "nodeType": "SourceUnit",
-    "src": "32:1200:51",
+    "src": "32:1200:53",
     "nodes": [
       {
-        "id": 24390,
+        "id": 26709,
         "nodeType": "PragmaDirective",
-        "src": "32:25:51",
+        "src": "32:25:53",
         "nodes": [],
         "literals": [
           "solidity",
@@ -53,36 +53,36 @@
         ]
       },
       {
-        "id": 24393,
+        "id": 26712,
         "nodeType": "ImportDirective",
-        "src": "59:103:51",
+        "src": "59:103:53",
         "nodes": [],
         "absolutePath": "node_modules/@latticexyz/store/src/storeResourceTypes.sol",
         "file": "@latticexyz/store/src/storeResourceTypes.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 24422,
-        "sourceUnit": 36671,
+        "scope": 26741,
+        "sourceUnit": 39187,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 24391,
+              "id": 26710,
               "name": "RESOURCE_TABLE",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 36666,
-              "src": "68:14:51",
+              "referencedDeclaration": 39182,
+              "src": "68:14:53",
               "typeDescriptions": {}
             },
             "nameLocation": "-1:-1:-1"
           },
           {
             "foreign": {
-              "id": 24392,
+              "id": 26711,
               "name": "RESOURCE_OFFCHAIN_TABLE",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 36670,
-              "src": "84:23:51",
+              "referencedDeclaration": 39186,
+              "src": "84:23:53",
               "typeDescriptions": {}
             },
             "nameLocation": "-1:-1:-1"
@@ -91,15 +91,15 @@
         "unitAlias": ""
       },
       {
-        "id": 24397,
+        "id": 26716,
         "nodeType": "VariableDeclaration",
-        "src": "541:41:51",
+        "src": "541:41:53",
         "nodes": [],
         "constant": true,
         "mutability": "constant",
         "name": "RESOURCE_NAMESPACE",
-        "nameLocation": "557:18:51",
-        "scope": 24422,
+        "nameLocation": "557:18:53",
+        "scope": 26741,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -107,10 +107,10 @@
           "typeString": "bytes2"
         },
         "typeName": {
-          "id": 24395,
+          "id": 26714,
           "name": "bytes2",
           "nodeType": "ElementaryTypeName",
-          "src": "541:6:51",
+          "src": "541:6:53",
           "typeDescriptions": {
             "typeIdentifier": "t_bytes2",
             "typeString": "bytes2"
@@ -118,14 +118,14 @@
         },
         "value": {
           "hexValue": "6e73",
-          "id": 24396,
+          "id": 26715,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
           "kind": "string",
           "lValueRequested": false,
           "nodeType": "Literal",
-          "src": "578:4:51",
+          "src": "578:4:53",
           "typeDescriptions": {
             "typeIdentifier": "t_stringliteral_a2988854b91401f98206dff94028e22dce27feb5fbfdc2843bbe299db9660d49",
             "typeString": "literal_string \"ns\""
@@ -135,15 +135,15 @@
         "visibility": "internal"
       },
       {
-        "id": 24400,
+        "id": 26719,
         "nodeType": "VariableDeclaration",
-        "src": "806:38:51",
+        "src": "806:38:53",
         "nodes": [],
         "constant": true,
         "mutability": "constant",
         "name": "RESOURCE_MODULE",
-        "nameLocation": "822:15:51",
-        "scope": 24422,
+        "nameLocation": "822:15:53",
+        "scope": 26741,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -151,10 +151,10 @@
           "typeString": "bytes2"
         },
         "typeName": {
-          "id": 24398,
+          "id": 26717,
           "name": "bytes2",
           "nodeType": "ElementaryTypeName",
-          "src": "806:6:51",
+          "src": "806:6:53",
           "typeDescriptions": {
             "typeIdentifier": "t_bytes2",
             "typeString": "bytes2"
@@ -162,14 +162,14 @@
         },
         "value": {
           "hexValue": "6d64",
-          "id": 24399,
+          "id": 26718,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
           "kind": "string",
           "lValueRequested": false,
           "nodeType": "Literal",
-          "src": "840:4:51",
+          "src": "840:4:53",
           "typeDescriptions": {
             "typeIdentifier": "t_stringliteral_1804a342ec28d0404df931f0fdb61c4c892bdd286e963437dcbd8dd87399412c",
             "typeString": "literal_string \"md\""
@@ -179,15 +179,15 @@
         "visibility": "internal"
       },
       {
-        "id": 24403,
+        "id": 26722,
         "nodeType": "VariableDeclaration",
-        "src": "929:38:51",
+        "src": "929:38:53",
         "nodes": [],
         "constant": true,
         "mutability": "constant",
         "name": "RESOURCE_SYSTEM",
-        "nameLocation": "945:15:51",
-        "scope": 24422,
+        "nameLocation": "945:15:53",
+        "scope": 26741,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -195,10 +195,10 @@
           "typeString": "bytes2"
         },
         "typeName": {
-          "id": 24401,
+          "id": 26720,
           "name": "bytes2",
           "nodeType": "ElementaryTypeName",
-          "src": "929:6:51",
+          "src": "929:6:53",
           "typeDescriptions": {
             "typeIdentifier": "t_bytes2",
             "typeString": "bytes2"
@@ -206,14 +206,14 @@
         },
         "value": {
           "hexValue": "7379",
-          "id": 24402,
+          "id": 26721,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
           "kind": "string",
           "lValueRequested": false,
           "nodeType": "Literal",
-          "src": "963:4:51",
+          "src": "963:4:53",
           "typeDescriptions": {
             "typeIdentifier": "t_stringliteral_4ba644d4d5fba50020e3397332b128744e5de794270f776b66b08f8fbb5d0357",
             "typeString": "literal_string \"sy\""
@@ -223,15 +223,15 @@
         "visibility": "internal"
       },
       {
-        "id": 24409,
+        "id": 26728,
         "nodeType": "VariableDeclaration",
-        "src": "1028:70:51",
+        "src": "1028:70:53",
         "nodes": [],
         "constant": true,
         "mutability": "constant",
         "name": "MASK_RESOURCE_NAMESPACE",
-        "nameLocation": "1045:23:51",
-        "scope": 24422,
+        "nameLocation": "1045:23:53",
+        "scope": 26741,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -239,10 +239,10 @@
           "typeString": "bytes32"
         },
         "typeName": {
-          "id": 24404,
+          "id": 26723,
           "name": "bytes32",
           "nodeType": "ElementaryTypeName",
-          "src": "1028:7:51",
+          "src": "1028:7:53",
           "typeDescriptions": {
             "typeIdentifier": "t_bytes32",
             "typeString": "bytes32"
@@ -251,12 +251,12 @@
         "value": {
           "arguments": [
             {
-              "id": 24407,
+              "id": 26726,
               "name": "RESOURCE_NAMESPACE",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 24397,
-              "src": "1079:18:51",
+              "referencedDeclaration": 26716,
+              "src": "1079:18:53",
               "typeDescriptions": {
                 "typeIdentifier": "t_bytes2",
                 "typeString": "bytes2"
@@ -270,26 +270,26 @@
                 "typeString": "bytes2"
               }
             ],
-            "id": 24406,
+            "id": 26725,
             "isConstant": false,
             "isLValue": false,
             "isPure": true,
             "lValueRequested": false,
             "nodeType": "ElementaryTypeNameExpression",
-            "src": "1071:7:51",
+            "src": "1071:7:53",
             "typeDescriptions": {
               "typeIdentifier": "t_type$_t_bytes32_$",
               "typeString": "type(bytes32)"
             },
             "typeName": {
-              "id": 24405,
+              "id": 26724,
               "name": "bytes32",
               "nodeType": "ElementaryTypeName",
-              "src": "1071:7:51",
+              "src": "1071:7:53",
               "typeDescriptions": {}
             }
           },
-          "id": 24408,
+          "id": 26727,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
@@ -298,7 +298,7 @@
           "nameLocations": [],
           "names": [],
           "nodeType": "FunctionCall",
-          "src": "1071:27:51",
+          "src": "1071:27:53",
           "tryCall": false,
           "typeDescriptions": {
             "typeIdentifier": "t_bytes32",
@@ -308,15 +308,15 @@
         "visibility": "internal"
       },
       {
-        "id": 24415,
+        "id": 26734,
         "nodeType": "VariableDeclaration",
-        "src": "1100:64:51",
+        "src": "1100:64:53",
         "nodes": [],
         "constant": true,
         "mutability": "constant",
         "name": "MASK_RESOURCE_MODULE",
-        "nameLocation": "1117:20:51",
-        "scope": 24422,
+        "nameLocation": "1117:20:53",
+        "scope": 26741,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -324,10 +324,10 @@
           "typeString": "bytes32"
         },
         "typeName": {
-          "id": 24410,
+          "id": 26729,
           "name": "bytes32",
           "nodeType": "ElementaryTypeName",
-          "src": "1100:7:51",
+          "src": "1100:7:53",
           "typeDescriptions": {
             "typeIdentifier": "t_bytes32",
             "typeString": "bytes32"
@@ -336,12 +336,12 @@
         "value": {
           "arguments": [
             {
-              "id": 24413,
+              "id": 26732,
               "name": "RESOURCE_MODULE",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 24400,
-              "src": "1148:15:51",
+              "referencedDeclaration": 26719,
+              "src": "1148:15:53",
               "typeDescriptions": {
                 "typeIdentifier": "t_bytes2",
                 "typeString": "bytes2"
@@ -355,26 +355,26 @@
                 "typeString": "bytes2"
               }
             ],
-            "id": 24412,
+            "id": 26731,
             "isConstant": false,
             "isLValue": false,
             "isPure": true,
             "lValueRequested": false,
             "nodeType": "ElementaryTypeNameExpression",
-            "src": "1140:7:51",
+            "src": "1140:7:53",
             "typeDescriptions": {
               "typeIdentifier": "t_type$_t_bytes32_$",
               "typeString": "type(bytes32)"
             },
             "typeName": {
-              "id": 24411,
+              "id": 26730,
               "name": "bytes32",
               "nodeType": "ElementaryTypeName",
-              "src": "1140:7:51",
+              "src": "1140:7:53",
               "typeDescriptions": {}
             }
           },
-          "id": 24414,
+          "id": 26733,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
@@ -383,7 +383,7 @@
           "nameLocations": [],
           "names": [],
           "nodeType": "FunctionCall",
-          "src": "1140:24:51",
+          "src": "1140:24:53",
           "tryCall": false,
           "typeDescriptions": {
             "typeIdentifier": "t_bytes32",
@@ -393,15 +393,15 @@
         "visibility": "internal"
       },
       {
-        "id": 24421,
+        "id": 26740,
         "nodeType": "VariableDeclaration",
-        "src": "1166:64:51",
+        "src": "1166:64:53",
         "nodes": [],
         "constant": true,
         "mutability": "constant",
         "name": "MASK_RESOURCE_SYSTEM",
-        "nameLocation": "1183:20:51",
-        "scope": 24422,
+        "nameLocation": "1183:20:53",
+        "scope": 26741,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -409,10 +409,10 @@
           "typeString": "bytes32"
         },
         "typeName": {
-          "id": 24416,
+          "id": 26735,
           "name": "bytes32",
           "nodeType": "ElementaryTypeName",
-          "src": "1166:7:51",
+          "src": "1166:7:53",
           "typeDescriptions": {
             "typeIdentifier": "t_bytes32",
             "typeString": "bytes32"
@@ -421,12 +421,12 @@
         "value": {
           "arguments": [
             {
-              "id": 24419,
+              "id": 26738,
               "name": "RESOURCE_SYSTEM",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 24403,
-              "src": "1214:15:51",
+              "referencedDeclaration": 26722,
+              "src": "1214:15:53",
               "typeDescriptions": {
                 "typeIdentifier": "t_bytes2",
                 "typeString": "bytes2"
@@ -440,26 +440,26 @@
                 "typeString": "bytes2"
               }
             ],
-            "id": 24418,
+            "id": 26737,
             "isConstant": false,
             "isLValue": false,
             "isPure": true,
             "lValueRequested": false,
             "nodeType": "ElementaryTypeNameExpression",
-            "src": "1206:7:51",
+            "src": "1206:7:53",
             "typeDescriptions": {
               "typeIdentifier": "t_type$_t_bytes32_$",
               "typeString": "type(bytes32)"
             },
             "typeName": {
-              "id": 24417,
+              "id": 26736,
               "name": "bytes32",
               "nodeType": "ElementaryTypeName",
-              "src": "1206:7:51",
+              "src": "1206:7:53",
               "typeDescriptions": {}
             }
           },
-          "id": 24420,
+          "id": 26739,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
@@ -468,7 +468,7 @@
           "nameLocations": [],
           "names": [],
           "nodeType": "FunctionCall",
-          "src": "1206:24:51",
+          "src": "1206:24:53",
           "tryCall": false,
           "typeDescriptions": {
             "typeIdentifier": "t_bytes32",
@@ -480,5 +480,5 @@
     ],
     "license": "MIT"
   },
-  "id": 51
+  "id": 53
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/world-modules",
-  "version": "2.0.0-main-c714e5d1",
+  "version": "2.0.0-main-94d7f1ee",
   "description": "World modules",
   "repository": {
     "type": "git",
@@ -15,11 +15,11 @@
   },
   "dependencies": {
     "zod": "^3.21.4",
-    "@latticexyz/common": "2.0.0-main-c714e5d1",
-    "@latticexyz/config": "2.0.0-main-c714e5d1",
-    "@latticexyz/schema-type": "2.0.0-main-c714e5d1",
-    "@latticexyz/store": "2.0.0-main-c714e5d1",
-    "@latticexyz/world": "2.0.0-main-c714e5d1"
+    "@latticexyz/common": "2.0.0-main-94d7f1ee",
+    "@latticexyz/config": "2.0.0-main-94d7f1ee",
+    "@latticexyz/schema-type": "2.0.0-main-94d7f1ee",
+    "@latticexyz/store": "2.0.0-main-94d7f1ee",
+    "@latticexyz/world": "2.0.0-main-94d7f1ee"
   },
   "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-c714e5d1",
-    "@latticexyz/gas-report": "2.0.0-main-c714e5d1"
+    "@latticexyz/abi-ts": "2.0.0-main-94d7f1ee",
+    "@latticexyz/gas-report": "2.0.0-main-94d7f1ee"
   },
   "publishConfig": {
     "access": "public"

package/src/modules/uniqueentity/getUniqueEntity.sol

@@ -1,10 +1,13 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.21;
 
-import { StoreSwitch } from "@latticexyz/store/src/StoreSwitch.sol";
 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";
+import { SYSTEM_ID } from "./constants.sol";
 
 /**
  * Increment and get an entity nonce.
@@ -13,8 +16,7 @@ import { IUniqueEntitySystem } from "../../interfaces/IUniqueEntitySystem.sol";
  * For usage outside of a World, use the overload that takes an explicit store argument.
  */
 function getUniqueEntity() returns (bytes32 uniqueEntity) {
-  address world = StoreSwitch.getStoreAddress();
-  return IUniqueEntitySystem(world).uniqueEntity_system_getUniqueEntity();
+  return abi.decode(SystemSwitch.call(SYSTEM_ID, abi.encodeCall(UniqueEntitySystem.getUniqueEntity, ())), (bytes32));
 }
 
 /**

package/src/utils/SystemSwitch.sol

@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.21;
+
+import { Hook } from "@latticexyz/store/src/Hook.sol";
+import { Bytes } from "@latticexyz/store/src/Bytes.sol";
+
+import { IWorldKernel } from "@latticexyz/world/src/IWorldKernel.sol";
+import { ResourceId, WorldResourceIdInstance } from "@latticexyz/world/src/WorldResourceId.sol";
+import { WorldContextProviderLib, WorldContextConsumerLib } from "@latticexyz/world/src/WorldContext.sol";
+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 { IWorldErrors } from "@latticexyz/world/src/IWorldErrors.sol";
+import { ISystemHook } from "@latticexyz/world/src/ISystemHook.sol";
+
+import { FunctionSelectors } from "@latticexyz/world/src/codegen/tables/FunctionSelectors.sol";
+import { Systems } from "@latticexyz/world/src/codegen/tables/Systems.sol";
+import { SystemHooks } from "@latticexyz/world/src/codegen/tables/SystemHooks.sol";
+import { Balances } from "@latticexyz/world/src/codegen/tables/Balances.sol";
+
+/**
+ * @title SystemSwitch
+ * @dev The SystemSwitch library provides functions for interacting with systems from other systems.
+ */
+library SystemSwitch {
+  using WorldResourceIdInstance for ResourceId;
+
+  /**
+   * @notice Calls a system identified by its Resource ID.
+   * @dev Reverts if the system is not found, or if the system call reverts.
+   * If the call is executed from the root context, the system is called directly via delegatecall.
+   * Otherwise, the call is executed via an external call to the World contract.
+   * @param systemId The unique Resource ID of the system being called.
+   * @param callData The calldata to be executed in the system.
+   * @return returnData The return data from the system call.
+   */
+  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 (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,
+        callData: callData
+      });
+
+      if (!success) revertWithBytes(returnData);
+      return returnData;
+    }
+
+    // Otherwise, call the system via world.call
+    returnData = IWorldKernel(worldAddress).call(systemId, callData);
+  }
+
+  /**
+   * @notice Calls a system via the function selector registered for it in the World contract.
+   * @dev Reverts if the system is not found, or if the system call reverts.
+   * If the call is executed from the root context, the system is called directly via delegatecall.
+   * Otherwise, the call is executed via an external call to the World contract.
+   * @param callData The world function selector, and call data to be forwarded to the system.
+   * @return returnData The return data from the system call.
+   */
+  function call(bytes memory callData) internal returns (bytes memory returnData) {
+    // Get the systemAddress and systemFunctionSelector from the worldFunctionSelector encoded in the calldata
+    (ResourceId systemId, bytes4 systemFunctionSelector) = FunctionSelectors.get(bytes4(callData));
+
+    // Revert if the function selector is not found
+    if (ResourceId.unwrap(systemId) == 0) revert IWorldErrors.World_FunctionSelectorNotFound(msg.sig);
+
+    // Replace function selector in the calldata with the system function selector, and call the system
+    return call({ systemId: systemId, callData: Bytes.setBytes4(callData, 0, systemFunctionSelector) });
+  }
+}