-
Notifications
You must be signed in to change notification settings - Fork 34
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Structured Concurrency: Part 2 #1216
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bitcoin-da should be updated too
bitcoin-da does not use |
|
I haven't look at the code here yet and maybe it does need some refactoring. However, based on Tokio's documentation for spawn_blocking:
We might be able to pull off cancellation of a blocking task using a cancellation token... i'll look into that. |
0d0c449
to
4a51289
Compare
So there are 2 things a tokio task is doing - to process get_fee_rate (can be a separate task) and to |
|
b21f310
to
667b653
Compare
667b653
to
f6b7eef
Compare
…d-concurrency-pt2
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGMT but please note my comments
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM overall but I believe l1 and l2 sync can also be managed with task manager? I would like to hear your thoughts on this
The reason we don't spawn So, tasks which are running outside the select loop in sequencer / full node / prover would be cancelled by task manager's cancellation token. But the ones running inside would be cancelled by the |
* Structured concurrency: Part 1 (#1214) * Implement managed tasks for SubscriptionManager * Fix clippy * Add comment about trace task * Use broadcast instead of mpsc for l2 blocks events * Fix typo (#1246) * Structured Concurrency: Part 2 (#1216) * Implement managed tasks for SubscriptionManager * Fix clippy * Add comment about trace task * Use broadcast instead of mpsc for l2 blocks events * Fix spawns in DaService * Add TaskManager * Use task manager in sequencer * Document TaskManager * Handle shutdown event * Use TaskTracker * Add comment about using a cancellation token * Use JoinHandles instead of TaskTracker * Use TaskManager in fullnode and prover * Improve bitcoin-da service * Force spawned tasks to accept a cancellation token * Use biased polling * Satisfy clippy * Address PR feedback * Fix checks * Pin foundry (#1253) * Pin foundary * Add comment * Remove puclihs mock da block script * Use default block time on error (#1244) * Use default block time on error * Constant target_block_time * Remove import * Dump logs and cleanup on assert failures (#1252) * Fix estiamte gas l1 fee issue when metamask max amount is selected (#1261) * Fix estiamte gas l1 fee issue when metamask max amount is selected * Fix tests * Remove unnecessary comment * Fix hive (#1263) * Fix configs * Remove publish mock block from docker * Update port for hive * Rename config in hive * Refactor eth estimate gas l1 fee issue (#1264) * Refactor eth estimate gas l1 fee issue * Nits * Fix bug * Refactor * Do not ignore resources * Fix --------- Co-authored-by: Roman Proskuryakoff <[email protected]> * Pruning skeleton (#1229) * Implement managed tasks for SubscriptionManager * Fix clippy * Add comment about trace task * Use broadcast instead of mpsc for l2 blocks events * Fix spawns in DaService * Add TaskManager * Use task manager in sequencer * Document TaskManager * Handle shutdown event * Use TaskTracker * Add comment about using a cancellation token * Use JoinHandles instead of TaskTracker * Use TaskManager in fullnode and prover * Improve bitcoin-da service * Force spawned tasks to accept a cancellation token * Use biased polling * Satisfy clippy * WIP * Add pruning tables * Pruning skeleton implementation * Use pruner in nodes * Use biased polling based on order * WIP * Fix how config is done * Derive default * Add logs * Let the tasks finish without panicing * Use pruning config in fullnode and prover * Add simple run test * Use option instead of PruningMode * Unneccessary changes * l2_receiver * Cleanup prints * Use last pruned block in calculation * Implement pruning criteria * Lint and add comment * Set the last_pruned_block to up_to_block value * Don't store config internally * Remove from constructor * Should not change * Move config value * Remove pruning from sequencer / prover * Derive SequencerClient (#1269) * Derive SequencerClient * Renames * Lint * Improve estimate gas and create access list rpcs (#1265) * Remove unnecessary transact_to conversion * unwrap_or_default * More concise block_env initialization * Actually get highest gas limit from request and block env * One liner set * Allow unused * Cleanup prepare_call_env * Fix tests & lint * Replace unwrap * Set state to block in eth_call * Consume request in prepare_call_env * Lint * Set state before reading config * Remove unnecessary clone * Replace allow unused with feature native gate * Add sys txs to evm tests (#1255) * modify config_push_contracts * modify call_multiple_test * modify tests in call_tests.rs * moving common functions to utils.rs * minor fixes * updated lock files * modify tests --------- Co-authored-by: Esad Yusuf Atik <[email protected]> * make prover config arg not optional (#1278) * Pin to 27.1 (#1279) * E2E tests using citrea-e2e (#1277) * E2E tests using citrea-e2e * Lint * Set CITREA path * With github.workspace * Target citrea-e2e main * Update citrea-e2e rev * Use debug build * Update citrea-e2e * Prover generate input rpc (#1280) * WIP Implement prover generate rpcg * It compiles but stf is modified * Context * Fix Context: Send * Merge fix * Move function from common to prover * Remove code duplicate and unnecessary log * Add optional parameter to break commitments into groups * Return input as string --------- Co-authored-by: Roman Proskuryakoff <[email protected]> * Move node configs to citrea-common (#1286) * move node configs to a seperate crate * fix udeps * remove native feature * move SequencerConfig * move config to citrea-common * fix use statements * Update e2e test framework and fix tests (#1305) * Update e2e test framework and fix tests * Fix bug * Update ci binary env key * Test if new fix works * Update bitcoincore-rpc version * Dprint * Try against fix prover config rev * Target main HEAD rev --------- Co-authored-by: jfldde <[email protected]> * build and publish a new image for every commit to the nightly branch (#1309) * Get fee recommendation from mempool space (#1302) * Get fee recommendation from mempool space * Fix bug * Construct mempool space endpoint by network --------- Co-authored-by: Esad Yusuf Atik <[email protected]> * new path fix for nightly (#1310) * Enable pending block tag in simulation endpoints (#1303) * treat pending tag same as latest * fix lint * return new sealed block for pending * handle pending tag externally * revert enabling pending in some endpoints * get blockenv instead of sealed block * address review comments * implement tests for eth_call, eth_estimateGas, eth_createAccessList pending blocks * rename tests --------- Co-authored-by: eyusufatik <[email protected]> * Implement state and block overrides (#1270) * Implement state and block overrides * Update comment * apply_block_overrides func * apply_state_overrides func * Use a single func for replacing account storage * Clippy * Address feedback Use Reth's BlockOverrides with saturating_to to convert back to u64 * Test for block overrides * Test for state overrides * Comment tests * Create a fresh working set * Remove box * remove alloy-serde --------- Co-authored-by: eyusufatik <[email protected]> * Use spawn_blocking for da queue (#1311) * Fetch smart fee only if none (#1312) * update run doc and changelog (#1315) --------- Co-authored-by: Rakan Al-Huneiti <[email protected]> Co-authored-by: Ahmet Yazıcı <[email protected]> Co-authored-by: Erce Can Bektüre <[email protected]> Co-authored-by: jfldde <[email protected]> Co-authored-by: Erce Can Bektüre <[email protected]> Co-authored-by: Roman Proskuryakoff <[email protected]> Co-authored-by: Ege Okan Ünaldı <[email protected]> Co-authored-by: Çetin <[email protected]>
* Structured concurrency: Part 1 (#1214) * Implement managed tasks for SubscriptionManager * Fix clippy * Add comment about trace task * Use broadcast instead of mpsc for l2 blocks events * Fix typo (#1246) * Structured Concurrency: Part 2 (#1216) * Implement managed tasks for SubscriptionManager * Fix clippy * Add comment about trace task * Use broadcast instead of mpsc for l2 blocks events * Fix spawns in DaService * Add TaskManager * Use task manager in sequencer * Document TaskManager * Handle shutdown event * Use TaskTracker * Add comment about using a cancellation token * Use JoinHandles instead of TaskTracker * Use TaskManager in fullnode and prover * Improve bitcoin-da service * Force spawned tasks to accept a cancellation token * Use biased polling * Satisfy clippy * Address PR feedback * Fix checks * Pin foundry (#1253) * Pin foundary * Add comment * Remove puclihs mock da block script * Use default block time on error (#1244) * Use default block time on error * Constant target_block_time * Remove import * Dump logs and cleanup on assert failures (#1252) * Fix estiamte gas l1 fee issue when metamask max amount is selected (#1261) * Fix estiamte gas l1 fee issue when metamask max amount is selected * Fix tests * Remove unnecessary comment * Fix hive (#1263) * Fix configs * Remove publish mock block from docker * Update port for hive * Rename config in hive * Refactor eth estimate gas l1 fee issue (#1264) * Refactor eth estimate gas l1 fee issue * Nits * Fix bug * Refactor * Do not ignore resources * Fix --------- Co-authored-by: Roman Proskuryakoff <[email protected]> * Pruning skeleton (#1229) * Implement managed tasks for SubscriptionManager * Fix clippy * Add comment about trace task * Use broadcast instead of mpsc for l2 blocks events * Fix spawns in DaService * Add TaskManager * Use task manager in sequencer * Document TaskManager * Handle shutdown event * Use TaskTracker * Add comment about using a cancellation token * Use JoinHandles instead of TaskTracker * Use TaskManager in fullnode and prover * Improve bitcoin-da service * Force spawned tasks to accept a cancellation token * Use biased polling * Satisfy clippy * WIP * Add pruning tables * Pruning skeleton implementation * Use pruner in nodes * Use biased polling based on order * WIP * Fix how config is done * Derive default * Add logs * Let the tasks finish without panicing * Use pruning config in fullnode and prover * Add simple run test * Use option instead of PruningMode * Unneccessary changes * l2_receiver * Cleanup prints * Use last pruned block in calculation * Implement pruning criteria * Lint and add comment * Set the last_pruned_block to up_to_block value * Don't store config internally * Remove from constructor * Should not change * Move config value * Remove pruning from sequencer / prover * Derive SequencerClient (#1269) * Derive SequencerClient * Renames * Lint * Improve estimate gas and create access list rpcs (#1265) * Remove unnecessary transact_to conversion * unwrap_or_default * More concise block_env initialization * Actually get highest gas limit from request and block env * One liner set * Allow unused * Cleanup prepare_call_env * Fix tests & lint * Replace unwrap * Set state to block in eth_call * Consume request in prepare_call_env * Lint * Set state before reading config * Remove unnecessary clone * Replace allow unused with feature native gate * Add sys txs to evm tests (#1255) * modify config_push_contracts * modify call_multiple_test * modify tests in call_tests.rs * moving common functions to utils.rs * minor fixes * updated lock files * modify tests --------- Co-authored-by: Esad Yusuf Atik <[email protected]> * make prover config arg not optional (#1278) * Pin to 27.1 (#1279) * E2E tests using citrea-e2e (#1277) * E2E tests using citrea-e2e * Lint * Set CITREA path * With github.workspace * Target citrea-e2e main * Update citrea-e2e rev * Use debug build * Update citrea-e2e * Prover generate input rpc (#1280) * WIP Implement prover generate rpcg * It compiles but stf is modified * Context * Fix Context: Send * Merge fix * Move function from common to prover * Remove code duplicate and unnecessary log * Add optional parameter to break commitments into groups * Return input as string --------- Co-authored-by: Roman Proskuryakoff <[email protected]> * Move node configs to citrea-common (#1286) * move node configs to a seperate crate * fix udeps * remove native feature * move SequencerConfig * move config to citrea-common * fix use statements * Update e2e test framework and fix tests (#1305) * Update e2e test framework and fix tests * Fix bug * Update ci binary env key * Test if new fix works * Update bitcoincore-rpc version * Dprint * Try against fix prover config rev * Target main HEAD rev --------- Co-authored-by: jfldde <[email protected]> * build and publish a new image for every commit to the nightly branch (#1309) * Get fee recommendation from mempool space (#1302) * Get fee recommendation from mempool space * Fix bug * Construct mempool space endpoint by network --------- Co-authored-by: Esad Yusuf Atik <[email protected]> * new path fix for nightly (#1310) * Enable pending block tag in simulation endpoints (#1303) * treat pending tag same as latest * fix lint * return new sealed block for pending * handle pending tag externally * revert enabling pending in some endpoints * get blockenv instead of sealed block * address review comments * implement tests for eth_call, eth_estimateGas, eth_createAccessList pending blocks * rename tests --------- Co-authored-by: eyusufatik <[email protected]> * Implement state and block overrides (#1270) * Implement state and block overrides * Update comment * apply_block_overrides func * apply_state_overrides func * Use a single func for replacing account storage * Clippy * Address feedback Use Reth's BlockOverrides with saturating_to to convert back to u64 * Test for block overrides * Test for state overrides * Comment tests * Create a fresh working set * Remove box * remove alloy-serde --------- Co-authored-by: eyusufatik <[email protected]> * Use spawn_blocking for da queue (#1311) * Fetch smart fee only if none (#1312) * update run doc and changelog (#1315) --------- Co-authored-by: Rakan Al-Huneiti <[email protected]> Co-authored-by: Ahmet Yazıcı <[email protected]> Co-authored-by: Erce Can Bektüre <[email protected]> Co-authored-by: jfldde <[email protected]> Co-authored-by: Erce Can Bektüre <[email protected]> Co-authored-by: Roman Proskuryakoff <[email protected]> Co-authored-by: Ege Okan Ünaldı <[email protected]> Co-authored-by: Çetin <[email protected]>
Description
Related to #1214 so this is to be merged AFTER.
This PR:
TaskManager
: Callingspawn
using the task manager would force the future-to-be-spawned to accept a cancellation token so that all tasks using the task manager are cancellable.tokio::spawn
for each transaction queue call with a single worker.TaskManager
.ctrl-c
event would be sufficient sincetokio::select
is going to execute thectrl-c
signal to stop all current tasks. This means that no other branch oftokio::select
is going to be executed concurrently.TaskManager
.TaskManager
.Task cancellation
For tasks which are spawned by the task manager, all tasks are expected to use the
cancellation_token
. Most of the uses of the token would come inside thetokio::select
. This means that if all futures inside this select are running in a single task, notifying the task with the cancellation token means that we have to finish processing whatever the task is currently doing in-hand and return control back totokio::select
in order for the cancellation token to be seen ascancelled
and then the component currently running is stopped.Linked Issues
tokio::spawn
s with a task manager #923Refs: