Skip to content

Commit b1d4a1d

Browse files
sveitsersveitser
authored
Merge branch 'main' into ab/epoch-integration-test
2 parents ccdcc1b + ce2a014 commit b1d4a1d

7 files changed

+63
-2
lines changed

‎.github/workflows/benchmark-build.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
target/release/keygen
6161
target/release/permissionless-builder
6262
target/release/nasty-client
63+
target/release/update-permissioned-stake-table
6364
target/release/espresso-dev-node
6465
target/release/pub-key
6566
target/release/espresso-bridge
@@ -102,6 +103,7 @@ jobs:
102103
target/release/keygen
103104
target/release/permissionless-builder
104105
target/release/nasty-client
106+
target/release/update-permissioned-stake-table
105107
target/release/espresso-dev-node
106108
target/release/pub-key
107109
target/release/espresso-bridge
@@ -121,6 +123,7 @@ jobs:
121123
deploy-tag: ${{ steps.deploy.outputs.tags }}
122124
builder-tag: ${{ steps.builder.outputs.tags }}
123125
nasty-client-tag: ${{ steps.nasty-client.outputs.tags }}
126+
update-permissioned-stake-table-tag: ${{ steps.update-permissioned-stake-table.outputs.tags }}
124127
espresso-dev-node-tag: ${{ steps.espresso-dev-node.outputs.tags }}
125128
bridge-tag: ${{ steps.bridge.outputs.tags }}
126129
steps:
@@ -227,6 +230,13 @@ jobs:
227230
images: ghcr.io/espressosystems/espresso-sequencer/nasty-client
228231
flavor: suffix=bench
229232

233+
- name: Generate update-permissioned-stake-table metadata
234+
uses: docker/metadata-action@v5
235+
id: update-permissioned-stake-table
236+
with:
237+
images: ghcr.io/espressosystems/espresso-sequencer/update-permissioned-stake-table
238+
flavor: suffix=bench
239+
230240
- name: Generate espresso-dev-node metadata
231241
uses: docker/metadata-action@v5
232242
id: espresso-dev-node
@@ -351,6 +361,16 @@ jobs:
351361
tags: ${{ steps.nasty-client.outputs.tags }}
352362
labels: ${{ steps.nasty-client.outputs.labels }}
353363

364+
- name: Build and push update-permissioned-stake-table docker
365+
uses: docker/build-push-action@v6
366+
with:
367+
context: ./
368+
file: ./docker/update-permissioned-stake-table.Dockerfile
369+
platforms: linux/amd64,linux/arm64
370+
push: ${{ github.event_name != 'pull_request' }}
371+
tags: ${{ steps.update-permissioned-stake-table.outputs.tags }}
372+
labels: ${{ steps.update-permissioned-stake-table.outputs.labels }}
373+
354374
- name: Build and push espresso-dev-node docker
355375
uses: docker/build-push-action@v6
356376
with:
@@ -396,6 +416,7 @@ jobs:
396416
docker pull ${{ needs.build-dockers.outputs.deploy-tag }}
397417
docker pull ${{ needs.build-dockers.outputs.builder-tag }}
398418
docker pull ${{ needs.build-dockers.outputs.nasty-client-tag }}
419+
docker pull ${{ needs.build-dockers.outputs.update-permissioned-stake-table-tag }}
399420
docker pull ${{ needs.build-dockers.outputs.bridge-tag }}
400421
- name: Tag new docker images
401422
run: |
@@ -410,6 +431,7 @@ jobs:
410431
docker tag ${{ needs.build-dockers.outputs.deploy-tag }} ghcr.io/espressosystems/espresso-sequencer/deploy:main
411432
docker tag ${{ needs.build-dockers.outputs.builder-tag }} ghcr.io/espressosystems/espresso-sequencer/builder:main
412433
docker tag ${{ needs.build-dockers.outputs.nasty-client-tag }} ghcr.io/espressosystems/espresso-sequencer/nasty-client:main
434+
docker tag ${{ needs.build-dockers.outputs.update-permissioned-stake-table-tag }} ghcr.io/espressosystems/espresso-sequencer/update-permissioned-stake-table:main
413435
docker tag ${{ needs.build-dockers.outputs.bridge-tag }} ghcr.io/espressosystems/espresso-sequencer/bridge:main
414436
415437
- name: Test docker demo

‎.github/workflows/build.yml

