fix conflict

Author: georgehao

.github/workflows/bench.yml

@@ -0,0 +1,34 @@
+# Runs benchmarks.
+
+on:
+  pull_request:
+  push:
+    branches: [main]
+
+env:
+  CARGO_TERM_COLOR: always
+  BASELINE: base
+  SEED: rollup-node
+
+name: bench
+jobs:
+  codspeed:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: Install cargo-codspeed
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-codspeed
+      - name: Build the benchmark target(s)
+        run: cargo codspeed build -p scroll-derivation-pipeline --profile profiling
+      - name: Run the benchmarks
+        uses: CodSpeedHQ/action@v4
+        with:
+          mode: instrumentation
+          run: cargo codspeed run --workspace

.github/workflows/book.yml

@@ -0,0 +1,23 @@
+name: Deploy mdBook
+on:
+  push:
+    branches: [main]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: peaceiris/actions-mdbook@v2
+        with:
+          mdbook-version: 'latest'
+
+      - name: Build book
+        run: mdbook build book  # Add "book" to specify the directory
+
+      - uses: peaceiris/actions-gh-pages@v4
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./book/book

.github/workflows/lint.yaml

@@ -92,7 +92,7 @@ jobs:
         with:
           cache-on-failure: true
       - name: Run doc
-        run: cargo docs --document-private-items
+        run: cargo docs --document-private-items --exclude rollup-node-chain-orchestrator
         env:
           RUSTDOCFLAGS: --cfg docsrs --show-type-layout --generate-link-to-definition --enable-index-page -Zunstable-options -D warnings
 

.github/workflows/release.yml

@@ -50,7 +50,7 @@ jobs:
           latest=false
 
     - name: Login to Docker Hub
-      uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 #v3.5.0
+      uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef #v3.6.0
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -75,6 +75,6 @@ jobs:
         tags: ${{ steps.meta-nightly.outputs.tags }}
         labels: ${{ steps.meta-nightly.outputs.labels }}
         build-args: |
-          CARGO_FEATURES=js-trace
+          CARGO_FEATURES=js-tracer
         cache-from: type=gha,scope=${{ github.workflow }}-nightly
         cache-to: type=gha,scope=${{ github.workflow }}-nightly

.github/workflows/sequencer-migration-docker.yml

@@ -0,0 +1,46 @@
+name: Sequencer Migration Docker
+
+on:
+  push:
+    tags:
+      - '*'
+  release:
+    types: [published]
+
+jobs:
+  build-and-push:
+    runs-on:
+        group: scroll-reth-runner-group
+    permissions: {}
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v5
+      with:
+        persist-credentials: false
+
+    - name: Extract docker metadata
+      id: meta
+      uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f # v5.8.0
+      with:
+        images: scrolltech/sequencer-migration
+        tags: |
+          type=ref,event=tag,enable=${{ github.event_name == 'push' }}
+          type=raw,value=latest,enable=${{ github.event_name == 'release' }}
+        flavor: |
+          latest=false
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef #v3.6.0
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Build and push Docker image
+      uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+      with:
+        context: sequencer-migration
+        file: sequencer-migration/Dockerfile
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}

.github/workflows/test.yaml

@@ -14,7 +14,8 @@ env:
 
 jobs:
   unit:
-    runs-on: ubuntu-latest
+    runs-on:
+      group: scroll-reth-runner-group
     timeout-minutes: 60
     env:
       RUST_BACKTRACE: 1
@@ -27,14 +28,13 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - uses: taiki-e/install-action@v2
-        with:
-          tool: [email protected]
+      - uses: taiki-e/install-action@nextest
       - name: Run unit tests
         run: cargo nextest run --all-features --workspace --locked -E '!kind(test)'
 
   integration:
-    runs-on: ubuntu-latest
+    runs-on:
+      group: scroll-reth-runner-group
     timeout-minutes: 60
     env:
       RUST_BACKTRACE: 1
@@ -47,17 +47,16 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - uses: taiki-e/install-action@v2
-        with:
-          tool: [email protected]
+      - uses: taiki-e/install-action@nextest
       - name: Run integration tests
         run: |
           cargo nextest run --all-features --workspace --locked \
             --no-tests=pass -E 'kind(test) and not test(docker)' \
             -- --skip test_should_consolidate_to_block_15k
 
   integration-docker-compose:
-    runs-on: ubuntu-latest
+    runs-on:
+      group: scroll-reth-runner-group
     timeout-minutes: 90
     env:
       RUST_BACKTRACE: 1
@@ -68,9 +67,7 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - uses: taiki-e/install-action@v2
-        with:
-          tool: [email protected]
+      - uses: taiki-e/install-action@nextest
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Free up disk space
@@ -95,5 +92,5 @@ jobs:
             --success-output never \
             --verbose
         env:
-          RUST_LOG: debug
+          RUST_LOG: trace
           RUST_BACKTRACE: full