X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=contrib%2Fchash%2Fchash.php;h=1c4965cb835d56892179bff65dea904f3627a106;hb=0551dc708ab662db5663d7a693219e6428c9a3da;hp=408b4660e553b50152a6044df95e8ed0f7acac4a;hpb=57adde2ad243a28700a9e1352e6c9eafaa90cfc4;p=core.git

diff --git a/contrib/chash/chash.php b/contrib/chash/chash.php
index 408b4660..1c4965cb 100644
--- a/contrib/chash/chash.php
+++ b/contrib/chash/chash.php
@@ -1,17 +1,27 @@
 <?php
 error_reporting(E_ALL | E_STRICT);
 
-define('START_TIME'            , microtime(TRUE));
+define('START_TIME'            , microtime(true));
 define('CHECK_POINT'           , 'chash.pos');
 
+// Hashes needed to complete a "block"
 $GLOBALS['block_size']          = 100;
 $GLOBALS['none_increment']      = (1 / pow(10, 20));
-$GLOBALS['hash_algo']           = MHASH_RIPEMD320;
+
+// Hashing algorythm
+$GLOBALS['hash_algo']           = MHASH_SHA256;
+
+// Automatic saving interval in seconds
 $GLOBALS['flush_file_time']     = 30;
+
+/*
+ * How long (in seconds) to try to find a proper hash until the best root hash
+ * is taken.
+ */
 $GLOBALS['restart_search_time'] = 1800;
 
 // Hashes per call
-$GLOBALS['hash_cycles'] = 3;
+$GLOBALS['hash_cycles'] = 5;
 
 // Total restarts
 $GLOBALS['total_restarts'] = 0;
@@ -73,6 +83,9 @@ function modulaHash ($hash1, $hash2) {
 	// Both must have same length
 	assert(strlen($hash1) === strlen($hash2));
 
+	// Init propability array with 256 zeros
+	$propability = array_fill(0, 256, 0);
+
 	// Init new hash
 	$modulaHash = '';
 
@@ -85,6 +98,9 @@ function modulaHash ($hash1, $hash2) {
 		$part1 = hexdec(substr($hash1, $idx, 2));
 		$part2 = hexdec(substr($hash2, $idx, 2));
 
+		// Debug message
+		//* NOISY-DEBUG: */ print 'part1=' . $part1 . ',part2=' . $part2 . PHP_EOL;
+
 		/*
 		 * If part1 is larget part2, part1 is divident and vise-versa. But don't do it
 		 * if one is zero
@@ -92,18 +108,43 @@ function modulaHash ($hash1, $hash2) {
 		if (($part1 > $part2) && ($part2 > 0)) {
 			// 'part1' is larger than 'part2'
 			$mod = $part1 % $part2;
-		} elseif (($part1 < $part2) && ($part1 > 0)) {
+		} elseif (($part2 > $part1) && ($part1 > 0)) {
 			// 'part2' is larger than 'part1'
 			$mod = $part2 % $part1;
 		}
 
-		// "Invert" the result against 255
+		// $mod is now mostly a small number so try to "improve" it
+		//* NOISY-DEBUG: */ print 'mod[' . gettype($mod) . ']=' . $mod . ' - BEFORE!' . PHP_EOL;
+		$mod = (int) round(sqrt($mod * ($part1 + $part2 + $mod ^ 7) / 3));
+		//* NOISY-DEBUG: */ print 'mod[' . gettype($mod) . ']=' . $mod . ' - AFTER!' . PHP_EOL;
+
+		// Make sure it is valid
+		assert($mod >= 0);
+		assert($mod <= 255);
+
+		// "Invert" the result against 255 as zeros are not good for later calculations
 		$mod = 255 - $mod;
 
+		// Add it to propability array for debugging
+		$propability[$mod]++;
+
 		// Encode to hex, pre-pad it with zeros and add to new hash
 		$modulaHash .= padHex($mod);
 	} // END - for
 
+	// Debug propability array
+	$cnt = 0;
+	foreach ($propability as $value) {
+		// Is the value larger than one, means the number has been found at least once?
+		if ($value > 0) {
+			// Then count it
+			$cnt++;
+		} // END - if
+	} // END - foreach
+
+	// Debug message
+	//* NOISY-DEBUG: */ print('cnt=' . $cnt . '/' . strlen($hash1) / 2 . PHP_EOL);
+
 	// Modula hash must have same length as input hash
 	assert(strlen($modulaHash) === strlen($hash1));
 
@@ -207,7 +248,7 @@ function flushCheckPointFile ($hash) {
 	print ('FLUSHING: Writing ' . count($GLOBALS['found_hashes']) . ' blocks ...' . PHP_EOL);
 
 	// Start timer
-	$timer = microtime(TRUE);
+	$timer = microtime(true);
 
 	// Flush data
 	file_put_contents(
@@ -221,11 +262,11 @@ function flushCheckPointFile ($hash) {
 		base64_encode((float) $GLOBALS['nonce']) . ':' .
 		$hash . ':' .
 		$GLOBALS['root_hash'] . ':' .
-		base64_encode(gzcompress(serialize($GLOBALS['found_hashes'])))
+		base64_encode(gzcompress(json_encode($GLOBALS['found_hashes'])))
 	);
 
 	// Set time
-	$GLOBALS['time_flush'] = microtime(TRUE);
+	$GLOBALS['time_flush'] = microtime(true);
 	print ('FLUSHING: Took ' . ($GLOBALS['time_flush'] - $timer) . ' seconds.' . PHP_EOL);
 }
 
@@ -254,7 +295,7 @@ function addFoundHash ($hash) {
 	print ('FOUND: hash=' . $hash . ',nonce=' . $GLOBALS['nonce'] . ',total_found=' . $GLOBALS['total_found'] . PHP_EOL);
 
 	// Set time as a new hash was found
-	$GLOBALS['found_time'] = microtime(TRUE);
+	$GLOBALS['found_time'] = microtime(true);
 
 	// Flush check-point file after new hash is found
 	flushCheckPointFile($hash);
@@ -334,9 +375,9 @@ $GLOBALS['genesis_hash'] = $GLOBALS['modula_hash'];
 $GLOBALS['root_hash']    = $GLOBALS['modula_hash'];
 
 // Output results
-print ('hashes=' . print_r($gensisHashes, TRUE));
-print ('modulaHashes=' . print_r($modulaHashes, TRUE));
-print ('sqrtHashes=' . print_r($sqrtHashes, TRUE));
+print ('hashes=' . print_r($gensisHashes, true));
+print ('modulaHashes=' . print_r($modulaHashes, true));
+print ('sqrtHashes=' . print_r($sqrtHashes, true));
 print ('modulaHash=' . $GLOBALS['modula_hash'] . PHP_EOL);
 
 // Total reward + hashes
@@ -344,7 +385,7 @@ $GLOBALS['total_reward']   = 0;
 $GLOBALS['total_hashes']   = 0;
 $GLOBALS['total_found']    = 0;
 $GLOBALS['total_blocks']   = 0;
-$GLOBALS['found_time']     = microtime(TRUE);
+$GLOBALS['found_time']     = microtime(true);
 
 // Is the check point there?
 if (is_readable(CHECK_POINT)) {
@@ -366,7 +407,7 @@ if (is_readable(CHECK_POINT)) {
 	$GLOBALS['hash_cycles']    = intval($data[5]);
 	$GLOBALS['nonce']          = (float) base64_decode($data[6]);
 	$GLOBALS['root_hash']      = $data[8];
-	$GLOBALS['found_hashes']   = unserialize(gzuncompress(base64_decode($data[9])));
+	$GLOBALS['found_hashes']   = json_decode(gzuncompress(base64_decode($data[9])));
 
 	// Set modula hash
 	setModulaHash($data[7]);
@@ -381,13 +422,13 @@ print ('nonce=' . $GLOBALS['nonce'] . PHP_EOL);
 print ('found=' . count($GLOBALS['found_hashes'][$GLOBALS['total_blocks']]) . PHP_EOL);
 
 // Start "mining"
-while (TRUE) {
+while (true) {
 	// Init hash-per-block counter and hashrate
 	$GLOBALS['hashes_block'] = 0;
 	$hashrate = 0;
 
 	// Wait for block_size iterations (= found hashes). This is one block
-	$timeBlock   = microtime(TRUE);
+	$timeBlock   = microtime(true);
 	$timeDisplay = $timeBlock;
 	$GLOBALS['time_flush'] = $timeBlock;
 
@@ -406,7 +447,7 @@ while (TRUE) {
 		$GLOBALS['iteration_second'] = 0;
 
 		// Now start the "mining" ...
-		$timeHash = microtime(TRUE);
+		$timeHash = microtime(true);
 		while ($sumNonce < $GLOBALS['sum_modula']) {
 			// Calculate new nonce
 			calculateNonce();
@@ -418,7 +459,7 @@ while (TRUE) {
 			$sumNonce  = calculateSumFromHash($nonceHash);
 
 			// Time spend in loop
-			$testTime = abs(microtime(TRUE) - $timeDisplay);
+			$testTime = abs(microtime(true) - $timeDisplay);
 
 			// Calculate hashrate/sec
 			$hashrate = 1 / $testTime * $GLOBALS['iteration_second'] * $GLOBALS['hash_cycles'];
@@ -429,12 +470,12 @@ while (TRUE) {
 				print ('hashrate=' . round($hashrate) . ' hashes/sec,iterSecond=' . $GLOBALS['iteration_second'] . ' iterations/sec' . PHP_EOL);
 
 				// Reset timer
-				$timeDisplay = microtime(TRUE);
+				$timeDisplay = microtime(true);
 				$GLOBALS['iteration_second']  = 0;
 			} // END - if
 
 			// Time spend from last flush
-			$testTime = abs(microtime(TRUE) - $GLOBALS['time_flush']);
+			$testTime = abs(microtime(true) - $GLOBALS['time_flush']);
 
 			// Only once per 10 seconds
 			if ($testTime >= $GLOBALS['flush_file_time']) {
@@ -443,7 +484,7 @@ while (TRUE) {
 			} // END - if
 
 			// Time spend from last found block
-			$testTime = abs(microtime(TRUE) - $GLOBALS['found_time']);
+			$testTime = abs(microtime(true) - $GLOBALS['found_time']);
 
 			// Is the last found time to far away?
 			if ($testTime >= $GLOBALS['restart_search_time']) {
@@ -460,7 +501,7 @@ while (TRUE) {
 					foreach ($block as $hash) {
 						if (!isset($hash['root_hash'])) {
 							// Bad file
-							die('INCONSISTENCY: hash=' . print_r($hash, TRUE));
+							die('INCONSISTENCY: hash=' . print_r($hash, true));
 						} // END - if
 
 						if (isset($rootHashes[$hash['root_hash']])) {
@@ -503,7 +544,7 @@ while (TRUE) {
 							print ('idx=' . $idx . ',modulaHash=' . $GLOBALS['root_hash'] . ' - Is now new root hash!' . PHP_EOL);
 
 							// Reset "found time" (when a hash was found)
-							$GLOBALS['found_time'] = microtime(TRUE);
+							$GLOBALS['found_time'] = microtime(true);
 
 							// Re-initialize nonce
 							initNonce();
@@ -527,7 +568,7 @@ while (TRUE) {
 		// If the iteration is zero, then no hash is found
 		if ($GLOBALS['iteration'] == 0) {
 			// Bad hash found
-			$timeBadHashes += abs(microtime(TRUE) - $timeHash);
+			$timeBadHashes += abs(microtime(true) - $timeHash);
 
 			// And next round
 			print('BAD:nonce=' . $GLOBALS['nonce'] . PHP_EOL);
@@ -545,7 +586,7 @@ while (TRUE) {
 	} // END - while
 
 	// Time taken for one
-	$timeBlock = abs(microtime(TRUE) - $timeBlock);
+	$timeBlock = abs(microtime(true) - $timeBlock);
 
 	// Calculate reward
 	$reward = abs($timeBlock - $timeBadHashes) / $hashrate * $GLOBALS['hashes_block'] / $GLOBALS['block_size'] * 1000;
@@ -569,10 +610,7 @@ while (TRUE) {
 	$blockValue = $GLOBALS['total_reward'] / $GLOBALS['total_blocks'] * $GLOBALS['total_hashes'] / ($GLOBALS['block_size'] * $GLOBALS['total_blocks']);
 
 	// Calculate reward per hour (= 3600 seconds)
-	$rewardPerHour = $GLOBALS['total_reward'] / abs(microtime(TRUE) - START_TIME) * 3600;
+	$rewardPerHour = $GLOBALS['total_reward'] / abs(microtime(true) - START_TIME) * 3600;
 
 	print ('totalReward=' . $GLOBALS['total_reward'] . ',blockValue=' . $blockValue . ',rewardPerHour=' . $rewardPerHour . PHP_EOL);
 } // END - while
-
-// [EOF]
-?>