Merge branch 'decouple-contracts' into non18-decimal-token

.github/workflows/testnode.bash

@@ -3,10 +3,10 @@
 # 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
+# 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
@@ -29,11 +29,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
 

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

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

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`
@@ -55,6 +55,10 @@ while [[ $# -gt 0 ]]; do
             fi
             shift
             ;;
+        --init-force)
+            force_init=true
+            shift
+            ;;
         --dev)
             simple=false
             shift

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"]