From d374162b038c67f09507f71953119d3a97ea14bf Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Tue, 29 Oct 2024 13:33:09 -0300 Subject: [PATCH] wip --- apps/cli/src/commands/run.ts | 13 ++++ apps/cli/src/node/DockerfileDeploy.txt | 2 +- apps/cli/src/node/default.env | 60 ++++++++++++------- apps/cli/src/node/docker-compose-anvil.yaml | 37 ++++++++---- .../cli/src/node/docker-compose-database.yaml | 12 +++- .../node/docker-compose-snapshot-volume.yaml | 2 +- .../src/node/docker-compose-validator.yaml | 4 +- 7 files changed, 92 insertions(+), 38 deletions(-) diff --git a/apps/cli/src/commands/run.ts b/apps/cli/src/commands/run.ts index 4dd12bb6..76f22a1e 100644 --- a/apps/cli/src/commands/run.ts +++ b/apps/cli/src/commands/run.ts @@ -116,6 +116,19 @@ export default class Run extends BaseCommand { CARTESI_LISTEN_PORT: listenPort.toString(), CARTESI_VALIDATOR_CPUS: flags.cpus?.toString(), CARTESI_VALIDATOR_MEMORY: flags.memory?.toString(), + CARTESI_POSTGRES_ENDPOINT: + "postgres://postgres:password@database:5432/postgres?sslmode=disable", + CARTESI_BLOCKCHAIN_HTTP_ENDPOINT: "http://anvil:8545", + CARTESI_BLOCKCHAIN_WS_ENDPOINT: "ws://anvil:8545", + CARTESI_CONTRACTS_INPUT_BOX_ADDRESS: + "0x593E5BCf894D6829Dd26D0810DA7F064406aebB6", + CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER: "7", + CARTESI_AUTH_MNEMONIC: + "test test test test test test test test test test test junk", + CARTESI_CONTRACTS_APPLICATION_FACTORY_ADDRESS: + "0x1d4CfBD2622d802A07CeB4C3401Bbb455c9dbdC3", + CARTESI_CONTRACTS_AUTHORITY_FACTORY_ADDRESS: + "0xB897F7Fe78f220aE34B7FA9493092701a873Ed45", }; // validator diff --git a/apps/cli/src/node/DockerfileDeploy.txt b/apps/cli/src/node/DockerfileDeploy.txt index d1412cb2..3ee73917 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: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 index a415d636..e324d3cc 100644 --- a/apps/cli/src/node/default.env +++ b/apps/cli/src/node/default.env @@ -1,27 +1,43 @@ # 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_CLAIMER_ENABLED="${CARTESI_FEATURE_CLAIMER_ENABLED:-true}" +CARTESI_FEATURE_MACHINE_HASH_CHECK_ENABLED="${CARTESI_FEATURE_MACHINE_HASH_CHECK_ENABLED:-false}" + +# rollups CARTESI_EPOCH_LENGTH="${CARTESI_EPOCH_LENGTH:-720}" +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_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}" + +# 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_HTTP_ENDPOINT="http://anvil:8545" +CARTESI_BLOCKCHAIN_WS_ENDPOINT="ws://anvil:8545" +CARTESI_LEGACY_BLOCKCHAIN_ENABLED="${CARTESI_LEGACY_BLOCKCHAIN_ENABLED:-false}" CARTESI_BLOCKCHAIN_FINALITY_OFFSET="${CARTESI_BLOCKCHAIN_FINALITY_OFFSET:-0}" +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}" -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}" + +#contracts +CARTESI_CONTRACTS_INPUT_BOX_ADDRESS="0x593E5BCf894D6829Dd26D0810DA7F064406aebB6" +CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER="7" + +# snapshot +CARTESI_SNAPSHOT_DIR="/usr/share/rollups-node/snapshot" + +# auth +CARTESI_AUTH_MNEMONIC="test test test test test test test test test test test junk" + +# postgres +CARTESI_POSTGRES_ENDPOINT="postgres://postgres:password@database:5432/postgres?sslmode=disable" + +# http +CARTESI_HTTP_ADDRESS="${CARTESI_HTTP_ADDRESS:-0.0.0.0}" +CARTESI_HTTP_PORT="${CARTESI_HTTP_PORT:-10000}" diff --git a/apps/cli/src/node/docker-compose-anvil.yaml b/apps/cli/src/node/docker-compose-anvil.yaml index 515c239e..6ea187df 100644 --- a/apps/cli/src/node/docker-compose-anvil.yaml +++ b/apps/cli/src/node/docker-compose-anvil.yaml @@ -19,26 +19,39 @@ services: - 8545:8545 dapp_deployer: - image: cartesi/sdk:0.12.0-alpha.0 + image: cartesi/rollups-node:devel restart: on-failure depends_on: anvil: condition: service_started + migration: + condition: service_completed_successfully + env_file: + - ${CARTESI_BIN_PATH}/node/default.env command: [ - "cast", - "send", + "cartesi-rollups-cli", + "app", + "deploy", + "--print-json", + "--postgres-endpoint", + "${CARTESI_POSTGRES_ENDPOINT}", "--rpc-url", - "http://anvil:8545", - "--private-key", - "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80", - "0x4C11C7F82D6D56a726f9B53dd99af031AFd86BB6", - "deployContracts(address,address,bytes32,bytes32)", - "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "720", + "${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", - "0x0000000000000000000000000000000000000000000000000000000000000000", - "0x0000000000000000000000000000000000000000000000000000000000000000", + "--template-path", + "${CARTESI_SNAPSHOT_DIR}", ] prompt: diff --git a/apps/cli/src/node/docker-compose-database.yaml b/apps/cli/src/node/docker-compose-database.yaml index fb661ab1..dac4bb12 100644 --- a/apps/cli/src/node/docker-compose-database.yaml +++ b/apps/cli/src/node/docker-compose-database.yaml @@ -1,6 +1,6 @@ services: database: - image: postgres:15-alpine + image: postgres:17-alpine healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres || exit 1"] interval: 10s @@ -8,3 +8,13 @@ services: retries: 5 environment: - POSTGRES_PASSWORD=password + + migration: + image: cartesi/rollups-node:devel + command: 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..f421d67a 100644 --- a/apps/cli/src/node/docker-compose-validator.yaml +++ b/apps/cli/src/node/docker-compose-validator.yaml @@ -1,9 +1,11 @@ services: validator: - image: cartesi/rollups-node:1.5.1 + image: cartesi/rollups-node:devel depends_on: dapp_deployer: condition: service_completed_successfully + migration: + condition: service_completed_successfully expose: - "10000" healthcheck: