passive peering

Add initial peers list to configuration

.travis.yml

@@ -0,0 +1,25 @@
+dist: trusty
+language: php
+
+php:
+  - 7.2
+  - nightly
+
+matrix:
+  allow_failures:
+    - php: nightly
+
+# This triggers builds to run on the new TravisCI infrastructure.
+# See: https://docs.travis-ci.com/user/reference/trusty#Container-based-with-sudo%3A-false
+sudo: false
+
+## Cache composer
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+before_script:
+  - travis_retry composer update --no-interaction --prefer-dist
+
+script:
+  - vendor/bin/phpcs -l --standard=psr2 . include

README.md

@@ -1,55 +1,54 @@
 # node
-Arionum (ARO) cryptocurrency node
 
------------------------------------------------------
-Block 10800 Hard fork - Code name: Resistance
+The Arionum (ARO) cryptocurrency node.
 
-In order to increase the fairness of Arionum and stay true to the inital claim of being a cpu coin, we will be changing the mining algorithm starting the block 10800.
+## Install
 
-The new mining alghoritm uses:
+**Hardware Requirements:**
+```
+2GB RAM
+1 CPU Core
+50GB DISK
+```
+**Requirements:**
 
-threads=1
+- PHP 7.2
+  - PDO extension
+  - GMP extension
+  - BCMath extension
+- MySQL/MariaDB
 
-memory=524288
-
-time=1
-
-Also, starting block 10800, the maximum transaction fee will be 10 ARO.
-
------------------------------------------------------
-
-Requires php 7.2, mysql/mariadb, php-pdo, php-bcmath and php-gmp
-
-This app should only be run in the main directory of the domain/subdomain, ex: http://111.111.111.111/
-
-The node should have a public IP and be accessible over internet. 
-
-Installation:
 1. Install MySQL or MariaDB and create a database and a user.
-
-2. Edit include/config.inc.php and set the DB login data
-
-3. Change permissions to tmp and tmp/db-update to 777 (chmod 777 tmp -R)
-
+2. Rename `include/config-sample.inc.php` to  `include/config.inc.php` and set the DB login data
+3. Change permissions to tmp and `tmp/db-update` to 777 (`chmod 777 tmp -R`)
 4. Access the http://ip-or-domain and refresh once
 
-Official website: https://www.arionum.com
+## Usage
 
-Block explorer: https://arionum.info
+This app should only be run in the main directory of the domain/subdomain, ex: http://111.111.111.111
 
-Forums: https://forum.arionum.com
+The node should have a public IP and be accessible over internet.
 
+## Links
 
-Development Fund
+- Official website: https://www.arionum.com
+- Block explorer: https://arionum.info
+- Forums: https://forum.arionum.com
 
-ARO: 5WuRMXGM7Pf8NqEArVz1NxgSBptkimSpvuSaYC79g1yo3RDQc8TjVtGH5chQWQV7CHbJEuq9DmW5fbmCEW4AghQr
+## Development Fund
 
-LTC: LWgqzbXGeucKaMmJEvwaAWPFrAgKiJ4Y4m
-
-BTC: 1LdoMmYitb4C3pXoGNLL1VRj7xk3smGXoU
-
-ETH: 0x4B904bDf071E9b98441d25316c824D7b7E447527
-
-BCH: qrtkqrl3mxzdzl66nchkgdv73uu3rf7jdy7el2vduw
+Coin | Address
+---- | --------
+[ARO]: | 5WuRMXGM7Pf8NqEArVz1NxgSBptkimSpvuSaYC79g1yo3RDQc8TjVtGH5chQWQV7CHbJEuq9DmW5fbmCEW4AghQr
+[LTC]: | LWgqzbXGeucKaMmJEvwaAWPFrAgKiJ4Y4m
+[BTC]: | 1LdoMmYitb4C3pXoGNLL1VRj7xk3smGXoU
+[ETH]: | 0x4B904bDf071E9b98441d25316c824D7b7E447527
+[BCH]: | qrtkqrl3mxzdzl66nchkgdv73uu3rf7jdy7el2vduw
 
 If you'd like to support the Arionum development, you can donate to the addresses listed above.
+
+[aro]: https://arionum.com
+[ltc]: https://litecoin.org
+[btc]: https://bitcoin.org
+[eth]: https://ethereum.org
+[bch]: https://www.bitcoincash.org

UPGRADE

@@ -0,0 +1,6 @@
+In order to upgrade your Arionum Node, follow the next steps:
+1. Download the source code from https://github.com/arionum/node
+2. Edit the include/config.inc.php with the DB details
+3. Replace your old node folder with the new one.
+4. chmod 777 tmp -R
+5. Load the node's address in your browser.

composer.json

@@ -0,0 +1,19 @@
+{
+    "name": "arionum/node",
+    "description": "The Arionum (ARO) cryptocurrency node.",
+    "license": "MIT",
+    "require": {
+        "php": "^7.2",
+        "ext-bcmath": "*",
+        "ext-gmp": "*",
+        "ext-openssl": "*",
+        "ext-pdo": "*"
+    },
+    "require-dev": {
+        "squizlabs/php_codesniffer": "^3.2"
+    },
+    "scripts": {
+        "check-style": "phpcs -p -l --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 . include",
+        "fix-style": "phpcbf -p -l --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 . include"
+    }
+}

doc/api_data.js

@@ -101,6 +101,57 @@ define({ "api": [
     "filename": "./api.php",
     "groupTitle": "API"
   },
+  {
+    "type": "get",
+    "url": "/api.php?q=checkSignature",
+    "title": "17. checkSignature",
+    "name": "checkSignature",
+    "group": "API",
+    "description": "<p>Checks a signature against a public key</p>",
+    "parameter": {
+      "fields": {
+        "Parameter": [
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "public_key",
+            "description": "<p>Public key</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "signature",
+            "description": "<p>signature</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "data",
+            "description": "<p>signed data</p>"
+          }
+        ]
+      }
+    },
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "boolean",
+            "optional": false,
+            "field": "data",
+            "description": "<p>true or false</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
   {
     "type": "get",
     "url": "/api.php?q=currentBlock",
@@ -249,6 +300,50 @@ define({ "api": [
     "filename": "./api.php",
     "groupTitle": "API"
   },
+  {
+    "type": "get",
+    "url": "/api.php?q=getAlias",
+    "title": "19. getAlias",
+    "name": "getAlias",
+    "group": "API",
+    "description": "<p>Returns the alias of an account</p>",
+    "parameter": {
+      "fields": {
+        "Parameter": [
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "public_key",
+            "description": "<p>Public key</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "account",
+            "description": "<p>Account id / address</p>"
+          }
+        ]
+      }
+    },
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "string",
+            "optional": false,
+            "field": "data",
+            "description": "<p>alias</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
   {
     "type": "get",
     "url": "/api.php?q=getBalance",
@@ -272,6 +367,13 @@ define({ "api": [
             "optional": true,
             "field": "account",
             "description": "<p>Account id / address</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "alias",
+            "description": "<p>alias</p>"
           }
         ]
       }
@@ -420,7 +522,7 @@ define({ "api": [
             "group": "Success 200",
             "type": "numeric",
             "optional": false,
-            "field": "confirmation",
+            "field": "confirmations",
             "description": "<p>Number of confirmations</p>"
           },
           {
@@ -865,6 +967,30 @@ define({ "api": [
     "filename": "./api.php",
     "groupTitle": "API"
   },
+  {
+    "type": "get",
+    "url": "/api.php?q=masternodes",
+    "title": "18. masternodes",
+    "name": "masternodes",
+    "group": "API",
+    "description": "<p>Returns all the masternode data</p>",
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "boolean",
+            "optional": false,
+            "field": "data",
+            "description": "<p>masternode date</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
   {
     "type": "get",
     "url": "/api.php?q=mempoolSize",
@@ -889,6 +1015,182 @@ define({ "api": [
     "filename": "./api.php",
     "groupTitle": "API"
   },
+  {
+    "type": "get",
+    "url": "/api.php?q=node-info",
+    "title": "21. node-info",
+    "name": "node_info",
+    "group": "API",
+    "description": "<p>Returns details about the node.</p>",
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "object",
+            "optional": false,
+            "field": "data",
+            "description": "<p>A collection of data about the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "string",
+            "optional": false,
+            "field": "data.hostname",
+            "description": "<p>The hostname of the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "string",
+            "optional": false,
+            "field": "data.version",
+            "description": "<p>The current version of the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "string",
+            "optional": false,
+            "field": "data.dbversion",
+            "description": "<p>The database schema version for the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "number",
+            "optional": false,
+            "field": "data.accounts",
+            "description": "<p>The number of accounts known by the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "number",
+            "optional": false,
+            "field": "data.transactions",
+            "description": "<p>The number of transactions known by the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "number",
+            "optional": false,
+            "field": "data.mempool",
+            "description": "<p>The number of transactions in the mempool.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "number",
+            "optional": false,
+            "field": "data.masternodes",
+            "description": "<p>The number of masternodes known by the node.</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
+  {
+    "type": "get",
+    "url": "/api.php?q=randomNumber",
+    "title": "16. randomNumber",
+    "name": "randomNumber",
+    "group": "API",
+    "description": "<p>Returns a random number based on an ARO block id.</p>",
+    "parameter": {
+      "fields": {
+        "Parameter": [
+          {
+            "group": "Parameter",
+            "type": "numeric",
+            "optional": false,
+            "field": "height",
+            "description": "<p>The height of the block on which the random number will be based on (should be a future block when starting)</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "numeric",
+            "optional": false,
+            "field": "min",
+            "description": "<p>Minimum number (default 1)</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "numeric",
+            "optional": false,
+            "field": "max",
+            "description": "<p>Maximum number</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": false,
+            "field": "seed",
+            "description": "<p>A seed to generate different numbers for each use cases.</p>"
+          }
+        ]
+      }
+    },
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "numeric",
+            "optional": false,
+            "field": "data",
+            "description": "<p>The random number</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
+  {
+    "type": "get",
+    "url": "/api.php?q=sanity",
+    "title": "20. sanity",
+    "name": "sanity",
+    "group": "API",
+    "description": "<p>Returns details about the node's sanity process.</p>",
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "object",
+            "optional": false,
+            "field": "data",
+            "description": "<p>A collection of data about the sanity process.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "boolean",
+            "optional": false,
+            "field": "data.sanity_running",
+            "description": "<p>Whether the sanity process is currently running.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "number",
+            "optional": false,
+            "field": "data.last_sanity",
+            "description": "<p>The timestamp for the last time the sanity process was run.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "boolean",
+            "optional": false,
+            "field": "data.sanity_sync",
+            "description": "<p>Whether the sanity process is currently synchronising.</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
   {
     "type": "get",
     "url": "/api.php?q=send",
@@ -999,6 +1301,34 @@ define({ "api": [
     "filename": "./api.php",
     "groupTitle": "API"
   },
+  {
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "optional": false,
+            "field": "varname1",
+            "description": "<p>No type.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "String",
+            "optional": false,
+            "field": "varname2",
+            "description": "<p>With type.</p>"
+          }
+        ]
+      }
+    },
+    "type": "",
+    "url": "",
+    "version": "0.0.0",
+    "filename": "./doc/main.js",
+    "group": "C__Users_owen_voke_Documents_GitHub_php_arionum_node_doc_main_js",
+    "groupTitle": "C__Users_owen_voke_Documents_GitHub_php_arionum_node_doc_main_js",
+    "name": ""
+  },
   {
     "type": "php util.php",
     "url": "balance",
@@ -1211,6 +1541,24 @@ define({ "api": [
     "filename": "./util.php",
     "groupTitle": "UTIL"
   },
+  {
+    "type": "php util.php",
+    "url": "clean-blacklist",
+    "title": "Clean-Blacklist",
+    "name": "clean_blacklist",
+    "group": "UTIL",
+    "description": "<p>Removes all the peers from blacklist</p>",
+    "examples": [
+      {
+        "title": "Example usage:",
+        "content": "php util.php clean-blacklist",
+        "type": "cli"
+      }
+    ],
+    "version": "0.0.0",
+    "filename": "./util.php",
+    "groupTitle": "UTIL"
+  },
   {
     "type": "php util.php",
     "url": "current",
@@ -1487,33 +1835,5 @@ define({ "api": [
     "version": "0.0.0",
     "filename": "./util.php",
     "groupTitle": "UTIL"
-  },
-  {
-    "success": {
-      "fields": {
-        "Success 200": [
-          {
-            "group": "Success 200",
-            "optional": false,
-            "field": "varname1",
-            "description": "<p>No type.</p>"
-          },
-          {
-            "group": "Success 200",
-            "type": "String",
-            "optional": false,
-            "field": "varname2",
-            "description": "<p>With type.</p>"
-          }
-        ]
-      }
-    },
-    "type": "",
-    "url": "",
-    "version": "0.0.0",
-    "filename": "./doc/main.js",
-    "group": "_github_node_doc_main_js",
-    "groupTitle": "_github_node_doc_main_js",
-    "name": ""
   }
 ] });

doc/api_data.json

@@ -101,6 +101,57 @@
     "filename": "./api.php",
     "groupTitle": "API"
   },
+  {
+    "type": "get",
+    "url": "/api.php?q=checkSignature",
+    "title": "17. checkSignature",
+    "name": "checkSignature",
+    "group": "API",
+    "description": "<p>Checks a signature against a public key</p>",
+    "parameter": {
+      "fields": {
+        "Parameter": [
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "public_key",
+            "description": "<p>Public key</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "signature",
+            "description": "<p>signature</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "data",
+            "description": "<p>signed data</p>"
+          }
+        ]
+      }
+    },
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "boolean",
+            "optional": false,
+            "field": "data",
+            "description": "<p>true or false</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
   {
     "type": "get",
     "url": "/api.php?q=currentBlock",
@@ -249,6 +300,50 @@
     "filename": "./api.php",
     "groupTitle": "API"
   },
+  {
+    "type": "get",
+    "url": "/api.php?q=getAlias",
+    "title": "19. getAlias",
+    "name": "getAlias",
+    "group": "API",
+    "description": "<p>Returns the alias of an account</p>",
+    "parameter": {
+      "fields": {
+        "Parameter": [
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "public_key",
+            "description": "<p>Public key</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "account",
+            "description": "<p>Account id / address</p>"
+          }
+        ]
+      }
+    },
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "string",
+            "optional": false,
+            "field": "data",
+            "description": "<p>alias</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
   {
     "type": "get",
     "url": "/api.php?q=getBalance",
@@ -272,6 +367,13 @@
             "optional": true,
             "field": "account",
             "description": "<p>Account id / address</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": true,
+            "field": "alias",
+            "description": "<p>alias</p>"
           }
         ]
       }
@@ -420,7 +522,7 @@
             "group": "Success 200",
             "type": "numeric",
             "optional": false,
-            "field": "confirmation",
+            "field": "confirmations",
             "description": "<p>Number of confirmations</p>"
           },
           {
@@ -865,6 +967,30 @@
     "filename": "./api.php",
     "groupTitle": "API"
   },
+  {
+    "type": "get",
+    "url": "/api.php?q=masternodes",
+    "title": "18. masternodes",
+    "name": "masternodes",
+    "group": "API",
+    "description": "<p>Returns all the masternode data</p>",
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "boolean",
+            "optional": false,
+            "field": "data",
+            "description": "<p>masternode date</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
   {
     "type": "get",
     "url": "/api.php?q=mempoolSize",
@@ -889,6 +1015,182 @@
     "filename": "./api.php",
     "groupTitle": "API"
   },
+  {
+    "type": "get",
+    "url": "/api.php?q=node-info",
+    "title": "21. node-info",
+    "name": "node_info",
+    "group": "API",
+    "description": "<p>Returns details about the node.</p>",
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "object",
+            "optional": false,
+            "field": "data",
+            "description": "<p>A collection of data about the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "string",
+            "optional": false,
+            "field": "data.hostname",
+            "description": "<p>The hostname of the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "string",
+            "optional": false,
+            "field": "data.version",
+            "description": "<p>The current version of the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "string",
+            "optional": false,
+            "field": "data.dbversion",
+            "description": "<p>The database schema version for the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "number",
+            "optional": false,
+            "field": "data.accounts",
+            "description": "<p>The number of accounts known by the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "number",
+            "optional": false,
+            "field": "data.transactions",
+            "description": "<p>The number of transactions known by the node.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "number",
+            "optional": false,
+            "field": "data.mempool",
+            "description": "<p>The number of transactions in the mempool.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "number",
+            "optional": false,
+            "field": "data.masternodes",
+            "description": "<p>The number of masternodes known by the node.</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
+  {
+    "type": "get",
+    "url": "/api.php?q=randomNumber",
+    "title": "16. randomNumber",
+    "name": "randomNumber",
+    "group": "API",
+    "description": "<p>Returns a random number based on an ARO block id.</p>",
+    "parameter": {
+      "fields": {
+        "Parameter": [
+          {
+            "group": "Parameter",
+            "type": "numeric",
+            "optional": false,
+            "field": "height",
+            "description": "<p>The height of the block on which the random number will be based on (should be a future block when starting)</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "numeric",
+            "optional": false,
+            "field": "min",
+            "description": "<p>Minimum number (default 1)</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "numeric",
+            "optional": false,
+            "field": "max",
+            "description": "<p>Maximum number</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": false,
+            "field": "seed",
+            "description": "<p>A seed to generate different numbers for each use cases.</p>"
+          }
+        ]
+      }
+    },
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "numeric",
+            "optional": false,
+            "field": "data",
+            "description": "<p>The random number</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
+  {
+    "type": "get",
+    "url": "/api.php?q=sanity",
+    "title": "20. sanity",
+    "name": "sanity",
+    "group": "API",
+    "description": "<p>Returns details about the node's sanity process.</p>",
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "type": "object",
+            "optional": false,
+            "field": "data",
+            "description": "<p>A collection of data about the sanity process.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "boolean",
+            "optional": false,
+            "field": "data.sanity_running",
+            "description": "<p>Whether the sanity process is currently running.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "number",
+            "optional": false,
+            "field": "data.last_sanity",
+            "description": "<p>The timestamp for the last time the sanity process was run.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "boolean",
+            "optional": false,
+            "field": "data.sanity_sync",
+            "description": "<p>Whether the sanity process is currently synchronising.</p>"
+          }
+        ]
+      }
+    },
+    "version": "0.0.0",
+    "filename": "./api.php",
+    "groupTitle": "API"
+  },
   {
     "type": "get",
     "url": "/api.php?q=send",
@@ -999,6 +1301,34 @@
     "filename": "./api.php",
     "groupTitle": "API"
   },
+  {
+    "success": {
+      "fields": {
+        "Success 200": [
+          {
+            "group": "Success 200",
+            "optional": false,
+            "field": "varname1",
+            "description": "<p>No type.</p>"
+          },
+          {
+            "group": "Success 200",
+            "type": "String",
+            "optional": false,
+            "field": "varname2",
+            "description": "<p>With type.</p>"
+          }
+        ]
+      }
+    },
+    "type": "",
+    "url": "",
+    "version": "0.0.0",
+    "filename": "./doc/main.js",
+    "group": "C__Users_owen_voke_Documents_GitHub_php_arionum_node_doc_main_js",
+    "groupTitle": "C__Users_owen_voke_Documents_GitHub_php_arionum_node_doc_main_js",
+    "name": ""
+  },
   {
     "type": "php util.php",
     "url": "balance",
@@ -1211,6 +1541,24 @@
     "filename": "./util.php",
     "groupTitle": "UTIL"
   },
+  {
+    "type": "php util.php",
+    "url": "clean-blacklist",
+    "title": "Clean-Blacklist",
+    "name": "clean_blacklist",
+    "group": "UTIL",
+    "description": "<p>Removes all the peers from blacklist</p>",
+    "examples": [
+      {
+        "title": "Example usage:",
+        "content": "php util.php clean-blacklist",
+        "type": "cli"
+      }
+    ],
+    "version": "0.0.0",
+    "filename": "./util.php",
+    "groupTitle": "UTIL"
+  },
   {
     "type": "php util.php",
     "url": "current",
@@ -1487,33 +1835,5 @@
     "version": "0.0.0",
     "filename": "./util.php",
     "groupTitle": "UTIL"
-  },
-  {
-    "success": {
-      "fields": {
-        "Success 200": [
-          {
-            "group": "Success 200",
-            "optional": false,
-            "field": "varname1",
-            "description": "<p>No type.</p>"
-          },
-          {
-            "group": "Success 200",
-            "type": "String",
-            "optional": false,
-            "field": "varname2",
-            "description": "<p>With type.</p>"
-          }
-        ]
-      }
-    },
-    "type": "",
-    "url": "",
-    "version": "0.0.0",
-    "filename": "./doc/main.js",
-    "group": "_github_node_doc_main_js",
-    "groupTitle": "_github_node_doc_main_js",
-    "name": ""
   }
 ]

doc/api_project.js

@@ -1,13 +1,14 @@
 define({
-  "name": "",
+  "name": "Arionum Node",
   "version": "0.0.0",
-  "description": "",
+  "description": "The Arionum Node API and utility documentation.",
+  "title": "Arionum Node",
   "sampleUrl": false,
   "defaultVersion": "0.0.0",
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2018-02-22T16:13:41.713Z",
+    "time": "2018-10-12T11:08:47.065Z",
     "url": "http://apidocjs.com",
     "version": "0.17.6"
   }

doc/api_project.json

@@ -1,13 +1,14 @@
 {
-  "name": "",
+  "name": "Arionum Node",
   "version": "0.0.0",
-  "description": "",
+  "description": "The Arionum Node API and utility documentation.",
+  "title": "Arionum Node",
   "sampleUrl": false,
   "defaultVersion": "0.0.0",
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2018-02-22T16:13:41.713Z",
+    "time": "2018-10-12T11:08:47.065Z",
     "url": "http://apidocjs.com",
     "version": "0.17.6"
   }

include/Blacklist.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Arionum;
+
+/**
+ * Class Blacklist
+ */
+final class Blacklist
+{
+    /**
+     * The official list of blacklisted public keys
+     */
+    public const PUBLIC_KEYS = [
+        // phpcs:disable Generic.Files.LineLength
+        'PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCvVQcHHCNLfiP9LmzWhhpCHx39Bhc67P5HMQM9cctEFvcsUdgrkGqy18taz9ZMrAGtq7NhBYpQ4ZTHkKYiZDaSUqQ' => 'Faucet Abuser',
+        'PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCxYDeQHk7Ke66UB2Un3UMmMoJ7RF5vDZXihdEXi8gk8ZBRAi35aFrER2ZLX1mgND7sLFXKETGTjRYjoHcuRNiJN1g' => 'Octaex Exchange',
+        // phpcs:enable
+    ];
+
+    /**
+     * The official list of blacklisted addresses
+     */
+    public const ADDRESSES = [
+        // phpcs:disable Generic.Files.LineLength
+        'xuzyMbEGA1tmx1o7mcxSXf2nXuuV1GtKbA4sAqjcNq2gh3shuhwBT5nJHez9AynCaxpJwL6dpkavmZBA3JkrMkg' => 'Octaex Exchange',
+        // phpcs:enable
+    ];
+
+    /**
+     * 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);
+    }
+
+    /**
+     * Check if an address is blacklisted
+     *
+     * @param string $address
+     * @return bool
+     */
+    public static function checkAddress(string $address): bool
+    {
+        return key_exists($address, static::ADDRESSES);
+    }
+}

include/Exception.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Arionum\Node;
+
+/**
+ * Class Exception
+ * A custom exception for Arionum error handling.
+ */
+class Exception extends \Exception
+{
+}

include/InitialPeers.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace Arionum\Node;
+
+/**
+ * Class InitialPeers
+ */
+final class InitialPeers
+{
+    public const MINIMUM_PEERS_REQUIRED = 2;
+    public const PRELOAD_ERROR = 'Unable to retrieve peers from the preload list.';
+    public const PRELOAD_LIST = 'https://www.arionum.com/peers.txt';
+
+    /**
+     * @var array
+     */
+    private $peerList = [];
+
+    /**
+     * InitialPeers constructor.
+     * @param array|null $peerList
+     * @return void
+     */
+    public function __construct(?array $peerList = [])
+    {
+        $this->peerList = $peerList;
+    }
+
+    /**
+     * Retrieve a peer from the initial peer list.
+     * @return string
+     * @throws Exception
+     */
+    public function get(): string
+    {
+        if (!$this->peerList || count($this->peerList) < self::MINIMUM_PEERS_REQUIRED) {
+            $this->retrieveFromPreloadList();
+        }
+
+        return $this->selectPeer();
+    }
+
+    /**
+     * Retrieve all available initial peers.
+     * @return array
+     * @throws Exception
+     */
+    public function getAll(): array
+    {
+        if (!$this->peerList || count($this->peerList) < self::MINIMUM_PEERS_REQUIRED) {
+            $this->retrieveFromPreloadList();
+        }
+
+        return $this->peerList;
+    }
+
+    /**
+     * @return string
+     */
+    private function selectPeer(): string
+    {
+        return $this->peerList[array_rand($this->peerList)];
+    }
+
+    /**
+     * Retrieve a peer from
+     *
+     * @return void
+     * @throws Exception
+     */
+    private function retrieveFromPreloadList(): void
+    {
+        $peerList = file(self::PRELOAD_LIST, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+
+        if (!$peerList || count($peerList) < self::MINIMUM_PEERS_REQUIRED) {
+            throw new Exception(self::PRELOAD_ERROR);
+        }
+
+        $this->peerList = $peerList;
+    }
+}

include/account.inc.php

@@ -1,162 +1,318 @@
 <?php
 
-class Account {
-	
-	
-	// inserts the account in the DB and updates the public key if empty
-	public function add($public_key, $block){
-		global $db;
-		$id=$this->get_address($public_key);
-		$bind=array(":id"=>$id, ":public_key"=>$public_key, ":block"=>$block,":public_key2"=>$public_key );
-		
-		$db->run("INSERT INTO accounts SET id=:id, public_key=:public_key, block=:block, balance=0 ON DUPLICATE KEY UPDATE public_key=if(public_key='',:public_key2,public_key)",$bind);
-	}
-	// inserts just the account without public key
-	public function add_id($id, $block){
-		global $db;
-		$bind=array(":id"=>$id, ":block"=>$block);
-		$db->run("INSERT ignore INTO accounts SET id=:id, public_key='', block=:block, balance=0",$bind);
-	}
-	// generates Account's address from the public key
-	public function get_address($hash){
+class Account
+{
+    // inserts the account in the DB and updates the public key if empty
+    public function add($public_key, $block)
+    {
+        global $db;
+        $id = $this->get_address($public_key);
+        $bind = [":id" => $id, ":public_key" => $public_key, ":block" => $block, ":public_key2" => $public_key];
 
-                //broken base58 addresses, which are block winners, missing the first 0 bytes from the address.
-                if($hash=='PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCwCpspGFGQSaF9yVGLamBgymdf8M7FafghmP3oPzQb3W4PZsZApVa41uQrrHRVBH5p9bdoz7c6XeRQHK2TkzWR45e') return '22SoB29oyq2JhMxtBbesL7JioEYytyC6VeFmzvBH6fRQrueSvyZfEXR5oR7ajSQ9mLERn6JKU85EAbVDNChke32';
-                elseif($hash=='PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCzbRyyz5oDNDKhk5jyjg4caRjkbqegMZMrUkuBjVMuYcVfPyc3aKuLmPHS4QEDjCrNGks7Z5oPxwv4yXSv7WJnkbL') return 'AoFnv3SLujrJSa2J7FDTADGD7Eb9kv3KtNAp7YVYQEUPcLE6cC6nLvvhVqcVnRLYF5BFF38C1DyunUtmfJBhyU';
-                elseif($hash=='PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCyradtFFJoaYB4QdcXyBGSXjiASMMnofsT4f5ZNaxTnNDJt91ubemn3LzgKrfQh8CBpqaphkVNoRLub2ctdMnrzG1') return 'RncXQuc7S7aWkvTUJSHEFvYoV3ntAf7bfxEHjSiZNBvQV37MzZtg44L7GAV7szZ3uV8qWqikBewa3piZMqzBqm';
-                elseif($hash=='PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCyjKMBY4ihhJ2G25EVezg7KnoCBVbhdvWfqzNA4LC5R7wgu3VNfJgvqkCq9sKKZcCoCpX6Qr9cN882MoXsfGTvZoj') return 'Rq53oLzpCrb4BdJZ1jqQ2zsixV2ukxVdM4H9uvUhCGJCz1q2wagvuXV4hC6UVwK7HqAt1FenukzhVXgzyG1y32';
+        $db->run(
+            "INSERT INTO accounts SET id=:id, public_key=:public_key, block=:block, balance=0 ON DUPLICATE KEY UPDATE public_key=if(public_key='',:public_key2,public_key)",
+            $bind
+        );
+    }
 
-		
-		// hashes 9 times in sha512 (binary) and encodes in base58
-	        for($i=0;$i<9;$i++) $hash=hash('sha512',$hash, true);					
-		return base58_encode($hash);
-        	
+    // inserts just the account without public key
+    public function add_id($id, $block)
+    {
+        global $db;
+        $bind = [":id" => $id, ":block" => $block];
+        $db->run("INSERT ignore INTO accounts SET id=:id, public_key='', block=:block, balance=0", $bind);
+    }
 
-	}
-	// checks the ecdsa secp256k1 signature for a specific public key
-	public function check_signature($data, $signature, $public_key){
-	
-		return ec_verify($data ,$signature, $public_key);
-	}
+    // generates Account's address from the public key
+    public function get_address($hash)
+    {
+        //broken base58 addresses, which are block winners, missing the first 0 bytes from the address.
+        if ($hash == 'PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCwCpspGFGQSaF9yVGLamBgymdf8M7FafghmP3oPzQb3W4PZsZApVa41uQrrHRVBH5p9bdoz7c6XeRQHK2TkzWR45e') {
+            return '22SoB29oyq2JhMxtBbesL7JioEYytyC6VeFmzvBH6fRQrueSvyZfEXR5oR7ajSQ9mLERn6JKU85EAbVDNChke32';
+        } elseif ($hash == 'PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCzbRyyz5oDNDKhk5jyjg4caRjkbqegMZMrUkuBjVMuYcVfPyc3aKuLmPHS4QEDjCrNGks7Z5oPxwv4yXSv7WJnkbL') {
+            return 'AoFnv3SLujrJSa2J7FDTADGD7Eb9kv3KtNAp7YVYQEUPcLE6cC6nLvvhVqcVnRLYF5BFF38C1DyunUtmfJBhyU';
+        } elseif ($hash == 'PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCyradtFFJoaYB4QdcXyBGSXjiASMMnofsT4f5ZNaxTnNDJt91ubemn3LzgKrfQh8CBpqaphkVNoRLub2ctdMnrzG1') {
+            return 'RncXQuc7S7aWkvTUJSHEFvYoV3ntAf7bfxEHjSiZNBvQV37MzZtg44L7GAV7szZ3uV8qWqikBewa3piZMqzBqm';
+        } elseif ($hash == 'PZ8Tyr4Nx8MHsRAGMpZmZ6TWY63dXWSCyjKMBY4ihhJ2G25EVezg7KnoCBVbhdvWfqzNA4LC5R7wgu3VNfJgvqkCq9sKKZcCoCpX6Qr9cN882MoXsfGTvZoj') {
+            return 'Rq53oLzpCrb4BdJZ1jqQ2zsixV2ukxVdM4H9uvUhCGJCz1q2wagvuXV4hC6UVwK7HqAt1FenukzhVXgzyG1y32';
+        }
 
-	// generates a new account and a public/private key pair
-	public function generate_account(){
-		// using secp256k1 curve for ECDSA
-		$args = array(
-			"curve_name" => "secp256k1",
-			"private_key_type" => OPENSSL_KEYTYPE_EC,
-		);
-		
-		// generates a new key pair
-		$key1 = openssl_pkey_new($args);
+        // hashes 9 times in sha512 (binary) and encodes in base58
+        for ($i = 0; $i < 9;
+             $i++) {
+            $hash = hash('sha512', $hash, true);
+        }
+        return base58_encode($hash);
+    }
 
-		// exports the private key encoded as PEM
-		openssl_pkey_export($key1, $pvkey);
+    // checks the ecdsa secp256k1 signature for a specific public key
+    public function check_signature($data, $signature, $public_key)
+    {
+        return ec_verify($data, $signature, $public_key);
+    }
 
-		// converts the PEM to a base58 format
-		$private_key= pem2coin($pvkey);
+    // generates a new account and a public/private key pair
+    public function generate_account()
+    {
+        // using secp256k1 curve for ECDSA
+        $args = [
+            "curve_name"       => "secp256k1",
+            "private_key_type" => OPENSSL_KEYTYPE_EC,
+        ];
 
-		// exports the private key encoded as PEM
-		$pub = openssl_pkey_get_details($key1);
-		
-		// converts the PEM to a base58 format
-		$public_key= pem2coin($pub['key']);
-		
-		// generates the account's address based on the public key
-		$address=$this->get_address($public_key);
-		return array("address"=>$address, "public_key"=>$public_key,"private_key"=>$private_key);
+        // generates a new key pair
+        $key1 = openssl_pkey_new($args);
 
+        // exports the private key encoded as PEM
+        openssl_pkey_export($key1, $pvkey);
 
-	}
-	// check the validity of a base58 encoded key. At the moment, it checks only the characters to be base58.
-	public function valid_key($id){
-		$chars = str_split("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
-		for($i=0;$i<strlen($id);$i++) if(!in_array($id[$i],$chars)) return false;
+        // converts the PEM to a base58 format
+        $private_key = pem2coin($pvkey);
 
-		return true;
+        // exports the private key encoded as PEM
+        $pub = openssl_pkey_get_details($key1);
 
-	}
-	// check the validity of an address. At the moment, it checks only the characters to be base58 and the length to be >=70 and <=128.
-	public function valid($id){
-		if(strlen($id)<70||strlen($id)>128) return false;
-		$chars = str_split("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
-		for($i=0;$i<strlen($id);$i++) if(!in_array($id[$i],$chars)) return false;
+        // converts the PEM to a base58 format
+        $public_key = pem2coin($pub['key']);
 
-		return true;
+        // generates the account's address based on the public key
+        $address = $this->get_address($public_key);
+        return ["address" => $address, "public_key" => $public_key, "private_key" => $private_key];
+    }
 
-	}
-	// returns the current account balance
-	public function balance($id){
-		global $db;
-		$res=$db->single("SELECT balance FROM accounts WHERE id=:id",array(":id"=>$id));
-		if($res===false) $res="0.00000000";
-		return number_format($res,8,".","");
-	}
-	// returns the account balance - any pending debits from the mempool
-	public function pending_balance($id){
-		global $db;
-		$res=$db->single("SELECT balance FROM accounts WHERE id=:id",array(":id"=>$id));
-		if($res===false) $res="0.00000000";
+    // check the validity of a base58 encoded key. At the moment, it checks only the characters to be base58.
+    public function valid_key($id)
+    {
+        $chars = str_split("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
+        for ($i = 0; $i < strlen($id);
+             $i++) {
+            if (!in_array($id[$i], $chars)) {
+                return false;
+            }
+        }
 
-		// if the original balance is 0, no mempool transactions are possible
-		if($res=="0.00000000") return $res;
-		$mem=$db->single("SELECT SUM(val+fee) FROM mempool WHERE src=:id",array(":id"=>$id));
-		$rez=$res-$mem;
-		return number_format($rez,8,".","");
-		
-	}
-	// returns all the transactions of a specific address
-	public function get_transactions($id,$limit=100){
-		global $db;
-		$block=new Block;
-        	$current=$block->current();
-		$public_key=$this->public_key($id);
-		$limit=intval($limit);
-		if($limit>100||$limit<1) $limit=100;
-		$res=$db->run("SELECT * FROM transactions WHERE dst=:dst or public_key=:src ORDER by height DESC LIMIT :limit",array(":src"=>$public_key, ":dst"=>$id, ":limit"=>$limit));
-		
-		$transactions=array();
-		foreach($res as $x){
-			$trans=array("block"=>$x['block'],"height"=>$x['height'], "id"=>$x['id'],"dst"=>$x['dst'],"val"=>$x['val'],"fee"=>$x['fee'],"signature"=>$x['signature'], "message"=>$x['message'],"version"=>$x['version'],"date"=>$x['date'], "public_key"=>$x['public_key']);
-			$trans['src']=$this->get_address($x['public_key']);
-			$trans['confirmations']=$current['height']-$x['height'];
-			
-			// version 0 -> reward transaction, version 1 -> normal transaction
-			if($x['version']==0) $trans['type']="mining";
-			elseif($x['version']==1){
-				if($x['dst']==$id) $trans['type']="credit";
-				else $trans['type']="debit";
-			} else {
-				$trans['type']="other";
-			}
-			ksort($trans);
-			$transactions[]=$trans;
-		}
-		return $transactions;
-	}
-	// returns the transactions from the mempool
-	public function get_mempool_transactions($id){
-		global $db;
-		$transactions=array();
-		$res=$db->run("SELECT * FROM mempool WHERE src=:src ORDER by height DESC LIMIT 100",array(":src"=>$id, ":dst"=>$id));
-		foreach($res as $x){
-			$trans=array("block"=>$x['block'],"height"=>$x['height'], "id"=>$x['id'],"src"=>$x['src'],"dst"=>$x['dst'],"val"=>$x['val'],"fee"=>$x['fee'],"signature"=>$x['signature'], "message"=>$x['message'],"version"=>$x['version'],"date"=>$x['date'], "public_key"=>$x['public_key']);
-			$trans['type']="mempool";
-			// they are unconfirmed, so they will have -1 confirmations.
-			$trans['confirmations']=-1;
-			ksort($trans);
-			$transactions[]=$trans;
-		}
-		return $transactions;
-	}
-	// returns the public key for a specific account
-	public function public_key($id){
-		global $db;
-		$res=$db->single("SELECT public_key FROM accounts WHERE id=:id",array(":id"=>$id));
-		return $res;
-	}
+        return true;
+    }
+    //check alias validity
+    public function free_alias($id)
+    {
+        global $db;
+        $orig=$id;
+        $id=strtoupper($id);
+        $id = san($id);
+        if (strlen($id)<4||strlen($id)>25) {
+            return false;
+        }
+        if ($orig!=$id) {
+            return false;
+        }
+        
+        if ($db->single("SELECT COUNT(1) FROM accounts WHERE alias=:alias", [":alias"=>$id])==0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    //check if an account already has an alias
+    public function has_alias($public_key)
+    {
+        global $db;
+        $public_key=san($public_key);
+        $res=$db->single("SELECT COUNT(1) FROM accounts WHERE public_key=:public_key AND alias IS NOT NULL", [":public_key"=>$public_key]);
+        if ($res!=0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    //check alias validity
+    public function valid_alias($id)
+    {
+        global $db;
+        $orig=$id;
+        $banned=["MERCURY","DEVS","DEVELOPMENT", "MARKETING", "MERCURY80","DEVARO", "DEVELOPER","DEVELOPERS","ARODEV", "DONATION","MERCATOX", "OCTAEX", "MERCURY", "ARIONUM", "ESCROW","OKEX","BINANCE","CRYPTOPIA","HUOBI","ITFINEX","HITBTC","UPBIT","COINBASE","KRAKEN","BITSTAMP","BITTREX","POLONIEX"];
+        $id=strtoupper($id);
+        $id = san($id);
+        if (in_array($id, $banned)) {
+            return false;
+        }
+        if (strlen($id)<4||strlen($id)>25) {
+            return false;
+        }
+        if ($orig!=$id) {
+            return false;
+        }
+        return $db->single("SELECT COUNT(1) FROM accounts WHERE alias=:alias", [":alias"=>$id]);
+    }
+
+    //returns the account of an alias
+    public function alias2account($alias)
+    {
+        global $db;
+        $alias=strtoupper($alias);
+        $res=$db->single("SELECT id FROM accounts WHERE alias=:alias LIMIT 1", [":alias"=>$alias]);
+        return $res;
+    }
+
+    //returns the alias of an account
+    public function account2alias($id)
+    {
+        global $db;
+        $id=san($id);
+        $res=$db->single("SELECT alias FROM accounts WHERE id=:id LIMIT 1", [":id"=>$id]);
+        return $res;
+    }
+    // check the validity of an address. At the moment, it checks only the characters to be base58 and the length to be >=70 and <=128.
+    public function valid($id)
+    {
+        if (strlen($id) < 70 || strlen($id) > 128) {
+            return false;
+        }
+        $chars = str_split("123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz");
+        for ($i = 0; $i < strlen($id);
+             $i++) {
+            if (!in_array($id[$i], $chars)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    // returns the current account balance
+    public function balance($id)
+    {
+        global $db;
+        $res = $db->single("SELECT balance FROM accounts WHERE id=:id", [":id" => $id]);
+        if ($res === false) {
+            $res = "0.00000000";
+        }
+
+        return number_format($res, 8, ".", "");
+    }
+
+    // returns the account balance - any pending debits from the mempool
+    public function pending_balance($id)
+    {
+        global $db;
+        $res = $db->single("SELECT balance FROM accounts WHERE id=:id", [":id" => $id]);
+        if ($res === false) {
+            $res = "0.00000000";
+        }
+
+        // if the original balance is 0, no mempool transactions are possible
+        if ($res == "0.00000000") {
+            return $res;
+        }
+        $mem = $db->single("SELECT SUM(val+fee) FROM mempool WHERE src=:id", [":id" => $id]);
+        $rez = $res - $mem;
+        return number_format($rez, 8, ".", "");
+    }
+
+    // returns all the transactions of a specific address
+    public function get_transactions($id, $limit = 100)
+    {
+        global $db;
+        $block = new Block();
+        $current = $block->current();
+        $public_key = $this->public_key($id);
+        $alias = $this->account2alias($id);
+        $limit = intval($limit);
+        if ($limit > 100 || $limit < 1) {
+            $limit = 100;
+        }
+        $res = $db->run(
+            "SELECT * FROM transactions WHERE dst=:dst or public_key=:src or dst=:alias ORDER by height DESC LIMIT :limit",
+            [":src" => $public_key, ":dst" => $id, ":limit" => $limit, ":alias"=>$alias]
+        );
+
+        $transactions = [];
+        foreach ($res as $x) {
+            $trans = [
+                "block"      => $x['block'],
+                "height"     => $x['height'],
+                "id"         => $x['id'],
+                "dst"        => $x['dst'],
+                "val"        => $x['val'],
+                "fee"        => $x['fee'],
+                "signature"  => $x['signature'],
+                "message"    => $x['message'],
+                "version"    => $x['version'],
+                "date"       => $x['date'],
+                "public_key" => $x['public_key'],
+            ];
+            $trans['src'] = $this->get_address($x['public_key']);
+            $trans['confirmations'] = $current['height'] - $x['height'];
+
+            // version 0 -> reward transaction, version 1 -> normal transaction
+            if ($x['version'] == 0) {
+                $trans['type'] = "mining";
+            } elseif ($x['version'] == 1) {
+                if ($x['dst'] == $id) {
+                    $trans['type'] = "credit";
+                } else {
+                    $trans['type'] = "debit";
+                }
+            } else {
+                $trans['type'] = "other";
+            }
+            ksort($trans);
+            $transactions[] = $trans;
+        }
+
+        return $transactions;
+    }
+
+    // returns the transactions from the mempool
+    public function get_mempool_transactions($id)
+    {
+        global $db;
+        $transactions = [];
+        $res = $db->run(
+            "SELECT * FROM mempool WHERE src=:src ORDER by height DESC LIMIT 100",
+            [":src" => $id, ":dst" => $id]
+        );
+        foreach ($res as $x) {
+            $trans = [
+                "block"      => $x['block'],
+                "height"     => $x['height'],
+                "id"         => $x['id'],
+                "src"        => $x['src'],
+                "dst"        => $x['dst'],
+                "val"        => $x['val'],
+                "fee"        => $x['fee'],
+                "signature"  => $x['signature'],
+                "message"    => $x['message'],
+                "version"    => $x['version'],
+                "date"       => $x['date'],
+                "public_key" => $x['public_key'],
+            ];
+            $trans['type'] = "mempool";
+            // they are unconfirmed, so they will have -1 confirmations.
+            $trans['confirmations'] = -1;
+            ksort($trans);
+            $transactions[] = $trans;
+        }
+        return $transactions;
+    }
+
+    // returns the public key for a specific account
+    public function public_key($id)
+    {
+        global $db;
+        $res = $db->single("SELECT public_key FROM accounts WHERE id=:id", [":id" => $id]);
+        return $res;
+    }
+
+    public function get_masternode($public_key)
+    {
+        global $db;
+        $res = $db->row("SELECT * FROM masternode WHERE public_key=:public_key", [":public_key" => $public_key]);
+        if (empty($res['public_key'])) {
+            return false;
+        }
+        return $res;
+    }
 }
-
-
-
-?>

include/config-sample.inc.php

@@ -0,0 +1,156 @@
+<?php
+
+/*
+|--------------------------------------------------------------------------
+| Database Configuration
+|--------------------------------------------------------------------------
+*/
+
+// The database DSN
+$_config['db_connect'] = 'mysql:host=localhost;dbname=ENTER-DB-NAME';
+
+// The database username
+$_config['db_user'] = 'ENTER-DB-USER';
+
+// The database password
+$_config['db_pass'] = 'ENTER-DB-PASS';
+
+/*
+|--------------------------------------------------------------------------
+| General Configuration
+|--------------------------------------------------------------------------
+*/
+
+// Maximum number of connected peers
+$_config['max_peers'] = 30;
+
+// Enable testnet mode for development
+$_config['testnet'] = false;
+
+// To avoid any problems if other clones are made
+$_config['coin'] = 'arionum';
+
+// Allow others to connect to the node api (if set to false, only the below 'allowed_hosts' are allowed)
+$_config['public_api'] = true;
+
+// Hosts that are allowed to mine on this node
+$_config['allowed_hosts'] = [
+    '127.0.0.1',
+];
+
+// Disable transactions and block repropagation
+$_config['disable_repropagation'] = false;
+
+
+/*
+|--------------------------------------------------------------------------
+| Peer Configuration
+|--------------------------------------------------------------------------
+*/
+
+// The number of peers to send each new transaction to
+$_config['transaction_propagation_peers'] = 5;
+
+// How many new peers to check from each peer
+$_config['max_test_peers'] = 5;
+
+// The initial peers to sync from in sanity
+$_config['initial_peer_list'] = [
+    'http://peer1.arionum.com',
+    'http://peer2.arionum.com',
+    'http://peer3.arionum.com',
+    'http://peer4.arionum.com',
+    'http://peer5.arionum.com',
+    'http://peer6.arionum.com',
+    'http://peer7.arionum.com',
+    'http://peer8.arionum.com',
+    'http://peer9.arionum.com',
+    'http://peer10.arionum.com',
+    'http://peer11.arionum.com',
+    'http://peer12.arionum.com',
+    'http://peer13.arionum.com',
+    'http://peer14.arionum.com',
+    'http://peer15.arionum.com',
+    'http://peer16.arionum.com',
+    'http://peer17.arionum.com',
+    'http://peer18.arionum.com',
+    'http://peer19.arionum.com',
+    'http://peer20.arionum.com',
+    'http://peer21.arionum.com',
+    'http://peer22.arionum.com',
+    'http://peer23.arionum.com',
+    'http://peer24.arionum.com',
+    'http://peer25.arionum.com',
+    'http://peer26.arionum.com',
+    'http://peer27.arionum.com',
+];
+
+// does not peer with any of the peers. Uses the seed peers and syncs only from those peers. Requires a cronjob on sanity.php
+$_config['passive_peering'] = false;
+
+
+/*
+|--------------------------------------------------------------------------
+| Mempool Configuration
+|--------------------------------------------------------------------------
+*/
+
+// The maximum transactions to accept from a single peer
+$_config['peer_max_mempool'] = 100;
+
+// The maximum number of mempool transactions to be rebroadcasted
+$_config['max_mempool_rebroadcast'] = 5000;
+
+// The number of blocks between rebroadcasting transactions
+$_config['sanity_rebroadcast_height'] = 30;
+
+// Block accepting transfers from addresses blacklisted by the Arionum devs
+$_config['use_official_blacklist'] = true;
+
+/*
+|--------------------------------------------------------------------------
+| Sanity Configuration
+|--------------------------------------------------------------------------
+*/
+
+// Recheck the last blocks on sanity
+$_config['sanity_recheck_blocks'] = 10;
+
+// The interval to run the sanity in seconds
+$_config['sanity_interval'] = 900;
+
+// Enable setting a new hostname (should be used only if you want to change the hostname)
+$_config['allow_hostname_change'] = false;
+
+// Rebroadcast local transactions when running sanity
+$_config['sanity_rebroadcast_locals'] = true;
+
+// Get more peers?
+$_config['get_more_peers'] = true;
+
+/*
+|--------------------------------------------------------------------------
+| Logging Configuration
+|--------------------------------------------------------------------------
+*/
+
+// Enable log output to the specified file
+$_config['enable_logging'] = false;
+
+// The specified file to write to (this should not be publicly visible)
+$_config['log_file'] = '/var/log/aro.log';
+
+// Log verbosity (default 0, maximum 3)
+$_config['log_verbosity'] = 0;
+
+/*
+|--------------------------------------------------------------------------
+| Masternode Configuration
+|--------------------------------------------------------------------------
+*/
+
+// Enable this node as a masternode
+$_config['masternode'] = false;
+
+// The public key for the masternode
+$_config['masternode_public_key'] = '';

include/config.inc.php

@@ -1,40 +0,0 @@
-<?php
-// Database connection
-$_config['db_connect']="mysql:host=localhost;dbname=ENTER-DB-NAME";
-$_config['db_user']="ENTER-DB-USER";
-$_config['db_pass']="ENTER-DB-PASS";
-
-// Maximum number of connected peers 
-$_config['max_peers']=30;
-// Testnet, used for development
-$_config['testnet']=false;
-// To avoid any problems if other clones are made
-$_config['coin']="arionum";
-// maximum transactions accepted from a single peer
-$_config['peer_max_mempool']=100;
-// maximum mempool transactions to be rebroadcasted
-$_config['max_mempool_rebroadcast']=5000;
-// after how many blocks should the transactions be rebroadcasted
-$_config['sanity_rebroadcast_height']=30;
-// each new received transaction is sent to X peers
-$_config['transaction_propagation_peers']=5;
-// how many new peers to check from each peer.
-$_config['max_test_peers']=5;
-// recheck the last blocks on sanity
-$_config['sanity_recheck_blocks']=10;
-// allow others to connect to node api. If set to false, only allowed_hosts are allowed
-$_config['public_api']=true;
-// hosts allowed to mine on this node
-$_config['allowed_hosts']=array("127.0.0.1");
-// sanity is run every X seconds
-$_config['sanity_interval']=900;
-// accept the setting of new hostnames / should be used only if you want to change the hostname
-$_config['allow_hostname_change']=false;
-// rebroadcast local transactions on each sanity
-$_config['sanity_rebroadcast_locals']=true;
-// write logs to file
-$_config['enable_logging']=false;
-// log file, should not be publicly viewable
-$_config['log_file']="/var/log/aro.log";
-
-?>

include/db.inc.php

@@ -1,122 +1,138 @@
 <?php
-// a simple wrapper for pdo
-class db extends PDO {
 
+/**
+ * Class DB
+ *
+ * A simple wrapper for PDO.
+ */
+class DB extends PDO
+{
+    private $error;
+    private $sql;
+    private $bind;
+    private $debugger = 0;
+    public $working = "yes";
 
-        private $error;
-        private $sql;
-        private $bind;
-        private $debugger=0;
-        public $working="yes";
+    public function __construct($dsn, $user = "", $passwd = "", $debug_level = 0)
+    {
+        $options = [
+            PDO::ATTR_PERSISTENT       => true,
+            PDO::ATTR_EMULATE_PREPARES => false,
+            PDO::ATTR_ERRMODE          => PDO::ERRMODE_EXCEPTION,
+        ];
+        $this->debugger = $debug_level;
+        try {
+            parent::__construct($dsn, $user, $passwd, $options);
+        } catch (PDOException $e) {
+            $this->error = $e->getMessage();
+            die("Could not connect to the DB - ".$this->error);
+        }
+    }
 
-        public function __construct($dsn, $user="", $passwd="",$debug_level=0) {
-                $options = array(
-                        PDO::ATTR_PERSISTENT => true,
-                       PDO::ATTR_EMULATE_PREPARES => false,
-                        PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
-                );
-                $this->debugger=$debug_level;
-                try {
-                        parent::__construct($dsn, $user, $passwd, $options);
-                } catch (PDOException $e) {
-                        $this->error = $e->getMessage();
-                        die("Could not connect to the DB - ".$this->error);
+    private function debug()
+    {
+        global $_config;
+        if (!$this->debugger) {
+            return;
+        }
+        $error = ["Error" => $this->error];
+        if (!empty($this->sql)) {
+            $error["SQL Statement"] = $this->sql;
+        }
+        if (!empty($this->bind)) {
+            $error["Bind Parameters"] = trim(print_r($this->bind, true));
+        }
+
+        $backtrace = debug_backtrace();
+        if (!empty($backtrace)) {
+            foreach ($backtrace as $info) {
+                if ($info["file"] != __FILE__) {
+                    $error["Backtrace"] = $info["file"]." at line ".$info["line"];
                 }
+            }
+        }
+        $msg = "";
+        $msg .= "SQL Error\n".str_repeat("-", 50);
+        foreach ($error as $key => $val) {
+            $msg .= "\n\n$key:\n$val";
         }
 
-        private function debug() {
-                        if(!$this->debugger) return;
-                        $error = array("Error" => $this->error);
-                        if(!empty($this->sql))
-                                $error["SQL Statement"] = $this->sql;
-                        if(!empty($this->bind))
-                                $error["Bind Parameters"] = trim(print_r($this->bind, true));
+        
+            _log($msg);
+        
+    }
 
-                        $backtrace = debug_backtrace();
-                        if(!empty($backtrace)) {
-                                foreach($backtrace as $info) {
-                                        if($info["file"] != __FILE__)
-                                                $error["Backtrace"] = $info["file"] . " at line " . $info["line"];
-                                }
-                        }
-                        $msg = "";
-                                $msg .= "SQL Error\n" . str_repeat("-", 50);
-                                foreach($error as $key => $val)
-                                        $msg .= "\n\n$key:\n$val";
-
-                        if($this->debugger){ 
-                                
-                                echo nl2br($msg);
-                       
-                        }
+    private function cleanup($bind, $sql = "")
+    {
+        if (!is_array($bind)) {
+            if (!empty($bind)) {
+                $bind = [$bind];
+            } else {
+                $bind = [];
+            }
         }
 
-        private function cleanup($bind,$sql="") {
-                        if(!is_array($bind)) {
-                                if(!empty($bind))
-                                        $bind = array($bind);
-                                else
-                                        $bind = array();
-                        }
+        foreach ($bind as $key => $val) {
+            if (str_replace($key, "", $sql) == $sql) {
+                unset($bind[$key]);
+            }
+        }
+        return $bind;
+    }
 
-                        foreach($bind as $key=>$val){
-                        if(str_replace($key,"",$sql)==$sql) unset($bind[$key]);
-                        }
-                        return $bind;
+    public function single($sql, $bind = "")
+    {
+        $this->sql = trim($sql);
+        $this->bind = $this->cleanup($bind, $sql);
+        $this->error = "";
+        try {
+            $pdostmt = $this->prepare($this->sql);
+            if ($pdostmt->execute($this->bind) !== false) {
+                return $pdostmt->fetchColumn();
+            }
+        } catch (PDOException $e) {
+            $this->error = $e->getMessage();
+            $this->debug();
+            return false;
+        }
+    }
+
+    public function run($sql, $bind = "")
+    {
+        $this->sql = trim($sql);
+        $this->bind = $this->cleanup($bind, $sql);
+        $this->error = "";
+
+        try {
+            $pdostmt = $this->prepare($this->sql);
+            if ($pdostmt->execute($this->bind) !== false) {
+                if (preg_match("/^(".implode("|", ["select", "describe", "pragma"]).") /i", $this->sql)) {
+                    return $pdostmt->fetchAll(PDO::FETCH_ASSOC);
+                } elseif (preg_match("/^(".implode("|", ["delete", "insert", "update"]).") /i", $this->sql)) {
+                    return $pdostmt->rowCount();
                 }
-
-
-
-
-        public function single($sql,$bind="")   {
-                        $this->sql = trim($sql);
-                        $this->bind = $this->cleanup($bind,$sql);
-                        $this->error = "";
-                        try {
-                                $pdostmt = $this->prepare($this->sql);
-                                if($pdostmt->execute($this->bind) !== false) {
-                                                return $pdostmt->fetchColumn();
-                                }
-                        } catch (PDOException $e) {
-                                $this->error = $e->getMessage();
-                                $this->debug();
-                                return false;
-                        }
+            }
+        } catch (PDOException $e) {
+            $this->error = $e->getMessage();
+            $this->debug();
+            return false;
         }
+    }
 
-
-        public function run($sql, $bind="") {
-                $this->sql = trim($sql);
-                $this->bind = $this->cleanup($bind,$sql);
-                $this->error = "";
-
-                try {
-                        $pdostmt = $this->prepare($this->sql);
-                        if($pdostmt->execute($this->bind) !== false) {
-                                if(preg_match("/^(" . implode("|", array("select", "describe", "pragma")) . ") /i", $this->sql))
-                                        return $pdostmt->fetchAll(PDO::FETCH_ASSOC);
-                                elseif(preg_match("/^(" . implode("|", array("delete", "insert", "update")) . ") /i", $this->sql))
-                                        return $pdostmt->rowCount();
-                        }
-                } catch (PDOException $e) {
-                        $this->error = $e->getMessage();
-                        $this->debug();
-                        return false;
-                }
+    public function row($sql, $bind = "")
+    {
+        $query = $this->run($sql, $bind);
+        if (count($query) == 0) {
+            return false;
         }
-
-        public function row($sql,$bind=""){
-        	$query=$this->run($sql,$bind);
-        	if(count($query)==0) return false;
-        	if(count($query)>1) return $query;
-        	if(count($query)==1){
-        		foreach($query as $row) $result=$row;
-        		return $result;
-        	}
+        if (count($query) > 1) {
+            return $query;
         }
-
-
-
+        if (count($query) == 1) {
+            foreach ($query as $row) {
+                $result = $row;
+            }
+            return $result;
+        }
+    }
 }
-
-?>

include/functions.inc.php

@@ -1,257 +1,305 @@
 <?php
 
-
 // simple santization function to accept only alphanumeric characters
-function san($a,$b=""){
+function san($a, $b = "")
+{
     $a = preg_replace("/[^a-zA-Z0-9".$b."]/", "", $a);
-    
+
     return $a;
 }
-// api  error and exit 
-function api_err($data){
-    global $_config;
-	echo json_encode(array("status"=>"error","data"=>$data, "coin"=>$_config['coin']));
-	exit;
+
+function san_ip($a)
+{
+    $a = preg_replace("/[^a-fA-F0-9\[\]\.\:]/", "", $a);
+    return $a;
 }
-// api print ok and exit
-function api_echo($data){
+
+function san_host($a)
+{
+    $a = preg_replace("/[^a-zA-Z0-9\.\-\:\/]/", "", $a);
+    return $a;
+}
+
+// api  error and exit
+function api_err($data)
+{
     global $_config;
-	echo json_encode(array("status"=>"ok","data"=>$data, "coin"=>$_config['coin']));
+
+    if (!headers_sent()) {
+        header('Content-Type: application/json');
+    }
+    echo json_encode(["status" => "error", "data" => $data, "coin" => $_config['coin']]);
     exit;
 }
+
+// api print ok and exit
+function api_echo($data)
+{
+    global $_config;
+
+    if (!headers_sent()) {
+        header('Content-Type: application/json');
+    }
+    echo json_encode(["status" => "ok", "data" => $data, "coin" => $_config['coin']]);
+    exit;
+}
+
 // log function, shows only in cli atm
-function _log($data){
-	$date=date("[Y-m-d H:i:s]");
-	$trace=debug_backtrace(); 
-	$loc=count($trace)-1;
-	$file=substr($trace[$loc]['file'],strrpos($trace[$loc]['file'],"/")+1);
-	
-	$res="$date ".$file.":".$trace[$loc]['line'];
-	
-	if(!empty($trace[$loc]['class'])) $res.="---".$trace[$loc]['class'];
-	if(!empty($trace[$loc]['function'])&&$trace[$loc]['function']!='_log') $res.='->'.$trace[$loc]['function'].'()';
-	$res.=" $data \n";
-	if(php_sapi_name() === 'cli') echo $res;
-	global $_config;
-	if($_config['enable_logging']==true){
-		@file_put_contents($_config['log_file'],$res, FILE_APPEND);
-	}
+function _log($data, $verbosity = 0)
+{
+    global $_config;
+    if ($_config['log_verbosity'] < $verbosity) {
+        return;
+    }
+    $date = date("[Y-m-d H:i:s]");
+    $trace = debug_backtrace();
+    $loc = count($trace) - 1;
+    $file = substr($trace[$loc]['file'], strrpos($trace[$loc]['file'], "/") + 1);
+
+    $res = "$date ".$file.":".$trace[$loc]['line'];
+
+    if (!empty($trace[$loc]['class'])) {
+        $res .= "---".$trace[$loc]['class'];
+    }
+    if (!empty($trace[$loc]['function']) && $trace[$loc]['function'] != '_log') {
+        $res .= '->'.$trace[$loc]['function'].'()';
+    }
+    $res .= " $data \n";
+    if (php_sapi_name() === 'cli') {
+        echo $res;
+    }
+    if ($_config['enable_logging'] == true && $_config['log_verbosity'] >= $verbosity) {
+        @file_put_contents($_config['log_file'], $res, FILE_APPEND);
+    }
 }
 
 // converts PEM key to hex
-function pem2hex ($data) {
-    $data=str_replace("-----BEGIN PUBLIC KEY-----","",$data);
-    $data=str_replace("-----END PUBLIC KEY-----","",$data);
-    $data=str_replace("-----BEGIN EC PRIVATE KEY-----","",$data);
-    $data=str_replace("-----END EC PRIVATE KEY-----","",$data);
-    $data=str_replace("\n","",$data);
-    $data=base64_decode($data);
-    $data=bin2hex($data);
+function pem2hex($data)
+{
+    $data = str_replace("-----BEGIN PUBLIC KEY-----", "", $data);
+    $data = str_replace("-----END PUBLIC KEY-----", "", $data);
+    $data = str_replace("-----BEGIN EC PRIVATE KEY-----", "", $data);
+    $data = str_replace("-----END EC PRIVATE KEY-----", "", $data);
+    $data = str_replace("\n", "", $data);
+    $data = base64_decode($data);
+    $data = bin2hex($data);
     return $data;
 }
 
 // converts hex key to PEM
-function hex2pem ($data, $is_private_key=false) {
-    $data=hex2bin($data);
-    $data=base64_encode($data);
-    if($is_private_key) return "-----BEGIN EC PRIVATE KEY-----\n".$data."\n-----END EC PRIVATE KEY-----";
+function hex2pem($data, $is_private_key = false)
+{
+    $data = hex2bin($data);
+    $data = base64_encode($data);
+    if ($is_private_key) {
+        return "-----BEGIN EC PRIVATE KEY-----\n".$data."\n-----END EC PRIVATE KEY-----";
+    }
     return "-----BEGIN PUBLIC KEY-----\n".$data."\n-----END PUBLIC KEY-----";
 }
 
 
-
-
-    // Base58 encoding/decoding functions - all credits go to https://github.com/stephen-hill/base58php
-    function base58_encode($string)
-    {
-	$alphabet='123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
-	$base=strlen($alphabet);
-        // Type validation
-        if (is_string($string) === false) {
-		return false;
-        }
-        // If the string is empty, then the encoded string is obviously empty
-        if (strlen($string) === 0) {
-            return '';
-        }
-        // Now we need to convert the byte array into an arbitrary-precision decimal
-        // We basically do this by performing a base256 to base10 conversion
-        $hex = unpack('H*', $string);
-        $hex = reset($hex);
-        $decimal = gmp_init($hex, 16);
-        // This loop now performs base 10 to base 58 conversion
-        // The remainder or modulo on each loop becomes a base 58 character
-        $output = '';
-        while (gmp_cmp($decimal, $base) >= 0) {
-            list($decimal, $mod) = gmp_div_qr($decimal, $base);
-            $output .= $alphabet[gmp_intval($mod)];
-        }
-        // If there's still a remainder, append it
-        if (gmp_cmp($decimal, 0) > 0) {
-            $output .= $alphabet[gmp_intval($decimal)];
-        }
-        // Now we need to reverse the encoded data
-        $output = strrev($output);
-        // Now we need to add leading zeros
-        $bytes = str_split($string);
-        foreach ($bytes as $byte) {
-            if ($byte === "\x00") {
-                $output = $alphabet[0] . $output;
-                continue;
-            }
-            break;
-        }
-        return (string) $output;
+// Base58 encoding/decoding functions - all credits go to https://github.com/stephen-hill/base58php
+function base58_encode($string)
+{
+    $alphabet = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
+    $base = strlen($alphabet);
+    // Type validation
+    if (is_string($string) === false) {
+        return false;
     }
-    function base58_decode($base58)
-    {
-        $alphabet='123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
-        $base=strlen($alphabet);
-
-        // Type Validation
-        if (is_string($base58) === false) {
-		return false;
-        }
-        // If the string is empty, then the decoded string is obviously empty
-        if (strlen($base58) === 0) {
-            return '';
-        }
-        $indexes = array_flip(str_split($alphabet));
-        $chars = str_split($base58);
-        // Check for invalid characters in the supplied base58 string
-        foreach ($chars as $char) {
-            if (isset($indexes[$char]) === false) {
-		return false;
-            }
-        }
-        // Convert from base58 to base10
-        $decimal = gmp_init($indexes[$chars[0]], 10);
-        for ($i = 1, $l = count($chars); $i < $l; $i++) {
-            $decimal = gmp_mul($decimal, $base);
-            $decimal = gmp_add($decimal, $indexes[$chars[$i]]);
-        }
-        // Convert from base10 to base256 (8-bit byte array)
-        $output = '';
-        while (gmp_cmp($decimal, 0) > 0) {
-            list($decimal, $byte) = gmp_div_qr($decimal, 256);
-            $output = pack('C', gmp_intval($byte)) . $output;
-        }
-        // Now we need to add leading zeros
-        foreach ($chars as $char) {
-            if ($indexes[$char] === 0) {
-                $output = "\x00" . $output;
-                continue;
-            }
-            break;
-        }
-        return $output;
+    // If the string is empty, then the encoded string is obviously empty
+    if (strlen($string) === 0) {
+        return '';
     }
+    // Now we need to convert the byte array into an arbitrary-precision decimal
+    // We basically do this by performing a base256 to base10 conversion
+    $hex = unpack('H*', $string);
+    $hex = reset($hex);
+    $decimal = gmp_init($hex, 16);
+    // This loop now performs base 10 to base 58 conversion
+    // The remainder or modulo on each loop becomes a base 58 character
+    $output = '';
+    while (gmp_cmp($decimal, $base) >= 0) {
+        list($decimal, $mod) = gmp_div_qr($decimal, $base);
+        $output .= $alphabet[gmp_intval($mod)];
+    }
+    // If there's still a remainder, append it
+    if (gmp_cmp($decimal, 0) > 0) {
+        $output .= $alphabet[gmp_intval($decimal)];
+    }
+    // Now we need to reverse the encoded data
+    $output = strrev($output);
+    // Now we need to add leading zeros
+    $bytes = str_split($string);
+    foreach ($bytes as $byte) {
+        if ($byte === "\x00") {
+            $output = $alphabet[0].$output;
+            continue;
+        }
+        break;
+    }
+    return (string)$output;
+}
+
+function base58_decode($base58)
+{
+    $alphabet = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
+    $base = strlen($alphabet);
+
+    // Type Validation
+    if (is_string($base58) === false) {
+        return false;
+    }
+    // If the string is empty, then the decoded string is obviously empty
+    if (strlen($base58) === 0) {
+        return '';
+    }
+    $indexes = array_flip(str_split($alphabet));
+    $chars = str_split($base58);
+    // Check for invalid characters in the supplied base58 string
+    foreach ($chars as $char) {
+        if (isset($indexes[$char]) === false) {
+            return false;
+        }
+    }
+    // Convert from base58 to base10
+    $decimal = gmp_init($indexes[$chars[0]], 10);
+    for ($i = 1, $l = count($chars); $i < $l; $i++) {
+        $decimal = gmp_mul($decimal, $base);
+        $decimal = gmp_add($decimal, $indexes[$chars[$i]]);
+    }
+    // Convert from base10 to base256 (8-bit byte array)
+    $output = '';
+    while (gmp_cmp($decimal, 0) > 0) {
+        list($decimal, $byte) = gmp_div_qr($decimal, 256);
+        $output = pack('C', gmp_intval($byte)).$output;
+    }
+    // Now we need to add leading zeros
+    foreach ($chars as $char) {
+        if ($indexes[$char] === 0) {
+            $output = "\x00".$output;
+            continue;
+        }
+        break;
+    }
+    return $output;
+}
 
 // converts PEM key to the base58 version used by ARO
-function pem2coin ($data) {
-    $data=str_replace("-----BEGIN PUBLIC KEY-----","",$data);
-    $data=str_replace("-----END PUBLIC KEY-----","",$data);
-    $data=str_replace("-----BEGIN EC PRIVATE KEY-----","",$data);
-    $data=str_replace("-----END EC PRIVATE KEY-----","",$data);
-    $data=str_replace("\n","",$data);
-    $data=base64_decode($data);
-    
- 
+function pem2coin($data)
+{
+    $data = str_replace("-----BEGIN PUBLIC KEY-----", "", $data);
+    $data = str_replace("-----END PUBLIC KEY-----", "", $data);
+    $data = str_replace("-----BEGIN EC PRIVATE KEY-----", "", $data);
+    $data = str_replace("-----END EC PRIVATE KEY-----", "", $data);
+    $data = str_replace("\n", "", $data);
+    $data = base64_decode($data);
+
+
     return base58_encode($data);
-    
 }
+
 // converts the key in base58 to PEM
-function coin2pem ($data, $is_private_key=false) {
+function coin2pem($data, $is_private_key = false)
+{
+    $data = base58_decode($data);
+    $data = base64_encode($data);
 
-    
-    
-       $data=base58_decode($data);
-       $data=base64_encode($data);
+    $dat = str_split($data, 64);
+    $data = implode("\n", $dat);
 
-        $dat=str_split($data,64);
-        $data=implode("\n",$dat);
-
-    if($is_private_key) return "-----BEGIN EC PRIVATE KEY-----\n".$data."\n-----END EC PRIVATE KEY-----\n";
+    if ($is_private_key) {
+        return "-----BEGIN EC PRIVATE KEY-----\n".$data."\n-----END EC PRIVATE KEY-----\n";
+    }
     return "-----BEGIN PUBLIC KEY-----\n".$data."\n-----END PUBLIC KEY-----\n";
 }
 
 // sign data with private key
-function ec_sign($data, $key){
-    // transform the base58 key format to PEM 
-    $private_key=coin2pem($key,true);
-   
-   
-    $pkey=openssl_pkey_get_private($private_key);
-  
-    $k=openssl_pkey_get_details($pkey);
+function ec_sign($data, $key)
+{
+    // transform the base58 key format to PEM
+    $private_key = coin2pem($key, true);
 
 
-    openssl_sign($data,$signature,$pkey,OPENSSL_ALGO_SHA256);
-      
-    // the signature will be base58 encoded  
+    $pkey = openssl_pkey_get_private($private_key);
+
+    $k = openssl_pkey_get_details($pkey);
+
+
+    openssl_sign($data, $signature, $pkey, OPENSSL_ALGO_SHA256);
+
+    // the signature will be base58 encoded
     return base58_encode($signature);
-    
 }
 
 
-function ec_verify($data, $signature, $key){
-
-    
+function ec_verify($data, $signature, $key)
+{
     // transform the base58 key to PEM
-    $public_key=coin2pem($key);
-   
-    $signature=base58_decode($signature);
-   
-    $pkey=openssl_pkey_get_public($public_key);
-    
-    $res=openssl_verify($data,$signature,$pkey,OPENSSL_ALGO_SHA256);
-  
- 
-    if($res===1) return true;
+    $public_key = coin2pem($key);
+
+    $signature = base58_decode($signature);
+
+    $pkey = openssl_pkey_get_public($public_key);
+
+    $res = openssl_verify($data, $signature, $pkey, OPENSSL_ALGO_SHA256);
+
+
+    if ($res === 1) {
+        return true;
+    }
     return false;
 }
 
 // POST data to an URL (usualy peer). The data is an array, json encoded with is sent as $_POST['data']
-function peer_post($url, $data=array(),$timeout=60,$debug=false){
+function peer_post($url, $data = [], $timeout = 60, $debug = false)
+{
     global $_config;
-    if($debug) echo "\nPeer post: $url\n";
+    if ($debug) {
+        echo "\nPeer post: $url\n";
+    }
     $postdata = http_build_query(
-        array(
+        [
             'data' => json_encode($data),
-            "coin"=>$_config['coin']
-            )
+            "coin" => $_config['coin'],
+        ]
     );
-    
-    $opts = array('http' =>
-        array(
-            'timeout' => $timeout,
-            'method'  => 'POST',
-            'header'  => 'Content-type: application/x-www-form-urlencoded',
-            'content' => $postdata
-        )
-    );
-    
-    $context  = stream_context_create($opts);
-    
+
+    $opts = [
+        'http' =>
+            [
+                'timeout' => $timeout,
+                'method'  => 'POST',
+                'header'  => 'Content-type: application/x-www-form-urlencoded',
+                'content' => $postdata,
+            ],
+    ];
+
+    $context = stream_context_create($opts);
+
     $result = file_get_contents($url, false, $context);
-    if($debug) echo "\nPeer response: $result\n";
-    $res=json_decode($result,true);
+    if ($debug) {
+        echo "\nPeer response: $result\n";
+    }
+    $res = json_decode($result, true);
 
     // the function will return false if something goes wrong
-    if($res['status']!="ok"||$res['coin']!=$_config['coin']) return false;
+    if ($res['status'] != "ok" || $res['coin'] != $_config['coin']) {
+        return false;
+    }
     return $res['data'];
 }
 
 // convers hex to base58
-function hex2coin($hex){
-   
-    $data=hex2bin($hex);
-    return  base58_encode($data);
-} 
+function hex2coin($hex)
+{
+    $data = hex2bin($hex);
+    return base58_encode($data);
+}
+
 // converts base58 to hex
-function coin2hex($data){
-    
-    $bin= base58_decode($data);
-    return bin2hex($bin);      
-} 
-?>
+function coin2hex($data)
+{
+    $bin = base58_decode($data);
+    return bin2hex($bin);
+}

include/init.inc.php

@@ -1,89 +1,111 @@
 <?php
 // ARO version
-define("VERSION", "0.2b");
+define("VERSION", "0.4.3");
 // Amsterdam timezone by default, should probably be moved to config
-date_default_timezone_set("Europe/Amsterdam");
-
-
+date_default_timezone_set("UTC");
 
 //error_reporting(E_ALL & ~E_NOTICE);
 error_reporting(0);
-ini_set('display_errors',"off");
+ini_set('display_errors', "off");
 
 // not accessible directly
-if(php_sapi_name() !== 'cli'&&substr_count($_SERVER['PHP_SELF'],"/")>1){
-	die("This application should only be run in the main directory /");
+if (php_sapi_name() !== 'cli' && substr_count($_SERVER['PHP_SELF'], "/") > 1) {
+    die("This application should only be run in the main directory /");
 }
 
+require_once __DIR__.'/Exception.php';
+require_once __DIR__.'/config.inc.php';
+require_once __DIR__.'/db.inc.php';
+require_once __DIR__.'/functions.inc.php';
+require_once __DIR__.'/Blacklist.php';
+require_once __DIR__.'/InitialPeers.php';
+require_once __DIR__.'/block.inc.php';
+require_once __DIR__.'/account.inc.php';
+require_once __DIR__.'/transaction.inc.php';
 
-require_once("include/config.inc.php");
-require_once("include/db.inc.php");
-require_once("include/functions.inc.php");
-require_once("include/block.inc.php");
-require_once("include/account.inc.php");
-require_once("include/transaction.inc.php");
-
-if($_config['db_pass']=="ENTER-DB-PASS") die("Please update your config file and set your db password");
+if ($_config['db_pass'] == "ENTER-DB-PASS") {
+    die("Please update your config file and set your db password");
+}
 // initial DB connection
-$db=new DB($_config['db_connect'],$_config['db_user'],$_config['db_pass'],0);
-if(!$db) die("Could not connect to the DB backend.");
+$db = new DB($_config['db_connect'], $_config['db_user'], $_config['db_pass'], $_config['enable_logging']);
+if (!$db) {
+    die("Could not connect to the DB backend.");
+}
 
 // checks for php version and extensions
-if (!extension_loaded("openssl") && !defined("OPENSSL_KEYTYPE_EC")) api_err("Openssl php extension missing");
-if (!extension_loaded("gmp")) api_err("gmp php extension missing");
-if (!extension_loaded('PDO')) api_err("pdo php extension missing");
-if (!extension_loaded("bcmath")) api_err("bcmath php extension missing");
-if (!defined("PASSWORD_ARGON2I")) api_err("The php version is not compiled with argon2i support");
-
-if(floatval(phpversion())<7.2) api_err("The minimum php version required is 7.2");
-
-
-
-
-
-// Getting extra configs from the database
-$query=$db->run("SELECT cfg, val FROM config");
-foreach($query as $res){
-	$_config[$res['cfg']]=trim($res['val']);
+if (!extension_loaded("openssl") && !defined("OPENSSL_KEYTYPE_EC")) {
+    api_err("Openssl php extension missing");
+}
+if (!extension_loaded("gmp")) {
+    api_err("gmp php extension missing");
+}
+if (!extension_loaded('PDO')) {
+    api_err("pdo php extension missing");
+}
+if (!extension_loaded("bcmath")) {
+    api_err("bcmath php extension missing");
+}
+if (!defined("PASSWORD_ARGON2I")) {
+    api_err("The php version is not compiled with argon2i support");
 }
 
+if (floatval(phpversion()) < 7.2) {
+    api_err("The minimum php version required is 7.2");
+}
 
-
+// Getting extra configs from the database
+$query = $db->run("SELECT cfg, val FROM config");
+foreach ($query as $res) {
+    $_config[$res['cfg']] = trim($res['val']);
+}
 
 // nothing is allowed while in maintenance
-if($_config['maintenance']==1) api_err("under-maintenance");
-
+if ($_config['maintenance'] == 1) {
+    api_err("under-maintenance");
+}
 
 // update the db schema, on every git pull or initial install
-if(file_exists("tmp/db-update")){
-	
-	$res=unlink("tmp/db-update");
-	if($res){
-		echo "Updating db schema! Please refresh!\n";
-		require_once("include/schema.inc.php");
-		exit;
-	}
-	echo "Could not access the tmp/db-update file. Please give full permissions to this file\n";
+if (file_exists("tmp/db-update")) {
+    //checking if the server has at least 2GB of ram
+    $ram=file_get_contents("/proc/meminfo");
+    $ramz=explode("MemTotal:",$ram);
+    $ramb=explode("kB",$ramz[1]);
+    $ram=intval(trim($ramb[0]));
+    if($ram<1700000) {
+        die("The node requires at least 2 GB of RAM");
+    }
+    $res = unlink("tmp/db-update");
+    if ($res) {
+        echo "Updating db schema! Please refresh!\n";
+        require_once __DIR__.'/schema.inc.php';
+        exit;
+    }
+    echo "Could not access the tmp/db-update file. Please give full permissions to this file\n";
 }
 
 // something went wront with the db schema
-if($_config['dbversion']<2) exit;
+if ($_config['dbversion'] < 2) {
+    exit;
+}
 
 // separate blockchain for testnet
-if($_config['testnet']==true) $_config['coin'].="-testnet"; 
+if ($_config['testnet'] == true) {
+    $_config['coin'] .= "-testnet";
+}
 
 // current hostname
-$hostname=(!empty($_SERVER['HTTPS'])?'https':'http')."://".$_SERVER['HTTP_HOST'];
+$hostname = (!empty($_SERVER['HTTPS']) ? 'https' : 'http')."://".san_host($_SERVER['HTTP_HOST']);
 // set the hostname to the current one
-if($hostname!=$_config['hostname']&&$_SERVER['HTTP_HOST']!="localhost"&&$_SERVER['HTTP_HOST']!="127.0.0.1"&&$_SERVER['hostname']!='::1'&&php_sapi_name() !== 'cli' && ($_config['allow_hostname_change']!=false||empty($_config['hostname']))){
-	$db->run("UPDATE config SET val=:hostname WHERE cfg='hostname' LIMIT 1",array(":hostname"=>$hostname));
-	$_config['hostname']=$hostname;
+if ($hostname != $_config['hostname'] && $_SERVER['HTTP_HOST'] != "localhost" && $_SERVER['HTTP_HOST'] != "127.0.0.1" && $_SERVER['hostname'] != '::1' && php_sapi_name() !== 'cli' && ($_config['allow_hostname_change'] != false || empty($_config['hostname']))) {
+    $db->run("UPDATE config SET val=:hostname WHERE cfg='hostname' LIMIT 1", [":hostname" => $hostname]);
+    $_config['hostname'] = $hostname;
+}
+if (empty($_config['hostname']) || $_config['hostname'] == "http://" || $_config['hostname'] == "https://") {
+    api_err("Invalid hostname");
 }
-if(empty($_config['hostname'])||$_config['hostname']=="http://"||$_config['hostname']=="https://") api_err("Invalid hostname");
 
 // run sanity
-	$t=time();
-	if($t-$_config['sanity_last']>$_config['sanity_interval']&& php_sapi_name() !== 'cli') system("php sanity.php  > /dev/null 2>&1  &");
-
-
-?>
+$t = time();
+if ($t - $_config['sanity_last'] > $_config['sanity_interval'] && php_sapi_name() !== 'cli') {
+    system("php sanity.php  > /dev/null 2>&1  &");
+}

include/schema.inc.php

@@ -1,18 +1,17 @@
 <?php
 
 // when db schema modifications are done, this function is run.
-
-$dbversion=intval($_config['dbversion']);
+$dbversion = intval($_config['dbversion']);
 $db->beginTransaction();
-if($dbversion==0){
-    $db->run("  
+if ($dbversion == 0) {
+    $db->run("
     CREATE TABLE `accounts` (
       `id` varbinary(128) NOT NULL,
       `public_key` varbinary(1024) NOT NULL,
       `block` varbinary(128) NOT NULL,
       `balance` decimal(20,8) NOT NULL
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT;");
-    
+
     $db->run("CREATE TABLE `blocks` (
       `id` varbinary(128) NOT NULL,
       `generator` varbinary(128) NOT NULL,
@@ -24,16 +23,16 @@ if($dbversion==0){
       `argon` varbinary(128) NOT NULL,
       `transactions` INT NOT NULL
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
-    
+
     $db->run("CREATE TABLE `config` (
       `cfg` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
       `val` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
-    
-    
+
+
     $db->run("INSERT INTO `config` (`cfg`, `val`) VALUES
     ('hostname', '');");
-    
+
     $db->run("INSERT INTO `config` (`cfg`, `val`) VALUES
     ('dbversion', '1');");
 
@@ -51,7 +50,7 @@ if($dbversion==0){
       `date` bigint(20) NOT NULL,
       `peer` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
-    
+
     $db->run("CREATE TABLE `peers` (
       `id` int(11) NOT NULL,
       `hostname` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
@@ -60,8 +59,8 @@ if($dbversion==0){
       `reserve` tinyint(4) NOT NULL DEFAULT 1,
       `ip` varchar(45) NOT NULL
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
-    
-    
+
+
     $db->run("CREATE TABLE `transactions` (
       `id` varbinary(128) NOT NULL,
       `block` varbinary(128) NOT NULL,
@@ -75,75 +74,101 @@ if($dbversion==0){
       `date` int(11) NOT NULL,
       `public_key` varbinary(1024) NOT NULL
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;");
-    
+
     $db->run("ALTER TABLE `peers`
       ADD PRIMARY KEY (`id`);");
-      $db->run("ALTER TABLE `peers`
+    $db->run("ALTER TABLE `peers`
       MODIFY `id` int(11) NOT NULL AUTO_INCREMENT;");
-    
+
     $db->run("ALTER TABLE `accounts`
       ADD PRIMARY KEY (`id`),
       ADD KEY `accounts` (`block`);");
-    
+
     $db->run("ALTER TABLE `blocks`
       ADD PRIMARY KEY (`id`),
       ADD UNIQUE KEY `height` (`height`);");
-    
-      $db->run("ALTER TABLE `config` ADD PRIMARY KEY (`cfg`);");
-    
-      $db->run("ALTER TABLE `mempool`
+
+    $db->run("ALTER TABLE `config` ADD PRIMARY KEY (`cfg`);");
+
+    $db->run("ALTER TABLE `mempool`
       ADD PRIMARY KEY (`id`),
       ADD KEY `height` (`height`);");
-    
-      $db->run("ALTER TABLE `peers`
+
+    $db->run("ALTER TABLE `peers`
       ADD UNIQUE KEY `hostname` (`hostname`),
       ADD UNIQUE KEY `ip` (`ip`),
       ADD KEY `blacklisted` (`blacklisted`),
       ADD KEY `ping` (`ping`),
       ADD KEY `reserve` (`reserve`);");
-    
-      $db->run("ALTER TABLE `transactions`
+
+    $db->run("ALTER TABLE `transactions`
       ADD PRIMARY KEY (`id`),
       ADD KEY `block_id` (`block`);");
-    
-      $db->run("ALTER TABLE `accounts`
+
+    $db->run("ALTER TABLE `accounts`
       ADD CONSTRAINT `accounts` FOREIGN KEY (`block`) REFERENCES `blocks` (`id`) ON DELETE CASCADE;");
-    
-      $db->run("ALTER TABLE `transactions`
+
+    $db->run("ALTER TABLE `transactions`
       ADD CONSTRAINT `block_id` FOREIGN KEY (`block`) REFERENCES `blocks` (`id`) ON DELETE CASCADE;");
-     
+
     $dbversion++;
 }
-if($dbversion==1){
-  $db->run("INSERT INTO `config` (`cfg`, `val`) VALUES ('sanity_last', '0');");
-  $dbversion++;
+if ($dbversion == 1) {
+    $db->run("INSERT INTO `config` (`cfg`, `val`) VALUES ('sanity_last', '0');");
+    $dbversion++;
 }
-if($dbversion==2){
-  $db->run("INSERT INTO `config` (`cfg`, `val`) VALUES ('sanity_sync', '0');");
-  $dbversion++;
+if ($dbversion == 2) {
+    $db->run("INSERT INTO `config` (`cfg`, `val`) VALUES ('sanity_sync', '0');");
+    $dbversion++;
 }
-if($dbversion==3){
+if ($dbversion == 3) {
+    $dbversion++;
+}
+
+if ($dbversion == 4) {
+    $db->run("ALTER TABLE `mempool` ADD INDEX(`src`);");
+    $db->run("ALTER TABLE `mempool` ADD INDEX(`peer`); ");
+    $db->run("ALTER TABLE `mempool` ADD INDEX(`val`); ");
+    $dbversion++;
+}
+if ($dbversion == 5) {
+    $db->run("ALTER TABLE `peers` ADD `fails` TINYINT NOT NULL DEFAULT '0' AFTER `ip`; ");
+    $dbversion++;
+}
+if ($dbversion == 6) {
+    $db->run("ALTER TABLE `peers` ADD `stuckfail` TINYINT(4) NOT NULL DEFAULT '0' AFTER `fails`, ADD INDEX (`stuckfail`); ");
+    $db->run("ALTER TABLE `accounts` ADD `alias` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL AFTER `balance`; ");
+    $dbversion++;
+}
+if ($dbversion == 7) {
+    $db->run("ALTER TABLE `accounts` ADD INDEX(`alias`); ");
+    $db->run("ALTER TABLE `transactions` ADD KEY `dst` (`dst`), ADD KEY `height` (`height`),  ADD KEY `public_key` (`public_key`);");
+    $dbversion++;
+}
+if ($dbversion == 8) {
+  $db->run("CREATE TABLE `masternode` (
+    `public_key` varchar(128) COLLATE utf8mb4_bin NOT NULL,
+    `height` int(11) NOT NULL,
+    `ip` varchar(16) COLLATE utf8mb4_bin NOT NULL,
+    `last_won` int(11) NOT NULL DEFAULT '0',
+    `blacklist` int(11) NOT NULL DEFAULT '0',
+    `fails` int(11) NOT NULL DEFAULT '0',
+    `status` tinyint(4) NOT NULL DEFAULT '1'
+  ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;");
+
+  $db->run("ALTER TABLE `masternode`
+  ADD PRIMARY KEY (`public_key`),
+  ADD KEY `last_won` (`last_won`),
+  ADD KEY `status` (`status`),
+  ADD KEY `blacklist` (`blacklist`),
+  ADD KEY `height` (`height`);");
   $dbversion++;
 }
 
-if($dbversion==4){
-  $db->run("ALTER TABLE `mempool` ADD INDEX(`src`);");
-  $db->run("ALTER TABLE `mempool` ADD INDEX(`peer`); ");
-  $db->run("ALTER TABLE `mempool` ADD INDEX(`val`); ");
-  $dbversion++;
-}
-if($dbversion==5){
-  $db->run("ALTER TABLE `peers` ADD `fails` TINYINT NOT NULL DEFAULT '0' AFTER `ip`; ");
-  $dbversion++;
-}
-if($dbversion==6){
-  $db->run("ALTER TABLE `peers` ADD `stuckfail` TINYINT(4) NOT NULL DEFAULT '0' AFTER `fails`, ADD INDEX (`stuckfail`); ");
-  $db->run("ALTER TABLE `accounts` ADD `alias` VARCHAR(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL AFTER `balance`; ");
-  $dbversion++;
-}
+
+
 // update the db version to the latest one
-if($dbversion!=$_config['dbversion']) $db->run("UPDATE config SET val=:val WHERE cfg='dbversion'",array(":val"=>$dbversion));
+if ($dbversion != $_config['dbversion']) {
+    $db->run("UPDATE config SET val=:val WHERE cfg='dbversion'", [":val" => $dbversion]);
+}
 $db->commit();
-
-
-?>

include/transaction.inc.php

@@ -1,275 +1,686 @@
 <?php
 
-class Transaction {
+use Arionum\Blacklist;
+
+class Transaction
+{
     // reverse and remove all transactions from a block
-    public function reverse($block){
+    public function reverse($block)
+    {
         global $db;
-        $acc=new Account;
-        $r=$db->run("SELECT * FROM transactions WHERE block=:block",array(":block"=>$block));
-        foreach($r as $x){
-            if(empty($x['src'])) $x['src']=$acc->get_address($x['public_key']);
-            $db->run("UPDATE accounts SET balance=balance-:val WHERE id=:id",array(":id"=>$x['dst'], ":val"=>$x['val']));
+        
+        $acc = new Account();
+        $r = $db->run("SELECT * FROM transactions WHERE block=:block ORDER by `version` ASC", [":block" => $block]);
+        foreach ($r as $x) {
+            _log("Reversing transaction $x[id]", 4);
+            if (empty($x['src'])) {
+                $x['src'] = $acc->get_address($x['public_key']);
+            }
+            if ($x['version'] == 2) {
+                // payment sent to alias
+                $rez=$db->run(
+                    "UPDATE accounts SET balance=balance-:val WHERE alias=:alias",
+                    [":alias" => $x['dst'], ":val" => $x['val']]
+                    );
+                if ($rez!=1) {
+                    _log("Update alias balance minus failed", 3);
+                    return false;
+                }
+            } else {
+                // other type of transactions
+       
+                if ($x['version']!=100&&$x['version']<111) {
+                    $rez=$db->run(
+                    "UPDATE accounts SET balance=balance-:val WHERE id=:id",
+                    [":id" => $x['dst'], ":val" => $x['val']]
+                    );
+                    if ($rez!=1) {
+                        _log("Update accounts balance minus failed", 3);
+                        return false;
+                    }
+                }
+            }
+            // on version 0 / reward transaction, don't credit anyone
+            if ($x['version'] > 0 && $x['version']<111) {
+                $rez=$db->run(
+                    "UPDATE accounts SET balance=balance+:val WHERE id=:id",
+                    [":id" => $x['src'], ":val" => $x['val'] + $x['fee']]
+                );
+                if ($rez!=1) {
+                    _log("Update account balance plus failed", 3);
+                    return false;
+                }
+            }
+            // removing the alias if the alias transaction is reversed
+            if ($x['version']==3) {
+                $rez=$db->run(
+                    "UPDATE accounts SET alias=NULL WHERE id=:id",
+                    [":id" => $x['src']]
+                );
+                if ($rez!=1) {
+                    _log("Clear alias failed", 3);
+                    return false;
+                }
+            }
 
-	    // on version 0 / reward transaction, don't credit anyone
-            if($x['version']>0) $db->run("UPDATE accounts SET balance=balance+:val WHERE id=:id",array(":id"=>$x['src'], ":val"=>$x['val']+$x['fee']));
-	
-	   // add the transactions to mempool            
-           if($x['version']>0) $this->add_mempool($x);
-           $res= $db->run("DELETE FROM transactions WHERE id=:id",array(":id"=>$x['id']));
-           if($res!=1) return false;
-         }
-    }
-    // clears the mempool
-    public function clean_mempool(){
-        global $db;
-        $block= new Block;
-	    $current=$block->current();
-        $height=$current['height'];
-        $limit=$height-1000;
-        $db->run("DELETE FROM mempool WHERE height<:limit",array(":limit"=>$limit));
-    }
-	
-    // returns X  transactions from mempool
-    public function mempool($max){
-        global $db;
-        $block=new Block;
-        $current=$block->current();
-        $height=$current['height']+1;
-	// only get the transactions that are not locked with a future height
-        $r=$db->run("SELECT * FROM mempool WHERE height<=:height ORDER by val/fee DESC LIMIT :max",array(":height"=>$height, ":max"=>$max+50));
-        $transactions=array();
-        if(count($r)>0){
-            $i=0;
-            $balance=array();
-            foreach($r as $x){
-                    $trans=array("id"=>$x['id'],"dst"=>$x['dst'],"val"=>$x['val'],"fee"=>$x['fee'],"signature"=>$x['signature'], "message"=>$x['message'],"version"=>$x['version'],"date"=>$x['date'], "public_key"=>$x['public_key']);
-                
-                    if($i>=$max) break;
 
-                    if(empty($x['public_key'])){
-                        _log("$x[id] - Transaction has empty public_key");
-                        continue;
-                    } 
-                    if(empty($x['src'])){
-                        _log("$x[id] - Transaction has empty src");
-                        continue;
-                    } 
-                    if(!$this->check($trans, $current['height'])){
-                        _log("$x[id] - Transaction Check Failed");
-                        continue;
-                    } 
-                    
-                    $balance[$x['src']]+=$x['val']+$x['fee'];
-                    if($db->single("SELECT COUNT(1) FROM transactions WHERE id=:id",array(":id"=>$x['id']))>0) {
-                        _log("$x[id] - Duplicate transaction");
-                        continue; //duplicate transaction	
+            if ($x['version']>=100&&$x['version']<110&&$x['height']>=80000) {
+                if ($x['version']==100) {
+                    $rez=$db->run("DELETE FROM masternode WHERE public_key=:public_key", [':public_key'=>$x['public_key']]);
+                    if ($rez!=1) {
+                        _log("Delete from masternode failed", 3);
+                        return false;
+                    }
+                } elseif ($x['version']==101) {
+                    $rez=$db->run(
+                        "UPDATE masternode SET status=1 WHERE public_key=:public_key",
+                    [':public_key'=>$x['public_key']]
+                    );
+                } elseif ($x['version']==102) {
+                    $rez=$db->run("UPDATE masternode SET status=0 WHERE public_key=:public_key", [':public_key'=>$x['public_key']]);
+                } elseif ($x['version']==103) {
+                    $mnt=$db->row("SELECT height, `message` FROM transactions WHERE version=100 AND public_key=:public_key ORDER by height DESC LIMIT 1", [":public_key"=>$x['public_key']]);
+                    $vers=$db->single(
+                        "SELECT `version` FROM transactions WHERE (version=101 or version=102) AND public_key=:public_key AND height>:height ORDER by height DESC LIMIT 1",
+                    [":public_key"=>$x['public_key'],":height"=>$mnt['height']]
+                    );
+                       
+                    $status=1;
+                        
+                    if ($vers==101) {
+                        $status=0;
                     }
                     
-                    $res=$db->single("SELECT COUNT(1) FROM accounts WHERE id=:id AND balance>=:balance",array(":id"=>$x['src'], ":balance"=>$balance[$x['src']]));
-                    
-                    if($res==0) {
-                        _log("$x[id] - Not enough funds in balance");
-                        continue; // not enough balance for the transactions	
-                    } 
-                    $i++;
-                    ksort($trans);
-                    $transactions[$x['id']]=$trans;
+                    $rez=$db->run(
+                        "INSERT into masternode SET `public_key`=:public_key, `height`=:height, `ip`=:ip, `status`=:status",
+                    [":public_key"=>$x['public_key'], ":height"=>$mnt['height'], ":ip"=>$mnt['message'], ":status"=>$status]
+                    );
+                    if ($rez!=1) {
+                        _log("Insert into masternode failed", 3);
+                        return false;
+                    }
+                    $rez=$db->run("UPDATE accounts SET balance=balance-100000 WHERE public_key=:public_key", [':public_key'=>$x['public_key']]);
+                    if ($rez!=1) {
+                        _log("Update masternode balance failed", 3);
+                        return false;
+                    }
                 }
+            }
+            // internal masternode history
+            if ($x['version']==111) {
+                _log("Masternode reverse: $x[message]", 4);
+                $m=explode(",", $x['message']);
+
+                $rez=$db->run(
+                    "UPDATE masternode SET fails=:fails, blacklist=:blacklist, last_won=:last_won WHERE public_key=:public_key",
+                [":public_key"=>$x['public_key'], ":blacklist"=> $m[0], ":fails"=>$m[2], ":last_won"=>$m[1]]
+                );
+                if ($rez!=1) {
+                    _log("Update masternode log failed", 3);
+                    return false;
+                }
+            }
+    
+            // add the transactions to mempool
+            if ($x['version'] > 0 && $x['version']<=110) {
+                $this->add_mempool($x);
+            }
+            $res = $db->run("DELETE FROM transactions WHERE id=:id", [":id" => $x['id']]);
+            if ($res != 1) {
+                _log("Delete transaction failed", 3);
+                return false;
+            }
         }
-	// always sort the array
+    }
+
+    // clears the mempool
+    public function clean_mempool()
+    {
+        global $db;
+        $block = new Block();
+        $current = $block->current();
+        $height = $current['height'];
+        $limit = $height - 1000;
+        $db->run("DELETE FROM mempool WHERE height<:limit", [":limit" => $limit]);
+    }
+
+    // returns X  transactions from mempool
+    public function mempool($max)
+    {
+        global $db;
+        $block = new Block();
+        $current = $block->current();
+        $height = $current['height'] + 1;
+        // only get the transactions that are not locked with a future height
+        $r = $db->run(
+            "SELECT * FROM mempool WHERE height<=:height ORDER by val/fee DESC LIMIT :max",
+            [":height" => $height, ":max" => $max + 50]
+        );
+        $transactions = [];
+        if (count($r) > 0) {
+            $i = 0;
+            $balance = [];
+            foreach ($r as $x) {
+                $trans = [
+                    "id"         => $x['id'],
+                    "dst"        => $x['dst'],
+                    "val"        => $x['val'],
+                    "fee"        => $x['fee'],
+                    "signature"  => $x['signature'],
+                    "message"    => $x['message'],
+                    "version"    => $x['version'],
+                    "date"       => $x['date'],
+                    "public_key" => $x['public_key'],
+                ];
+
+                if ($i >= $max) {
+                    break;
+                }
+
+                if (empty($x['public_key'])) {
+                    _log("$x[id] - Transaction has empty public_key");
+                    continue;
+                }
+                if (empty($x['src'])) {
+                    _log("$x[id] - Transaction has empty src");
+                    continue;
+                }
+                if (!$this->check($trans, $current['height'])) {
+                    _log("$x[id] - Transaction Check Failed");
+                    continue;
+                }
+  
+                $balance[$x['src']] += $x['val'] + $x['fee'];
+                if ($db->single("SELECT COUNT(1) FROM transactions WHERE id=:id", [":id" => $x['id']]) > 0) {
+                    _log("$x[id] - Duplicate transaction");
+                    continue; //duplicate transaction
+                }
+
+                $res = $db->single(
+                    "SELECT COUNT(1) FROM accounts WHERE id=:id AND balance>=:balance",
+                    [":id" => $x['src'], ":balance" => $balance[$x['src']]]
+                );
+
+                if ($res == 0) {
+                    _log("$x[id] - Not enough funds in balance");
+                    continue; // not enough balance for the transactions
+                }
+                $i++;
+                ksort($trans);
+                $transactions[$x['id']] = $trans;
+            }
+        }
+        // always sort the array
         ksort($transactions);
 
         return $transactions;
     }
 
     // add a new transaction to mempool and lock it with the current height
-    public function add_mempool($x, $peer=""){
+    public function add_mempool($x, $peer = "")
+    {
         global $db;
-        $block= new Block;
-	    $current=$block->current();
-        $height=$current['height'];
-        $x['id']=san($x['id']);
-        $bind=array(":peer"=>$peer, ":id"=>$x['id'],"public_key"=>$x['public_key'], ":height"=>$height, ":src"=>$x['src'],":dst"=>$x['dst'],":val"=>$x['val'], ":fee"=>$x['fee'],":signature"=>$x['signature'], ":version"=>$x['version'],":date"=>$x['date'], ":message"=>$x['message']);
-        $db->run("INSERT into mempool  SET peer=:peer, id=:id, public_key=:public_key, height=:height, src=:src, dst=:dst, val=:val, fee=:fee, signature=:signature, version=:version, message=:message, `date`=:date",$bind);
+        global $_config;
+        $block = new Block();
+        if ($x['version']>110) {
+            return true;
+        }
+        
+        if ($_config['use_official_blacklist']!==false) {
+            if (Blacklist::checkPublicKey($x['public_key']) || Blacklist::checkAddress($x['src'])) {
+                return true;
+            }
+        }
+        $current = $block->current();
+        $height = $current['height'];
+        $x['id'] = san($x['id']);
+        $bind = [
+            ":peer"      => $peer,
+            ":id"        => $x['id'],
+            "public_key" => $x['public_key'],
+            ":height"    => $height,
+            ":src"       => $x['src'],
+            ":dst"       => $x['dst'],
+            ":val"       => $x['val'],
+            ":fee"       => $x['fee'],
+            ":signature" => $x['signature'],
+            ":version"   => $x['version'],
+            ":date"      => $x['date'],
+            ":message"   => $x['message'],
+        ];
+
+        //only a single masternode command of same type, per block
+        if ($x['version']>=100&&$x['version']<110) {
+            $check=$db->single("SELECT COUNT(1) FROM mempool WHERE public_key=:public_key", [":public_key"=>$x['public_key']]);
+            if ($check!=0) {
+                _log("Masternode transaction already in mempool", 3);
+                return false;
+            }
+        }
+
+        $db->run(
+            "INSERT into mempool  SET peer=:peer, id=:id, public_key=:public_key, height=:height, src=:src, dst=:dst, val=:val, fee=:fee, signature=:signature, version=:version, message=:message, `date`=:date",
+            $bind
+        );
         return true;
-
-
     }
 
     // add a new transaction to the blockchain
-    public function add($block,$height, $x){
+    public function add($block, $height, $x)
+    {
         global $db;
-        $acc= new Account;
+        $acc = new Account();
         $acc->add($x['public_key'], $block);
-        $acc->add_id($x['dst'],$block);
-        $x['id']=san($x['id']);
-        $bind=array(":id"=>$x['id'], ":public_key"=>$x['public_key'],":height"=>$height, ":block"=>$block, ":dst"=>$x['dst'],":val"=>$x['val'], ":fee"=>$x['fee'],":signature"=>$x['signature'], ":version"=>$x['version'],":date"=>$x['date'], ":message"=>$x['message']);
-        $res=$db->run("INSERT into transactions SET id=:id, public_key=:public_key, block=:block,  height=:height, dst=:dst, val=:val, fee=:fee, signature=:signature, version=:version, message=:message, `date`=:date",$bind);
-        if($res!=1) return false;
-        $db->run("UPDATE accounts SET balance=balance+:val WHERE id=:id",array(":id"=>$x['dst'], ":val"=>$x['val']));
-	// no debit when the transaction is reward
-	if($x['version']>0) $db->run("UPDATE accounts SET balance=(balance-:val)-:fee WHERE id=:id",array(":id"=>$x['src'], ":val"=>$x['val'], ":fee"=>$x['fee']));
-        $db->run("DELETE FROM mempool WHERE id=:id",array(":id"=>$x['id']));
+        if ($x['version']==1) {
+            $acc->add_id($x['dst'], $block);
+        }
+        $x['id'] = san($x['id']);
+        $bind = [
+            ":id"         => $x['id'],
+            ":public_key" => $x['public_key'],
+            ":height"     => $height,
+            ":block"      => $block,
+            ":dst"        => $x['dst'],
+            ":val"        => $x['val'],
+            ":fee"        => $x['fee'],
+            ":signature"  => $x['signature'],
+            ":version"    => $x['version'],
+            ":date"       => $x['date'],
+            ":message"    => $x['message'],
+        ];
+        $res = $db->run(
+            "INSERT into transactions SET id=:id, public_key=:public_key, block=:block,  height=:height, dst=:dst, val=:val, fee=:fee, signature=:signature, version=:version, message=:message, `date`=:date",
+            $bind
+        );
+        if ($res != 1) {
+            return false;
+        }
+        if ($x['version'] == 2&&$height>=80000) {
+            $db->run("UPDATE accounts SET balance=balance+:val WHERE alias=:alias", [":alias" => $x['dst'], ":val" => $x['val']]);
+        } elseif ($x['version']==100&&$height>=80000) {
+            //master node deposit
+        } elseif ($x['version']==103&&$height>=80000) {
+            $blk=new Block();
+            $blk->masternode_log($x['public_key'], $height, $block);
+
+        //master node withdrawal
+        } else {
+            $db->run("UPDATE accounts SET balance=balance+:val WHERE id=:id", [":id" => $x['dst'], ":val" => $x['val']]);
+        }
+
+
+
+        // no debit when the transaction is reward
+        if ($x['version'] > 0) {
+            $db->run(
+                "UPDATE accounts SET balance=(balance-:val)-:fee WHERE id=:id",
+                [":id" => $x['src'], ":val" => $x['val'], ":fee" => $x['fee']]
+            );
+        }
+
+
+        // set the alias
+        if ($x['version']==3&&$height>=80000) {
+            $db->run(
+                    "UPDATE accounts SET alias=:alias WHERE id=:id",
+                    [":id" => $x['src'], ":alias"=>$x['message']]
+                );
+        }
+
+
+        if ($x['version']>=100&&$x['version']<110&&$height>=80000) {
+            $message=$x['message'];
+            $message=preg_replace("/[^0-9\.]/", "", $message);
+            if ($x['version']==100) {
+                $db->run("INSERT into masternode SET `public_key`=:public_key, `height`=:height, `ip`=:ip, `status`=1", [":public_key"=>$x['public_key'], ":height"=>$height, ":ip"=>$message]);
+            } else {
+                if ($x['version']==101) {
+                    $db->run("UPDATE masternode SET status=0 WHERE public_key=:public_key", [':public_key'=>$x['public_key']]);
+                } elseif ($x['version']==102) {
+                    $db->run("UPDATE masternode SET status=1 WHERE public_key=:public_key", [':public_key'=>$x['public_key']]);
+                } elseif ($x['version']==103) {
+                    $db->run("DELETE FROM masternode WHERE public_key=:public_key", [':public_key'=>$x['public_key']]);
+                    $db->run("UPDATE accounts SET balance=balance+100000 WHERE public_key=:public_key", [':public_key'=>$x['public_key']]);
+                }
+            }
+        }
+        
+
+
+        $db->run("DELETE FROM mempool WHERE id=:id", [":id" => $x['id']]);
         return true;
-
-
     }
-	
+
     // hash the transaction's most important fields and create the transaction ID
-    public function hash($x){
-        $info=$x['val']."-".$x['fee']."-".$x['dst']."-".$x['message']."-".$x['version']."-".$x['public_key']."-".$x['date']."-".$x['signature'];
-        $hash= hash("sha512",$info);
-        return hex2coin($hash);   
+    public function hash($x)
+    {
+        $info = $x['val']."-".$x['fee']."-".$x['dst']."-".$x['message']."-".$x['version']."-".$x['public_key']."-".$x['date']."-".$x['signature'];
+        $hash = hash("sha512", $info);
+        return hex2coin($hash);
     }
-    
+
     // check the transaction for validity
-    public function check($x, $height=0){
-                // if no specific block, use current
-		if($height===0){
-			$block=new Block;
-			$current=$block->current();
-			$height=$current['height'];
-		}
-                $acc= new Account;
-                $info=$x['val']."-".$x['fee']."-".$x['dst']."-".$x['message']."-".$x['version']."-".$x['public_key']."-".$x['date'];
+    public function check($x, $height = 0)
+    {
+        // if no specific block, use current
+        if ($height === 0) {
+            $block = new Block();
+            $current = $block->current();
+            $height = $current['height'];
+        }
+        $acc = new Account();
+        $info = $x['val']."-".$x['fee']."-".$x['dst']."-".$x['message']."-".$x['version']."-".$x['public_key']."-".$x['date'];
 
-		// the value must be >=0
-                if($x['val']<0){ _log("$x[id] - Value below 0"); return false; }
-       		
-		// the fee must be >=0
-	        if($x['fee']<0) { _log("$x[id] - Fee below 0"); return false; }
+        // hard fork at 80000 to implement alias, new mining system, assets
+        // if($x['version']>1 && $height<80000){
+        //     return false;
+        // }
             
-		// the fee is 0.25%, hardcoded
-                $fee=$x['val']*0.0025;
-		$fee=number_format($fee,8,".","");
-                if($fee<0.00000001) $fee=0.00000001;
-		// max fee after block 10800 is 10
-		if($height>10800&&$fee>10) $fee=10; //10800
-		// added fee does not match
-                if($fee!=$x['fee']) { _log("$x[id] - Fee not 0.25%"); return false; }
+        // internal transactions
+        if ($x['version']>110) {
+            return false;
+        }
 
-		// invalid destination address
-                if(!$acc->valid($x['dst'])) { _log("$x[id] - Invalid destination address"); return false; }
-             
-		// reward transactions are not added via this function
-                if($x['version']<1) { _log("$x[id] - Invalid version <1"); return false; }
-                //if($x['version']>1) { _log("$x[id] - Invalid version >1"); return false; }
+        // the value must be >=0
+        if ($x['val'] < 0) {
+            _log("$x[id] - Value below 0", 3);
+            return false;
+        }
+
+        // the fee must be >=0
+        if ($x['fee'] < 0) {
+            _log("$x[id] - Fee below 0", 3);
+            return false;
+        }
+
+        // the fee is 0.25%, hardcoded
+        $fee = $x['val'] * 0.0025;
+        $fee = number_format($fee, 8, ".", "");
+        if ($fee < 0.00000001) {
+            $fee = 0.00000001;
+        }
+        //alias fee
+        if ($x['version']==3&&$height>=80000) {
+            $fee=10;
+            if (!$acc->free_alias($x['message'])) {
+                _log("Alias not free", 3);
+                return false;
+            }
+            // alias can only be set once per account
+            if ($acc->has_alias($x['public_key'])) {
+                _log("The account already has an alias", 3);
+                return false;
+            }
+        }
+
+        //masternode transactions
         
-		// public key must be at least 15 chars / probably should be replaced with the validator function        
-	        if(strlen($x['public_key'])<15) { _log("$x[id] - Invalid public key size"); return false; }
- 		// no transactions before the genesis
-                if($x['date']<1511725068) { _log("$x[id] - Date before genesis"); return false; }
-		// no future transactions
-                if($x['date']>time()+86400) { _log("$x[id] - Date in the future"); return false; }
-                // prevent the resending of broken base58 transactions
-		if($height>16900&&$x['date']<1519327780) return false;
-                $id=$this->hash($x);	
-        	// the hash does not match our regenerated hash
-	        if($x['id']!=$id) { 
-			// fix for broken base58 library which was used until block 16900, accepts hashes without the first 1 or 2 bytes
-			$xs=base58_decode($x['id']);
-                        if(((strlen($xs)!=63||substr($id,1)!=$x['id'])&&(strlen($xs)!=62||substr($id,2)!=$x['id']))||$height>16900){
-                                 _log("$x[id] - $id - Invalid hash");
-                                return false;
-                        }
-
-		}
+        if ($x['version']>=100&&$x['version']<110&&$height>=80000) {
+            if ($x['version']==100) {
+                $message=$x['message'];
+                $message=preg_replace("/[^0-9\.]/", "", $message);
+                if (!filter_var($message, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE)) {
+                    _log("The Masternode IP is invalid", 3);
+                    return false;
+                }
+                global $db;
+                $existing=$db->single("SELECT COUNT(1) FROM masternode WHERE public_key=:id or ip=:ip", ["id"=>$x['public_key'], ":ip"=>$message]);
+                if ($existing!=0) {
+                    return false;
+                }
+            }
+           
+        
+            if ($x['version']==100&&$x['val']!=100000) {
+                _log("The masternode transaction is not 100k", 3);
+                return false;
+            } elseif ($x['version']!=100) {
+                $mn=$acc->get_masternode($x['public_key']);
                 
-           	//verify the ecdsa signature
-    		if(!$acc->check_signature($info, $x['signature'], $x['public_key'])) { _log("$x[id] - Invalid signature"); return false; }
-               
-	    return true;
-    }
-    // sign a transaction
-    public function sign($x, $private_key){
-        $info=$x['val']."-".$x['fee']."-".$x['dst']."-".$x['message']."-".$x['version']."-".$x['public_key']."-".$x['date'];
-        $signature=ec_sign($info,$private_key);
+                if (!$mn) {
+                    _log("The masternode does not exist", 3);
+                    return false;
+                }
+                if ($x['version']==101&&$mn['status']!=1) {
+                    _log("The masternode does is not running", 3);
+                    return false;
+                } elseif ($x['version']==102 && $mn['status']!=0) {
+                    _log("The masternode is not paused", 3);
+                    return false;
+                } elseif ($x['version']==103) {
+                    if ($mn['status']!=0) {
+                        _log("The masternode is not paused", 3);
+                        return false;
+                    } elseif ($height-$mn['last_won']<10800) { //10800
+                        _log("The masternode last won block is less than 10800 blocks", 3);
+                        return false;
+                    } elseif ($height-$mn['height']<32400) { //32400
+                        _log("The masternode start height is less than 32400 blocks! $height - $mn[height]", 3);
+                        return false;
+                    }
+                }
+            }
+        }
         
-        return $signature;
 
+        // max fee after block 10800 is 10
+        if ($height > 10800 && $fee > 10) {
+            $fee = 10; //10800
+        }
+        // added fee does not match
+        if ($fee != $x['fee']) {
+            _log("$x[id] - Fee not 0.25%", 3);
+            _log(json_encode($x), 3);
+            return false;
+        }
+
+        if ($x['version']==1) {
+            // invalid destination address
+            if (!$acc->valid($x['dst'])) {
+                _log("$x[id] - Invalid destination address", 3);
+                return false;
+            }
+        } elseif ($x['version']==2&&$height>=80000) {
+            if (!$acc->valid_alias($x['dst'])) {
+                _log("$x[id] - Invalid destination alias", 3);
+                return false;
+            }
+        }
+
+
+        // reward transactions are not added via this function
+        if ($x['version'] < 1) {
+            _log("$x[id] - Invalid version <1", 3);
+            return false;
+        }
+        //if($x['version']>1) { _log("$x[id] - Invalid version >1"); return false; }
+
+        // public key must be at least 15 chars / probably should be replaced with the validator function
+        if (strlen($x['public_key']) < 15) {
+            _log("$x[id] - Invalid public key size", 3);
+            return false;
+        }
+        // no transactions before the genesis
+        if ($x['date'] < 1511725068) {
+            _log("$x[id] - Date before genesis", 3);
+            return false;
+        }
+        // no future transactions
+        if ($x['date'] > time() + 86400) {
+            _log("$x[id] - Date in the future", 3);
+            return false;
+        }
+        // prevent the resending of broken base58 transactions
+        if ($height > 16900 && $x['date'] < 1519327780) {
+            _log("$x[id] - Broken base58 transaction", 3);
+            return false;
+        }
+        $id = $this->hash($x);
+        // the hash does not match our regenerated hash
+        if ($x['id'] != $id) {
+            // fix for broken base58 library which was used until block 16900, accepts hashes without the first 1 or 2 bytes
+            $xs = base58_decode($x['id']);
+            if (((strlen($xs) != 63 || substr($id, 1) != $x['id']) && (strlen($xs) != 62 || substr(
+                $id,
+                2
+            ) != $x['id'])) || $height > 16900) {
+                _log("$x[id] - $id - Invalid hash");
+                return false;
+            }
+        }
+
+        //verify the ecdsa signature
+        if (!$acc->check_signature($info, $x['signature'], $x['public_key'])) {
+            _log("$x[id] - Invalid signature - $info");
+            return false;
+        }
+
+        return true;
+    }
+
+    // sign a transaction
+    public function sign($x, $private_key)
+    {
+        $info = $x['val']."-".$x['fee']."-".$x['dst']."-".$x['message']."-".$x['version']."-".$x['public_key']."-".$x['date'];
+        
+        $signature = ec_sign($info, $private_key);
+
+        return $signature;
     }
 
     //export a mempool transaction
-    public function export($id){
+    public function export($id)
+    {
         global $db;
-        $r=$db->row("SELECT * FROM mempool WHERE id=:id",array(":id"=>$id));
+        $r = $db->row("SELECT * FROM mempool WHERE id=:id", [":id" => $id]);
         return $r;
-
     }
+
     // get the transaction data as array
-    public function get_transaction($id){
+    public function get_transaction($id)
+    {
         global $db;
-        $acc=new Account;
-        $block=new Block;
-        $current=$block->current();
+        $acc = new Account();
+        $block = new Block();
+        $current = $block->current();
 
-        $x=$db->row("SELECT * FROM transactions WHERE id=:id",array(":id"=>$id));
-       
-	    if(!$x) return false;
-	    $trans=array("block"=>$x['block'],"height"=>$x['height'], "id"=>$x['id'],"dst"=>$x['dst'],"val"=>$x['val'],"fee"=>$x['fee'],"signature"=>$x['signature'], "message"=>$x['message'],"version"=>$x['version'],"date"=>$x['date'], "public_key"=>$x['public_key']);
-            $trans['src']=$acc->get_address($x['public_key']);
-            $trans['confirmations']=$current['height']-$x['height'];
+        $x = $db->row("SELECT * FROM transactions WHERE id=:id", [":id" => $id]);
 
-			if($x['version']==0) $trans['type']="mining";
-			elseif($x['version']==1){
-				if($x['dst']==$id) $trans['type']="credit";
-				else $trans['type']="debit";
-			} else {
-				$trans['type']="other";
-			}
-			ksort($trans);
-			return $trans;
-            
+        if (!$x) {
+            return false;
+        }
+        $trans = [
+            "block"      => $x['block'],
+            "height"     => $x['height'],
+            "id"         => $x['id'],
+            "dst"        => $x['dst'],
+            "val"        => $x['val'],
+            "fee"        => $x['fee'],
+            "signature"  => $x['signature'],
+            "message"    => $x['message'],
+            "version"    => $x['version'],
+            "date"       => $x['date'],
+            "public_key" => $x['public_key'],
+        ];
+        $trans['src'] = $acc->get_address($x['public_key']);
+        $trans['confirmations'] = $current['height'] - $x['height'];
+
+        if ($x['version'] == 0) {
+            $trans['type'] = "mining";
+        } elseif ($x['version'] == 1 || $x['version'] == 2) {
+            if ($x['dst'] == $id) {
+                $trans['type'] = "credit";
+            } else {
+                $trans['type'] = "debit";
+            }
+        } else {
+            $trans['type'] = "other";
+        }
+        ksort($trans);
+        return $trans;
     }
 
-   // return the transactions for a specific block id or height
-   public function get_transactions($height="", $id=""){
+    // return the transactions for a specific block id or height
+    public function get_transactions($height = "", $id = "")
+    {
         global $db;
-        $block=new Block;
-        $current=$block->current();
-        $acc=new Account;
-	$height=san($height);
-	$id=san($id);
-	if(empty($id)&&empty($height)) return false;
-	if(!empty($id)) $r=$db->run("SELECT * FROM transactions WHERE block=:id AND version>0",array(":id"=>$id));
-	else $r=$db->run("SELECT * FROM transactions WHERE height=:height AND version>0",array(":height"=>$height));
-	$res=array();
-	foreach($r as $x){
-            $trans=array("block"=>$x['block'],"height"=>$x['height'], "id"=>$x['id'],"dst"=>$x['dst'],"val"=>$x['val'],"fee"=>$x['fee'],"signature"=>$x['signature'], "message"=>$x['message'],"version"=>$x['version'],"date"=>$x['date'], "public_key"=>$x['public_key']);
-            $trans['src']=$acc->get_address($x['public_key']);
-            $trans['confirmations']=$current['height']-$x['height'];
-
-                        if($x['version']==0) $trans['type']="mining";
-                        elseif($x['version']==1){
-                                if($x['dst']==$id) $trans['type']="credit";
-                                else $trans['type']="debit";
-                        } else {
-                                $trans['type']="other";
-                        }
-                        ksort($trans);
-			$res[]=$trans;
-	}
-	return $res;
+        $block = new Block();
+        $current = $block->current();
+        $acc = new Account();
+        $height = san($height);
+        $id = san($id);
+        if (empty($id) && empty($height)) {
+            return false;
+        }
+        if (!empty($id)) {
+            $r = $db->run("SELECT * FROM transactions WHERE block=:id AND version>0", [":id" => $id]);
+        } else {
+            $r = $db->run("SELECT * FROM transactions WHERE height=:height AND version>0", [":height" => $height]);
+        }
+        $res = [];
+        foreach ($r as $x) {
+            if ($x['version']>110) {
+                continue; //internal transactions
+            }
+            $trans = [
+                "block"      => $x['block'],
+                "height"     => $x['height'],
+                "id"         => $x['id'],
+                "dst"        => $x['dst'],
+                "val"        => $x['val'],
+                "fee"        => $x['fee'],
+                "signature"  => $x['signature'],
+                "message"    => $x['message'],
+                "version"    => $x['version'],
+                "date"       => $x['date'],
+                "public_key" => $x['public_key'],
+            ];
+            $trans['src'] = $acc->get_address($x['public_key']);
+            $trans['confirmations'] = $current['height'] - $x['height'];
 
+            if ($x['version'] == 0) {
+                $trans['type'] = "mining";
+            } elseif ($x['version'] == 1||$x['version'] == 2) {
+                if ($x['dst'] == $id) {
+                    $trans['type'] = "credit";
+                } else {
+                    $trans['type'] = "debit";
+                }
+            } else {
+                $trans['type'] = "other";
+            }
+            ksort($trans);
+            $res[] = $trans;
+        }
+        return $res;
     }
 
     // get a specific mempool transaction as array
-    public function get_mempool_transaction($id){
+    public function get_mempool_transaction($id)
+    {
         global $db;
-        $x=$db->row("SELECT * FROM mempool WHERE id=:id",array(":id"=>$id));
-		if(!$x) return false;
-			$trans=array("block"=>$x['block'],"height"=>$x['height'], "id"=>$x['id'],"dst"=>$x['dst'],"val"=>$x['val'],"fee"=>$x['fee'],"signature"=>$x['signature'], "message"=>$x['message'],"version"=>$x['version'],"date"=>$x['date'], "public_key"=>$x['public_key']);
-			$trans['src']=$x['src'];
+        $x = $db->row("SELECT * FROM mempool WHERE id=:id", [":id" => $id]);
+        if (!$x) {
+            return false;
+        }
+        $trans = [
+            "block"      => $x['block'],
+            "height"     => $x['height'],
+            "id"         => $x['id'],
+            "dst"        => $x['dst'],
+            "val"        => $x['val'],
+            "fee"        => $x['fee'],
+            "signature"  => $x['signature'],
+            "message"    => $x['message'],
+            "version"    => $x['version'],
+            "date"       => $x['date'],
+            "public_key" => $x['public_key'],
+        ];
+        $trans['src'] = $x['src'];
 
-			$trans['type']="mempool";
-            $trans['confirmations']=-1;
-			ksort($trans);
-			return $trans;
-            
+        $trans['type'] = "mempool";
+        $trans['confirmations'] = -1;
+        ksort($trans);
+        return $trans;
     }
-
 }
-
-
-
-?>

index.php

@@ -1,7 +1,7 @@
 <?php
-/* 
+/*
 The MIT License (MIT)
-Copyright (c) 2018 AroDev 
+Copyright (c) 2018 AroDev
 
 www.arionum.com
 
@@ -24,14 +24,300 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-
-require_once("include/init.inc.php");
-$block=new Block;
-$current=$block->current();
-
-echo "<h3>Arionum Node</h3>";
-echo "System check complete.<br><br> Current block: $current[height]";
-
-
-
+require_once __DIR__.'/include/init.inc.php';
+$block = new Block();
+$current = $block->current();
 ?>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Arionum Node</title>
+    <style>
+        .title:not(:last-child) {
+            margin-bottom: 1.5rem;
+        }
+
+        body, h1, html {
+            margin: 0;
+            padding: 0;
+        }
+
+        h1 {
+            font-size: 100%;
+            font-weight: 400;
+        }
+
+        html {
+            box-sizing: border-box;
+            background-color: #fff;
+            font-size: 16px;
+            -moz-osx-font-smoothing: grayscale;
+            -webkit-font-smoothing: antialiased;
+            min-width: 300px;
+            overflow-x: hidden;
+            overflow-y: scroll;
+            text-rendering: optimizeLegibility;
+            -webkit-text-size-adjust: 100%;
+            -moz-text-size-adjust: 100%;
+            -ms-text-size-adjust: 100%;
+            text-size-adjust: 100%;
+        }
+
+        *, ::after, ::before {
+            box-sizing: inherit;
+        }
+
+        section {
+            display: block;
+        }
+
+        body {
+            font-family: "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
+            color: #4a4a4a;
+            font-size: 1rem;
+            font-weight: 400;
+            line-height: 1.5;
+        }
+
+        span {
+            font-style: inherit;
+            font-weight: inherit;
+        }
+
+        strong {
+            color: #363636;
+            font-weight: 700;
+        }
+
+        .container {
+            position: relative;
+            margin: 0 auto;
+        }
+
+        .field.is-grouped {
+            display: flex;
+            justify-content: flex-start;
+        }
+
+        .field.is-grouped > .control {
+            flex-shrink: 0;
+        }
+
+        .field.is-grouped > .control:not(:last-child) {
+            margin-bottom: 0;
+            margin-right: .75rem;
+        }
+
+        .field.is-grouped.is-grouped-multiline {
+            flex-wrap: wrap;
+        }
+
+        .field.is-grouped.is-grouped-multiline > .control:last-child, .field.is-grouped.is-grouped-multiline > .control:not(:last-child) {
+            margin-bottom: .75rem;
+        }
+
+        .field.is-grouped.is-grouped-multiline:last-child {
+            margin-bottom: -.75rem;
+        }
+
+        .control {
+            font-size: 1rem;
+            position: relative;
+            text-align: left;
+        }
+
+        .tags {
+            align-items: center;
+            display: flex;
+            flex-wrap: wrap;
+            justify-content: flex-start;
+        }
+
+        .tags .tag {
+            margin-bottom: .5rem;
+        }
+
+        .tags .tag:not(:last-child) {
+            margin-right: .5rem;
+        }
+
+        .tags:last-child {
+            margin-bottom: -.5rem;
+        }
+
+        .tags.has-addons .tag {
+            margin-right: 0;
+        }
+
+        .tags.has-addons .tag:not(:first-child) {
+            border-bottom-left-radius: 0;
+            border-top-left-radius: 0;
+        }
+
+        .tags.has-addons .tag:not(:last-child) {
+            border-bottom-right-radius: 0;
+            border-top-right-radius: 0;
+        }
+
+        .tag:not(body) {
+            align-items: center;
+            background-color: #f5f5f5;
+            border-radius: 4px;
+            color: #4a4a4a;
+            display: inline-flex;
+            font-size: .75rem;
+            height: 2em;
+            justify-content: center;
+            line-height: 1.5;
+            padding-left: .75em;
+            padding-right: .75em;
+            white-space: nowrap;
+        }
+
+        .tag:not(body).is-light {
+            background-color: #f5f5f5;
+            color: #363636;
+        }
+
+        .tag:not(body).is-info {
+            background-color: #209cee;
+            color: #fff;
+        }
+        .tag:not(body).is-danger {
+            background-color: #f48f42;
+            color: #fff;
+        }
+
+        .tag:not(body).is-success {
+            background-color: #23d160;
+            color: #fff;
+        }
+
+        .title {
+            word-break: break-word;
+            color: #363636;
+            font-size: 2rem;
+            font-weight: 600;
+            line-height: 1.125;
+        }
+
+        .hero {
+            align-items: stretch;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+        }
+
+        .hero.is-dark {
+            background-color: #363636;
+            color: #f5f5f5;
+        }
+
+        .hero.is-dark strong {
+            color: inherit;
+        }
+
+        .hero.is-dark .title {
+            color: #f5f5f5;
+        }
+
+        .hero.is-fullheight .hero-body {
+            align-items: center;
+            display: flex;
+        }
+
+        .hero.is-fullheight .hero-body > .container {
+            flex-grow: 1;
+            flex-shrink: 1;
+        }
+
+        .hero.is-fullheight {
+            min-height: 100vh;
+        }
+
+        .hero-body {
+            flex-grow: 1;
+            flex-shrink: 0;
+            padding: 3rem 1.5rem;
+        }
+
+        a {
+            color: #3273dc;
+            cursor: pointer;
+            text-decoration: none;
+        }
+
+        a:hover {
+            color: #363636;
+        }
+
+        a.is-dark {
+            color: #fff;
+        }
+
+        @media screen and (min-width: 1088px) {
+
+            .container {
+                max-width: 960px;
+                width: 960px;
+            }
+        }
+
+        @media screen and (min-width: 1280px) {
+
+            .container {
+                max-width: 1152px;
+                width: 1152px;
+            }
+        }
+
+        @media screen and (min-width: 1472px) {
+
+            .container {
+                max-width: 1344px;
+                width: 1344px;
+            }
+        }
+    </style>
+</head>
+
+<body>
+<section class="hero is-dark is-fullheight">
+    <div class="hero-body">
+        <div class="container">
+            <h1 class="title">Arionum Node</h1>
+
+            <div class="field is-grouped is-grouped-multiline">
+                <div class="control">
+                    <div class="tags has-addons">
+                        <strong class="tag is-success">Current Block</strong>
+                        <span class="tag is-light"><?= $current['height']; ?></span>
+                    </div>
+                </div>
+                <div class="control">
+                    <div class="tags has-addons">
+                        <strong class="tag is-danger">Version</strong>
+                        <span class="tag is-light"><?= VERSION; ?></span>
+                    </div>
+                </div>
+
+                <div class="control">
+                    <div class="tags has-addons">
+                        <strong class="tag is-info">Public API</strong>
+                        <span class="tag is-light"><?= ($_config['public_api']) ? 'yes' : 'no'; ?></span>
+                    </div>
+                </div>
+
+                <div class="control">
+                    <a class="tags is-dark" href="./doc/" target="_blank">
+                        <strong class="tag is-info">Documentation</strong>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+</body>
+</html>

mine.php

@@ -1,7 +1,7 @@
 <?php
-/* 
+/*
 The MIT License (MIT)
-Copyright (c) 2018 AroDev 
+Copyright (c) 2018 AroDev
 
 www.arionum.com
 
@@ -23,52 +23,206 @@ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 OR OTHER DEALINGS IN THE SOFTWARE.
 */
-require_once("include/init.inc.php");
-$block=new Block();
-$acc=new Account();
+require_once __DIR__.'/include/init.inc.php';
+$block = new Block();
+$acc = new Account();
 set_time_limit(360);
-$q=$_GET['q'];
+$q = $_GET['q'];
 
-$ip=$_SERVER['REMOTE_ADDR'];
-$ip=filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
+$ip = san_ip($_SERVER['REMOTE_ADDR']);
+$ip = filter_var($ip, FILTER_VALIDATE_IP);
 
 // in case of testnet, all IPs are accepted for mining
-if($_config['testnet']==false&&!in_array($ip,$_config['allowed_hosts'])) api_err("unauthorized");
-
-if($q=="info"){
-	// provides the mining info to the miner
-	$diff=$block->difficulty();
-	$current=$block->current();
-	api_echo(array("difficulty"=>$diff, "block"=>$current['id'], "height"=>$current['height']));
-	exit;
-} elseif($q=="submitNonce"){
-	// in case the blocks are syncing, reject all
-	if($_config['sanity_sync']==1) api_err("sanity-sync");
-	$nonce = san($_POST['nonce']);
-	$argon=$_POST['argon'];
-	$public_key=san($_POST['public_key']);
-	$private_key=san($_POST['private_key']);
-	// check if the miner won the block
-	$result=$block->mine($public_key, $nonce, $argon);
-
-	if($result) {
-			// generate the new block
-			$res=$block->forge($nonce,$argon, $public_key, $private_key);
-			
-			
-			
-
-		
-		if($res){
-			//if the new block is generated, propagate it to all peers in background
-			$current=$block->current();
-			system("php propagate.php block $current[id]  > /dev/null 2>&1  &");
-			api_echo("accepted");
-		} 
-	}
-	api_err("rejected");
-} else {
-	api_err("invalid command");
+if ($_config['testnet'] == false && !in_array($ip, $_config['allowed_hosts']) && !empty($ip) && !in_array(
+    '*',
+    $_config['allowed_hosts']
+)) {
+    api_err("unauthorized");
 }
 
-?>
+if ($q == "info") {
+    // provides the mining info to the miner
+    $diff = $block->difficulty();
+    $current = $block->current();
+
+    $current_height=$current['height'];
+    $recommendation="mine";
+    $argon_mem=16384;
+    $argon_threads=4;
+    $argon_time=4;
+    if ($current_height<80000) {
+        if ($current_height > 10800) {
+            $argon_mem=524288;
+            $argon_threads=1;
+            $argon_time=1;
+        }
+     } elseif($current_height>=80458){
+	if($current_height%2==0){
+	    $argon_mem=524288;
+            $argon_threads=1;
+            $argon_time=1;
+	} else {
+	    $argon_mem=16384;
+            $argon_threads=4;
+            $argon_time=4;
+
+	}
+
+	
+    } else {
+        if ($current_height%3==0) {
+            $argon_mem=524288;
+            $argon_threads=1;
+            $argon_time=1;
+        } elseif ($current_height%3==2) {
+            global $db;
+            $winner=$db->single(
+                "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";
+            if ($winner===false) {
+                $recommendation="mine";
+            }
+        }
+    }
+    $res = [
+        "difficulty" => $diff,
+        "block"      => $current['id'],
+        "height"     => $current['height'],
+        "testnet"    => $_config['testnet'],
+        "recommendation"=> $recommendation,
+        "argon_mem"  => $argon_mem,
+        "argon_threads"  => $argon_threads,
+        "argon_time"  => $argon_time,
+    ];
+    api_echo($res);
+    exit;
+} elseif ($q == "submitNonce") {
+    // in case the blocks are syncing, reject all
+    if ($_config['sanity_sync'] == 1) {
+        api_err("sanity-sync");
+    }
+    $nonce = san($_POST['nonce']);
+    $argon = $_POST['argon'];
+    $public_key = san($_POST['public_key']);
+    $private_key = san($_POST['private_key']);
+    // check if the miner won the block
+    $result = $block->mine($public_key, $nonce, $argon);
+
+    if ($result) {
+        // generate the new block
+        $res = $block->forge($nonce, $argon, $public_key, $private_key);
+
+
+        if ($res) {
+            //if the new block is generated, propagate it to all peers in background
+            $current = $block->current();
+            $current['id']=escapeshellarg(san($current['id']));
+            system("php propagate.php block $current[id]  > /dev/null 2>&1  &");
+            api_echo("accepted");
+        }
+    }
+    api_err("rejected");
+} elseif ($q == "submitBlock") {
+    // in case the blocks are syncing, reject all
+    if ($_config['sanity_sync'] == 1) {
+        api_err("sanity-sync");
+    }
+    $nonce = san($_POST['nonce']);
+    $argon = $_POST['argon'];
+    $public_key = san($_POST['public_key']);
+    // check if the miner won the block
+    
+    $result = $block->mine($public_key, $nonce, $argon);
+    
+    if ($result) {
+        // generate the new block
+        $date = intval($_POST['date']);
+        if ($date <= $current['date']) {
+            api_err("rejected - date");
+        }
+
+        // get the mempool transactions
+        $txn = new Transaction();
+        $current = $block->current();
+        $height = $current['height'] += 1;
+  
+        // get the mempool transactions
+        $txn = new Transaction();
+        
+
+        $difficulty = $block->difficulty();
+        $acc = new Account();
+        $generator = $acc->get_address($public_key);
+
+        $data=json_decode($_POST['data'], true);
+           
+        // sign the block
+        $signature = san($_POST['signature']);
+
+        // reward transaction and signature
+        $reward = $block->reward($height, $data);
+        $msg = '';
+        $transaction = [
+            "src"        => $generator,
+            "dst"        => $generator,
+            "val"        => $reward,
+            "version"    => 0,
+            "date"       => $date,
+            "message"    => $msg,
+            "fee"        => "0.00000000",
+            "public_key" => $public_key,
+        ];
+        ksort($transaction);
+        $reward_signature = san($_POST['reward_signature']);
+
+        // add the block to the blockchain
+        $res = $block->add(
+            $height,
+            $public_key,
+            $nonce,
+            $data,
+            $date,
+            $signature,
+            $difficulty,
+            $reward_signature,
+            $argon
+        );
+
+
+        if ($res) {
+            //if the new block is generated, propagate it to all peers in background
+            $current = $block->current();
+            $current['id']=escapeshellarg(san($current['id']));
+            system("php propagate.php block $current[id]  > /dev/null 2>&1  &");
+            api_echo("accepted");
+        } else {
+            api_err("rejected - add");
+        }
+    }
+    api_err("rejected");
+} elseif ($q == "getWork") {
+    if ($_config['sanity_sync'] == 1) {
+        api_err("sanity-sync");
+    }
+    $block = new Block();
+    $current = $block->current();
+    $height = $current['height'] += 1;
+    $date = time();
+    // get the mempool transactions
+    $txn = new Transaction();
+    $data = $txn->mempool($block->max_transactions());
+
+
+    $difficulty = $block->difficulty();
+    // always sort  the transactions in the same way
+    ksort($data);
+
+
+    // reward transaction and signature
+    $reward = $block->reward($height, $data);
+    api_echo(["height"=>$height, "data"=>$data, "reward"=>$reward, "block"=>$current['id'], "difficulty"=>$difficulty]);
+} else {
+    api_err("invalid command");
+}

peer.php

@@ -1,228 +1,284 @@
-<?php
-/* 
-The MIT License (MIT)
-Copyright (c) 2018 AroDev 
-
-www.arionum.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-require_once("include/init.inc.php");
-$trx = new Transaction;
-$block=new Block;
-$q=$_GET['q'];
-// the data is sent as json, in $_POST['data']
-if(!empty($_POST['data'])){
-    $data=json_decode(trim($_POST['data']),true);  
-}
-
-// make sure it's the same coin and not testnet
-if($_POST['coin']!=$_config['coin']) api_err("Invalid coin");
-$ip=$_SERVER['REMOTE_ADDR'];
-$ip=filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
-
-// peer with the current node
-if($q=="peer"){
-    // sanitize the hostname
-    $hostname = filter_var($data['hostname'], FILTER_SANITIZE_URL);
-    
-    if (!filter_var($hostname, FILTER_VALIDATE_URL)) api_err("invalid-hostname");
-   
-    // if it's already peered, only repeer on request
-    $res=$db->single("SELECT COUNT(1) FROM peers WHERE hostname=:hostname AND ip=:ip",array(":hostname"=>$hostname,":ip"=>$ip));
-    if($res==1){
-         if($data['repeer']==1){
-            $res=peer_post($hostname."/peer.php?q=peer",array("hostname"=>$_config['hostname']));
-            if($res!==false) api_echo("re-peer-ok");
-            else api_err("re-peer failed - $result");
-         }
-         api_echo("peer-ok-already");
-    }
-    // if we have enough peers, add it to DB as reserve
-    $res=$db->single("SELECT COUNT(1) FROM peers WHERE blacklisted<UNIX_TIMESTAMP() AND ping >UNIX_TIMESTAMP()-86400 AND reserve=0");
-    $reserve=1;
-    if($res<$_config['max_peers']) $reserve=0;
-    $db->run("INSERT ignore INTO peers SET hostname=:hostname, reserve=:reserve, ping=UNIX_TIMESTAMP(), ip=:ip ON DUPLICATE KEY UPDATE hostname=:hostname2",array(":ip"=>$ip, ":hostname2"=>$hostname,":hostname"=>$hostname, ":reserve"=>$reserve));
-    // re-peer to make sure the peer is valid
-    $res=peer_post($hostname."/peer.php?q=peer",array("hostname"=>$_config['hostname']));
-    if($res!==false) api_echo("re-peer-ok");
-    else{ 
-        $db->run("DELETE FROM peers WHERE ip=:ip",array(":ip"=>$ip));
-        api_err("re-peer failed - $result");
-    }
-}
-elseif($q=="ping"){
-    // confirm peer is active
-    api_echo("pong");
-} elseif($q=="submitTransaction"){
-    // receive a new transaction from a peer
-    $current=$block->current();
-
-
-    // no transactions accepted if the sanity is syncing
-    if($_config['sanity_sync']==1) api_err("sanity-sync");
-    
-    $data['id']=san($data['id']);
-    // validate transaction data
-    if(!$trx->check($data)) api_err("Invalid transaction");
-    $hash=$data['id']; 
-    // make sure it's not already in mempool 
-    $res=$db->single("SELECT COUNT(1) FROM mempool WHERE id=:id",array(":id"=>$hash));
-    if($res!=0) api_err("The transaction is already in mempool");
-    // make sure the peer is not flooding us with transactions
-    $res=$db->single("SELECT COUNT(1) FROM mempool WHERE src=:src",array(":src"=>$data['src']));
-    if($res>25) api_err("Too many transactions from this address in mempool. Please rebroadcast later.");
-    $res=$db->single("SELECT COUNT(1) FROM mempool WHERE peer=:peer",array(":peer"=>$ip));
-    if($res>$_config['peer_max_mempool']) api_error("Too many transactions broadcasted from this peer");
-    
-    
-    // make sure the transaction is not already on the blockchain
-    $res=$db->single("SELECT COUNT(1) FROM transactions WHERE id=:id",array(":id"=>$hash));
-    if($res!=0) api_err("The transaction is already in a block");
-    $acc=new Account;
-    $src=$acc->get_address($data['public_key']);
-    // make sure the sender has enough balance
-    $balance=$db->single("SELECT balance FROM accounts WHERE id=:id",array(":id"=>$src));
-    if($balance<$val+$fee) api_err("Not enough funds");
-    
-    // make sure the sender has enough pending balance
-    $memspent=$db->single("SELECT SUM(val+fee) FROM mempool WHERE src=:src",array(":src"=>$src));
-    if($balance-$memspent<$val+$fee) api_err("Not enough funds (mempool)");
-
-    // add to mempool
-    $trx->add_mempool($data, $ip);
-   
-    // rebroadcast the transaction to some peers unless the transaction is smaller than the average size of transactions in mempool - protect against garbage data flooding
-    $res=$db->row("SELECT COUNT(1) as c, sum(val) as v FROM  mempool ",array(":src"=>$data['src']));
-    if($res['c']<$_config['max_mempool_rebroadcast']&&$res['v']/$res['c']<$data['val']) system("php propagate.php transaction '$data[id]'  > /dev/null 2>&1  &");
-    api_echo("transaction-ok");
-}
-elseif($q=="submitBlock"){
-    // receive a  new block from a peer
-    
-    // if sanity sync, refuse all
-    if($_config['sanity_sync']==1){ _log('['.$ip."] Block rejected due to sanity sync"); api_err("sanity-sync"); }
-    $data['id']=san($data['id']);
-    $current=$block->current();
-    // block already in the blockchain
-    if($current['id']==$data['id']) api_echo("block-ok");
-    if($data['date']>time()+30) api_err("block in the future");
-
-    if($current['height']==$data['height']&&$current['id']!=$data['id']){
-        // different forks, same height
-        $accept_new=false;
-        if($current['transactions']<$data['transactions']){
-    	    // accept the one with most transactions
-            $accept_new=true;
-        } elseif($current['transactions']==$data['transactions']) {
-            // convert the first 12 characters from hex to decimal and the block with the largest number wins
-            $no1=hexdec(substr(coin2hex($current['id']),0,12));
-            $no2=hexdec(substr(coin2hex($data['id']),0,12));
-            if(gmp_cmp($no1,$no2)==1){
-                $accept_new=true;
-            }
-        }
-        if($accept_new){
-	    // if the new block is accepted, run a microsanity to sync it
-	    _log('['.$ip."] Starting microsanity - $data[height]"); 
-            system("php sanity.php microsanity '$ip'  > /dev/null 2>&1  &");
-            api_echo("microsanity");
-	
-        } else {
-		 _log('['.$ip."] suggesting reverse-microsanity - $data[height]"); 
-		 api_echo("reverse-microsanity"); // if it's not, suggest to the peer to get the block from us
-	}
-    }
-    // if it's not the next block
-    if($current['height']!=$data['height']-1) {
-	// if the height of the block submitted is lower than our current height, send them our current block
-        if($data['height']<$current['height']){ 
-		$pr=$db->row("SELECT * FROM peers WHERE ip=:ip",array(":ip"=>$ip));
-		if(!$pr) api_err("block-too-old");
-		$peer_host=base58_encode($pr['hostname']);
-		$pr['ip']=escapeshellcmd($pr['ip']);
-		system("php propagate.php block current '$peer_host' '$pr[ip]'   > /dev/null 2>&1  &");
-		_log('['.$ip."] block too old, sending our current block - $data[height]");
-
-		api_err("block-too-old");
-	}
-	// if the block difference is bigger than 150, nothing should be done. They should sync via sanity
-        if($data['height']-$current['height']>150) { 
-		_log('['.$ip."] block-out-of-sync - $data[height]");  
-		api_err("block-out-of-sync"); 
-	}
-	// request them to send us a microsync with the latest blocks
-	_log('['.$ip."] requesting microsync - $current[height] - $data[height]");
-        api_echo(array("request"=>"microsync","height"=>$current['height'], "block"=>$current['id']));
-        
-    }
-    // check block data
-    if(!$block->check($data)){
-	_log('['.$ip."] invalid block - $data[height]");
-	 api_err("invalid-block"); 
-    }
-    $b=$data;
-    // add the block to the blockchain
-    $res=$block->add($b['height'], $b['public_key'], $b['nonce'], $b['data'], $b['date'], $b['signature'], $b['difficulty'], $b['reward_signature'], $b['argon']);	
-   
-    if(!$res) {
-	_log('['.$ip."] invalid block data - $data[height]");
-	api_err("invalid-block-data"); 
-    }
-
-    _log('['.$ip."] block ok, repropagating - $data[height]");
-
-    // send it to all our peers
-    system("php propagate.php block '$data[id]' all all linear > /dev/null 2>&1  &");
-    api_echo("block-ok");
-}
-// return the current block, used in syncing
-elseif($q=="currentBlock"){
-   $current=$block->current();
-    api_echo($current);
-}
-// return a specific block, used in syncing
-elseif($q=="getBlock"){
-    $height=intval($data['height']);
-    
-    $export=$block->export("",$height);
-    if(!$export) api_err("invalid-block");
-     api_echo($export);
- }
- elseif($q=="getBlocks"){
-// returns X block starting at height,  used in syncing
-
-    $height=intval($data['height']);
-    
-    $r=$db->run("SELECT id,height FROM blocks WHERE height>=:height ORDER by height ASC LIMIT 100",array(":height"=>$height));
-    foreach($r as $x){
-        $blocks[$x['height']]=$block->export($x['id']);
-    }
-    api_echo($blocks);
-
- }
- // returns a full list of unblacklisted peers in a random order
- elseif($q=="getPeers"){
-    $peers=$db->run("SELECT ip,hostname FROM peers WHERE blacklisted<UNIX_TIMESTAMP() ORDER by RAND()");
-    api_echo($peers);
- } else {
-     api_err("Invalid request");
- }
- 
-?>
+<?php
+/*
+The MIT License (MIT)
+Copyright (c) 2018 AroDev
+
+www.arionum.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+require_once __DIR__.'/include/init.inc.php';
+header('Content-Type: application/json');
+
+$trx = new Transaction();
+$block = new Block();
+$q = $_GET['q'];
+// the data is sent as json, in $_POST['data']
+if (!empty($_POST['data'])) {
+    $data = json_decode(trim($_POST['data']), true);
+}
+
+// make sure it's the same coin and not testnet
+if ($_POST['coin'] != $_config['coin']) {
+    api_err("Invalid coin");
+}
+$ip = san_ip($_SERVER['REMOTE_ADDR']);
+$ip = filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
+
+// peer with the current node
+if ($q == "peer") {
+    // sanitize the hostname
+    $hostname = filter_var($data['hostname'], FILTER_SANITIZE_URL);
+
+    $bad_peers = ["127.", "localhost", "10.", "192.168.","172.16.","172.17.","172.18.","172.19.","172.20.","172.21.","172.22.","172.23.","172.24.","172.25.","172.26.","172.27.","172.28.","172.29.","172.30.","172.31."];
+    $tpeer=str_replace(["https://","http://","//"], "", $hostname);
+    foreach ($bad_peers as $bp) {
+        if (strpos($tpeer, $bp)===0) {
+            api_err("invalid-hostname");
+        }
+    }
+
+    if (!filter_var($hostname, FILTER_VALIDATE_URL)) {
+        api_err("invalid-hostname");
+    }
+    $hostname = san_host($hostname);
+    // if it's already peered, only repeer on request
+    $res = $db->single(
+        "SELECT COUNT(1) FROM peers WHERE hostname=:hostname AND ip=:ip",
+        [":hostname" => $hostname, ":ip" => $ip]
+    );
+    if ($res == 1) {
+        if ($data['repeer'] == 1) {
+            $res = peer_post($hostname."/peer.php?q=peer", ["hostname" => $_config['hostname']]);
+            if ($res !== false) {
+                api_echo("re-peer-ok");
+            } else {
+                api_err("re-peer failed - $result");
+            }
+        }
+        api_echo("peer-ok-already");
+    }
+    // if we have enough peers, add it to DB as reserve
+    $res = $db->single("SELECT COUNT(1) FROM peers WHERE blacklisted<UNIX_TIMESTAMP() AND ping >UNIX_TIMESTAMP()-86400 AND reserve=0");
+    $reserve = 1;
+    if ($res < $_config['max_peers']) {
+        $reserve = 0;
+    }
+    $db->run(
+        "INSERT ignore INTO peers SET hostname=:hostname, reserve=:reserve, ping=UNIX_TIMESTAMP(), ip=:ip ON DUPLICATE KEY UPDATE hostname=:hostname2",
+        [":ip" => $ip, ":hostname2" => $hostname, ":hostname" => $hostname, ":reserve" => $reserve]
+    );
+    // re-peer to make sure the peer is valid
+    $res = peer_post($hostname."/peer.php?q=peer", ["hostname" => $_config['hostname']]);
+    if ($res !== false) {
+        api_echo("re-peer-ok");
+    } else {
+        $db->run("DELETE FROM peers WHERE ip=:ip", [":ip" => $ip]);
+        api_err("re-peer failed - $result");
+    }
+} elseif ($q == "ping") {
+    // confirm peer is active
+    api_echo("pong");
+} elseif ($q == "submitTransaction") {
+    // receive a new transaction from a peer
+    $current = $block->current();
+
+
+    // no transactions accepted if the sanity is syncing
+    if ($_config['sanity_sync'] == 1) {
+        api_err("sanity-sync");
+    }
+
+    $data['id'] = san($data['id']);
+    // validate transaction data
+    if (!$trx->check($data)) {
+        api_err("Invalid transaction");
+    }
+    $hash = $data['id'];
+    // make sure it's not already in mempool
+    $res = $db->single("SELECT COUNT(1) FROM mempool WHERE id=:id", [":id" => $hash]);
+    if ($res != 0) {
+        api_err("The transaction is already in mempool");
+    }
+    // make sure the peer is not flooding us with transactions
+    $res = $db->single("SELECT COUNT(1) FROM mempool WHERE src=:src", [":src" => $data['src']]);
+    if ($res > 25) {
+        api_err("Too many transactions from this address in mempool. Please rebroadcast later.");
+    }
+    $res = $db->single("SELECT COUNT(1) FROM mempool WHERE peer=:peer", [":peer" => $ip]);
+    if ($res > $_config['peer_max_mempool']) {
+        api_error("Too many transactions broadcasted from this peer");
+    }
+
+
+    // make sure the transaction is not already on the blockchain
+    $res = $db->single("SELECT COUNT(1) FROM transactions WHERE id=:id", [":id" => $hash]);
+    if ($res != 0) {
+        api_err("The transaction is already in a block");
+    }
+    $acc = new Account();
+    $src = $acc->get_address($data['public_key']);
+    // make sure the sender has enough balance
+    $balance = $db->single("SELECT balance FROM accounts WHERE id=:id", [":id" => $src]);
+    if ($balance < $val + $fee) {
+        api_err("Not enough funds");
+    }
+
+    // make sure the sender has enough pending balance
+    $memspent = $db->single("SELECT SUM(val+fee) FROM mempool WHERE src=:src", [":src" => $src]);
+    if ($balance - $memspent < $val + $fee) {
+        api_err("Not enough funds (mempool)");
+    }
+
+    // add to mempool
+    $trx->add_mempool($data, $ip);
+
+    // rebroadcast the transaction to some peers unless the transaction is smaller than the average size of transactions in mempool - protect against garbage data flooding
+    $res = $db->row("SELECT COUNT(1) as c, sum(val) as v FROM  mempool ", [":src" => $data['src']]);
+    if ($res['c'] < $_config['max_mempool_rebroadcast'] && $res['v'] / $res['c'] < $data['val']) {
+        $data['id']=escapeshellarg(san($data['id']));
+        system("php propagate.php transaction '$data[id]'  > /dev/null 2>&1  &");
+    }
+    api_echo("transaction-ok");
+} elseif ($q == "submitBlock") {
+    // receive a  new block from a peer
+
+    // if sanity sync, refuse all
+    if ($_config['sanity_sync'] == 1) {
+        _log('['.$ip."] Block rejected due to sanity sync");
+        api_err("sanity-sync");
+    }
+    $data['id'] = san($data['id']);
+    $current = $block->current();
+    // block already in the blockchain
+    if ($current['id'] == $data['id']) {
+        api_echo("block-ok");
+    }
+    if ($data['date'] > time() + 30) {
+        api_err("block in the future");
+    }
+
+    if ($current['height'] == $data['height'] && $current['id'] != $data['id']) {
+        // different forks, same height
+        $accept_new = false;
+
+            // convert the first 12 characters from hex to decimal and the block with the largest number wins
+            $no1 = hexdec(substr(coin2hex($current['id']), 0, 12));
+            $no2 = hexdec(substr(coin2hex($data['id']), 0, 12));
+            if (gmp_cmp($no1, $no2) == 1) {
+                $accept_new = true;
+            }
+        
+        if ($accept_new) {
+            // if the new block is accepted, run a microsanity to sync it
+            _log('['.$ip."] Starting microsanity - $data[height]");
+            $ip=escapeshellarg($ip);
+            system("php sanity.php microsanity '$ip'  > /dev/null 2>&1  &");
+            api_echo("microsanity");
+        } else {
+            _log('['.$ip."] suggesting reverse-microsanity - $data[height]");
+            api_echo("reverse-microsanity"); // if it's not, suggest to the peer to get the block from us
+        }
+    }
+    // if it's not the next block
+    if ($current['height'] != $data['height'] - 1) {
+        // if the height of the block submitted is lower than our current height, send them our current block
+        if ($data['height'] < $current['height']) {
+            $pr = $db->row("SELECT * FROM peers WHERE ip=:ip", [":ip" => $ip]);
+            if (!$pr) {
+                api_err("block-too-old");
+            }
+            $peer_host = escapeshellcmd(base58_encode($pr['hostname']));
+            $pr['ip'] = escapeshellcmd(san_ip($pr['ip']));
+            system("php propagate.php block current '$peer_host' '$pr[ip]'   > /dev/null 2>&1  &");
+            _log('['.$ip."] block too old, sending our current block - $data[height]");
+
+            api_err("block-too-old");
+        }
+        // if the block difference is bigger than 150, nothing should be done. They should sync via sanity
+        if ($data['height'] - $current['height'] > 150) {
+            _log('['.$ip."] block-out-of-sync - $data[height]");
+            api_err("block-out-of-sync");
+        }
+        // request them to send us a microsync with the latest blocks
+        _log('['.$ip."] requesting microsync - $current[height] - $data[height]");
+        api_echo(["request" => "microsync", "height" => $current['height'], "block" => $current['id']]);
+    }
+    // check block data
+    if (!$block->check($data)) {
+        _log('['.$ip."] invalid block - $data[height]");
+        api_err("invalid-block");
+    }
+    $b = $data;
+    // add the block to the blockchain
+    $res = $block->add(
+        $b['height'],
+        $b['public_key'],
+        $b['nonce'],
+        $b['data'],
+        $b['date'],
+        $b['signature'],
+        $b['difficulty'],
+        $b['reward_signature'],
+        $b['argon']
+    );
+
+    if (!$res) {
+        _log('['.$ip."] invalid block data - $data[height]");
+        api_err("invalid-block-data");
+    }
+
+    _log('['.$ip."] block ok, repropagating - $data[height]");
+
+    // send it to all our peers
+    $data['id']=escapeshellcmd(san($data['id']));
+    system("php propagate.php block '$data[id]' all all linear > /dev/null 2>&1  &");
+    api_echo("block-ok");
+} // return the current block, used in syncing
+elseif ($q == "currentBlock") {
+    $current = $block->current();
+    api_echo($current);
+} // return a specific block, used in syncing
+elseif ($q == "getBlock") {
+    $height = intval($data['height']);
+    $export = $block->export("", $height);
+    if (!$export) {
+        api_err("invalid-block");
+    }
+    api_echo($export);
+} elseif ($q == "getBlocks") {
+// returns X block starting at height,  used in syncing
+
+    $height = intval($data['height']);
+
+    $r = $db->run(
+        "SELECT id,height FROM blocks WHERE height>=:height ORDER by height ASC LIMIT 100",
+        [":height" => $height]
+    );
+    foreach ($r as $x) {
+        $blocks[$x['height']] = $block->export($x['id']);
+    }
+    api_echo($blocks);
+} // returns a full list of unblacklisted peers in a random order
+elseif ($q == "getPeers") {
+    $peers = $db->run("SELECT ip,hostname FROM peers WHERE blacklisted<UNIX_TIMESTAMP() ORDER by RAND()");
+    api_echo($peers);
+} else {
+    api_err("Invalid request");
+}

propagate.php

@@ -1,7 +1,7 @@
 <?php
-/* 
+/*
 The MIT License (MIT)
-Copyright (c) 2018 AroDev 
+Copyright (c) 2018 AroDev
 
 www.arionum.com
 
@@ -24,117 +24,161 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 OR OTHER DEALINGS IN THE SOFTWARE.
 */
 set_time_limit(360);
-require_once("include/init.inc.php");
-$block= new Block();
+require_once __DIR__.'/include/init.inc.php';
+$block = new Block();
 
-$type=san($argv[1]);
-$id=san($argv[2]);
-$debug=false;
-$linear=false;
+$type = san($argv[1]);
+$id = san($argv[2]);
+$debug = false;
+$linear = false;
 // if debug mode, all data is printed to console, no background processes
-if(trim($argv[5])=='debug') $debug=true;
-if(trim($argv[5])=='linear') $linear=true;
-$peer=san(trim($argv[3]));
+if (trim($argv[5]) == 'debug') {
+    $debug = true;
+}
+if (trim($argv[5]) == 'linear') {
+    $linear = true;
+}
+$peer = san(trim($argv[3]));
 
 
 // broadcasting a block to all peers
-if((empty($peer)||$peer=='all')&&$type=="block"){
-	$whr="";
-	if($id=="current") {
-		$current=$block->current();
-		$id=$current['id'];
-	}
-	$data=$block->export($id);
-	$id=san($id);
-	if($data===false||empty($data)) die("Could not export block");  
-	$data=json_encode($data);
-	// cache it to reduce the load
-	$res=file_put_contents("tmp/$id",$data);
-	if($res===false) die("Could not write the cache file");
-	// broadcasting to all peers
-	$ewhr="";
-	// boradcasting to only certain peers
-	if($linear==true) $ewhr=" ORDER by RAND() LIMIT 5";
-	$r=$db->run("SELECT * FROM peers WHERE blacklisted < UNIX_TIMESTAMP() AND reserve=0 $ewhr");
-	foreach($r as $x) {
-		// encode the hostname in base58 and sanitize the IP to avoid any second order shell injections
-		$host=base58_encode($x['hostname']);
-		$ip=filter_var($x['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
-		// fork a new process to send the blocks async
-		if($debug) system("php propagate.php '$type' '$id' '$host' '$ip' debug");
-		elseif($linear)  system("php propagate.php '$type' '$id' '$host' '$ip' linear");
-		else system("php propagate.php '$type' '$id' '$host' 'ip'  > /dev/null 2>&1  &");
-	}
-	exit;
+if ((empty($peer) || $peer == 'all') && $type == "block") {
+    $whr = "";
+    if ($id == "current") {
+        $current = $block->current();
+        $id = $current['id'];
+    }
+    $data = $block->export($id);
+    $id = san($id);
+    if ($data === false || empty($data)) {
+        die("Could not export block");
+    }
+    $data = json_encode($data);
+    // cache it to reduce the load
+    $res = file_put_contents("tmp/$id", $data);
+    if ($res === false) {
+        die("Could not write the cache file");
+    }
+    // broadcasting to all peers
+    $ewhr = "";
+    // boradcasting to only certain peers
+    if ($linear == true) {
+        $ewhr = " ORDER by RAND() LIMIT 5";
+    }
+    $r = $db->run("SELECT * FROM peers WHERE blacklisted < UNIX_TIMESTAMP() AND reserve=0 $ewhr");
+    foreach ($r as $x) {
+        if($x['hostname']==$_config['hostname']) continue;
+        // encode the hostname in base58 and sanitize the IP to avoid any second order shell injections
+        $host = escapeshellcmd(base58_encode($x['hostname']));
+        $ip = escapeshellcmd(filter_var($x['ip'], FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE));
+        // fork a new process to send the blocks async
+        $type=escapeshellcmd(san($type));
+        $id=escapeshellcmd(san($id));
+       
+
+        if ($debug) {
+            system("php propagate.php '$type' '$id' '$host' '$ip' debug");
+        } elseif ($linear) {
+            system("php propagate.php '$type' '$id' '$host' '$ip' linear");
+        } else {
+            system("php propagate.php '$type' '$id' '$host' 'ip'  > /dev/null 2>&1  &");
+        }
+    }
+    exit;
 }
 
 
-
-// broadcast a block to a single peer (usually a forked process from above) 
-if($type=="block"){
-	// current block or read cache
-	if($id=="current"){
-		$current=$block->current();
-		$data=$block->export($current['id']);
-		if(!$data)  { echo "Invalid Block data"; exit; }
-	} else {
-		$data=file_get_contents("tmp/$id");
-		if(empty($data)) { echo "Invalid Block data"; exit; }
-		$data=json_decode($data,true);
-	}
-	$hostname=base58_decode($peer);
-	// send the block as POST to the peer
-	echo "Block sent to $hostname:\n";
-	$response= peer_post($hostname."/peer.php?q=submitBlock",$data,60, $debug);
-	if($response=="block-ok") { echo "Block $i accepted. Exiting.\n"; exit;}
-	elseif($response['request']=="microsync"){
-		// the peer requested us to send more blocks, as it's behind
-		echo "Microsync request\n";
-		$height=intval($response['height']);
-		$bl=san($response['block']);
-		$current=$block->current();
-		// maximum microsync is 10 blocks, for more, the peer should sync by sanity
-		if($current['height']-$height>10) { echo "Height Differece too high\n"; exit; }
-		$last_block=$block->get($height);
-		// if their last block does not match our blockchain/fork, ignore the request
-		if ($last_block['id'] != $bl ) { echo "Last block does not match\n"; exit; }
-		echo "Sending the requested blocks\n";
-		//start sending the requested block
-		for($i=$height+1;$i<=$current['height'];$i++){
-			$data=$block->export("",$i);
-			$response = peer_post($hostname."/peer.php?q=submitBlock",$data,60,$debug);
-			if($response!="block-ok") { echo "Block $i not accepted. Exiting.\n"; exit;}
-			echo "Block\t$i\t accepted\n";
-		}
-
-	} elseif($response=="reverse-microsanity"){
-		// the peer informe us that we should run a microsanity
-		echo "Running microsanity\n";
-		$ip=trim($argv[4]);
-		$ip=filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
-		if(empty($ip)) die("Invalid IP");
-		// fork a microsanity in a new process
-		system("php sanity.php microsanity '$ip'  > /dev/null 2>&1  &");
-	}
-	else echo "Block not accepted!\n";
-
+// broadcast a block to a single peer (usually a forked process from above)
+if ($type == "block") {
+    // current block or read cache
+    if ($id == "current") {
+        $current = $block->current();
+        $data = $block->export($current['id']);
+        if (!$data) {
+            echo "Invalid Block data";
+            exit;
+        }
+    } else {
+        $data = file_get_contents("tmp/$id");
+        if (empty($data)) {
+            echo "Invalid Block data";
+            exit;
+        }
+        $data = json_decode($data, true);
+    }
+    $hostname = base58_decode($peer);
+    // send the block as POST to the peer
+    echo "Block sent to $hostname:\n";
+    $response = peer_post($hostname."/peer.php?q=submitBlock", $data, 60, $debug);
+    _log("Propagating block to $hostname - [result: $response] $data[height] - $data[id]",2);
+    if ($response == "block-ok") {
+        echo "Block $i accepted. Exiting.\n";
+        exit;
+    } elseif ($response['request'] == "microsync") {
+        // the peer requested us to send more blocks, as it's behind
+        echo "Microsync request\n";
+        $height = intval($response['height']);
+        $bl = san($response['block']);
+        $current = $block->current();
+        // maximum microsync is 10 blocks, for more, the peer should sync by sanity
+        if ($current['height'] - $height > 10) {
+            echo "Height Differece too high\n";
+            exit;
+        }
+        $last_block = $block->get($height);
+        // if their last block does not match our blockchain/fork, ignore the request
+        if ($last_block['id'] != $bl) {
+            echo "Last block does not match\n";
+            exit;
+        }
+        echo "Sending the requested blocks\n";
+        //start sending the requested block
+        for ($i = $height + 1; $i <= $current['height']; $i++) {
+            $data = $block->export("", $i);
+            $response = peer_post($hostname."/peer.php?q=submitBlock", $data, 60, $debug);
+            if ($response != "block-ok") {
+                echo "Block $i not accepted. Exiting.\n";
+                exit;
+            }
+            echo "Block\t$i\t accepted\n";
+        }
+    } elseif ($response == "reverse-microsanity") {
+        // the peer informe us that we should run a microsanity
+        echo "Running microsanity\n";
+        $ip = trim($argv[4]);
+        $ip = filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE);
+        if (empty($ip)) {
+            die("Invalid IP");
+        }
+        // fork a microsanity in a new process
+        system("php sanity.php microsanity '$ip'  > /dev/null 2>&1  &");
+    } else {
+        echo "Block not accepted!\n";
+    }
 }
 // broadcast a transaction to some peers
-if($type=="transaction"){
+if ($type == "transaction") {
+    $trx = new Transaction();
+    // get the transaction data
+    $data = $trx->export($id);
 
-	$trx=new Transaction;
-	// get the transaction data
-	$data=$trx->export($id);
+    if (!$data) {
+        echo "Invalid transaction id\n";
+        exit;
+    }
+    // if the transaction was first sent locally, we will send it to all our peers, otherwise to just a few
+    if ($data['peer'] == "local") {
+        $r = $db->run("SELECT hostname FROM peers WHERE blacklisted < UNIX_TIMESTAMP()");
+    } else {
 
-	if(!$data){ echo "Invalid transaction id\n"; exit; }
-	// if the transaction was first sent locally, we will send it to all our peers, otherwise to just a few
-	if($data['peer']=="local") $r=$db->run("SELECT hostname FROM peers WHERE blacklisted < UNIX_TIMESTAMP()");
-	else $r=$db->run("SELECT hostname FROM peers WHERE blacklisted < UNIX_TIMESTAMP() AND reserve=0  ORDER by RAND() LIMIT ".intval($_config['transaction_propagation_peers']));
-	foreach($r as $x){
-		$res= peer_post($x['hostname']."/peer.php?q=submitTransaction",$data);
-		if(!$res) echo "Transaction not accepted\n";
-		else echo "Transaction accepted\n";
-	}
+        $r = $db->run("SELECT hostname FROM peers WHERE blacklisted < UNIX_TIMESTAMP() AND reserve=0  ORDER by RAND() LIMIT :limit",["limit"=>intval($_config['transaction_propagation_peers'])]);
+    }
+    foreach ($r as $x) {
+        $res = peer_post($x['hostname']."/peer.php?q=submitTransaction", $data);
+        if (!$res) {
+            echo "Transaction not accepted\n";
+        } else {
+            echo "Transaction accepted\n";
+        }
+    }
 }
-
-?>

tmp/db-update

@@ -0,0 +1 @@
+4.0.2

util.php

@@ -1,7 +1,7 @@
 <?php
-/* 
+/*
 The MIT License (MIT)
-Copyright (c) 2018 AroDev 
+Copyright (c) 2018 AroDev
 
 www.arionum.com
 
@@ -24,17 +24,16 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
 OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-
 // make sure it's not accessible in the browser
-if(php_sapi_name() !== 'cli') die("This should only be run as cli");
-
-
-require_once("include/init.inc.php");
-$cmd=trim($argv[1]);
+if (php_sapi_name() !== 'cli') {
+    die("This should only be run as cli");
+}
 
+require_once __DIR__.'/include/init.inc.php';
+$cmd = trim($argv[1]);
 
 /**
- * @api {php util.php} clean Clean 
+ * @api {php util.php} clean Clean
  * @apiName clean
  * @apiGroup UTIL
  * @apiDescription Cleans the entire database
@@ -43,16 +42,21 @@ $cmd=trim($argv[1]);
  * php util.php clean
  */
 
-if($cmd=='clean'){
-$tables=array("blocks","accounts","transactions","mempool");
-foreach($tables as $table) $db->run("DELETE FROM {$table}");
+if ($cmd == 'clean') {
+    if (file_exists("tmp/sanity-lock")) {
+        die("Sanity running. Wait for it to finish");
+    }
+    touch("tmp/sanity-lock");
+    $db->run("SET foreign_key_checks=0;");
+    $tables = ["accounts", "transactions", "mempool", "masternode","blocks"];
+    foreach ($tables as $table) {
+        $db->run("TRUNCATE TABLE {$table}");
+    }
+    $db->run("SET foreign_key_checks=1;");
 
-echo "\n The database has been cleared\n";
-
-}
-
-
-/**
+    echo "\n The database has been cleared\n";
+    unlink("tmp/sanity-lock");
+} /**
  * @api {php util.php} pop Pop
  * @apiName pop
  * @apiGroup UTIL
@@ -64,13 +68,16 @@ echo "\n The database has been cleared\n";
  * php util.php pop 1
  */
 
-elseif($cmd=='pop'){
-	$no=intval($argv[2]);
-	$block=new Block;
-	$block->pop($no);
-}
-
-/**
+elseif ($cmd == 'pop') {
+    if (file_exists("tmp/sanity-lock")) {
+        die("Sanity running. Wait for it to finish");
+    }
+    touch("tmp/sanity-lock");
+    $no = intval($argv[2]);
+    $block = new Block();
+    $block->pop($no);
+    unlink("tmp/sanity-lock");
+} /**
  * @api {php util.php} block-time Block-time
  * @apiName block-time
  * @apiGroup UTIL
@@ -86,29 +93,28 @@ elseif($cmd=='pop'){
  * Average block time: 217 seconds
  */
 
-elseif($cmd=='block-time'){
-	$t=time();
-	$r=$db->run("SELECT * FROM blocks ORDER by height DESC LIMIT 100");
-	$start=0;
-	foreach($r as $x){
-		if($start==0) $start=$x['date'];
-		$time=$t-$x['date'];
-		$t=$x['date'];
-		echo "$x[height] -> $time\n";
-		$end=$x['date'];
-	}
-echo "Average block time: ".ceil(($start-$end)/100)." seconds\n";
-
-
-}
-/**
+elseif ($cmd == 'block-time') {
+    $t = time();
+    $r = $db->run("SELECT * FROM blocks ORDER by height DESC LIMIT 100");
+    $start = 0;
+    foreach ($r as $x) {
+        if ($start == 0) {
+            $start = $x['date'];
+        }
+        $time = $t - $x['date'];
+        $t = $x['date'];
+        echo "$x[height]\t\t$time\t\t$x[difficulty]\n";
+        $end = $x['date'];
+    }
+    echo "Average block time: ".ceil(($start - $end) / 100)." seconds\n";
+} /**
  * @api {php util.php} peer Peer
  * @apiName peer
  * @apiGroup UTIL
  * @apiDescription Creates a peering session with another node
  *
  * @apiParam {text} arg2 The Hostname of the other node
- * 
+ *
  * @apiExample {cli} Example usage:
  * php util.php peer http://peer1.arionum.com
  *
@@ -117,12 +123,14 @@ echo "Average block time: ".ceil(($start-$end)/100)." seconds\n";
  */
 
 
-elseif($cmd=="peer"){
-	$res=peer_post($argv[2]."/peer.php?q=peer",array("hostname"=>$_config['hostname']));
-	if($res!==false) echo "Peering OK\n";
-	else echo "Peering FAIL\n";
-} 
-/**
+elseif ($cmd == "peer") {
+    $res = peer_post($argv[2]."/peer.php?q=peer", ["hostname" => $_config['hostname']]);
+    if ($res !== false) {
+        echo "Peering OK\n";
+    } else {
+        echo "Peering FAIL\n";
+    }
+} /**
  * @api {php util.php} current Current
  * @apiName current
  * @apiGroup UTIL
@@ -155,15 +163,14 @@ elseif($cmd=="peer"){
  *
  */
 
-elseif ($cmd=="current") {
-	$block=new Block;
-	var_dump($block->current());
-}
-/**
+elseif ($cmd == "current") {
+    $block = new Block();
+    var_dump($block->current());
+} /**
  * @api {php util.php} blocks Blocks
  * @apiName blocks
  * @apiGroup UTIL
- * @apiDescription Prints the id and the height of the blocks >=arg2, max 100 or arg3 
+ * @apiDescription Prints the id and the height of the blocks >=arg2, max 100 or arg3
  *
  * @apiParam {number} arg2 Starting height
  *
@@ -180,16 +187,17 @@ elseif ($cmd=="current") {
  * 10805   5RBeWXo2c9NZ7UF2ubztk53PZpiA4tsk3bhXNXbcBk89cNqorNj771Qu4kthQN5hXLtu1hzUnv7nkH33hDxBM34m
  *
  */
- elseif($cmd=="blocks"){
-	$height=intval($argv[2]);
-	$limit=intval($argv[3]);
-	if($limit<1) $limit=100;
-	$r=$db->run("SELECT * FROM blocks WHERE height>:height ORDER by height ASC LIMIT $limit",array(":height"=>$height));
-	foreach($r as $x){
-		echo "$x[height]\t$x[id]\n";
-	}
-}
-/**
+elseif ($cmd == "blocks") {
+    $height = intval($argv[2]);
+    $limit = intval($argv[3]);
+    if ($limit < 1) {
+        $limit = 100;
+    }
+    $r = $db->run("SELECT * FROM blocks WHERE height>:height ORDER by height ASC LIMIT :limit", [":height" => $height, ":limit"=>$limit]);
+    foreach ($r as $x) {
+        echo "$x[height]\t$x[id]\n";
+    }
+} /**
  * @api {php util.php} recheck-blocks Recheck-Blocks
  * @apiName recheck-blocks
  * @apiGroup UTIL
@@ -199,26 +207,33 @@ elseif ($cmd=="current") {
  * php util.php recheck-blocks
  *
  */
-elseif($cmd=="recheck-blocks"){
-	$blocks=array();
-	$block=new Block();
-	$r=$db->run("SELECT * FROM blocks ORDER by height ASC");
-	foreach($r as $x){
-		$blocks[$x['height']]=$x;
-		$max_height=$x['height'];
-	}
-	for($i=2;$i<=$max_height;$i++){
-		$data=$blocks[$i];
-		
-		$key=$db->single("SELECT public_key FROM accounts WHERE id=:id",array(":id"=>$data['generator']));
+elseif ($cmd == "recheck-blocks") {
+    $blocks = [];
+    $block = new Block();
+    $r = $db->run("SELECT * FROM blocks ORDER by height ASC");
+    foreach ($r as $x) {
+        $blocks[$x['height']] = $x;
+        $max_height = $x['height'];
+    }
+    for ($i = 2; $i <= $max_height; $i++) {
+        $data = $blocks[$i];
 
-		if(!$block->mine($key,$data['nonce'], $data['argon'], $data['difficulty'], $blocks[$i-1]['id'],$blocks[$i-1]['height'])) {
-			_log("Invalid block detected. We should delete everything after $data[height] - $data[id]");
-			break;
-		}
-	}
-}
-/**
+        $key = $db->single("SELECT public_key FROM accounts WHERE id=:id", [":id" => $data['generator']]);
+
+        if (!$block->mine(
+            $key,
+            $data['nonce'],
+            $data['argon'],
+            $data['difficulty'],
+            $blocks[$i - 1]['id'],
+            $blocks[$i - 1]['height'],
+            $data['date']
+        )) {
+            _log("Invalid block detected. We should delete everything after $data[height] - $data[id]");
+            break;
+        }
+    }
+} /**
  * @api {php util.php} peers Peers
  * @apiName peers
  * @apiGroup UTIL
@@ -232,15 +247,16 @@ elseif($cmd=="recheck-blocks"){
  * ...
  * http://aro.master.hashpi.com    active
  */
- elseif($cmd=="peers"){
-	$r=$db->run("SELECT * FROM peers ORDER by reserve ASC");
-	$status="active";
-	if($x['reserve']==1) $status="reserve";
-	foreach($r as $x){
-		echo "$x[hostname]\t$status\n";
-	}
-}
-/**
+elseif ($cmd == "peers") {
+    $r = $db->run("SELECT * FROM peers ORDER by reserve ASC");
+    $status = "active";
+    if ($x['reserve'] == 1) {
+        $status = "reserve";
+    }
+    foreach ($r as $x) {
+        echo "$x[hostname]\t$status\n";
+    }
+} /**
  * @api {php util.php} mempool Mempool
  * @apiName mempool
  * @apiGroup UTIL
@@ -252,12 +268,10 @@ elseif($cmd=="recheck-blocks"){
  * @apiSuccessExample {text} Success-Response:
  * Mempool size: 12
  */
- elseif($cmd=="mempool"){
-$res=$db->single("SELECT COUNT(1) from mempool");
-echo "Mempool size: $res\n";
-
-} 
-/**
+elseif ($cmd == "mempool") {
+    $res = $db->single("SELECT COUNT(1) from mempool");
+    echo "Mempool size: $res\n";
+} /**
  * @api {php util.php} delete-peer Delete-peer
  * @apiName delete-peer
  * @apiGroup UTIL
@@ -271,24 +285,25 @@ echo "Mempool size: $res\n";
  * @apiSuccessExample {text} Success-Response:
  * Peer removed
  */
-elseif($cmd=="delete-peer"){
-        $peer=trim($argv[2]);
-        if(empty($peer)) die("Invalid peer");
-        $db->run("DELETE FROM peers WHERE ip=:ip",array(":ip"=>$peer));
-        echo "Peer removed\n";
-}elseif($cmd=="recheck-peers"){
-	$r=$db->run("SELECT * FROM peers");
-	foreach($r as $x){
-		$a=peer_post($x['hostname']."/peer.php?q=ping");
-		if($a!="pong"){
-			echo "$x[hostname] -> failed\n";
-			$db->run("DELETE FROM peers WHERE id=:id",array(":id"=>$x['id']));
-		} else echo "$x[hostname] ->ok \n";
-	}
-
-}
-
-/**
+elseif ($cmd == "delete-peer") {
+    $peer = trim($argv[2]);
+    if (empty($peer)) {
+        die("Invalid peer");
+    }
+    $db->run("DELETE FROM peers WHERE ip=:ip", [":ip" => $peer]);
+    echo "Peer removed\n";
+} elseif ($cmd == "recheck-peers") {
+    $r = $db->run("SELECT * FROM peers");
+    foreach ($r as $x) {
+        $a = peer_post($x['hostname']."/peer.php?q=ping");
+        if ($a != "pong") {
+            echo "$x[hostname] -> failed\n";
+            $db->run("DELETE FROM peers WHERE id=:id", [":id" => $x['id']]);
+        } else {
+            echo "$x[hostname] ->ok \n";
+        }
+    }
+} /**
  * @api {php util.php} peers-block Peers-Block
  * @apiName peers-block
  * @apiGroup UTIL
@@ -302,23 +317,24 @@ elseif($cmd=="delete-peer"){
  * ...
  * http://peer10.arionum.com        16849
  */
-elseif($cmd=="peers-block"){
-	$only_diff=false;
-	if($argv[2]=="diff"){
-		$current=$db->single("SELECT height FROM blocks ORDER by height DESC LIMIT 1");
-		$only_diff=true;
-	}
-	$r=$db->run("SELECT * FROM peers WHERE blacklisted<UNIX_TIMESTAMP()");
-        foreach($r as $x){
-                $a=peer_post($x['hostname']."/peer.php?q=currentBlock",array(),5);
-		$enc=base58_encode($x['hostname']);
-		if($argv[2]=="debug") echo "$enc\t";
-		if($only_diff==false||$current!=$a['height']) echo "$x[hostname]\t$a[height]\n";
-
+elseif ($cmd == "peers-block") {
+    $only_diff = false;
+    if ($argv[2] == "diff") {
+        $current = $db->single("SELECT height FROM blocks ORDER by height DESC LIMIT 1");
+        $only_diff = true;
+    }
+    $r = $db->run("SELECT * FROM peers WHERE blacklisted<UNIX_TIMESTAMP()");
+    foreach ($r as $x) {
+        $a = peer_post($x['hostname']."/peer.php?q=currentBlock", [], 5);
+        $enc = base58_encode($x['hostname']);
+        if ($argv[2] == "debug") {
+            echo "$enc\t";
         }
-}
-
-/**
+        if ($only_diff == false || $current != $a['height']) {
+            echo "$x[hostname]\t$a[height]\n";
+        }
+    }
+} /**
  * @api {php util.php} balance Balance
  * @apiName balance
  * @apiGroup UTIL
@@ -333,14 +349,15 @@ elseif($cmd=="peers-block"){
  * Balance: 2,487
  */
 
-elseif($cmd=="balance"){
+elseif ($cmd == "balance") {
+    $id = san($argv[2]);
+    $res = $db->single(
+        "SELECT balance FROM accounts WHERE id=:id OR public_key=:id2 LIMIT 1",
+        [":id" => $id, ":id2" => $id]
+    );
 
-	$id=san($argv[2]);
-	$res=$db->single("SELECT balance FROM accounts WHERE id=:id OR public_key=:id2 LIMIT 1",array(":id"=>$id, ":id2"=>$id));
-
-	echo "Balance: ".number_format($res)."\n";
-}
-/**
+    echo "Balance: ".number_format($res)."\n";
+} /**
  * @api {php util.php} block Block
  * @apiName block
  * @apiGroup UTIL
@@ -373,14 +390,12 @@ elseif($cmd=="balance"){
  *  int(0)
  * }
  */
-elseif($cmd=="block"){
-        $id=san($argv[2]);
-        $res=$db->row("SELECT * FROM blocks WHERE id=:id OR height=:id2 LIMIT 1",array(":id"=>$id, ":id2"=>$id));
-	
-	var_dump($res);
+elseif ($cmd == "block") {
+    $id = san($argv[2]);
+    $res = $db->row("SELECT * FROM blocks WHERE id=:id OR height=:id2 LIMIT 1", [":id" => $id, ":id2" => $id]);
 
-}
-/**
+    var_dump($res);
+} /**
  * @api {php util.php} check-address Check-Address
  * @apiName check-address
  * @apiGroup UTIL
@@ -394,14 +409,18 @@ elseif($cmd=="block"){
  * @apiSuccessExample {text} Success-Response:
  * The address is valid
  */
-elseif($cmd=="check-address"){
-	$dst=trim($argv[2]);
-	$acc=new Account;
-	if(!$acc->valid($dst)) die("Invalid address");
-	$dst_b=base58_decode($dst);
-	if(strlen($dst_b)!=64)  die("Invalid address - ".strlen($dst_b)." bytes");
-	
-	echo "The address is valid\n";
+elseif ($cmd == "check-address") {
+    $dst = trim($argv[2]);
+    $acc = new Account();
+    if (!$acc->valid($dst)) {
+        die("Invalid address");
+    }
+    $dst_b = base58_decode($dst);
+    if (strlen($dst_b) != 64) {
+        die("Invalid address - ".strlen($dst_b)." bytes");
+    }
+
+    echo "The address is valid\n";
 }
 /**
  * @api {php util.php} get-address Get-Address
@@ -418,15 +437,160 @@ elseif($cmd=="check-address"){
  * 5WuRMXGM7Pf8NqEArVz1NxgSBptkimSpvuSaYC79g1yo3RDQc8TjVtGH5chQWQV7CHbJEuq9DmW5fbmCEW4AghQr
  */
 
-elseif($cmd=='get-address'){
-
-   $public_key=trim($argv2);
-    if(strlen($public_key)<32) die("Invalid public key");
+elseif ($cmd == 'get-address') {
+    $public_key = trim($argv2);
+    if (strlen($public_key) < 32) {
+        die("Invalid public key");
+    }
     print($acc->get_address($public_key));
+/**
+ * @api {php util.php} clean-blacklist Clean-Blacklist
+ * @apiName clean-blacklist
+ * @apiGroup UTIL
+ * @apiDescription Removes all the peers from blacklist
+ *
+ * @apiExample {cli} Example usage:
+ * php util.php clean-blacklist
+ *
+ */
+} elseif ($cmd == 'clean-blacklist') {
+    $db->run("UPDATE peers SET blacklisted=0, fails=0, stuckfail=0");
+    echo "All the peers have been removed from the blacklist\n";
+} elseif ($cmd == 'resync-accounts') {
+    // resyncs the balance on all accounts
+    if (file_exists("tmp/sanity-lock")) {
+        die("Sanity running. Wait for it to finish");
+    }
+    touch("tmp/sanity-lock");
+    // lock table to avoid race conditions on blocks
+    $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE");
+
+    $r=$db->run("SELECT * FROM accounts");
+    foreach ($r as $x) {
+        $alias=$x['alias'];
+        if (empty($alias)) {
+            $alias="A";
+        }
+        $rec=$db->single("SELECT SUM(val) FROM transactions WHERE (dst=:id or dst=:alias) AND (height<80000 OR (version!=100 AND version!=103)) and version<111", [":id"=>$x['id'], ":alias"=>$alias]);
+        $spent=$db->single("SELECT SUM(val+fee) FROM transactions WHERE public_key=:pub AND version>0", [":pub"=>$x['public_key']]);
+        if ($spent==false) {
+            $spent=0;
+        }
+        $balance=round(($rec-$spent), 8);
+        if ($x['balance']!=$balance) {
+            echo "rec: $rec, spent: $spent, bal: $x[balance], should be: $balance - $x[id] $x[public_key]\n";
+            if (trim($argv[2])!="check") {
+                $db->run("UPDATE accounts SET balance=:bal WHERE id=:id", [":id"=>$x['id'], ":bal"=>$balance]);
+            }
+        }
+    }
+    $db->exec("UNLOCK TABLES");
+    echo "All done";
+    unlink("tmp/sanity-lock");
+} elseif ($cmd=="compare-blocks") {
+    $block=new Block();
+
+    $current=$block->current();
+    $peer=trim($argv[2]);
+    $limit=intval($argv[3]);
+    if ($limit==0) {
+        $limit=5000;
+    }
+    for ($i=$current['height']-$limit;$i<=$current['height'];$i++) {
+        $data=peer_post($peer."/peer.php?q=getBlock", ["height" => $i]);
+        if ($data==false) {
+            continue;
+        }
+        $our=$block->export(false, $i);
+        if ($data!=$our) {
+            echo "Failed block -> $i\n";
+            if ($argv[4]=="dump") {
+                echo "\n\n  ---- Internal ----\n\n";
+                var_dump($our);
+                echo "\n\n  ---- External ----\n\n";
+                var_dump($data);
+            }
+        }
+    }
+} elseif ($cmd=='compare-accounts') {
+    $peer=trim($argv[2]);
+    $r=$db->run("SELECT id,balance FROM accounts");
+    foreach ($r as $x) {
+        $data=peer_post($peer."/api.php?q=getBalance", ["account" => $x['id']]);
+        if ($data==false) {
+            continue;
+        }
+        if ($data!=$x['balance']) {
+            echo "$x[id]\t\t$x[balance]\t$data\n";
+        }
+    }
+} elseif ($cmd=='masternode-hash') {
+    $res=$db->run("SELECT * FROM masternode ORDER by public_key ASC");
+    $block=new Block();
+    $current=$block->current();
+    echo "Height:\t\t$current[height]\n";
+    echo "Hash:\t\t".md5(json_encode($res))."\n\n";
+} elseif ($cmd=='accounts-hash') {
+    $res=$db->run("SELECT * FROM accounts ORDER by id ASC");
+    $block=new Block();
+    $current=$block->current();
+    echo "Height:\t\t$current[height]\n";
+    echo "Hash:\t\t".md5(json_encode($res))."\n\n";
+} elseif ($cmd == "version") {
+    echo "\n\n".VERSION."\n\n";
+} elseif ($cmd == "sendblock"){
+    $peer=trim($argv[3]);
+    if (!filter_var($peer, FILTER_VALIDATE_URL)) {
+        die("Invalid peer hostname");
+    }
+    $peer = filter_var($peer, FILTER_SANITIZE_URL);
+    $height=intval($argv[2]);
+    $block=new Block();
+    $data = $block->export("", $height);
+
+    
+    if($data===false){
+        die("Could not find this block");
+    }
+    $response = peer_post($peer."/peer.php?q=submitBlock", $data, 60, true);
+    var_dump($response);
+
+}elseif ($cmd == "recheck-external-blocks") {
+    $peer=trim($argv[2]);
+    if (!filter_var($peer, FILTER_VALIDATE_URL)) {
+        die("Invalid peer hostname");
+    }
+    $peer = filter_var($peer, FILTER_SANITIZE_URL);
+
+
+    $blocks = [];
+    $block = new Block();
+    $height=intval($argv[3]);
+
+    $last=peer_post($peer."/peer.php?q=currentBlock");
+
+    $b=peer_post($peer."/peer.php?q=getBlock",["height"=>$height]);
+
+    for ($i = $height+1; $i <= $last['height']; $i++) {
+        $c=peer_post($peer."/peer.php?q=getBlock",["height"=>$i]);
+
+        if (!$block->mine(
+            $c['public_key'],
+            $c['nonce'],
+            $c['argon'],
+            $c['difficulty'],
+            $b['id'],
+            $b['height'],
+            $c['date']
+        )) {
+            print("Invalid block detected. $c[height] - $c[id]\n");
+            break;
+        } 
+        echo "Block $i -> ok\n";
+        $b=$c;
+    }
+
 
 } else {
-	echo "Invalid command\n";
+    echo "Invalid command\n";
 }
-
-
-?>