Skip to content

Clickhouse backup on rbuilder-utils #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 28, 2025
+352 −2,648
Merged

Clickhouse backup on rbuilder-utils #117

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
64cca08
first idea
ZanCorDX Oct 23, 2025
0672e57
dep to experimental branch
ZanCorDX Oct 23, 2025
60892d0
format
ZanCorDX Oct 23, 2025
20e9724
clippy
ZanCorDX Oct 23, 2025
95ab0e8
moved code
ZanCorDX Oct 23, 2025
f3cdb63
things moved
ZanCorDX Oct 24, 2025
1995426
fixed build
ZanCorDX Oct 24, 2025
ade6181
final dep
ZanCorDX Oct 27, 2025
c2e2cfa
reverted change
ZanCorDX Oct 27, 2025
816b225
fixed tests
ZanCorDX Oct 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
199 changes: 136 additions & 63 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ 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 = "77f35b4ecd39ac547e92de2f11a7497676d3bfd4" }
#rbuilder-primitives = {path="./../rbuilder/crates/rbuilder-primitives"}
rbuilder-utils = { git = "https://github.com/flashbots/rbuilder", rev = "77f35b4ecd39ac547e92de2f11a7497676d3bfd4", features = ["test-utils"] }
#rbuilder-utils = {path="./../rbuilder/crates/rbuilder-utils"}
Copy link
Collaborator

@thedevbirb thedevbirb Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove these comments?




# rt
tokio = { version = "1", default-features = false, features = [
Expand Down
4 changes: 2 additions & 2 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "stable"
version = "1.89.0"
channel = "nightly-2025-09-21"
components = ["rustfmt", "clippy"]
Copy link
Collaborator

@thedevbirb thedevbirb Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't specify a toolchain to use to build the code, and we don't want to use nightly for compiling. Right now, we want to use it only for the formatting, unless we find a good set of options available with stable only.

Moreover, my editor's LSP does not start because it can't pick up a version from this file.

I'd suggest to revert these changes.

Copy link
Collaborator Author

@ZanCorDX ZanCorDX Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry this was not supposed to be comited!

11 changes: 4 additions & 7 deletions src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};

Expand Down
4 changes: 2 additions & 2 deletions src/forwarder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use crate::{
UtcInstant, WithEncoding,
},
priority::{pchannel, Priority},
tasks::TaskExecutor,
utils::UtcDateTimeHeader as _,
};
use alloy_primitives::Address;
Expand All @@ -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;
Expand Down Expand Up @@ -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
Expand Down
Loading
Loading