diff --git a/apps/cli/src/config.ts b/apps/cli/src/config.ts index e2cec48..a105643 100644 --- 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.5"; +export const DEFAULT_SDK = "cartesi/sdk:0.12.0-alpha.6"; type Builder = "directory" | "docker" | "empty" | "none" | "tar"; type DriveFormat = "ext2" | "sqfs"; diff --git a/apps/cli/src/node/docker-compose-anvil.yaml b/apps/cli/src/node/docker-compose-anvil.yaml index 3049067..1284072 100644 --- a/apps/cli/src/node/docker-compose-anvil.yaml +++ b/apps/cli/src/node/docker-compose-anvil.yaml @@ -1,6 +1,6 @@ services: anvil: - image: cartesi/sdk:0.12.0-alpha.5 + image: cartesi/sdk:0.12.0-alpha.6 command: [ "devnet", diff --git a/apps/cli/src/node/docker-compose-bundler.yaml b/apps/cli/src/node/docker-compose-bundler.yaml index d6ae5fd..658ef58 100644 --- a/apps/cli/src/node/docker-compose-bundler.yaml +++ b/apps/cli/src/node/docker-compose-bundler.yaml @@ -1,6 +1,6 @@ services: alto: - image: cartesi/sdk:0.12.0-alpha.5 + image: cartesi/sdk:0.12.0-alpha.6 command: - "alto" - "--entrypoints" diff --git a/apps/cli/src/node/docker-compose-envfile.yaml b/apps/cli/src/node/docker-compose-envfile.yaml index 89bff15..4fb936e 100644 --- a/apps/cli/src/node/docker-compose-envfile.yaml +++ b/apps/cli/src/node/docker-compose-envfile.yaml @@ -2,3 +2,9 @@ services: validator: env_file: - ./.cartesi.env + espresso_reader: + env_file: + - ./.cartesi.env + espresso: + env_file: + - ./.cartesi.env diff --git a/apps/cli/src/node/docker-compose-espresso.yaml b/apps/cli/src/node/docker-compose-espresso.yaml index f64091a..8149549 100644 --- a/apps/cli/src/node/docker-compose-espresso.yaml +++ b/apps/cli/src/node/docker-compose-espresso.yaml @@ -15,9 +15,56 @@ services: validator: environment: CARTESI_FEATURE_INPUT_READER_ENABLED: false + + espresso_reader_migrate: + image: golang:1.23 + command: + - /bin/bash + - -c + - | + git clone --depth 1 https://github.com/cartesi/rollups-espresso-reader.git --branch v0.2.1-node-20250128 + cd rollups-espresso-reader + make migrate + env_file: + - ${CARTESI_BIN_PATH}/node/default.env + depends_on: + database: + condition: service_healthy + environment: + DATABASE_URL: postgres://postgres:password@database:5432/espresso_reader + + espresso_reader: + image: cartesi/sdk:0.12.0-alpha.6 + command: "cartesi-rollups-espresso-reader" + ports: + - 8081 + depends_on: + espresso_reader_migrate: + condition: service_completed_successfully + espresso: + condition: service_healthy + env_file: + - ${CARTESI_BIN_PATH}/node/default.env + environment: + ESPRESSO_SERVICE_ENDPOINT: ":8081" + ESPRESSO_BASE_URL: http://espresso:8770 + ESPRESSO_NAMESPACE: 51025 + ESPRESSO_STARTING_BLOCK: 101 + espresso: - image: cartesi/sdk:0.12.0-alpha.3 + image: cartesi/sdk:0.12.0-alpha.6 command: ["/usr/local/bin/espresso-dev-node"] + healthcheck: + test: + [ + "CMD", + "curl", + "-f", + "http://localhost:8770/v0/status/block-height", + ] + interval: 10s + timeout: 1s + retries: 5 deploy: resources: limits: @@ -33,6 +80,8 @@ services: condition: service_completed_successfully database: condition: service_healthy + anvil: + condition: service_healthy environment: ESPRESSO_SEQUENCER_L1_PROVIDER: ${CARTESI_BLOCKCHAIN_HTTP_ENDPOINT:-http://anvil:8545} ESPRESSO_SEQUENCER_API_PORT: 8770 @@ -125,3 +174,22 @@ services: loadBalancer: servers: - url: "http://espresso:8772" + + TRAEFIK_CONFIG_ESPRESSO_READER: | + http: + routers: + espresso-reader: + rule: "PathPrefix(`/espresso/reader`)" + middlewares: + - "remove-espresso-reader-prefix" + service: espresso-reader + middlewares: + remove-espresso-reader-prefix: + replacePathRegex: + regex: "^/espresso/reader/(.*)" + replacement: "/$1" + services: + espresso-reader: + loadBalancer: + servers: + - url: "http://espresso_reader:8081" diff --git a/apps/cli/src/node/docker-compose-paymaster.yaml b/apps/cli/src/node/docker-compose-paymaster.yaml index b7265ba..7280ecc 100644 --- a/apps/cli/src/node/docker-compose-paymaster.yaml +++ b/apps/cli/src/node/docker-compose-paymaster.yaml @@ -1,6 +1,6 @@ services: mock-verifying-paymaster: - image: cartesi/sdk:0.12.0-alpha.5 + image: cartesi/sdk:0.12.0-alpha.6 command: "mock-verifying-paymaster" environment: - ALTO_RPC=http://alto:4337