From 82e19bf70905a575df4d24024da52dfcc9e54c28 Mon Sep 17 00:00:00 2001 From: Andrew Luka Date: Sun, 26 Apr 2026 11:56:42 +0300 Subject: [PATCH] apollo_integration_tests,deployment: rename dummy_eth_to_strk_oracle binary to dummy_price_oracle --- .github/workflows/hybrid_system_test.yaml | 6 +++--- ...mmy_eth_to_strk_oracle.rs => dummy_price_oracle.rs} | 0 ...oracle.Dockerfile => dummy_price_oracle.Dockerfile} | 10 +++++----- deployments/local-testing/deploy.sh | 6 +++--- deployments/monitoring/deploy_local_stack.sh | 2 +- deployments/monitoring/local/docker-compose.yml | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) rename crates/apollo_integration_tests/src/bin/{dummy_eth_to_strk_oracle.rs => dummy_price_oracle.rs} (100%) rename deployments/images/sequencer/{dummy_eth_to_strk_oracle.Dockerfile => dummy_price_oracle.Dockerfile} (70%) diff --git a/.github/workflows/hybrid_system_test.yaml b/.github/workflows/hybrid_system_test.yaml index 5e749ea2920..eb6110d69ad 100644 --- a/.github/workflows/hybrid_system_test.yaml +++ b/.github/workflows/hybrid_system_test.yaml @@ -96,8 +96,8 @@ jobs: dockerfile: Dockerfile - svc: dummy_recorder dockerfile: dummy_recorder.Dockerfile - - svc: dummy_eth_to_strk_oracle - dockerfile: dummy_eth_to_strk_oracle.Dockerfile + - svc: dummy_price_oracle + dockerfile: dummy_price_oracle.Dockerfile steps: - uses: actions/checkout@v6 @@ -225,7 +225,7 @@ jobs: echo "Deploying Dummy Eth2Strk Oracle..." pipenv install cdk8s import - cdk8s synth --app "pipenv run python main.py --namespace ${{ env.dummy_eth_to_strk_namespace }} --image ${{ env.NSC_CONTAINER_REGISTRY }}/dummy_eth_to_strk_oracle:${{ github.sha }}" + cdk8s synth --app "pipenv run python main.py --namespace ${{ env.dummy_eth_to_strk_namespace }} --image ${{ env.NSC_CONTAINER_REGISTRY }}/dummy_price_oracle:${{ github.sha }}" kubectl create namespace ${{ env.dummy_eth_to_strk_namespace }} kubectl apply -R -f ./dist echo "⏳ Waiting for Dummy Eth2Strk Oracle to become ready..." diff --git a/crates/apollo_integration_tests/src/bin/dummy_eth_to_strk_oracle.rs b/crates/apollo_integration_tests/src/bin/dummy_price_oracle.rs similarity index 100% rename from crates/apollo_integration_tests/src/bin/dummy_eth_to_strk_oracle.rs rename to crates/apollo_integration_tests/src/bin/dummy_price_oracle.rs diff --git a/deployments/images/sequencer/dummy_eth_to_strk_oracle.Dockerfile b/deployments/images/sequencer/dummy_price_oracle.Dockerfile similarity index 70% rename from deployments/images/sequencer/dummy_eth_to_strk_oracle.Dockerfile rename to deployments/images/sequencer/dummy_price_oracle.Dockerfile index 73f8a8fbb12..10b0a9bee33 100644 --- a/deployments/images/sequencer/dummy_eth_to_strk_oracle.Dockerfile +++ b/deployments/images/sequencer/dummy_price_oracle.Dockerfile @@ -1,5 +1,5 @@ # syntax = devthefuture/dockerfile-x -# deployments/images/sequencer/dummy_eth_to_strk_oracle.Dockerfile +# deployments/images/sequencer/dummy_price_oracle.Dockerfile # Dockerfile with multi-stage builds for efficient dependency caching and lightweight final image. # For more on Docker stages, visit: https://docs.docker.com/build/building/multi-stage/ @@ -15,15 +15,15 @@ RUN cargo chef prepare --recipe-path recipe.json FROM base AS builder WORKDIR /app COPY --from=planner /app/recipe.json recipe.json -RUN cargo chef cook --recipe-path recipe.json --bin dummy_eth_to_strk_oracle +RUN cargo chef cook --recipe-path recipe.json --bin dummy_price_oracle COPY . . -RUN cargo build --bin dummy_eth_to_strk_oracle +RUN cargo build --bin dummy_price_oracle FROM ubuntu:24.04 AS final_stage ENV ID=1001 WORKDIR /app -COPY --from=builder /app/target/debug/dummy_eth_to_strk_oracle ./target/debug/dummy_eth_to_strk_oracle +COPY --from=builder /app/target/debug/dummy_price_oracle ./target/debug/dummy_price_oracle COPY --from=builder /usr/bin/tini /usr/bin/tini RUN set -ex; \ @@ -34,4 +34,4 @@ EXPOSE 9000 USER ${ID} -ENTRYPOINT ["tini", "--", "/app/target/debug/dummy_eth_to_strk_oracle"] +ENTRYPOINT ["tini", "--", "/app/target/debug/dummy_price_oracle"] diff --git a/deployments/local-testing/deploy.sh b/deployments/local-testing/deploy.sh index 478fc30cfe6..a5c0393aa46 100755 --- a/deployments/local-testing/deploy.sh +++ b/deployments/local-testing/deploy.sh @@ -403,7 +403,7 @@ build_images() { # Note: sequencer-simulator Docker image is NOT needed - simulator runs as Python script locally local images=( "dummy-recorder:deployments/images/sequencer/dummy_recorder.Dockerfile" - "dummy-eth-to-strk-oracle:deployments/images/sequencer/dummy_eth_to_strk_oracle.Dockerfile" + "dummy-price-oracle:deployments/images/sequencer/dummy_price_oracle.Dockerfile" "sequencer:deployments/images/sequencer/Dockerfile" ) @@ -821,7 +821,7 @@ prepare_box() { local images=( "dummy-recorder:deployments/images/sequencer/dummy_recorder.Dockerfile" - "dummy-eth-to-strk-oracle:deployments/images/sequencer/dummy_eth_to_strk_oracle.Dockerfile" + "dummy-price-oracle:deployments/images/sequencer/dummy_price_oracle.Dockerfile" "sequencer:deployments/images/sequencer/Dockerfile" ) @@ -1044,7 +1044,7 @@ generate_cdk8s_manifests() { # Format: "directory_name:output_subdir:image_name" local services=( "dummy_recorder:dummy-recorder:${REGISTRY_URL}/dummy-recorder:local" - "dummy_eth2strk_oracle:dummy-eth2strk-oracle:${REGISTRY_URL}/dummy-eth-to-strk-oracle:local" + "dummy_eth2strk_oracle:dummy-eth2strk-oracle:${REGISTRY_URL}/dummy-price-oracle:local" ) for service_spec in "${services[@]}"; do diff --git a/deployments/monitoring/deploy_local_stack.sh b/deployments/monitoring/deploy_local_stack.sh index 0ff14bc3046..10e3088d7d9 100755 --- a/deployments/monitoring/deploy_local_stack.sh +++ b/deployments/monitoring/deploy_local_stack.sh @@ -25,7 +25,7 @@ else fi if [ "$MONITORING_ENABLED" != true ]; then - services="sequencer_node_setup dummy_recorder dummy_eth_to_strk_oracle config_injector sequencer_node sequencer_simulator" + services="sequencer_node_setup dummy_recorder dummy_price_oracle config_injector sequencer_node sequencer_simulator" fi echo "Running: ${docker_compose} -f ${monitoring_dir}/local/docker-compose.yml $*" diff --git a/deployments/monitoring/local/docker-compose.yml b/deployments/monitoring/local/docker-compose.yml index cad4ada6341..0d98b75af63 100644 --- a/deployments/monitoring/local/docker-compose.yml +++ b/deployments/monitoring/local/docker-compose.yml @@ -53,12 +53,12 @@ services: networks: - sequencer-network - dummy_eth_to_strk_oracle: + dummy_price_oracle: depends_on: - sequencer_node_setup build: context: ${SEQUENCER_ROOT_DIR} - dockerfile: ${SEQUENCER_ROOT_DIR}/deployments/images/sequencer/dummy_eth_to_strk_oracle.Dockerfile + dockerfile: ${SEQUENCER_ROOT_DIR}/deployments/images/sequencer/dummy_price_oracle.Dockerfile ports: - "9000:9000" networks: @@ -77,7 +77,7 @@ services: "cp /config/node_0/node_integration_test_config_changes.json ${SEQUENCER_CONFIG_PATH} \ echo 'Injecting config changes...' && \ jq '.\"recorder_url\" = \"http://dummy_recorder:8080\"' ${SEQUENCER_CONFIG_PATH} | sponge ${SEQUENCER_CONFIG_PATH} && \ - jq '.\"l1_gas_price_provider_config.eth_to_strk_oracle_config.url_header_list\" = \"http://dummy_eth_to_strk_oracle:9000/eth_to_strk_oracle\"' ${SEQUENCER_CONFIG_PATH} | sponge ${SEQUENCER_CONFIG_PATH} && \ + jq '.\"l1_gas_price_provider_config.eth_to_strk_oracle_config.url_header_list\" = \"http://dummy_price_oracle:9000/eth_to_strk_oracle\"' ${SEQUENCER_CONFIG_PATH} | sponge ${SEQUENCER_CONFIG_PATH} && \ jq '.\"http_server_config.static_config.ip\" = \"0.0.0.0\"' ${SEQUENCER_CONFIG_PATH} | sponge ${SEQUENCER_CONFIG_PATH} && \ jq '.\"http_server_config.static_config.port\" = ${SEQUENCER_HTTP_PORT}' ${SEQUENCER_CONFIG_PATH} | sponge ${SEQUENCER_CONFIG_PATH} && \ jq '.\"monitoring_endpoint_config.port\" = ${SEQUENCER_MONITORING_PORT}' ${SEQUENCER_CONFIG_PATH} | sponge ${SEQUENCER_CONFIG_PATH} && \