Skip to content
Merged
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
8 changes: 4 additions & 4 deletions crates/op-rbuilder/src/builders/flashblocks/best_txs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@ where
continue;
}

let flashblock_number_min = tx.flashblock_number_min();
let flashblock_number_max = tx.flashblock_number_max();
let min_flashblock_number = tx.min_flashblock_number();
let max_flashblock_number = tx.max_flashblock_number();

// Check min flashblock requirement
if let Some(min) = flashblock_number_min
if let Some(min) = min_flashblock_number
&& self.current_flashblock_number < min
{
continue;
}

// Check max flashblock requirement
if let Some(max) = flashblock_number_max
if let Some(max) = max_flashblock_number
&& self.current_flashblock_number > max
{
debug!(
Expand Down
40 changes: 20 additions & 20 deletions crates/op-rbuilder/src/mock_tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ impl MockFbTransactionFactory {
self.validated(MockFbTransaction {
inner: MockTransaction::legacy(),
reverted_hashes: None,
flashblock_number_max: None,
flashblock_number_min: None,
max_flashblock_number: None,
min_flashblock_number: None,
})
}

Expand All @@ -76,8 +76,8 @@ impl MockFbTransactionFactory {
self.validated(MockFbTransaction {
inner: MockTransaction::legacy(),
reverted_hashes: None,
flashblock_number_max: max,
flashblock_number_min: min,
max_flashblock_number: max,
min_flashblock_number: min,
})
}

Expand All @@ -86,8 +86,8 @@ impl MockFbTransactionFactory {
self.validated(MockFbTransaction {
inner: MockTransaction::eip1559(),
reverted_hashes: None,
flashblock_number_max: None,
flashblock_number_min: None,
max_flashblock_number: None,
min_flashblock_number: None,
})
}

Expand All @@ -96,8 +96,8 @@ impl MockFbTransactionFactory {
self.validated(MockFbTransaction {
inner: MockTransaction::eip4844(),
reverted_hashes: None,
flashblock_number_max: None,
flashblock_number_min: None,
max_flashblock_number: None,
min_flashblock_number: None,
})
}
}
Expand All @@ -110,8 +110,8 @@ pub struct MockFbTransaction {
/// transaction is not a bundle, this is `None`.
pub reverted_hashes: Option<Vec<B256>>,

pub flashblock_number_min: Option<u64>,
pub flashblock_number_max: Option<u64>,
pub min_flashblock_number: Option<u64>,
pub max_flashblock_number: Option<u64>,
}

/// A validated transaction in the transaction pool, using [`MockTransaction`] as the transaction
Expand All @@ -135,8 +135,8 @@ impl PoolTransaction for MockFbTransaction {
Self {
inner: pooled.into(),
reverted_hashes: None,
flashblock_number_min: None,
flashblock_number_max: None,
min_flashblock_number: None,
max_flashblock_number: None,
}
}

Expand Down Expand Up @@ -433,21 +433,21 @@ pub type PooledTransactionVariant =
alloy_consensus::EthereumTxEnvelope<TxEip4844WithSidecar<BlobTransactionSidecarVariant>>;

impl MaybeFlashblockFilter for MockFbTransaction {
fn with_flashblock_number_min(mut self, flashblock_number_min: Option<u64>) -> Self {
self.flashblock_number_min = flashblock_number_min;
fn with_min_flashblock_number(mut self, min_flashblock_number: Option<u64>) -> Self {
self.min_flashblock_number = min_flashblock_number;
self
}

fn with_flashblock_number_max(mut self, flashblock_number_max: Option<u64>) -> Self {
self.flashblock_number_max = flashblock_number_max;
fn with_max_flashblock_number(mut self, max_flashblock_number: Option<u64>) -> Self {
self.max_flashblock_number = max_flashblock_number;
self
}

fn flashblock_number_min(&self) -> Option<u64> {
self.flashblock_number_min
fn min_flashblock_number(&self) -> Option<u64> {
self.min_flashblock_number
}

fn flashblock_number_max(&self) -> Option<u64> {
self.flashblock_number_max
fn max_flashblock_number(&self) -> Option<u64> {
self.max_flashblock_number
}
}
Loading
Loading