@cartesi/cli 2.0.0-alpha.14 → 2.0.0-alpha.16

package/dist/base.d.ts

@@ -2,7 +2,7 @@ import { type Address, type Hash } from "viem";
 import { type Config } from "./config.js";
 export declare const getContextPath: (...paths: string[]) => string;
 export declare const getMachineHash: () => Hash | undefined;
-export declare const getApplicationConfig: (configPath: string) => Config;
+export declare const getApplicationConfig: (configPaths: string[]) => Config;
 export declare const getProjectName: (options: {
     projectName?: string;
 }) => string;

package/dist/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,IAAI,EAKZ,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,KAAK,MAAM,EAAS,MAAM,aAAa,CAAC;AAkBjD,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,YAAY,MAAM,KAAG,MAIzD,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;AAqBF,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"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../src/base.ts"],"names":[],"mappings":"AAIA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,IAAI,EAKZ,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,KAAK,MAAM,EAAS,MAAM,aAAa,CAAC;AAkBjD,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;AAqBF,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

@@ -20,10 +20,17 @@ export const getMachineHash = () => {
     }
     return undefined;
 };
-export const getApplicationConfig = (configPath) => {
-    return fs.existsSync(configPath)
-        ? parse(fs.readFileSync(configPath).toString())
-        : parse("");
+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());

package/dist/builder/directory.d.ts

@@ -1,3 +1,3 @@
 import type { DirectoryDriveConfig } from "../config.js";
-export declare const build: (name: string, drive: DirectoryDriveConfig, sdkImage: string, destination: string) => Promise<undefined>;
+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,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,eAAO,MAAM,KAAK,GACd,MAAM,MAAM,EACZ,OAAO,oBAAoB,EAC3B,UAAU,MAAM,EAChB,aAAa,MAAM,KACpB,OAAO,CAAC,SAAS,CAkCnB,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 "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

@@ -5,6 +5,6 @@ type ImageInfo = {
     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,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;AA+DF,eAAO,MAAM,KAAK,GACd,MAAM,MAAM,EACZ,OAAO,iBAAiB,EACxB,UAAU,MAAM,EAChB,aAAa,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 "node:path";
-import tmp from "tmp";
-import { crane, genext2fs, mksquashfs } from "../exec/index.js";
+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.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
@@ -54,33 +60,28 @@ const getImageInfo = async (image) => {
     };
     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 type { EmptyDriveConfig } from "../config.js";
-export declare const build: (name: string, drive: EmptyDriveConfig, sdkImage: string, destination: string) => Promise<undefined>;
+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,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,SAAS,CAoBnB,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/none.d.ts

@@ -1,3 +1,3 @@
 import { type ExistingDriveConfig } from "../config.js";
-export declare const build: (name: string, drive: ExistingDriveConfig, destination: string) => Promise<undefined>;
+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,KAAK,mBAAmB,EAAkB,MAAM,cAAc,CAAC;AAExE,eAAO,MAAM,KAAK,GACd,MAAM,MAAM,EACZ,OAAO,mBAAmB,EAC1B,aAAa,MAAM,KACpB,OAAO,CAAC,SAAS,CAQnB,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/tar.d.ts

@@ -1,3 +1,3 @@
 import type { TarDriveConfig } from "../config.js";
-export declare const build: (name: string, drive: TarDriveConfig, sdkImage: string, destination: string) => Promise<undefined>;
+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,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,SAAS,CA4BnB,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/commands/build.d.ts

@@ -1,6 +1,8 @@
 import { Command } from "@commander-js/extra-typings";
 export declare const createBuildCommand: () => Command<[], {
-    config: string;
+    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":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAwCtD,eAAO,MAAM,kBAAkB;;;MAoD9B,CAAC"}
+{"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,61 +1,97 @@
-import { Command } from "@commander-js/extra-typings";
+import { Command, Option } from "@commander-js/extra-typings";
+import chalk from "chalk";
 import fs from "fs-extra";
+import { Listr } from "listr2";
 import path from "node:path";
 import tmp from "tmp";
 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);
-        }
-    }
-};
+        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", "cartesi.toml")
+        .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")
-        .action(async ({ config, drivesOnly }) => {
+        .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 c = getApplicationConfig(config);
+        const config = getApplicationConfig(options.config);
         // destination directory for image and intermediate files
         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(c.drives).reduce((acc, [name, drive]) => {
-            acc[name] = buildDrive(name, drive, c.sdk, destination);
-            return acc;
-        }, {});
-        // await for all drives to be built
-        await Promise.all(Object.values(results));
+        // 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) {
-            // only build drives, so quit here
             return;
         }
-        // get image info of root drive
-        const root = await results.root;
-        const imageInfo = root || undefined;
-        // path of machine snapshot
-        const snapshotPath = getContextPath("image");
         // create machine snapshot
-        await bootMachine(c, imageInfo, destination);
-        await fs.chmod(snapshotPath, 0o755);
+        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);
     });
 };

