@latticexyz/cli 2.0.8-not-npmignore-cache-2d3a1a18 → 2.0.8-not-npmignore-cache-a91bf9e0

package/dist/mud.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-import*as i from"dotenv";i.config();async function l(){let{default:r}=await import("yargs"),{default:o}=await import("chalk"),{hideBin:e}=await import("yargs/helpers"),{logError:s}=await import("./errors-MZURIB7V.js"),{commands:t}=await import("./commands-L6ZRKSMG.js");r(e(process.argv)).scriptName("mud").command(t).strict().fail((a,n)=>{console.error(o.red(a)),a.includes("Missing required argument")&&console.log(o.yellow(`Run 'pnpm mud ${process.argv[2]} --help' for a list of available and required arguments.`)),console.log(""),n!=null&&(s(n),console.log("")),process.exit(1)}).alias({h:"help"}).argv}l();
+import*as i from"dotenv";i.config();async function l(){let{default:r}=await import("yargs"),{default:o}=await import("chalk"),{hideBin:e}=await import("yargs/helpers"),{logError:s}=await import("./errors-MZURIB7V.js"),{commands:t}=await import("./commands-NQNH6NTF.js");r(e(process.argv)).scriptName("mud").command(t).strict().fail((a,n)=>{console.error(o.red(a)),a.includes("Missing required argument")&&console.log(o.yellow(`Run 'pnpm mud ${process.argv[2]} --help' for a list of available and required arguments.`)),console.log(""),n!=null&&(s(n),console.log("")),process.exit(1)}).alias({h:"help"}).argv}l();
 //# sourceMappingURL=mud.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@latticexyz/cli",
