feat(rollup-boost): port rollup-boost to the monorepo

.circleci/continue/main.yml

@@ -422,7 +422,7 @@ commands:
             echo "export RUST_BINARY_PATH_KONA_NODE=$ROOT_DIR/rust/target/release/kona-node" >> "$BASH_ENV"
             echo "export RUST_BINARY_PATH_KONA_SUPERVISOR=$ROOT_DIR/rust/target/release/kona-supervisor" >> "$BASH_ENV"
             echo "export RUST_BINARY_PATH_OP_RBUILDER=$BIN_DIR/op-rbuilder" >> "$BASH_ENV"
-            echo "export RUST_BINARY_PATH_ROLLUP_BOOST=$BIN_DIR/rollup-boost" >> "$BASH_ENV"
+            echo "export RUST_BINARY_PATH_ROLLUP_BOOST=$ROOT_DIR/rust/target/release/rollup-boost" >> "$BASH_ENV"
 
   rust-prepare:
     parameters:
@@ -2167,7 +2167,7 @@ jobs:
             echo "export RUST_BINARY_PATH_KONA_NODE=$ROOT_DIR/rust/target/release/kona-node" >> "$BASH_ENV"
             echo "export RUST_BINARY_PATH_KONA_SUPERVISOR=$ROOT_DIR/rust/target/release/kona-supervisor" >> "$BASH_ENV"
             echo "export RUST_BINARY_PATH_OP_RBUILDER=$BIN_DIR/op-rbuilder" >> "$BASH_ENV"
-            echo "export RUST_BINARY_PATH_ROLLUP_BOOST=$BIN_DIR/rollup-boost" >> "$BASH_ENV"
+            echo "export RUST_BINARY_PATH_ROLLUP_BOOST=$ROOT_DIR/rust/target/release/rollup-boost" >> "$BASH_ENV"
       # Restore cached Go modules
       - restore_cache:
           keys:
@@ -3202,8 +3202,8 @@ workflows:
           save_cache: true
           context:
             - circleci-repo-readonly-authenticated-github-token
-      - rust-build-binary: &kona-build-release
-          name: kona-build-release
+      - rust-build-binary: &rust-build-release
+          name: rust-build-release
           directory: rust
           profile: "release"
           features: "default"
@@ -3218,18 +3218,10 @@ workflows:
           needs_clang: true
           context:
             - circleci-repo-readonly-authenticated-github-token
-      - rust-build-submodule: &rust-build-rollup-boost
-          name: rust-build-rollup-boost
-          directory: rollup-boost
-          binaries: "rollup-boost"
-          build_command: cargo build --release -p rollup-boost --bin rollup-boost
-          context:
-            - circleci-repo-readonly-authenticated-github-token
       - rust-binaries-for-sysgo:
           requires:
-            - kona-build-release
+            - rust-build-release
             - rust-build-op-rbuilder
-            - rust-build-rollup-boost
       - go-binaries-for-sysgo
       # IN-MEMORY (all)
       - op-acceptance-tests:
@@ -3539,19 +3531,17 @@ workflows:
           context:
             - circleci-repo-readonly-authenticated-github-token
       - rust-build-binary:
-          name: kona-build-release
+          name: rust-build-release
           directory: rust
           needs_clang: true
           profile: "release"
           context:
             - circleci-repo-readonly-authenticated-github-token
       - rust-build-submodule: *rust-build-op-rbuilder
-      - rust-build-submodule: *rust-build-rollup-boost
       - rust-binaries-for-sysgo:
           requires:
-            - kona-build-release
+            - rust-build-release
             - rust-build-op-rbuilder
-            - rust-build-rollup-boost
       - op-acceptance-tests-flake-shake:
           context:
             - circleci-repo-readonly-authenticated-github-token

.circleci/continue/rust-ci.yml

@@ -87,7 +87,7 @@ commands:
             echo "export RUST_BINARY_PATH_KONA_NODE=$ROOT_DIR/rust/target/release/kona-node" >> "$BASH_ENV"
             echo "export RUST_BINARY_PATH_KONA_SUPERVISOR=$ROOT_DIR/rust/target/release/kona-supervisor" >> "$BASH_ENV"
             echo "export RUST_BINARY_PATH_OP_RBUILDER=$BIN_DIR/op-rbuilder" >> "$BASH_ENV"
-            echo "export RUST_BINARY_PATH_ROLLUP_BOOST=$BIN_DIR/rollup-boost" >> "$BASH_ENV"
+            echo "export RUST_BINARY_PATH_ROLLUP_BOOST=$ROOT_DIR/rust/target/release/rollup-boost" >> "$BASH_ENV"
 
   rust-prepare:
     parameters:
@@ -1003,6 +1003,39 @@ jobs:
           destination: op-reth-docs
 
 
