From 1e6c398d12611f233c7e0f71ad27e9d35fbb7056 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Wed, 18 Dec 2024 02:28:37 +0700 Subject: [PATCH 1/2] chore: Update tooling to use consensus-v32-eigenda consensus root --- .github/workflows/docker-upload.yml | 4 ++-- Dockerfile | 4 ++-- Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-upload.yml b/.github/workflows/docker-upload.yml index 0d01f69c2..e79722d92 100644 --- a/.github/workflows/docker-upload.yml +++ b/.github/workflows/docker-upload.yml @@ -48,7 +48,7 @@ jobs: uses: docker/build-push-action@v5 with: platform: linux/amd64 - target: nitro-node-dev + target: nitro-node context: . push: true tags: ${{ steps.meta.outputs.tags }} @@ -106,7 +106,7 @@ jobs: uses: docker/build-push-action@v5 with: platform: linux/arm64/v8 - target: nitro-node-dev + target: nitro-node context: . push: true tags: ${{ steps.meta.outputs.tags }} diff --git a/Dockerfile b/Dockerfile index 3390dd7e9..a50ba0cb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -207,6 +207,7 @@ WORKDIR /workspace/machines # Download WAVM machines # no fetch since these replay artifacts are only used for backwards compatibility for Arbitrum One and Nova COPY ./scripts/download-machine.sh . +COPY ./scripts/download-machine-eigenda.sh . #RUN ./download-machine.sh consensus-v1-rc1 0xbb9d58e9527566138b682f3a207c0976d5359837f6e330f4017434cca983ff41 #RUN ./download-machine.sh consensus-v2.1 0x9d68e40c47e3b87a8a7e6368cc52915720a6484bb2f47ceabad7e573e3a11232 #RUN ./download-machine.sh consensus-v3 0x53c288a0ca7100c0f2db8ab19508763a51c7fd1be125d376d940a65378acaee7 @@ -228,8 +229,7 @@ COPY ./scripts/download-machine.sh . # RUN ./download-machine.sh consensus-v30 0xb0de9cb89e4d944ae6023a3b62276e54804c242fd8c4c2d8e6cc4450f5fa8b1b && true # RUN ./download-machine.sh consensus-v31 0x260f5fa5c3176a856893642e149cf128b5a8de9f828afec8d11184415dd8dc69 RUN ./download-machine.sh consensus-v32 0x184884e1eb9fefdc158f6c8ac912bb183bf3cf83f0090317e0bc4ac5860baa39 -# TODO: Insert eigenda machine here once we're post audit and have a final artifact to push -# RUN ./download-machine.sh consensus-eigenda-v32 0x...0 +RUN ./download-machine-eigenda.sh consensus-eigenda-v32 0x951009942c00b5bd0abec233174fe33fadf7cd5013d17b042f9b28b3b00b469c FROM golang:1.21.10-bookworm AS node-builder WORKDIR /workspace diff --git a/Makefile b/Makefile index 0a71d64f1..d4ccc895e 100644 --- a/Makefile +++ b/Makefile @@ -290,7 +290,7 @@ clean: docker: docker build -t nitro-node-slim --target nitro-node-slim . docker build -t nitro-node --target nitro-node . - docker build -t nitro-node-dev --target nitro-node-dev . + # docker build -t nitro-node-dev --target nitro-node-dev . # regular build rules From 19d69c008e4861d4561589f8dc820c1e24b64187 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Wed, 18 Dec 2024 11:21:45 +0700 Subject: [PATCH 2/2] chore: Bump to using consensus-v32-eigenda module root - revert make change --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d4ccc895e..0a71d64f1 100644 --- a/Makefile +++ b/Makefile @@ -290,7 +290,7 @@ clean: docker: docker build -t nitro-node-slim --target nitro-node-slim . docker build -t nitro-node --target nitro-node . - # docker build -t nitro-node-dev --target nitro-node-dev . + docker build -t nitro-node-dev --target nitro-node-dev . # regular build rules