feat: update retry mechanism using tower::Service #358
+1,346
−976
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
greged93
commented
Oct 13, 2025
Comment on lines
644
to
645
| async fn get_n_l1_messages( | ||
| &self, |
There was a problem hiding this comment.
Returning a stream which captured the lifetime of the TX caused lifetime issues when trying to return the stream from the database call.
CodSpeed Performance ReportMerging #358 will degrade performances by 13.34%Comparing Summary
Benchmarks breakdown
|
frisitano
reviewed
Oct 15, 2025
Comment on lines
+297
to
+304
| self.database | ||
| .tx_mut(move |tx| { | ||
| let block_info = block_info.clone(); | ||
| async move { | ||
| tx.update_l1_messages_from_l2_blocks(vec![block_info.clone()]).await | ||
| } | ||
| }) | ||
| .await?; |
There was a problem hiding this comment.
Suggested change
| self.database | |
| .tx_mut(move |tx| { | |
| let block_info = block_info.clone(); | |
| async move { | |
| tx.update_l1_messages_from_l2_blocks(vec![block_info.clone()]).await | |
| } | |
| }) | |
| .await?; | |
| self.database | |
| .update_l1_messages_from_l2_blocks(vec![block_info.clone()]) | |
| .await?; |
| let l1_processed = db_tx.get_processed_l1_block_number().await?; | ||
| let (l1_latest, l1_finalized, l1_processed) = self | ||
| .database | ||
| .tx_mut(|tx| async move { |
There was a problem hiding this comment.
Suggested change
| .tx_mut(|tx| async move { | |
| .tx(|tx| async move { |
Comment on lines
+493
to
+499
| let consolidation_outcome = batch_consolidation_outcome.clone(); | ||
| self.database | ||
| .tx_mut(move |tx| { | ||
| let consolidation_outcome = consolidation_outcome.clone(); | ||
| async move { tx.insert_batch_consolidation_outcome(consolidation_outcome).await } | ||
| }) | ||
| .await?; |
There was a problem hiding this comment.
Suggested change
| let consolidation_outcome = batch_consolidation_outcome.clone(); | |
| self.database | |
| .tx_mut(move |tx| { | |
| let consolidation_outcome = consolidation_outcome.clone(); | |
| async move { tx.insert_batch_consolidation_outcome(consolidation_outcome).await } | |
| }) | |
| .await?; | |
| // Insert the batch consolidation outcome into the database. | |
| self.database | |
| .insert_batch_consolidation_outcome(batch_consolidation_outcome.clone()) | |
| .await?; |
Comment on lines
+511
to
+516
| let block_number = *block_number; | ||
| self.database | ||
| .tx_mut(move |tx| async move { | ||
| tx.set_processed_l1_block_number(block_number).await | ||
| }) | ||
| .await?; |
There was a problem hiding this comment.
Suggested change
| let block_number = *block_number; | |
| self.database | |
| .tx_mut(move |tx| async move { | |
| tx.set_processed_l1_block_number(block_number).await | |
| }) | |
| .await?; | |
| self.database.set_processed_l1_block_number(*block_number).await?; |
Comment on lines
+551
to
+552
| self.database | ||
| .tx_mut(move |tx| async move { tx.set_latest_l1_block_number(block_number).await }) |
There was a problem hiding this comment.
Suggested change
| self.database | |
| .tx_mut(move |tx| async move { tx.set_latest_l1_block_number(block_number).await }) | |
| self.database.set_latest_l1_block_number(block_number).await?; |
Comment on lines
+1200
to
+1208
| let count = l1_message_hashes.len(); | ||
| let mut database_messages = self | ||
| .database | ||
| .tx(move |tx| async move { | ||
| tx.get_n_l1_messages(Some(L1MessageKey::block_number(first_block_number)), count) | ||
| .await | ||
| }) | ||
| .await? | ||
| .into_iter(); |
There was a problem hiding this comment.
Use the method directly.
| Ok::<_, ChainOrchestratorError>(input) | ||
| let mut input = database | ||
| .tx(move |tx| async move { | ||
| tx.get_n_l1_messages(Some(L1MessageKey::from_queue_index(index)), 1).await |
There was a problem hiding this comment.
use the method directly.
Comment on lines
+49
to
+51
| tx.map_err(|_| DatabaseError::CommitFailed)?.commit().await?; | ||
| } else { | ||
| tx.map_err(|_| DatabaseError::RollbackFailed)?.rollback().await?; |
There was a problem hiding this comment.
nit, should we execute .commit() / .rollback() before we map_err(..)? No particular difference but it's more readable. What do you think?
Comment on lines
+264
to
+266
| db.prepare_on_startup(chain_spec.genesis_hash()).await?; | ||
| let l2_head_block_number = db.get_l2_head_block_number().await?; | ||
| db.purge_l1_message_to_l2_block_mappings(Some(l2_head_block_number + 1)).await?; |
There was a problem hiding this comment.
Should we combine this in a transaction?
|
|
||
| // Update the head block info if available and ahead of finalized. | ||
| let l2_head_block_number = db.tx().await?.get_l2_head_block_number().await?; | ||
| let l2_head_block_number = db.get_l2_head_block_number().await?; |
There was a problem hiding this comment.
should we combine this with the transaction above?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.