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

enforce block signer == author field in PoA (#5808)

Browse Source
This commit is contained in:
Robert Habermeier 2017-06-12 11:54:34 +02:00 committed by Nikolay Volf
parent 75ac263961
commit edea41d35e
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ethcore/src/engines/authority_round.rs
View File

@ -168,7 +168,10 @@ fn verify_external(header: &Header, validators: &ValidatorSet, step: &Step) -> R
} else { } else {
let proposer_signature = header_signature(header)?; let proposer_signature = header_signature(header)?;
let correct_proposer = validators.get(header.parent_hash(), header_step); let correct_proposer = validators.get(header.parent_hash(), header_step);
if !verify_address(&correct_proposer, &proposer_signature, &header.bare_hash())? { let is_invalid_proposer = *header.author() != correct_proposer ||
!verify_address(&correct_proposer, &proposer_signature, &header.bare_hash())?;
if is_invalid_proposer {
trace!(target: "engine", "verify_block_unordered: bad proposer for step: {}", header_step); trace!(target: "engine", "verify_block_unordered: bad proposer for step: {}", header_step);
Err(EngineError::NotProposer(Mismatch { expected: correct_proposer, found: header.author().clone() }))? Err(EngineError::NotProposer(Mismatch { expected: correct_proposer, found: header.author().clone() }))?
} else { } else {

4
ethcore/src/engines/basic_authority.rs
View File

@ -69,6 +69,10 @@ fn verify_external(header: &Header, validators: &ValidatorSet) -> Result<(), Err
let sig = UntrustedRlp::new(&header.seal()[0]).as_val::<H520>()?; let sig = UntrustedRlp::new(&header.seal()[0]).as_val::<H520>()?;
let signer = public_to_address(&recover(&sig.into(), &header.bare_hash())?); let signer = public_to_address(&recover(&sig.into(), &header.bare_hash())?);
if *header.author() != signer {
return Err(EngineError::NotAuthorized(*header.author()).into())
}
match validators.contains(header.parent_hash(), &signer) { match validators.contains(header.parent_hash(), &signer) {
false => Err(BlockError::InvalidSeal.into()), false => Err(BlockError::InvalidSeal.into()),
true => Ok(()) true => Ok(())

2
ethcore/src/engines/mod.rs
View File

@ -60,7 +60,7 @@ pub const DEFAULT_BLOCKHASH_CONTRACT: &'static str = "73ffffffffffffffffffffffff
/// Voting errors. /// Voting errors.
#[derive(Debug)] #[derive(Debug)]
pub enum EngineError { pub enum EngineError {
/// Signature does not belong to an authority. /// Signature or author field does not belong to an authority.
NotAuthorized(Address), NotAuthorized(Address),
/// The same author issued different votes at the same step. /// The same author issued different votes at the same step.
DoubleVote(Address), DoubleVote(Address),