From 6172c4d43032ed63cef53e10f51fc74fc45b58fa Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Fri, 19 Apr 2024 15:55:24 -0600 Subject: [PATCH 1/7] update nitro version --- test-node.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-node.bash b/test-node.bash index a48c61ff..440aea7f 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.2.2-8f33fea-dev +NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.3.3-6a1c1a7-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 mydir=`dirname $0` From a2bad35144d935cf1406572c7ef8050076070c70 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Fri, 19 Apr 2024 15:55:48 -0600 Subject: [PATCH 2/7] add init-force option that isn't interactive --- test-node.bash | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test-node.bash b/test-node.bash index 440aea7f..1e8506a6 100755 --- a/test-node.bash +++ b/test-node.bash @@ -54,6 +54,10 @@ while [[ $# -gt 0 ]]; do fi shift ;; + --init-force) + force_init=true + shift + ;; --dev) simple=false shift From b493760ae38f5fb38e0392638877be04b5f24a5c Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Fri, 19 Apr 2024 15:56:36 -0600 Subject: [PATCH 3/7] fix ci script --- .github/workflows/testnode.bash | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 258a47c6..29525cb0 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -3,10 +3,9 @@ # until send-l2 succeeds. # Start the test node and get PID, to terminate it once send-l2 is done. -${GITHUB_WORKSPACE}/test-node.bash --init > output.log 2>&1 & -PID=$! +cd ${GITHUB_WORKSPACE} -sleep 5m +./test-node.bash --init-force --detach START=$(date +%s) SUCCEDED=0 @@ -29,11 +28,10 @@ while true; do sleep 10 done -# Shut down the test node and wait for it to terminate. -kill $PID -wait $PID +docker-compose stop if [ "$SUCCEDED" -eq 0 ]; then + docker-compose logs exit 1 fi From c258219d9db16f52639d2ae19d5f6f66e690e5a1 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 23 Apr 2024 11:15:42 +0200 Subject: [PATCH 4/7] Separate checkout step --- rollupcreator/Dockerfile | 3 ++- tokenbridge/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile index 51f012e8..17b065a9 100644 --- a/rollupcreator/Dockerfile +++ b/rollupcreator/Dockerfile @@ -3,7 +3,8 @@ ARG NITRO_CONTRACTS_BRANCH=main RUN apt-get update && \ apt-get install -y git docker.io python3 build-essential curl jq WORKDIR /workspace -RUN git clone -b ${NITRO_CONTRACTS_BRANCH} https://github.com/OffchainLabs/nitro-contracts.git ./ +RUN git clone --no-checkout https://github.com/OffchainLabs/nitro-contracts.git ./ +RUN git checkout ${NITRO_CONTRACTS_BRANCH} RUN curl -L https://foundry.paradigm.xyz | bash ENV PATH="${PATH}:/root/.foundry/bin" RUN foundryup diff --git a/tokenbridge/Dockerfile b/tokenbridge/Dockerfile index ed53eae2..3d8cbacb 100644 --- a/tokenbridge/Dockerfile +++ b/tokenbridge/Dockerfile @@ -3,7 +3,8 @@ ARG TOKEN_BRIDGE_BRANCH=main RUN apt-get update && \ apt-get install -y git docker.io python3 build-essential WORKDIR /workspace -RUN git clone -b ${TOKEN_BRIDGE_BRANCH} https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git clone --no-checkout https://github.com/OffchainLabs/token-bridge-contracts.git ./ +RUN git checkout ${TOKEN_BRIDGE_BRANCH} RUN yarn install RUN yarn build ENTRYPOINT ["yarn"] From fb6eac390df36ff432051019197f32cc2b303865 Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 23 Apr 2024 11:34:14 +0200 Subject: [PATCH 5/7] Disable blobs --- scripts/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config.ts b/scripts/config.ts index 2efba172..23ecff4f 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -182,7 +182,7 @@ function writeConfigs(argv: any) { "sequencer": false, "dangerous": { "no-sequencer-coordinator": false, - // "disable-blob-reader": true, + "disable-blob-reader": true, }, "delayed-sequencer": { "enable": false From 2d516bcf547eb762d916bc724cb5c838cf6c8ffd Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 23 Apr 2024 12:50:48 +0200 Subject: [PATCH 6/7] Temporary use custom nitro-contracts branch 'e2e-to-ci' 'e2e-to-ci' implements support for testnode to use custom nitro-contracts branches Once 'e2e-to-ci' is in master, 'NITRO_CONTRACTS_BRANCH' env var can be removed from CI --- .github/workflows/testnode.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 29525cb0..1ebfd6af 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -5,7 +5,8 @@ # Start the test node and get PID, to terminate it once send-l2 is done. cd ${GITHUB_WORKSPACE} -./test-node.bash --init-force --detach +# TODO once e2e-to-ci is merged into master, remove the NITRO_CONTRACTS_BRANCH env var +NITRO_CONTRACTS_BRANCH=e2e-to-ci ./test-node.bash --init-force --detach START=$(date +%s) SUCCEDED=0 From 8f9881cadad437a4c52e6fe839907e81ab15271a Mon Sep 17 00:00:00 2001 From: Goran Vladika Date: Tue, 23 Apr 2024 13:19:50 +0200 Subject: [PATCH 7/7] Use nitro-contract's develop temporary --- .github/workflows/testnode.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash index 1ebfd6af..9ce69348 100755 --- a/.github/workflows/testnode.bash +++ b/.github/workflows/testnode.bash @@ -5,8 +5,8 @@ # Start the test node and get PID, to terminate it once send-l2 is done. cd ${GITHUB_WORKSPACE} -# TODO once e2e-to-ci is merged into master, remove the NITRO_CONTRACTS_BRANCH env var -NITRO_CONTRACTS_BRANCH=e2e-to-ci ./test-node.bash --init-force --detach +# TODO once develop is merged into nitro-contract's master, remove the NITRO_CONTRACTS_BRANCH env var +NITRO_CONTRACTS_BRANCH=develop ./test-node.bash --init-force --detach START=$(date +%s) SUCCEDED=0