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

package/dist/compose/docker-compose-passkey-server.yaml

@@ -0,0 +1,37 @@
+configs:
+    passkey_server_proxy:
+        content: |
+            http:
+                routers:
+                    passkey-server:
+                        rule: "PathPrefix(`/passkey`)"
+                        middlewares:
+                            - "remove-passkey-server-prefix"
+                        service: passkey-server
+                middlewares:
+                    remove-passkey-server-prefix:
+                        replacePathRegex:
+                            regex: "^/passkey/(.*)"
+                            replacement: "/$1"
+                services:
+                    passkey-server:
+                        loadBalancer:
+                            servers:
+                                - url: "http://passkey-server:3000"
+
+services:
+    passkey-server:
+        image: ${CARTESI_SDK_IMAGE}
+        command: ["passkey-server"]
+        healthcheck:
+            test: ["CMD", "curl", "-fsS", "http://127.0.0.1:3000/health"]
+            start_period: 10s
+            start_interval: 200ms
+            interval: 10s
+            timeout: 1s
+            retries: 5
+
+    proxy:
+        configs:
+            - source: passkey_server_proxy
+              target: /etc/traefik/conf.d/passkey-server.yaml

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

@@ -0,0 +1,40 @@
+configs:
+    paymaster_proxy:
+        content: |
+            http:
+                routers:
+                    paymaster:
+                        rule: "PathPrefix(`/paymaster`)"
+                        middlewares:
+                            - "remove-paymaster-prefix"
+                        service: paymaster
+                middlewares:
+                    remove-paymaster-prefix:
+                        replacePathRegex:
+                            regex: "^/paymaster/(.*)"
+                            replacement: "/$1"
+                services:
+                    paymaster:
+                        loadBalancer:
+                            servers:
+                                - url: "http://paymaster:3000"
+
+services:
+    paymaster:
+        image: ${CARTESI_SDK_IMAGE}
+        command: "mock-verifying-paymaster"
+        environment:
+            - ALTO_RPC=http://bundler:4337
+            - ANVIL_RPC=http://anvil:8545
+        healthcheck:
+            test: ["CMD", "curl", "-fsS", "http://127.0.0.1:3000/ping"]
+            start_period: 10s
+            start_interval: 200ms
+            interval: 10s
+            timeout: 1s
+            retries: 5
+
+    proxy:
+        configs:
+            - source: paymaster_proxy
+              target: /etc/traefik/conf.d/paymaster.yaml

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

@@ -0,0 +1,24 @@
+services:
+    proxy:
+        image: traefik:v3.3.4
+        healthcheck:
+            test: ["CMD", "traefik", "healthcheck", "--ping"]
+            start_period: 10s
+            start_interval: 200ms
+            interval: 10s
+            timeout: 1s
+            retries: 5
+        command:
+            [
+                "--ping=true",
+                "--entryPoints.web.address=:8088",
+                "--entryPoints.traefik.address=:8080",
+                "--metrics.prometheus=true",
+                "--metrics.prometheus.addServicesLabels=true",
+                "--providers.file.directory=/etc/traefik/conf.d",
+                "--providers.file.watch=true",
+                "--log",
+                "--log.level=INFO",
+            ]
+        ports:
+            - ${CARTESI_LISTEN_PORT:-6751}:8088

package/dist/config.d.ts

@@ -1,4 +1,4 @@
-import { TomlPrimitive } from "smol-toml";
+import { type TomlPrimitive } from "smol-toml";
 /**
  * Typed Errors
  */
