Skip to content

fix: resolve 4 panics in mempool and proposer #1014

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

Open
Sertug17 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: resolve 4 panics in mempool and proposer #1014

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions src/consensus/proposer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ impl Proposer for ShardProposer {
let previous_chunk = self.engine.get_last_shard_chunk();
let parent_hash = match previous_chunk {
Some(chunk) => chunk.hash.clone(),
None => vec![0, 32],
None => vec![0; 32],
};

let state_change =
Expand Down Expand Up @@ -582,10 +582,11 @@ impl Proposer for BlockProposer {
let header = block.header.as_ref().unwrap();
let height = header.height.unwrap();

if height != self.get_confirmed_height().increment() {
let confirmed_height = self.get_confirmed_height();
if height != confirmed_height.increment() {
warn!(
shard = height.shard_index,
our_height = height.block_number,
our_height = confirmed_height.block_number,
proposal_height = height.block_number,
"Cannot validate height, not the next height"
);
Expand Down
4 changes: 2 additions & 2 deletions src/mempool/mempool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ impl MessageMempoolExt for proto::Message {
self.hex_hash(),
);
}
todo!();
MempoolKey::new(MempoolMessageKind::UserMessage, 0, self.hex_hash())
}
}

Expand All @@ -326,7 +326,7 @@ impl ValidatorMessageMempoolExt for proto::ValidatorMessage {
} else if let Some(fname_transfer) = &self.fname_transfer {
MempoolKey::new(
MempoolMessageKind::ValidatorMessage,
fname_transfer.proof.as_ref().unwrap().timestamp,
fname_transfer.proof.as_ref().map(|p| p.timestamp).unwrap_or(0),
fname_transfer.id.to_string(),
)
} else if let Some(block_event) = &self.block_event {
Expand Down