From 7edd38570f7407196df3ce70acfb2494b77be2d8 Mon Sep 17 00:00:00 2001 From: Pepper Lebeck-Jobe Date: Wed, 14 Aug 2024 18:49:50 +0200 Subject: [PATCH 1/2] Upgrade to the consensus-v31 release --- scripts/config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index eefcdd29..6edded2c 100644 --- 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 } From 8ec213161a2e5e18252c55b882d6e1270a559170 Mon Sep 17 00:00:00 2001 From: Pepper Lebeck-Jobe Date: Wed, 14 Aug 2024 21:33:55 +0200 Subject: [PATCH 2/2] Update versions of contracts token-bridge and node These updated versions are needed to work with the consensus-v31 release. --- rollupcreator/Dockerfile | 2 +- test-node.bash | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/rollupcreator/Dockerfile b/rollupcreator/Dockerfile index 17b065a9..5706b9cb 100644 --- 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/test-node.bash b/test-node.bash index dd112c95..645f5f6a 100755 --- 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}