grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correct seal verification

Browse Source
This commit is contained in:
keorn 2016-11-21 16:02:26 +00:00
parent 841d0941e0
commit 84fdaf966a
2 changed files with 48 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ethcore/src/engines/tendermint/message.rs
View File

@ -18,7 +18,10 @@
use util::*;
use super::{Height, Round, BlockHash, Step};
use error::Error;
use header::Header;
use rlp::*;
use ethkey::{recover, public_to_address};
#[derive(Debug, PartialEq, Eq, Clone)]
pub struct ConsensusMessage {
@ -29,7 +32,23 @@ pub struct ConsensusMessage {
pub block_hash: Option<BlockHash>
}
fn consensus_round(header: &Header) -> Result<Round, ::rlp::DecoderError> {
UntrustedRlp::new(header.seal()[0].as_slice()).as_val()
}
impl ConsensusMessage {
pub fn new_proposal(header: &Header) -> Result<Self, ::rlp::DecoderError> {
Ok(ConsensusMessage {
signature: try!(UntrustedRlp::new(header.seal()[1].as_slice()).as_val()),
height: header.number() as Height,
round: try!(consensus_round(header)),
step: Step::Propose,
block_hash: Some(header.bare_hash())
})
}
pub fn is_height(&self, height: Height) -> bool {
self.height == height
}
@ -45,6 +64,13 @@ impl ConsensusMessage {
pub fn is_aligned(&self, height: Height, round: Round, block_hash: Option<H256>) -> bool {
self.height == height && self.round == round && self.block_hash == block_hash
}
pub fn verify(&self) -> Result<Address, Error> {
let full_rlp = ::rlp::encode(self);
let block_info = Rlp::new(&full_rlp).at(1);
let public_key = try!(recover(&self.signature.into(), &block_info.as_raw().sha3()));
Ok(public_to_address(&public_key))
}
}
impl PartialOrd for ConsensusMessage {
@ -56,10 +82,10 @@ impl PartialOrd for ConsensusMessage {
impl Step {
fn number(&self) -> i8 {
match *self {
Step::Propose => -1,
Step::Prevote => 0,
Step::Precommit => 1,
Step::Commit => 2,
Step::Propose => 0,
Step::Prevote => 1,
Step::Precommit => 2,
Step::Commit => 3,
}
}
}
@ -135,6 +161,11 @@ pub fn message_info_rlp(height: Height, round: Round, step: Step, block_hash: Op
s.out()
}
pub fn message_info_rlp_from_header(header: &Header) -> Result<Bytes, ::rlp::DecoderError> {
let round = try!(consensus_round(header));
Ok(message_info_rlp(header.number() as Height, round, Step::Precommit, Some(header.bare_hash())))
}
pub fn message_full_rlp<F>(signer: F, height: Height, round: Round, step: Step, block_hash: Option<BlockHash>) -> Option<Bytes> where F: FnOnce(H256) -> Option<H520> {
let vote_info = message_info_rlp(height, round, step, block_hash);
signer(vote_info.sha3()).map(|ref signature| {

52
ethcore/src/engines/tendermint/mod.rs
View File

@ -23,7 +23,6 @@ mod vote_collector;
use std::sync::atomic::{AtomicUsize, Ordering as AtomicOrdering};
use util::*;
use basic_types::Seal;
use error::{Error, BlockError};
use header::Header;
use builtin::Builtin;
@ -40,7 +39,7 @@ use views::HeaderView;
use evm::Schedule;
use io::{IoService, IoChannel};
use service::ClientIoMessage;
use self::message::{ConsensusMessage, message_info_rlp, message_full_rlp};
use self::message::*;
use self::transition::TransitionHandler;
use self::params::TendermintParams;
use self::vote_collector::VoteCollector;
@ -265,19 +264,6 @@ impl Tendermint {
}
}
/// Block hash including the consensus round, gets signed and included in the seal.
fn block_hash(header: &Header) -> H256 {
header.rlp(Seal::WithSome(1)).sha3()
}
fn proposer_signature(header: &Header) -> Result<H520, ::rlp::DecoderError> {
UntrustedRlp::new(header.seal()[1].as_slice()).as_val()
}
fn consensus_round(header: &Header) -> Result<Round, ::rlp::DecoderError> {
UntrustedRlp::new(header.seal()[0].as_slice()).as_val()
}
impl Engine for Tendermint {
fn name(&self) -> &str { "Tendermint" }
fn version(&self) -> SemanticVersion { SemanticVersion::new(1, 0, 0) }
@ -289,11 +275,12 @@ impl Engine for Tendermint {
/// Additional engine-specific information for the user/developer concerning `header`.
fn extra_info(&self, header: &Header) -> BTreeMap<String, String> {
let message = ConsensusMessage::new_proposal(header).expect("Invalid header.");
map![
"signature".into() => proposer_signature(header).as_ref().map(ToString::to_string).unwrap_or("".into()),
"height".into() => header.number().to_string(),
"round".into() => consensus_round(header).as_ref().map(ToString::to_string).unwrap_or("".into()),
"block_hash".into() => block_hash(header).to_string()
"signature".into() => message.signature.to_string(),
"height".into() => message.height.to_string(),
"round".into() => message.round.to_string(),
"block_hash".into() => message.block_hash.as_ref().map(ToString::to_string).unwrap_or("".into())
]
}
@ -319,12 +306,6 @@ impl Engine for Tendermint {
*self.authority.write() = *block.header().author()
}
/// Set the correct round in the seal.
fn on_close_block(&self, block: &mut ExecutedBlock) {
let round = self.round.load(AtomicOrdering::SeqCst);
block.fields_mut().header.set_seal(vec![::rlp::encode(&round).to_vec(), Vec::new(), Vec::new()]);
}
/// Round proposer switching.
fn is_sealer(&self, address: &Address) -> Option<bool> {
Some(self.is_proposer(address))
@ -335,7 +316,7 @@ impl Engine for Tendermint {
if let Some(ref ap) = *self.account_provider.lock() {
let header = block.header();
let author = header.author();
let vote_info = message_info_rlp(header.number() as Height, self.round.load(AtomicOrdering::SeqCst), Step::Propose, Some(block_hash(header)));
let vote_info = message_info_rlp(header.number() as Height, self.round.load(AtomicOrdering::SeqCst), Step::Propose, Some(header.bare_hash()));
if let Ok(signature) = ap.sign(*author, None, vote_info.sha3()) {
*self.proposal.write() = Some(header.bare_hash());
Some(vec![
@ -418,23 +399,16 @@ impl Engine for Tendermint {
/// Also transitions to Prevote if verifying Proposal.
fn verify_block_unordered(&self, header: &Header, _block: Option<&[u8]>) -> Result<(), Error> {
let signature = try!(proposer_signature(header));
let proposal = ConsensusMessage {
signature: signature,
height: header.number() as Height,
round: try!(consensus_round(header)),
step: Step::Propose,
block_hash: Some(block_hash(header))
};
let proposer = public_to_address(&try!(recover(&signature.into(), &::rlp::encode(&proposal))));
let proposal = try!(ConsensusMessage::new_proposal(header));
let proposer = try!(proposal.verify());
if !self.is_proposer(&proposer) {
try!(Err(BlockError::InvalidSeal))
}
self.votes.vote(proposal, proposer);
let votes_rlp = UntrustedRlp::new(&header.seal()[2]);
for rlp in votes_rlp.iter() {
let sig: H520 = try!(rlp.as_val());
let address = public_to_address(&try!(recover(&sig.into(), &block_hash(header))));
let block_info_hash = try!(message_info_rlp_from_header(header)).sha3();
for rlp in UntrustedRlp::new(&header.seal()[2]).iter() {
let signature: H520 = try!(rlp.as_val());
let address = public_to_address(&try!(recover(&signature.into(), &block_info_hash)));
if !self.our_params.authorities.contains(&address) {
try!(Err(BlockError::InvalidSeal))
}