-  "version": "2.0.8-not-npmignore-cache-2d3a1a18",
+  "version": "2.0.8-not-npmignore-cache-a91bf9e0",
   "description": "Command line interface for mud",
   "repository": {
     "type": "git",
@@ -44,17 +44,17 @@
     "yargs": "^17.7.1",
     "zod": "^3.21.4",
     "zod-validation-error": "^1.3.0",
-    "@latticexyz/abi-ts": "2.0.8-not-npmignore-cache-2d3a1a18",
-    "@latticexyz/common": "2.0.8-not-npmignore-cache-2d3a1a18",
-    "@latticexyz/config": "2.0.8-not-npmignore-cache-2d3a1a18",
-    "@latticexyz/gas-report": "2.0.8-not-npmignore-cache-2d3a1a18",
-    "@latticexyz/protocol-parser": "2.0.8-not-npmignore-cache-2d3a1a18",
-    "@latticexyz/schema-type": "2.0.8-not-npmignore-cache-2d3a1a18",
-    "@latticexyz/services": "2.0.8-not-npmignore-cache-2d3a1a18",
-    "@latticexyz/store": "2.0.8-not-npmignore-cache-2d3a1a18",
-    "@latticexyz/utils": "2.0.8-not-npmignore-cache-2d3a1a18",
-    "@latticexyz/world": "2.0.8-not-npmignore-cache-2d3a1a18",
-    "@latticexyz/world-modules": "2.0.8-not-npmignore-cache-2d3a1a18"
+    "@latticexyz/abi-ts": "2.0.8-not-npmignore-cache-a91bf9e0",
+    "@latticexyz/common": "2.0.8-not-npmignore-cache-a91bf9e0",
+    "@latticexyz/config": "2.0.8-not-npmignore-cache-a91bf9e0",
+    "@latticexyz/gas-report": "2.0.8-not-npmignore-cache-a91bf9e0",
+    "@latticexyz/protocol-parser": "2.0.8-not-npmignore-cache-a91bf9e0",
+    "@latticexyz/schema-type": "2.0.8-not-npmignore-cache-a91bf9e0",
+    "@latticexyz/services": "2.0.8-not-npmignore-cache-a91bf9e0",
+    "@latticexyz/store": "2.0.8-not-npmignore-cache-a91bf9e0",
+    "@latticexyz/utils": "2.0.8-not-npmignore-cache-a91bf9e0",
+    "@latticexyz/world": "2.0.8-not-npmignore-cache-a91bf9e0",
+    "@latticexyz/world-modules": "2.0.8-not-npmignore-cache-a91bf9e0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",

package/src/commands/verify.ts

@@ -25,7 +25,7 @@ const verifyOptions = {
     desc: "Enable batch processing of RPC requests in viem client (defaults to batch size of 100 and wait of 1s)",
   },
   srcDir: { type: "string", desc: "Source directory. Defaults to foundry src directory." },
-  verifier: { type: "string", desc: "The verifier to use" },
+  verifier: { type: "string", desc: "The verifier to use. Default to sourcify", default: "sourcify" },
   verifierUrl: {
     type: "string",
     desc: "The verification provider.",
@@ -97,7 +97,6 @@ const commandModule: CommandModule<Options, Options> = {
     await verify({
       client,
       rpc,
-      foundryProfile: profile,
       systems,
       modules,
       deployerAddress: opts.deployerAddress as Hex | undefined,

package/src/verify/verifyContract.ts

@@ -7,11 +7,10 @@ type VerifyContractOptions = {
   verifier?: string;
   verifierUrl?: string;
   address: Address;
+  cwd?: string;
 };
 
-type ForgeOptions = { profile?: string; silent?: boolean; env?: NodeJS.ProcessEnv; cwd?: string };
-
-export async function verifyContract(options: VerifyContractOptions, forgeOptions?: ForgeOptions) {
+export async function verifyContract(options: VerifyContractOptions) {
   const args = ["verify-contract", options.address, options.name, "--rpc-url", options.rpc];
 
   if (options.verifier) {
@@ -20,5 +19,5 @@ export async function verifyContract(options: VerifyContractOptions, forgeOption
   if (options.verifierUrl) {
     args.push("--verifier-url", options.verifierUrl);
   }
-  await forge(args, forgeOptions);
+  await forge(args, { cwd: options.cwd });
 }

package/src/verify.ts

@@ -12,8 +12,7 @@ import { execa } from "execa";
 type VerifyOptions = {
   client: Client<Transport, Chain | undefined>;
   rpc: string;
-  foundryProfile?: string;
-  verifier?: string;
+  verifier: string;
   verifierUrl?: string;
   systems: { name: string; bytecode: Hex }[];
   modules: { name: string; bytecode: Hex }[];
@@ -31,7 +30,6 @@ const ERC1967_IMPLEMENTATION_SLOT = "0x360894a13ba1a3210667c828492db98dca3e2076c
 export async function verify({
   client,
   rpc,
-  foundryProfile = process.env.FOUNDRY_PROFILE,
   systems,
   modules,
   worldAddress,
@@ -55,133 +53,124 @@ export async function verify({
 
   systems.map(({ name, bytecode }) =>
     verifyQueue.add(() =>
-      verifyContract(
-        {
-          name,
-          rpc,
-          verifier,
-          verifierUrl,
-          address: getCreate2Address({
-            from: deployerAddress,
-            bytecode: bytecode,
-            salt,
-          }),
-        },
-        { profile: foundryProfile },
-      ).catch((error) => {
+      verifyContract({
+        name,
+        rpc,
+        verifier,
+        verifierUrl,
+        address: getCreate2Address({
+          from: deployerAddress,
+          bytecode: bytecode,
+          salt,
+        }),
+      }).catch((error) => {
         console.error(`Error verifying system contract ${name}:`, error);
       }),
     ),
   );
 
-  {
-    const cwd = "node_modules/@latticexyz/world";
-
+  // If the verifier is Sourcify, attempt to verify MUD core contracts
+  // There are path issues with verifying Blockscout and Etherscan
+  if (verifier === "sourcify") {
+    // Install subdependencies so contracts can compile
+    await execa("npm", ["install"], {
+      cwd: "node_modules/@latticexyz/store",
+    });
     await execa("npm", ["install"], {
-      cwd,
+      cwd: "node_modules/@latticexyz/world",
+    });
+    await execa("npm", ["install"], {
+      cwd: "node_modules/@latticexyz/world-modules",
     });
 
     Object.entries(
       usesProxy ? getWorldProxyFactoryContracts(deployerAddress) : getWorldFactoryContracts(deployerAddress),
     ).map(([name, { bytecode }]) =>
       verifyQueue.add(() =>
-        verifyContract(
-          {
-            name,
-            rpc,
-            verifier,
-            verifierUrl,
-            address: getCreate2Address({
-              from: deployerAddress,
-              bytecode: bytecode,
-              salt,
-            }),
-          },
-          {
-            profile: foundryProfile,
-            cwd,
-          },
-        ).catch((error) => {
+        verifyContract({
+          cwd: "node_modules/@latticexyz/world",
+          name,
+          rpc,
+          verifier,
+          verifierUrl,
+          address: getCreate2Address({
+            from: deployerAddress,
+            bytecode: bytecode,
+            salt,
+          }),
+        }).catch((error) => {
           console.error(`Error verifying world factory contract ${name}:`, error);
         }),
       ),
     );
-  }
-
-  {
-    const cwd = "node_modules/@latticexyz/world-modules";
-
-    await execa("npm", ["install"], {
-      cwd,
-    });
 
     modules.map(({ name, bytecode }) =>
       verifyQueue.add(() =>
-        verifyContract(
-          {
-            name: name,
-            rpc,
-            verifier,
-            verifierUrl,
-            address: getCreate2Address({
-              from: deployerAddress,
-              bytecode: bytecode,
-              salt,
-            }),
-          },
-          {
-            profile: foundryProfile,
-            cwd,
-          },
-        ).catch((error) => {
+        verifyContract({
+          cwd: "node_modules/@latticexyz/world-modules",
+          name: name,
+          rpc,
+          verifier,
+          verifierUrl,
+          address: getCreate2Address({
+            from: deployerAddress,
+            bytecode: bytecode,
+            salt,
+          }),
+        }).catch((error) => {
           console.error(`Error verifying module contract ${name}:`, error);
         }),
       ),
     );
-  }
-
-  {
-    const cwd = "node_modules/@latticexyz/world";
 
     // If the world was deployed as a Proxy, verify the proxy and implementation.
     if (usesProxy) {
       const implementationAddress = sliceHex(implementationStorage, -20);
 
       verifyQueue.add(() =>
-        verifyContract(
-          { name: "WorldProxy", rpc, verifier, verifierUrl, address: worldAddress },
-          {
-            profile: foundryProfile,
-            cwd,
-          },
-        ).catch((error) => {
+        verifyContract({
+          cwd: "node_modules/@latticexyz/world",
+          name: "WorldProxy",
+          rpc,
+          verifier,
+          verifierUrl,
+          address: worldAddress,
+        }).catch((error) => {
           console.error(`Error verifying WorldProxy contract:`, error);
         }),
       );
 
       verifyQueue.add(() =>
-        verifyContract(
-          { name: "World", rpc, verifier, verifierUrl, address: implementationAddress },
-          {
-            profile: foundryProfile,
-            cwd,
-          },
-        ).catch((error) => {
+        verifyContract({
+          cwd: "node_modules/@latticexyz/world",
+          name: "World",
+          rpc,
+          verifier,
+          verifierUrl,
+          address: implementationAddress,
+        }).catch((error) => {
           console.error(`Error verifying World contract:`, error);
         }),
       );
     } else {
       verifyQueue.add(() =>
-        verifyContract(
-          { name: "World", rpc, verifier, verifierUrl, address: worldAddress },
-          {
-            profile: foundryProfile,
-            cwd: "node_modules/@latticexyz/world",
-          },
-        ).catch((error) => {
+        verifyContract({
+          cwd: "node_modules/@latticexyz/world",
+          name: "World",
+          rpc,
+          verifier,
+          verifierUrl,
+          address: worldAddress,
+        }).catch((error) => {
           console.error(`Error verifying World contract:`, error);
         }),
       );
     }
+  } else {
+    console.log("");
+    console.log(
+      `Note: MUD is currently unable to verify store, world, and world-modules contracts with ${verifier}. We are planning to expand support in a future version.`,
+    );
+    console.log("");
   }
 }