Continued with chash:

[core.git] / contrib / chash / chash.php

diff --git a/contrib/chash/chash.php b/contrib/chash/chash.php
index fe08cd3466e55fbde567c8e92ad87602cc81dc63..ed583d9946b113fb9faf42b40e779696cfc919b4 100644 (file)
--- a/contrib/chash/chash.php
+++ b/contrib/chash/chash.php
@@ -6,7 +6,7 @@ require 'lib/functions.php';
 require 'lib/scrypt.php';
 
 define('START_TIME'            , microtime(true));
-define('CHECK_POINT'           , 'chash.pos');
+define('CHECKPOINT_FILE'           , 'chash.pos');
 
 // Hashes needed to complete a "block"
 $GLOBALS['block_size']          = 100;
@@ -34,7 +34,7 @@ $GLOBALS['salt'] = Scrypt::generateSalt();
 $GLOBALS['difficulty'] = 2;
 
 // Found hashes
-$GLOBALS['found_hashes'] = array(0 => array());
+$GLOBALS['found_hashes'] = array([]);
 
 /**
  * Continued-hashing
@@ -45,7 +45,7 @@ $GLOBALS['found_hashes'] = array(0 => array());
  */
 
 // Is the check point there?
-if (is_readable(CHECK_POINT)) {
+if (is_readable(CHECKPOINT_FILE)) {
        // Load it
        loadCheckpointFile();
 } else {
@@ -61,8 +61,8 @@ if (is_readable(CHECK_POINT)) {
 $gensisHashes = array(
        // A famous quote from Deus Ex 2 - Invisible War
        multiplehashString('"Informations must be free." - AI Helios from Deus Ex'),
-       // My name + URL of my first StatusNet instance
-       multipleHashString('Roland Haeder, https://status.mxchange.org'),
+       // My name + URL of my GNUSocial instance
+       multipleHashString('Roland Haeder, https://social.mxchange.org'),
        // A famous quote from Linus Torwalds
        multipleHashString('"Software is like sex. Its better when its free." - Linus Torwalds'),
        // Well ...
@@ -88,10 +88,10 @@ $genesisBlock = array(
 
 // Calulcate final "genesis" hash
 $genesisHash = hashString(
+       $genesisBlock[3] .
        $genesisBlock[0] .
        $genesisBlock[2] .
-       $genesisBlock[1] .
-       $genesisBlock[3]
+       $genesisBlock[1]
 );
 
 // Get all elements to get the last part out
@@ -122,7 +122,7 @@ print ('difficulty=' . $GLOBALS['difficulty'] . PHP_EOL);
 while (true) {
        // Init hash-per-block counter and hashrate
        $GLOBALS['hashes_block'] = 0;
-       $hashrate = 0;
+       $hashRate = 1;
 
        // Wait for block_size iterations (= found hashes). This is one block
        $timeBlock   = microtime(true);
@@ -159,12 +159,12 @@ while (true) {
                        $testTime = abs(microtime(true) - $timeDisplay);
 
                        // Calculate hashrate/sec
-                       $hashrate = 1 / $testTime * $GLOBALS['iteration_second'] * $GLOBALS['hash_cycles'];
+                       $hashRate = 1 / $testTime * $GLOBALS['iteration_second'] * $GLOBALS['hash_cycles'];
 
                        // Only every second
                        if ($testTime >= 1) {
                                // Display hash rate
-                               print ('hashrate=' . round($hashrate) . ' hashes/sec,iterSecond=' . $GLOBALS['iteration_second'] . ' iterations/sec,difficulty=' . $GLOBALS['difficulty'] . PHP_EOL);
+                               print ('hashrate=' . round($hashRate) . ' hashes/sec,iterSecond=' . $GLOBALS['iteration_second'] . ' iterations/sec,difficulty=' . $GLOBALS['difficulty'] . PHP_EOL);
 
                                // Reset timer
                                $timeDisplay = microtime(true);
@@ -193,7 +193,7 @@ while (true) {
                                print('total_restarts=' . $GLOBALS['total_restarts'] . ' - Restarting ...');
 
                                // Count all root (genesis) hashes
-                               $rootHashes = array();
+                               $rootHashes = [];
                                foreach ($GLOBALS['found_hashes'] as $block) {
                                        // "Walk" through all blocks
                                        foreach ($block as $hash) {
@@ -287,8 +287,8 @@ while (true) {
        $timeBlock = abs(microtime(true) - $timeBlock);
 
        // Calculate reward
-       $reward = abs($timeBlock - $timeBadHashes) / $hashrate * $GLOBALS['hashes_block'] / $GLOBALS['block_size'] * 1000;
-       print ('timeBlock=' . $timeBlock . ',timeBadHashes=' . $timeBadHashes . ',hashesPerBlock=' . $GLOBALS['hashes_block'] .',reward=' . $reward . PHP_EOL);
+       $reward = abs($timeBlock - $timeBadHashes) / $hashRate * $GLOBALS['hashes_block'] / max(1, $GLOBALS['block_size']) * 1000;
+       print('timeBlock=' . $timeBlock . ',timeBadHashes=' . $timeBadHashes . ',hashesPerBlock=' . $GLOBALS['hashes_block'] .',reward=' . $reward . PHP_EOL);
 
        // Double difficulty
        $GLOBALS['difficulty'] = $GLOBALS['difficulty'] * 2;
@@ -299,7 +299,7 @@ while (true) {
        $GLOBALS['hashes_block'] = 0;
 
        // Init next block
-       $GLOBALS['found_hashes'][$GLOBALS['total_blocks']] = array();
+       $GLOBALS['found_hashes'][$GLOBALS['total_blocks']] = [];
 
        // Calculate new nonce
        calculateNonce();