diff --git a/public/include/classes/bitcoinwrapper.class.php b/public/include/classes/bitcoinwrapper.class.php index 4777a87c..3679ee43 100644 --- a/public/include/classes/bitcoinwrapper.class.php +++ b/public/include/classes/bitcoinwrapper.class.php @@ -75,9 +75,9 @@ class BitcoinWrapper extends BitcoinClient { if (array_key_exists('networkhashps', $dNetworkHashrate)) { $dNetworkHashrate = $dNetworkHashrate['networkhashps']; } else if (array_key_exists('networkmhps', $dNetworkHashrate)) { - $dNetworkHashrate = $dNetworkHashrate['networkmhps'] * 1000; + $dNetworkHashrate = $dNetworkHashrate['networkmhps'] * 1000 * 1000; } else if (array_key_exists('networkghps', $dNetworkHashrate)) { - $dNetworkHashrate = $dNetworkHashrate['networkghps'] * 1000 * 1000; + $dNetworkHashrate = $dNetworkHashrate['networkghps'] * 1000 * 1000 * 1000; } else if (array_key_exists('hashespersec', $dNetworkHashrate)) { $dNetworkHashrate = $dNetworkHashrate['hashespersec']; } else if (array_key_exists('netmhashps', $dNetworkHashrate)) { diff --git a/public/include/version.inc.php b/public/include/version.inc.php index f6176806..25448d09 100644 --- a/public/include/version.inc.php +++ b/public/include/version.inc.php @@ -2,7 +2,7 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1; define('MPOS_VERSION', '0.0.4'); -define('DB_VERSION', '0.0.6'); +define('DB_VERSION', '0.0.7'); define('CONFIG_VERSION', '0.0.7'); // Fetch installed database version diff --git a/sql/000_base_structure.sql b/sql/000_base_structure.sql index 39e71860..29432c22 100644 --- a/sql/000_base_structure.sql +++ b/sql/000_base_structure.sql @@ -46,7 +46,7 @@ CREATE TABLE IF NOT EXISTS `blocks` ( `account_id` int(255) unsigned DEFAULT NULL, `worker_name` varchar(50) DEFAULT 'unknown', `shares` int(255) unsigned DEFAULT NULL, - `share_id` int(255) DEFAULT NULL, + `share_id` bigint(30) DEFAULT NULL, PRIMARY KEY (`id`), UNIQUE KEY `height` (`height`,`blockhash`), KEY `time` (`time`) @@ -133,7 +133,7 @@ CREATE TABLE IF NOT EXISTS `settings` ( UNIQUE KEY `setting` (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.6'); +INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.7'); CREATE TABLE IF NOT EXISTS `shares` ( `id` bigint(30) NOT NULL AUTO_INCREMENT, diff --git a/sql/017_blocks_update.sql b/sql/017_blocks_update.sql new file mode 100644 index 00000000..0e87da9b --- /dev/null +++ b/sql/017_blocks_update.sql @@ -0,0 +1,2 @@ +ALTER TABLE `blocks` CHANGE `share_id` `share_id` BIGINT( 30 ) NULL DEFAULT NULL ; +INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.7') ON DUPLICATE KEY UPDATE `value` = '0.0.7';