From beff53e938a919b3452cadc033aa7febd0bc5662 Mon Sep 17 00:00:00 2001 From: Arionum Date: Mon, 13 Aug 2018 05:15:02 +0300 Subject: [PATCH] 80458 --- include/block.inc.php | 10 +++++----- mine.php | 4 ++-- sanity.php | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/block.inc.php b/include/block.inc.php index daa521d..4e3dd54 100755 --- a/include/block.inc.php +++ b/include/block.inc.php @@ -43,7 +43,7 @@ class Block $msg = ''; - if($height>=80460){ + if($height>=80458){ //reward the masternode $mn_winner=$db->single( @@ -143,7 +143,7 @@ $this->reset_fails_masternodes($mn_winner, $height, $hash); // parse the block's transactions and insert them to db $res = $this->parse_block($hash, $height, $data, false, $bootstrapping); - if (($height-1)%3==2 && $height>=80000&&$height<80460) { + if (($height-1)%3==2 && $height>=80000&&$height<80458) { $this->blacklist_masternodes(); $this->reset_fails_masternodes($public_key, $height, $hash); } @@ -229,7 +229,7 @@ $this->reset_fails_masternodes($mn_winner, $height, $hash); $height = $current['height']; - if ($height == 10801) { + if ($height == 10801||($height>=80456&&$height<80460)) { return 5555555555; //hard fork 10900 resistance, force new difficulty } @@ -460,7 +460,7 @@ $this->reset_fails_masternodes($mn_winner, $height, $hash); // reward transaction and signature $reward = $this->reward($height, $data); -if($height>=80460){ +if($height>=80458){ //reward the masternode global $db; $mn_winner=$db->single( @@ -595,7 +595,7 @@ if($height>=80460){ $argon = '$argon2i$v=19$m=16384,t=4,p=4'.$argon; } - } elseif($current_height>=80460){ + } elseif($current_height>=80458){ if ($current_height%2==0) { // cpu mining _log("CPU Mining - $current_height", 2); diff --git a/mine.php b/mine.php index 7c331af..ce87eda 100755 --- a/mine.php +++ b/mine.php @@ -56,7 +56,7 @@ if ($q == "info") { $argon_threads=1; $argon_time=1; } - } elseif($current_height>=80460&&$current_height%2==0){ + } elseif($current_height>=80458&&$current_height%2==0){ $argon_mem=524288; $argon_threads=1; $argon_time=1; @@ -73,7 +73,7 @@ if ($q == "info") { "SELECT public_key FROM masternode WHERE status=1 AND blacklist<:current AND height<:start ORDER by last_won ASC, public_key ASC LIMIT 1", [":current"=>$current_height, ":start"=>$current_height-360] ); - $recommendation="pause"; + //$recommendation="pause"; if ($winner===false) { $recommendation="mine"; } diff --git a/sanity.php b/sanity.php index e0e8272..041e61c 100755 --- a/sanity.php +++ b/sanity.php @@ -510,7 +510,7 @@ if ($current['height'] < $largest_height && $largest_height > 1) { } // check if the block mining data is correct for ($i = $last_good + 1; $i <= $largest_height; $i++) { - if (($i-1)%3==2&&$cblock[$i - 1]['height']<80460) { + if (($i-1)%3==2&&$cblock[$i - 1]['height']<80458) { continue; } if (!$block->mine(