Continued:

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

diff --git a/contrib/chash/chash.php b/contrib/chash/chash.php
index ed583d9946b113fb9faf42b40e779696cfc919b4..4911ba57036e2c22603c4abe0ccb738e22bd968d 100644 (file)
--- a/contrib/chash/chash.php
+++ b/contrib/chash/chash.php
@@ -169,7 +169,7 @@ while (true) {
                                // Reset timer
                                $timeDisplay = microtime(true);
                                $GLOBALS['iteration_second']  = 0;
-                       } // END - if
+                       }
 
                        // Time spend from last flush
                        $testTime = abs(microtime(true) - $GLOBALS['time_flush']);
@@ -178,7 +178,7 @@ while (true) {
                        if ($testTime >= $GLOBALS['flush_file_time']) {
                                // Flush check-point file
                                flushCheckPointFile($GLOBALS['current_hash']);
-                       } // END - if
+                       }
 
                        // Time spend from last found block
                        $testTime = abs(microtime(true) - $GLOBALS['found_time']);
@@ -200,7 +200,7 @@ while (true) {
                                                if (!isset($hash['root_hash'])) {
                                                        // Bad file
                                                        die('INCONSISTENCY: hash=' . print_r($hash, true));
-                                               } // END - if
+                                               }
 
                                                if (isset($rootHashes[$hash['root_hash']])) {
                                                        // Count up
@@ -209,23 +209,21 @@ while (true) {
                                                        // First entry found
                                                        $rootHashes[$hash['root_hash']] = 1;
                                                }
-                                       } // END - foreach
-                               } // END - foreach
+                                       }
+                               }
 
                                // Find best root hash
                                $bestRootHash = '';
                                $bestRootCount = 0;
                                foreach ($rootHashes as $hash => $count) {
-                                       // Debug message
-                                       //* NOISY-DEBUG: */ print ('hash=' . $hash . ',count=' . $count . ',bestRootHash=' . $bestRootHash . ',bestRootCount=' . $bestRootCount . PHP_EOL);
-
                                        // Is a better one found?
+                                       //* NOISY-DEBUG: */ print ('hash=' . $hash . ',count=' . $count . ',bestRootHash=' . $bestRootHash . ',bestRootCount=' . $bestRootCount . PHP_EOL);
                                        if ($count > $bestRootCount) {
                                                // Remember it
                                                $bestRootHash  = $hash;
                                                $bestRootCount = $count;
-                                       } // END - if
-                               } // END - foreach
+                                       }
+                               }
 
                                // Output message
                                print ('bestRootHash=' . $bestRootHash . ',bestRootCount=' . $bestRootCount . PHP_EOL);
@@ -249,49 +247,50 @@ while (true) {
 
                                                        // Abort search
                                                        break;
-                                               } // END - if
-                                       } // END - for
-                               } // END - foreach
-                       } // END - if
+                                               }
+                                       }
+                               }
+                       }
 
                        // Next round
                        $GLOBALS['iteration']++;
                        $GLOBALS['iteration_second']++;
-                       //print ('nonce=' . $GLOBALS['nonce'] . ',iteration=' . $GLOBALS['iteration'] . PHP_EOL);
-                       //print ('nonceHash=' . $nonceHash . PHP_EOL);
-                       //print ('sumNonce=' . $sumNonce . PHP_EOL);
-                       //print ('sumGenesis=' . $GLOBALS['sum_genesis'] . PHP_EOL);
-               } // END - while
+                       //* NOISY-DEBUG: */ print('nonce=' . $GLOBALS['nonce'] . ',iteration=' . $GLOBALS['iteration'] . PHP_EOL);
+                       //* NOISY-DEBUG: */ print('nonceHash=' . $nonceHash . PHP_EOL);
+                       //* NOISY-DEBUG: */ print('sumNonce=' . $sumNonce . PHP_EOL);
+                       //* NOISY-DEBUG: */ print('sumGenesis=' . $GLOBALS['sum_genesis'] . PHP_EOL);
+               }
 
                // If the iteration is zero, then no hash is found
                if ($GLOBALS['iteration'] == 0) {
                        // Bad hash found
                        $timeBadHashes += abs(microtime(true) - $timeHash);
 
-                       // And next round
-                       print('BAD:nonce=' . $GLOBALS['nonce'] . PHP_EOL);
-
                        // Nothing found, so calculate new nonce
+                       //* NOISY-DEBUG: */ print('BAD:nonce=' . $GLOBALS['nonce'] . PHP_EOL);
                        calculateNonce();
                        continue;
-               } // END - if
+               }
 
                // Add amount of hashes per block (multiple-hash)
                $GLOBALS['hashes_block'] += $GLOBALS['iteration'] * $GLOBALS['hash_cycles'] + $GLOBALS['hash_cycles'];
 
                // Push found hash
                addFoundHash($nonceHash);
-       } // END - while
+       }
+
+       // Flush check-point file
+       flushCheckPointFile($GLOBALS['current_hash']);
 
        // Time taken for one
        $timeBlock = abs(microtime(true) - $timeBlock);
 
        // Calculate reward
-       $reward = abs($timeBlock - $timeBadHashes) / $hashRate * $GLOBALS['hashes_block'] / max(1, $GLOBALS['block_size']) * 1000;
+       $reward = abs($timeBlock - $timeBadHashes) / max(1, $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;
+       // Increase difficulty
+       $GLOBALS['difficulty'] = $GLOBALS['difficulty']++;
 
        // Block completed
        $GLOBALS['total_hashes'] += $GLOBALS['hashes_block'];
@@ -314,4 +313,4 @@ while (true) {
        $rewardPerHour = $GLOBALS['total_reward'] / abs(microtime(true) - START_TIME) * 3600;
 
        print ('totalReward=' . $GLOBALS['total_reward'] . ',blockValue=' . $blockValue . ',rewardPerHour=' . $rewardPerHour . PHP_EOL);
-} // END - while
+}