Remove more occurrences of commitment-task

- Rename the env var of the prover service port to ESPRESSO_PROVER_SERVICE_PORT that's actually used by the service.
EspressoSystems · Oct 23, 2024 · cb8fecf · cb8fecf
1 parent 1f8cadf
commit cb8fecf
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 52 deletions.
diff --git a/.github/workflows/benchmark-build.yaml b/.github/workflows/benchmark-build.yaml
@@ -63,7 +63,6 @@ jobs:
             target/release/state-prover
             target/release/sequencer
             target/release/cli
-            target/release/commitment-task
             target/release/submit-transactions
             target/release/utils
             target/release/reset-storage
@@ -115,7 +114,6 @@ jobs:
             target/release/state-prover
             target/release/sequencer
             target/release/cli
-            target/release/commitment-task
             target/release/submit-transactions
             target/release/reset-storage
             target/release/utils
@@ -138,7 +136,6 @@ jobs:
       state-relay-server-tag: ${{ steps.state-relay-server.outputs.tags }}
       prover-service-tag: ${{ steps.prover-service.outputs.tags }}
       orchestrator-tag: ${{ steps.orchestrator.outputs.tags }}
-      commitment-task-tag: ${{ steps.commitment-task.outputs.tags }}
       submit-transactions-tag: ${{ steps.submit-transactions.outputs.tags }}
       deploy-tag: ${{ steps.deploy.outputs.tags }}
       builder-tag: ${{ steps.builder.outputs.tags }}
@@ -223,13 +220,6 @@ jobs:
           images: ghcr.io/espressosystems/espresso-sequencer/orchestrator
           flavor: suffix=bench
 
-      - name: Generate commitment task docker metadata
-        uses: docker/metadata-action@v5
-        id: commitment-task
-        with:
-          images: ghcr.io/espressosystems/espresso-sequencer/commitment-task
-          flavor: suffix=bench
-
       - name: Generate submit-transactions docker metadata
         uses: docker/metadata-action@v5
         id: submit-transactions
@@ -342,16 +332,6 @@ jobs:
           tags: ${{ steps.orchestrator.outputs.tags }}
           labels: ${{ steps.orchestrator.outputs.labels }}
 
-      - name: Build and push commitment-task docker
-        uses: docker/build-push-action@v6
-        with:
-          context: ./
-          file: ./docker/commitment-task.Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.commitment-task.outputs.tags }}
-          labels: ${{ steps.commitment-task.outputs.labels }}
-
       - name: Build and push submit-transactions docker
         uses: docker/build-push-action@v6
         with:
@@ -433,7 +413,6 @@ jobs:
           docker pull ${{ needs.build-dockers.outputs.state-relay-server-tag }}
           docker pull ${{ needs.build-dockers.outputs.prover-service-tag }}
           docker pull ${{ needs.build-dockers.outputs.orchestrator-tag }}
-          docker pull ${{ needs.build-dockers.outputs.commitment-task-tag }}
           docker pull ${{ needs.build-dockers.outputs.submit-transactions-tag }}
           docker pull ${{ needs.build-dockers.outputs.deploy-tag }}
           docker pull ${{ needs.build-dockers.outputs.builder-tag }}
@@ -448,7 +427,6 @@ jobs:
           docker tag ${{ needs.build-dockers.outputs.state-relay-server-tag }} ghcr.io/espressosystems/espresso-sequencer/state-relay-server:main
           docker tag ${{ needs.build-dockers.outputs.prover-service-tag }} ghcr.io/espressosystems/espresso-sequencer/prover-service:main
           docker tag ${{ needs.build-dockers.outputs.orchestrator-tag }} ghcr.io/espressosystems/espresso-sequencer/orchestrator:main
-          docker tag ${{ needs.build-dockers.outputs.commitment-task-tag }} ghcr.io/espressosystems/espresso-sequencer/commitment-task:main
           docker tag ${{ needs.build-dockers.outputs.submit-transactions-tag }} ghcr.io/espressosystems/espresso-sequencer/submit-transactions:main
           docker tag ${{ needs.build-dockers.outputs.deploy-tag }} ghcr.io/espressosystems/espresso-sequencer/deploy:main
           docker tag ${{ needs.build-dockers.outputs.builder-tag }} ghcr.io/espressosystems/espresso-sequencer/builder:main

diff --git a/.github/workflows/build_static.yml b/.github/workflows/build_static.yml
@@ -83,7 +83,6 @@ jobs:
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/state-prover
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/sequencer
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/cli
-            ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/commitment-task
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/submit-transactions
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/reset-storage
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/deploy
@@ -177,13 +176,6 @@ jobs:
           images: ghcr.io/espressosystems/espresso-sequencer/orchestrator
           flavor: suffix=musl
 
-      - name: Generate commitment task docker metadata
-        uses: docker/metadata-action@v5
-        id: commitment-task
-        with:
-          images: ghcr.io/espressosystems/espresso-sequencer/commitment-task
-          flavor: suffix=musl
-
       - name: Generate submit-transactions docker metadata
         uses: docker/metadata-action@v5
         id: submit-transactions
@@ -309,16 +301,6 @@ jobs:
           tags: ${{ steps.orchestrator.outputs.tags }}
           labels: ${{ steps.orchestrator.outputs.labels }}
 
-      - name: Build and push commitment-task docker
-        uses: docker/build-push-action@v6
-        with:
-          context: ./
-          file: ./docker/commitment-task.Dockerfile
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.commitment-task.outputs.tags }}
-          labels: ${{ steps.commitment-task.outputs.labels }}
-
       - name: Build and push submit-transactions docker
         uses: docker/build-push-action@v6
         with:
@@ -397,4 +379,4 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.dev-rollup.outputs.tags }}
-          labels: ${{ steps.dev-rollup.outputs.labels }}
+          labels: ${{ steps.dev-rollup.outputs.labels }}
diff --git a/docker/prover-service.Dockerfile b/docker/prover-service.Dockerfile
@@ -17,7 +17,7 @@ RUN chmod +x /usr/local/bin/state-prover
 
 # When running as a Docker service, we always want a healthcheck endpoint, so set a default for the
 # port that the HTTP server will run on. This can be overridden in any given deployment environment.
-ENV ESPRESSO_COMMITMENT_TASK_PORT=80
-HEALTHCHECK --interval=1s --timeout=1s --retries=100 CMD curl --fail http://localhost:${ESPRESSO_COMMITMENT_TASK_PORT}/healthcheck || exit 1
+ENV ESPRESSO_PROVER_SERVICE_PORT=80
+HEALTHCHECK --interval=1s --timeout=1s --retries=100 CMD curl --fail http://localhost:${ESPRESSO_PROVER_SERVICE_PORT}/healthcheck || exit 1
 
 CMD [ "state-prover", "-d" ]
diff --git a/justfile b/justfile
@@ -72,12 +72,6 @@ dev-sequencer:
     --state-relay-server-url http://localhost:8083 \
     -- http --port 8083  -- query --storage-path storage
 
-dev-commitment:
-     target/release/commitment-task --sequencer-url http://localhost:50000 \
-     --l1-provider http://localhost:8545 \
-     --eth-mnemonic "test test test test test test test test test test test junk" \
-     --deploy
-
 build-docker-images:
     scripts/build-docker-images-native
 

diff --git a/sequencer/api/public-env-vars.toml b/sequencer/api/public-env-vars.toml
@@ -20,9 +20,6 @@ variables = [
     "ESPRESSO_CDN_MARSHAL_DISCOVERY_ENDPOINT",
     "ESPRESSO_CDN_MARSHAL_METRICS_BIND_ENDPOINT",
     "ESPRESSO_CDN_WHITELIST_DISCOVERY_ENDPOINT",
-    "ESPRESSO_COMMITMENT_TASK_DELAY",
-    "ESPRESSO_COMMITMENT_TASK_PORT",
-    "ESPRESSO_COMMITMENT_TASK_REQUEST_TIMEOUT",
     "ESPRESSO_DEPLOYER_OUT_PATH",
     "ESPRESSO_NASTY_CLIENT_HTTP_TIMEOUT_ERROR",
     "ESPRESSO_NASTY_CLIENT_HTTP_TIMEOUT_WARNING",