diff --git a/README.md b/README.md index 45665ca8..e8c3983d 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 diff --git a/blockscout b/blockscout index c8db5b1b..8419b9c5 160000 --- a/blockscout +++ b/blockscout @@ -1 +1 @@ -Subproject commit c8db5b1bb99b31f7348e6f760ba6dd22643c725a +Subproject commit 8419b9c5a47ec165c8892fa8ba48689fc0b163af diff --git a/docker-compose.yaml b/docker-compose.yaml index 4b1c72cc..e5579753 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -151,6 +151,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" @@ -167,6 +168,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" @@ -181,6 +183,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" @@ -195,6 +198,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" @@ -209,6 +213,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" @@ -225,6 +230,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" @@ -240,6 +246,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" @@ -255,6 +262,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" @@ -270,6 +278,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" @@ -285,6 +294,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" @@ -300,12 +310,12 @@ 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: - "config:/config" command: --conf.file /config/validation_node_config.json - entrypoint: /usr/local/bin/nitro-val scripts: build: scripts/ @@ -317,10 +327,10 @@ services: relay: pid: host image: nitro-node-dev-testnode + entrypoint: /usr/local/bin/nitro ports: - "127.0.0.1:9652:9652" - entrypoint: bin/relay - command: --node.feed.output.port 9652 --node.feed.input.url ws://sequencer:9652 + command: --chain.id 412346 --node.feed.input.url ws://sequencer:9642 --node.feed.output.port 9652 tokenbridge: depends_on: diff --git a/scripts/config.ts b/scripts/config.ts index 23ecff4f..d9d895c7 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": 20, "InitialChainOwner": argv.l2owner, "GenesisBlockNum": 0 } @@ -377,7 +377,7 @@ function writeL3ChainConfig(argv: any) { "EnableArbOS": true, "AllowDebugPrecompiles": true, "DataAvailabilityCommittee": false, - "InitialArbOSVersion": 11, + "InitialArbOSVersion": 20, "InitialChainOwner": "0x0000000000000000000000000000000000000000", "GenesisBlockNum": 0 } diff --git a/test-node.bash b/test-node.bash index 0b5f3d85..3f0e4ae6 100755 --- a/test-node.bash +++ b/test-node.bash @@ -182,7 +182,7 @@ while [[ $# -gt 0 ]]; do echo --init remove all data, rebuild, deploy new rollup echo --pos l1 is a proof-of-stake chain \(using prysm for consensus\) echo --validate heavy computation, validating all blocks in WASM - echo --l3-node deploys an L3 node on top of the L2 + echo --l3node deploys an L3 node on top of the L2 echo --l3-fee-token L3 chain is set up to use custom fee token. Only valid if also '--l3node' is provided echo --l3-token-bridge Deploy L2-L3 token bridge. Only valid if also '--l3node' is provided echo --batchposters batch posters [0-3]