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

Jump to bottom

fix(mem_pool): cannot get block_info when it is updating #581

Merged
merged 1 commit into from
Feb 17, 2022
Merged

fix(mem_pool): cannot get block_info when it is updating #581

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
14 changes: 6 additions & 8 deletions crates/mem-pool/src/pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,15 +585,13 @@ impl MemPool {
// estimate next l2block timestamp
let estimated_timestamp = self.provider.estimate_next_blocktime().await?;
// reset mem block state
{
let snapshot = self.store.get_snapshot();
assert_eq!(snapshot.get_tip_block_hash()?, new_tip, "set new snapshot");
let mem_store = MemStore::new(snapshot);
self.mem_pool_state.store(Arc::new(mem_store));
}
// Fix execute_raw_l2transaction panic by updating mem_store first and storing it to mem_pool_state after.
let snapshot = self.store.get_snapshot();
assert_eq!(snapshot.get_tip_block_hash()?, new_tip, "set new snapshot");
let mem_store = MemStore::new(snapshot);
mem_store.update_mem_pool_block_info(self.mem_block.block_info())?;
let mem_block_content = self.mem_block.reset(&new_tip_block, estimated_timestamp);
let snap = self.mem_pool_state.load();
snap.update_mem_pool_block_info(self.mem_block.block_info())?;
self.mem_pool_state.store(Arc::new(mem_store));

// set tip
self.current_tip = (new_tip, new_tip_block.raw().number().unpack());
Expand Down