Skip to content

Conversation

klkvr
Copy link
Member

@klkvr klkvr commented Oct 16, 2025

Based on #19084

Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is pretty straight forward actually

logic checks out only have one suggestion to sleep for a few seconds before we start doing this

let pool = pool.clone();
let spawner = task_spawner.clone();
let client = client.clone();
task_spawner.spawn(Box::pin(async move {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we perhaps make this a standalone fn, feel like this would be easier to delete later, but maybe doesnt really matter

}
// Remove transaction and sidecar from the pool, both are in memory
// now
let Some(tx) = pool.remove_transactions(vec![tx_hash]).pop() else {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let me add a new api fn for this

Comment on lines +511 to +522
let last_iteration =
client.latest_header().ok().flatten().is_none_or(|header| {
client
.chain_spec()
.is_osaka_active_at_timestamp(header.timestamp())
});
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this exit condition assumes we're making it past the block, if that doesn't happen this loop will keep going, but since we have the timeout this is fine

@klkvr klkvr force-pushed the klkvr/convert-blobs-transition branch from dbdb714 to 178b2e0 Compare October 17, 2025 11:44
@klkvr klkvr changed the title [wip] feat: convert pooled blobs transition feat: convert pooled blobs transition Oct 17, 2025
@klkvr klkvr marked this pull request as ready for review October 17, 2025 11:45
Base automatically changed from klkvr/convert-blobs-rpc to main October 17, 2025 12:06
@klkvr klkvr force-pushed the klkvr/convert-blobs-transition branch from 178b2e0 to 8b7b074 Compare October 17, 2025 13:12
Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

Comment on lines +508 to +511
// Start converting not eaerlier than 4 seconds into current slot to ensure
// that our pool only contains valid transactions for the next block (as
// it's not Osaka yet).
tokio::time::sleep(Duration::from_secs(4)).await;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@github-project-automation github-project-automation bot moved this from Backlog to In Progress in Reth Tracker Oct 17, 2025
@mattsse mattsse added this pull request to the merge queue Oct 17, 2025
Merged via the queue into main with commit a5618f5 Oct 17, 2025
41 checks passed
@mattsse mattsse deleted the klkvr/convert-blobs-transition branch October 17, 2025 17:49
@github-project-automation github-project-automation bot moved this from In Progress to Done in Reth Tracker Oct 17, 2025
@mattsse mattsse added M-changelog This change should be included in the changelog A-tx-pool Related to the transaction mempool E-osaka Related to the Osaka network upgrade labels Oct 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-tx-pool Related to the transaction mempool E-osaka Related to the Osaka network upgrade M-changelog This change should be included in the changelog

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants