sido/node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

80458

Browse Source
This commit is contained in:
Arionum
2018-08-13 05:15:02 +03:00
parent 5ca54479a7
commit beff53e938
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/block.inc.php
View File

@@ -43,7 +43,7 @@ class Block
$msg = ''; $msg = '';
if($height>=80460){ if($height>=80458){
//reward the masternode //reward the masternode
$mn_winner=$db->single( $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 // parse the block's transactions and insert them to db
$res = $this->parse_block($hash, $height, $data, false, $bootstrapping); $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->blacklist_masternodes();
$this->reset_fails_masternodes($public_key, $height, $hash); $this->reset_fails_masternodes($public_key, $height, $hash);
} }
@@ -229,7 +229,7 @@ $this->reset_fails_masternodes($mn_winner, $height, $hash);
$height = $current['height']; $height = $current['height'];
if ($height == 10801) { if ($height == 10801||($height>=80456&&$height<80460)) {
return 5555555555; //hard fork 10900 resistance, force new difficulty 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 transaction and signature
$reward = $this->reward($height, $data); $reward = $this->reward($height, $data);
if($height>=80460){ if($height>=80458){
//reward the masternode //reward the masternode
global $db; global $db;
$mn_winner=$db->single( $mn_winner=$db->single(
@@ -595,7 +595,7 @@ if($height>=80460){
$argon = '$argon2i$v=19$m=16384,t=4,p=4'.$argon; $argon = '$argon2i$v=19$m=16384,t=4,p=4'.$argon;
} }
} elseif($current_height>=80460){ } elseif($current_height>=80458){
if ($current_height%2==0) { if ($current_height%2==0) {
// cpu mining // cpu mining
_log("CPU Mining - $current_height", 2); _log("CPU Mining - $current_height", 2);

4
mine.php
View File

@@ -56,7 +56,7 @@ if ($q == "info") {
$argon_threads=1; $argon_threads=1;
$argon_time=1; $argon_time=1;
} }
} elseif($current_height>=80460&&$current_height%2==0){ } elseif($current_height>=80458&&$current_height%2==0){
$argon_mem=524288; $argon_mem=524288;
$argon_threads=1; $argon_threads=1;
$argon_time=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", "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] [":current"=>$current_height, ":start"=>$current_height-360]
); );
$recommendation="pause"; //$recommendation="pause";
if ($winner===false) { if ($winner===false) {
$recommendation="mine"; $recommendation="mine";
} }

2
sanity.php
View File

@@ -510,7 +510,7 @@ if ($current['height'] < $largest_height && $largest_height > 1) {
} }
// check if the block mining data is correct // check if the block mining data is correct
for ($i = $last_good + 1; $i <= $largest_height; $i++) { 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; continue;
} }
if (!$block->mine( if (!$block->mine(