feat: use new config (#2483)

latticexyz · Mar 20, 2024 · 252a185 · 252a185
1 parent 20ffc95
commit 252a185
Show file tree

Hide file tree

Showing 68 changed files with 665 additions and 770 deletions.
diff --git a/.changeset/yellow-bulldogs-boil.md b/.changeset/yellow-bulldogs-boil.md
@@ -0,0 +1,11 @@
+---
+"@latticexyz/cli": major
+"@latticexyz/dev-tools": major
+"@latticexyz/store-sync": major
+"@latticexyz/store": major
+"@latticexyz/world-modules": major
+"@latticexyz/world": major
+"create-mud": major
+---
+
+Migrated to new config format.
diff --git a/e2e/packages/client-vanilla/src/mud/setupNetwork.ts b/e2e/packages/client-vanilla/src/mud/setupNetwork.ts
@@ -4,7 +4,7 @@ import { encodeEntity, syncToRecs } from "@latticexyz/store-sync/recs";
 import { getNetworkConfig } from "./getNetworkConfig";
 import { world } from "./world";
 import IWorldAbi from "contracts/out/IWorld.sol/IWorld.abi.json";
-import { createBurnerAccount, getContract, resourceToHex, transportObserver } from "@latticexyz/common";
+import { createBurnerAccount, getContract, transportObserver } from "@latticexyz/common";
 import mudConfig from "contracts/mud.config";
 
 export type SetupNetworkResult = Awaited<ReturnType<typeof setupNetwork>>;
@@ -40,11 +40,7 @@ export async function setupNetwork() {
     startBlock: BigInt(networkConfig.initialBlockNumber),
     indexerUrl: networkConfig.indexerUrl ?? undefined,
     filters: Object.entries(mudConfig.tables).map(([, table]) => {
-      const tableId = resourceToHex({
-        type: table.offchainOnly ? "offchainTable" : "table",
-        namespace: mudConfig.namespace,
-        name: table.name,
-      });
+      const tableId = table.tableId;
       if (table.name === mudConfig.tables.Position.name) {
         return {
           tableId,

diff --git a/e2e/packages/contracts/mud.config.ts b/e2e/packages/contracts/mud.config.ts
@@ -1,55 +1,53 @@
-import { mudConfig } from "@latticexyz/world/register";
+import { defineWorld } from "@latticexyz/world/config/v2";
 
-export default mudConfig({
+export default defineWorld({
   tables: {
     Number: {
-      keySchema: {
+      schema: {
         key: "uint32",
-      },
-      valueSchema: {
         value: "uint32",
       },
+      key: ["key"],
     },
     Vector: {
-      keySchema: {
+      schema: {
         key: "uint32",
-      },
-      valueSchema: {
         x: "int32",
         y: "int32",
       },
+      key: ["key"],
     },
     NumberList: {
-      keySchema: {},
-      valueSchema: {
+      schema: {
         value: "uint32[]",
       },
+      key: [],
     },
     Multi: {
-      keySchema: {
+      schema: {
         a: "uint32",
         b: "bool",
         c: "uint256",
         d: "int120",
-      },
-      valueSchema: {
         num: "int256",
         value: "bool",
       },
+      key: ["a", "b", "c", "d"],
     },
     Position: {
-      keySchema: {
+      schema: {
         zone: "bytes32",
         x: "int32",
         y: "int32",
-      },
-      valueSchema: {
         player: "address",
       },
+      key: ["zone", "x", "y"],
     },
     StaticArray: {
-      keySchema: {},
-      valueSchema: "uint256[3]",
+      schema: {
+        value: "uint256[3]",
+      },
+      key: [],
     },
   },
 });
diff --git a/e2e/packages/sync-test/data/encodeTestData.ts b/e2e/packages/sync-test/data/encodeTestData.ts
@@ -1,7 +1,10 @@
 import { mapObject } from "@latticexyz/utils";
 import { encodeKey, encodeValueArgs, valueSchemaToFieldLayoutHex } from "@latticexyz/protocol-parser/internal";
 import { Data, EncodedData } from "./types";
-import config from "../../contracts/mud.config";
+import configV2 from "../../contracts/mud.config";
+import { worldToV1 } from "@latticexyz/world/config/v2";
+
+const config = worldToV1(configV2);
 
 /**
  * Turns the typed data into encoded data in the format expected by `world.setRecord`

diff --git a/e2e/packages/sync-test/data/expectClientData.ts b/e2e/packages/sync-test/data/expectClientData.ts
@@ -1,8 +1,11 @@
 import { Page, expect } from "@playwright/test";
 import { Data } from "./types";
-import config from "../../contracts/mud.config";
+import configV2 from "../../contracts/mud.config";
 import { encodeEntity } from "@latticexyz/store-sync/recs";
 import { callPageFunction } from "./callPageFunction";
+import { worldToV1 } from "@latticexyz/world/config/v2";
+
+const config = worldToV1(configV2);
 
 /**
  * Confirms that the client state equals the given state by reading from the client's data store

diff --git a/e2e/packages/sync-test/data/types.ts b/e2e/packages/sync-test/data/types.ts
@@ -1,7 +1,11 @@
 // Note: this expects the config to not use shortcuts but the full definitions for table schemas
 import { SchemaAbiType, SchemaAbiTypeToPrimitiveType } from "@latticexyz/schema-type/internal";
-import config from "../../contracts/mud.config";
+import configV2 from "../../contracts/mud.config";
 import { Hex } from "viem";
+import { worldToV1 } from "@latticexyz/world/config/v2";
+
+const config = worldToV1(configV2);
+
 type SchemaToPrimitive<Schema> =
   Schema extends Record<string, SchemaAbiType>
     ? { [key in keyof Schema]: SchemaAbiTypeToPrimitiveType<Schema[key]> }

diff --git a/e2e/packages/sync-test/package.json b/e2e/packages/sync-test/package.json
@@ -19,6 +19,7 @@
     "@latticexyz/store": "link:../../../packages/store",
     "@latticexyz/store-sync": "link:../../../packages/store-sync",
     "@latticexyz/utils": "link:../../../packages/utils",
+    "@latticexyz/world": "link:../../../packages/world",
     "@viem/anvil": "^0.0.6",
     "abitype": "1.0.0",
     "chalk": "^5.2.0",

diff --git a/e2e/pnpm-lock.yaml b/e2e/pnpm-lock.yaml
diff --git a/examples/minimal/packages/contracts/mud.config.ts b/examples/minimal/packages/contracts/mud.config.ts
@@ -1,8 +1,7 @@
-import { mudConfig } from "@latticexyz/world/register";
-
+import { defineWorld } from "@latticexyz/world/config/v2";
 import { resolveTableId } from "@latticexyz/config/library";
 
-export default mudConfig({
+export default defineWorld({
   systems: {
     IncrementSystem: {
       name: "increment",
@@ -15,26 +14,27 @@ export default mudConfig({
   ],
   tables: {
     CounterTable: {
-      keySchema: {},
-      valueSchema: {
+      schema: {
         value: "uint32",
       },
-      storeArgument: true,
+      key: [],
+      codegen: { storeArgument: true },
     },
     MessageTable: {
-      keySchema: {},
-      valueSchema: {
+      type: "offchainTable",
+      schema: {
         value: "string",
       },
-      offchainOnly: true,
+      key: [],
     },
     Inventory: {
-      keySchema: {
+      schema: {
         owner: "address",
         item: "uint32",
         itemVariant: "uint32",
+        amount: "uint32",
       },
-      valueSchema: { amount: "uint32" },
+      key: ["owner", "item", "itemVariant"],
     },
   },
   modules: [

diff --git a/examples/multiple-accounts/packages/contracts/mud.config.ts b/examples/multiple-accounts/packages/contracts/mud.config.ts
@@ -1,16 +1,15 @@
-import { mudConfig } from "@latticexyz/world/register";
+import { defineWorld } from "@latticexyz/world/config/v2";
 
-export default mudConfig({
+export default defineWorld({
   namespace: "LastCall",
   tables: {
     LastCall: {
-      keySchema: {
+      schema: {
         caller: "address",
-      },
-      valueSchema: {
         callTime: "uint256",
         sender: "address",
       },
+      key: ["caller"],
     },
   },
 });