@latticexyz/cli 2.0.0-main-e1dc88eb → 2.0.0-main-ccc21e91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/cli",
-  "version": "2.0.0-main-e1dc88eb",
+  "version": "2.0.0-main-ccc21e91",
   "description": "Command line interface for mud",
   "repository": {
     "type": "git",
@@ -40,17 +40,17 @@
     "yargs": "^17.7.1",
     "zod": "^3.21.4",
     "zod-validation-error": "^1.3.0",
-    "@latticexyz/abi-ts": "2.0.0-main-e1dc88eb",
-    "@latticexyz/common": "2.0.0-main-e1dc88eb",
-    "@latticexyz/config": "2.0.0-main-e1dc88eb",
-    "@latticexyz/gas-report": "2.0.0-main-e1dc88eb",
-    "@latticexyz/protocol-parser": "2.0.0-main-e1dc88eb",
-    "@latticexyz/schema-type": "2.0.0-main-e1dc88eb",
-    "@latticexyz/services": "2.0.0-main-e1dc88eb",
-    "@latticexyz/store": "2.0.0-main-e1dc88eb",
-    "@latticexyz/utils": "2.0.0-main-e1dc88eb",
-    "@latticexyz/world": "2.0.0-main-e1dc88eb",
-    "@latticexyz/world-modules": "2.0.0-main-e1dc88eb"
+    "@latticexyz/abi-ts": "2.0.0-main-ccc21e91",
+    "@latticexyz/common": "2.0.0-main-ccc21e91",
+    "@latticexyz/config": "2.0.0-main-ccc21e91",
+    "@latticexyz/gas-report": "2.0.0-main-ccc21e91",
+    "@latticexyz/protocol-parser": "2.0.0-main-ccc21e91",
+    "@latticexyz/schema-type": "2.0.0-main-ccc21e91",
+    "@latticexyz/services": "2.0.0-main-ccc21e91",
+    "@latticexyz/store": "2.0.0-main-ccc21e91",
+    "@latticexyz/utils": "2.0.0-main-ccc21e91",
+    "@latticexyz/world": "2.0.0-main-ccc21e91",
+    "@latticexyz/world-modules": "2.0.0-main-ccc21e91"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",

package/src/commands/dev-contracts.ts

@@ -15,6 +15,7 @@ import { Address } from "viem";
 const devOptions = {
   rpc: deployOptions.rpc,
   configPath: deployOptions.configPath,
+  alwaysRunPostDeploy: deployOptions.alwaysRunPostDeploy,
 };
 
 const commandModule: CommandModule<typeof devOptions, InferredOptionTypes<typeof devOptions>> = {
@@ -74,6 +75,7 @@ const commandModule: CommandModule<typeof devOptions, InferredOptionTypes<typeof
         }
         // TODO: handle errors
         const deploy = await runDeploy({
+          ...opts,
           configPath,
           rpc,
           skipBuild: false,

package/src/deploy/common.ts

@@ -38,25 +38,25 @@ export type WorldFunction = {
   readonly systemFunctionSelector: Hex;
 };
 
-export type System = {
+export type DeterministicContract = {
+  readonly address: Address;
+  readonly bytecode: Hex;
+  readonly abi: Abi;
+};
+
+export type System = DeterministicContract & {
   readonly namespace: string;
   readonly name: string;
   readonly systemId: Hex;
   readonly allowAll: boolean;
   readonly allowedAddresses: readonly Hex[];
-  readonly address: Address;
-  readonly bytecode: Hex;
-  readonly abi: Abi;
   readonly functions: readonly WorldFunction[];
 };
 
-export type Module = {
+export type Module = DeterministicContract & {
   readonly name: string;
   readonly installAsRoot: boolean;
   readonly installData: Hex; // TODO: figure out better naming for this
-  readonly address: Address;
-  readonly bytecode: Hex;
-  readonly abi: Abi;
 };
 
 export type ConfigInput = StoreConfig & WorldConfig;

package/src/deploy/deploy.ts

@@ -11,6 +11,9 @@ import { ensureModules } from "./ensureModules";
 import { Table } from "./configToTables";
 import { assertNamespaceOwner } from "./assertNamespaceOwner";
 import { debug } from "./debug";
+import { resourceLabel } from "./resourceLabel";
+import { ensureContract } from "./ensureContract";
+import { uniqueBy } from "@latticexyz/common/utils";
 
 type DeployOptions<configInput extends ConfigInput> = {
   client: Client<Transport, Chain | undefined, Account>;
@@ -51,6 +54,27 @@ export async function deploy<configInput extends ConfigInput>({
     resourceIds: [...tables.map((table) => table.tableId), ...systems.map((system) => system.systemId)],
   });
 
+  // deploy all dependent contracts, because system registration, module install, etc. all expect these contracts to be callable.
+  const contractTxs = (
+    await Promise.all([
+      ...uniqueBy(systems, (system) => system.address).map((system) =>
+        ensureContract({ client, bytecode: system.bytecode, label: `${resourceLabel(system)} system` })
+      ),
+      ...uniqueBy(config.modules, (mod) => mod.address).map((mod) =>
+        ensureContract({ client, bytecode: mod.bytecode, label: `${mod.name} module` })
+      ),
+    ])
+  ).flat();
+
+  if (contractTxs.length) {
+    debug("waiting for contracts");
+    // wait for each tx separately/serially, because parallelizing results in RPC errors
+    for (const tx of contractTxs) {
+      await waitForTransactionReceipt(client, { hash: tx });
+      // TODO: throw if there was a revert?
+    }
+  }
+
   const tableTxs = await ensureTables({
     client,
     worldDeploy,
@@ -75,7 +99,7 @@ export async function deploy<configInput extends ConfigInput>({
   const txs = [...tableTxs, ...systemTxs, ...functionTxs, ...moduleTxs];
 
   // wait for each tx separately/serially, because parallelizing results in RPC errors
-  debug("waiting for transactions to confirm");
+  debug("waiting for all transactions to confirm");
   for (const tx of txs) {
     await waitForTransactionReceipt(client, { hash: tx });
     // TODO: throw if there was a revert?

package/src/deploy/ensureModules.ts

@@ -1,9 +1,8 @@
 import { Client, Transport, Chain, Account, Hex } from "viem";
 import { writeContract } from "@latticexyz/common";
 import { Module, WorldDeploy, worldAbi } from "./common";
-import { ensureContract } from "./ensureContract";
 import { debug } from "./debug";
-import { uniqueBy, wait } from "@latticexyz/common/utils";
+import { wait } from "@latticexyz/common/utils";
 import pRetry from "p-retry";
 
 export async function ensureModules({
@@ -17,14 +16,6 @@ export async function ensureModules({
 }): Promise<readonly Hex[]> {
   if (!modules.length) return [];
 
-  // kick off contract deployments first, otherwise installing modules can fail
-  const contractTxs = await Promise.all(
-    uniqueBy(modules, (mod) => mod.address).map((mod) =>
-      ensureContract({ client, bytecode: mod.bytecode, label: `${mod.name} module` })
-    )
-  );
-
-  // then start installing modules
   debug("installing modules:", modules.map((mod) => mod.name).join(", "));
   const installTxs = await Promise.all(
     modules.map((mod) =>
@@ -70,5 +61,5 @@ export async function ensureModules({
     )
   );
 
-  return (await Promise.all([...contractTxs, ...installTxs])).flat();
+  return await Promise.all(installTxs);
 }

package/src/deploy/ensureSystems.ts

@@ -1,12 +1,11 @@
 import { Client, Transport, Chain, Account, Hex, getAddress } from "viem";
 import { writeContract } from "@latticexyz/common";
 import { System, WorldDeploy, worldAbi } from "./common";
-import { ensureContract } from "./ensureContract";
 import { debug } from "./debug";
 import { resourceLabel } from "./resourceLabel";
 import { getSystems } from "./getSystems";
 import { getResourceAccess } from "./getResourceAccess";
-import { uniqueBy, wait } from "@latticexyz/common/utils";
+import { wait } from "@latticexyz/common/utils";
 import pRetry from "p-retry";
 
 export async function ensureSystems({
@@ -53,7 +52,7 @@ export async function ensureSystems({
     debug("adding", accessToAdd.length, "access grants");
   }
 
-  const accessTxs = await Promise.all([
+  const accessTxs = [
     ...accessToRemove.map((access) =>
       pRetry(
         () =>
@@ -94,7 +93,7 @@ export async function ensureSystems({
         }
       )
     ),
-  ]);
+  ];
 
   const existingSystems = systems.filter((system) =>
     worldSystems.some(
@@ -127,37 +126,27 @@ export async function ensureSystems({
     debug("registering new systems", systemsToAdd.map(resourceLabel).join(", "));
   }
 
-  // kick off contract deployments first, otherwise registering systems can fail
-  const contractTxs = await Promise.all(
-    uniqueBy(missingSystems, (system) => system.address).map((system) =>
-      ensureContract({ client, bytecode: system.bytecode, label: `${resourceLabel(system)} system` })
-    )
-  );
-
-  // then start registering systems
-  const registerTxs = await Promise.all(
-    missingSystems.map((system) =>
-      pRetry(
-        () =>
-          writeContract(client, {
-            chain: client.chain ?? null,
-            address: worldDeploy.address,
-            abi: worldAbi,
-            // TODO: replace with batchCall (https://github.com/latticexyz/mud/issues/1645)
-            functionName: "registerSystem",
-            args: [system.systemId, system.address, system.allowAll],
-          }),
-        {
-          retries: 3,
-          onFailedAttempt: async (error) => {
-            const delay = error.attemptNumber * 500;
-            debug(`failed to register system ${resourceLabel(system)}, retrying in ${delay}ms...`);
-            await wait(delay);
-          },
-        }
-      )
+  const registerTxs = missingSystems.map((system) =>
+    pRetry(
+      () =>
+        writeContract(client, {
+          chain: client.chain ?? null,
+          address: worldDeploy.address,
+          abi: worldAbi,
+          // TODO: replace with batchCall (https://github.com/latticexyz/mud/issues/1645)
+          functionName: "registerSystem",
+          args: [system.systemId, system.address, system.allowAll],
+        }),
+      {
+        retries: 3,
+        onFailedAttempt: async (error) => {
+          const delay = error.attemptNumber * 500;
+          debug(`failed to register system ${resourceLabel(system)}, retrying in ${delay}ms...`);
+          await wait(delay);
+        },
+      }
     )
   );
 
-  return (await Promise.all([...accessTxs, ...contractTxs, ...registerTxs])).flat();
+  return await Promise.all([...accessTxs, ...registerTxs]);
 }

package/src/runDeploy.ts

@@ -26,6 +26,10 @@ export const deployOptions = {
   worldAddress: { type: "string", desc: "Deploy to an existing World at the given address" },
   srcDir: { type: "string", desc: "Source directory. Defaults to foundry src directory." },
   skipBuild: { type: "boolean", desc: "Skip rebuilding the contracts before deploying" },
+  alwaysRunPostDeploy: {
+    type: "boolean",
+    desc: "Always run PostDeploy.s.sol after each deploy (including during upgrades). By default, PostDeploy.s.sol is only run once after a new world is deployed.",
+  },
 } as const satisfies Record<string, Options>;
 
 export type DeployOptions = InferredOptionTypes<typeof deployOptions>;
@@ -84,7 +88,7 @@ in your contracts directory to use the default anvil private key.`
     client,
     config: resolvedConfig,
   });
-  if (opts.worldAddress == null) {
+  if (opts.worldAddress == null || opts.alwaysRunPostDeploy) {
     await postDeploy(config.postDeployScript, worldDeploy.address, rpc, profile);
   }
   console.log(chalk.green("Deployment completed in", (Date.now() - startTime) / 1000, "seconds"));