From 268df3b48e1c17522963a4e8b208b0439cfb77de Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Mon, 21 Oct 2024 02:04:44 -0400 Subject: [PATCH 1/3] fix: Backwards compatibility with Arbitrum Nitro v3.2.1 --- Dockerfile | 6 +++--- contracts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0b29aa0c5..3390dd7e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -205,8 +205,7 @@ RUN apt-get update && apt-get install -y unzip wget curl WORKDIR /workspace/machines # Download WAVM machines -# Since these replay artifacts are only used for core arbitrum functionality -# we don't need to fetch legacy artifacts +# no fetch since these replay artifacts are only used for backwards compatibility for Arbitrum One and Nova COPY ./scripts/download-machine.sh . #RUN ./download-machine.sh consensus-v1-rc1 0xbb9d58e9527566138b682f3a207c0976d5359837f6e330f4017434cca983ff41 #RUN ./download-machine.sh consensus-v2.1 0x9d68e40c47e3b87a8a7e6368cc52915720a6484bb2f47ceabad7e573e3a11232 @@ -303,7 +302,8 @@ USER user WORKDIR /home/user/ ENTRYPOINT [ "/usr/local/bin/nitro" ] -FROM offchainlabs/nitro-node:v2.3.4-rc.5-b4cc111 AS nitro-legacy +## Fetch the old nitro-node release +FROM offchainlabs/nitro-node:v3.2.1-d81324d AS nitro-legacy FROM nitro-node-slim AS nitro-node USER root diff --git a/contracts b/contracts index 9d17ba2d2..637e4770a 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 9d17ba2d205f851df9ed01bf1f58b1515eeb030d +Subproject commit 637e4770aca46fcd63693ca5a7d66e6b7303e833 From 3ed0ad5bfa9f0f01463199fb55d1709ef2bcfce0 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Thu, 21 Nov 2024 03:21:35 +0700 Subject: [PATCH 2/3] fix: Backwards compatibility with Arbitrum Nitro v3.2.1 - bump contracts --- contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts b/contracts index 637e4770a..53dcf378f 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 637e4770aca46fcd63693ca5a7d66e6b7303e833 +Subproject commit 53dcf378fc5574061875b56d9bd867b48b036952 From 946794cdcdffa3070818eae34bee042689d463a0 Mon Sep 17 00:00:00 2001 From: Ethen Pociask Date: Thu, 21 Nov 2024 21:21:08 +0700 Subject: [PATCH 3/3] fix: Backwards compatibility with Arbitrum Nitro v3.2.1 - bump contracts and rollup creator in testnode --- contracts | 2 +- nitro-testnode | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts b/contracts index 53dcf378f..a2de1c3ef 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 53dcf378fc5574061875b56d9bd867b48b036952 +Subproject commit a2de1c3ef227bde09b0b6ebfe272c66f441345f9 diff --git a/nitro-testnode b/nitro-testnode index 345f178d2..859571cac 160000 --- a/nitro-testnode +++ b/nitro-testnode @@ -1 +1 @@ -Subproject commit 345f178d26692456df1e1ad8d72ad90676529777 +Subproject commit 859571caca3d5fd7d62b6236f1114bde25125800