blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Hold Bank's own parent hash instead of the parent's

This commit is contained in:
Greg Fitzgerald 2019-02-20 15:26:57 -07:00 committed by Grimes
parent 5492aad61e
commit 582a7192ec
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
runtime/src/bank.rs
View File

@ -89,15 +89,14 @@ pub struct Bank {
/// Previous checkpoint of this bank /// Previous checkpoint of this bank
parent: Option<Arc<Bank>>, parent: Option<Arc<Bank>>,
/// Hash of the previous checkpoint's state /// Hash of this Bank's state. Only meaningful after freezing it via `new_from_parent()`.
parent_hash: Hash, hash: RwLock<Hash>,
} }
impl Bank { impl Bank {
pub fn new(genesis_block: &GenesisBlock) -> Self { pub fn new(genesis_block: &GenesisBlock) -> Self {
let mut bank = Self::default(); let bank = Self::default();
bank.process_genesis_block(genesis_block); bank.process_genesis_block(genesis_block);
bank.parent_hash = bank.hash_internal_state();
bank.add_builtin_programs(); bank.add_builtin_programs();
bank bank
} }
@ -106,7 +105,7 @@ impl Bank {
pub fn new_from_parent(parent: &Arc<Bank>) -> Self { pub fn new_from_parent(parent: &Arc<Bank>) -> Self {
let mut bank = Self::default(); let mut bank = Self::default();
bank.last_id_queue = RwLock::new(parent.last_id_queue.read().unwrap().clone()); bank.last_id_queue = RwLock::new(parent.last_id_queue.read().unwrap().clone());
bank.parent_hash = parent.hash_internal_state(); *parent.hash.write().unwrap() = parent.hash_internal_state();
bank.parent = Some(parent.clone()); bank.parent = Some(parent.clone());
bank bank
} }
@ -560,12 +559,16 @@ impl Bank {
// If there are no accounts, return the same hash as we did before // If there are no accounts, return the same hash as we did before
// checkpointing. // checkpointing.
let accounts = &self.accounts.accounts_db.read().unwrap().accounts; let accounts = &self.accounts.accounts_db.read().unwrap().accounts;
let parent_hash = match &self.parent {
None => Hash::default(),
Some(parent) => *parent.hash.read().unwrap(),
};
if accounts.is_empty() { if accounts.is_empty() {
return self.parent_hash; return parent_hash;
} }
let accounts_delta_hash = self.accounts.hash_internal_state(); let accounts_delta_hash = self.accounts.hash_internal_state();
extend_and_hash(&self.parent_hash, &serialize(&accounts_delta_hash).unwrap()) extend_and_hash(&parent_hash, &serialize(&accounts_delta_hash).unwrap())
} }
pub fn vote_states<F>(&self, cond: F) -> Vec<VoteState> pub fn vote_states<F>(&self, cond: F) -> Vec<VoteState>