Merge 7caaa14b93 into 37344b9439

node/miner/src/mine.rs

@@ -99,7 +99,7 @@ impl MineRangeConfig {
         }
         Some(
             self_start_position <= recall_position + SECTORS_PER_LOAD as u64
-                || self_end_position > recall_position,
+                && self_end_position > recall_position,
         )
     }
 }

node/miner/src/miner_id.rs

@@ -37,6 +37,7 @@ pub(crate) async fn check_and_request_miner_id(
                     d_id, c_id
                 ))
             } else {
+                check_miner_id(&mine_contract, d_id).await?;
                 Ok(d_id)
             }
         }

node/miner/src/pora.rs

@@ -111,7 +111,7 @@ impl<'a> Miner<'a> {
                     "Find a PoRA valid answer, quality: {}, target_quality {}, scale {:.3}",
                     U256::MAX / quality,
                     U256::MAX / self.target_quality,
-                    difficulty_scale_x64.as_u128() as f64 / (u64::MAX as f64 + 1.0)
+                    difficulty_scale_x64.as_u128() as f64 / u64::MAX as f64
                 );
                 inc_counter(&HIT_COUNT);
                 // Undo mix data when find a valid solition