feat: Rebase to nitro-v3.3.2 commit

.clabot

@@ -0,0 +1,5 @@
+{
+  "contributors": "https://api.github.com/repos/OffchainLabs/clabot-config/contents/nitro-contributors.json",
+  "message": "We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please sign the linked documents below to get yourself added. https://na3.docusign.net/Member/PowerFormSigning.aspx?PowerFormId=b15c81cc-b5ea-42a6-9107-3992526f2898&env=na3&acct=6e152afc-6284-44af-a4c1-d8ef291db402&v=2",
+  "label": "s"
+}

.github/workflows/ci.yml

@@ -2,39 +2,46 @@ name: CI
 run-name: CI triggered from @${{ github.actor }} of ${{ github.head_ref }}
 
 on:
-    workflow_dispatch:
-    merge_group:
-    pull_request:
-    push:
-      branches:
-        - master
-        - main
-        - develop
-
+  workflow_dispatch:
+  merge_group:
+  pull_request:
+  push:
+    branches:
+      - master
+      - develop
 
 jobs:
   build_and_run:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # Temporarily disabling this until a fix is pushed upstream
+        # pos: [pos, no-pos]
+        l3node: [l3node, l3node-token-6, no-l3node]
+        tokenbridge: [tokenbridge, no-tokenbridge]
+        eigenda: [eigenda, no-eigenda]
 
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-      with:
-        submodules: recursive
+      - 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: 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
-      env:
-        EIGENDA_SIGNER_PRIVATE_KEY: ${{ secrets.EIGENDA_SIGNER_PRIVATE_KEY }}
-      run: EIGENDA_SIGNER_PRIVATE_KEY=$EIGENDA_SIGNER_PRIVATE_KEY ${{ github.workspace }}/.github/workflows/testnode.bash
+      - 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
+        env:
+          EIGENDA_SIGNER_PRIVATE_KEY: ${{ secrets.EIGENDA_SIGNER_PRIVATE_KEY }}
+        ## add this into run CMD when prysm patch is applied upstream
+        ## $ {{ matrix.pos == 'pos' && '--pos' || '' }}
+        run: EIGENDA_SIGNER_PRIVATE_KEY=$EIGENDA_SIGNER_PRIVATE_KEY ${{ github.workspace }}/.github/workflows/testnode.bash --init-force ${{ (matrix.l3node == 'l3node' && '--l3node') || (matrix.l3node == 'l3node-token-6' && '--l3node --l3-fee-token --l3-token-bridge --l3-fee-token-decimals 6') || '' }} ${{ matrix.tokenbridge == 'tokenbridge' && '--tokenbridge' || '--no-tokenbridge' }} --no-simple --detach ${{matrix.eigenda == 'eigenda' && '--eigenda' || ''}}

.github/workflows/testnode.bash

@@ -5,24 +5,36 @@
 # 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
+./test-node.bash "$@"
+
+if [ $? -ne 0 ]; then
+    echo "test-node.bash failed"
+    docker compose logs --tail=1000
+    exit 1
+fi
+
 
 START=$(date +%s)
 L2_TRANSACTION_SUCCEEDED=false
-L3_TRANSACTION_SUCCEEDED=false
+# if we're not running an l3node then we just set l3 to success by default
+L3_TRANSACTION_SUCCEEDED=true
+for arg in "$@"; do
+    if [ "$arg" = "--l3node" ]; then
+        L3_TRANSACTION_SUCCEEDED=false
+    fi
+done
 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
+        if ${GITHUB_WORKSPACE}/test-node.bash script send-l2 --ethamount 2 --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
+        if ${GITHUB_WORKSPACE}/test-node.bash script send-l3 --ethamount 2 --to user_l3user --wait; then
             echo "Sending l3 transaction succeeded"
             L3_TRANSACTION_SUCCEEDED=true
         fi
@@ -44,10 +56,10 @@ while true; do
     sleep 10
 done
 
-docker-compose stop
+docker compose stop
 
 if [ "$SUCCEEDED" = false ]; then
-    docker-compose logs
+    docker compose logs
     exit 1
 fi
 

docker-compose.yaml