+21
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ jobs:
7777
target/release/nasty-client
7878
target/release/espresso-dev-node
7979
target/release/pub-key
80+
target/release/update-permissioned-stake-table
8081
target/release/espresso-bridge
8182
target/release/marketplace-solver
8283
target/release/marketplace-builder
@@ -132,6 +133,7 @@ jobs:
132133
target/release/keygen
133134
target/release/permissionless-builder
134135
target/release/nasty-client
136+
target/release/update-permissioned-stake-table
135137
target/release/espresso-dev-node
136138
target/release/pub-key
137139
target/release/espresso-bridge
@@ -158,6 +160,7 @@ jobs:
158160
deploy-tag: ${{ steps.deploy.outputs.tags }}
159161
builder-tag: ${{ steps.builder.outputs.tags }}
160162
nasty-client-tag: ${{ steps.nasty-client.outputs.tags }}
163+
update-permissioned-stake-table-tag: ${{ steps.update-permissioned-stake-table.outputs.tags }}
161164
espresso-dev-node-tag: ${{ steps.espresso-dev-node.outputs.tags }}
162165
bridge-tag: ${{ steps.bridge.outputs.tags }}
163166
marketplace-solver-tag: ${{ steps.marketplace-solver.outputs.tags }}
@@ -264,6 +267,12 @@ jobs:
264267
with:
265268
images: ghcr.io/espressosystems/espresso-sequencer/nasty-client
266269

270+
- name: Generate update-permissioned-stake-table metadata
271+
uses: docker/metadata-action@v5
272+
id: update-permissioned-stake-table
273+
with:
274+
images: ghcr.io/espressosystems/espresso-sequencer/update-permissioned-stake-table
275+
267276
- name: Generate espresso-dev-node metadata
268277
uses: docker/metadata-action@v5
269278
id: espresso-dev-node
@@ -410,6 +419,16 @@ jobs:
410419
tags: ${{ steps.nasty-client.outputs.tags }}
411420
labels: ${{ steps.nasty-client.outputs.labels }}
412421

422+
- name: Build and push update-permissioned-stake-table docker
423+
uses: docker/build-push-action@v6
424+
with:
425+
context: ./
426+
file: ./docker/update-permissioned-stake-table.Dockerfile
427+
platforms: ${{ env.DOCKER_PLATFORMS }}
428+
push: ${{ github.event_name != 'pull_request' }}
429+
tags: ${{ steps.update-permissioned-stake-table.outputs.tags }}
430+
labels: ${{ steps.update-permissioned-stake-table.outputs.labels }}
431+
413432
- name: Build and push espresso-dev-node docker
414433
uses: docker/build-push-action@v6
415434
with:
@@ -495,6 +514,7 @@ jobs:
495514
docker pull ${{ needs.build-dockers.outputs.deploy-tag }}
496515
docker pull ${{ needs.build-dockers.outputs.builder-tag }}
497516
docker pull ${{ needs.build-dockers.outputs.nasty-client-tag }}
517+
docker pull ${{ needs.build-dockers.outputs.update-permissioned-stake-table-tag }}
498518
docker pull ${{ needs.build-dockers.outputs.bridge-tag }}
499519
docker pull ${{ needs.build-dockers.outputs.marketplace-solver-tag }}
500520
docker pull ${{ needs.build-dockers.outputs.marketplace-builder-tag }}
@@ -514,6 +534,7 @@ jobs:
514534
docker tag ${{ needs.build-dockers.outputs.deploy-tag }} ghcr.io/espressosystems/espresso-sequencer/deploy:main
515535
docker tag ${{ needs.build-dockers.outputs.builder-tag }} ghcr.io/espressosystems/espresso-sequencer/builder:main
516536
docker tag ${{ needs.build-dockers.outputs.nasty-client-tag }} ghcr.io/espressosystems/espresso-sequencer/nasty-client:main
537+
docker tag ${{ needs.build-dockers.outputs.update-permissioned-stake-table-tag }} ghcr.io/espressosystems/espresso-sequencer/update-permissioned-stake-table:main
517538
docker tag ${{ needs.build-dockers.outputs.bridge-tag }} ghcr.io/espressosystems/espresso-sequencer/bridge:main
518539
docker tag ${{ needs.build-dockers.outputs.marketplace-solver-tag }} ghcr.io/espressosystems/espresso-sequencer/marketplace-solver:main
519540
docker tag ${{ needs.build-dockers.outputs.marketplace-builder-tag }} ghcr.io/espressosystems/espresso-sequencer/marketplace-builder:main

‎.github/workflows/build_static.yml

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ jobs:
8989
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/deploy
9090
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/keygen
9191
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/utils
92+
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/update-permissioned-stake-table
9293
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/pub-key
9394
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/espresso-bridge
9495
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/espresso-dev-node

‎.github/workflows/test.yml

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ jobs:
134134
target/debug/keygen
135135
target/debug/permissionless-builder
136136
target/debug/nasty-client
137+
target/debug/update-permissioned-stake-table
137138
target/debug/espresso-dev-node
138139
target/debug/pub-key
139140
target/debug/espresso-bridge

