Merge branch 'arionum:master' into master
This commit is contained in:
@@ -450,15 +450,16 @@ class Block
|
||||
$blacklist[]=san($x['message']);
|
||||
}
|
||||
}
|
||||
if($height>=1641600){
|
||||
$r=$db->run("SELECT public_key FROM masternode WHERE voted=1");
|
||||
foreach ($r as $masternode) {
|
||||
if (!in_array($masternode, $blacklist)) {
|
||||
_log("Masternode removed from voting blacklist - $masternode", 3);
|
||||
$this->add_log($hash, ["table"=>"masternode", "key"=>"public_key","id"=>$masternode, "vals"=>['voted'=>1]]);
|
||||
$db->run("UPDATE masternode SET voted=0 WHERE public_key=:pub", [":pub"=>$masternode]);
|
||||
if (!in_array($masternode['public_key'], $blacklist)) {
|
||||
_log("Masternode removed from voting blacklist - $masternode[public_key]", 3);
|
||||
$this->add_log($hash, ["table"=>"masternode", "key"=>"public_key","id"=>$masternode['public_key'], "vals"=>['voted'=>1]]);
|
||||
$db->run("UPDATE masternode SET voted=0 WHERE public_key=:pub", [":pub"=>$masternode['public_key']]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($blacklist as $masternode) {
|
||||
$res=$db->single("SELECT voted FROM masternode WHERE public_key=:pub", [":pub"=>$masternode]);
|
||||
if ($res==0) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?php
|
||||
// ARO version
|
||||
define("VERSION", "1.0.0-alpha.6");
|
||||
define("VERSION", "1.0.0-alpha.7");
|
||||
// UTC timezone by default
|
||||
date_default_timezone_set("UTC");
|
||||
|
||||
|
||||
Reference in New Issue
Block a user