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

package/dist/compose/docker-compose-explorer.yaml

@@ -39,7 +39,7 @@ configs:
 
 services:
     explorer_api:
-        image: cartesi/rollups-explorer-api:1.0.0-alpha.4
+        image: cartesi/rollups-explorer-api:1.0.0
         environment:
             <<: *explorer_db_env
             GQL_PORT: 4350
@@ -50,8 +50,9 @@ services:
             test:
                 [
                     "CMD",
-                    "curl",
-                    "-fsS",
+                    "wget",
+                    "--spider",
+                    "-q",
                     "http://127.0.0.1:4350/graphql?query=%7B__typename%7D",
                 ]
             start_period: 10s
@@ -64,7 +65,7 @@ services:
                 condition: service_healthy
 
     squid_processor:
-        image: cartesi/rollups-explorer-api:1.0.0-alpha.4
+        image: cartesi/rollups-explorer-api:1.0.0
         environment:
             <<: *explorer_db_env
             CHAIN_IDS: ${CARTESI_BLOCKCHAIN_ID:-13370}
@@ -77,7 +78,10 @@ services:
                 condition: service_healthy
 
     explorer:
-        image: cartesi/rollups-explorer:1.0.0-alpha.3
+        image: cartesi/rollups-explorer:1.2.0
+        environment:
+            NODE_RPC_URL: "http://127.0.0.1:${CARTESI_LISTEN_PORT:-6751}/anvil"
+            EXPLORER_API_URL: "http://127.0.0.1:${CARTESI_LISTEN_PORT:-6751}/explorer-api/graphql"
         expose:
             - 3000
         depends_on:

package/dist/config.d.ts

