refactor(world): integrate changes to registerTable and getValueSchema

latticexyz · Aug 15, 2023 · a775d2a · a775d2a
1 parent 5f3f8d1
commit a775d2a
Show file tree

Hide file tree

Showing 46 changed files with 1,226 additions and 1,332 deletions.
diff --git a/packages/world/abi/CoreModule.sol/CoreModule.abi.json b/packages/world/abi/CoreModule.sol/CoreModule.abi.json
@@ -82,17 +82,17 @@
   {
     "inputs": [
       {
-        "internalType": "bytes32",
-        "name": "tableId",
-        "type": "bytes32"
+        "internalType": "uint256",
+        "name": "expected",
+        "type": "uint256"
       },
       {
-        "internalType": "string",
-        "name": "tableIdString",
-        "type": "string"
+        "internalType": "uint256",
+        "name": "received",
+        "type": "uint256"
       }
     ],
-    "name": "StoreCore_TableAlreadyExists",
+    "name": "StoreCore_InvalidKeyNamesLength",
     "type": "error"
   },
   {
@@ -108,7 +108,7 @@
         "type": "string"
       }
     ],
-    "name": "StoreCore_TableNotFound",
+    "name": "StoreCore_TableAlreadyExists",
     "type": "error"
   },
   {

diff --git a/packages/world/abi/CoreSystem.sol/CoreSystem.abi.json b/packages/world/abi/CoreSystem.sol/CoreSystem.abi.json
@@ -150,25 +150,25 @@
     "name": "StoreCore_InvalidFieldNamesLength",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "StoreCore_NotDynamicField",
-    "type": "error"
-  },
   {
     "inputs": [
       {
-        "internalType": "bytes32",
-        "name": "tableId",
-        "type": "bytes32"
+        "internalType": "uint256",
+        "name": "expected",
+        "type": "uint256"
       },
       {
-        "internalType": "string",
-        "name": "tableIdString",
-        "type": "string"
+        "internalType": "uint256",
+        "name": "received",
+        "type": "uint256"
       }
     ],
-    "name": "StoreCore_TableAlreadyExists",
+    "name": "StoreCore_InvalidKeyNamesLength",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "StoreCore_NotDynamicField",
     "type": "error"
   },
   {
@@ -184,7 +184,7 @@
         "type": "string"
       }
     ],
-    "name": "StoreCore_TableNotFound",
+    "name": "StoreCore_TableAlreadyExists",
     "type": "error"
   },
   {
@@ -429,29 +429,6 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "tableId",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "Schema",
-        "name": "valueSchema",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "Schema",
-        "name": "keySchema",
-        "type": "bytes32"
-      }
-    ],
-    "name": "registerSchema",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
   {
     "inputs": [
       {
@@ -541,13 +518,23 @@
       },
       {
         "internalType": "Schema",
-        "name": "valueSchema",
+        "name": "keySchema",
         "type": "bytes32"
       },
       {
         "internalType": "Schema",
-        "name": "keySchema",
+        "name": "valueSchema",
         "type": "bytes32"
+      },
+      {
+        "internalType": "string[]",
+        "name": "keyNames",
+        "type": "string[]"
+      },
+      {
+        "internalType": "string[]",
+        "name": "fieldNames",
+        "type": "string[]"
       }
     ],
     "name": "registerTable",
@@ -564,22 +551,32 @@
   {
     "inputs": [
       {
-        "internalType": "bytes16",
-        "name": "namespace",
-        "type": "bytes16"
+        "internalType": "bytes32",
+        "name": "tableId",
+        "type": "bytes32"
       },
       {
-        "internalType": "bytes16",
-        "name": "name",
-        "type": "bytes16"
+        "internalType": "Schema",
+        "name": "keySchema",
+        "type": "bytes32"
       },
       {
-        "internalType": "contract IStoreHook",
-        "name": "hook",
-        "type": "address"
+        "internalType": "Schema",
+        "name": "valueSchema",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "string[]",
+        "name": "keyNames",
+        "type": "string[]"
+      },
+      {
+        "internalType": "string[]",
+        "name": "fieldNames",
+        "type": "string[]"
       }
     ],
-    "name": "registerTableHook",
+    "name": "registerTable",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
@@ -597,12 +594,12 @@
         "type": "bytes16"
       },
       {
-        "internalType": "address",
-        "name": "grantee",
+        "internalType": "contract IStoreHook",
+        "name": "hook",
         "type": "address"
       }
     ],
-    "name": "revokeAccess",
+    "name": "registerTableHook",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
@@ -620,40 +617,12 @@
         "type": "bytes16"
       },
       {
-        "internalType": "string",
-        "name": "tableName",
-        "type": "string"
-      },
-      {
-        "internalType": "string[]",
-        "name": "fieldNames",
-        "type": "string[]"
-      }
-    ],
-    "name": "setMetadata",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "tableId",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "string",
-        "name": "tableName",
-        "type": "string"
-      },
-      {
-        "internalType": "string[]",
-        "name": "fieldNames",
-        "type": "string[]"
+        "internalType": "address",
+        "name": "grantee",
+        "type": "address"
       }
     ],
-    "name": "setMetadata",
+    "name": "revokeAccess",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"