@cartesi/cli 0.16.0 → 0.16.1

package/dist/commands/run.d.ts

@@ -12,6 +12,9 @@ export default class Run extends BaseCommand<typeof Run> {
         "no-backend": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         verbose: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         "listen-port": import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        cpus: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        memory: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        "dry-run": import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACpD,MAAM,CAAC,OAAO,SAA2B;IAEzC,MAAM,CAAC,WAAW,SAAmD;IAErE,MAAM,CAAC,QAAQ,WAA2C;IAE1D,MAAM,CAAC,KAAK;;;;;;;;;MA0CV;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAmIpC"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACpD,MAAM,CAAC,OAAO,SAA2B;IAEzC,MAAM,CAAC,WAAW,SAAmD;IAErE,MAAM,CAAC,QAAQ,WAA2C;IAE1D,MAAM,CAAC,KAAK;;;;;;;;;;;;MAyDV;IAEW,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAoJpC"}

package/dist/commands/run.js

@@ -40,9 +40,17 @@ class Run extends BaseCommand {
             CARTESI_SNAPSHOT_DIR: "/usr/share/rollups-node/snapshot",
             CARTESI_BIN_PATH: binPath,
             CARTESI_LISTEN_PORT: listenPort.toString(),
+            CARTESI_VALIDATOR_CPUS: flags.cpus?.toString(),
+            CARTESI_VALIDATOR_MEMORY: flags.memory?.toString(),
         };
         // validator
         const composeFiles = ["docker-compose-validator.yaml"];
+        if (flags.cpus) {
+            composeFiles.push("docker-compose-validator-cpus.yaml");
+        }
+        if (flags.memory) {
+            composeFiles.push("docker-compose-validator-memory.yaml");
+        }
         // prompt
         composeFiles.push("docker-compose-prompt.yaml");
         // database
