github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

consensus/state: Have consensus nodes update local state on fin blocks.

Browse Source
This commit is contained in:
parazyd
2022-05-01 09:21:36 +02:00
parent 695d7ed084
commit 0d708d935b
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/consensus/proto/protocol_proposal.rs
View File

@@ -75,7 +75,7 @@ impl ProtocolProposal {
debug!("Node did not vote for the proposed block.");
} else {
let vote = v.unwrap();
match self.state.write().await.receive_vote(&vote) {
match self.state.write().await.receive_vote(&vote).await {
Ok(_) => {}
Err(e) => {
error!("receive_vote() error: {}", e);

15
src/consensus/proto/protocol_vote.rs
View File

@@ -57,13 +57,14 @@ impl ProtocolVote {
let vote_copy = (*vote).clone();
let (voted, to_broadcast) = match self.state.write().await.receive_vote(&vote_copy) {
Ok(v) => v,
Err(e) => {
error!("handle_receive_vote(): receive_vote() fail: {}", e);
continue
}
};
let (voted, to_broadcast) =
match self.state.write().await.receive_vote(&vote_copy).await {
Ok(v) => v,
Err(e) => {
error!("handle_receive_vote(): receive_vote() fail: {}", e);
continue
}
};
if voted {
match self.consensus_p2p.broadcast(vote_copy).await {

13
src/consensus/state.rs
View File

@@ -490,7 +490,7 @@ impl ValidatorState {
/// removed from the node's unconfirmed tx list.
/// Finally, we check if the notarization of the proposal can finalize
/// parent proposals in its chain.
pub fn receive_vote(&mut self, vote: &Vote) -> Result<(bool, Option<Vec<BlockInfo>>)> {
pub async fn receive_vote(&mut self, vote: &Vote) -> Result<(bool, Option<Vec<BlockInfo>>)> {
let current_epoch = self.current_epoch();
// Node hasn't started participating
match self.participating {
@@ -578,7 +578,7 @@ impl ValidatorState {
if !proposal.block.sm.notarized && proposal.block.sm.votes.len() > (2 * node_count / 3) {
debug!("receive_vote(): Notarized a block");
proposal.block.sm.notarized = true;
match self.chain_finalization(chain_idx) {
match self.chain_finalization(chain_idx).await {
Ok(v) => {
to_broadcast = v;
}
@@ -627,7 +627,7 @@ impl ValidatorState {
/// blockchain) all proposals up to the middle block.
/// When fork chain proposals are finalized, the rest of fork chains not
/// starting by those proposals are removed.
pub fn chain_finalization(&mut self, chain_index: i64) -> Result<Vec<BlockInfo>> {
pub async fn chain_finalization(&mut self, chain_index: i64) -> Result<Vec<BlockInfo>> {
let chain = &mut self.consensus.proposals[chain_index as usize];
if chain.proposals.len() < 3 {
@@ -674,6 +674,13 @@ impl ValidatorState {
};
for proposal in &finalized {
// TODO: Is this the right place? We're already doing this in protocol_sync.
// TODO: These state transitions have already been checked.
let canon_state_clone = self.state_machine.lock().await.clone();
let mem_st = MemoryState::new(canon_state_clone);
let state_updates = ValidatorState::validate_state_transitions(mem_st, &proposal.txs)?;
self.update_canon_state(state_updates, None).await?;
self.remove_txs(proposal.txs.clone())?;
}

2
src/consensus/task/proposal.rs
View File

@@ -87,7 +87,7 @@ pub async fn proposal_task(p2p: net::P2pPtr, sync_p2p: net::P2pPtr, state: Valid
debug!("proposal_task(): Node did not vote for the proposed block");
} else {
let vote = v.unwrap();
let result = state.write().await.receive_vote(&vote);
let result = state.write().await.receive_vote(&vote).await;
match result {
Ok((_, to_broadcast)) => {
info!(target: "consensus", "Vote saved successfully.");