@latticexyz/world-modules 2.0.0-main-251170e1 → 2.0.0-main-5741d53d

package/out/types.sol/types.json

@@ -10,20 +10,23 @@
   },
   "ast": {
     "absolutePath": "/home/runner/work/mud/mud/packages/world/src/modules/core/types.sol",
-    "id": 33709,
+    "id": 33728,
     "exportedSymbols": {
       "ResourceId": [
-        36365
+        36384
       ],
       "SystemCallData": [
-        33708
+        33719
+      ],
+      "SystemCallFromData": [
+        33727
       ]
     },
     "nodeType": "SourceUnit",
-    "src": "32:162:49",
+    "src": "32:250:49",
     "nodes": [
       {
-        "id": 33700,
+        "id": 33711,
         "nodeType": "PragmaDirective",
         "src": "32:25:49",
         "nodes": [],
@@ -35,23 +38,23 @@
         ]
       },
       {
-        "id": 33702,
+        "id": 33713,
         "nodeType": "ImportDirective",
         "src": "59:66:49",
         "nodes": [],
         "absolutePath": "node_modules/@latticexyz/store/src/ResourceId.sol",
         "file": "@latticexyz/store/src/ResourceId.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 33709,
-        "sourceUnit": 36430,
+        "scope": 33728,
+        "sourceUnit": 36449,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 33701,
+              "id": 33712,
               "name": "ResourceId",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 36365,
+              "referencedDeclaration": 36384,
               "src": "68:10:49",
               "typeDescriptions": {}
             },
@@ -61,7 +64,7 @@
         "unitAlias": ""
       },
       {
-        "id": 33708,
+        "id": 33719,
         "nodeType": "StructDefinition",
         "src": "127:66:49",
         "nodes": [],
@@ -69,36 +72,36 @@
         "members": [
           {
             "constant": false,
-            "id": 33705,
+            "id": 33716,
             "mutability": "mutable",
             "name": "systemId",
             "nameLocation": "164:8:49",
             "nodeType": "VariableDeclaration",
-            "scope": 33708,
+            "scope": 33719,
             "src": "153:19:49",
             "stateVariable": false,
             "storageLocation": "default",
             "typeDescriptions": {
-              "typeIdentifier": "t_userDefinedValueType$_ResourceId_$36365",
+              "typeIdentifier": "t_userDefinedValueType$_ResourceId_$36384",
               "typeString": "ResourceId"
             },
             "typeName": {
-              "id": 33704,
+              "id": 33715,
               "nodeType": "UserDefinedTypeName",
               "pathNode": {
-                "id": 33703,
+                "id": 33714,
                 "name": "ResourceId",
                 "nameLocations": [
                   "153:10:49"
                 ],
                 "nodeType": "IdentifierPath",
-                "referencedDeclaration": 36365,
+                "referencedDeclaration": 36384,
                 "src": "153:10:49"
               },
-              "referencedDeclaration": 36365,
+              "referencedDeclaration": 36384,
               "src": "153:10:49",
               "typeDescriptions": {
-                "typeIdentifier": "t_userDefinedValueType$_ResourceId_$36365",
+                "typeIdentifier": "t_userDefinedValueType$_ResourceId_$36384",
                 "typeString": "ResourceId"
               }
             },
@@ -106,12 +109,12 @@
           },
           {
             "constant": false,
-            "id": 33707,
+            "id": 33718,
             "mutability": "mutable",
             "name": "callData",
             "nameLocation": "182:8:49",
             "nodeType": "VariableDeclaration",
-            "scope": 33708,
+            "scope": 33719,
             "src": "176:14:49",
             "stateVariable": false,
             "storageLocation": "default",
@@ -120,7 +123,7 @@
               "typeString": "bytes"
             },
             "typeName": {
-              "id": 33706,
+              "id": 33717,
               "name": "bytes",
               "nodeType": "ElementaryTypeName",
               "src": "176:5:49",
@@ -134,7 +137,112 @@
         ],
         "name": "SystemCallData",
         "nameLocation": "134:14:49",
-        "scope": 33709,
+        "scope": 33728,
+        "visibility": "public"
+      },
+      {
+        "id": 33727,
+        "nodeType": "StructDefinition",
+        "src": "195:86:49",
+        "nodes": [],
+        "canonicalName": "SystemCallFromData",
+        "members": [
+          {
+            "constant": false,
+            "id": 33721,
+            "mutability": "mutable",
+            "name": "from",
+            "nameLocation": "233:4:49",
+            "nodeType": "VariableDeclaration",
+            "scope": 33727,
+            "src": "225:12:49",
+            "stateVariable": false,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_address",
+              "typeString": "address"
+            },
+            "typeName": {
+              "id": 33720,
+              "name": "address",
+              "nodeType": "ElementaryTypeName",
+              "src": "225:7:49",
+              "stateMutability": "nonpayable",
+              "typeDescriptions": {
+                "typeIdentifier": "t_address",
+                "typeString": "address"
+              }
+            },
+            "visibility": "internal"
+          },
+          {
+            "constant": false,
+            "id": 33724,
+            "mutability": "mutable",
+            "name": "systemId",
+            "nameLocation": "252:8:49",
+            "nodeType": "VariableDeclaration",
+            "scope": 33727,
+            "src": "241:19:49",
+            "stateVariable": false,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_userDefinedValueType$_ResourceId_$36384",
+              "typeString": "ResourceId"
+            },
+            "typeName": {
+              "id": 33723,
+              "nodeType": "UserDefinedTypeName",
+              "pathNode": {
+                "id": 33722,
+                "name": "ResourceId",
+                "nameLocations": [
+                  "241:10:49"
+                ],
+                "nodeType": "IdentifierPath",
+                "referencedDeclaration": 36384,
+                "src": "241:10:49"
+              },
+              "referencedDeclaration": 36384,
+              "src": "241:10:49",
+              "typeDescriptions": {
+                "typeIdentifier": "t_userDefinedValueType$_ResourceId_$36384",
+                "typeString": "ResourceId"
+              }
+            },
+            "visibility": "internal"
+          },
+          {
+            "constant": false,
+            "id": 33726,
+            "mutability": "mutable",
+            "name": "callData",
+            "nameLocation": "270:8:49",
+            "nodeType": "VariableDeclaration",
+            "scope": 33727,
+            "src": "264:14:49",
+            "stateVariable": false,
+            "storageLocation": "default",
+            "typeDescriptions": {
+              "typeIdentifier": "t_bytes_storage_ptr",
+              "typeString": "bytes"
+            },
+            "typeName": {
+              "id": 33725,
+              "name": "bytes",
+              "nodeType": "ElementaryTypeName",
+              "src": "264:5:49",
+              "typeDescriptions": {
+                "typeIdentifier": "t_bytes_storage_ptr",
+                "typeString": "bytes"
+              }
+            },
+            "visibility": "internal"
+          }
+        ],
+        "name": "SystemCallFromData",
+        "nameLocation": "202:18:49",
+        "scope": 33728,
         "visibility": "public"
       }
     ],

package/out/worldResourceTypes.sol/worldResourceTypes.json

@@ -10,38 +10,38 @@
   },
   "ast": {
     "absolutePath": "/home/runner/work/mud/mud/packages/world/src/worldResourceTypes.sol",
-    "id": 33751,
+    "id": 33770,
     "exportedSymbols": {
       "MASK_RESOURCE_MODULE": [
-        33744
+        33763
       ],
       "MASK_RESOURCE_NAMESPACE": [
-        33738
+        33757
       ],
       "MASK_RESOURCE_SYSTEM": [
-        33750
+        33769
       ],
       "RESOURCE_MODULE": [
-        33729
+        33748
       ],
       "RESOURCE_NAMESPACE": [
-        33726
+        33745
       ],
       "RESOURCE_OFFCHAIN_TABLE": [
-        46365
+        46384
       ],
       "RESOURCE_SYSTEM": [
-        33732
+        33751
       ],
       "RESOURCE_TABLE": [
-        46362
+        46381
       ]
     },
     "nodeType": "SourceUnit",
     "src": "32:460:51",
     "nodes": [
       {
-        "id": 33720,
+        "id": 33739,
         "nodeType": "PragmaDirective",
         "src": "32:25:51",
         "nodes": [],
@@ -53,23 +53,23 @@
         ]
       },
       {
-        "id": 33723,
+        "id": 33742,
         "nodeType": "ImportDirective",
         "src": "59:103:51",
         "nodes": [],
         "absolutePath": "node_modules/@latticexyz/store/src/storeResourceTypes.sol",
         "file": "@latticexyz/store/src/storeResourceTypes.sol",
         "nameLocation": "-1:-1:-1",
-        "scope": 33751,
-        "sourceUnit": 46366,
+        "scope": 33770,
+        "sourceUnit": 46385,
         "symbolAliases": [
           {
             "foreign": {
-              "id": 33721,
+              "id": 33740,
               "name": "RESOURCE_TABLE",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 46362,
+              "referencedDeclaration": 46381,
               "src": "68:14:51",
               "typeDescriptions": {}
             },
@@ -77,11 +77,11 @@
           },
           {
             "foreign": {
-              "id": 33722,
+              "id": 33741,
               "name": "RESOURCE_OFFCHAIN_TABLE",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 46365,
+              "referencedDeclaration": 46384,
               "src": "84:23:51",
               "typeDescriptions": {}
             },
@@ -91,7 +91,7 @@
         "unitAlias": ""
       },
       {
-        "id": 33726,
+        "id": 33745,
         "nodeType": "VariableDeclaration",
         "src": "164:41:51",
         "nodes": [],
@@ -99,7 +99,7 @@
         "mutability": "constant",
         "name": "RESOURCE_NAMESPACE",
         "nameLocation": "180:18:51",
-        "scope": 33751,
+        "scope": 33770,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -107,7 +107,7 @@
           "typeString": "bytes2"
         },
         "typeName": {
-          "id": 33724,
+          "id": 33743,
           "name": "bytes2",
           "nodeType": "ElementaryTypeName",
           "src": "164:6:51",
@@ -118,7 +118,7 @@
         },
         "value": {
           "hexValue": "6e73",
-          "id": 33725,
+          "id": 33744,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
@@ -135,7 +135,7 @@
         "visibility": "internal"
       },
       {
-        "id": 33729,
+        "id": 33748,
         "nodeType": "VariableDeclaration",
         "src": "207:38:51",
         "nodes": [],
@@ -143,7 +143,7 @@
         "mutability": "constant",
         "name": "RESOURCE_MODULE",
         "nameLocation": "223:15:51",
-        "scope": 33751,
+        "scope": 33770,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -151,7 +151,7 @@
           "typeString": "bytes2"
         },
         "typeName": {
-          "id": 33727,
+          "id": 33746,
           "name": "bytes2",
           "nodeType": "ElementaryTypeName",
           "src": "207:6:51",
@@ -162,7 +162,7 @@
         },
         "value": {
           "hexValue": "6d64",
-          "id": 33728,
+          "id": 33747,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
@@ -179,7 +179,7 @@
         "visibility": "internal"
       },
       {
-        "id": 33732,
+        "id": 33751,
         "nodeType": "VariableDeclaration",
         "src": "247:38:51",
         "nodes": [],
@@ -187,7 +187,7 @@
         "mutability": "constant",
         "name": "RESOURCE_SYSTEM",
         "nameLocation": "263:15:51",
-        "scope": 33751,
+        "scope": 33770,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -195,7 +195,7 @@
           "typeString": "bytes2"
         },
         "typeName": {
-          "id": 33730,
+          "id": 33749,
           "name": "bytes2",
           "nodeType": "ElementaryTypeName",
           "src": "247:6:51",
@@ -206,7 +206,7 @@
         },
         "value": {
           "hexValue": "7379",
-          "id": 33731,
+          "id": 33750,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
@@ -223,7 +223,7 @@
         "visibility": "internal"
       },
       {
-        "id": 33738,
+        "id": 33757,
         "nodeType": "VariableDeclaration",
         "src": "288:70:51",
         "nodes": [],
@@ -231,7 +231,7 @@
         "mutability": "constant",
         "name": "MASK_RESOURCE_NAMESPACE",
         "nameLocation": "305:23:51",
-        "scope": 33751,
+        "scope": 33770,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -239,7 +239,7 @@
           "typeString": "bytes32"
         },
         "typeName": {
-          "id": 33733,
+          "id": 33752,
           "name": "bytes32",
           "nodeType": "ElementaryTypeName",
           "src": "288:7:51",
@@ -251,11 +251,11 @@
         "value": {
           "arguments": [
             {
-              "id": 33736,
+              "id": 33755,
               "name": "RESOURCE_NAMESPACE",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 33726,
+              "referencedDeclaration": 33745,
               "src": "339:18:51",
               "typeDescriptions": {
                 "typeIdentifier": "t_bytes2",
@@ -270,7 +270,7 @@
                 "typeString": "bytes2"
               }
             ],
-            "id": 33735,
+            "id": 33754,
             "isConstant": false,
             "isLValue": false,
             "isPure": true,
@@ -282,14 +282,14 @@
               "typeString": "type(bytes32)"
             },
             "typeName": {
-              "id": 33734,
+              "id": 33753,
               "name": "bytes32",
               "nodeType": "ElementaryTypeName",
               "src": "331:7:51",
               "typeDescriptions": {}
             }
           },
-          "id": 33737,
+          "id": 33756,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
@@ -308,7 +308,7 @@
         "visibility": "internal"
       },
       {
-        "id": 33744,
+        "id": 33763,
         "nodeType": "VariableDeclaration",
         "src": "360:64:51",
         "nodes": [],
@@ -316,7 +316,7 @@
         "mutability": "constant",
         "name": "MASK_RESOURCE_MODULE",
         "nameLocation": "377:20:51",
-        "scope": 33751,
+        "scope": 33770,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -324,7 +324,7 @@
           "typeString": "bytes32"
         },
         "typeName": {
-          "id": 33739,
+          "id": 33758,
           "name": "bytes32",
           "nodeType": "ElementaryTypeName",
           "src": "360:7:51",
@@ -336,11 +336,11 @@
         "value": {
           "arguments": [
             {
-              "id": 33742,
+              "id": 33761,
               "name": "RESOURCE_MODULE",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 33729,
+              "referencedDeclaration": 33748,
               "src": "408:15:51",
               "typeDescriptions": {
                 "typeIdentifier": "t_bytes2",
@@ -355,7 +355,7 @@
                 "typeString": "bytes2"
               }
             ],
-            "id": 33741,
+            "id": 33760,
             "isConstant": false,
             "isLValue": false,
             "isPure": true,
@@ -367,14 +367,14 @@
               "typeString": "type(bytes32)"
             },
             "typeName": {
-              "id": 33740,
+              "id": 33759,
               "name": "bytes32",
               "nodeType": "ElementaryTypeName",
               "src": "400:7:51",
               "typeDescriptions": {}
             }
           },
-          "id": 33743,
+          "id": 33762,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,
@@ -393,7 +393,7 @@
         "visibility": "internal"
       },
       {
-        "id": 33750,
+        "id": 33769,
         "nodeType": "VariableDeclaration",
         "src": "426:64:51",
         "nodes": [],
@@ -401,7 +401,7 @@
         "mutability": "constant",
         "name": "MASK_RESOURCE_SYSTEM",
         "nameLocation": "443:20:51",
-        "scope": 33751,
+        "scope": 33770,
         "stateVariable": false,
         "storageLocation": "default",
         "typeDescriptions": {
@@ -409,7 +409,7 @@
           "typeString": "bytes32"
         },
         "typeName": {
-          "id": 33745,
+          "id": 33764,
           "name": "bytes32",
           "nodeType": "ElementaryTypeName",
           "src": "426:7:51",
@@ -421,11 +421,11 @@
         "value": {
           "arguments": [
             {
-              "id": 33748,
+              "id": 33767,
               "name": "RESOURCE_SYSTEM",
               "nodeType": "Identifier",
               "overloadedDeclarations": [],
-              "referencedDeclaration": 33732,
+              "referencedDeclaration": 33751,
               "src": "474:15:51",
               "typeDescriptions": {
                 "typeIdentifier": "t_bytes2",
@@ -440,7 +440,7 @@
                 "typeString": "bytes2"
               }
             ],
-            "id": 33747,
+            "id": 33766,
             "isConstant": false,
             "isLValue": false,
             "isPure": true,
@@ -452,14 +452,14 @@
               "typeString": "type(bytes32)"
             },
             "typeName": {
-              "id": 33746,
+              "id": 33765,
               "name": "bytes32",
               "nodeType": "ElementaryTypeName",
               "src": "466:7:51",
               "typeDescriptions": {}
             }
           },
-          "id": 33749,
+          "id": 33768,
           "isConstant": false,
           "isLValue": false,
           "isPure": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/world-modules",
-  "version": "2.0.0-main-251170e1",
+  "version": "2.0.0-main-5741d53d",
   "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-5741d53d",
+    "@latticexyz/config": "2.0.0-main-5741d53d",
+    "@latticexyz/schema-type": "2.0.0-main-5741d53d",
+    "@latticexyz/store": "2.0.0-main-5741d53d",
+    "@latticexyz/world": "2.0.0-main-5741d53d"
   },
   "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-5741d53d",
+    "@latticexyz/gas-report": "2.0.0-main-5741d53d"
   },
   "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 {
 
 }