From 55854794be59b9966811db2b2f54e79ab4478c34 Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Tue, 29 Oct 2024 13:33:09 -0300 Subject: [PATCH 1/6] feat(cli): adapt to rollups-node:2.0.0 --- apps/cli/src/baseCommand.ts | 2 +- apps/cli/src/node/DockerfileDeploy.txt | 2 +- apps/cli/src/node/default.env | 57 ++++++++++++------- apps/cli/src/node/docker-compose-anvil.yaml | 37 ++++++------ .../cli/src/node/docker-compose-database.yaml | 16 ++++++ .../node/docker-compose-snapshot-volume.yaml | 2 +- .../src/node/docker-compose-validator.yaml | 11 ++-- 7 files changed, 84 insertions(+), 43 deletions(-) diff --git a/apps/cli/src/baseCommand.ts b/apps/cli/src/baseCommand.ts index cf618c45..ecd45eba 100644 --- a/apps/cli/src/baseCommand.ts +++ b/apps/cli/src/baseCommand.ts @@ -78,7 +78,7 @@ export abstract class BaseCommand extends Command { protected async getApplicationAddress(): Promise
{ // fixed value, as we do deterministic deployment with a zero hash - return getAddress("0xab7528bb862fb57e8a2bcd567a2e929a0be56a5e"); + return getAddress("0x60ec77594cdaa4ec2263c0d7436d70e37164c69f"); } protected async getAddressBook(): Promise { diff --git a/apps/cli/src/node/DockerfileDeploy.txt b/apps/cli/src/node/DockerfileDeploy.txt index d1412cb2..9efd58c2 100644 --- 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:2.0.0 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 index a415d636..0c5c255f 100644 --- 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 index d2f64a32..df049da0 100644 --- a/apps/cli/src/node/docker-compose-anvil.yaml +++ b/apps/cli/src/node/docker-compose-anvil.yaml @@ -19,27 +19,30 @@ services: - 8545:8545 dapp_deployer: - image: cartesi/sdk:0.12.0-alpha.3 + image: cartesi/rollups-node:2.0.0 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-database.yaml b/apps/cli/src/node/docker-compose-database.yaml index e5a66dc4..5e5948a0 100644 --- a/apps/cli/src/node/docker-compose-database.yaml +++ b/apps/cli/src/node/docker-compose-database.yaml @@ -8,3 +8,19 @@ services: retries: 5 environment: - POSTGRES_PASSWORD=password + + migration: + image: cartesi/rollups-node:2.0.0 + 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-snapshot-volume.yaml b/apps/cli/src/node/docker-compose-snapshot-volume.yaml index 0862b2a3..46c04b93 100644 --- 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 index 81f7dba8..6d8b2621 100644 --- a/apps/cli/src/node/docker-compose-validator.yaml +++ b/apps/cli/src/node/docker-compose-validator.yaml @@ -1,16 +1,19 @@ services: validator: - image: cartesi/rollups-node:1.5.1 + image: cartesi/rollups-node:2.0.0 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 +48,7 @@ services: inspect_server: loadBalancer: servers: - - url: "http://validator:10000/inspect" + - url: "http://validator:10012/inspect" TRAEFIK_CONFIG_GRAPHQL_SERVER: | http: routers: From 87f8b78c3417f2460b556257eb5d33c9b651f20a Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Fri, 1 Nov 2024 15:57:13 -0300 Subject: [PATCH 2/6] DELETE: use cartesi/rollups-node:devel --- apps/cli/src/node/DockerfileDeploy.txt | 2 +- apps/cli/src/node/docker-compose-anvil.yaml | 2 +- apps/cli/src/node/docker-compose-database.yaml | 2 +- apps/cli/src/node/docker-compose-validator.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/cli/src/node/DockerfileDeploy.txt b/apps/cli/src/node/DockerfileDeploy.txt index 9efd58c2..3ee73917 100644 --- a/apps/cli/src/node/DockerfileDeploy.txt +++ b/apps/cli/src/node/DockerfileDeploy.txt @@ -1,4 +1,4 @@ -FROM cartesi/rollups-node:2.0.0 +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/docker-compose-anvil.yaml b/apps/cli/src/node/docker-compose-anvil.yaml index df049da0..f18e6539 100644 --- a/apps/cli/src/node/docker-compose-anvil.yaml +++ b/apps/cli/src/node/docker-compose-anvil.yaml @@ -19,7 +19,7 @@ services: - 8545:8545 dapp_deployer: - image: cartesi/rollups-node:2.0.0 + image: cartesi/rollups-node:devel restart: on-failure depends_on: validator: diff --git a/apps/cli/src/node/docker-compose-database.yaml b/apps/cli/src/node/docker-compose-database.yaml index 5e5948a0..1086c9ef 100644 --- a/apps/cli/src/node/docker-compose-database.yaml +++ b/apps/cli/src/node/docker-compose-database.yaml @@ -10,7 +10,7 @@ services: - POSTGRES_PASSWORD=password migration: - image: cartesi/rollups-node:2.0.0 + image: cartesi/rollups-node:devel command: - /bin/bash - -c diff --git a/apps/cli/src/node/docker-compose-validator.yaml b/apps/cli/src/node/docker-compose-validator.yaml index 6d8b2621..449440fa 100644 --- a/apps/cli/src/node/docker-compose-validator.yaml +++ b/apps/cli/src/node/docker-compose-validator.yaml @@ -1,6 +1,6 @@ services: validator: - image: cartesi/rollups-node:2.0.0 + image: cartesi/rollups-node:devel depends_on: migration: condition: service_completed_successfully From d2c37a42422f63f6148c7693a5a55453a6c8ab60 Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Mon, 3 Feb 2025 15:51:52 -0300 Subject: [PATCH 3/6] chore(cli): bump sdk to 0.12.0-alpha.5 --- apps/cli/src/config.ts | 2 +- apps/cli/src/node/docker-compose-anvil.yaml | 2 +- apps/cli/src/node/docker-compose-bundler.yaml | 2 +- apps/cli/src/node/docker-compose-paymaster.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/cli/src/config.ts b/apps/cli/src/config.ts index 19d12e78..e2cec485 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.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/docker-compose-anvil.yaml b/apps/cli/src/node/docker-compose-anvil.yaml index f18e6539..30490675 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.3 + image: cartesi/sdk:0.12.0-alpha.5 command: [ "devnet", diff --git a/apps/cli/src/node/docker-compose-bundler.yaml b/apps/cli/src/node/docker-compose-bundler.yaml index dd29c4cc..d6ae5fd3 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.3 + image: cartesi/sdk:0.12.0-alpha.5 command: - "alto" - "--entrypoints" diff --git a/apps/cli/src/node/docker-compose-paymaster.yaml b/apps/cli/src/node/docker-compose-paymaster.yaml index 3b819afe..b7265ba4 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.3 + image: cartesi/sdk:0.12.0-alpha.5 command: "mock-verifying-paymaster" environment: - ALTO_RPC=http://alto:4337 From a6a9af4152a22ed86247f46ac651c9426b6e4155 Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Tue, 4 Feb 2025 10:19:14 -0300 Subject: [PATCH 4/6] refactor(cli): compose image definition in a single place --- .changeset/selfish-dots-perform.md | 5 +++++ apps/cli/src/commands/run.ts | 6 +++++- apps/cli/src/node/docker-compose-anvil.yaml | 8 ++++++-- apps/cli/src/node/docker-compose-base.yaml | 5 +++++ apps/cli/src/node/docker-compose-bundler.yaml | 4 +++- apps/cli/src/node/docker-compose-database.yaml | 4 +++- apps/cli/src/node/docker-compose-paymaster.yaml | 4 +++- apps/cli/src/node/docker-compose-validator.yaml | 4 +++- 8 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 .changeset/selfish-dots-perform.md create mode 100644 apps/cli/src/node/docker-compose-base.yaml diff --git a/.changeset/selfish-dots-perform.md b/.changeset/selfish-dots-perform.md new file mode 100644 index 00000000..9c554755 --- /dev/null +++ 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/commands/run.ts b/apps/cli/src/commands/run.ts index a1d80f35..81c028e2 100644 --- a/apps/cli/src/commands/run.ts +++ b/apps/cli/src/commands/run.ts @@ -123,8 +123,12 @@ export default class Run extends BaseCommand { CARTESI_VALIDATOR_MEMORY: flags.memory?.toString(), }; + // 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"); } diff --git a/apps/cli/src/node/docker-compose-anvil.yaml b/apps/cli/src/node/docker-compose-anvil.yaml index 30490675..d3170f8a 100644 --- 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.5 + extends: + file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml + service: sdk_image command: [ "devnet", @@ -19,7 +21,9 @@ services: - 8545:8545 dapp_deployer: - image: cartesi/rollups-node:devel + extends: + file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml + service: rollups_node_image restart: on-failure depends_on: validator: diff --git a/apps/cli/src/node/docker-compose-base.yaml b/apps/cli/src/node/docker-compose-base.yaml new file mode 100644 index 00000000..467437ae --- /dev/null +++ b/apps/cli/src/node/docker-compose-base.yaml @@ -0,0 +1,5 @@ +services: + sdk_image: + image: cartesi/sdk:0.12.0-alpha.5 + 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 index d6ae5fd3..c0a50d15 100644 --- 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.5 + 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 index 1086c9ef..26ab0c28 100644 --- a/apps/cli/src/node/docker-compose-database.yaml +++ b/apps/cli/src/node/docker-compose-database.yaml @@ -10,7 +10,9 @@ services: - POSTGRES_PASSWORD=password migration: - image: cartesi/rollups-node:devel + extends: + file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml + service: rollups_node_image command: - /bin/bash - -c diff --git a/apps/cli/src/node/docker-compose-paymaster.yaml b/apps/cli/src/node/docker-compose-paymaster.yaml index b7265ba4..5eb74a01 100644 --- 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.5 + 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-validator.yaml b/apps/cli/src/node/docker-compose-validator.yaml index 449440fa..2129361f 100644 --- a/apps/cli/src/node/docker-compose-validator.yaml +++ b/apps/cli/src/node/docker-compose-validator.yaml @@ -1,6 +1,8 @@ services: validator: - image: cartesi/rollups-node:devel + extends: + file: ${CARTESI_BIN_PATH}/node/docker-compose-base.yaml + service: rollups_node_image depends_on: migration: condition: service_completed_successfully From e1c81867e6b3fb072dd7c961918119c085be737b Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Fri, 21 Feb 2025 10:57:55 -0300 Subject: [PATCH 5/6] fixup! refactor(cli): compose image definition in a single place --- apps/cli/src/node/docker-compose-espresso.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/cli/src/node/docker-compose-espresso.yaml b/apps/cli/src/node/docker-compose-espresso.yaml index f64091af..813862a3 100644 --- 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: From 855012a92291f5a08e5a935194af167ce2e0da26 Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Fri, 21 Feb 2025 10:58:28 -0300 Subject: [PATCH 6/6] fixup! refactor(cli): compose image definition in a single place --- apps/cli/src/commands/run.ts | 2 ++ apps/cli/src/node/docker-compose-base.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/cli/src/commands/run.ts b/apps/cli/src/commands/run.ts index 81c028e2..e5af807c 100644 --- a/apps/cli/src/commands/run.ts +++ b/apps/cli/src/commands/run.ts @@ -4,6 +4,7 @@ import fs from "fs-extra"; import path from "path"; import { BaseCommand } from "../baseCommand.js"; +import { DEFAULT_SDK } from "../config.js"; export default class Run extends BaseCommand { static summary = "Run application node."; @@ -121,6 +122,7 @@ export default class Run extends BaseCommand { CARTESI_LISTEN_PORT: listenPort.toString(), CARTESI_VALIDATOR_CPUS: flags.cpus?.toString(), CARTESI_VALIDATOR_MEMORY: flags.memory?.toString(), + CARTESI_SDK_IMAGE: DEFAULT_SDK, }; // base diff --git a/apps/cli/src/node/docker-compose-base.yaml b/apps/cli/src/node/docker-compose-base.yaml index 467437ae..1e24044d 100644 --- a/apps/cli/src/node/docker-compose-base.yaml +++ b/apps/cli/src/node/docker-compose-base.yaml @@ -1,5 +1,5 @@ services: sdk_image: - image: cartesi/sdk:0.12.0-alpha.5 + image: ${CARTESI_SDK_IMAGE} rollups_node_image: image: cartesi/rollups-node:2.0.0