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

Fix secondary pow scaling bug (#2051)

Browse source 
* fix(es) for #1980

* rustfmt

* skip(1) is height dependent on testnet4
rename for clarity

* rustfmt
This commit is contained in:
Antioch Peverell 2018-11-30 11:19:55 +00:00 committed by GitHub
parent 35df4ad11e
commit 1dffd4df1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 190 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
core/src/consensus.rs
View file

@ -63,7 +63,6 @@ pub const COINBASE_MATURITY: u64 = DAY_HEIGHT;
/// function of block height (time). Starts at 90% losing a percent /// function of block height (time). Starts at 90% losing a percent
/// approximately every week. Represented as an integer between 0 and 100. /// approximately every week. Represented as an integer between 0 and 100.
pub fn secondary_pow_ratio(height: u64) -> u64 { pub fn secondary_pow_ratio(height: u64) -> u64 {
// TODO - this should all be cleaned up and simplified before mainnet.
if global::is_mainnet() { if global::is_mainnet() {
90u64.saturating_sub(height / (2 * YEAR_HEIGHT / 90)) 90u64.saturating_sub(height / (2 * YEAR_HEIGHT / 90))
} else { } else {
@ -76,6 +75,20 @@ pub fn secondary_pow_ratio(height: u64) -> u64 {
} }
} }
/// The AR scale damping factor to use. Dependent on block height
/// to account for pre HF behavior on testnet4.
fn ar_scale_damp_factor(height: u64) -> u64 {
if global::is_mainnet() {
AR_SCALE_DAMP_FACTOR
} else {
if height < T4_CUCKAROO_HARDFORK {
DIFFICULTY_DAMP_FACTOR
} else {
AR_SCALE_DAMP_FACTOR
}
}
}
/// Cuckoo-cycle proof size (cycle length) /// Cuckoo-cycle proof size (cycle length)
pub const PROOFSIZE: usize = 42; pub const PROOFSIZE: usize = 42;
@ -170,7 +183,10 @@ pub const BLOCK_TIME_WINDOW: u64 = DIFFICULTY_ADJUST_WINDOW * BLOCK_TIME_SEC;
pub const CLAMP_FACTOR: u64 = 2; pub const CLAMP_FACTOR: u64 = 2;
/// Dampening factor to use for difficulty adjustment /// Dampening factor to use for difficulty adjustment
pub const DAMP_FACTOR: u64 = 3; pub const DIFFICULTY_DAMP_FACTOR: u64 = 3;
/// Dampening factor to use for AR scale calculation.
pub const AR_SCALE_DAMP_FACTOR: u64 = 13;
/// Compute weight of a graph as number of siphash bits defining the graph /// Compute weight of a graph as number of siphash bits defining the graph
/// Must be made dependent on height to phase out smaller size over the years /// Must be made dependent on height to phase out smaller size over the years
@ -188,7 +204,7 @@ pub fn graph_weight(height: u64, edge_bits: u8) -> u64 {
} }
/// minimum difficulty to avoid getting stuck when trying to increase subject to dampening /// minimum difficulty to avoid getting stuck when trying to increase subject to dampening
pub const MIN_DIFFICULTY: u64 = DAMP_FACTOR; pub const MIN_DIFFICULTY: u64 = DIFFICULTY_DAMP_FACTOR;
/// unit difficulty, equal to graph_weight(SECOND_POW_EDGE_BITS) /// unit difficulty, equal to graph_weight(SECOND_POW_EDGE_BITS)
pub const UNIT_DIFFICULTY: u64 = pub const UNIT_DIFFICULTY: u64 =
@ -315,7 +331,7 @@ where
// adjust time delta toward goal subject to dampening and clamping // adjust time delta toward goal subject to dampening and clamping
let adj_ts = clamp( let adj_ts = clamp(
damp(ts_delta, BLOCK_TIME_WINDOW, DAMP_FACTOR), damp(ts_delta, BLOCK_TIME_WINDOW, DIFFICULTY_DAMP_FACTOR),
BLOCK_TIME_WINDOW, BLOCK_TIME_WINDOW,
CLAMP_FACTOR, CLAMP_FACTOR,
); );
@ -325,11 +341,23 @@ where
HeaderInfo::from_diff_scaling(Difficulty::from_num(difficulty), sec_pow_scaling) HeaderInfo::from_diff_scaling(Difficulty::from_num(difficulty), sec_pow_scaling)
} }
/// Count the number of "secondary" (AR) blocks in the provided window of blocks.
/// Note: we skip the first one, but testnet4 was incorrectly including it before
/// the hardfork.
fn ar_count(height: u64, diff_data: &[HeaderInfo]) -> u64 {
let mut to_skip = 1;
if !global::is_mainnet() && height < T4_CUCKAROO_HARDFORK {
to_skip = 0;
}
100 * diff_data
.iter()
.skip(to_skip)
.filter(|n| n.is_secondary)
.count() as u64
}
/// Factor by which the secondary proof of work difficulty will be adjusted /// Factor by which the secondary proof of work difficulty will be adjusted
pub fn secondary_pow_scaling(height: u64, diff_data: &[HeaderInfo]) -> u32 { pub fn secondary_pow_scaling(height: u64, diff_data: &[HeaderInfo]) -> u32 {
// Get the secondary count across the window, in pct (100 * 60 * 2nd_pow_fraction)
let snd_count = 100 * diff_data.iter().filter(|n| n.is_secondary).count() as u64;
// Get the scaling factor sum of the last DIFFICULTY_ADJUST_WINDOW elements // Get the scaling factor sum of the last DIFFICULTY_ADJUST_WINDOW elements
let scale_sum: u64 = diff_data let scale_sum: u64 = diff_data
.iter() .iter()
@ -341,9 +369,14 @@ pub fn secondary_pow_scaling(height: u64, diff_data: &[HeaderInfo]) -> u32 {
let target_pct = secondary_pow_ratio(height); let target_pct = secondary_pow_ratio(height);
let target_count = DIFFICULTY_ADJUST_WINDOW * target_pct; let target_count = DIFFICULTY_ADJUST_WINDOW * target_pct;
// adjust count toward goal subject to dampening and clamping // Get the secondary count across the window, adjusting count toward goal
// subject to dampening and clamping.
let adj_count = clamp( let adj_count = clamp(
damp(snd_count, target_count, DAMP_FACTOR), damp(
ar_count(height, diff_data),
target_count,
ar_scale_damp_factor(height),
),
target_count, target_count,
CLAMP_FACTOR, CLAMP_FACTOR,
); );

215
core/tests/consensus.rs
View file

@ -241,7 +241,7 @@ fn print_chain_sim(chain_sim: Vec<(HeaderInfo, DiffStats)>) {
println!("DIFFICULTY_ADJUST_WINDOW: {}", DIFFICULTY_ADJUST_WINDOW); println!("DIFFICULTY_ADJUST_WINDOW: {}", DIFFICULTY_ADJUST_WINDOW);
println!("BLOCK_TIME_WINDOW: {}", BLOCK_TIME_WINDOW); println!("BLOCK_TIME_WINDOW: {}", BLOCK_TIME_WINDOW);
println!("CLAMP_FACTOR: {}", CLAMP_FACTOR); println!("CLAMP_FACTOR: {}", CLAMP_FACTOR);
println!("DAMP_FACTOR: {}", DAMP_FACTOR); println!("DAMP_FACTOR: {}", DIFFICULTY_DAMP_FACTOR);
chain_sim.iter().enumerate().for_each(|(i, b)| { chain_sim.iter().enumerate().for_each(|(i, b)| {
let block = b.0.clone(); let block = b.0.clone();
let stats = b.1.clone(); let stats = b.1.clone();
@ -562,72 +562,153 @@ fn test_secondary_pow_scale() {
let window = DIFFICULTY_ADJUST_WINDOW; let window = DIFFICULTY_ADJUST_WINDOW;
let mut hi = HeaderInfo::from_diff_scaling(Difficulty::from_num(10), 100); let mut hi = HeaderInfo::from_diff_scaling(Difficulty::from_num(10), 100);
// all primary, factor should increase so it becomes easier to find a high // testnet4 testing
// difficulty block {
hi.is_secondary = false; global::set_mining_mode(global::ChainTypes::Testnet4);
assert_eq!( assert_eq!(global::is_mainnet(), false);
secondary_pow_scaling(1, &(0..window).map(|_| hi.clone()).collect::<Vec<_>>()),
147 // all primary, factor should increase so it becomes easier to find a high
); // difficulty block
// all secondary on 90%, factor should go down a bit hi.is_secondary = false;
hi.is_secondary = true; assert_eq!(
assert_eq!( secondary_pow_scaling(1, &(0..window).map(|_| hi.clone()).collect::<Vec<_>>()),
secondary_pow_scaling(1, &(0..window).map(|_| hi.clone()).collect::<Vec<_>>()), 147
94 );
); // all secondary on 90%, factor should go down a bit
// all secondary on 1%, factor should go down to bound (divide by 2) hi.is_secondary = true;
assert_eq!( assert_eq!(
secondary_pow_scaling( secondary_pow_scaling(1, &(0..window).map(|_| hi.clone()).collect::<Vec<_>>()),
890_000, 94
&(0..window).map(|_| hi.clone()).collect::<Vec<_>>() );
), // all secondary on 1%, factor should go down to bound (divide by 2)
49 assert_eq!(
); secondary_pow_scaling(
// same as above, testing lowest bound 890_000,
let mut low_hi = HeaderInfo::from_diff_scaling(Difficulty::from_num(10), MIN_DIFFICULTY as u32); &(0..window).map(|_| hi.clone()).collect::<Vec<_>>()
low_hi.is_secondary = true; ),
assert_eq!( 67
secondary_pow_scaling( );
890_000, // same as above, testing lowest bound
&(0..window).map(|_| low_hi.clone()).collect::<Vec<_>>() let mut low_hi =
), HeaderInfo::from_diff_scaling(Difficulty::from_num(10), MIN_DIFFICULTY as u32);
MIN_DIFFICULTY as u32 low_hi.is_secondary = true;
); assert_eq!(
// just about the right ratio, also no longer playing with median secondary_pow_scaling(
let mut primary_hi = HeaderInfo::from_diff_scaling(Difficulty::from_num(10), 50); 890_000,
primary_hi.is_secondary = false; &(0..window).map(|_| low_hi.clone()).collect::<Vec<_>>()
assert_eq!( ),
secondary_pow_scaling( MIN_DIFFICULTY as u32
1, );
&(0..(window / 10)) // just about the right ratio, also no longer playing with median
.map(|_| primary_hi.clone()) let mut primary_hi = HeaderInfo::from_diff_scaling(Difficulty::from_num(10), 50);
.chain((0..(window * 9 / 10)).map(|_| hi.clone())) primary_hi.is_secondary = false;
.collect::<Vec<_>>() assert_eq!(
), secondary_pow_scaling(
94 1,
); &(0..(window / 10))
// 95% secondary, should come down based on 97.5 average .map(|_| primary_hi.clone())
assert_eq!( .chain((0..(window * 9 / 10)).map(|_| hi.clone()))
secondary_pow_scaling( .collect::<Vec<_>>()
1, ),
&(0..(window / 20)) 94
.map(|_| primary_hi.clone()) );
.chain((0..(window * 95 / 100)).map(|_| hi.clone())) // 95% secondary, should come down based on 97.5 average
.collect::<Vec<_>>() assert_eq!(
), secondary_pow_scaling(
94 1,
); &(0..(window / 20))
// 40% secondary, should come up based on 70 average .map(|_| primary_hi.clone())
assert_eq!( .chain((0..(window * 95 / 100)).map(|_| hi.clone()))
secondary_pow_scaling( .collect::<Vec<_>>()
1, ),
&(0..(window * 6 / 10)) 94
.map(|_| primary_hi.clone()) );
.chain((0..(window * 4 / 10)).map(|_| hi.clone())) // 40% secondary, should come up based on 70 average
.collect::<Vec<_>>() assert_eq!(
), secondary_pow_scaling(
84 1,
); &(0..(window * 6 / 10))
.map(|_| primary_hi.clone())
.chain((0..(window * 4 / 10)).map(|_| hi.clone()))
.collect::<Vec<_>>()
),
84
);
}
// mainnet testing
{
global::set_mining_mode(global::ChainTypes::Mainnet);
assert_eq!(global::is_mainnet(), true);
// all primary, factor should increase so it becomes easier to find a high
// difficulty block
hi.is_secondary = false;
assert_eq!(
secondary_pow_scaling(1, &(0..window).map(|_| hi.clone()).collect::<Vec<_>>()),
106
);
// all secondary on 90%, factor should go down a bit
hi.is_secondary = true;
assert_eq!(
secondary_pow_scaling(1, &(0..window).map(|_| hi.clone()).collect::<Vec<_>>()),
97
);
// all secondary on 1%, factor should go down to bound (divide by 2)
assert_eq!(
secondary_pow_scaling(
890_000,
&(0..window).map(|_| hi.clone()).collect::<Vec<_>>()
),
67
);
// same as above, testing lowest bound
let mut low_hi =
HeaderInfo::from_diff_scaling(Difficulty::from_num(10), MIN_DIFFICULTY as u32);
low_hi.is_secondary = true;
assert_eq!(
secondary_pow_scaling(
890_000,
&(0..window).map(|_| low_hi.clone()).collect::<Vec<_>>()
),
MIN_DIFFICULTY as u32
);
// just about the right ratio, also no longer playing with median
let mut primary_hi = HeaderInfo::from_diff_scaling(Difficulty::from_num(10), 50);
primary_hi.is_secondary = false;
assert_eq!(
secondary_pow_scaling(
1,
&(0..(window / 10))
.map(|_| primary_hi.clone())
.chain((0..(window * 9 / 10)).map(|_| hi.clone()))
.collect::<Vec<_>>()
),
94
);
// 95% secondary, should come down based on 97.5 average
assert_eq!(
secondary_pow_scaling(
1,
&(0..(window / 20))
.map(|_| primary_hi.clone())
.chain((0..(window * 95 / 100)).map(|_| hi.clone()))
.collect::<Vec<_>>()
),
96
);
// 40% secondary, should come up based on 70 average
assert_eq!(
secondary_pow_scaling(
1,
&(0..(window * 6 / 10))
.map(|_| primary_hi.clone())
.chain((0..(window * 4 / 10)).map(|_| hi.clone()))
.collect::<Vec<_>>()
),
72
);
}
} }
#[test] #[test]