Update blacklist checks to use the class

This commit is contained in:
pxgamer
2018-09-06 12:07:17 +01:00
parent 30f35944ea
commit 2202811745
2 changed files with 6 additions and 9 deletions

View File

@@ -65,6 +65,8 @@ OR OTHER DEALINGS IN THE SOFTWARE.
* } * }
*/ */
use Arionum\Blacklist;
require_once("include/init.inc.php"); require_once("include/init.inc.php");
error_reporting(0); error_reporting(0);
$ip = san_ip($_SERVER['REMOTE_ADDR']); $ip = san_ip($_SERVER['REMOTE_ADDR']);
@@ -429,10 +431,7 @@ if ($q == "getAddress") {
api_err("Invalid public key"); api_err("Invalid public key");
} }
if ($_config['use_official_blacklist']!==false) { if ($_config['use_official_blacklist']!==false) {
$blacklisted=["PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCvVQcHHCNLfiP9LmzWhhpCHx39Bhc67P5HMQM9cctEFvcsUdgrkGqy18taz9ZMrAGtq7NhBYpQ4ZTHkKYiZDaSUqQ", //faucet abuser if (Blacklist::checkPublicKey($public_key)) {
"PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCxYDeQHk7Ke66UB2Un3UMmMoJ7RF5vDZXihdEXi8gk8ZBRAi35aFrER2ZLX1mgND7sLFXKETGTjRYjoHcuRNiJN1g" // octaex
];
if (in_array($public_key, $blacklisted)) {
api_err("Blacklisted account"); api_err("Blacklisted account");
} }
} }

View File

@@ -1,5 +1,7 @@
<?php <?php
use Arionum\Blacklist;
class Transaction class Transaction
{ {
// reverse and remove all transactions from a block // reverse and remove all transactions from a block
@@ -225,11 +227,7 @@ class Transaction
} }
if ($_config['use_official_blacklist']!==false) { if ($_config['use_official_blacklist']!==false) {
$blacklisted=[ if (Blacklist::checkPublicKey($x['public_key'])) {
"PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCvVQcHHCNLfiP9LmzWhhpCHx39Bhc67P5HMQM9cctEFvcsUdgrkGqy18taz9ZMrAGtq7NhBYpQ4ZTHkKYiZDaSUqQ", //faucet abuser
"PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCxYDeQHk7Ke66UB2Un3UMmMoJ7RF5vDZXihdEXi8gk8ZBRAi35aFrER2ZLX1mgND7sLFXKETGTjRYjoHcuRNiJN1g" // octaex
];
if (in_array($public_key, $blacklisted)) {
return true; return true;
} }
} }