Skip to content

Remove unnecessary initialization of genesis header extra data #329

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
byeongjee merged 1 commit into from
Apr 16, 2020
Merged

Remove unnecessary initialization of genesis header extra data #329

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
1 change: 0 additions & 1 deletion core/src/client/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ impl Client {

let gb = scheme.genesis_block();
let chain = BlockChain::new(&gb, db.clone());
scheme.check_genesis_common_params(&chain)?;

let engine = scheme.engine.clone();

Expand Down
36 changes: 2 additions & 34 deletions core/src/scheme/scheme.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@
use super::pod_state::PodAccounts;
use super::seal::Generic as GenericSeal;
use super::Genesis;
use crate::blockchain::HeaderProvider;
use crate::consensus::{CodeChainEngine, NullEngine, Solo, Tendermint};
use crate::error::{Error, SchemeError};
use ccrypto::{blake256, BLAKE_NULL_RLP};
use ccrypto::BLAKE_NULL_RLP;
use cdb::{AsHashDB, HashDB};
use ckey::Address;
use cstate::{Metadata, MetadataAddress, Shard, ShardAddress, StateDB, StateResult};
Expand Down Expand Up @@ -169,19 +168,6 @@ impl Scheme {
Ok(self.initialize_state(db, self.genesis_params())?)
}

pub fn check_genesis_common_params<HP: HeaderProvider>(&self, chain: &HP) -> Result<(), Error> {
let genesis_header = self.genesis_header();
let genesis_header_hash = genesis_header.hash();
let header =
chain.block_header(&genesis_header_hash).ok_or_else(|| Error::Scheme(SchemeError::InvalidCommonParams))?;
let extra_data = header.extra_data();
let common_params_hash = blake256(&self.genesis_params().rlp_bytes()).to_vec();
if extra_data != &common_params_hash {
return Err(Error::Scheme(SchemeError::InvalidCommonParams))
}
Ok(())
}

/// Return the state root for the genesis state, memoising accordingly.
pub fn state_root(&self) -> H256 {
*self.state_root_memo.read()
Expand Down Expand Up @@ -225,7 +211,7 @@ impl Scheme {
header.set_number(0);
header.set_author(self.author);
header.set_transactions_root(self.transactions_root);
header.set_extra_data(blake256(&self.genesis_params().rlp_bytes()).to_vec());
header.set_extra_data(self.extra_data.clone());
header.set_state_root(self.state_root());
header.set_next_validator_set_hash(BLAKE_NULL_RLP /* This will be calculated from state after https://github.com/CodeChain-io/foundry/issues/142*/);
header.set_seal({
Expand Down Expand Up @@ -288,21 +274,3 @@ fn load_from(s: cjson::scheme::Scheme) -> Result<Scheme, Error> {

Ok(s)
}

#[cfg(test)]
mod tests {
use ccrypto::Blake;

use super::*;

#[test]
fn extra_data_of_genesis_header_is_hash_of_common_params() {
let scheme = Scheme::new_test();
let common_params = scheme.genesis_params();
let hash_of_common_params = H256::blake(&common_params.rlp_bytes()).to_vec();

let genesis_header = scheme.genesis_header();
let result = genesis_header.extra_data();
assert_eq!(&hash_of_common_params, result);
}
}