diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb4cc791..50b11c62 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,7 +182,7 @@ jobs: env: RISC0_DEV_MODE: "1" RUST_LOG: "info" - run: cargo nextest run -p integration_tests indexer -- --skip tps_test + run: cargo nextest run -p integration_tests indexer -- --skip tps_test valid-proof-test: runs-on: ubuntu-latest diff --git a/bedrock/cfgsync.yaml b/bedrock/cfgsync.yaml index e09fe586..43ffdfca 100644 --- a/bedrock/cfgsync.yaml +++ b/bedrock/cfgsync.yaml @@ -2,11 +2,22 @@ port: 4400 n_hosts: 4 timeout: 10 +faucet_settings: + enabled: false + +deployment_settings_storage_path: deployment-settings.yaml + +entropy_file: /etc/logos-blockchain/test_entropy + +mode: Setup + # Tracing tracing_settings: - logger: Stdout + logger: + stdout: true + stderr: true tracing: None filter: None metrics: None console: None - level: DEBUG + level: Debug diff --git a/bedrock/docker-compose.yml b/bedrock/docker-compose.yml index 4f85bf25..d4ba9859 100644 --- a/bedrock/docker-compose.yml +++ b/bedrock/docker-compose.yml @@ -1,14 +1,17 @@ services: cfgsync: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + platform: linux/amd64 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:2d35c2564e0e64b1181b5158908ec8842c9c540786cdbd665202026b349f61eb volumes: - ./scripts:/etc/logos-blockchain/scripts - ./cfgsync.yaml:/etc/logos-blockchain/cfgsync.yaml:z + - ./test_entropy:/etc/logos-blockchain/test_entropy:z entrypoint: /etc/logos-blockchain/scripts/run_cfgsync.sh logos-blockchain-node-0: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + platform: linux/amd64 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:2d35c2564e0e64b1181b5158908ec8842c9c540786cdbd665202026b349f61eb ports: - "${PORT:-8080}:18080/tcp" volumes: @@ -19,7 +22,8 @@ services: entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh logos-blockchain-node-1: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + platform: linux/amd64 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:2d35c2564e0e64b1181b5158908ec8842c9c540786cdbd665202026b349f61eb volumes: - ./scripts:/etc/logos-blockchain/scripts - ./kzgrs_test_params:/kzgrs_test_params:z @@ -28,7 +32,8 @@ services: entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh logos-blockchain-node-2: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + platform: linux/amd64 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:2d35c2564e0e64b1181b5158908ec8842c9c540786cdbd665202026b349f61eb volumes: - ./scripts:/etc/logos-blockchain/scripts - ./kzgrs_test_params:/kzgrs_test_params:z @@ -37,7 +42,8 @@ services: entrypoint: /etc/logos-blockchain/scripts/run_logos_blockchain_node.sh logos-blockchain-node-3: - image: ghcr.io/logos-blockchain/logos-blockchain@sha256:000982e751dfd346ca5346b8025c685fc3abc585079c59cde3bde7fd63100657 + platform: linux/amd64 + image: ghcr.io/logos-blockchain/logos-blockchain@sha256:2d35c2564e0e64b1181b5158908ec8842c9c540786cdbd665202026b349f61eb volumes: - ./scripts:/etc/logos-blockchain/scripts - ./kzgrs_test_params:/kzgrs_test_params:z diff --git a/bedrock/scripts/run_logos_blockchain_node.sh b/bedrock/scripts/run_logos_blockchain_node.sh index e318ab4a..13ab2de2 100755 --- a/bedrock/scripts/run_logos_blockchain_node.sh +++ b/bedrock/scripts/run_logos_blockchain_node.sh @@ -9,5 +9,12 @@ export CFG_FILE_PATH="/config.yaml" \ LOG_LEVEL="INFO" \ POL_PROOF_DEV_MODE=true -/usr/bin/logos-blockchain-cfgsync-client && \ - exec /usr/bin/logos-blockchain-node /config.yaml +/usr/bin/logos-blockchain-cfgsync-client + +# Download deployment settings generated by cfgsync +curl -sf "${CFG_SERVER_ADDR}/deployment-settings" -o /deployment-settings.yaml + +# Set security parameter to 10 to keep integration tests within the 10 minute timeout +sed -i 's/security_param: 30/security_param: 10/' /deployment-settings.yaml + +exec /usr/bin/logos-blockchain-node /config.yaml --deployment /deployment-settings.yaml diff --git a/bedrock/test_entropy b/bedrock/test_entropy new file mode 100644 index 00000000..314128ee --- /dev/null +++ b/bedrock/test_entropy @@ -0,0 +1 @@ +deterministic-lez-test-entropy-seed-do-not-use-in-production \ No newline at end of file