Back port flashbots main branch

.dockerignore

@@ -1,8 +1,10 @@
 # Version control
-.git
 .github
 .gitignore
 
+# Include for vergen constants
+!/.git
+
 # Build artifacts
 **/target
 integration_logs

.github/workflows/build.yml

@@ -2,6 +2,14 @@ name: Build Docker Image
 
 on:
   workflow_dispatch:
+    inputs:
+      service_name:
+        description: 'Name of the service to build'
+        default: 'rollup-boost'
+        type: choice
+        options:
+          - "rollup-boost"
+          - "flashblocks-rpc"
   push:
     branches:
       - main
@@ -12,7 +20,7 @@ permissions:
   contents: write
 
 env:
-  REGISTRY_IMAGE: flashbots/rollup-boost
+  REGISTRY_IMAGE: flashbots/${{ inputs.service_name || 'rollup-boost' }}
 
 jobs:
   build:
@@ -46,13 +54,13 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Login to DockerHub
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.FLASHBOTS_DOCKERHUB_USERNAME }}
           password: ${{ secrets.FLASHBOTS_DOCKERHUB_TOKEN }}
 
-      - name: Build and push
+      - name: Build and push to docker hub
         id: build
         uses: docker/build-push-action@v6
         with:
@@ -61,7 +69,9 @@ jobs:
           context: .
           platforms: ${{ matrix.config.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
+          build-args: |
+            SERVICE_NAME=${{ inputs.service_name || 'rollup-boost' }}
+          outputs: type=registry,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true
 
       - name: Export digest
         run: |
@@ -79,6 +89,9 @@ jobs:
 
   merge:
     runs-on: warp-ubuntu-latest-x64-16x
+    permissions:
+      contents: read
+      packages: write
     needs:
       - build
     steps:
@@ -95,6 +108,13 @@ jobs:
           username: ${{ secrets.FLASHBOTS_DOCKERHUB_USERNAME }}
           password: ${{ secrets.FLASHBOTS_DOCKERHUB_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.FLASHBOTS_GHCR_TOKEN }}
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -110,8 +130,22 @@ jobs:
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+          image=$(
+            jq -cr '.tags | first' <<< "$DOCKER_METADATA_OUTPUT_JSON"
+          )
+
+          docker buildx imagetools create -t $image $(
+            printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *
+          )
+
+      - name: Install regctl
+        uses: regclient/actions/regctl-installer@main
+
+      - name: Push to GHCR
+        run: |
+          regctl image copy \
+            ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} \
+            ghcr.io/${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
 
       - name: Inspect image
         run: |

.github/workflows/builder-playground.yml

@@ -0,0 +1,45 @@
+name: Builder Playground Integration Tests
+
+on:
+  # Allow manual trigger
+  workflow_dispatch:
+  # Run nightly at 00:00 UTC
+  schedule:
+    - cron: "0 0 * * *"
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  integration-tests:
+    name: Run Builder Playground Integration Tests
+    runs-on: warp-ubuntu-latest-x64-16x
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Builder playground
+        uses: flashbots/[email protected]
+        with:
+          builder-playground: latest
+
+      - name: Setup Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          profile: minimal
+
+      - name: Install Just
+        uses: taiki-e/install-action@just
+
+      - name: Build Rollup boost image
+        run: |
+          just build
+
+      - name: Run Builder Playground
+        run: |
+          builder-playground cook opstack --override rollup-boost=flashbots/rollup-boost:develop --external-builder op-reth --timeout 5m --watchdog

.github/workflows/kurtosis_integration.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
   # Run nightly at 00:00 UTC
   schedule:
-    - cron: '0 0 * * *'
+    - cron: "0 0 * * *"
   push:
     branches:
       - main
@@ -97,12 +97,12 @@ jobs:
       - name: Devnet Up
         run: |
           eval $(minikube -p minikube docker-env)
-          just devnet-up
+          just kurtosis-devnet-up
 
       - name: Stress Tests
         run: |
-          just stress-test
+          just kurtosis-stress-test
 
       - name: Devnet Down
         run: |
-          just devnet-down
+          just kurtosis-devnet-down

.github/workflows/release.yml

@@ -1,7 +1,6 @@
 name: Release
 
 on:
-  workflow_dispatch:
   push:
     tags:
       - 'v*'
@@ -25,7 +24,7 @@ jobs:
     runs-on: ${{ matrix.config.runner }}
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4.2.0
 
       - name: Set env
         run: |
@@ -67,7 +66,7 @@ jobs:
             VERSION=${{ env.RELEASE_VERSION }}
           platforms: ${{ matrix.config.platform }}
           labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
+          outputs: type=registry,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true
 
       - name: Export digest
         run: |
@@ -101,6 +100,13 @@ jobs:
           username: ${{ secrets.FLASHBOTS_DOCKERHUB_USERNAME }}
           password: ${{ secrets.FLASHBOTS_DOCKERHUB_TOKEN }}
 
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.FLASHBOTS_GHCR_TOKEN }} # PAT required for Organization policy
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -113,13 +119,27 @@ jobs:
             type=sha
             type=pep440,pattern={{version}}
             type=pep440,pattern={{major}}.{{minor}}
-            type=raw,value=latest,enable=${{ !contains(env.RELEASE_VERSION, '-') }}
+            type=raw,value=latest,enable=${{ !contains(env.RELEASE_VERSION, '-rc') }}
 
       - name: Create manifest list and push
         working-directory: /tmp/digests
         run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+          image=$(
+            jq -cr '.tags | first' <<< "$DOCKER_METADATA_OUTPUT_JSON"
+          )
+
+          docker buildx imagetools create -t $image $(
+            printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *
+          )
+
+      - name: Install regctl
+        uses: regclient/actions/regctl-installer@main
+
+      - name: Push to GHCR
+        run: |
+          regctl image copy \
+            ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }} \
+            ghcr.io/${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
 
       - name: Inspect image
         run: |
@@ -129,7 +149,7 @@ jobs:
     runs-on: warp-ubuntu-latest-x64-16x
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.0
 
       - name: Create release
         id: create_release

.github/workflows/websocket-proxy-ci.yaml

@@ -52,6 +52,9 @@ jobs:
   docker:
     name: Docker Build
     runs-on: warp-ubuntu-latest-x64-16x
+    defaults:
+      run:
+        working-directory: "./crates/websocket-proxy"
     steps:
       - uses: actions/checkout@v4