version

Beautify the sample configuration with sections

README.md

@@ -5,11 +5,11 @@ The Arionum (ARO) cryptocurrency node.
 ## Install
 
 **Hardware Requirements:**
-
+```
 2GB RAM
 1 CPU Core
 50GB DISK
-
+```
 **Requirements:**
 
 - PHP 7.2
@@ -19,7 +19,7 @@ The Arionum (ARO) cryptocurrency node.
 - MySQL/MariaDB
 
 1. Install MySQL or MariaDB and create a database and a user.
-2. Edit `include/config.inc.php` and set the DB login data
+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
 

include/block.inc.php

@@ -24,7 +24,7 @@ class Block
 
         // create the block data and check it against the signature
         $info = "{$generator}-{$height}-{$date}-{$nonce}-{$json}-{$difficulty}-{$argon}";
-        _log($info,3);
+        // _log($info,3);
         if (!$bootstrapping) {
             if (!$acc->check_signature($info, $signature, $public_key)) {
                 _log("Block signature check failed");
@@ -37,12 +37,33 @@ class Block
             }
         }
         // lock table to avoid race conditions on blocks
-        $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE");
+        $db->exec("LOCK TABLES blocks WRITE, accounts WRITE, transactions WRITE, mempool WRITE, masternode WRITE, peers write, config WRITE");
 
         $reward = $this->reward($height, $data);
 
         $msg = '';
 
