cartesi · endersonmaia · Oct 29, 2024 · Nov 1, 2024 · Feb 3, 2025 · Feb 4, 2025
diff --git a/.changeset/selfish-dots-perform.md b/.changeset/selfish-dots-perform.md
@@ -0,0 +1,5 @@
+---
+"@cartesi/cli": patch
+---
+
+refactor: single place to define the cartesi/sdk and cartesi/rollups-node image
diff --git a/apps/cli/src/baseCommand.ts b/apps/cli/src/baseCommand.ts
@@ -78,7 +78,7 @@ export abstract class BaseCommand<T extends typeof Command> extends Command {
 
     protected async getApplicationAddress(): Promise<Address> {
         // fixed value, as we do deterministic deployment with a zero hash
-        return getAddress("0xab7528bb862fb57e8a2bcd567a2e929a0be56a5e");
+        return getAddress("0x60ec77594cdaa4ec2263c0d7436d70e37164c69f");
     }
 
     protected async getAddressBook(): Promise<AddressBook> {

diff --git a/apps/cli/src/commands/run.ts b/apps/cli/src/commands/run.ts
@@ -4,6 +4,7 @@
 import path from "path";
 
 import { BaseCommand } from "../baseCommand.js";
+import { DEFAULT_SDK } from "../config.js";
 
 export default class Run extends BaseCommand<typeof Run> {
     static summary = "Run application node.";
@@ -121,10 +122,15 @@
             CARTESI_LISTEN_PORT: listenPort.toString(),
             CARTESI_VALIDATOR_CPUS: flags.cpus?.toString(),
             CARTESI_VALIDATOR_MEMORY: flags.memory?.toString(),
+            CARTESI_SDK_IMAGE: DEFAULT_SDK,
         };
 
+        // base
+        const composeFiles = ["docker-compose-base.yaml"];
+
         // validator
-        const composeFiles = ["docker-compose-validator.yaml"];
+        composeFiles.push("docker-compose-validator.yaml");
+
         if (flags.cpus) {
             composeFiles.push("docker-compose-validator-cpus.yaml");
         }
@@ -218,7 +224,7 @@
            });
        } catch (e: unknown) {
            // 130 is a graceful shutdown, so we can swallow it
            if ((e as any).exitCode !== 130) {
                throw e;
            }
        } finally {

diff --git a/apps/cli/src/config.ts b/apps/cli/src/config.ts
@@ -74,7 +74,7 @@ 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 = "cartesi/sdk:0.12.0-alpha.3";
+export const DEFAULT_SDK = "cartesi/sdk:0.12.0-alpha.5";
 
 type Builder = "directory" | "docker" | "empty" | "none" | "tar";
 type DriveFormat = "ext2" | "sqfs";

diff --git a/apps/cli/src/node/DockerfileDeploy.txt b/apps/cli/src/node/DockerfileDeploy.txt
@@ -1,4 +1,4 @@
-FROM cartesi/rollups-node:1.5.1
+FROM cartesi/rollups-node:devel
 ENV CARTESI_SNAPSHOT_DIR=/usr/share/rollups-node/snapshot
 ENV CARTESI_HTTP_ADDRESS=0.0.0.0
 COPY --chown=cartesi:cartesi . ${CARTESI_SNAPSHOT_DIR}
diff --git a/apps/cli/src/node/default.env b/apps/cli/src/node/default.env
@@ -1,27 +1,46 @@
 # cartesi/rollups-node
-CARTESI_LOG_LEVEL="${CARTESI_LOG_LEVEL:-error}"
-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_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}"
+
+#logs
+CARTESI_LOG_LEVEL="${CARTESI_LOG_LEVEL:-info}"
+CARTESI_LOG_PRETTY_ENABLED="${CARTESI_LOG_PRETTY_ENABLED:-false}"
+
+# features
+CARTESI_FEATURE_INPUT_READER_ENABLED="${CARTESI_FEATURE_INPUT_READER_ENABLED:-true}"
+CARTESI_FEATURE_CLAIM_SUBMISSION_ENABLED="${CARTESI_FEATURE_CLAIM_SUBMISSION_ENABLED:-true}"
+CARTESI_FEATURE_MACHINE_HASH_CHECK_ENABLED="${CARTESI_FEATURE_MACHINE_HASH_CHECK_ENABLED:-false}"
+
+# rollups
 CARTESI_EPOCH_LENGTH="${CARTESI_EPOCH_LENGTH:-720}"
