Sweetbread/Alfis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added additional material for consensus.

Browse Source
This commit is contained in:
Revertron
2021-04-29 19:27:45 +02:00
parent a4d9a64989
commit 6d4dfb282f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blockchain/block.rs
+5 -2
View File
@@ -73,8 +73,11 @@ impl Block {
if self.transaction.is_some() && other.transaction.is_none() { if self.transaction.is_some() && other.transaction.is_none() {
return true; return true;
} }
let my_diff = hash_difficulty(self.hash.as_slice()) + key_hash_difficulty(self.hash.as_slice()); let hash_diff = hash_difficulty(self.hash.as_slice()) + key_hash_difficulty(self.hash.as_slice());
let it_diff = hash_difficulty(other.hash.as_slice()) + key_hash_difficulty(other.hash.as_slice()); let my_diff = (hash_diff << 16) + (self.hash.get_tail_u64() % 0xFFFF) as u32;
let hash_diff = hash_difficulty(other.hash.as_slice()) + key_hash_difficulty(other.hash.as_slice());
let it_diff = (hash_diff << 16) + (other.hash.get_tail_u64() % 0xFFFF) as u32;
if my_diff > it_diff { if my_diff > it_diff {
return true; return true;
} }
src/p2p/network.rs
+2
View File
@@ -580,6 +580,8 @@ fn handle_block(context: Arc<Mutex<Context>>, peers: &mut Peers, token: &Token,
if zone { if zone {
context.bus.post(crate::event::Event::ZonesChanged); context.bus.post(crate::event::Event::ZonesChanged);
} }
} else {
debug!("Fork in not better than our block, dropping.");
} }
let height = context.chain.get_height(); let height = context.chain.get_height();
context.chain.update_max_height(height); context.chain.update_max_height(height);