Merge branch 'fix-chain-config' into transfer-ownership

Author: tsahee

.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,40 @@
+#!/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.
+${GITHUB_WORKSPACE}/test-node.bash --init > output.log 2>&1 &
+PID=$!
+
+sleep 5m
+
+START=$(date +%s)
+SUCCEDED=0
+
+while true; do
+    if ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 100 --to user_l2user --wait; then
+        echo "Sending l2 transaction succeeded"
+        SUCCEDED=1
+        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
+
+# Shut down the test node and wait for it to terminate.
+kill $PID
+wait $PID
+
+if [ "$SUCCEDED" -eq 0 ]; then
+    exit 1
+fi
+
+exit 0

scripts/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:16
+FROM node:16-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",
     },
   },

scripts/config.ts

@@ -181,7 +181,8 @@ function writeConfigs(argv: any) {
             },
             "sequencer": false,
             "dangerous": {
-                "no-sequencer-coordinator": false
+                "no-sequencer-coordinator": false,
+                "disable-blob-reader": true,
             },
             "delayed-sequencer": {
                 "enable": false

test-node.bash

@@ -164,13 +164,15 @@ 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 --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]
             echo --redundantsequencers redundant sequencers [0-3]
             echo --detach          detach from nodes after running them
             echo --blockscout      build or launch blockscout
             echo --simple          run a simple configuration. one node as sequencer/batch-poster/staker \(default unless using --dev\)
+            echo --tokenbridge     deploy L1-L2 token bridge.
             echo --no-tokenbridge  don\'t build or launch tokenbridge
             echo --no-run          does not launch nodes \(useful with build or init\)
             echo --no-simple       run a full configuration with separate sequencer/batch-poster/validator/relayer

tokenbridge/Dockerfile

@@ -1,8 +1,8 @@
 FROM node:16-bullseye-slim
 RUN apt-get update && \
-    apt-get install -y git docker.io python3 chromium build-essential
+    apt-get install -y git docker.io python3 build-essential
 WORKDIR /workspace  
-RUN git clone -b reg-weth-gw https://github.com/OffchainLabs/token-bridge-contracts.git ./
+RUN git clone https://github.com/OffchainLabs/token-bridge-contracts.git ./
 RUN yarn install
 RUN yarn build
 ENTRYPOINT ["yarn"]