+ if($height>=80460){
+                //reward the masternode
+
+	 $mn_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"=>$height, ":start"=>$height-360]
+            );
+	_log("MN Winner: $mn_winner",2);
+	if($mn_winner!==false){
+		$mn_reward=round(0.33*$reward,8);
+		$reward=round($reward-$mn_reward,8);
+		$reward=number_format($reward,8,".","");
+		$mn_reward=number_format($mn_reward,8,".","");
+		_log("MN Reward: $mn_reward",2);
+	}
+
+}
+
+
+
+
         // the reward transaction
         $transaction = [
             "src"        => $generator,
@@ -68,6 +89,8 @@ class Block
         // insert the block into the db
         $db->beginTransaction();
         $total = count($data);
+
+
         $bind = [
             ":id"           => $hash,
             ":generator"    => $generator,
@@ -94,10 +117,33 @@ class Block
         // insert the reward transaction in the db
         $trx->add($hash, $height, $transaction);
 
+if($mn_winner!==false){
+	$db->run("UPDATE accounts SET balance=balance+:bal WHERE public_key=:pub",[":pub"=>$mn_winner, ":bal"=>$mn_reward]);
+	$bind = [
+            ":id"         => hex2coin(hash("sha512", "mn".$hash.$height.$mn_winner)),
+            ":public_key" => $public_key,
+            ":height"     => $height,
+            ":block"      => $hash,
+            ":dst"        => $acc->get_address($mn_winner),
+            ":val"        => $mn_reward,
+            ":fee"        => 0,
+            ":signature"  => $reward_signature,
+            ":version"    => 0,
+            ":date"       => $date,
+            ":message"    => 'masternode',
+        ];
+        $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
+        );
+$this->reset_fails_masternodes($mn_winner, $height, $hash);
+
+}
+
         // parse the block's transactions and insert them to db
         $res = $this->parse_block($hash, $height, $data, false, $bootstrapping);
 
-        if (($height-1)%3==2 && $height>=80000) {
+        if (($height-1)%3==2 && $height>=80000&&$height<80460) {
             $this->blacklist_masternodes();
             $this->reset_fails_masternodes($public_key, $height, $hash);
         }
@@ -385,6 +431,25 @@ class Block
 
         // reward transaction and signature
         $reward = $this->reward($height, $data);
+
+if($height>=80460){
+                //reward the masternode
+	global $db;
+         $mn_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"=>$height, ":start"=>$height-360]
+            );
+        _log("MN Winner: $mn_winner",2);
+        if($mn_winner!==false){
+                $mn_reward=round(0.33*$reward,8);
+                $reward=round($reward-$mn_reward,8);
+                $reward=number_format($reward,8,".","");
+                $mn_reward=number_format($mn_reward,8,".","");
+                _log("MN Reward: $mn_reward",2);
+        }
+
+}
+
         $msg = '';
         $transaction = [
             "src"        => $generator,
@@ -430,10 +495,19 @@ class Block
         $last=$this->get($current['height']-1);
         $total_time=$current['date']-$last['date'];
         _log("blacklist total time $total_time");
-        if ($total_time<=600) {
+        if ($total_time<=600&&$current['height']<80500) {
             return;
         }
+	if($current['height']>=80500&&$total_time<360){
+		return false;
+	}
+	if($current['height']>=80500){
+		$total_time-=360;
+		$tem=floor($total_time/120)+1;
+		if($tem>5) $tem=5;
+	} else {
         	$tem=floor($total_time/600);
+	}
         _log("We have masternodes to blacklist - $tem", 2);
         $ban=$db->run(
             "SELECT public_key, blacklist, fails, last_won FROM masternode WHERE status=1 AND blacklist<:current AND height<:start ORDER by last_won ASC, public_key ASC LIMIT 0,$tem",
@@ -444,7 +518,9 @@ class Block
         foreach ($ban as $b) {
             $this->masternode_log($b['public_key'], $current['height'], $current['id']);
             _log("Blacklisting masternode - $i $b[public_key]", 2);
-            $db->run("UPDATE masternode SET fails=fails+1, blacklist=:blacklist WHERE public_key=:public_key", [":public_key"=>$b['public_key'], ":blacklist"=> $current['height']+(($b['fails']+1)*10)]);
+		$btime=10;
+		if($current['height']>83000) $btime=360;
+            $db->run("UPDATE masternode SET fails=fails+1, blacklist=:blacklist WHERE public_key=:public_key", [":public_key"=>$b['public_key'], ":blacklist"=> $current['height']+(($b['fails']+1)*$btime)]);
             $i++;
         }
     }
@@ -490,6 +566,18 @@ class Block
                 _log("Block below 10800, using 16MB argon", 2);
                 $argon = '$argon2i$v=19$m=16384,t=4,p=4'.$argon;
             }
+   
+	} elseif($current_height>=80460){
+		if ($current_height%2==0) {
+                	// cpu mining
+                	_log("CPU Mining - $current_height", 2);
+                	$argon = '$argon2i$v=19$m=524288,t=1,p=1'.$argon;
+		} else {
+               		 // gpu mining
+        	        _log("GPU Mining - $current_height", 2);
+                	$argon = '$argon2i$v=19$m=16384,t=4,p=4'.$argon;
+		}		
+
      } else {
             _log("Block > 80000 - $current_height", 2);
             if ($current_height%3==0) {
@@ -535,17 +623,23 @@ class Block
                     }
                     // if 10 mins have passed, try to give the block to the next masternode and do this every 10mins
                     _log("Last block time: $last_time, difference: ".($time-$last_time), 3);
-                    if ($time-$last_time>600) {
+                    if (($time-$last_time>600&&$current_height<80500)||($time-$last_time>360&&$current_height>=80500)) {
                         _log("Current public_key $public_key", 3);
-                        $tem=floor(($time-$last_time)/600);
+			if($current_height>=80500){
+				$total_time=$time-$last_time;
+				$total_time-=360;
+				$tem=floor($total_time/120)+1;
 			
+			} else {
+                        	$tem=floor(($time-$last_time)/600);
+                        }
                         $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 $tem,1",
                             [":current"=>$current_height, ":start"=>$current_height-360]
                         );
                         _log("Moving to the next masternode - $tem - $winner", 1);
                         // if all masternodes are dead, give the block to gpu
-                        if ($winner===false) {
+                        if ($winner===false||($tem>=5&&$current_height>=80500)) {
                             _log("All masternodes failed, giving the block to gpu", 1);
                             $argon = '$argon2i$v=19$m=16384,t=1,p=1'.$argon;
                         } elseif ($winner==$public_key) {
@@ -863,7 +957,7 @@ class Block
 
         // the reward transaction always has version 0
         $gen = $db->row(
-            "SELECT public_key, signature FROM transactions WHERE  version=0 AND block=:block",
+            "SELECT public_key, signature FROM transactions WHERE  version=0 AND block=:block AND message=''",
             [":block" => $block['id']]
         );
         $block['public_key'] = $gen['public_key'];

include/config-sample.inc.php

@@ -0,0 +1,114 @@
+<?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',
+];
+
+/*
+|--------------------------------------------------------------------------
+| 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;
+
+/*
+|--------------------------------------------------------------------------
+| 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;
+
+/*
+|--------------------------------------------------------------------------
+| 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,44 +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";
-//log verbosity, default 0, maximum 3
-$_config['log_verbosity']=0;
-//will this run as a masternode?
-$_config['masternode']=false;
-//masternode public key
-$_config['masternode_public_key']="";

include/init.inc.php

@@ -1,6 +1,6 @@
 <?php
 // ARO version
-define("VERSION", "0.4.1");
+define("VERSION", "0.4.2");
 // Amsterdam timezone by default, should probably be moved to config
 date_default_timezone_set("UTC");
 
@@ -71,9 +71,6 @@ if (file_exists("tmp/db-update")) {
     if($ram<1700000) {
         die("The node requires at least 2 GB of RAM");
     }
-    if($_config['masternode']==true && $ram<7000000){
-        die("The masternode require at least 8GB of RAM");
-    }
     $res = unlink("tmp/db-update");
     if ($res) {
         echo "Updating db schema! Please refresh!\n";

include/transaction.inc.php

@@ -20,11 +20,14 @@ class Transaction
                     );
             } else {
                 // other type of transactions
-                $db->run(
+       
+	        if($x['version']!=100) { $db->run(
                     "UPDATE accounts SET balance=balance-:val WHERE id=:id",
                     [":id" => $x['dst'], ":val" => $x['val']]
                     );
 		}
+        
+    		}	
             // on version 0 / reward transaction, don't credit anyone
             if ($x['version'] > 0) {
                 $db->run(
@@ -82,7 +85,7 @@ class Transaction
             }
     
             // add the transactions to mempool
-            if ($x['version'] > 0 && $x['version']<=1000) {
+            if ($x['version'] > 0 && $x['version']<=110) {
                 $this->add_mempool($x);
             }
             $res = $db->run("DELETE FROM transactions WHERE id=:id", [":id" => $x['id']]);

index.php

@@ -185,6 +185,10 @@ $current = $block->current();
             background-color: #209cee;
             color: #fff;
         }
+        .tag:not(body).is-danger {
+            background-color: #f48f42;
+            color: #fff;
+        }
 
         .tag:not(body).is-success {
             background-color: #23d160;
@@ -292,12 +296,20 @@ $current = $block->current();
                         <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>

mine.php

@@ -56,6 +56,12 @@ if ($q == "info") {
             $argon_threads=1;
             $argon_time=1;
         }
+     } elseif($current_height>=80460&&$current_height%2==0){
+	          $argon_mem=524288;
+            $argon_threads=1;
+            $argon_time=1;
+
+	
     } else {
         if ($current_height%3==0) {
             $argon_mem=524288;

peer.php

@@ -252,7 +252,6 @@ elseif ($q == "currentBlock") {
 } // return a specific block, used in syncing
 elseif ($q == "getBlock") {
     $height = intval($data['height']);
-
     $export = $block->export("", $height);
     if (!$export) {
         api_err("invalid-block");

sanity.php

@@ -314,6 +314,7 @@ foreach ($r as $x) {
     _log("Contacting peer $x[hostname]");
     $url = $x['hostname']."/peer.php?q=";
     // get their peers list
+if($_config['get_more_peers']==true){ 
    $data = peer_post($url."getPeers", [], 5);
     if ($data === false) {
         _log("Peer $x[hostname] unresponsive");
@@ -324,7 +325,6 @@ foreach ($r as $x) {
         );
         continue;
     }
-
     $i = 0;
     foreach ($data as $peer) {
         // store the hostname as md5 hash, for easier checking
@@ -371,7 +371,7 @@ foreach ($r as $x) {
             }
         }
     }
-
+}
 
     // get the current block and check it's blockchain
     $data = peer_post($url."currentBlock", [], 5);
@@ -665,7 +665,7 @@ foreach ($f as $x) {
 
 
 //recheck the last blocks
-if ($_config['sanity_recheck_blocks'] > 0 && $_config['testnet'] == false) {
+if ($_config['sanity_recheck_blocks'] > 0 && $_config['testnet'] == false&&1==2) {
     _log("Rechecking blocks");
     $blocks = [];
     $all_blocks_ok = true;

tmp/db-update

@@ -0,0 +1 @@
+4.0.1

util.php

@@ -447,6 +447,29 @@ elseif ($cmd == 'get-address') {
 } 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
+
+ // 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";
+                $db->run("UPDATE accounts SET balance=:bal WHERE id=:id",[":id"=>$x['id'], ":bal"=>$balance]);
+        }
+}
+$db->exec("UNLOCK TABLES");
+echo "All done";
+
+
 } else {
     echo "Invalid command\n";
 }