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
4 changes: 2 additions & 2 deletions core/lib/dal/src/blocks_dal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2222,12 +2222,12 @@ impl BlocksDal<'_, '_> {
}

pub async fn get_last_executed_priority_op_id(&mut self) -> DalResult<Option<usize>> {
let lat_executed_l1_batch = self
let last_executed_l1_batch = self
.storage
.blocks_dal()
.get_number_of_last_l1_batch_with_tx(L1BatchAggregatedActionType::Execute)
.await?;
let Some(lat_executed_l1_batch) = lat_executed_l1_batch else {
let Some(lat_executed_l1_batch) = last_executed_l1_batch else {
return Ok(None);
};

Expand Down
1 change: 1 addition & 0 deletions core/lib/dal/src/transactions_dal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ impl TransactionsDal<'_, '_> {
Ok(())
}

/// Get L1 transaction hashes by their priority op ids, inclusive.
pub async fn get_l1_transactions_hashes(
&mut self,
start_id: usize,
Expand Down
3 changes: 3 additions & 0 deletions core/node/eth_sender/src/aggregator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,9 @@ impl Aggregator {
.filter(|(first_id, _last_id)| *first_id >= priority_tree_start_index);

let count = batch.header.l1_tx_count as usize;

// If there are priority operations in this batch. We have to prepare a merkle path for them.
// For being always deterministic we build the tree that includes ONLY transcations up to the current batch.
if let Some((first_priority_op_id_in_batch, last_priority_op_id_in_batch)) =
priority_ops_in_batch
{
Expand Down
Loading