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
2 changes: 1 addition & 1 deletion based/crates/sequencer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ where
warn!(
"received FCU when Sorting. Sending already Fragged txs back to the pools and syncing to the new head."
);
for tx in frag_seq.txs.into_iter() {
for tx in frag_seq.txs.into_iter().skip(if frag_seq.next_seq == 0 { data.n_force_include } else { 0 }) {
ctx.handle_tx(tx.tx, senders);
}
let start = ctx.db.head_block_number().expect("couldn't get db head block number");
Expand Down
4 changes: 4 additions & 0 deletions based/crates/sequencer/src/sorting/sorting_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ pub struct SortingData<Db> {
pub gas_remaining: u64,
pub payment: U256,
pub txs: Vec<SimulatedTx>,
pub n_force_include: usize,
/// Sort frag until, and then commit
pub until: Instant,
/// We wait until these are back before we apply the next
Expand Down Expand Up @@ -123,6 +124,7 @@ impl<Db> SortingData<Db> {
tof_snapshot,
gas_remaining: seq.gas_remaining,
txs: vec![],
n_force_include: 0,
start_t: Instant::now(),
telemetry: Default::default(),
}
Expand Down Expand Up @@ -321,8 +323,10 @@ impl<Db: DatabaseRead + Database<Error: Into<ProviderError> + Display>> SortingD
.map_err(|_| OpBlockExecutionError::ForceCreate2DeployerFail)?;

let Some(forced_inclusion_txs) = context.payload_attributes.transactions.as_ref() else {
self.n_force_include = 0;
return Ok(());
};
self.n_force_include = forced_inclusion_txs.len();

// Apply must include txs.
for tx in forced_inclusion_txs.iter() {
Expand Down
Loading