@@ -48,6 +48,7 @@ export type DirectoryDriveConfig = {
 };
 export type DockerDriveConfig = {
     builder: "docker";
+    buildArgs: string[];
     context: string;
     dockerfile: string;
     extraSize: number;
@@ -81,13 +82,12 @@ export type MachineConfig = {
     assertRollingTemplate?: boolean;
     bootargs: string[];
     entrypoint?: string;
-    finalHash: boolean;
-    interactive?: boolean;
     maxMCycle?: bigint;
     noRollup?: boolean;
     ramLength: string;
-    ramImage: string;
-    store?: string;
+    ramImage?: string;
+    useDockerEnv: boolean;
+    useDockerWorkdir: boolean;
     user?: string;
 };
 export type Config = {
@@ -95,10 +95,30 @@ export type Config = {
     machine: MachineConfig;
     sdk: string;
 };
+type TomlTable = {
+    [key: string]: TomlPrimitive;
+};
 export declare const defaultRootDriveConfig: () => DriveConfig;
 export declare const defaultMachineConfig: () => MachineConfig;
 export declare const defaultConfig: () => Config;
 export declare const getDriveFormat: (filename: string) => DriveFormat;
-export declare const parse: (str: string) => Config;
+export declare const parse: (str: string[]) => Config;
+/**
+ * Recursively merges two TOML table objects
+ * Values from 'other' take precedence over 'base'
+ *
+ * @param base - The base TOML table
+ * @param other - The TOML table to merge into base (takes precedence)
+ * @returns A new merged TOML table
+ */
+export declare function mergeTomlTables(base: TomlTable, other: TomlTable): TomlTable;
+/**
+ * Merges two TOML values of any type
+ *
+ * @param base - The base TOML value
+ * @param other - The TOML value to merge into base (takes precedence)
+ * @returns The merged TOML value
+ */
+export declare function mergeTomlValues(base: TomlPrimitive, other: TomlPrimitive): TomlPrimitive;
 export {};
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}

package/dist/config.js

@@ -63,12 +63,12 @@ export class InvalidStringArrayError extends Error {
  */
 const DEFAULT_FORMAT = "ext2";
 const DEFAULT_RAM = "128Mi";
-const DEFAULT_RAM_IMAGE = "/usr/share/cartesi-machine/images/linux.bin";
 export const DEFAULT_SDK_VERSION = "0.12.0-alpha.20";
 export const DEFAULT_SDK_IMAGE = "cartesi/sdk";
 export const PREFERRED_PORT = 6751;
 export const defaultRootDriveConfig = () => ({
     builder: "docker",
+    buildArgs: [],
     context: ".",
     dockerfile: "Dockerfile", // file on current working directory
     extraSize: 0,
@@ -79,13 +79,11 @@ export const defaultMachineConfig = () => ({
     assertRollingTemplate: undefined,
     bootargs: [],
     entrypoint: undefined,
-    finalHash: true,
-    interactive: undefined,
     maxMCycle: undefined,
     noRollup: undefined,
     ramLength: DEFAULT_RAM,
-    ramImage: DEFAULT_RAM_IMAGE,
-    store: "image",
+    useDockerEnv: true,
+    useDockerWorkdir: true,
     user: undefined,
 });
 export const defaultConfig = () => ({
@@ -252,15 +250,15 @@ const parseMachine = (value) => {
     }
     const toml = value;
     return {
-        assertRollingTemplate: parseOptionalBoolean(toml["assert-rolling-template"]),
-        bootargs: parseStringArray(toml.bootargs),
-        finalHash: parseBoolean(toml["final-hash"], true),
-        interactive: undefined,
-        maxMCycle: parseOptionalNumber(toml["max-mcycle"]),
-        noRollup: parseBoolean(toml["no-rollup"], false),
-        ramLength: parseString(toml["ram-length"], DEFAULT_RAM),
-        ramImage: parseString(toml["ram-image"], DEFAULT_RAM_IMAGE),
-        store: "image",
+        assertRollingTemplate: parseOptionalBoolean(toml.assert_rolling_template),
+        bootargs: parseStringArray(toml.boot_args),
+        entrypoint: parseOptionalString(toml.entrypoint),
+        maxMCycle: parseOptionalNumber(toml.max_mcycle),
+        noRollup: parseBoolean(toml.no_rollup, false),
+        ramLength: parseString(toml.ram_length, DEFAULT_RAM),
+        ramImage: parseOptionalString(toml.ram_image),
+        useDockerEnv: parseBoolean(toml.use_docker_env, true),
+        useDockerWorkdir: parseBoolean(toml.use_docker_workdir, true),
         user: parseOptionalString(toml.user),
     };
 };
@@ -279,10 +277,10 @@ const parseDrive = (drive) => {
     const builder = parseBuilder(drive.builder);
     switch (builder) {
         case "directory": {
-            const { extraSize, format, mount, directory, shared, user } = drive;
+            const { extra_size, format, mount, directory, shared, user } = drive;
             return {
                 builder: "directory",
-                extraSize: parseBytes(extraSize, 0),
+                extraSize: parseBytes(extra_size, 0),
                 format: parseFormat(format),
                 mount: parseOptionalStringBoolean(mount),
                 directory: parseRequiredString(directory, "directory"),
@@ -291,13 +289,14 @@ const parseDrive = (drive) => {
             };
         }
         case "docker": {
-            const { context, dockerfile, extraSize, format, image, mount, shared, tags, target, user, } = drive;
+            const { build_args, context, dockerfile, extra_size, format, image, mount, shared, tags, target, user, } = drive;
             return {
                 builder: "docker",
+                buildArgs: parseStringArray(build_args),
                 image: parseOptionalString(image),
                 context: parseString(context, "."),
                 dockerfile: parseString(dockerfile, "Dockerfile"),
-                extraSize: parseBytes(extraSize, 0),
+                extraSize: parseBytes(extra_size, 0),
                 format: parseFormat(format),
                 mount: parseOptionalStringBoolean(mount),
                 shared: parseOptionalBoolean(shared),
@@ -318,10 +317,10 @@ const parseDrive = (drive) => {
             };
         }
         case "tar": {
-            const { extraSize, filename, format, mount, shared, user } = drive;
+            const { extra_size, filename, format, mount, shared, user } = drive;
             return {
                 builder: "tar",
-                extraSize: parseBytes(extraSize, 0),
+                extraSize: parseBytes(extra_size, 0),
                 filename: parseRequiredString(filename, "filename"),
                 format: parseFormat(format),
                 mount: parseOptionalStringBoolean(mount),
@@ -359,7 +358,10 @@ const parseDrives = (config) => {
     return drives;
 };
 export const parse = (str) => {
-    const toml = parseToml(str);
+    let toml = {};
+    for (const s of str) {
+        toml = mergeTomlTables(toml, parseToml(s));
+    }
     const config = {
         drives: parseDrives(toml.drives),
         machine: parseMachine(toml.machine),
@@ -367,3 +369,50 @@ export const parse = (str) => {
     };
     return config;
 };
+/**
+ * Checks if a value is a plain object (TOML table)
+ */
+function isTomlTable(value) {
+    return (typeof value === "object" &&
+        value !== null &&
+        !Array.isArray(value) &&
+        !("toISOString" in value)); // Check for TomlDate (has toISOString method)
+}
+/**
+ * Recursively merges two TOML table objects
+ * Values from 'other' take precedence over 'base'
+ *
+ * @param base - The base TOML table
+ * @param other - The TOML table to merge into base (takes precedence)
+ * @returns A new merged TOML table
+ */
+export function mergeTomlTables(base, other) {
+    const result = { ...base };
+    for (const [key, otherValue] of Object.entries(other)) {
+        const baseValue = result[key];
+        // If both values are tables, merge them recursively
+        if (isTomlTable(baseValue) && isTomlTable(otherValue)) {
+            result[key] = mergeTomlTables(baseValue, otherValue);
+        }
+        else {
+            // For all other cases, other value takes precedence
+            result[key] = otherValue;
+        }
+    }
+    return result;
+}
+/**
+ * Merges two TOML values of any type
+ *
+ * @param base - The base TOML value
+ * @param other - The TOML value to merge into base (takes precedence)
+ * @returns The merged TOML value
+ */
+export function mergeTomlValues(base, other) {
+    // If both are tables, merge recursively
+    if (isTomlTable(base) && isTomlTable(other)) {
+        return mergeTomlTables(base, other);
+    }
+    // For arrays, replaces entirely
+    return other;
+}

package/dist/exec/cartesi-machine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cartesi-machine.d.ts","sourceRoot":"","sources":["../../src/exec/cartesi-machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,MAAM,EAAS,MAAM,QAAQ,CAAC;AACnD,OAAO,EACH,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAElC,MAAM,WAAW,CAAC;AAEnB,eAAO,MAAM,eAAe,OAAuB,CAAC;AAEpD,eAAO,MAAM,IAAI,GACb,MAAM,SAAS,MAAM,EAAE,EACvB,SAAS,0BAA0B;;;GAGtC,CAAC;AAEF,eAAO,MAAM,OAAO,GAChB,UAAU,qBAAqB,KAChC,OAAO,CAAC,MAAM,GAAG,IAAI,CAgBvB,CAAC"}
+{"version":3,"file":"cartesi-machine.d.ts","sourceRoot":"","sources":["../../src/exec/cartesi-machine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAEH,KAAK,qBAAqB,EAC1B,KAAK,0BAA0B,EAClC,MAAM,WAAW,CAAC;AAEnB,eAAO,MAAM,eAAe,OAAuB,CAAC;AAEpD,eAAO,MAAM,IAAI,GACb,MAAM,SAAS,MAAM,EAAE,EACvB,SAAS,0BAA0B;;;GACmB,CAAC;AAE3D,eAAO,MAAM,OAAO,GAChB,UAAU,qBAAqB,KAChC,OAAO,CAAC,MAAM,GAAG,IAAI,CAgBvB,CAAC"}

package/dist/exec/cartesi-machine.js

@@ -1,9 +1,7 @@
-import { Range, parse } from "semver";
+import { parse, Range } from "semver";
 import { execaDockerFallback, } from "./util.js";
 export const requiredVersion = new Range("^0.19.0");
-export const boot = async (args, options) => {
-    return execaDockerFallback("cartesi-machine", args, options);
-};
+export const boot = (args, options) => execaDockerFallback("cartesi-machine", args, options);
 export const version = async (options) => {
     const { image } = options || {};
     try {
@@ -14,7 +12,7 @@ export const version = async (options) => {
         }
         return null;
     }
-    catch (e) {
+    catch {
         return null;
     }
 };

package/dist/exec/genext2fs.d.ts

@@ -5,7 +5,10 @@ export declare const empty: (options: {
     cwd?: string;
     size: number;
     output: string;
-} & DockerFallbackOptions) => Promise<void>;
+} & DockerFallbackOptions) => Promise<import("execa").Result<import("execa").Options & {
+    image?: string;
+    forceDocker?: false;
+}>>;
 export declare const fromDirectory: (options: {
     cwd?: string;
     extraSize: number;

package/dist/exec/genext2fs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"genext2fs.d.ts","sourceRoot":"","sources":["../../src/exec/genext2fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,MAAM,EAAS,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,KAAK,qBAAqB,EAAuB,MAAM,WAAW,CAAC;AAI5E,eAAO,MAAM,eAAe,EAAE,KAA2B,CAAC;AAU1D,eAAO,MAAM,KAAK,GACd,SAAS;IACL,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB,GAAG,qBAAqB,kBAgB5B,CAAC;AAEF,eAAO,MAAM,aAAa,GACtB,SAAS;IACL,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB,GAAG,qBAAqB;;;GAS5B,CAAC;AAEF,eAAO,MAAM,OAAO,GAChB,SAAS;IACL,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB,GAAG,qBAAqB;;;GAS5B,CAAC;AAEF,eAAO,MAAM,OAAO,GAChB,UAAU,qBAAqB,KAChC,OAAO,CAAC,MAAM,GAAG,IAAI,CAevB,CAAC"}
+{"version":3,"file":"genext2fs.d.ts","sourceRoot":"","sources":["../../src/exec/genext2fs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,KAAK,qBAAqB,EAAuB,MAAM,WAAW,CAAC;AAI5E,eAAO,MAAM,eAAe,EAAE,KAA2B,CAAC;AAU1D,eAAO,MAAM,KAAK,GACd,SAAS;IACL,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB,GAAG,qBAAqB;;;GAgB5B,CAAC;AAEF,eAAO,MAAM,aAAa,GACtB,SAAS;IACL,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB,GAAG,qBAAqB;;;GAS5B,CAAC;AAEF,eAAO,MAAM,OAAO,GAChB,SAAS;IACL,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAClB,GAAG,qBAAqB;;;GAS5B,CAAC;AAEF,eAAO,MAAM,OAAO,GAChB,UAAU,qBAAqB,KAChC,OAAO,CAAC,MAAM,GAAG,IAAI,CAevB,CAAC"}

package/dist/exec/genext2fs.js

@@ -1,4 +1,4 @@
-import { Range, parse } from "semver";
+import { parse, Range } from "semver";
 import { execaDockerFallback } from "./util.js";
 const BLOCK_SIZE = 4096; // fixed at 4k
 export const requiredVersion = new Range("^1.5.6");
@@ -9,10 +9,10 @@ const baseArgs = (options) => [
     "--readjustment",
     `+${options.extraBlocks}`,
 ];
-export const empty = async (options) => {
+export const empty = (options) => {
     const { size, output } = options;
     const blocks = Math.ceil(size / BLOCK_SIZE); // size in blocks
-    await execaDockerFallback("xgenext2fs", [
+    return execaDockerFallback("xgenext2fs", [
         "--block-size",
         BLOCK_SIZE.toString(),
         "--faketime",
@@ -21,12 +21,12 @@ export const empty = async (options) => {
         output,
     ], options);
 };
-export const fromDirectory = async (options) => {
+export const fromDirectory = (options) => {
     const { cwd, extraSize, image, input, output } = options;
     const extraBlocks = Math.ceil(extraSize / BLOCK_SIZE);
     return execaDockerFallback("xgenext2fs", [...baseArgs({ extraBlocks }), "--root", input, output], { cwd, image });
 };
-export const fromTar = async (options) => {
+export const fromTar = (options) => {
     const { cwd, extraSize, image, input, output } = options;
     const extraBlocks = Math.ceil(extraSize / BLOCK_SIZE);
     return execaDockerFallback("xgenext2fs", [...baseArgs({ extraBlocks }), "--tarball", input, output], { cwd, image });

package/dist/exec/index.d.ts

@@ -1,5 +1,4 @@
 export * as cartesiMachine from "./cartesi-machine.js";
-export * as crane from "./crane.js";
 export * as genext2fs from "./genext2fs.js";
 export * as mksquashfs from "./mksquashfs.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/exec/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/exec/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/exec/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAC"}

package/dist/exec/index.js

@@ -1,4 +1,3 @@
 export * as cartesiMachine from "./cartesi-machine.js";
-export * as crane from "./crane.js";
 export * as genext2fs from "./genext2fs.js";
 export * as mksquashfs from "./mksquashfs.js";

package/dist/exec/rollups.js

@@ -28,7 +28,7 @@ export const getDeployments = async (options) => {
         ]);
         return JSON.parse(stdout).map(parseDeployment);
     }
-    catch (e) {
+    catch {
         return [];
     }
 };

package/dist/exec/util.d.ts

@@ -1,5 +1,4 @@
 import { type Options } from "execa";
-import { type SpawnSyncOptions } from "node:child_process";
 export type DockerFallbackOptions = {
     image: string;
     forceDocker: true;
@@ -19,18 +18,4 @@ export declare const execaDockerFallback: (command: string, args: readonly strin
     image?: string;
     forceDocker?: false;
 }>>;
-/**
- * Calls spawnSync and falls back to docker run if command (on the host) fails
- * @param command command to be executed
- * @param args arguments to be passed to the command
- * @param options execution options
- * @returns return of execa
- */
-export type SpawnOptionsDockerFallback = SpawnSyncOptions & DockerFallbackOptions;
-export declare const spawnSyncDockerFallback: (command: string, args: readonly string[], options: SpawnOptionsDockerFallback) => import("child_process").SpawnSyncReturns<string | Buffer<ArrayBufferLike>> | {
-    error: {
-        code: string;
-    };
-    stdout: string;
-};
 //# sourceMappingURL=util.d.ts.map

package/dist/exec/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/exec/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,OAAO,EAAS,MAAM,OAAO,CAAC;AACxD,OAAO,EAAE,KAAK,gBAAgB,EAAa,MAAM,oBAAoB,CAAC;AAGtE,MAAM,MAAM,qBAAqB,GAC3B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,IAAI,CAAA;CAAE,GACpC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,MAAM,0BAA0B,GAAG,OAAO,GAAG,qBAAqB,CAAC;AACzE,eAAO,MAAM,mBAAmB,GAC5B,SAAS,MAAM,EACf,MAAM,SAAS,MAAM,EAAE,EACvB,SAAS,0BAA0B;YAbvB,MAAM;kBAAgB,KAAK;GAmD1C,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,0BAA0B,GAAG,gBAAgB,GACrD,qBAAqB,CAAC;AAC1B,eAAO,MAAM,uBAAuB,GAChC,SAAS,MAAM,EACf,MAAM,SAAS,MAAM,EAAE,EACvB,SAAS,0BAA0B;;;;;CA6CtC,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/exec/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,OAAO,EAAE,MAAM,OAAO,CAAC;AAGxD,MAAM,MAAM,qBAAqB,GAC3B;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,IAAI,CAAA;CAAE,GACpC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,MAAM,0BAA0B,GAAG,OAAO,GAAG,qBAAqB,CAAC;AACzE,eAAO,MAAM,mBAAmB,GAC5B,SAAS,MAAM,EACf,MAAM,SAAS,MAAM,EAAE,EACvB,SAAS,0BAA0B;YAbvB,MAAM;kBAAgB,KAAK;GA6C1C,CAAC"}

package/dist/exec/util.js

@@ -1,5 +1,4 @@
 import { ExecaError, execa } from "execa";
-import { spawnSync } from "node:child_process";
 import os from "node:os";
 export const execaDockerFallback = async (command, args, options) => {
     try {
@@ -13,9 +12,6 @@ export const execaDockerFallback = async (command, args, options) => {
     catch (error) {
         if (error instanceof ExecaError) {
             if (error.code === "ENOENT" && options.image) {
-                if (!options.forceDocker) {
-                    console.warn(`error executing '${command}', falling back to docker execution using image '${options.image}'`);
-                }
                 const userInfo = os.userInfo();
                 const dockerOpts = [
                     "--volume",
@@ -29,48 +25,7 @@ export const execaDockerFallback = async (command, args, options) => {
                 ];
                 return await execa("docker", ["run", ...dockerOpts, options.image, command, ...args], options);
             }
-            console.error(`error executing '${command}'`, error);
         }
         throw error;
     }
 };
-export const spawnSyncDockerFallback = (command, args, options) => {
-    const result = options.forceDocker
-        ? { error: { code: "ENOENT" }, stdout: "" }
-        : spawnSync(command, args, options);
-    if (result.error) {
-        const code = result.error.code;
-        if (code === "ENOENT" && options.image) {
-            if (!options.forceDocker) {
-                console.warn(`error executing '${command}', falling back to docker execution using image '${options.image}'`);
-            }
-            const userInfo = os.userInfo();
-            const dockerOpts = [
-                "--volume",
-                `${options.cwd}:/work`,
-                "--workdir",
-                "/work",
-                "--interactive",
-                "--rm",
-                "--user",
-                `${userInfo.uid}:${userInfo.gid}`,
-            ];
-            const dockerArgs = [
-                "run",
-                ...dockerOpts,
-                options.image,
-                command,
-                ...args,
-            ];
-            const dockerResult = spawnSync("docker", dockerArgs, options);
-            if (dockerResult.error) {
-                console.error(`error executing '${command}'`, dockerResult.error);
-                throw dockerResult.error;
-            }
-            return dockerResult;
-        }
-        console.error(`error executing '${command}'`, result.error);
-        throw result.error;
-    }
-    return result;
-};

package/dist/machine.d.ts

@@ -1,5 +1,11 @@
 import type { Config, ImageInfo } from "./config.js";
-export declare const bootMachine: (config: Config, info: ImageInfo | undefined, destination: string) => Promise<import("execa").Result<import("execa").Options & {
+import type { ExecaOptionsDockerFallback } from "./exec/util.js";
+export type BootMachineOptions = {
+    finalHash?: boolean;
+    interactive?: boolean;
+    store?: string;
+};
+export declare const bootMachine: (config: Config, info: ImageInfo | undefined, bootOptions: BootMachineOptions, options?: ExecaOptionsDockerFallback) => Promise<import("execa").Result<import("execa").Options & {
     image?: string;
     forceDocker?: false;
 }>>;

package/dist/machine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../src/machine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAoBlE,eAAO,MAAM,WAAW,GACpB,QAAQ,MAAM,EACd,MAAM,SAAS,GAAG,SAAS,EAC3B,aAAa,MAAM;;;GAwFtB,CAAC"}
+{"version":3,"file":"machine.d.ts","sourceRoot":"","sources":["../src/machine.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gBAAgB,CAAC;AAmBjE,MAAM,MAAM,kBAAkB,GAAG;IAC7B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,WAAW,GACpB,QAAQ,MAAM,EACd,MAAM,SAAS,GAAG,SAAS,EAC3B,aAAa,kBAAkB,EAC/B,UAAU,0BAA0B;;;GA+FvC,CAAC"}

package/dist/machine.js

@@ -15,11 +15,11 @@ const flashDrive = (label, drive) => {
     // don't specify start and length
     return `--flash-drive=${vars.join(",")}`;
 };
-export const bootMachine = async (config, info, destination) => {
+export const bootMachine = (config, info, bootOptions, options) => {
     const { machine } = config;
-    const { assertRollingTemplate, finalHash, interactive, maxMCycle, noRollup, ramLength, ramImage, store, user, } = machine;
+    const { assertRollingTemplate, maxMCycle, noRollup, ramLength, ramImage, useDockerEnv, useDockerWorkdir, user, } = machine;
     // list of environment variables of docker image
-    const env = info?.env ?? [];
+    const env = useDockerEnv ? (info?.env ?? []) : [];
     const envs = env.map((variable) => `--env=${variable}`);
     // check if we need a rootfstype boot arg
     const root = config.drives.root;
@@ -33,10 +33,15 @@ export const bootMachine = async (config, info, destination) => {
     // bootargs from config string array
     const bootargs = machine.bootargs.map((arg) => `--append-bootargs="${arg}"`);
     // entrypoint from config or image info (Docker ENTRYPOINT + CMD)
-    const entrypoint = machine.entrypoint ?? // takes priority
-        (info ? [...info.entrypoint, ...info.cmd].join(" ") : undefined); // ENTRYPOINT and CMD as a space separated string
+    let entrypoint;
+    if (machine.entrypoint) {
+        entrypoint = machine.entrypoint;
+    }
+    else if (info && (info.entrypoint.length > 0 || info.cmd.length > 0)) {
+        entrypoint = [...info.entrypoint, ...info.cmd].join(" ");
+    }
     if (!entrypoint) {
-        throw new Error("Undefined machine entrypoint");
+        throw new Error("Undefined machine entrypoint. Please define an entrypoint in your cartesi.toml config or in your Dockerfile.");
     }
     const flashDrives = Object.entries(config.drives).map(([label, drive]) => flashDrive(label, drive));
     // command to change working directory if WORKDIR is defined
@@ -44,20 +49,21 @@ export const bootMachine = async (config, info, destination) => {
         ...bootargs,
         ...envs,
         ...flashDrives,
-        `--ram-image=${ramImage}`,
         `--ram-length=${ramLength}`,
-        `--append-entrypoint=${entrypoint}`,
     ];
+    if (ramImage) {
+        args.push(`--ram-image=${ramImage}`);
+    }
     if (assertRollingTemplate) {
         args.push("--assert-rolling-template");
     }
-    if (finalHash) {
+    if (bootOptions.finalHash) {
         args.push("--final-hash");
     }
-    if (info?.workdir) {
+    if (useDockerWorkdir && info?.workdir) {
         args.push(`--workdir="${info.workdir}"`);
     }
-    if (interactive) {
+    if (bootOptions.interactive) {
         args.push("-it");
     }
     if (noRollup) {
@@ -66,15 +72,16 @@ export const bootMachine = async (config, info, destination) => {
     if (maxMCycle) {
         args.push(`--max-mcycle=${maxMCycle.toString()}`);
     }
-    if (store) {
-        args.push(`--store=${store}`);
+    if (bootOptions.store) {
+        args.push(`--store=${bootOptions.store}`);
     }
     if (user) {
         args.push(`--user=${user}`);
     }
+    args.push("--");
+    args.push(entrypoint);
     return cartesiMachine.boot(args, {
-        cwd: destination,
         image: config.sdk,
-        stdio: "inherit",
+        ...options,
     });
 };

package/dist/prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../src/prompts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAA6B,MAAM,gBAAgB,CAAC;AACtE,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,GAAG,EASX,MAAM,MAAM,CAAC;AAGd,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/C,KAAK,YAAY,CAAC,SAAS,IAAI,UAAU,CAAC,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvE;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AACtE,eAAO,MAAM,YAAY,GACrB,QAAQ,mBAAmB,KAC5B,OAAO,CAAC,OAAO,CAMjB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,WAAW,GAAG;IAAE,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC;AAC9D,eAAO,MAAM,QAAQ,GAAU,QAAQ,eAAe,KAAG,OAAO,CAAC,GAAG,CAMnE,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,WAAW,GAAG;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,eAAO,MAAM,WAAW,GACpB,QAAQ,kBAAkB,KAC3B,OAAO,CAAC,MAAM,CAUhB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,GACnB,QAAQ,WAAW,GAAG;IAClB,QAAQ,CAAC,EAAE,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC;CACnB,KACF,OAAO,CAAC,GAAG,CAkDb,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACvB,QAAQ,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,KAC1C,OAAO,CAAC,KAAK,MAAM,EAAE,CA+DvB,CAAC;AAGF,MAAM,MAAM,MAAM,CAAC,SAAS,IAAI;IAC5B,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC5B,IAAI,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,SAAS,IAAI,YAAY,CAAC,SAAS,CAAC,GAAG;IAChE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,SAAS,EAChC,QAAQ,gBAAgB,CAAC,SAAS,CAAC,GAAG;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,EACnE,UAAU,OAAO,GAAG,SAAS,KAC9B,OAAO,CAAC,SAAS,CAuBnB,CAAC;AAOF,eAAO,MAAM,SAAS,GACjB,KAAK;;gBAJM,MAAM;;;CAoBrB,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAU,SAAS;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,KAAG,OAAO,CAAC,OAAO,CAoBlB,CAAC"}
+{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../src/prompts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAA6B,MAAM,gBAAgB,CAAC;AACtE,OAAO,KAAK,MAAM,iBAAiB,CAAC;AACpC,OAAO,MAAM,MAAM,kBAAkB,CAAC;AACtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAE9C,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,GAAG,EASX,MAAM,MAAM,CAAC;AAGd,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/C,KAAK,YAAY,CAAC,SAAS,IAAI,UAAU,CAAC,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvE;;;;GAIG;AACH,MAAM,MAAM,mBAAmB,GAAG,WAAW,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AACtE,eAAO,MAAM,YAAY,GACrB,QAAQ,mBAAmB,KAC5B,OAAO,CAAC,OAAO,CAMjB,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,eAAe,GAAG,WAAW,GAAG;IAAE,OAAO,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC;AAC9D,eAAO,MAAM,QAAQ,GAAU,QAAQ,eAAe,KAAG,OAAO,CAAC,GAAG,CAMnE,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG,WAAW,GAAG;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AACF,eAAO,MAAM,WAAW,GACpB,QAAQ,kBAAkB,KAC3B,OAAO,CAAC,MAAM,CAUhB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,UAAU,GACnB,QAAQ,WAAW,GAAG;IAClB,QAAQ,CAAC,EAAE,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC;CACnB,KACF,OAAO,CAAC,GAAG,CAkDb,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,cAAc,GACvB,QAAQ,WAAW,GAAG;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,KAC1C,OAAO,CAAC,KAAK,MAAM,EAAE,CA+DvB,CAAC;AAGF,MAAM,MAAM,MAAM,CAAC,SAAS,IAAI;IAC5B,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC5B,IAAI,CAAC,EAAE,KAAK,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAAC,SAAS,IAAI,YAAY,CAAC,SAAS,CAAC,GAAG;IAChE,OAAO,EAAE,aAAa,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,CAAC;IACtD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,SAAS,EAChC,QAAQ,gBAAgB,CAAC,SAAS,CAAC,GAAG;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,EACnE,UAAU,OAAO,GAAG,SAAS,KAC9B,OAAO,CAAC,SAAS,CAsBnB,CAAC;AAOF,eAAO,MAAM,SAAS,GACjB,KAAK;;gBAJM,MAAM;;;CAoBrB,CAAC;AAEF,eAAO,MAAM,0BAA0B,GAAU,SAAS;IACtD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB,KAAG,OAAO,CAAC,OAAO,CAoBlB,CAAC"}

package/dist/prompts.js

@@ -91,7 +91,7 @@ export const abiParamsInput = async (config) => {
                 parseAbiParameters(value);
                 return true;
             }
-            catch (e) {
+            catch {
                 return "Invalid ABI parameters";
             }
         },
@@ -121,7 +121,7 @@ export const abiParamsInput = async (config) => {
                             BigInt(value);
                             return true;
                         }
-                        catch (e) {
+                        catch {
                             return "Invalid number";
                         }
                     },
@@ -147,7 +147,6 @@ export const selectAuto = (config, context) => {
     const list = config.discardDisabled
         ? choices.filter((c) => !(c instanceof Separator) && !c.disabled)
         : choices;
-    const a = choices.filter((c) => c.type !== "separator");
     if (list.length === 1) {
         const choice = list[0];
         if (!(choice instanceof Separator)) {