+  # Rollup Boost integration tests (requires Docker + Redis)
+  rollup-boost-integration-tests:
+    machine:
+      image: <<pipeline.parameters.c-base_image>>
+      docker_layer_caching: true
+    resource_class: xlarge
+    steps:
+      - utils/checkout-with-mise:
+          checkout-method: blobless
+      - rust-prepare-and-restore-cache:
+          directory: rust
+          prefix: rollup-boost-integration
+      - install-cargo-binstall
+      - run:
+          name: Install nextest
+          command: |
+            command -v cargo-nextest >/dev/null || cargo binstall --no-confirm cargo-nextest
+      - run:
+          name: Install redis-server
+          # NEEDRESTART_MODE ensures we're not prompted for restarts interactively in CI.
+          command: |
+            export NEEDRESTART_MODE=a
+            sudo -E apt-get update -y
+            sudo -E apt-get install -y redis-server
+      - run:
+          name: Run rollup-boost integration tests
+          working_directory: rust
+          no_output_timeout: 40m
+          command: just test-integration
+      - rust-save-build-cache:
+          directory: rust
+          prefix: rollup-boost-integration
+
   # Kona Link Checker
   kona-link-checker:
     docker:
@@ -1203,6 +1236,12 @@ workflows:
       - op-reth-windows-check:
           context: *rust-ci-context
 
+      # -----------------------------------------------------------------------
+      # Rollup Boost crate-specific jobs
+      # -----------------------------------------------------------------------
+      - rollup-boost-integration-tests:
+          context: *rust-ci-context
+
       - rust-ci-cargo-tests:
           name: op-reth-integration-tests
           directory: rust

.gitmodules

@@ -38,6 +38,3 @@
 [submodule "op-rbuilder"]
 	path = op-rbuilder
 	url = https://github.com/flashbots/op-rbuilder
-[submodule "rollup-boost"]
-	path = rollup-boost
-	url = https://github.com/flashbots/rollup-boost

justfile

@@ -1,8 +1,7 @@
 # Build all Rust binaries (release) for sysgo tests.
 build-rust-release:
-  cd rust && cargo build --release --bin kona-node --bin kona-supervisor
+  cd rust && cargo build --release --bin kona-node --bin kona-supervisor --bin rollup-boost
   cd op-rbuilder && cargo build --release -p op-rbuilder --bin op-rbuilder
-  cd rollup-boost && cargo build --release -p rollup-boost --bin rollup-boost
 
 # Checks that TODO comments have corresponding issues.
 todo-checker:

op-acceptance-tests/tests/flashblocks/flashblocks_stream_test.go

@@ -42,7 +42,7 @@ func TestFlashblocksStream(gt *testing.T) {
 	ctx, span := tracer.Start(ctx, "test chains")
 	defer span.End()
 
-	ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
+	ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
 	defer cancel()
 
 	if flashblocksStreamRate == "" {
@@ -96,6 +96,8 @@ func TestFlashblocksStream(gt *testing.T) {
 	listening := true
 	for listening {
 		select {
+		case <-ctx.Done():
+			t.Errorf("timed out waiting for flashblocks streams to complete: %v", ctx.Err())
 		case <-doneListening:
 			doneListening = nil
 		case <-builderDone:

op-devstack/sysgo/l2_cl_kona.go

@@ -278,7 +278,7 @@ func withKonaNode(l2CLID stack.L2CLNodeID, l1CLID stack.L1CLNodeID, l1ELID stack
 		}
 
 		execPath, err := EnsureRustBinary(p, RustBinarySpec{
-			SrcDir:  "kona",
+			SrcDir:  "rust",
 			Package: "kona-node",
 			Binary:  "kona-node",
 		})

op-devstack/sysgo/rollup_boost.go

@@ -132,7 +132,7 @@ func (r *RollupBoostNode) Start() {
 	r.sub = NewSubProcess(r.p, stdOut, stdErr)
 
 	execPath, err := EnsureRustBinary(r.p, RustBinarySpec{
-		SrcDir:  "rollup-boost",
+		SrcDir:  "rust",
 		Package: "rollup-boost",
 		Binary:  "rollup-boost",
 	})

op-devstack/sysgo/rust_binary.go

@@ -14,7 +14,7 @@ import (
 
 // RustBinarySpec describes a Rust binary to be built and located.
 type RustBinarySpec struct {
-	SrcDir  string // directory name relative to monorepo root, e.g. "rollup-boost"
+	SrcDir  string // directory name relative to monorepo root, e.g. "rust" or "op-rbuilder"
 	Package string // cargo package name, e.g. "rollup-boost"
 	Binary  string // binary name, e.g. "rollup-boost"
 }

op-devstack/sysgo/supervisor_kona.go

@@ -159,7 +159,7 @@ func WithKonaSupervisor(supervisorID stack.SupervisorID, clusterID stack.Cluster
 		}
 
 		execPath, err := EnsureRustBinary(p, RustBinarySpec{
-			SrcDir:  "kona",
+			SrcDir:  "rust",
 			Package: "kona-supervisor",
 			Binary:  "kona-supervisor",
 		})