refactor(withdrawer): read from block subscription stream and get events on each block #1207
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
Fraser999
reviewed
Jun 26, 2024
crates/astria-bridge-withdrawer/src/bridge_withdrawer/ethereum/watcher.rs
Outdated
Show resolved
Hide resolved
crates/astria-bridge-withdrawer/src/bridge_withdrawer/ethereum/watcher.rs
Outdated
Show resolved
Hide resolved
crates/astria-bridge-withdrawer/src/bridge_withdrawer/ethereum/watcher.rs
Outdated
Show resolved
Hide resolved
| event_tx: mpsc::Sender<(WithdrawalEvent, LogMeta)>, | ||
| from_block: u64, | ||
| async fn sync_from_next_rollup_block_height( | ||
| provider: Arc<Provider<Ws>>, |
There was a problem hiding this comment.
Seems like in almost all places we're using Arc<Provider<Ws>> we can get away with just &Provider<Ws>. Looks like the only place we need the provider wrapped in an Arc is in IAstriaWithdrawer::new, and we can just create one inline there.
There was a problem hiding this comment.
unfortunately it needs to be in an Arc due to the loop here:
loop {
select! {
() = shutdown_token.cancelled() => {
info!("block watcher shutting down");
return Ok(());
}
block = block_rx.next() => {
if let Some(block) = block {
get_and_send_events_at_block(
provider.clone(),
contract_address,
block,
&converter,
&submitter_handle,
)
.await
.wrap_err("failed to get and send events at block")?;
}
}
}
}have to clone it otherwise it gets moved in the previous loop iteration
There was a problem hiding this comment.
You should be able to change get_and_send_events_at_block to take provider: &Provider<Ws> too though (and all the other places taking an Arc)?
crates/astria-bridge-withdrawer/src/bridge_withdrawer/ethereum/watcher.rs
Outdated
Show resolved
Hide resolved
crates/astria-bridge-withdrawer/src/bridge_withdrawer/ethereum/watcher.rs
Show resolved
Hide resolved
crates/astria-bridge-withdrawer/src/bridge_withdrawer/ethereum/watcher.rs
Outdated
Show resolved
Hide resolved
crates/astria-bridge-withdrawer/src/bridge_withdrawer/ethereum/watcher.rs
Outdated
Show resolved
Hide resolved
Fraser999
approved these changes
Jun 27, 2024
steezeburger
added a commit
that referenced
this pull request
Jul 11, 2024
* main: (27 commits) refactor(sequencer): fix prepare proposal metrics (#1211) refactor(bridge-withdrawer): move generated contract bindings to crate (#1237) fix(sequencer) fix wrong metric and remove unused metric (#1240) feat(sequencer): implement transaction fee query (#1196) chore(cli)!: remove unmaintained rollup subcommand (#1235) release(sequencer): 0.14.1 patch release (#1233) feat(sequencer-utils): generate example genesis state (#1224) feat(sequencer): implement abci query for bridge account info (#1189) feat(charts): bridge-withdrawer, smoke test, various chart improvements (#1141) chore(charts): update for new geth update (#1226) chore(chart)!: dusk-8 chart version updates (#1223) release(conductor): fix conductor release version (#1222) release: dusk-8 versions (#1219) fix(core): revert `From` ed25519_consensus types for crypto mod (#1220) Refactor(chart, sequencer): restructure sequencer chart, adjust configs (#1193) refactor(withdrawer): read from block subscription stream and get events on each block (#1207) feat(core): implement with verification key for address builder and crypto improvements (#1218) feat(proto, sequencer)!: use full IBC ICS20 denoms instead of IDs (#1209) chore(chart): update evm chart for new prefix field (#1214) chore: bump penumbra deps (#1216) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
refactor the bridge withdrawer to read only from one block subscription stream instead of a block stream + event streams. then, when a new block is received, the events for that block are batched and sent to the submitter.
Background
this fixes race conditions between the block/event streams and ensures proper batching; ie. that one rollup block = one sequencer tx.
Changes
Testing
unit tests