Skip to content

chore: Sharebundle cleanup #889

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

Open
chirag-bgh wants to merge 1 commit into
base: develop
Choose a base branch
from
+3 −13
Open

chore: Sharebundle cleanup #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion crates/rbuilder-primitives/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ pub struct Nonce {
pub optional: bool,
}

/// Information regarding a new/update replaceable Bundle/ShareBundle.
/// Information regarding a new/update replaceable Bundle.
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct ReplacementData<KeyType> {
pub key: KeyType,
Expand Down
1 change: 0 additions & 1 deletion crates/rbuilder/src/backtest/redistribute/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ pub enum InclusionChange {
pub enum ExtendedOrderId {
Tx(B256),
Bundle { uuid: Uuid, hash: B256 },
ShareBundle(B256),
}

impl ExtendedOrderId {
Expand Down
8 changes: 0 additions & 8 deletions crates/rbuilder/src/building/order_commit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,14 +443,6 @@ pub struct ReservedPayout {
pub base_fee: U256,
}

#[derive(Debug, Clone)]
pub struct ShareBundleCommitResult {
pub bundle_ok: BundleOk,
pub coinbase_diff_before_payouts: U256,
pub total_payouts_promissed: U256,
pub payouts_promissed: HashMap<Address, ReservedPayout>,
}

#[derive(thiserror::Error, Debug)]
pub enum CriticalCommitOrderError {
#[error("Reth error: {0}")]
Expand Down
3 changes: 1 addition & 2 deletions crates/rbuilder/src/live_builder/order_input/order_replacement_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use super::{order_sink::OrderSink, replaceable_order_sink::ReplaceableOrderSink}
/// honor the replacement with highest `sequence_number`.
///
/// Although all the structs and fields say "bundle" we always refer to Bundle
/// or ShareBundle.
///
/// For each bundle we keep the current [`BundleReplacementState`]
#[derive(Debug)]
Expand Down Expand Up @@ -84,7 +83,7 @@ struct ValidBundleState {
pub order_id: OrderId,
}

/// Last state we have for a replaceable ShareBundle.
/// Last state we have for a replaceable Bundle.
/// It updates itself on new orders.
/// On new seq:
/// Valid upgrades if seq > current.
Expand Down
2 changes: 1 addition & 1 deletion docs/LIVEBUILDER_DATAFLOW.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Although this stage is referred to as "building," it doesn't completely build th
The block building process begins with a flow of `ReplaceableOrderPoolCommand`s arriving from the `OrderPool` (subscribed via an OrderPoolSubscriber). These operations can be:
- Adding a new order (`ReplaceableOrderPoolCommand::Order`)
- Replacing an existing order (`ReplaceableOrderPoolCommand::Order` for an existing uuid)
- Canceling an order (`ReplaceableOrderPoolCommand::CancelBundle`/`ReplaceableOrderPoolCommand::CancelShareBundle`)
- Canceling an order (`ReplaceableOrderPoolCommand::CancelBundle`)

Throughout the order pipeline, we consistently use these commands instead of plain `Orders` since the entire pipeline must handle updates and cancellations.

Expand Down