From 04ada288994aed98abbbdb9fe9c60b5493e77c96 Mon Sep 17 00:00:00 2001
From: Goran Vladika <goran.vladika@gmail.com>
Date: Fri, 26 Apr 2024 14:33:23 +0200
Subject: [PATCH 1/2] Set default contracts versions in the test-node.bash

---
 docker-compose.yaml |  4 ++--
 test-node.bash      | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index a93662e7..3d4ad9b9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -331,7 +331,7 @@ services:
     build:
       context: tokenbridge/
       args:
-        TOKEN_BRIDGE_BRANCH: ${TOKEN_BRIDGE_BRANCH:-main}
+        TOKEN_BRIDGE_BRANCH: ${TOKEN_BRIDGE_BRANCH:-}
     environment:
       - ARB_URL=http://sequencer:8547
       - ETH_URL=http://geth:8545
@@ -347,7 +347,7 @@ services:
     build:
       context: rollupcreator/
       args:
-        NITRO_CONTRACTS_BRANCH: ${NITRO_CONTRACTS_BRANCH:-main}
+        NITRO_CONTRACTS_BRANCH: ${NITRO_CONTRACTS_BRANCH:-}
     volumes:
       - "config:/config"
       - /var/run/docker.sock:/var/run/docker.sock
diff --git a/test-node.bash b/test-node.bash
index 79fd3006..8776d451 100755
--- a/test-node.bash
+++ b/test-node.bash
@@ -5,6 +5,20 @@ set -e
 NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.3.3-6a1c1a7-dev
 BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1
 
+# This commit matches the v1.2.1 contracts, with additional fixes for rollup deployment script.
+# Once v1.2.2 is released, we can switch to that version.
+DEFAULT_NITRO_CONTRACTS_VERSION="2e8eeb9f28104465de0557851aa7607b037cafcf"
+DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.1"
+
+# Set default versions if not overriden by provided env vars
+: ${NITRO_CONTRACTS_BRANCH:=$DEFAULT_NITRO_CONTRACTS_VERSION}
+: ${TOKEN_BRIDGE_BRANCH:=$DEFAULT_TOKEN_BRIDGE_VERSION}
+export NITRO_CONTRACTS_BRANCH
+export TOKEN_BRIDGE_BRANCH
+
+echo "Using NITRO_CONTRACTS_BRANCH: $NITRO_CONTRACTS_BRANCH"
+echo "Using TOKEN_BRIDGE_BRANCH: $TOKEN_BRIDGE_BRANCH"
+
 mydir=`dirname $0`
 cd "$mydir"
 

From 5efefbedde2febc602c89dedeb71cfb601f285a1 Mon Sep 17 00:00:00 2001
From: Goran Vladika <goran.vladika@gmail.com>
Date: Fri, 26 Apr 2024 14:58:25 +0200
Subject: [PATCH 2/2] Use default version

---
 .github/workflows/testnode.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/testnode.bash b/.github/workflows/testnode.bash
index 9ce69348..b6d1f596 100755
--- a/.github/workflows/testnode.bash
+++ b/.github/workflows/testnode.bash
@@ -6,7 +6,7 @@
 cd ${GITHUB_WORKSPACE}
 
 # 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
+./test-node.bash --init-force --detach
 
 START=$(date +%s)
 SUCCEDED=0