@@ -29,7 +29,9 @@ export declare class RequiredFieldError extends Error {
 export declare class InvalidStringArrayError extends Error {
     constructor();
 }
-export declare const DEFAULT_SDK = "cartesi/sdk:0.12.0-alpha.1";
+export declare const DEFAULT_SDK_VERSION = "0.12.0-alpha.25";
+export declare const DEFAULT_SDK_IMAGE = "cartesi/sdk";
+export declare const PREFERRED_PORT = 6751;
 type DriveFormat = "ext2" | "sqfs";
 export type ImageInfo = {
     cmd: string[];
@@ -37,7 +39,7 @@ export type ImageInfo = {
     env: string[];
     workdir: string;
 };
-export type DriveResult = ImageInfo | undefined | void;
+export type DriveResult = ImageInfo | undefined;
 export type DirectoryDriveConfig = {
     builder: "directory";
     extraSize: number;
@@ -46,6 +48,7 @@ export type DirectoryDriveConfig = {
 };
 export type DockerDriveConfig = {
     builder: "docker";
+    buildArgs: string[];
     context: string;
     dockerfile: string;
     extraSize: number;
@@ -79,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 = {
@@ -93,11 +95,30 @@ export type Config = {
     machine: MachineConfig;
     sdk: string;
 };
+type TomlTable = {
+    [key: string]: TomlPrimitive;
+};
 export declare const defaultRootDriveConfig: () => DriveConfig;
-export declare const defaultRamImage: () => string;
 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

@@ -1,6 +1,5 @@
 import bytes from "bytes";
-import os from "os";
-import { extname } from "path";
+import { extname } from "node:path";
 import { parse as parseToml } from "smol-toml";
 /**
  * Typed Errors
@@ -55,7 +54,7 @@ export class RequiredFieldError extends Error {
 }
 export class InvalidStringArrayError extends Error {
     constructor() {
-        super(`Invalid string array`);
+        super("Invalid string array");
         this.name = "InvalidStringArrayError";
     }
 }
@@ -64,49 +63,39 @@ export class InvalidStringArrayError extends Error {
  */
 const DEFAULT_FORMAT = "ext2";
 const DEFAULT_RAM = "128Mi";
-const DEFAULT_RAM_IMAGE_DOCKER = "/usr/share/cartesi-machine/images/linux.bin";
-const DEFAULT_RAM_IMAGE_LINUX = "/usr/share/cartesi-machine/images/linux.bin";
-const DEFAULT_RAM_IMAGE_MAC = "/opt/homebrew/share/cartesi-machine/images/linux.bin";
-export const DEFAULT_SDK = "cartesi/sdk:0.12.0-alpha.1";
+export const DEFAULT_SDK_VERSION = "0.12.0-alpha.25";
+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,
     format: DEFAULT_FORMAT,
     tags: [],
 });
-export const defaultRamImage = () => {
-    switch (os.platform()) {
-        case "darwin":
-            return DEFAULT_RAM_IMAGE_MAC;
-        default:
-            return DEFAULT_RAM_IMAGE_LINUX;
-    }
-};
 export const defaultMachineConfig = () => ({
     assertRollingTemplate: undefined,
     bootargs: [],
     entrypoint: undefined,
-    finalHash: true,
-    interactive: undefined,
     maxMCycle: undefined,
     noRollup: undefined,
     ramLength: DEFAULT_RAM,
-    ramImage: defaultRamImage(),
-    store: "image",
+    useDockerEnv: true,
+    useDockerWorkdir: true,
     user: undefined,
 });
 export const defaultConfig = () => ({
     drives: { root: defaultRootDriveConfig() },
     machine: defaultMachineConfig(),
-    sdk: DEFAULT_SDK,
+    sdk: `${DEFAULT_SDK_IMAGE}:${DEFAULT_SDK_VERSION}`,
 });
 const parseBoolean = (value, defaultValue) => {
     if (value === undefined) {
         return defaultValue;
     }
-    else if (typeof value === "boolean") {
+    if (typeof value === "boolean") {
         return value;
     }
     throw new InvalidBooleanValueError(value);
@@ -115,7 +104,7 @@ const parseOptionalBoolean = (value) => {
     if (value === undefined) {
         return undefined;
     }
-    else if (typeof value === "boolean") {
+    if (typeof value === "boolean") {
         return value;
     }
     throw new InvalidBooleanValueError(value);
@@ -124,7 +113,7 @@ const parseString = (value, defaultValue) => {
     if (value === undefined) {
         return defaultValue;
     }
-    else if (typeof value === "string") {
+    if (typeof value === "string") {
         return value;
     }
     throw new InvalidStringValueError(value);
@@ -133,10 +122,10 @@ const parseStringArray = (value) => {
     if (value === undefined) {
         return [];
     }
-    else if (typeof value === "string") {
+    if (typeof value === "string") {
         return [value];
     }
-    else if (typeof value === "object" && Array.isArray(value)) {
+    if (typeof value === "object" && Array.isArray(value)) {
         return value.map((v) => {
             if (typeof v === "string") {
                 return v;
@@ -150,7 +139,7 @@ const parseRequiredString = (value, key) => {
     if (value === undefined) {
         throw new RequiredFieldError(key);
     }
-    else if (typeof value === "string") {
+    if (typeof value === "string") {
         return value;
     }
     throw new InvalidStringValueError(value);
@@ -159,7 +148,7 @@ const parseOptionalString = (value) => {
     if (value === undefined) {
         return undefined;
     }
-    else if (typeof value === "string") {
+    if (typeof value === "string") {
         return value;
     }
     throw new InvalidStringValueError(value);
@@ -168,10 +157,10 @@ const parseOptionalStringBoolean = (value) => {
     if (value === undefined) {
         return undefined;
     }
-    else if (typeof value === "string") {
+    if (typeof value === "string") {
         return value;
     }
-    else if (typeof value === "boolean") {
+    if (typeof value === "boolean") {
         return value;
     }
     throw new InvalidStringValueError(value);
@@ -180,10 +169,10 @@ const parseOptionalNumber = (value) => {
     if (value === undefined) {
         return undefined;
     }
-    else if (typeof value === "bigint") {
+    if (typeof value === "bigint") {
         return value;
     }
-    else if (typeof value === "number") {
+    if (typeof value === "number") {
         return BigInt(value);
     }
     throw new InvalidNumberValueError(value);
@@ -192,10 +181,10 @@ const parseBytes = (value, defaultValue) => {
     if (value === undefined) {
         return defaultValue;
     }
-    else if (typeof value === "bigint") {
+    if (typeof value === "bigint") {
         return Number(value);
     }
-    else if (typeof value === "number" || typeof value === "string") {
+    if (typeof value === "number" || typeof value === "string") {
         const output = bytes.parse(value);
         if (output !== null) {
             return output;
@@ -207,7 +196,7 @@ const parseBuilder = (value) => {
     if (value === undefined) {
         return "docker";
     }
-    else if (typeof value === "string") {
+    if (typeof value === "string") {
         switch (value) {
             case "directory":
                 return "directory";
@@ -227,7 +216,7 @@ const parseFormat = (value) => {
     if (value === undefined) {
         return DEFAULT_FORMAT;
     }
-    else if (typeof value === "string") {
+    if (typeof value === "string") {
         switch (value) {
             case "ext2":
                 return "ext2";
@@ -241,7 +230,7 @@ const parseEmptyFormat = (value) => {
     if (value === undefined) {
         return DEFAULT_FORMAT;
     }
-    else if (typeof value === "string") {
+    if (typeof value === "string") {
         switch (value) {
             case "ext2":
                 return "ext2";
@@ -261,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"], defaultRamImage()),
-        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),
     };
 };
@@ -288,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"),
@@ -300,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),
@@ -327,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),
@@ -368,11 +358,61 @@ 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),
-        sdk: parseString(toml.sdk, DEFAULT_SDK),
+        sdk: parseString(toml.sdk, `${DEFAULT_SDK_IMAGE}:${DEFAULT_SDK_VERSION}`),
     };
     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;
+}