@@ -47,7 +47,7 @@ services:
       - "127.0.0.1:6379:6379"
 
   geth:
-    image: ethereum/client-go:v1.10.23
+    image: ethereum/client-go:latest
     ports:
       - "127.0.0.1:8545:8545"
       - "127.0.0.1:8551:8551"
@@ -77,6 +77,7 @@ services:
       - --authrpc.jwtsecret=/config/jwt.hex
       - --nodiscover
       - --syncmode=full
+      - --state.scheme=hash
       - --dev
       - --dev.period=1
       - --mine
@@ -91,9 +92,13 @@ services:
     command:
       - testnet
       - generate-genesis
+      - --fork=deneb
       - --num-validators=64
+      - --genesis-time-delay=15
       - --output-ssz=/consensus/genesis.ssz
       - --chain-config-file=/config/prysm.yaml
+      - --geth-genesis-json-in=/config/geth_genesis.json
+      - --geth-genesis-json-out=/config/geth_genesis.json
     volumes:
       - "consensus:/consensus"
       - "config:/config"
@@ -108,16 +113,17 @@ services:
       - --datadir=/consensus/beacondata
       - --rpc-port=5000
       - --min-sync-peers=0
-      - --interop-genesis-state=/consensus/genesis.ssz
+      - --genesis-state=/consensus/genesis.ssz
       - --interop-eth1data-votes
       - --bootstrap-node=
       - --chain-config-file=/config/prysm.yaml
       - --rpc-host=0.0.0.0
       - --grpc-gateway-host=0.0.0.0
-      - --chain-id=32382
+      - --chain-id=1337
       - --execution-endpoint=http://geth:8551
       - --accept-terms-of-use
       - --jwt-secret=/config/jwt.hex
+      - --suggested-fee-recipient=0x000000000000000000000000000000000000dEaD
     depends_on:
       geth:
         condition: service_started
@@ -361,6 +367,54 @@ services:
       - "config:/config"
       - /var/run/docker.sock:/var/run/docker.sock
 
+  datool:
+    image: nitro-node-dev-testnode
+    entrypoint: /usr/local/bin/datool
+    volumes:
+      - "config:/config"
+      - "das-committee-a-data:/das-committee-a"
+      - "das-committee-b-data:/das-committee-b"
+      - "das-mirror-data:/das-mirror"
+    command:
+
+  das-committee-a:
+    pid: host # allow debugging
+    image: nitro-node-dev-testnode
+    entrypoint: /usr/local/bin/daserver
+    ports:
+      - "127.0.0.1:9876:9876"
+      - "127.0.0.1:9877:9877"
+    volumes:
+      - "config:/config"
+      - "das-committee-a-data:/das"
+    command:
+      - --conf.file=/config/l2_das_committee.json
+
+  das-committee-b:
+    pid: host # allow debugging
+    image: nitro-node-dev-testnode
+    entrypoint: /usr/local/bin/daserver
+    ports:
+      - "127.0.0.1:8876:9876"
+      - "127.0.0.1:8877:9877"
+    volumes:
+      - "config:/config"
+      - "das-committee-b-data:/das"
+    command:
+      - --conf.file=/config/l2_das_committee.json
+
+  das-mirror:
+    pid: host # allow debugging
+    image: nitro-node-dev-testnode
+    entrypoint: /usr/local/bin/daserver
+    ports:
+      - "127.0.0.1:7877:9877"
+    volumes:
+      - "config:/config"
+      - "das-mirror-data:/das"
+    command:
+      - --conf.file=/config/l2_das_mirror.json
+
   eigenda_proxy:
     container_name: eigenda-proxy
     image: ghcr.io/layr-labs/eigenda-proxy:v1.6.1
@@ -441,3 +495,7 @@ volumes:
   config:
   postgres-data:
   tokenbridge-data:
+  das-committee-a-data:
+  das-committee-b-data:
+  das-mirror-data:
+

rollupcreator/Dockerfile

@@ -1,7 +1,5 @@
 FROM node:18-bullseye-slim
-
-
-# Install necessary packages
+ARG NITRO_CONTRACTS_BRANCH=main
 RUN apt-get update && \
     apt-get install -y git docker.io python3 build-essential curl jq