+CARTESI_EVM_READER_RETRY_POLICY_MAX_RETRIES="${CARTESI_EVM_READER_RETRY_POLICY_MAX_RETRIES:-3}"
+CARTESI_EVM_READER_RETRY_POLICY_MAX_DELAY="${CARTESI_EVM_READER_RETRY_POLICY_MAX_DELAY:-3}"
+CARTESI_ADVANCER_POLLING_INTERVAL="${CARTESI_ADVANCER_POLLING_INTERVAL:-7}"
+CARTESI_VALIDATOR_POLLING_INTERVAL="${CARTESI_VALIDATOR_POLLING_INTERVAL:-7}"
+CARTESI_CLAIMER_POLLING_INTERVAL="${CARTESI_CLAIMER_POLLING_INTERVAL:-7}"
+CARTESI_MAX_STARTUP_TIME="${CARTESI_MAX_STARTUP_TIME:-5}"
+
+# blockchain
 CARTESI_BLOCKCHAIN_ID="${CARTESI_BLOCKCHAIN_ID:-31337}"
 CARTESI_BLOCKCHAIN_HTTP_ENDPOINT="${CARTESI_BLOCKCHAIN_HTTP_ENDPOINT:-http://anvil:8545}"
 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_LEGACY_BLOCKCHAIN_ENABLED="${CARTESI_LEGACY_BLOCKCHAIN_ENABLED:-false}"
+CARTESI_EVM_READER_DEFAULT_BLOCK="${CARTESI_EVM_READER_DEFAULT_BLOCK:-latest}"
 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}"
-CARTESI_CONTRACTS_AUTHORITY_ADDRESS="${CARTESI_CONTRACTS_AUTHORITY_ADDRESS:-0x58c93f83fb3304730c95aad2e360cdb88b782010}"
-CARTESI_CONTRACTS_INPUT_BOX_ADDRESS="${CARTESI_CONTRACTS_INPUT_BOX_ADDRESS:-0x59b22D57D4f067708AB0c00552767405926dc768}"
-CARTESI_SNAPSHOT_DIR="${CARTESI_SNAPSHOT_DIR:-/usr/share/cartesi/snapshot}"
+
+# contracts
+CARTESI_CONTRACTS_INPUT_BOX_ADDRESS="${CARTESI_CONTRACTS_INPUT_BOX_ADDRESS:-0x593E5BCf894D6829Dd26D0810DA7F064406aebB6}"
+CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER="${CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER:-7}"
+CARTESI_CONTRACTS_APPLICATION_FACTORY_ADDRESS="${CARTESI_CONTRACTS_APPLICATION_FACTORY_ADDRESS:-0xd7d4d184b82b1a4e08f304DDaB0A2A7a301C2620}"
+CARTESI_CONTRACTS_AUTHORITY_FACTORY_ADDRESS="${CARTESI_CONTRACTS_AUTHORITY_FACTORY_ADDRESS:-0xB897F7Fe78f220aE34B7FA9493092701a873Ed45}"
+
+# snapshot
+CARTESI_SNAPSHOT_DIR="${CARTESI_SNAPSHOT_DIR:-/usr/share/rollups-node/snapshot}"
+
+# auth
 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_SERVER_MANAGER_BYPASS_LOG="${CARTESI_EXPERIMENTAL_SERVER_MANAGER_BYPASS_LOG:-false}"
 
-# server-manager
-SM_DEADLINE_MACHINE="${SM_DEADLINE_MACHINE:-30000}"
+# postgres
+CARTESI_POSTGRES_ENDPOINT="${CARTESI_POSTGRES_ENDPOINT:-postgres://postgres:password@database:5432/postgres?sslmode=disable}"
+
+# http
+CARTESI_INSPECT_PORT=${CARTESI_INSPECT_PORT:-10012}
+CARTESI_INSPECT_ADDRESS=${CARTESI_INSPECT_ADDRESS:-0.0.0.0:$CARTESI_INSPECT_PORT}
diff --git a/apps/cli/src/node/docker-compose-anvil.yaml b/apps/cli/src/node/docker-compose-anvil.yaml
@@ -1,6 +1,8 @@
 services:
     anvil:
