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

fix share difficulty validation - compare stratum server minimum_share_difficulty as unscaled difficulty (#3624)

Browse source 
* fix for comparing scaled vs unscaled difficulty

fix mix use of scaled and unscaled, add additional comments to clarify which values are which

improved consistency - scaled and unscaled difficulty

* combine from_proof_unscaled() and  to_unscaled_difficulty{}

* code review - rust syntax
This commit is contained in:
Blade Doyle 2021-04-23 06:28:29 -07:00 committed by GitHub
parent 1b8acee72e
commit 9ed0cd65ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -290,6 +290,12 @@ impl ProofOfWork {
} }
} }
/// Maximum unscaled difficulty this proof of work can achieve
pub fn to_unscaled_difficulty(&self) -> Difficulty {
// using scale = 1 gives "unscaled" value
Difficulty::from_num(self.proof.scaled_difficulty(1u64))
}
/// The edge_bits used for the cuckoo cycle size on this proof /// The edge_bits used for the cuckoo cycle size on this proof
pub fn edge_bits(&self) -> u8 { pub fn edge_bits(&self) -> u8 {
self.proof.edge_bits self.proof.edge_bits

25
servers/src/mining/stratumserver.rs
View file

@ -183,8 +183,8 @@ struct State {
// nothing has changed. We only want to create a key_id for each new block, // nothing has changed. We only want to create a key_id for each new block,
// and reuse it when we rebuild the current block to add new tx. // and reuse it when we rebuild the current block to add new tx.
current_key_id: Option<keychain::Identifier>, current_key_id: Option<keychain::Identifier>,
current_difficulty: u64, current_difficulty: u64, // scaled
minimum_share_difficulty: u64, minimum_share_difficulty: u64, // unscaled
} }
impl State { impl State {
@ -379,7 +379,8 @@ impl Handler {
return Err(RpcError::too_late()); return Err(RpcError::too_late());
} }
let share_difficulty: u64; let scaled_share_difficulty: u64;
let unscaled_share_difficulty: u64;
let mut share_is_block = false; let mut share_is_block = false;
let mut b: Block = b.unwrap().clone(); let mut b: Block = b.unwrap().clone();
@ -399,14 +400,17 @@ impl Handler {
return Err(RpcError::cannot_validate()); return Err(RpcError::cannot_validate());
} }
// Get share difficulty // Get share difficulty values
share_difficulty = b.header.pow.to_difficulty(b.header.height).to_num(); scaled_share_difficulty = b.header.pow.to_difficulty(b.header.height).to_num();
unscaled_share_difficulty = b.header.pow.to_unscaled_difficulty().to_num();
// Note: state.minimum_share_difficulty is unscaled
// state.current_difficulty is scaled
// If the difficulty is too low its an error // If the difficulty is too low its an error
if share_difficulty < state.minimum_share_difficulty { if unscaled_share_difficulty < state.minimum_share_difficulty {
// Return error status // Return error status
error!( error!(
"(Server ID: {}) Share at height {}, hash {}, edge_bits {}, nonce {}, job_id {} rejected due to low difficulty: {}/{}", "(Server ID: {}) Share at height {}, hash {}, edge_bits {}, nonce {}, job_id {} rejected due to low difficulty: {}/{}",
self.id, params.height, b.hash(), params.edge_bits, params.nonce, params.job_id, share_difficulty, state.minimum_share_difficulty, self.id, params.height, b.hash(), params.edge_bits, params.nonce, params.job_id, unscaled_share_difficulty, state.minimum_share_difficulty,
); );
self.workers self.workers
.update_stats(worker_id, |worker_stats| worker_stats.num_rejected += 1); .update_stats(worker_id, |worker_stats| worker_stats.num_rejected += 1);
@ -414,7 +418,7 @@ impl Handler {
} }
// If the difficulty is high enough, submit it (which also validates it) // If the difficulty is high enough, submit it (which also validates it)
if share_difficulty >= state.current_difficulty { if scaled_share_difficulty >= state.current_difficulty {
// This is a full solution, submit it to the network // This is a full solution, submit it to the network
let res = self.chain.process_block(b.clone(), chain::Options::MINE); let res = self.chain.process_block(b.clone(), chain::Options::MINE);
if let Err(e) = res { if let Err(e) = res {
@ -484,7 +488,7 @@ impl Handler {
b.header.pow.proof.edge_bits, b.header.pow.proof.edge_bits,
b.header.pow.nonce, b.header.pow.nonce,
params.job_id, params.job_id,
share_difficulty, scaled_share_difficulty,
state.current_difficulty, state.current_difficulty,
submitted_by, submitted_by,
); );
@ -557,13 +561,14 @@ impl Handler {
wallet_listener_url, wallet_listener_url,
); );
// scaled difficulty
state.current_difficulty = state.current_difficulty =
(new_block.header.total_difficulty() - head.total_difficulty).to_num(); (new_block.header.total_difficulty() - head.total_difficulty).to_num();
state.current_key_id = block_fees.key_id(); state.current_key_id = block_fees.key_id();
current_hash = latest_hash; current_hash = latest_hash;
// set the minimum acceptable share difficulty for this block // set the minimum acceptable share unscaled difficulty for this block
state.minimum_share_difficulty = config.minimum_share_difficulty; state.minimum_share_difficulty = config.minimum_share_difficulty;
// set a new deadline for rebuilding with fresh transactions // set a new deadline for rebuilding with fresh transactions