Skip to content
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.

Sign up for GitHub

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

fix(pipe): init barrier in new_pipe_exec_layer_api #19

Merged
merged 1 commit into from
Jan 2, 2025
Merged

fix(pipe): init barrier in new_pipe_exec_layer_api #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 16 additions & 29 deletions crates/pipe-exec-layer-ext-v2/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,6 @@ struct PipeBarrier<Result> {
inner: Mutex<PipeBarrierInner<Result>>,
}

impl<Result> Default for PipeBarrier<Result> {
fn default() -> Self {
Self {
inner: Mutex::new(PipeBarrierInner {
block_number: 0,
result: None,
waiters: Vec::new(),
closed: false,
}),
}
}
}

#[derive(Debug)]
struct PipeBarrierInner<Result> {
block_number: u64,
Expand All @@ -113,6 +100,17 @@ struct PipeBarrierInner<Result> {
}

impl<Result> PipeBarrier<Result> {
fn new(block_number: u64, result: Result) -> Self {
Self {
inner: Mutex::new(PipeBarrierInner {
block_number,
result: Some(result),
waiters: Vec::new(),
closed: false,
}),
}
}

/// Wait until the block number is reached and return the result.
/// Returns `None` if the barrier has been closed.
async fn wait(&self, block_number: u64) -> Option<Result> {
Expand Down Expand Up @@ -167,19 +165,7 @@ impl<Result> PipeBarrier<Result> {
}

impl<Storage: GravityStorage> PipeExecService<Storage> {
async fn run(mut self, latest_block_header: Header, latest_block_hash: B256) {
let mut latest_block_number = latest_block_header.number;
self.core
.execute_block_barrier
.notify(latest_block_number, latest_block_header)
.await
.unwrap();
self.core
.make_canonical_barrier
.notify(latest_block_number, latest_block_hash)
.await
.unwrap();

async fn run(mut self, mut latest_block_number: u64) {
loop {
let ordered_block = match self.ordered_block_rx.recv().await {
Some(ordered_block) => ordered_block,
Expand Down Expand Up @@ -471,6 +457,7 @@ pub fn new_pipe_exec_layer_api<Storage: GravityStorage>(
let (verified_block_hash_tx, verified_block_hash_rx) = tokio::sync::mpsc::unbounded_channel();
let (event_tx, event_rx) = tokio::sync::mpsc::unbounded_channel();

let latest_block_number = latest_block_header.number;
let service = PipeExecService {
core: Arc::new(Core {
executed_block_hash_tx,
Expand All @@ -479,12 +466,12 @@ pub fn new_pipe_exec_layer_api<Storage: GravityStorage>(
evm_config: EthEvmConfig::new(chain_spec.clone()),
chain_spec,
event_tx,
execute_block_barrier: PipeBarrier::default(),
make_canonical_barrier: PipeBarrier::default(),
execute_block_barrier: PipeBarrier::new(latest_block_number, latest_block_header),
make_canonical_barrier: PipeBarrier::new(latest_block_number, latest_block_hash),
}),
ordered_block_rx,
};
tokio::spawn(service.run(latest_block_header, latest_block_hash));
tokio::spawn(service.run(latest_block_number));

PIPE_EXEC_LAYER_EXT.get_or_init(|| PipeExecLayerExt { event_rx: Mutex::new(event_rx) });

Expand Down
Loading