Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dead code #2199

Merged
merged 4 commits into from
Oct 23, 2024
Merged

Remove dead code #2199

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f8cadf
Remove dead code
jbearer Oct 22, 2024
cb8fecf
Remove more occurrences of commitment-task
sveitser Oct 23, 2024
a110bae
fix: cargo build SIGKILL on arm runner
sveitser Oct 23, 2024
af2b005
fix: cargo build SIGKILL arm (benchmark build)
sveitser Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ ESPRESSO_NODE_VALIDATOR_PORT=9000
# Only allow 1 block to be processed for events at a time, simulating a very bad L1 provider.
ESPRESSO_SEQUENCER_L1_EVENTS_MAX_BLOCK_RANGE=1
ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk"
ESPRESSO_COMMITMENT_TASK_PORT=30010
ESPRESSO_SEQUENCER0_DB_PORT=5432
ESPRESSO_SEQUENCER1_DB_PORT=5433
MARKETPLACE_SOLVER_POSTGRES_PORT=5434
Expand All @@ -52,14 +51,12 @@ ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:${ESPRESSO_STATE_RELAY
ESPRESSO_BLOCK_EXPLORER_PORT=3000

# Ethereum accounts (note 11-15 are used by the sequencer nodes)
ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=5
ESPRESSO_SEQUENCER_STATE_PROVER_ACCOUNT_INDEX=7
ESPRESSO_BUILDER_ETH_ACCOUNT_INDEX=8
ESPRESSO_DEPLOYER_ACCOUNT_INDEX=9

# Contracts
ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=0x8ce361602b935680e8dec218b820ff5056beb7af
ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS=0xed1db453c3156ff3155a97ad217b3087d5dc5f6e
ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS=0x0c8e79f3534b00d9a3d4a856b665bf4ebc22f2ba
ESPRESSO_SEQUENCER_LIGHTCLIENT_ADDRESS=$ESPRESSO_SEQUENCER_LIGHT_CLIENT_PROXY_ADDRESS
ESPRESSO_SEQUENCER_PERMISSIONED_PROVER=0x14dc79964da2c08b23698b3d3cc7ca32193d9955

Expand Down
22 changes: 0 additions & 22 deletions .github/workflows/benchmark-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand All @@ -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
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,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
Expand Down Expand Up @@ -126,7 +125,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
Expand All @@ -153,7 +151,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 }}
Expand Down Expand Up @@ -235,12 +232,6 @@ jobs:
with:
images: ghcr.io/espressosystems/espresso-sequencer/orchestrator

- name: Generate commitment task docker metadata
uses: docker/metadata-action@v5
id: commitment-task
with:
images: ghcr.io/espressosystems/espresso-sequencer/commitment-task

- name: Generate submit-transactions docker metadata
uses: docker/metadata-action@v5
id: submit-transactions
Expand Down Expand Up @@ -372,16 +363,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:
Expand Down Expand Up @@ -503,7 +484,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 }}
Expand All @@ -523,7 +503,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
Expand Down
20 changes: 1 addition & 19 deletions .github/workflows/build_static.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Loading
Loading