@cartesi/cli 2.0.0-alpha.2 → 2.0.0-alpha.20

package/dist/base.d.ts

@@ -0,0 +1,28 @@
+import { type Address, type Hash } from "viem";
+import { type Config } from "./config.js";
+import type { PsResponse } from "./types/docker.js";
+export declare const getContextPath: (...paths: string[]) => string;
+export declare const getMachineHash: () => Hash | undefined;
+export declare const getApplicationConfig: (configPaths: string[]) => Config;
+export declare const getProjectName: (options: {
+    projectName?: string;
+}) => string;
+export type AddressBook = Record<string, Address>;
+export declare const getAddressBook: (options: {
+    projectName?: string;
+}) => Promise<AddressBook>;
+export declare const getServiceInfo: (options: {
+    projectName: string;
+    service: string;
+}) => Promise<PsResponse | undefined>;
+export declare const getServiceState: (options: {
+    projectName: string;
+    service: string;
+}) => Promise<string | undefined>;
+export declare const getServiceHealth: (options: {
+    projectName: string;
+    service: string;
+}) => Promise<string | undefined>;
+export declare const parseAddress: (value: string) => Address | undefined;
+export declare const parseHash: (value: string) => Hash;
+//# sourceMappingURL=base.d.ts.map

package/dist/base.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,KAAK,OAAO,EAEZ,KAAK,IAAI,EAIZ,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,KAAK,MAAM,EAAS,MAAM,aAAa,CAAC;AAgBjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,eAAO,MAAM,cAAc,GAAI,GAAG,OAAO,MAAM,EAAE,KAAG,MAEnD,CAAC;AAEF,eAAO,MAAM,cAAc,QAAO,IAAI,GAAG,SAUxC,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,aAAa,MAAM,EAAE,KAAG,MAW5D,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,SAAS;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,WAE/D,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAElD,eAAO,MAAM,cAAc,GAAU,SAAS;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,KAAG,OAAO,CAAC,WAAW,CAkCtB,CAAC;AAEF,eAAO,MAAM,cAAc,GAAU,SAAS;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACnB,KAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAcjC,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,SAAS;IAC3C,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACnB,KAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAG7B,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAU,SAAS;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACnB,KAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAG7B,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,OAAO,MAAM,KAAG,OAAO,GAAG,SAQtD,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,OAAO,MAAM,KAAG,IAQzC,CAAC"}

package/dist/base.js

@@ -0,0 +1,109 @@
+import { InvalidArgumentError } from "@commander-js/extra-typings";
+import { execa } from "execa";
+import fs from "node:fs";
+import path from "node:path";
+import { getAddress, isAddress, isHash, zeroHash, } from "viem";
+import { parse } from "./config.js";
+import { applicationFactoryAddress, authorityFactoryAddress, erc1155BatchPortalAddress, erc1155SinglePortalAddress, erc20PortalAddress, erc721PortalAddress, etherPortalAddress, inputBoxAddress, selfHostedApplicationFactoryAddress, testMultiTokenAddress, testNftAddress, testTokenAddress, } from "./contracts.js";
+import { getApplicationAddress } from "./exec/rollups.js";
+export const getContextPath = (...paths) => {
+    return path.join(".cartesi", ...paths);
+};
+export const getMachineHash = () => {
+    // read hash of the cartesi machine snapshot, if one exists
+    const hashPath = getContextPath("image", "hash");
+    if (fs.existsSync(hashPath)) {
+        const hash = fs.readFileSync(hashPath).toString("hex");
+        if (isHash(`0x${hash}`)) {
+            return `0x${hash}`;
+        }
+    }
+    return undefined;
+};
+export const getApplicationConfig = (configPaths) => {
+    const tomls = configPaths.map((configPath) => {
+        if (fs.existsSync(configPath)) {
+            return fs.readFileSync(configPath).toString();
+        }
+        if (configPath === "cartesi.toml") {
+            return "";
+        }
+        throw new Error(`Config file ${configPath} does not exist`);
+    });
+    return parse(tomls);
+};
+export const getProjectName = (options) => {
+    return options.projectName ?? path.basename(process.cwd());
+};
+export const getAddressBook = async (options) => {
+    const applicationAddress = await getApplicationAddress(options);
+    // build rollups contracts address book
+    const contracts = {
+        ApplicationFactory: applicationFactoryAddress,
+        AuthorityFactory: authorityFactoryAddress,
+        EntryPointV06: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789",
+        EntryPointV07: "0x0000000071727De22E5E9d8BAf0edAc6f37da032",
+        ERC1155BatchPortal: erc1155BatchPortalAddress,
+        ERC1155SinglePortal: erc1155SinglePortalAddress,
+        ERC20Portal: erc20PortalAddress,
+        ERC721Portal: erc721PortalAddress,
+        EtherPortal: etherPortalAddress,
+        InputBox: inputBoxAddress,
+        LightAccountFactory: "0x00004EC70002a32400f8ae005A26081065620D20",
+        SelfHostedApplicationFactory: selfHostedApplicationFactoryAddress,
+        SimpleAccountFactory: "0x9406Cc6185a346906296840746125a0E44976454",
+        SmartAccountFactory: "0x000000a56Aaca3e9a4C479ea6b6CD0DbcB6634F5",
+        KernelFactoryV2: "0x5de4839a76cf55d0c90e2061ef4386d962E15ae3",
+        KernelFactoryV3: "0x6723b44Abeec4E71eBE3232BD5B455805baDD22f",
+        KernelFactoryV3_1: "0xaac5D4240AF87249B3f71BC8E4A2cae074A3E419",
+        TestToken: testTokenAddress,
+        TestNFT: testNftAddress,
+        TestMultiToken: testMultiTokenAddress,
+        VerifyingPaymasterV06: "0x28ec0633192d0cBd9E1156CE05D5FdACAcB93947",
+        VerifyingPaymasterV07: "0xc5c97885C67F7361aBAfD2B95067a5bBdA603608",
+    };
+    if (applicationAddress) {
+        contracts.Application = applicationAddress;
+    }
+    return contracts;
+};
+export const getServiceInfo = async (options) => {
+    const { projectName, service } = options;
+    // get service information
+    const { stdout } = await execa("docker", [
+        "compose",
+        "--project-name",
+        projectName,
+        "ps",
+        service,
+        "--format",
+        "json",
+    ]);
+    return stdout ? JSON.parse(stdout) : undefined;
+};
+export const getServiceState = async (options) => {
+    const info = await getServiceInfo(options);
+    return info?.State;
+};
+export const getServiceHealth = async (options) => {
+    const info = await getServiceInfo(options);
+    return info?.Health;
+};
+export const parseAddress = (value) => {
+    if (isAddress(value)) {
+        return getAddress(value);
+    }
+    if (value !== "") {
+        throw new InvalidArgumentError(`Invalid address: ${value}`);
+    }
+    return undefined;
+};
+export const parseHash = (value) => {
+    if (isHash(value)) {
+        return value;
+    }
+    if (value !== "") {
+        throw new InvalidArgumentError(`Invalid hash: ${value}`);
+    }
+    return zeroHash;
+};

package/dist/builder/directory.d.ts

@@ -1,3 +1,3 @@
-import { DirectoryDriveConfig } from "../config.js";
-export declare const build: (name: string, drive: DirectoryDriveConfig, sdkImage: string, destination: string) => Promise<void>;
+import type { DirectoryDriveConfig } from "../config.js";
+export declare const build: (name: string, drive: DirectoryDriveConfig, sdkImage: string, destination: string, debug: boolean) => Promise<void>;
 //# sourceMappingURL=directory.d.ts.map