@@ -96,6 +104,14 @@ class Run extends BaseCommand {
         // XXX: need this handler, so SIGINT can still call the finally block below
         process.on("SIGINT", () => { });
         try {
+            if (flags["dry-run"]) {
+                // show the docker compose configuration
+                await execa("docker", [...compose_args, "config"], {
+                    env,
+                    stdio: "inherit",
+                });
+                return;
+            }
             // run compose environment
             await execa("docker", [...compose_args, "up", ...up_args], {
                 env,
@@ -158,5 +174,18 @@ Run.flags = {
         description: "port to listen for incoming connections",
         default: 8080,
     }),
+    cpus: Flags.integer({
+        description: "Define the number of CPUs to use (eg.: 1) for the rollups-node",
+        summary: "number of cpu limits for the rollups-node",
+    }),
+    memory: Flags.integer({
+        description: "Define the amount of memory to use for the rollups-node in MB (eg.: 1024)",
+        summary: "memory limit for the rollups-node in MB",
+    }),
+    "dry-run": Flags.boolean({
+        description: "show the docker compose configuration",
+        default: false,
+        hidden: true,
+    }),
 };
 export default Run;

package/dist/node/DockerfileDeploy.txt

@@ -1,4 +1,4 @@
-FROM cartesi/rollups-node:1.5.0
+FROM cartesi/rollups-node:1.5.1
 ENV CARTESI_SNAPSHOT_DIR=/usr/share/rollups-node/snapshot
 ENV CARTESI_HTTP_ADDRESS=0.0.0.0
 COPY --chown=cartesi:cartesi . ${CARTESI_SNAPSHOT_DIR}

package/dist/node/default.env

@@ -1,10 +1,10 @@
 # cartesi/rollups-node
 CARTESI_LOG_LEVEL="${CARTESI_LOG_LEVEL:-error}"
-CARTESI_LOG_TIMESTAMP="${CARTESI_LOG_TIMESTAMP:-true}"
 CARTESI_HTTP_ADDRESS="${CARTESI_HTTP_ADDRESS:-0.0.0.0}"
 CARTESI_HTTP_PORT="${CARTESI_HTTP_PORT:-10000}"
 CARTESI_FEATURE_HOST_MODE="${CARTESI_FEATURE_HOST_MODE:-false}"
-CARTESI_FEATURE_READER_MODE="${CARTESI_FEATURE_READER_MODE:-false}"
+CARTESI_FEATURE_READER_MODE_ENABLED="${CARTESI_FEATURE_READER_MODE_ENABLED:-false}"
+CARTESI_FEATURE_DISABLE_CLAIMER="${CARTESI_FEATURE_DISABLE_CLAIMER:-false}"
 CARTESI_FEATURE_DISABLE_MACHINE_HASH_CHECK="${CARTESI_FEATURE_DISABLE_MACHINE_HASH_CHECK:-true}"
 CARTESI_EPOCH_LENGTH="${CARTESI_EPOCH_LENGTH:-720}"
 CARTESI_BLOCKCHAIN_ID="${CARTESI_BLOCKCHAIN_ID:-31337}"
@@ -12,6 +12,7 @@ CARTESI_BLOCKCHAIN_HTTP_ENDPOINT="${CARTESI_BLOCKCHAIN_HTTP_ENDPOINT:-http://anv
 CARTESI_BLOCKCHAIN_WS_ENDPOINT="${CARTESI_BLOCKCHAIN_WS_ENDPOINT:-ws://anvil:8545}"
 CARTESI_BLOCKCHAIN_IS_LEGACY="${CARTESI_BLOCKCHAIN_IS_LEGACY:-false}"
 CARTESI_BLOCKCHAIN_FINALITY_OFFSET="${CARTESI_BLOCKCHAIN_FINALITY_OFFSET:-0}"
+CARTESI_BLOCKCHAIN_BLOCK_TIMEOUT="${CARTESI_BLOCKCHAIN_BLOCK_TIMEOUT:-60}"
 CARTESI_CONTRACTS_APPLICATION_ADDRESS="${CARTESI_CONTRACTS_APPLICATION_ADDRESS:-0xab7528bb862fb57e8a2bcd567a2e929a0be56a5e}"
 CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER="${CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER:-22}"
 CARTESI_CONTRACTS_HISTORY_ADDRESS="${CARTESI_CONTRACTS_HISTORY_ADDRESS:-0x325272217ae6815b494bf38ced004c5eb8a7cda7}"
@@ -20,7 +21,6 @@ CARTESI_CONTRACTS_INPUT_BOX_ADDRESS="${CARTESI_CONTRACTS_INPUT_BOX_ADDRESS:-0x59
 CARTESI_SNAPSHOT_DIR="${CARTESI_SNAPSHOT_DIR:-/usr/share/cartesi/snapshot}"
 CARTESI_AUTH_MNEMONIC="${CARTESI_AUTH_MNEMONIC:-test test test test test test test test test test test junk}"
 CARTESI_POSTGRES_ENDPOINT="${CARTESI_POSTGRES_ENDPOINT:-postgres://postgres:password@database:5432/postgres}"
-CARTESI_EXPERIMENTAL_DISABLE_CONFIG_LOG="${CARTESI_EXPERIMENTAL_DISABLE_CONFIG_LOG:-false}"
 CARTESI_EXPERIMENTAL_SERVER_MANAGER_BYPASS_LOG="${CARTESI_EXPERIMENTAL_SERVER_MANAGER_BYPASS_LOG:-false}"
 
 # server-manager

package/dist/node/docker-compose-validator-cpus.yaml

@@ -0,0 +1,6 @@
+services:
+    validator:
+        deploy:
+            resources:
+                limits:
+                    cpus: "${CARTESI_VALIDATOR_CPUS}"

package/dist/node/docker-compose-validator-memory.yaml

@@ -0,0 +1,6 @@
+services:
+    validator:
+        deploy:
+            resources:
+                limits:
+                    memory: "${CARTESI_VALIDATOR_MEMORY}M"

package/dist/node/docker-compose-validator.yaml

@@ -1,6 +1,6 @@
 services:
     validator:
-        image: cartesi/rollups-node:1.5.0
+        image: cartesi/rollups-node:1.5.1
         depends_on:
             dapp_deployer:
                 condition: service_completed_successfully

package/oclif.manifest.json

@@ -272,6 +272,29 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "cpus": {
+          "description": "Define the number of CPUs to use (eg.: 1) for the rollups-node",
+          "name": "cpus",
+          "summary": "number of cpu limits for the rollups-node",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "memory": {
+          "description": "Define the amount of memory to use for the rollups-node in MB (eg.: 1024)",
+          "name": "memory",
+          "summary": "memory limit for the rollups-node in MB",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "dry-run": {
+          "description": "show the docker compose configuration",
+          "hidden": true,
+          "name": "dry-run",
+          "allowNo": false,
+          "type": "boolean"
         }
       },
       "hasDynamicHelp": false,
@@ -912,5 +935,5 @@
       ]
     }
   },
-  "version": "0.16.0"
+  "version": "0.16.1"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cartesi/cli",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "Cartesi CLI",
   "author": "Danilo Tuler <tuler@pobox.com>",
   "bin": {