From 5e230a5c6e2340542545db8f9e0c84623a4022c7 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Wed, 27 Nov 2024 13:28:17 +0000 Subject: [PATCH] fix: various infra things exp fix fix: add to various infra things fix: docker composes tmp --- aztec-up/bin/aztec-install | 1 + aztec-up/bin/docker-compose.sandbox.yml | 9 +++++++++ boxes/docker-compose.yml | 8 ++++++++ scripts/run_native_testnet.sh | 3 ++- yarn-project/Earthfile | 15 ++++++++------- .../end-to-end/scripts/docker-compose.yml | 10 +++++++++- .../scripts/native-network/blob-sink.sh | 11 +++++++++++ .../scripts/native-network/prover-node.sh | 1 + .../scripts/native-network/validator.sh | 1 + 9 files changed, 50 insertions(+), 9 deletions(-) create mode 100755 yarn-project/end-to-end/scripts/native-network/blob-sink.sh diff --git a/aztec-up/bin/aztec-install b/aztec-up/bin/aztec-install index bec2edb9a43..d1f646f9e9b 100755 --- a/aztec-up/bin/aztec-install +++ b/aztec-up/bin/aztec-install @@ -107,6 +107,7 @@ if [ -z "${SKIP_PULL:-}" ]; then pull_container aztec-nargo pull_container aztec pull_container cli-wallet + pull_container blob-sink fi # Download the Docker Compose file. Used by aztec. diff --git a/aztec-up/bin/docker-compose.sandbox.yml b/aztec-up/bin/docker-compose.sandbox.yml index 39d6ff20319..bebace30416 100644 --- a/aztec-up/bin/docker-compose.sandbox.yml +++ b/aztec-up/bin/docker-compose.sandbox.yml @@ -15,6 +15,13 @@ services: FORK_BLOCK_NUMBER: ANVIL_PORT: ${ANVIL_PORT:-8545} + # TODO: add a readiness probe to this + # TODO: delete all of these extra images and just have one, then symlink them??? + blob-sink: + image: aztecprotocol/blob-sink + ports: + - "${BLOB_SINK_PORT:-5052}:${BLOB_SINK_PORT:-5052}" + aztec: image: "aztecprotocol/aztec" ports: @@ -30,6 +37,7 @@ services: WS_BLOCK_CHECK_INTERVAL_MS: 50 PXE_BLOCK_POLLING_INTERVAL_MS: 50 ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500 + SEQ_BLOB_SINK_URL: http://blob-sink:${BLOB_SINK_PORT:-5052} PXE_PORT: ${PXE_PORT:-8080} PORT: ${AZTEC_NODE_PORT:-8080} TEST_ACCOUNTS: ${TEST_ACCOUNTS:-true} @@ -37,4 +45,5 @@ services: - ./log:/usr/src/yarn-project/aztec/log:rw depends_on: - ethereum + - blob-sink command: "start --sandbox" diff --git a/boxes/docker-compose.yml b/boxes/docker-compose.yml index b06cca7ebc8..dfeab83d0e0 100644 --- a/boxes/docker-compose.yml +++ b/boxes/docker-compose.yml @@ -19,9 +19,17 @@ services: WS_BLOCK_CHECK_INTERVAL_MS: 50 PXE_BLOCK_POLLING_INTERVAL_MS: 50 ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500 + SEQ_BLOB_SINK_URL: http://blob-sink:5052 depends_on: - ethereum + blob-sink: + image: aztecprotocol/blob-sink:${AZTEC_DOCKER_TAG:-latest} + environment: + PORT: 5052 + DEBUG: "aztec:*" + DEBUG_COLORS: "true" + boxes: image: aztecprotocol/boxes:${AZTEC_DOCKER_TAG:-latest} entrypoint: > diff --git a/scripts/run_native_testnet.sh b/scripts/run_native_testnet.sh index 00b08f53b29..b57da343355 100755 --- a/scripts/run_native_testnet.sh +++ b/scripts/run_native_testnet.sh @@ -127,7 +127,8 @@ BASE_CMD="INTERLEAVED=$INTERLEAVED ./yarn-project/end-to-end/scripts/native_netw \"./validators.sh $NUM_VALIDATORS\" \ $PROVER_SCRIPT \ ./pxe.sh \ - ./transaction-bot.sh" + ./transaction-bot.sh \ + ./blob-sink.sh" # Execute the command eval $BASE_CMD diff --git a/yarn-project/Earthfile b/yarn-project/Earthfile index 510c25d0a76..5ffe9d808d5 100644 --- a/yarn-project/Earthfile +++ b/yarn-project/Earthfile @@ -146,21 +146,22 @@ export-cli-wallet: ARG ARCH SAVE IMAGE --push aztecprotocol/cli-wallet:${DIST_TAG}${ARCH:+-$ARCH} -blob-sink: +blob-sink-build: FROM +cli-base RUN yarn workspaces focus @aztec/blob-sink --production && yarn cache clean - ENTRYPOINT ["node", "/usr/src/yarn-project/blob-sink/dest/bin/run.js"] SAVE ARTIFACT /usr/src /usr/src +blob-sink: + FROM ubuntu:noble + RUN apt update && apt install nodejs curl -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + COPY +blob-sink-build/usr/src /usr/src + ENTRYPOINT ["node", "/usr/src/yarn-project/blob-sink/dest/run.js"] + export-blob-sink: FROM +blob-sink ARG DIST_TAG="latest" - SAVE IMAGE aztecprotocol/blob-sink:${DIST_TAG} - -export-blob-sink-arch: - FROM +blob-sink ARG ARCH - SAVE IMAGE --push aztecprotocol/blob-sink:${ARCH:+-$ARCH} + SAVE IMAGE --push aztecprotocol/blob-sink:${DIST_TAG}${ARCH:+-$ARCH} aztec-prod: FROM +cli-base diff --git a/yarn-project/end-to-end/scripts/docker-compose.yml b/yarn-project/end-to-end/scripts/docker-compose.yml index 75b9cd0d36f..e75521482c7 100644 --- a/yarn-project/end-to-end/scripts/docker-compose.yml +++ b/yarn-project/end-to-end/scripts/docker-compose.yml @@ -11,7 +11,7 @@ services: image: aztecprotocol/aztec:${AZTEC_DOCKER_TAG:-latest} command: 'start --sandbox' environment: - DEBUG: ${DEBUG:-aztec:*,-aztec:avm_simulator:memory} + DEBUG: ${DEBUG:-aztec:*,-aztec:avm_simulator:memory,-aztec:l2_block_stream:*,-aztec:world-state:database} DEBUG_COLORS: 1 ETHEREUM_HOST: http://fork:8545 L1_CHAIN_ID: 31337 @@ -21,11 +21,19 @@ services: WS_BLOCK_CHECK_INTERVAL_MS: 50 PXE_BLOCK_POLLING_INTERVAL_MS: 50 ARCHIVER_VIEM_POLLING_INTERVAL_MS: 500 + SEQ_BLOB_SINK_URL: http://blob-sink:${BLOB_SINK_PORT:-5052} ENABLE_GAS: ${ENABLE_GAS:-} HARDWARE_CONCURRENCY: ${HARDWARE_CONCURRENCY:-} expose: - '8080' + blob-sink: + image: aztecprotocol/blob-sink + environment: + PORT: ${BLOB_SINK_PORT:-5052} + DEBUG: "aztec:*" + DEBUG_COLORS: 1 + end-to-end: image: aztecprotocol/end-to-end:${AZTEC_DOCKER_TAG:-latest} environment: diff --git a/yarn-project/end-to-end/scripts/native-network/blob-sink.sh b/yarn-project/end-to-end/scripts/native-network/blob-sink.sh new file mode 100755 index 00000000000..b9ae6482003 --- /dev/null +++ b/yarn-project/end-to-end/scripts/native-network/blob-sink.sh @@ -0,0 +1,11 @@ +#!/bin/bash +set -eu + +REPO=$(git rev-parse --show-toplevel) + +# Starts the Blob Sink +export PORT=${BLOB_SINK_PORT:-5052} +export DEBUG=${DEBUG:-"aztec:*"} +export DEBUG_COLORS=${DEBUG_COLORS:-1} + +node --no-warnings "$REPO"/yarn-project/blob-sink/dest/run.js diff --git a/yarn-project/end-to-end/scripts/native-network/prover-node.sh b/yarn-project/end-to-end/scripts/native-network/prover-node.sh index c6388c91e39..ba779d67296 100755 --- a/yarn-project/end-to-end/scripts/native-network/prover-node.sh +++ b/yarn-project/end-to-end/scripts/native-network/prover-node.sh @@ -40,6 +40,7 @@ export PROVER_PUBLISHER_PRIVATE_KEY="0xac0974bec39a17e36ba4a6b4d238ff944bacb478c export PROVER_COORDINATION_NODE_URL="http://127.0.0.1:8080" export AZTEC_NODE_URL="http://127.0.0.1:8080" export PROVER_JOB_SOURCE_URL="http://127.0.0.1:$PORT" +export PROVER_BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5052}" export OTEL_RESOURCE_ATTRIBUTES="service.name=prover-node-${PORT}" export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT="${OTEL_EXPORTER_OTLP_METRICS_ENDPOINT:-}" export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT="${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:-}" diff --git a/yarn-project/end-to-end/scripts/native-network/validator.sh b/yarn-project/end-to-end/scripts/native-network/validator.sh index 518dbb9db97..a7fec5284f4 100755 --- a/yarn-project/end-to-end/scripts/native-network/validator.sh +++ b/yarn-project/end-to-end/scripts/native-network/validator.sh @@ -54,6 +54,7 @@ export P2P_TCP_ANNOUNCE_ADDR="127.0.0.1:$P2P_PORT" export P2P_UDP_ANNOUNCE_ADDR="127.0.0.1:$P2P_PORT" export P2P_TCP_LISTEN_ADDR="0.0.0.0:$P2P_PORT" export P2P_UDP_LISTEN_ADDR="0.0.0.0:$P2P_PORT" +export SEQ_BLOB_SINK_URL="http://127.0.0.1:${BLOB_SINK_PORT:-5052}" export OTEL_RESOURCE_ATTRIBUTES="service.name=validator-node-${PORT}" export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT="${OTEL_EXPORTER_OTLP_METRICS_ENDPOINT:-}" export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT="${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:-}"