From 79f7ac718449b953b2cf005ee96294407cf20112 Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Thu, 6 Mar 2025 17:42:15 -0300 Subject: [PATCH] feat(cli): add rollups-espresso-reader --- .changeset/tasty-chairs-doubt.md | 5 ++ .../rollups/docker-compose-espresso.yaml | 55 +++++++++++++++---- .../rollups/proxy/espresso-reader.yaml | 17 ++++++ 3 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 .changeset/tasty-chairs-doubt.md create mode 100644 apps/cli/src/compose/rollups/proxy/espresso-reader.yaml diff --git a/.changeset/tasty-chairs-doubt.md b/.changeset/tasty-chairs-doubt.md new file mode 100644 index 00000000..33737f14 --- /dev/null +++ b/.changeset/tasty-chairs-doubt.md @@ -0,0 +1,5 @@ +--- +"@cartesi/cli": patch +--- + +add rollups-espresso-reader service diff --git a/apps/cli/src/compose/rollups/docker-compose-espresso.yaml b/apps/cli/src/compose/rollups/docker-compose-espresso.yaml index f989c630..f4c48b33 100644 --- a/apps/cli/src/compose/rollups/docker-compose-espresso.yaml +++ b/apps/cli/src/compose/rollups/docker-compose-espresso.yaml @@ -6,15 +6,11 @@ services: database: condition: service_healthy environment: - PGHOST: ${PGHOST:-database} - PGPORT: ${PGPORT:-5432} - PGUSER: ${PGUSER:-postgres} - PGPASSWORD: ${PGPASSWORD:-password} - PGDATABASE: ${PGDATABASE:-postgres} - - rollups-node: - environment: - CARTESI_FEATURE_INPUT_READER_ENABLED: false + PGHOST: database + PGPORT: 5432 + PGUSER: postgres + PGPASSWORD: password + PGDATABASE: postgres espresso: image: ${CARTESI_SDK_IMAGE} @@ -32,7 +28,7 @@ services: depends_on: espresso_database_creator: condition: service_completed_successfully - database: + anvil: condition: service_healthy environment: ESPRESSO_SEQUENCER_L1_PROVIDER: ${CARTESI_BLOCKCHAIN_HTTP_ENDPOINT:-http://anvil:8545} @@ -46,6 +42,8 @@ services: ESPRESSO_SEQUENCER_POSTGRES_PASSWORD: password ESPRESSO_SEQUENCER_POSTGRES_DATABASE: sequencer ESPRESSO_SEQUENCER_ETH_MNEMONIC: ${CARTESI_AUTH_MNEMONIC:-test test test test test test test test test test test junk} + ESPRESSO_SEQUENCER_L1_POLLING_INTERVAL: "1s" + ESPRESSO_STATE_PROVER_UPDATE_INTERVAL: "1s" healthcheck: test: [ @@ -60,9 +58,46 @@ services: timeout: 1s retries: 5 + rollups-node: + environment: + CARTESI_FEATURE_INPUT_READER_ENABLED: false + + espresso_reader_migration: + image: ${CARTESI_SDK_IMAGE} + command: + - migrate + - -source + - file:///usr/share/cartesi/rollups-espresso-reader/migrations + - -database + - postgres://postgres:password@database:5432/postgres?sslmode=disable&x-migrations-table=espresso_schema_migrations + - up + depends_on: + rollups-node-migration: + condition: service_completed_successfully + + espresso_reader: + image: ${CARTESI_SDK_IMAGE} + command: ["cartesi-rollups-espresso-reader"] + env_file: + - ${CARTESI_BIN_PATH}/compose/rollups/default.env + ports: + - 8081 + depends_on: + espresso_reader_migration: + condition: service_completed_successfully + espresso: + condition: service_healthy + environment: + CARTESI_POSTGRES_ENDPOINT: postgres://postgres:password@database:5432/postgres?sslmode=disable + ESPRESSO_SERVICE_ENDPOINT: ":8081" + ESPRESSO_BASE_URL: http://espresso:8770 + ESPRESSO_NAMESPACE: 51025 + ESPRESSO_STARTING_BLOCK: 101 + proxy: depends_on: espresso: condition: service_healthy volumes: - ./proxy/espresso.yaml:/etc/traefik/conf.d/espresso.yaml + - ./proxy/espresso-reader.yaml:/etc/traefik/conf.d/espresso-reader.yaml diff --git a/apps/cli/src/compose/rollups/proxy/espresso-reader.yaml b/apps/cli/src/compose/rollups/proxy/espresso-reader.yaml new file mode 100644 index 00000000..daacf317 --- /dev/null +++ b/apps/cli/src/compose/rollups/proxy/espresso-reader.yaml @@ -0,0 +1,17 @@ +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"