package/dist/builder/directory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"directory.d.ts","sourceRoot":"","sources":["../../src/builder/directory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGpD,eAAO,MAAM,KAAK,SACR,MAAM,SACL,oBAAoB,YACjB,MAAM,eACH,MAAM,KACpB,OAAO,CAAC,IAAI,CAkCd,CAAC"}
+{"version":3,"file":"directory.d.ts","sourceRoot":"","sources":["../../src/builder/directory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,eAAO,MAAM,KAAK,GACd,MAAM,MAAM,EACZ,OAAO,oBAAoB,EAC3B,UAAU,MAAM,EAChB,aAAa,MAAM,EACnB,OAAO,OAAO,KACf,OAAO,CAAC,IAAI,CAoCd,CAAC"}

package/dist/builder/directory.js

@@ -1,7 +1,7 @@
 import fs from "fs-extra";
-import path from "path";
+import path from "node:path";
 import { genext2fs, mksquashfs } from "../exec/index.js";
-export const build = async (name, drive, sdkImage, destination) => {
+export const build = async (name, drive, sdkImage, destination, debug) => {
     const filename = `${name}.${drive.format}`;
     // copy directory to destination
     const dest = path.join(destination, name);
@@ -32,6 +32,8 @@ export const build = async (name, drive, sdkImage, destination) => {
     }
     finally {
         // delete copied
-        await fs.remove(dest);
+        if (!debug) {
+            await fs.remove(dest);
+        }
     }
 };

package/dist/builder/docker.d.ts

@@ -1,10 +1,10 @@
-import { DockerDriveConfig } from "../config.js";
+import type { DockerDriveConfig } from "../config.js";
 type ImageInfo = {
     cmd: string[];
     entrypoint: string[];
     env: string[];
     workdir: string;
 };
-export declare const build: (name: string, drive: DockerDriveConfig, sdkImage: string, destination: string) => Promise<ImageInfo | undefined>;
+export declare const build: (name: string, drive: DockerDriveConfig, sdkImage: string, destination: string, debug: boolean) => Promise<ImageInfo | undefined>;
 export {};
 //# sourceMappingURL=docker.d.ts.map

package/dist/builder/docker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../src/builder/docker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAQjD,KAAK,SAAS,GAAG;IACb,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AA+DF,eAAO,MAAM,KAAK,SACR,MAAM,SACL,iBAAiB,YACd,MAAM,eACH,MAAM,KACpB,OAAO,CAAC,SAAS,GAAG,SAAS,CA4D/B,CAAC"}
+{"version":3,"file":"docker.d.ts","sourceRoot":"","sources":["../../src/builder/docker.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAQtD,KAAK,SAAS,GAAG;IACb,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACnB,CAAC;AAiFF,eAAO,MAAM,KAAK,GACd,MAAM,MAAM,EACZ,OAAO,iBAAiB,EACxB,UAAU,MAAM,EAChB,aAAa,MAAM,EACnB,OAAO,OAAO,KACf,OAAO,CAAC,SAAS,GAAG,SAAS,CAsD/B,CAAC"}

package/dist/builder/docker.js

@@ -1,33 +1,39 @@
 import { execa } from "execa";
 import fs from "fs-extra";
-import path from "path";
-import tmp from "tmp";
-import { crane, genext2fs, mksquashfs } from "../exec/index.js";
+import path from "node:path";
+import { genext2fs, mksquashfs } from "../exec/index.js";
 /**
  * Build Docker image (linux/riscv64). Returns image id.
  */
 const buildImage = async (options) => {
-    const { context, dockerfile, tags, target } = options;
-    const buildResult = tmp.tmpNameSync();
+    const { buildArgs, context, destination, dockerfile, dockerfileContent, tags, target, } = options;
+    // if dockerfileContext is specified, use it as the dockerfile passed through stdin
     const args = [
         "buildx",
         "build",
         "--platform",
         "linux/riscv64",
         "--file",
-        dockerfile,
-        "--load",
-        "--iidfile",
-        buildResult,
-        context,
+        dockerfileContent ? "-" : dockerfile,
+        "--output",
+        "type=docker",
+        "--output",
+        `type=tar,dest=${destination}`,
+        "--progress",
+        "quiet",
     ];
     // set tags for the image built
-    args.push(...tags.map((tag) => ["--tag", tag]).flat());
+    args.push(...tags.flatMap((tag) => ["--tag", tag]));
+    // set build args
+    args.push(...buildArgs.flatMap((arg) => ["--build-arg", arg]));
     if (target) {
         args.push("--target", target);
     }
-    await execa("docker", args, { stdio: "inherit" });
-    return fs.readFileSync(buildResult, "utf8");
+    args.push(context);
+    const { stdout: imageId } = await execa("docker", args, {
+        input: dockerfileContent,
+    });
+    return imageId;
 };
 /**
  * Query the image using docker image inspect
@@ -43,44 +49,39 @@ const getImageInfo = async (image) => {
     // parse image info from docker inspect output
     const [imageInfo] = JSON.parse(jsonStr);
     // validate image architecture (must be riscv64)
-    if (imageInfo["Architecture"] !== "riscv64") {
-        throw new Error(`Invalid image Architecture: ${imageInfo["Architecture"]}. Expected riscv64`);
+    if (imageInfo.Architecture !== "riscv64") {
+        throw new Error(`Invalid image Architecture: ${imageInfo.Architecture}. Expected riscv64`);
     }
     const info = {
-        cmd: imageInfo["Config"]["Cmd"] ?? [],
-        entrypoint: imageInfo["Config"]["Entrypoint"] ?? [],
-        env: imageInfo["Config"]["Env"] || [],
-        workdir: imageInfo["Config"]["WorkingDir"],
+        cmd: imageInfo.Config.Cmd ?? [],
+        entrypoint: imageInfo.Config.Entrypoint ?? [],
+        env: imageInfo.Config.Env || [],
+        workdir: imageInfo.Config.WorkingDir,
     };
     return info;
 };
-export const build = async (name, drive, sdkImage, destination) => {
+export const build = async (name, drive, sdkImage, destination, debug) => {
     const { format } = drive;
-    const ocitar = `${name}.oci.tar`;
     const tar = `${name}.tar`;
     const filename = `${name}.${format}`;
     // use pre-existing image or build docker image
     let image;
     if (drive.image) {
-        image = drive.image;
-        await execa("docker", ["image", "pull", image]);
+        // build a docker image with `FROM <image>`
+        image = await buildImage({
+            ...drive,
+            destination: path.join(destination, tar),
+            dockerfileContent: `FROM ${drive.image}`,
+        });
     }
     else {
-        image = await buildImage(drive);
+        image = await buildImage({
+            ...drive,
+            destination: path.join(destination, tar),
+        });
     }
-    // get image info
     const imageInfo = await getImageInfo(image);
     try {
-        // create OCI Docker tarball from Docker image
-        await execa("docker", ["image", "save", image, "-o", ocitar], {
-            cwd: destination,
-        });
-        // create rootfs tar from OCI tar
-        await crane.exportImage({
-            stdin: fs.openSync(path.join(destination, ocitar), "r"),
-            stdout: fs.openSync(path.join(destination, tar), "w"),
-            image: sdkImage,
-        });
         switch (format) {
             case "ext2": {
                 await genext2fs.fromTar({
@@ -105,8 +106,9 @@ export const build = async (name, drive, sdkImage, destination) => {
     }
     finally {
         // delete intermediate files
-        await fs.remove(path.join(destination, ocitar));
-        await fs.remove(path.join(destination, tar));
+        if (!debug) {
+            await fs.remove(path.join(destination, tar));
+        }
     }
     return imageInfo;
 };

package/dist/builder/empty.d.ts

@@ -1,3 +1,3 @@
-import { EmptyDriveConfig } from "../config.js";
+import type { EmptyDriveConfig } from "../config.js";
 export declare const build: (name: string, drive: EmptyDriveConfig, sdkImage: string, destination: string) => Promise<void>;
 //# sourceMappingURL=empty.d.ts.map

package/dist/builder/empty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"empty.d.ts","sourceRoot":"","sources":["../../src/builder/empty.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,eAAO,MAAM,KAAK,SACR,MAAM,SACL,gBAAgB,YACb,MAAM,eACH,MAAM,KACpB,OAAO,CAAC,IAAI,CAoBd,CAAC"}
+{"version":3,"file":"empty.d.ts","sourceRoot":"","sources":["../../src/builder/empty.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGrD,eAAO,MAAM,KAAK,GACd,MAAM,MAAM,EACZ,OAAO,gBAAgB,EACvB,UAAU,MAAM,EAChB,aAAa,MAAM,KACpB,OAAO,CAAC,IAAI,CAoBd,CAAC"}

package/dist/builder/empty.js

@@ -1,5 +1,5 @@
 import fs from "fs-extra";
-import path from "path";
+import path from "node:path";
 import { genext2fs } from "../exec/index.js";
 export const build = async (name, drive, sdkImage, destination) => {
     const filename = `${name}.${drive.format}`;

package/dist/builder/none.d.ts

@@ -1,3 +1,3 @@
-import { ExistingDriveConfig } from "../config.js";
+import { type ExistingDriveConfig } from "../config.js";
 export declare const build: (name: string, drive: ExistingDriveConfig, destination: string) => Promise<void>;
 //# sourceMappingURL=none.d.ts.map

package/dist/builder/none.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"none.d.ts","sourceRoot":"","sources":["../../src/builder/none.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAkB,MAAM,cAAc,CAAC;AAEnE,eAAO,MAAM,KAAK,SACR,MAAM,SACL,mBAAmB,eACb,MAAM,KACpB,OAAO,CAAC,IAAI,CAQd,CAAC"}
+{"version":3,"file":"none.d.ts","sourceRoot":"","sources":["../../src/builder/none.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,mBAAmB,EAAkB,MAAM,cAAc,CAAC;AAExE,eAAO,MAAM,KAAK,GACd,MAAM,MAAM,EACZ,OAAO,mBAAmB,EAC1B,aAAa,MAAM,KACpB,OAAO,CAAC,IAAI,CAQd,CAAC"}

package/dist/builder/none.js

@@ -1,5 +1,5 @@
 import fs from "fs-extra";
-import path from "path";
+import path from "node:path";
 import { getDriveFormat } from "../config.js";
 export const build = async (name, drive, destination) => {
     // no need to build, drive already exists

package/dist/builder/tar.d.ts

@@ -1,3 +1,3 @@
-import { TarDriveConfig } from "../config.js";
+import type { TarDriveConfig } from "../config.js";
 export declare const build: (name: string, drive: TarDriveConfig, sdkImage: string, destination: string) => Promise<void>;
 //# sourceMappingURL=tar.d.ts.map

package/dist/builder/tar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tar.d.ts","sourceRoot":"","sources":["../../src/builder/tar.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAG9C,eAAO,MAAM,KAAK,SACR,MAAM,SACL,cAAc,YACX,MAAM,eACH,MAAM,KACpB,OAAO,CAAC,IAAI,CA4Bd,CAAC"}
+{"version":3,"file":"tar.d.ts","sourceRoot":"","sources":["../../src/builder/tar.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,eAAO,MAAM,KAAK,GACd,MAAM,MAAM,EACZ,OAAO,cAAc,EACrB,UAAU,MAAM,EAChB,aAAa,MAAM,KACpB,OAAO,CAAC,IAAI,CA4Bd,CAAC"}

package/dist/builder/tar.js

@@ -1,5 +1,5 @@
 import fs from "fs-extra";
-import path from "path";
+import path from "node:path";
 import { genext2fs, mksquashfs } from "../exec/index.js";
 export const build = async (name, drive, sdkImage, destination) => {
     const tar = `${name}.tar`;

package/dist/commands/address-book.d.ts

@@ -1,9 +1,6 @@
-import { AddressBook as AddressBookType, BaseCommand } from "../baseCommand.js";
-export default class AddressBook extends BaseCommand<typeof AddressBook> {
-    static summary: string;
-    static description: string;
-    static examples: string[];
-    static enableJsonFlag: boolean;
-    run(): Promise<AddressBookType>;
-}
+import { Command } from "@commander-js/extra-typings";
+export declare const createAddressBookCommand: () => Command<[], {
+    json?: true | undefined;
+    projectName?: string | undefined;
+}, {}>;
 //# sourceMappingURL=address-book.d.ts.map

package/dist/commands/address-book.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"address-book.d.ts","sourceRoot":"","sources":["../../src/commands/address-book.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,IAAI,eAAe,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,WAAW,CAAC,OAAO,WAAW,CAAC;IACpE,MAAM,CAAC,OAAO,SAAmD;IAEjE,MAAM,CAAC,WAAW,SACwF;IAE1G,MAAM,CAAC,QAAQ,WAA2C;IAE1D,OAAc,cAAc,UAAQ;IAEvB,GAAG,IAAI,OAAO,CAAC,eAAe,CAAC;CA+B/C"}
+{"version":3,"file":"address-book.d.ts","sourceRoot":"","sources":["../../src/commands/address-book.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAItD,eAAO,MAAM,wBAAwB;;;MA4CpC,CAAC"}

package/dist/commands/address-book.js

@@ -1,9 +1,16 @@
+import { Command } from "@commander-js/extra-typings";
 import Table from "cli-table3";
-import { BaseCommand } from "../baseCommand.js";
-class AddressBook extends BaseCommand {
-    async run() {
-        const addressBook = await super.getAddressBook();
-        if (!this.jsonEnabled()) {
+import { getAddressBook, getProjectName } from "../base.js";
+export const createAddressBookCommand = () => {
+    return new Command("address-book")
+        .description("Prints the addresses of all smart contracts deployed to the runtime environment of the application.")
+        .option("--json", "Format output as json.")
+        .option("--project-name <string>", "name of project (used by docker compose and cartesi-rollups-node)")
+        .action(async (options) => {
+        const { json } = options;
+        const projectName = getProjectName(options);
+        const addressBook = await getAddressBook({ projectName });
+        if (!json) {
             // print as a table
             const table = new Table({
                 head: ["Contract", "Address"],
@@ -29,12 +36,9 @@ class AddressBook extends BaseCommand {
             table.push(...Object.entries(addressBook));
             console.log(table.toString());
         }
-        // return (as json)
-        return addressBook;
-    }
-}
-AddressBook.summary = "Prints addresses of smart contracts deployed.";
-AddressBook.description = "Prints the addresses of all smart contracts deployed to the runtime environment of the application.";
-AddressBook.examples = ["<%= config.bin %> <%= command.id %>"];
-AddressBook.enableJsonFlag = true;
-export default AddressBook;
+        else {
+            // print as json
+            process.stdout.write(JSON.stringify(addressBook));
+        }
+    });
+};

package/dist/commands/build.d.ts

@@ -1,12 +1,8 @@
-import { BaseCommand } from "../baseCommand.js";
-export default class Build extends BaseCommand<typeof Build> {
-    static summary: string;
-    static description: string;
-    static examples: string[];
-    static flags: {
-        config: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        "drives-only": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-    };
-    run(): Promise<void>;
-}
+import { Command } from "@commander-js/extra-typings";
+export declare const createBuildCommand: () => Command<[], {
+    config: string[];
+    debug: boolean;
+    drivesOnly?: true | undefined;
+    verbose: boolean;
+}, {}>;
 //# sourceMappingURL=build.d.ts.map

package/dist/commands/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAoChD,MAAM,CAAC,OAAO,OAAO,KAAM,SAAQ,WAAW,CAAC,OAAO,KAAK,CAAC;IACxD,MAAM,CAAC,OAAO,SAAwB;IAEtC,MAAM,CAAC,WAAW,SAC+E;IAEjG,MAAM,CAAC,QAAQ,WAA2C;IAE1D,MAAM,CAAC,KAAK;;;MAUV;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2CpC"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,6BAA6B,CAAC;AAqE9D,eAAO,MAAM,kBAAkB;;;;;MAqF9B,CAAC"}

package/dist/commands/build.js

@@ -1,73 +1,97 @@
-import { Flags } from "@oclif/core";
+import { Command, Option } from "@commander-js/extra-typings";
+import chalk from "chalk";
 import fs from "fs-extra";
-import path from "path";
+import { Listr } from "listr2";
+import path from "node:path";
 import tmp from "tmp";
-import { BaseCommand } from "../baseCommand.js";
+import { getApplicationConfig, getContextPath } from "../base.js";
 import { buildDirectory, buildDocker, buildEmpty, buildNone, buildTar, } from "../builder/index.js";
 import { bootMachine } from "../machine.js";
-const buildDrive = async (name, drive, sdkImage, destination) => {
-    switch (drive.builder) {
-        case "directory": {
-            return buildDirectory(name, drive, sdkImage, destination);
+const buildDriveTask = (name, drive) => ({
+    title: `Building drive ${chalk.cyan(name)}`,
+    task: async (ctx, task) => {
+        const { config, debug, destination } = ctx;
+        const sdk = config.sdk;
+        switch (drive.builder) {
+            case "directory": {
+                await buildDirectory(name, drive, sdk, destination, debug);
+                break;
+            }
+            case "docker": {
+                const imageInfo = await buildDocker(name, drive, sdk, destination, debug);
+                if (imageInfo && name === "root") {
+                    // only set image info for root drive
+                    ctx.imageInfo = imageInfo;
+                }
+                break;
+            }
+            case "empty": {
+                await buildEmpty(name, drive, sdk, destination);
+                break;
+            }
+            case "tar": {
+                await buildTar(name, drive, sdk, destination);
+                break;
+            }
+            case "none": {
+                await buildNone(name, drive, destination);
+                break;
+            }
         }
-        case "docker": {
-            return buildDocker(name, drive, sdkImage, destination);
-        }
-        case "empty": {
-            return buildEmpty(name, drive, sdkImage, destination);
-        }
-        case "tar": {
-            return buildTar(name, drive, sdkImage, destination);
-        }
-        case "none": {
-            return buildNone(name, drive, destination);
-        }
-    }
-};
-class Build extends BaseCommand {
-    async run() {
-        const { flags } = await this.parse(Build);
+        task.title = `Build drive ${chalk.cyan(name)}`;
+    },
+});
+export const createBuildCommand = () => {
+    return new Command("build")
+        .description("Build application by building Cartesi machine drives, configuring a machine and booting it.")
+        .option("-c, --config <config>", "path to the configuration file", (value, prev) => prev.concat([value]), ["cartesi.toml"])
+        .addOption(new Option("--debug", "enable debug mode (do not remove intermediate files)")
+        .default(false)
+        .hideHelp())
+        .option("-d, --drives-only", "only build drives, do not boot machine")
+        .option("-v, --verbose", "verbose output", false)
+        .action(async (options) => {
+        const { debug, drivesOnly, verbose } = options;
         // clean up temp files we create along the process
         tmp.setGracefulCleanup();
         // get application configuration from 'cartesi.toml'
-        const config = this.getApplicationConfig(flags.config);
+        const config = getApplicationConfig(options.config);
         // destination directory for image and intermediate files
-        const destination = path.resolve(this.getContextPath());
+        const destination = path.resolve(getContextPath());
         // prepare context directory
         await fs.emptyDir(destination); // XXX: make it less error prone
-        // start build of all drives simultaneously
-        const results = Object.entries(config.drives).reduce((acc, [name, drive]) => {
-            acc[name] = buildDrive(name, drive, config.sdk, destination);
-            return acc;
-        }, {});
-        // await for all drives to be built
-        await Promise.all(Object.values(results));
-        if (flags["drives-only"]) {
-            // only build drives, so quit here
+        // build context
+        const ctx = { config, debug, destination, imageInfo: undefined };
+        // tasks to build drives
+        const driveTasks = Object.entries(config.drives).map(([name, drive]) => buildDriveTask(name, drive));
+        const builds = new Listr([
+            {
+                title: "Build drives",
+                task: async (_ctx, task) => {
+                    return task.newListr(driveTasks, {
+                        concurrent: true,
+                        rendererOptions: {
+                            collapseSubtasks: false,
+                        },
+                        ctx,
+                    });
+                },
+            },
+        ], { ctx, renderer: verbose ? "verbose" : "default" });
+        const result = await builds.run();
+        // if only build drives, quit here
+        if (drivesOnly) {
             return;
         }
-        // get image info of root drive
-        const root = await results["root"];
-        const imageInfo = root || undefined;
-        // path of machine snapshot
-        const snapshotPath = this.getContextPath("image");
         // create machine snapshot
-        await bootMachine(config, imageInfo, destination);
-        await fs.chmod(snapshotPath, 0o755);
-    }
-}
-Build.summary = "Build application.";
-Build.description = "Build application by building Cartesi machine drives, configuring a machine and booting it";
-Build.examples = ["<%= config.bin %> <%= command.id %>"];
-Build.flags = {
-    config: Flags.file({
-        char: "c",
-        default: "cartesi.toml",
-        summary: "path to the configuration file",
-    }),
-    "drives-only": Flags.boolean({
-        default: false,
-        summary: "only build drives",
-    }),
+        await bootMachine(config, result.imageInfo, {
+            finalHash: true,
+            store: "image",
+        }, {
+            cwd: destination,
+            stdio: "inherit",
+        });
+        // make snapshot readable by all users, because cartesi-machine sets to 600
+        await fs.chmod(path.join(destination, "image"), 0o755);
+    });
 };
-export default Build;