-        image: cartesi/sdk:0.12.0-alpha.3
+        extends:
+            file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
+            service: sdk_image
         command:
             [
                 "devnet",
@@ -19,27 +21,32 @@ services:
             - 8545:8545
 
     dapp_deployer:
-        image: cartesi/sdk:0.12.0-alpha.3
+        extends:
+            file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
+            service: rollups_node_image
         restart: on-failure
         depends_on:
-            anvil:
+            validator:
                 condition: service_started
+        env_file:
+            - ${CARTESI_BIN_PATH}/node/default.env
         command:
-            [
-                "cast",
-                "send",
-                "--rpc-url",
-                "http://anvil:8545",
-                "--private-key",
-                "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80",
-                "0x4C11C7F82D6D56a726f9B53dd99af031AFd86BB6",
-                "deployContracts(address,address,bytes32,bytes32)",
-                "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-                "720",
-                "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-                "0x0000000000000000000000000000000000000000000000000000000000000000",
-                "0x0000000000000000000000000000000000000000000000000000000000000000",
-            ]
+            - /bin/bash
+            - -c
+            - -x
+            - |
+                cartesi-rollups-cli app deploy                                                      \
+                    --print-json                                                                    \
+                    --postgres-endpoint "$$CARTESI_POSTGRES_ENDPOINT"                               \
+                    --rpc-url "$$CARTESI_BLOCKCHAIN_HTTP_ENDPOINT"                                  \
+                    --inputbox-block-number "$$CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER" \
+                    --mnemonic "$$CARTESI_AUTH_MNEMONIC"                                            \
+                    --epoch-length "$$CARTESI_EPOCH_LENGTH"                                         \
+                    --app-factory "$$CARTESI_CONTRACTS_APPLICATION_FACTORY_ADDRESS"                 \
+                    --authority-factory "$$CARTESI_CONTRACTS_AUTHORITY_FACTORY_ADDRESS"             \
+                    --app-owner "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"                        \
+                    --template-path $$CARTESI_SNAPSHOT_DIR                                          \
+                    --name "dapp"
 
     prompt:
         image: debian:bookworm-slim

diff --git a/apps/cli/src/node/docker-compose-base.yaml b/apps/cli/src/node/docker-compose-base.yaml
@@ -0,0 +1,5 @@
+services:
+    sdk_image:
+        image: ${CARTESI_SDK_IMAGE}
+    rollups_node_image:
+        image: cartesi/rollups-node:2.0.0
diff --git a/apps/cli/src/node/docker-compose-bundler.yaml b/apps/cli/src/node/docker-compose-bundler.yaml
@@ -1,6 +1,8 @@
 services:
     alto:
-        image: cartesi/sdk:0.12.0-alpha.3
+        extends:
+            file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
+            service: sdk_image
         command:
             - "alto"
             - "--entrypoints"

diff --git a/apps/cli/src/node/docker-compose-database.yaml b/apps/cli/src/node/docker-compose-database.yaml
@@ -8,3 +8,21 @@ services:
             retries: 5
         environment:
             - POSTGRES_PASSWORD=password
+
+    migration:
+        extends:
+            file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
+            service: rollups_node_image
+        command:
+            - /bin/bash
+            - -c
+            - -x
+            - |
+                cartesi-rollups-cli db upgrade -p "$$CARTESI_POSTGRES_ENDPOINT"
+
+        depends_on:
+            database:
+                condition: service_healthy
+        restart: "no"
+        env_file:
+            - ${CARTESI_BIN_PATH}/node/default.env
diff --git a/apps/cli/src/node/docker-compose-espresso.yaml b/apps/cli/src/node/docker-compose-espresso.yaml
@@ -16,7 +16,9 @@ services:
         environment:
             CARTESI_FEATURE_INPUT_READER_ENABLED: false
     espresso:
-        image: cartesi/sdk:0.12.0-alpha.3
+        extends:
+            file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
+            service: sdk_image
         command: ["/usr/local/bin/espresso-dev-node"]
         deploy:
             resources:

diff --git a/apps/cli/src/node/docker-compose-paymaster.yaml b/apps/cli/src/node/docker-compose-paymaster.yaml
@@ -1,6 +1,8 @@
 services:
     mock-verifying-paymaster:
-        image: cartesi/sdk:0.12.0-alpha.3
+        extends:
+            file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
+            service: sdk_image
         command: "mock-verifying-paymaster"
         environment:
             - ALTO_RPC=http://alto:4337

diff --git a/apps/cli/src/node/docker-compose-snapshot-volume.yaml b/apps/cli/src/node/docker-compose-snapshot-volume.yaml
@@ -1,7 +1,7 @@
 services:
     dapp_deployer:
         volumes:
-            - ./.cartesi/image:/usr/share/cartesi/snapshot:ro
+            - ./.cartesi/image:/usr/share/rollups-node/snapshot:ro
 
     validator:
         volumes:

diff --git a/apps/cli/src/node/docker-compose-validator.yaml b/apps/cli/src/node/docker-compose-validator.yaml
@@ -1,16 +1,21 @@
 services:
     validator:
-        image: cartesi/rollups-node:1.5.1
+        extends:
+            file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml
+            service: rollups_node_image
         depends_on:
-            dapp_deployer:
+            migration:
                 condition: service_completed_successfully
+            anvil:
+                condition: service_healthy
         expose:
             - "10000"
         healthcheck:
-            test: ["CMD", "curl", "-f", "http://localhost:10000/healthz"]
+            test: ["CMD", "curl", "-f", "http://localhost:10000/livez"]
             interval: 10s
             timeout: 1s
             retries: 5
+        user: root
         command:
             - /bin/bash
             - -c
@@ -45,7 +50,7 @@ services:
                         inspect_server:
                             loadBalancer:
                                 servers:
-                                    - url: "http://validator:10000/inspect"
+                                    - url: "http://validator:10012/inspect"
             TRAEFIK_CONFIG_GRAPHQL_SERVER: |
                 http:
                     routers: