fixes

.github/workflows/ci.yml

@@ -0,0 +1,37 @@
+name: CI
+run-name: CI triggered from @${{ github.actor }} of ${{ github.head_ref }}
+
+on:
+    workflow_dispatch:
+    merge_group:
+    pull_request:
+    push:
+      branches:
+        - master
+        - develop
+
+
+jobs:
+  build_and_run:
+    runs-on: ubuntu-8
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+      with:
+        driver-opts: network=host
+
+    - name: Cache Docker layers
+      uses: actions/cache@v3
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }}
+        restore-keys: ${{ runner.os }}-buildx-
+
+    - name:  Startup Nitro testnode
+      run: ${{ github.workspace }}/.github/workflows/testnode.bash

.github/workflows/testnode.bash

@@ -0,0 +1,54 @@
+#!/bin/bash
+# The script starts up the test node and waits until the timeout (10min) or
+# until send-l2 succeeds.
+
+# Start the test node and get PID, to terminate it once send-l2 is done.
+cd ${GITHUB_WORKSPACE}
+
+# TODO once develop is merged into nitro-contract's master, remove the NITRO_CONTRACTS_BRANCH env var
+./test-node.bash --init-force --l3node --no-simple --detach
+
+START=$(date +%s)
+L2_TRANSACTION_SUCCEEDED=false
+L3_TRANSACTION_SUCCEEDED=false
+SUCCEEDED=false
+
+while true; do
+    if [ "$L2_TRANSACTION_SUCCEEDED" = false ]; then
+        if ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait; then
+            echo "Sending l2 transaction succeeded"
+            L2_TRANSACTION_SUCCEEDED=true
+        fi
+    fi
+
+    if [ "$L3_TRANSACTION_SUCCEEDED" = false ]; then
+        if ${GITHUB_WORKSPACE}/test-node.bash script send-l3 --ethamount 100 --to user_l3user --wait; then
+            echo "Sending l3 transaction succeeded"
+            L3_TRANSACTION_SUCCEEDED=true
+        fi
+    fi
+
+    if [ "$L2_TRANSACTION_SUCCEEDED" = true ] && [ "$L3_TRANSACTION_SUCCEEDED" = true ]; then
+        SUCCEEDED=true
+        break
+    fi
+
+    # Check if the timeout (10 min) has been reached.
+    NOW=$(date +%s)
+    DIFF=$((NOW - START))
+    if [ "$DIFF" -ge 600 ]; then
+        echo "Timed out"
+        break
+    fi
+
+    sleep 10
+done
+
+docker-compose stop
+
+if [ "$SUCCEEDED" = false ]; then
+    docker-compose logs
+    exit 1
+fi
+
+exit 0

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

docker-compose.yaml

@@ -1,4 +1,3 @@
-version: "3.9"
 services:
   blockscout:
     depends_on:
@@ -67,7 +66,7 @@ services:
       - --authrpc.port=8551
       - --authrpc.addr=0.0.0.0
       - --http.vhosts=*
-      - --http.api=engine,personal,eth,net,web3
+      - --http.api=engine,personal,eth,net,web3,debug
       - --http.corsdomain=*
       - --ws
       - --ws.addr=0.0.0.0
@@ -152,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"
@@ -168,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"
@@ -182,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"
@@ -196,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"
@@ -210,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"
@@ -226,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"
@@ -241,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"
@@ -256,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"
@@ -271,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"
@@ -286,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"
@@ -301,12 +310,12 @@ services:
   validation_node:
     pid: host # allow debugging
     image: nitro-node-dev-testnode
+    entrypoint: /usr/local/bin/nitro-val
     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/
@@ -318,24 +327,52 @@ services:
   relay:
     pid: host
     image: nitro-node-dev-testnode
+    entrypoint: /usr/local/bin/relay
     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:
       - geth
       - sequencer
     pid: host
-    build: tokenbridge/
+    build:
+      context: tokenbridge/
+      args:
+        TOKEN_BRIDGE_BRANCH: ${TOKEN_BRIDGE_BRANCH:-}
     environment:
       - ARB_URL=http://sequencer:8547
       - ETH_URL=http://geth:8545
     volumes:
       - "tokenbridge-data:/workspace"
       - /var/run/docker.sock:/var/run/docker.sock
 
+  rollupcreator:
+    depends_on:
+      - geth
+      - sequencer
+    pid: host
+    build:
+      context: rollupcreator/
+      args:
+        NITRO_CONTRACTS_BRANCH: ${NITRO_CONTRACTS_BRANCH:-}
+    volumes:
+      - "config:/config"
+      - /var/run/docker.sock:/var/run/docker.sock
+
+  # eigenda-proxy:
+  #   container_name: eigenda-proxy
+  #   image: eigenda-proxy
+  #   environment:
+  #     - EIGENDA_PROXY_ADDR=0.0.0.0
+  #     - EIGENDA_PROXY_PORT=4242
+  #     - MEMSTORE_ENABLED=true
+  #     - MEMSTORE_EXPIRATION=2m
+  #     - EIGENDA_PROXY_TARGET_KZG_G1_PATH=../../../eigenlayer/eigenda-proxy/operator-setup/resources/g1.point
+  #   ports:
+  #     - 4242:4242
+# 
 volumes:
   l1data:
   consensus:

rollupcreator/Dockerfile

@@ -0,0 +1,29 @@
+FROM node:18-bullseye-slim
+
+
+# Install necessary packages
+RUN apt-get update && \
+    apt-get install -y git docker.io python3 build-essential curl jq
+
+# Create workspace
+WORKDIR /workspace
+# Clone the repository and checkout the specified branch
+RUN git clone --no-checkout https://[email protected]/layr-labs/nitro-contracts-private ./
+RUN git checkout a450cd9278f067b480671e5658804f029da38ea1
+
+# ensure create-rollup-testnode command is in package.json
+RUN jq -e '.scripts["create-rollup-testnode"]' package.json > /dev/null || (echo "Error: 'create-rollup-testnode' not found in package.json" && exit 1)
+
+
+# Install Foundry
+RUN curl -L https://foundry.paradigm.xyz | bash
+ENV PATH="${PATH}:/root/.foundry/bin"
+RUN foundryup
+
+# Setup scripts and dependencies
+RUN touch scripts/config.ts
+RUN yarn install
+RUN yarn build:all
+
+
+ENTRYPOINT ["yarn"]

scripts/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:18-bullseye-slim
 WORKDIR /workspace
 COPY ./package.json ./yarn.lock ./
 RUN yarn

scripts/accounts.ts

@@ -85,10 +85,11 @@ export function namedAddress(
 
 export const namedAccountHelpString =
   "Valid account names:\n" +
-  "  funnel | sequencer | validator - known keys\n" +
-  "  user_[Alphanumeric]            - key will be generated from username\n" +
-  "  threaduser_[Alphanumeric]      - same as user_[Alphanumeric]_thread_[thread-id]\n" +
-  "  key_0x[full private key]       - user with specified private key\n" +
+  "  funnel | sequencer | validator | l2owner - known keys used by l2\n" +
+  "  l3owner | l3sequencer                    - known keys used by l3\n" +
+  "  user_[Alphanumeric]                      - key will be generated from username\n" +
+  "  threaduser_[Alphanumeric]                - same as user_[Alphanumeric]_thread_[thread-id]\n" +
+  "  key_0x[full private key]                 - user with specified private key\n" +
   "\n" +
   "Valid addresses: any account name, or\n" +
   "  address_0x[full eth address]\n" +
@@ -123,7 +124,7 @@ export const printPrivateKeyCommand = {
   builder: {
     account: {
       string: true,
-      describe: "address (see general help)",
+      describe: "account (see general help)",
       default: "funnel",
     },
   },