From 1f83198a8f8b7cdebbd99421c0a1626bb7e9b712 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 10 Jun 2024 11:24:33 -0600 Subject: [PATCH 1/4] use nitro 3.0 and arbos v30 --- scripts/config.ts | 4 ++-- test-node.bash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/config.ts b/scripts/config.ts index 23ecff4..3fd49ef 100644 --- a/scripts/config.ts +++ b/scripts/config.ts @@ -344,7 +344,7 @@ function writeL2ChainConfig(argv: any) { "EnableArbOS": true, "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, + "InitialArbOSVersion": 30, "InitialChainOwner": argv.l2owner, "GenesisBlockNum": 0 } @@ -377,7 +377,7 @@ function writeL3ChainConfig(argv: any) { "EnableArbOS": true, "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, + "InitialArbOSVersion": 30, "InitialChainOwner": "0x0000000000000000000000000000000000000000", "GenesisBlockNum": 0 } diff --git a/test-node.bash b/test-node.bash index 0b5f3d8..5004142 100755 --- a/test-node.bash +++ b/test-node.bash @@ -2,7 +2,7 @@ set -e -NITRO_NODE_VERSION=offchainlabs/nitro-node:v2.3.3-6a1c1a7-dev +NITRO_NODE_VERSION=offchainlabs/nitro-node:v3.0.0-e6f81cb-dev BLOCKSCOUT_VERSION=offchainlabs/blockscout:v1.0.0-c8db5b1 # This commit matches the v1.2.1 contracts, with additional fixes for rollup deployment script. From 014b44e0bfe35d9ead344254fe64ba1ddf66613c Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 10 Jun 2024 11:36:21 -0600 Subject: [PATCH 2/4] update readme for by-default stylus --- README.md | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 45665ca..e8c3983 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Nitro Testnode -Nitro-testnode brings up a full environment for local nitro testing (with or without Stylus support) including a dev-mode geth L1, and multiple instances with different roles. +Nitro-testnode brings up a full environment for local nitro testing (with Stylus support) including a dev-mode geth L1, and multiple instances with different roles. ### Requirements @@ -11,8 +11,6 @@ All must be installed in PATH. ## Using latest nitro release (recommended) -### Without Stylus support - Check out the release branch of the repository. > Notice: release branch may be force-pushed at any time. @@ -29,30 +27,12 @@ Initialize the node ``` To see more options, use `--help`. -### With Stylus support - -Check out the stylus branch of the repository. -> Notice: stylus branch may be force-pushed at any time. - -```bash -git clone -b stylus --recurse-submodules https://github.com/OffchainLabs/nitro-testnode.git -cd nitro-testnode -``` - -Initialize the node - -```bash -./test-node.bash --init -``` -To see more options, use `--help`. - ## Using current nitro code (local compilation) -Check out the nitro or stylus repository. Use the test-node submodule of nitro repository. +Check out the nitro repository. Use the test-node submodule of nitro repository. > Notice: testnode may not always be up-to-date with config options of current nitro node, and is not considered stable when operated in that way. -### Without Stylus support ```bash git clone --recurse-submodules https://github.com/OffchainLabs/nitro.git cd nitro/nitro-testnode @@ -64,18 +44,6 @@ Initialize the node in dev-mode (this will build the docker images from source) ``` To see more options, use `--help`. -### With Stylus support -```bash -git clone --recurse-submodules https://github.com/OffchainLabs/stylus.git -cd stylus/nitro-testnode -``` - -Initialize the node in dev-mode (this will build the docker images from source) -```bash -./test-node.bash --init --dev -``` -To see more options, use `--help`. - ## Further information ### Working with docker containers From dec82b6c9f4b64e0e2414c55e202b4e9ce849440 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 10 Jun 2024 15:45:57 -0600 Subject: [PATCH 3/4] docker-compose: use nitro entrypoint fort testnode we don't need the split-val entry --- docker-compose.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 1289560..f889cb1 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -152,6 +152,7 @@ services: sequencer: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8547:8547" - "127.0.0.1:8548:8548" @@ -168,6 +169,7 @@ services: sequencer_b: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8647:8547" - "127.0.0.1:8648:8548" @@ -182,6 +184,7 @@ services: sequencer_c: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8747:8547" - "127.0.0.1:8748:8548" @@ -196,6 +199,7 @@ services: sequencer_d: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8847:8547" - "127.0.0.1:8848:8548" @@ -210,6 +214,7 @@ services: staker-unsafe: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8047:8547" - "127.0.0.1:8048:8548" @@ -226,6 +231,7 @@ services: poster: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8147:8547" - "127.0.0.1:8148:8548" @@ -241,6 +247,7 @@ services: poster_b: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:9147:8547" - "127.0.0.1:9148:8548" @@ -256,6 +263,7 @@ services: poster_c: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:9247:8547" - "127.0.0.1:9248:8548" @@ -271,6 +279,7 @@ services: validator: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8247:8547" - "127.0.0.1:8248:8548" @@ -286,6 +295,7 @@ services: l3node: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:3347:3347" - "127.0.0.1:3348:3348" @@ -301,6 +311,7 @@ services: validation_node: pid: host # allow debugging image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:8949:8549" volumes: @@ -318,6 +329,7 @@ services: relay: pid: host image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:9652:9652" entrypoint: /usr/local/bin/relay From 22ecaea53ba2b37536f880269a7ae846d0fba3d2 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Mon, 10 Jun 2024 16:31:26 -0600 Subject: [PATCH 4/4] fix docker-compose --- docker-compose.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f889cb1..e21e1cf 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -317,7 +317,6 @@ services: volumes: - "config:/config" command: --conf.file /config/validation_node_config.json - entrypoint: /usr/local/bin/nitro-val scripts: build: scripts/ @@ -332,7 +331,6 @@ services: entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:9652:9652" - entrypoint: /usr/local/bin/relay command: --chain.id 412346 --node.feed.input.url ws://sequencer:9642 --node.feed.output.port 9652 tokenbridge: