From 024042ababce12d1928973606b0116cc258749a4 Mon Sep 17 00:00:00 2001
From: pxgamer <owzie123@gmail.com>
Date: Thu, 6 Sep 2018 12:00:08 +0100
Subject: [PATCH 1/4] Add Blacklist class

---
 include/Blacklist.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 include/Blacklist.php

diff --git a/include/Blacklist.php b/include/Blacklist.php
new file mode 100644
index 0000000..0b30725
--- /dev/null
+++ b/include/Blacklist.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Arionum;
+
+/**
+ * Class Blacklist
+ */
+final class Blacklist
+{
+    /**
+     * The official list of blacklisted public keys
+     */
+    public const PUBLIC_KEYS = [];
+
+    /**
+     * Check if a public key is blacklisted
+     *
+     * @param string $publicKey
+     * @return bool
+     */
+    public static function checkPublicKey(string $publicKey): bool
+    {
+        return key_exists($publicKey, static::PUBLIC_KEYS);
+    }
+}

From 7146cfd3c0a7bf623c0d508cf66b4b8dae1ac4c0 Mon Sep 17 00:00:00 2001
From: pxgamer <owzie123@gmail.com>
Date: Thu, 6 Sep 2018 12:00:42 +0100
Subject: [PATCH 2/4] Add current blacklisted public keys

---
 include/Blacklist.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/Blacklist.php b/include/Blacklist.php
index 0b30725..0545778 100644
--- a/include/Blacklist.php
+++ b/include/Blacklist.php
@@ -10,7 +10,12 @@ final class Blacklist
     /**
      * The official list of blacklisted public keys
      */
-    public const PUBLIC_KEYS = [];
+    public const PUBLIC_KEYS = [
+        // phpcs:disable Generic.Files.LineLength
+        'PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCvVQcHHCNLfiP9LmzWhhpCHx39Bhc67P5HMQM9cctEFvcsUdgrkGqy18taz9ZMrAGtq7NhBYpQ4ZTHkKYiZDaSUqQ' => 'Faucet Abuser',
+        'PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCxYDeQHk7Ke66UB2Un3UMmMoJ7RF5vDZXihdEXi8gk8ZBRAi35aFrER2ZLX1mgND7sLFXKETGTjRYjoHcuRNiJN1g' => 'Octaex Exchange',
+        // phpcs:enable
+    ];
 
     /**
      * Check if a public key is blacklisted

From 30f35944eaa900cf21fa29d5e0d096ca860fc05f Mon Sep 17 00:00:00 2001
From: pxgamer <owzie123@gmail.com>
Date: Thu, 6 Sep 2018 12:02:10 +0100
Subject: [PATCH 3/4] Require the Blaclist class in init.inc

---
 include/init.inc.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/init.inc.php b/include/init.inc.php
index cae142d..a0171eb 100755
--- a/include/init.inc.php
+++ b/include/init.inc.php
@@ -16,6 +16,7 @@ if (php_sapi_name() !== 'cli' && substr_count($_SERVER['PHP_SELF'], "/") > 1) {
 require_once("include/config.inc.php");
 require_once("include/db.inc.php");
 require_once("include/functions.inc.php");
+require_once __DIR__.'/Blacklist.php';
 require_once("include/block.inc.php");
 require_once("include/account.inc.php");
 require_once("include/transaction.inc.php");

From 22028117453defdb3cd720edd406c8a8abe28cee Mon Sep 17 00:00:00 2001
From: pxgamer <owzie123@gmail.com>
Date: Thu, 6 Sep 2018 12:07:17 +0100
Subject: [PATCH 4/4] Update blacklist checks to use the class

---
 api.php                     | 7 +++----
 include/transaction.inc.php | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/api.php b/api.php
index dd74f26..da6459d 100755
--- a/api.php
+++ b/api.php
@@ -65,6 +65,8 @@ OR OTHER DEALINGS IN THE SOFTWARE.
  *     }
  */
 
+use Arionum\Blacklist;
+
 require_once("include/init.inc.php");
 error_reporting(0);
 $ip = san_ip($_SERVER['REMOTE_ADDR']);
@@ -429,10 +431,7 @@ if ($q == "getAddress") {
         api_err("Invalid public key");
     }
     if ($_config['use_official_blacklist']!==false) {
-        $blacklisted=["PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCvVQcHHCNLfiP9LmzWhhpCHx39Bhc67P5HMQM9cctEFvcsUdgrkGqy18taz9ZMrAGtq7NhBYpQ4ZTHkKYiZDaSUqQ", //faucet abuser
-        "PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCxYDeQHk7Ke66UB2Un3UMmMoJ7RF5vDZXihdEXi8gk8ZBRAi35aFrER2ZLX1mgND7sLFXKETGTjRYjoHcuRNiJN1g" // octaex
-        ];
-        if (in_array($public_key, $blacklisted)) {
+        if (Blacklist::checkPublicKey($public_key)) {
             api_err("Blacklisted account");
         }
     }
diff --git a/include/transaction.inc.php b/include/transaction.inc.php
index 858a1f2..f718de4 100755
--- a/include/transaction.inc.php
+++ b/include/transaction.inc.php
@@ -1,5 +1,7 @@
 <?php
 
+use Arionum\Blacklist;
+
 class Transaction
 {
     // reverse and remove all transactions from a block
@@ -225,11 +227,7 @@ class Transaction
         }
         
         if ($_config['use_official_blacklist']!==false) {
-            $blacklisted=[
-                "PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCvVQcHHCNLfiP9LmzWhhpCHx39Bhc67P5HMQM9cctEFvcsUdgrkGqy18taz9ZMrAGtq7NhBYpQ4ZTHkKYiZDaSUqQ", //faucet abuser
-                "PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCxYDeQHk7Ke66UB2Un3UMmMoJ7RF5vDZXihdEXi8gk8ZBRAi35aFrER2ZLX1mgND7sLFXKETGTjRYjoHcuRNiJN1g" // octaex
-            ];
-            if (in_array($public_key, $blacklisted)) {
+            if (Blacklist::checkPublicKey($x['public_key'])) {
                 return true;
             }
         }