Merge pull request #74 from OffchainLabs/upgrade-to-31

Upgrade to the consensus-v31 release
OffchainLabs · Aug 22, 2024 · 94b04c3 · 94b04c3
2 parents 7db670c + 8ec2131
commit 94b04c3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-bullseye-slim
+FROM node:18.20.3-bullseye-slim
 ARG NITRO_CONTRACTS_BRANCH=main
 RUN apt-get update && \
     apt-get install -y git docker.io python3 build-essential curl jq

diff --git a/scripts/config.ts b/scripts/config.ts
@@ -344,7 +344,7 @@ function writeL2ChainConfig(argv: any) {
             "EnableArbOS": true,
             "AllowDebugPrecompiles": true,
             "DataAvailabilityCommittee": false,
-            "InitialArbOSVersion": 30,
+            "InitialArbOSVersion": 31,
             "InitialChainOwner": argv.l2owner,
             "GenesisBlockNum": 0
         }
@@ -377,7 +377,7 @@ function writeL3ChainConfig(argv: any) {
             "EnableArbOS": true,
             "AllowDebugPrecompiles": true,
             "DataAvailabilityCommittee": false,
-            "InitialArbOSVersion": 30,
+            "InitialArbOSVersion": 31,
             "InitialChainOwner": argv.l2owner,
             "GenesisBlockNum": 0
         }

diff --git a/test-node.bash b/test-node.bash
@@ -2,13 +2,11 @@
 
 set -e
 
-NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.0.1-cf4b74e-dev
-BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1
+NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.1.0-7d1d84c-dev
+BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.1.0-0e716c8
 
-# This commit matches the v1.2.1 contracts, with additional support for CacheManger deployment.
-# Once v1.2.2 is released, we can switch to that version.
-DEFAULT_NITRO_CONTRACTS_VERSION="867663657b98a66b60ff244e46226e0cb368ab94"
-DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.1"
+DEFAULT_NITRO_CONTRACTS_VERSION="v2.0.0"
+DEFAULT_TOKEN_BRIDGE_VERSION="v1.2.2"
 
 # Set default versions if not overriden by provided env vars
 : ${NITRO_CONTRACTS_BRANCH:=$DEFAULT_NITRO_CONTRACTS_VERSION}