Skip to content

Refactor hashing on VoteOn #1796

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

Merged
foriequal0 merged 3 commits into from
Sep 26, 2019
Merged

Refactor hashing on VoteOn #1796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46fff8e
Relplace message_info_rlp, message_hash with VoteOn::hash
foriequal0 Sep 21, 2019
91ee242
Make sign function hash argument by itself
foriequal0 Sep 21, 2019
97e12f5
Merge branch 'master' into refactor/vote-hash
mergify[bot] Sep 26, 2019
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
3 changes: 1 addition & 2 deletions core/src/consensus/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ pub use self::null_engine::NullEngine;
pub use self::simple_poa::SimplePoA;
pub use self::solo::Solo;
pub use self::tendermint::{
message_info_rlp, ConsensusMessage, Height, Step, Tendermint, TendermintParams, TimeGapParams, View, VoteOn,
VoteStep,
ConsensusMessage, Height, Step, Tendermint, TendermintParams, TimeGapParams, View, VoteOn, VoteStep,
};
pub use self::validator_set::validator_list::RoundRobinValidator;
pub use self::validator_set::{DynamicValidator, ValidatorSet};
Expand Down
11 changes: 6 additions & 5 deletions core/src/consensus/stake/actions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,9 @@ impl Decodable for Action {
#[cfg(test)]
mod tests {
use super::*;
use ccrypto::blake256;
use ckey::sign_schnorr;
use client::TestBlockChainClient;
use consensus::{message_info_rlp, ConsensusMessage, DynamicValidator, Step, VoteOn, VoteStep};
use consensus::{ConsensusMessage, DynamicValidator, Step, VoteOn, VoteStep};
use rlp::rlp_encode_and_decode_test;

#[test]
Expand Down Expand Up @@ -418,12 +417,14 @@ mod tests {
step: vote_step,
block_hash,
};
let message_for_signature =
blake256(message_info_rlp(vote_step_twister(vote_step), block_hash_twister(block_hash)));
let twisted = VoteOn {
step: vote_step_twister(vote_step),
block_hash: block_hash_twister(block_hash),
};
let reversed_idx = client.get_validators().len() - 1 - signer_index;
let pubkey = *client.get_validators().get(reversed_idx).unwrap().pubkey();
let privkey = *client.validator_keys.read().get(&pubkey).unwrap();
let signature = sign_schnorr(&privkey, &message_for_signature).unwrap();
let signature = sign_schnorr(&privkey, &twisted.hash()).unwrap();

ConsensusMessage {
signature,
Expand Down
25 changes: 7 additions & 18 deletions core/src/consensus/tendermint/message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,12 @@ pub struct VoteOn {
pub block_hash: Option<BlockHash>,
}

impl VoteOn {
pub fn hash(&self) -> H256 {
blake256(&self.rlp_bytes())
}
}

/// Message transmitted between consensus participants.
#[derive(Debug, PartialEq, Eq, Clone, Hash, Default, RlpDecodable, RlpEncodable)]
pub struct ConsensusMessage {
Expand Down Expand Up @@ -368,27 +374,10 @@ impl ConsensusMessage {
}

pub fn verify(&self, signer_public: &Public) -> Result<bool, KeyError> {
let vote_info = message_info_rlp(self.on.step, self.on.block_hash);
verify_schnorr(signer_public, &self.signature, &blake256(vote_info))
verify_schnorr(signer_public, &self.signature, &self.on.hash())
}
}

pub fn message_info_rlp(step: VoteStep, block_hash: Option<BlockHash>) -> Bytes {
let vote_on = VoteOn {
step,
block_hash,
};
vote_on.rlp_bytes().into_vec()
}

pub fn message_hash(step: VoteStep, block_hash: H256) -> H256 {
let vote_on = VoteOn {
step,
block_hash: Some(block_hash),
};
blake256(&vote_on.rlp_bytes())
}

#[cfg(test)]
mod tests {
use rlp::{self, rlp_encode_and_decode_test};
Expand Down
24 changes: 15 additions & 9 deletions core/src/consensus/tendermint/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ use parking_lot::RwLock;
use primitives::H256;

use self::chain_notify::TendermintChainNotify;
pub use self::message::{message_info_rlp, ConsensusMessage, VoteOn, VoteStep};
pub use self::message::{ConsensusMessage, VoteOn, VoteStep};
pub use self::params::{TendermintParams, TimeGapParams, TimeoutParams};
pub use self::types::{Height, Step, View};
use super::{stake, ValidatorSet};
Expand Down Expand Up @@ -129,7 +129,7 @@ mod tests {
use primitives::Bytes;

use super::super::BitSet;
use super::message::{message_info_rlp, VoteStep};
use super::message::VoteStep;
use crate::account_provider::AccountProvider;
use crate::block::{ClosedBlock, OpenBlock};
use crate::client::TestBlockChainClient;
Expand Down Expand Up @@ -231,8 +231,11 @@ mod tests {
header.set_author(proposer);
header.set_parent_hash(Default::default());

let vote_info = message_info_rlp(VoteStep::new(3, 0, Step::Precommit), Some(*header.parent_hash()));
let signature2 = tap.get_account(&proposer, None).unwrap().sign_schnorr(&blake256(&vote_info)).unwrap();
let vote_on = VoteOn {
step: VoteStep::new(3, 0, Step::Precommit),
block_hash: Some(*header.parent_hash()),
};
let signature2 = tap.get_account(&proposer, None).unwrap().sign_schnorr(&vote_on.hash()).unwrap();

let seal = Seal::Tendermint {
prev_view: 0,
Expand Down Expand Up @@ -267,8 +270,11 @@ mod tests {
header.set_author(proposer);
header.set_parent_hash(block1_hash);

let vote_info = message_info_rlp(VoteStep::new(1, 0, Step::Precommit), Some(*header.parent_hash()));
let signature2 = tap.get_account(&proposer, None).unwrap().sign_schnorr(&blake256(&vote_info)).unwrap();
let vote_info = VoteOn {
step: VoteStep::new(1, 0, Step::Precommit),
block_hash: Some(*header.parent_hash()),
};
let signature2 = tap.get_account(&proposer, None).unwrap().sign_schnorr(&vote_info.hash()).unwrap();

let seal = Seal::Tendermint {
prev_view: 0,
Expand All @@ -287,9 +293,9 @@ mod tests {
}

let voter = validator3;
let signature3 = tap.get_account(&voter, None).unwrap().sign_schnorr(&blake256(&vote_info)).unwrap();
let signature3 = tap.get_account(&voter, None).unwrap().sign_schnorr(&vote_info.hash()).unwrap();
let voter = validator0;
let signature0 = tap.get_account(&voter, None).unwrap().sign_schnorr(&blake256(&vote_info)).unwrap();
let signature0 = tap.get_account(&voter, None).unwrap().sign_schnorr(&vote_info.hash()).unwrap();

let seal = Seal::Tendermint {
prev_view: 0,
Expand All @@ -304,7 +310,7 @@ mod tests {
assert!(engine.verify_block_external(&header).is_ok());

let bad_voter = insert_and_unlock(&tap, "101");
let bad_signature = tap.get_account(&bad_voter, None).unwrap().sign_schnorr(&blake256(vote_info)).unwrap();
let bad_signature = tap.get_account(&bad_voter, None).unwrap().sign_schnorr(&vote_info.hash()).unwrap();

let seal = Seal::Tendermint {
prev_view: 0,
Expand Down
32 changes: 18 additions & 14 deletions core/src/consensus/tendermint/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use std::sync::{Arc, Weak};
use std::thread::{Builder, JoinHandle};
use std::time::{Duration, SystemTime, UNIX_EPOCH};

use ccrypto::blake256;
use ckey::{public_to_address, verify_schnorr, Address, SchnorrSignature};
use cnetwork::{EventSender, NodeId};
use crossbeam_channel as crossbeam;
Expand Down Expand Up @@ -837,13 +836,12 @@ impl Worker {
step: VoteStep::new(height, r, self.step.to_step()),
block_hash,
};
let vote_info = on.rlp_bytes();
let signer_index = self.signer_index().or_else(|| {
ctrace!(ENGINE, "No message, since there is no engine signer.");
None
})?;
let signature = self
.sign(blake256(&vote_info))
.sign(&on)
.map_err(|error| {
ctrace!(ENGINE, "{}th validator could not sign the message {}", signer_index, error);
error
Expand Down Expand Up @@ -1120,9 +1118,11 @@ impl Worker {

debug_assert_eq!(Ok(self.view), TendermintSealView::new(header.seal()).consensus_view());

let vote_step = VoteStep::new(header.number() as Height, self.view, Step::Propose);
let vote_info = message_info_rlp(vote_step, Some(hash));
let signature = self.sign(blake256(&vote_info)).expect("I am proposer");
let vote_on = VoteOn {
step: VoteStep::new(header.number() as Height, self.view, Step::Propose),
block_hash: Some(hash),
};
let signature = self.sign(&vote_on).expect("I am proposer");
self.votes.vote(
ConsensusMessage::new_proposal(signature, &*self.validators, header, self.view, prev_proposer_idx)
.expect("I am proposer"),
Expand Down Expand Up @@ -1191,8 +1191,10 @@ impl Worker {
}

let previous_block_view = TendermintSealView::new(header.seal()).previous_block_view()?;
let step = VoteStep::new(header.number() - 1, previous_block_view, Step::Precommit);
let precommit_hash = message_hash(step, *header.parent_hash());
let precommit_vote_on = VoteOn {
step: VoteStep::new(header.number() - 1, previous_block_view, Step::Precommit),
block_hash: Some(*header.parent_hash()),
};

let mut voted_validators = BitSet::new();
let grand_parent_hash = self
Expand All @@ -1202,7 +1204,7 @@ impl Worker {
.parent_hash();
for (bitset_index, signature) in seal_view.signatures()? {
let public = self.validators.get(&grand_parent_hash, bitset_index);
if !verify_schnorr(&public, &signature, &precommit_hash)? {
if !verify_schnorr(&public, &signature, &precommit_vote_on.hash())? {
let address = public_to_address(&public);
return Err(EngineError::BlockNotAuthorized(address.to_owned()).into())
}
Expand Down Expand Up @@ -1474,11 +1476,13 @@ impl Worker {

fn repropose_block(&mut self, block: encoded::Block) {
let header = block.decode_header();
let vote_step = VoteStep::new(header.number() as Height, self.view, Step::Propose);
let vote_info = message_info_rlp(vote_step, Some(header.hash()));
let vote_on = VoteOn {
step: VoteStep::new(header.number() as Height, self.view, Step::Propose),
block_hash: Some(header.hash()),
};
let parent_hash = header.parent_hash();
let prev_proposer_idx = self.block_proposer_idx(*parent_hash).expect("Prev block must exists");
let signature = self.sign(blake256(&vote_info)).expect("I am proposer");
let signature = self.sign(&vote_on).expect("I am proposer");
self.votes.vote(
ConsensusMessage::new_proposal(signature, &*self.validators, &header, self.view, prev_proposer_idx)
.expect("I am proposer"),
Expand Down Expand Up @@ -1511,8 +1515,8 @@ impl Worker {
self.signer.set_to_keep_decrypted_account(ap, address);
}

fn sign(&self, hash: H256) -> Result<SchnorrSignature, Error> {
self.signer.sign(hash).map_err(Into::into)
fn sign(&self, vote_on: &VoteOn) -> Result<SchnorrSignature, Error> {
self.signer.sign(vote_on.hash()).map_err(Into::into)
}

fn signer_index(&self) -> Option<usize> {
Expand Down