Clickhouse backup on rbuilder-utils

Cargo.toml

@@ -19,7 +19,10 @@ revm-primitives = { version = "20.2.1", default-features = false }
 revm-interpreter = { version = "25.0.2", default-features = false }
 
 # rbuilder
-rbuilder-primitives = { git = "https://github.com/flashbots/rbuilder", rev = "a21de88" }
+rbuilder-primitives = { git = "https://github.com/flashbots/rbuilder", rev = "332b00ceeb960cfa27278c020f0f8b299f928982" }
+rbuilder-utils = { git = "https://github.com/flashbots/rbuilder", rev = "332b00ceeb960cfa27278c020f0f8b299f928982", features = ["test-utils"] }
+
+
 
 # rt
 tokio = { version = "1", default-features = false, features = [

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
 channel = "stable"
-version = "1.89.0"
+version = "1.89.0"

src/cli.rs

@@ -3,15 +3,12 @@ use std::path::PathBuf;
 use alloy_primitives::Address;
 use alloy_signer_local::PrivateKeySigner;
 use clap::{Args, Parser, ValueHint};
+use rbuilder_utils::clickhouse::indexer::{
+    default_disk_backup_database_path, MAX_DISK_BACKUP_SIZE_BYTES, MAX_MEMORY_BACKUP_SIZE_BYTES,
+};
 
 use crate::{
-    indexer::{
-        click::{
-            default_disk_backup_database_path, MAX_DISK_BACKUP_SIZE_BYTES,
-            MAX_MEMORY_BACKUP_SIZE_BYTES,
-        },
-        BUNDLE_RECEIPTS_TABLE_NAME, BUNDLE_TABLE_NAME,
-    },
+    indexer::{BUNDLE_RECEIPTS_TABLE_NAME, BUNDLE_TABLE_NAME},
     SystemBundleDecoder,
 };
 

src/forwarder.rs

@@ -12,7 +12,6 @@ use crate::{
         UtcInstant, WithEncoding,
     },
     priority::{pchannel, Priority},
-    tasks::TaskExecutor,
     utils::UtcDateTimeHeader as _,
 };
 use alloy_primitives::Address;
@@ -22,6 +21,7 @@ use axum::http::HeaderValue;
 use dashmap::DashMap;
 use futures::{stream::FuturesUnordered, StreamExt};
 use hyper::{header::CONTENT_TYPE, HeaderMap, StatusCode};
+use rbuilder_utils::tasks::TaskExecutor;
 use reqwest::Url;
 use revm_primitives::keccak256;
 use serde_json::json;
@@ -68,7 +68,7 @@ impl IngressForwarders {
     }
 
     /// Broadcast bundle to all forwarders.
-    pub fn broadcast_bundle(&self, bundle: SystemBundle) {
+    pub(crate) fn broadcast_bundle(&self, bundle: SystemBundle) {
         let encoded_bundle = bundle.encode();
 
         // Create local request first