Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 0 additions & 30 deletions crates/rbuilder-operator/src/clickhouse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ pub struct BlockRow {

pub used_bundle_hashes: Vec<String>,
pub used_bundle_uuids: Vec<String>,
pub used_sbundles_hashes: Vec<String>,
pub delayed_payment_sources: Vec<String>,

#[serde(with = "vec_u256")]
Expand Down Expand Up @@ -178,33 +177,6 @@ fn offset_date_to_clickhouse_timestamp(date: OffsetDateTime) -> i64 {
(date.unix_timestamp_nanos() / 1000) as i64
}

fn get_used_sbundles_hashes(built_block_trace: &BuiltBlockTrace) -> Vec<String> {
built_block_trace
.included_orders
.iter()
.flat_map(|exec_result| {
if let Order::ShareBundle(sbundle) = &exec_result.order {
// don't like having special cases (merged vs not merged), can we improve this?
if sbundle.is_merged_order() {
exec_result
.original_order_ids
.iter()
.map(|id| id.to_string())
.collect()
} else if exec_result.tx_infos.is_empty() {
// non merged empty execution sbundle
vec![]
} else {
// non merged non empty execution sbundle
vec![exec_result.order.id().to_string()]
}
} else {
Vec::new()
}
})
.collect()
}

const MEV_VIRTUAL_BLOCKER_SOURCE: &str = "mev_blocker";
const MEV_VIRTUAL_ADDRESS: Address = Address::ZERO;

Expand Down Expand Up @@ -280,7 +252,6 @@ impl BidObserver for BuiltBlocksWriter {
used_bundle_uuids.push(bundle.uuid.to_string());
}
}
let used_sbundles_hashes = get_used_sbundles_hashes(&built_block_trace);
let (delayed_payment_sources, delayed_payment_values, delayed_payment_addresses) =
get_delayed_payments(&built_block_trace);
let delayed_payment_addresses = delayed_payment_addresses
Expand Down Expand Up @@ -354,7 +325,6 @@ impl BidObserver for BuiltBlocksWriter {
block_value: Some(submit_trace.value),
used_bundle_hashes,
used_bundle_uuids,
used_sbundles_hashes,
delayed_payment_sources,
delayed_payment_values,
delayed_payment_addresses,
Expand Down
36 changes: 1 addition & 35 deletions crates/rbuilder-primitives/src/fmt.rs
Original file line number Diff line number Diff line change
@@ -1,42 +1,12 @@
use std::fmt::Write;

use super::{Order, ShareBundleBody, ShareBundleInner, ShareBundleTx, SimValue, SimulatedOrder};
use super::{Order, SimValue, SimulatedOrder};

/// Writes indent spaces
pub fn write_indent<Buffer: Write>(indent: usize, buf: &mut Buffer) -> std::fmt::Result {
buf.write_str(&format!("{: <1$}", "", indent))
}

pub fn write_share_bundle_tx<Buffer: Write>(
indent: usize,
buf: &mut Buffer,
tx: &ShareBundleTx,
) -> std::fmt::Result {
write_indent(indent, buf)?;
buf.write_str(&format!(
"TX {} Rev {:?} val {}\n",
tx.tx.hash(),
tx.revert_behavior,
tx.tx.value()
))
}

pub fn write_share_bundle_inner<Buffer: Write>(
indent: usize,
buf: &mut Buffer,
inner: &ShareBundleInner,
) -> std::fmt::Result {
write_indent(indent, buf)?;
buf.write_str(&format!("Inner can skip {} \n", inner.can_skip))?;
for item in &inner.body {
match item {
ShareBundleBody::Tx(tx) => write_share_bundle_tx(indent + 1, buf, tx)?,
ShareBundleBody::Bundle(sb) => write_share_bundle_inner(indent + 1, buf, sb)?,
}
}
Ok(())
}

pub fn write_order<Buffer: Write>(
indent: usize,
buf: &mut Buffer,
Expand All @@ -50,10 +20,6 @@ pub fn write_order<Buffer: Write>(
tx.tx_with_blobs.hash(),
tx.tx_with_blobs.value()
)),
Order::ShareBundle(sb) => {
buf.write_str(&format!("ShB {:?}\n", sb.hash))?;
write_share_bundle_inner(indent + 1, buf, &sb.inner_bundle)
}
}
}

Expand Down
Loading
Loading