‎docker/update-permissioned-stake-table.Dockerfile

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM ubuntu:jammy
2+
3+
ARG TARGETARCH
4+
5+
RUN apt-get update \
6+
&& apt-get install -y curl libcurl4 wait-for-it tini \
7+
&& rm -rf /var/lib/apt/lists/*
8+
ENTRYPOINT ["tini", "--"]
9+
10+
COPY target/$TARGETARCH/release/update-permissioned-stake-table /bin/update-permissioned-stake-table
11+
RUN chmod +x /bin/update-permissioned-stake-table
12+
13+
CMD [ "/bin/update-permissioned-stake-table"]
14+

‎scripts/build-docker-images-native

+2-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ mkdir -p ${WORKDIR}/data
9999
cp -rv data/genesis ${WORKDIR}/data/
100100

101101
mkdir -p "${WORKDIR}/target/$ARCH/release"
102-
for binary in "cdn-broker" "cdn-marshal" "cdn-whitelist" "deploy" "dev-rollup" "espresso-bridge" "espresso-dev-node" "keygen" "marketplace-builder" "marketplace-solver" "nasty-client" "node-metrics" "orchestrator" "permissionless-builder" "pub-key" "reset-storage" "sequencer" "sequencer-sqlite" "state-prover" "state-relay-server" "submit-transactions" "utils"; do
102+
for binary in "cdn-broker" "cdn-marshal" "cdn-whitelist" "deploy" "dev-rollup" "espresso-bridge" "espresso-dev-node" "keygen" "marketplace-builder" "marketplace-solver" "nasty-client" "update-permissioned-stake-table" "node-metrics" "orchestrator" "permissionless-builder" "pub-key" "reset-storage" "sequencer" "sequencer-sqlite" "state-prover" "state-relay-server" "submit-transactions" "utils"; do
103103
cp -v "${CARGO_TARGET_DIR}/release/$binary" "${WORKDIR}/target/$ARCH/release"
104104
# Patch the interpreter for running without nix inside the ubuntu based docker image.
105105
if [ $KERNEL == "linux" ]; then
@@ -126,6 +126,7 @@ docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/
126126
docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/deploy:main -f docker/deploy.Dockerfile ${WORKDIR}
127127
docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/builder:main -f docker/permissionless-builder.Dockerfile ${WORKDIR}
128128
docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/nasty-client:main -f docker/nasty-client.Dockerfile ${WORKDIR}
129+
docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/update-permissioned-stake-table:main -f docker/update-permissioned-stake-table.Dockerfile ${WORKDIR}
129130
docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:main -f docker/espresso-dev-node.Dockerfile ${WORKDIR}
130131
docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/bridge:main -f docker/espresso-bridge.Dockerfile ${WORKDIR}
131132
docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/marketplace-solver:main -f docker/marketplace-solver.Dockerfile ${WORKDIR}

‎scripts/build-docker-images-static

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ for ARCH in "amd64" "arm64"; do
4646
;;
4747
esac
4848
mkdir -p ${WORKDIR}/target/$ARCH/release
49-
for binary in "cdn-broker" "cdn-marshal" "cdn-whitelist" "deploy" "dev-rollup" "espresso-bridge" "espresso-dev-node" "keygen" "marketplace-builder" "marketplace-solver" "nasty-client" "node-metrics" "orchestrator" "permissionless-builder" "pub-key" "reset-storage" "sequencer" "sequencer-sqlite" "state-prover" "state-relay-server" "submit-transactions" "utils"; do
49+
for binary in "cdn-broker" "cdn-marshal" "cdn-whitelist" "deploy" "dev-rollup" "espresso-bridge" "espresso-dev-node" "keygen" "marketplace-builder" "marketplace-solver" "nasty-client" "update-permissioned-stake-table" "node-metrics" "orchestrator" "permissionless-builder" "pub-key" "reset-storage" "sequencer" "sequencer-sqlite" "state-prover" "state-relay-server" "submit-transactions" "utils"; do
5050
cp -v "${CARGO_TARGET_DIR}/${TARGET}/release/$binary" ${WORKDIR}/target/$ARCH/release
5151
done
5252
done
@@ -70,6 +70,7 @@ docker build -t ghcr.io/espressosystems/espresso-sequencer/submit-transactions:m
7070
docker build -t ghcr.io/espressosystems/espresso-sequencer/deploy:main -f docker/deploy.Dockerfile ${WORKDIR}
7171
docker build -t ghcr.io/espressosystems/espresso-sequencer/builder:main -f docker/permissionless-builder.Dockerfile ${WORKDIR}
7272
docker build -t ghcr.io/espressosystems/espresso-sequencer/nasty-client:main -f docker/nasty-client.Dockerfile ${WORKDIR}
73+
docker build -t ghcr.io/espressosystems/espresso-sequencer/update-permissioned-stake-table:main -f docker/update-permissioned-stake-table.Dockerfile ${WORKDIR}
7374
docker build -t ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:main -f docker/espresso-dev-node.Dockerfile ${WORKDIR}
7475
docker build -t ghcr.io/espressosystems/espresso-sequencer/bridge:main -f docker/espresso-bridge.Dockerfile ${WORKDIR}
7576
docker build -t ghcr.io/espressosystems/espresso-sequencer/marketplace-solver:main -f docker/marketplace-solver.Dockerfile ${WORKDIR}

0 commit comments

Comments
 (0)