package/dist/commands/deposit/erc20.d.ts

@@ -1,7 +1,6 @@
 import { Command } from "@commander-js/extra-typings";
 export declare const createErc20Command: () => Command<[string | undefined], {
-    token?: string | undefined;
-    execLayerData: string;
+    [x: string]: never;
 }, {
     from?: string | undefined;
     application?: string | undefined;

package/dist/commands/deposit/erc20.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"erc20.d.ts","sourceRoot":"","sources":["../../../src/commands/deposit/erc20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AA4EtD,eAAO,MAAM,kBAAkB;;;;;;;;EAyG9B,CAAC"}
+{"version":3,"file":"erc20.d.ts","sourceRoot":"","sources":["../../../src/commands/deposit/erc20.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AA4EtD,eAAO,MAAM,kBAAkB;;;;;;;EAwG9B,CAAC"}

package/dist/commands/deposit/erc20.js

@@ -38,7 +38,6 @@ const parseToken = async (options) => {
     return readToken(testClient, address);
 };
 export const createErc20Command = () => {
-    // biome-ignore lint/complexity/noBannedTypes: commander pattern
     return new Command("erc20")
         .description("Deposit ERC-20 to the application")
         .configureHelp({ showGlobalOptions: true })
@@ -97,7 +96,7 @@ export const createErc20Command = () => {
         const amountLabel = `${chalk.cyan(formatUnits(amount, decimals))} ${symbol}`;
         // approve if needed
         if (allowance < amount) {
-            progress.start(`Approving ${amountStr}...`);
+            progress.start(`Approving ${amountLabel}...`);
             const { request } = await testClient.simulateContract({
                 abi: erc20Abi,
                 account,
@@ -107,7 +106,7 @@ export const createErc20Command = () => {
             });
             const hash = await testClient.writeContract(request);
             await testClient.waitForTransactionReceipt({ hash });
-            progress.succeed(`Approved ${amountStr}`);
+            progress.succeed(`Approved ${amountLabel}`);
         }
         // simulate deposit call
         const { request } = await testClient.simulateContract({

package/dist/commands/deposit/erc721.d.ts

@@ -1,8 +1,6 @@
 import { Command } from "@commander-js/extra-typings";
 export declare const createErc721Command: () => Command<[string | undefined], {
-    token?: string | undefined;
-    baseLayerData: string;
-    execLayerData: string;
+    [x: string]: never;
 }, {
     from?: string | undefined;
     application?: string | undefined;

package/dist/commands/deposit/erc721.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"erc721.d.ts","sourceRoot":"","sources":["../../../src/commands/deposit/erc721.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAuEtD,eAAO,MAAM,mBAAmB;;;;;;;;;EAoI/B,CAAC"}
+{"version":3,"file":"erc721.d.ts","sourceRoot":"","sources":["../../../src/commands/deposit/erc721.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAuEtD,eAAO,MAAM,mBAAmB;;;;;;;EAmI/B,CAAC"}

package/dist/commands/deposit/erc721.js

@@ -33,7 +33,6 @@ const parseToken = async (options) => {
     return readToken(testClient, address);
 };
 export const createErc721Command = () => {
-    // biome-ignore lint/complexity/noBannedTypes: commander pattern
     return new Command("erc721")
         .description("Deposit ERC-721 to the application")
         .configureHelp({ showGlobalOptions: true })

package/dist/commands/deposit/ether.d.ts

@@ -1,6 +1,6 @@
 import { Command } from "@commander-js/extra-typings";
 export declare const createEtherCommand: () => Command<[string | undefined], {
-    execLayerData: string;
+    [x: string]: never;
 }, {
     from?: string | undefined;
     application?: string | undefined;

package/dist/commands/deposit/ether.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ether.d.ts","sourceRoot":"","sources":["../../../src/commands/deposit/ether.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAUtD,eAAO,MAAM,kBAAkB;;;;;;;EAyE9B,CAAC"}
+{"version":3,"file":"ether.d.ts","sourceRoot":"","sources":["../../../src/commands/deposit/ether.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAUtD,eAAO,MAAM,kBAAkB;;;;;;;EAwE9B,CAAC"}

package/dist/commands/deposit/ether.js

@@ -7,7 +7,6 @@ import { etherPortalAbi, etherPortalAddress } from "../../contracts.js";
 import { bigintInput, getInputApplicationAddress } from "../../prompts.js";
 import { connect } from "../../wallet.js";
 export const createEtherCommand = () => {
-    // biome-ignore lint/complexity/noBannedTypes: commander pattern
     return new Command("ether")
         .description("Deposit ether to the application")
         .configureHelp({ showGlobalOptions: true })

package/dist/commands/deposit.js

@@ -11,7 +11,7 @@ export const createDepositCommand = () => {
         .option("--application <address>", "application address")
         .option("--project-name <string>", "name of project (used by docker compose and cartesi-rollups-node)")
         .option("--rpc-url <url>", "RPC URL of the Cartesi Devnet")
-        .action(async (options, command) => {
+        .action(async (_options, command) => {
         // get registered subcommands
         const commands = command.commands;
         // create choices for the selected prompt based on registered subcommands

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

@@ -1 +1 @@
-{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAItD,eAAO,MAAM,iBAAiB;;;;;;;MA4C7B,CAAC"}
+{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../src/commands/logs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAItD,eAAO,MAAM,iBAAiB;;;;;;;MA6C7B,CAAC"}

package/dist/commands/logs.js

@@ -11,7 +11,7 @@ export const createLogsCommand = () => {
         .option("-n, --tail <string>", "Number of lines to show from the end of the logs", "all")
         .option("--until <string>", "Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)")
         .configureHelp({ showGlobalOptions: true })
-        .action(async (options, command) => {
+        .action(async (options) => {
         const { follow, color, since, tail, until } = options;
         const projectName = getProjectName(options);
         const logOptions = ["--no-log-prefix"];
@@ -23,6 +23,8 @@ export const createLogsCommand = () => {
             logOptions.push("--since", since);
         if (tail)
             logOptions.push("--tail", tail);
+        if (until)
+            logOptions.push("--until", until);
         await execa("docker", [
             "compose",
             "--project-name",

package/dist/commands/run.js

@@ -13,7 +13,7 @@ const commaSeparatedList = (value) => value.split(",");
 const shell = async (options) => {
     const { build, epochLength, log, projectName } = options;
     // keep track of last deployment
-    let lastDeployment = undefined;
+    let lastDeployment;
     let salt = 0;
     // deploy for the first time
     const hash = getMachineHash();

package/dist/commands/send.js

@@ -50,7 +50,7 @@ const getInput = async (input, options) => {
                         try {
                             return BigInt(v);
                         }
-                        catch (e) {
+                        catch {
                             throw new Error(`Invalid uint value: ${v}`);
                         }
                     case "bytes":
@@ -95,7 +95,7 @@ export const createSendCommand = () => {
         .option("--abi-params <abi-params>", "input abi params")
         .option("--project-name <string>", "name of project (used by docker compose and cartesi-rollups-node)")
         .option("--rpc-url <url>", "RPC URL of the Cartesi Devnet")
-        .action(async (input, options, program) => {
+        .action(async (input, options) => {
         const { application, from } = options;
         const projectName = getProjectName(options);
         // connect to anvil

package/dist/commands/shell.d.ts

@@ -1,7 +1,7 @@
 import { Command } from "@commander-js/extra-typings";
-export declare const createShellCommand: () => Command<[string | undefined], {
+export declare const createShellCommand: () => Command<[], {
     command: string;
-    config: string;
+    config: string[];
     runAsRoot: boolean;
 }, {}>;
 //# sourceMappingURL=shell.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/commands/shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAOtD,eAAO,MAAM,kBAAkB;;;;MAiD9B,CAAC"}
+{"version":3,"file":"shell.d.ts","sourceRoot":"","sources":["../../src/commands/shell.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAOtD,eAAO,MAAM,kBAAkB;;;;MAuD9B,CAAC"}

package/dist/commands/shell.js

@@ -1,21 +1,22 @@
 import { Command } from "@commander-js/extra-typings";
+import { ExecaError } from "execa";
 import fs from "fs-extra";
 import path from "node:path";
 import { getApplicationConfig, getContextPath } from "../base.js";
 import { bootMachine } from "../machine.js";
 export const createShellCommand = () => {
     return new Command("shell")
-        .argument("[image]", "image ID|name")
         .option("--command <command>", "shell command to run", "/bin/sh")
-        .option("-c, --config <config>", "path to the configuration file", "cartesi.toml")
+        .option("-c, --config <config>", "path to the configuration file", (value, prev) => prev.concat([value]), ["cartesi.toml"])
         .option("--run-as-root", "run as root user", false)
-        .action(async (image, { command, config, runAsRoot }) => {
+        .action(async (options) => {
+        const { command, runAsRoot } = options;
         // get application configuration from 'cartesi.toml'
-        const c = getApplicationConfig(config);
+        const config = getApplicationConfig(options.config);
         // destination directory for image and intermediate files
         const destination = path.resolve(getContextPath());
         // check if all drives are built
-        for (const [name, drive] of Object.entries(c.drives)) {
+        for (const [name, drive] of Object.entries(config.drives)) {
             const filename = `${name}.${drive.format}`;
             const pathname = getContextPath(filename);
             if (!fs.existsSync(pathname)) {
@@ -23,21 +24,25 @@ export const createShellCommand = () => {
             }
         }
         // create shell entrypoint
-        const info = {
-            cmd: [],
-            entrypoint: [command],
-            env: [],
-            workdir: "/",
-        };
-        // start with interactive mode on
-        c.machine.interactive = true;
-        // interactive mode can't have final hash
-        c.machine.finalHash = false;
-        // do not store machine in interactive mode
-        c.machine.store = undefined;
+        config.machine.entrypoint = command;
         // run as root if flag is set
-        c.machine.user = runAsRoot ? "root" : undefined;
+        config.machine.user = runAsRoot ? "root" : undefined;
         // boot machine
-        await bootMachine(c, info, destination);
+        try {
+            await bootMachine(config, undefined, { interactive: true }, // start with interactive mode on
+            {
+                cwd: destination,
+                stdio: "inherit",
+            });
+        }
+        catch (error) {
+            if (error instanceof ExecaError) {
+                // just continue gracefully
+                if (error.exitCode === 130) {
+                    return;
+                }
+                throw error;
+            }
+        }
     });
 };