Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-02-12 22:31:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Scaling multiplier fix and slightly clearer structure

Browse source
This commit is contained in:
Ignotus Peverell 2018-09-19 16:25:44 +00:00
parent febe9076f0
commit 9a15859b81
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/src/pow/types.rs
View file

@ -55,27 +55,24 @@ impl Difficulty {
/// provided hash and applies the Cuckoo sizeshift adjustment factor (see /// provided hash and applies the Cuckoo sizeshift adjustment factor (see
/// https://lists.launchpad.net/mimblewimble/msg00494.html). /// https://lists.launchpad.net/mimblewimble/msg00494.html).
pub fn from_proof_adjusted(proof: &Proof) -> Difficulty { pub fn from_proof_adjusted(proof: &Proof) -> Difficulty {
let max_target = <u64>::max_value();
let target = proof.hash().to_u64();
let shift = proof.cuckoo_sizeshift;
// Adjust the difficulty based on a 2^(N-M)*(N-1) factor, with M being // Adjust the difficulty based on a 2^(N-M)*(N-1) factor, with M being
// the minimum sizeshift and N the provided sizeshift // the minimum sizeshift and N the provided sizeshift
let shift = proof.cuckoo_sizeshift;
let adjust_factor = (1 << (shift - global::ref_sizeshift()) as u64) * (shift as u64 - 1); let adjust_factor = (1 << (shift - global::ref_sizeshift()) as u64) * (shift as u64 - 1);
let difficulty = (max_target / target) * adjust_factor;
Difficulty::from_num(difficulty) Difficulty::from_num(Difficulty::raw_difficulty(proof) * adjust_factor)
} }
/// Same as `from_proof_adjusted` but instead of an adjustment based on /// Same as `from_proof_adjusted` but instead of an adjustment based on
/// cycle size, scales based on a provided factor. Used by dual PoW system /// cycle size, scales based on a provided factor. Used by dual PoW system
/// to scale one PoW against the other. /// to scale one PoW against the other.
pub fn from_proof_scaled(proof: &Proof, scaling: u64) -> Difficulty { pub fn from_proof_scaled(proof: &Proof, scaling: u64) -> Difficulty {
let max_target = <u64>::max_value();
let target = proof.hash().to_u64();
// Scaling between 2 proof of work algos // Scaling between 2 proof of work algos
Difficulty::from_num((max_target / scaling) / target) Difficulty::from_num(Difficulty::raw_difficulty(proof) * scaling)
}
fn raw_difficulty(proof: &Proof) -> u64 {
<u64>::max_value() / proof.hash().to_u64()
} }
/// Converts the difficulty into a u64 /// Converts the difficulty into a u64