feat(modules): standalone erc20 with own store

.github/workflows/changeset.yml

@@ -2,8 +2,6 @@ name: Changeset
 
 on:
   pull_request:
-    paths:
-      - ".changeset/*.md"
 
 jobs:
   changeset:

.gitignore

@@ -11,22 +11,15 @@ yarn.lock
 lerna-debug.log
 yarn-error.log
 .turbo
-.attest
-.tstrace
-
-.env*
 
 # We don't want projects created from templates to ignore their lockfiles, but we don't
 # want to check them in here, so we'll ignore them from the root.
 templates/*/pnpm-lock.yaml
 
-# mud test data
+.env
+
 test-data/world-logs-bulk-*.json
 test-data/world-logs-query.json
 
-# mud artifacts
-.mud
-
-# sqlite indexer data
-*.db
-*.db-journal
+.attest
+.tstrace

e2e/.gitignore

@@ -1 +1,3 @@
 node_modules
+*.db
+*.db-journal

examples/local-explorer/.gitignore

@@ -1,7 +1,2 @@
+indexer.db
 node_modules
-
-# mud artifacts
-.mud
-# sqlite indexer data
-*.db
-*.db-journal

package.json

@@ -14,7 +14,7 @@
     "build": "turbo run build",
     "changelog:generate": "bun scripts/changelog.ts",
     "clean": "turbo run clean",
-    "dev": "TSUP_SKIP_DTS=true turbo run dev --concurrency 100 --filter=!@latticexyz/explorer",
+    "dev": "TSUP_SKIP_DTS=true turbo run dev --concurrency 100",
     "dist-tag-rm": "pnpm recursive exec -- sh -c 'npm dist-tag rm $(cat package.json | jq -r \".name\") $TAG || true'",
     "docs:generate:api": "bun scripts/render-api-docs.ts",
     "foundryup": "curl -L https://foundry.paradigm.xyz | bash && bash ~/.foundry/bin/foundryup",

packages/cli/package.json

@@ -39,7 +39,6 @@
     "test:ci": "pnpm run test"
   },
   "dependencies": {
-    "@ark/util": "catalog:",
     "@aws-sdk/client-kms": "^3.556.0",
     "@latticexyz/abi-ts": "workspace:*",
     "@latticexyz/common": "workspace:*",

packages/cli/src/build.ts

@@ -1,5 +1,5 @@
 import { tablegen } from "@latticexyz/store/codegen";
-import { buildSystemsManifest, worldgen } from "@latticexyz/world/node";
+import { worldgen } from "@latticexyz/world/node";
 import { World as WorldConfig } from "@latticexyz/world";
 import { forge } from "@latticexyz/common/foundry";
 import { execa } from "execa";
@@ -21,7 +21,7 @@ export async function build({
   foundryProfile = process.env.FOUNDRY_PROFILE,
 }: BuildOptions): Promise<void> {
   await Promise.all([tablegen({ rootDir, config }), worldgen({ rootDir, config })]);
+
   await forge(["build"], { profile: foundryProfile });
-  await buildSystemsManifest({ rootDir, config });
   await execa("mud", ["abi-ts"], { stdio: "inherit" });
 }

packages/cli/src/deploy/common.ts

@@ -94,16 +94,12 @@ export type System = DeterministicContract & {
   readonly allowedAddresses: readonly Hex[];
   readonly allowedSystemIds: readonly Hex[];
   // world registration
-  // TODO: replace this with system manifest data
   readonly worldFunctions: readonly WorldFunction[];
-  // human readable ABIs to register onchain
-  readonly abi: readonly string[];
-  readonly worldAbi: readonly string[];
 };
 
 export type DeployedSystem = Omit<
   System,
-  "label" | "namespaceLabel" | "abi" | "worldAbi" | "prepareDeploy" | "deployedBytecodeSize" | "allowedSystemIds"
+  "label" | "namespaceLabel" | "abi" | "prepareDeploy" | "deployedBytecodeSize" | "allowedSystemIds"
 > & {
   address: Address;
 };

packages/cli/src/deploy/deploy.ts

@@ -1,4 +1,4 @@
-import { Account, Address, Chain, Client, Hex, Transport, stringToHex } from "viem";
+import { Account, Address, Chain, Client, Hex, Transport } from "viem";
 import { ensureDeployer } from "./ensureDeployer";
 import { deployWorld } from "./deployWorld";
 import { ensureTables } from "./ensureTables";
@@ -15,7 +15,7 @@ import { ensureContractsDeployed } from "./ensureContractsDeployed";
 import { randomBytes } from "crypto";
 import { ensureWorldFactory } from "./ensureWorldFactory";
 import { Table } from "@latticexyz/config";
-import { ensureResourceTags } from "./ensureResourceTags";
+import { ensureResourceLabels } from "./ensureResourceLabels";
 
 type DeployOptions = {
   client: Client<Transport, Chain | undefined, Account>;
@@ -90,10 +90,14 @@ export async function deploy({
     throw new Error(`Unsupported World version: ${worldDeploy.worldVersion}`);
   }
 
+  const resources = [
+    ...tables.map((table) => ({ resourceId: table.tableId, label: table.label })),
+    ...systems.map((system) => ({ resourceId: system.systemId, label: system.label })),
+  ];
   const namespaceTxs = await ensureNamespaceOwner({
     client,
     worldDeploy,
-    resourceIds: [...tables.map(({ tableId }) => tableId), ...systems.map(({ systemId }) => systemId)],
+    resourceIds: resources.map(({ resourceId }) => resourceId),
   });
 
   debug("waiting for all namespace registration transactions to confirm");
@@ -125,22 +129,13 @@ export async function deploy({
     worldDeploy,
     modules,
   });
-
-  const tableTags = tables.map(({ tableId: resourceId, label }) => ({ resourceId, tag: "label", value: label }));
-  const systemTags = systems.flatMap(({ systemId: resourceId, label, abi, worldAbi }) => [
-    { resourceId, tag: "label", value: label },
-    { resourceId, tag: "abi", value: abi.join("\n") },
-    { resourceId, tag: "worldAbi", value: worldAbi.join("\n") },
-  ]);
-
-  const tagTxs = await ensureResourceTags({
+  const labelTxs = await ensureResourceLabels({
     client,
     worldDeploy,
-    tags: [...tableTags, ...systemTags],
-    valueToHex: stringToHex,
+    resources,
   });
 
-  const txs = [...tableTxs, ...systemTxs, ...functionTxs, ...moduleTxs, ...tagTxs];
+  const txs = [...tableTxs, ...systemTxs, ...functionTxs, ...moduleTxs, ...labelTxs];
 
   // wait for each tx separately/serially, because parallelizing results in RPC errors
   debug("waiting for all transactions to confirm");

packages/cli/src/deploy/ensureResourceLabels.ts

@@ -0,0 +1,66 @@
+import { Hex, Client, Transport, Chain, Account, stringToHex, BaseError, hexToString } from "viem";
+import { WorldDeploy } from "./common";
+import { debug } from "./debug";
+import { hexToResource, writeContract } from "@latticexyz/common";
+import { isDefined } from "@latticexyz/common/utils";
+import metadataConfig from "@latticexyz/world-module-metadata/mud.config";
+import metadataAbi from "@latticexyz/world-module-metadata/out/IMetadataSystem.sol/IMetadataSystem.abi.json" assert { type: "json" };
+import { getTableValue } from "./getTableValue";
+
+type LabeledResource = {
+  readonly resourceId: Hex;
+  readonly label: string;
+};
+
+export async function ensureResourceLabels({
+  client,
+  worldDeploy,
+  resources,
+}: {
+  readonly client: Client<Transport, Chain | undefined, Account>;
+  readonly worldDeploy: WorldDeploy;
+  readonly resources: readonly LabeledResource[];
+}): Promise<readonly Hex[]> {
+  const currentLabels = await Promise.all(
+    resources.map(async (resource) => {
+      const { value } = await getTableValue({
+        client,
+        worldDeploy,
+        table: metadataConfig.tables.metadata__ResourceTag,
+        key: { resource: resource.resourceId, tag: stringToHex("label", { size: 32 }) },
+      });
+      return hexToString(value);
+    }),
+  );
+
+  const resourcesToSet = resources.filter((resource, i) => resource.label !== currentLabels[i]);
+  if (resourcesToSet.length === 0) {
+    return [];
+  }
+
+  debug("setting", resources.length, "resource labels");
+  return (
+    await Promise.all(
+      resourcesToSet.map(async ({ resourceId, label }) => {
+        const resource = hexToResource(resourceId);
+        // TODO: move to resourceToDebugString
+        const resourceString = `${resource.type}:${resource.namespace}:${resource.name}`;
+        debug(`setting resource label for ${resourceString} to ${label}`);
+        try {
+          return await writeContract(client, {
+            chain: client.chain ?? null,
+            address: worldDeploy.address,
+            abi: metadataAbi,
+            // TODO: replace with batchCall (https://github.com/latticexyz/mud/issues/1645)
+            functionName: "metadata__setResourceTag",
+            args: [resourceId, stringToHex("label", { size: 32 }), stringToHex(label)],
+          });
+        } catch (error) {
+          debug(
+            `failed to set resource label for ${resourceString}, skipping\n  ${error instanceof BaseError ? error.shortMessage : error}`,
+          );
+        }
+      }),
+    )
+  ).filter(isDefined);
+}