@cartesi/cli 1.5.0 → 2.0.0-alpha.1

package/dist/baseCommand.d.ts

@@ -1,5 +1,6 @@
 import { Command, Interfaces } from "@oclif/core";
 import { Address, Hash } from "viem";
+import { Config } from "./config.js";
 export type Flags<T extends typeof Command> = Interfaces.InferredFlags<(typeof BaseCommand)["baseFlags"] & T["flags"]>;
 export type Args<T extends typeof Command> = Interfaces.InferredArgs<T["args"]>;
 export type AddressBook = Record<string, Address>;
@@ -8,6 +9,7 @@ export declare abstract class BaseCommand<T extends typeof Command> extends Comm
     protected args: Args<T>;
     protected getServiceState(projectName: string, serviceName: string): Promise<string | undefined>;
     protected getContextPath(...paths: string[]): string;
+    protected getApplicationConfig(configPath: string): Config;
     protected getMachineHash(): Hash | undefined;
     protected logPrompt({ title, value }: {
         title: string;

package/dist/baseCommand.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseCommand.d.ts","sourceRoot":"","sources":["../src/baseCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKlD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAsB,MAAM,MAAM,CAAC;AAmBzD,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,aAAa,CAClE,CAAC,OAAO,WAAW,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CACjD,CAAC;AACF,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAChF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAElD,8BAAsB,WAAW,CAAC,CAAC,SAAS,OAAO,OAAO,CAAE,SAAQ,OAAO;IACvE,SAAS,CAAC,KAAK,EAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3B,SAAS,CAAC,IAAI,EAAG,IAAI,CAAC,CAAC,CAAC,CAAC;cAET,eAAe,CAC3B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAe9B,SAAS,CAAC,cAAc,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAIpD,SAAS,CAAC,cAAc,IAAI,IAAI,GAAG,SAAS;IAY5C,SAAS,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;cAItD,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC;cAKzC,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAkCzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAYrC"}
+{"version":3,"file":"baseCommand.d.ts","sourceRoot":"","sources":["../src/baseCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAKlD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAsB,MAAM,MAAM,CAAC;AAEzD,OAAO,EAAE,MAAM,EAAS,MAAM,aAAa,CAAC;AAiB5C,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,aAAa,CAClE,CAAC,OAAO,WAAW,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CACjD,CAAC;AACF,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,OAAO,OAAO,IAAI,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAChF,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAElD,8BAAsB,WAAW,CAAC,CAAC,SAAS,OAAO,OAAO,CAAE,SAAQ,OAAO;IACvE,SAAS,CAAC,KAAK,EAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3B,SAAS,CAAC,IAAI,EAAG,IAAI,CAAC,CAAC,CAAC,CAAC;cAET,eAAe,CAC3B,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAe9B,SAAS,CAAC,cAAc,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAIpD,SAAS,CAAC,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAM1D,SAAS,CAAC,cAAc,IAAI,IAAI,GAAG,SAAS;IAY5C,SAAS,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;cAItD,qBAAqB,IAAI,OAAO,CAAC,OAAO,CAAC;cAKzC,cAAc,IAAI,OAAO,CAAC,WAAW,CAAC;IAiCzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAYrC"}

package/dist/baseCommand.js

@@ -4,7 +4,8 @@ import { execa } from "execa";
 import fs from "fs";
 import path from "path";
 import { getAddress, isHash } from "viem";
-import { authorityHistoryPairFactoryAddress, cartesiDAppFactoryAddress, dAppAddressRelayAddress, erc1155BatchPortalAddress, erc1155SinglePortalAddress, erc20PortalAddress, erc721PortalAddress, etherPortalAddress, inputBoxAddress, selfHostedApplicationFactoryAddress, testMultiTokenAddress, testNftAddress, testTokenAddress, } from "./contracts.js";
+import { parse } from "./config.js";
+import { applicationFactoryAddress, authorityFactoryAddress, erc1155BatchPortalAddress, erc1155SinglePortalAddress, erc20PortalAddress, erc721PortalAddress, etherPortalAddress, inputBoxAddress, selfHostedApplicationFactoryAddress, testMultiTokenAddress, testNftAddress, testTokenAddress, } from "./contracts.js";
 export class BaseCommand extends Command {
     async getServiceState(projectName, serviceName) {
         // get service information
@@ -23,6 +24,11 @@ export class BaseCommand extends Command {
     getContextPath(...paths) {
         return path.join(".cartesi", ...paths);
     }
+    getApplicationConfig(configPath) {
+        return fs.existsSync(configPath)
+            ? parse(fs.readFileSync(configPath).toString())
+            : parse("");
+    }
     getMachineHash() {
         // read hash of the cartesi machine snapshot, if one exists
         const hashPath = this.getContextPath("image", "hash");
@@ -45,10 +51,9 @@ export class BaseCommand extends Command {
         const applicationAddress = await this.getApplicationAddress();
         // build rollups contracts address book
         const contracts = {
-            AuthorityHistoryPairFactory: authorityHistoryPairFactoryAddress,
-            CartesiDApp: applicationAddress,
-            CartesiDAppFactory: cartesiDAppFactoryAddress,
-            DAppAddressRelay: dAppAddressRelayAddress,
+            Application: applicationAddress,
+            ApplicationFactory: applicationFactoryAddress,
+            AuthorityFactory: authorityFactoryAddress,
             EntryPointV06: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789",
             EntryPointV07: "0x0000000071727De22E5E9d8BAf0edAc6f37da032",
             ERC1155BatchPortal: erc1155BatchPortalAddress,

package/dist/builder/directory.d.ts

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

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

@@ -0,0 +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"}

package/dist/builder/directory.js

@@ -0,0 +1,37 @@
+import fs from "fs-extra";
+import path from "path";
+import { genext2fs, mksquashfs } from "../exec/index.js";
+export const build = async (name, drive, sdkImage, destination) => {
+    const filename = `${name}.${drive.format}`;
+    // copy directory to destination
+    const dest = path.join(destination, name);
+    await fs.mkdirp(dest);
+    await fs.copy(drive.directory, dest);
+    try {
+        switch (drive.format) {
+            case "ext2": {
+                await genext2fs.fromDirectory({
+                    extraSize: drive.extraSize,
+                    input: name,
+                    output: filename,
+                    cwd: destination,
+                    image: sdkImage,
+                });
+                break;
+            }
+            case "sqfs": {
+                await mksquashfs.fromDirectory({
+                    input: name,
+                    output: filename,
+                    cwd: destination,
+                    image: sdkImage,
+                });
+                break;
+            }
+        }
+    }
+    finally {
+        // delete copied
+        await fs.remove(dest);
+    }
+};

package/dist/builder/docker.d.ts

@@ -0,0 +1,10 @@
+import { 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 {};
+//# sourceMappingURL=docker.d.ts.map

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

@@ -0,0 +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"}

package/dist/builder/docker.js

@@ -0,0 +1,112 @@
+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";
+/**
+ * Build Docker image (linux/riscv64). Returns image id.
+ */
+const buildImage = async (options) => {
+    const { context, dockerfile, tags, target } = options;
+    const buildResult = tmp.tmpNameSync();
+    const args = [
+        "buildx",
+        "build",
+        "--platform",
+        "linux/riscv64",
+        "--file",
+        dockerfile,
+        "--load",
+        "--iidfile",
+        buildResult,
+        context,
+    ];
+    // set tags for the image built
+    args.push(...tags.map((tag) => ["--tag", tag]).flat());
+    if (target) {
+        args.push("--target", target);
+    }
+    await execa("docker", args, { stdio: "inherit" });
+    return fs.readFileSync(buildResult, "utf8");
+};
+/**
+ * Query the image using docker image inspect
+ * @param image image id or name
+ * @returns Information about the image
+ */
+const getImageInfo = async (image) => {
+    const { stdout: jsonStr } = await execa("docker", [
+        "image",
+        "inspect",
+        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`);
+    }
+    const info = {
+        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) => {
+    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]);
+    }
+    else {
+        image = await buildImage(drive);
+    }
+    // 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({
+                    extraSize: drive.extraSize,
+                    input: tar,
+                    output: filename,
+                    cwd: destination,
+                    image: sdkImage,
+                });
+                break;
+            }
+            case "sqfs": {
+                await mksquashfs.fromTar({
+                    input: path.join(destination, tar),
+                    output: filename,
+                    cwd: destination,
+                    image: sdkImage,
+                });
+                break;
+            }
+        }
+    }
+    finally {
+        // delete intermediate files
+        await fs.remove(path.join(destination, ocitar));
+        await fs.remove(path.join(destination, tar));
+    }
+    return imageInfo;
+};

package/dist/builder/empty.d.ts

@@ -0,0 +1,3 @@
+import { 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

@@ -0,0 +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"}

package/dist/builder/empty.js

@@ -0,0 +1,21 @@
+import fs from "fs-extra";
+import path from "path";
+import { genext2fs } from "../exec/index.js";
+export const build = async (name, drive, sdkImage, destination) => {
+    const filename = `${name}.${drive.format}`;
+    switch (drive.format) {
+        case "ext2": {
+            await genext2fs.empty({
+                output: filename,
+                size: drive.size,
+                cwd: destination,
+                image: sdkImage,
+            });
+            break;
+        }
+        case "raw": {
+            await fs.writeFile(path.join(destination, filename), Buffer.alloc(drive.size));
+            break;
+        }
+    }
+};

package/dist/builder/index.d.ts

@@ -0,0 +1,6 @@
+export { build as buildDirectory } from "./directory.js";
+export { build as buildDocker } from "./docker.js";
+export { build as buildEmpty } from "./empty.js";
+export { build as buildNone } from "./none.js";
+export { build as buildTar } from "./tar.js";
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/builder/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,KAAK,IAAI,QAAQ,EAAE,MAAM,UAAU,CAAC"}

package/dist/builder/index.js

@@ -0,0 +1,5 @@
+export { build as buildDirectory } from "./directory.js";
+export { build as buildDocker } from "./docker.js";
+export { build as buildEmpty } from "./empty.js";
+export { build as buildNone } from "./none.js";
+export { build as buildTar } from "./tar.js";

package/dist/builder/none.d.ts

@@ -0,0 +1,3 @@
+import { 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

@@ -0,0 +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"}

package/dist/builder/none.js

@@ -0,0 +1,11 @@
+import fs from "fs-extra";
+import path from "path";
+import { getDriveFormat } from "../config.js";
+export const build = async (name, drive, destination) => {
+    // no need to build, drive already exists
+    const src = drive.filename;
+    const format = getDriveFormat(src);
+    const filename = path.join(destination, `${name}.${format}`);
+    // just copy it
+    await fs.copyFile(src, filename);
+};

package/dist/builder/tar.d.ts

@@ -0,0 +1,3 @@
+import { 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

@@ -0,0 +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"}

package/dist/builder/tar.js

@@ -0,0 +1,30 @@
+import fs from "fs-extra";
+import path from "path";
+import { genext2fs, mksquashfs } from "../exec/index.js";
+export const build = async (name, drive, sdkImage, destination) => {
+    const tar = `${name}.tar`;
+    const filename = `${name}.${drive.format}`;
+    // copy input tar to destination directory (with drive name)
+    await fs.copy(drive.filename, path.join(destination, tar));
+    switch (drive.format) {
+        case "ext2": {
+            await genext2fs.fromTar({
+                extraSize: drive.extraSize,
+                input: tar,
+                output: filename,
+                cwd: destination,
+                image: sdkImage,
+            });
+            break;
+        }
+        case "sqfs": {
+            await mksquashfs.fromTar({
+                input: path.join(destination, tar),
+                output: filename,
+                cwd: destination,
+                image: sdkImage,
+            });
+            break;
+        }
+    }
+};

package/dist/commands/build.d.ts

@@ -1,24 +1,12 @@
 import { BaseCommand } from "../baseCommand.js";
-export default class BuildApplication extends BaseCommand<typeof BuildApplication> {
+export default class Build extends BaseCommand<typeof Build> {
     static summary: string;
     static description: string;
     static examples: string[];
-    static args: {};
     static flags: {
-        "from-image": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        target: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        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>;
     };
-    /**
-     * Build DApp image (linux/riscv64). Returns image id.
-     * @param directory path of context containing Dockerfile
-     */
-    private buildImage;
-    private getImageInfo;
-    private createTarball;
-    private sdkRun;
-    private static createRootfsTarCommand;
-    private static createExt2Command;
-    private static createMachineSnapshotCommand;
     run(): Promise<void>;
 }
 //# 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":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA2BhD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,WAAW,CACrD,OAAO,gBAAgB,CAC1B;IACG,MAAM,CAAC,OAAO,SAAwB;IAEtC,MAAM,CAAC,WAAW,SAC8V;IAEhX,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,KAAK;;;MAWV;IAEF;;;OAGG;YACW,UAAU;YAcV,YAAY;YAsEZ,aAAa;YAUb,MAAM;IA+BpB,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAoBrC,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAkBhC,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAwB9B,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA0DpC"}
+{"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"}