RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into bootstrap

Browse Source
This commit is contained in:
Sebastian Grewe 2014-03-21 16:01:03 +01:00
commit 5841eb458e
24 changed files with 290 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cronjobs/etc/logrotate.conf
View File

@ -1,4 +1,4 @@
"./logs/*.txt" { "./logs/*/*.txt" {
copytruncate copytruncate
rotate 7 rotate 7
compress compress

9
cronjobs/pps_payout.php
View File

@ -63,7 +63,7 @@ if ($config['pps']['reward']['type'] == 'blockavg' && $block->getBlockCount() >
} }
// Per-share value to be paid out to users // Per-share value to be paid out to users
$pps_value = round($pps_reward / (pow(2, $coin->getTargetBits()) * $dDifficulty), 12); $pps_value = round($coin->calcPPSValue($pps_reward, $dDifficulty), 12);
// Find our last share accounted and last inserted share for PPS calculations // Find our last share accounted and last inserted share for PPS calculations
if (!$iPreviousShareId = $setting->getValue('pps_last_share_id')) { if (!$iPreviousShareId = $setting->getValue('pps_last_share_id')) {
@ -105,9 +105,8 @@ foreach ($aAccountShares as $aData) {
continue; continue;
} }
// MPOS uses a base difficulty setting to avoid showing weightened shares // Payout for this user
// Since we need weightened shares here, we go back to the proper value for payouts $aData['payout'] = round($aData['valid'] * $pps_value, 12);
$aData['payout'] = round($aData['valid'] * pow(2, ($config['difficulty'] - 16)) * $pps_value, 12);
// Defaults // Defaults
$aData['fee' ] = 0; $aData['fee' ] = 0;
@ -120,7 +119,7 @@ foreach ($aAccountShares as $aData) {
$aData['donation'] = round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 12); $aData['donation'] = round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 12);
$log->logInfo(sprintf( $log->logInfo(sprintf(
$strLogMask, $aData['id'], $aData['username'], $aData['invalid'], $aData['valid'] * pow(2, ($config['difficulty'] - 16)), $strLogMask, $aData['id'], $aData['username'], $aData['invalid'], $aData['valid'],
number_format($pps_value, 12), number_format($aData['payout'], 12), number_format($aData['donation'], 12), number_format($aData['fee'], 12) number_format($pps_value, 12), number_format($aData['payout'], 12), number_format($aData['donation'], 12), number_format($aData['fee'], 12)
)); ));

2
cronjobs/run-crons.sh
View File

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
echo "Please be aware: This cron is deprecated and will be removed. Please read: https://github.com/MPOS/php-mpos/wiki/Cronjobs#setup"
sleep 2
######################### #########################
# # # #

10
public/include/classes/coins/coin_base.class.php
View File

@ -19,6 +19,14 @@ class CoinBase extends Base {
return $this->target_bits; return $this->target_bits;
} }
/**
* Calculate the PPS value for this coin
* WARNING: Get this wrong and you will over- or underpay your miners!
**/
public function calcPPSValue($pps_reward, $dDifficulty) {
return ($pps_reward / (pow(2, $this->target_bits) * $dDifficulty));
}
/** /**
* Calculate our hashrate based on shares inserted to DB * Calculate our hashrate based on shares inserted to DB
* We use diff1 share values, not a baseline one * We use diff1 share values, not a baseline one
@ -32,7 +40,7 @@ class CoinBase extends Base {
* according to our configuration difficulty * according to our configuration difficulty
**/ **/
public function calcEstaimtedShares($dDifficulty) { public function calcEstaimtedShares($dDifficulty) {
return (int)round((pow(2, (32 - $this->target_bits)) * $dDifficulty) / pow(2, ($this->config['difficulty'] - 16))); return (int)round(pow(2, (32 - $this->target_bits)) * $dDifficulty, 0);
} }
/** /**

3
public/include/classes/roundstats.class.php
View File

@ -78,7 +78,7 @@ class RoundStats extends Base {
SELECT SELECT
b.id, height, blockhash, amount, confirmations, difficulty, FROM_UNIXTIME(time) as time, shares, b.id, height, blockhash, amount, confirmations, difficulty, FROM_UNIXTIME(time) as time, shares,
IF(a.is_anonymous, 'anonymous', a.username) AS finder, IF(a.is_anonymous, 'anonymous', a.username) AS finder,
ROUND((difficulty * 65535) / POW(2, (" . $this->config['difficulty'] . " -16)), 0) AS estshares, ROUND(difficulty * POW(2, 32 - " . $this->coin->getTargetBits() . "), 0) AS estshares,
(time - (SELECT time FROM $this->tableBlocks WHERE height < ? ORDER BY height DESC LIMIT 1)) AS round_time (time - (SELECT time FROM $this->tableBlocks WHERE height < ? ORDER BY height DESC LIMIT 1)) AS round_time
FROM " . $this->block->getTableName() . " as b FROM " . $this->block->getTableName() . " as b
LEFT JOIN " . $this->user->getTableName() . " AS a ON b.account_id = a.id LEFT JOIN " . $this->user->getTableName() . " AS a ON b.account_id = a.id
@ -288,3 +288,4 @@ $roundstats->setUser($user);
$roundstats->setStatistics($statistics); $roundstats->setStatistics($statistics);
$roundstats->setBlock($block); $roundstats->setBlock($block);
$roundstats->setTransaction($transaction); $roundstats->setTransaction($transaction);
$roundstats->setCoin($coin);

10
public/include/classes/share.class.php
View File

@ -75,7 +75,7 @@ class Share Extends Base {
**/ **/
public function getRoundShares($previous_upstream=0, $current_upstream) { public function getRoundShares($previous_upstream=0, $current_upstream) {
$stmt = $this->mysqli->prepare("SELECT $stmt = $this->mysqli->prepare("SELECT
ROUND(IFNULL(SUM(IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 8) AS total IFNULL(SUM(IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty)), 0) AS total
FROM $this->table AS s FROM $this->table AS s
LEFT JOIN " . $this->user->getTableName() . " AS a LEFT JOIN " . $this->user->getTableName() . " AS a
ON a.username = SUBSTRING_INDEX( s.username , '.', 1 ) ON a.username = SUBSTRING_INDEX( s.username , '.', 1 )
@ -99,8 +99,8 @@ class Share Extends Base {
a.id, a.id,
SUBSTRING_INDEX( s.username , '.', 1 ) as username, SUBSTRING_INDEX( s.username , '.', 1 ) as username,
a.no_fees AS no_fees, a.no_fees AS no_fees,
ROUND(IFNULL(SUM(IF(our_result='Y', IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 8) AS valid, IFNULL(SUM(IF(our_result='Y', IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0) AS valid,
ROUND(IFNULL(SUM(IF(our_result='N', IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 8) AS invalid IFNULL(SUM(IF(our_result='N', IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0) AS invalid
FROM $this->table AS s FROM $this->table AS s
LEFT JOIN " . $this->user->getTableName() . " AS a LEFT JOIN " . $this->user->getTableName() . " AS a
ON a.username = SUBSTRING_INDEX( s.username , '.', 1 ) ON a.username = SUBSTRING_INDEX( s.username , '.', 1 )
@ -146,8 +146,8 @@ class Share Extends Base {
a.id, a.id,
SUBSTRING_INDEX( s.username , '.', 1 ) as account, SUBSTRING_INDEX( s.username , '.', 1 ) as account,
a.no_fees AS no_fees, a.no_fees AS no_fees,
ROUND(IFNULL(SUM(IF(our_result='Y', IF(s.difficulty=0, pow(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 8) AS valid, IFNULL(SUM(IF(our_result='Y', IF(s.difficulty=0, pow(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0) AS valid,
ROUND(IFNULL(SUM(IF(our_result='N', IF(s.difficulty=0, pow(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 8) AS invalid IFNULL(SUM(IF(our_result='N', IF(s.difficulty=0, pow(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0) AS invalid
FROM $this->tableArchive AS s FROM $this->tableArchive AS s
LEFT JOIN " . $this->user->getTableName() . " AS a LEFT JOIN " . $this->user->getTableName() . " AS a
ON a.username = SUBSTRING_INDEX( s.username , '.', 1 ) ON a.username = SUBSTRING_INDEX( s.username , '.', 1 )

22
public/include/classes/statistics.class.php
View File

@ -104,7 +104,7 @@ class Statistics extends Base {
b.*, b.*,
a.username AS finder, a.username AS finder,
a.is_anonymous AS is_anonymous, a.is_anonymous AS is_anonymous,
ROUND((difficulty * POW(2, 32 - " . $this->coin->getTargetBits() . ")) / POW(2, (" . $this->config['difficulty'] . " -16)), 0) AS estshares ROUND(difficulty * POW(2, 32 - " . $this->coin->getTargetBits() . "), 0) AS estshares
FROM " . $this->block->getTableName() . " AS b FROM " . $this->block->getTableName() . " AS b
LEFT JOIN " . $this->user->getTableName() . " AS a LEFT JOIN " . $this->user->getTableName() . " AS a
ON b.account_id = a.id ON b.account_id = a.id
@ -127,7 +127,7 @@ class Statistics extends Base {
b.*, b.*,
a.username AS finder, a.username AS finder,
a.is_anonymous AS is_anonymous, a.is_anonymous AS is_anonymous,
ROUND((difficulty * POW(2, 32 - " . $this->coin->getTargetBits() . ")) / POW(2, (" . $this->config['difficulty'] . " -16)), 0) AS estshares ROUND(difficulty * POW(2, 32 - " . $this->coin->getTargetBits() . "), 0) AS estshares
FROM " . $this->block->getTableName() . " AS b FROM " . $this->block->getTableName() . " AS b
LEFT JOIN " . $this->user->getTableName() . " AS a LEFT JOIN " . $this->user->getTableName() . " AS a
ON b.account_id = a.id ON b.account_id = a.id
@ -293,8 +293,8 @@ class Statistics extends Base {
} }
$stmt = $this->mysqli->prepare(" $stmt = $this->mysqli->prepare("
SELECT SELECT
ROUND(IFNULL(SUM(IF(our_result='Y', IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty), 0)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 0) AS valid, ROUND(IFNULL(SUM(IF(our_result='Y', IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty), 0)), 0), 0) AS valid,
ROUND(IFNULL(SUM(IF(our_result='N', IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty), 0)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 0) AS invalid ROUND(IFNULL(SUM(IF(our_result='N', IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty), 0)), 0), 0) AS invalid
FROM " . $this->share->getTableName() . " FROM " . $this->share->getTableName() . "
WHERE UNIX_TIMESTAMP(time) > IFNULL((SELECT MAX(time) FROM " . $this->block->getTableName() . "), 0)"); WHERE UNIX_TIMESTAMP(time) > IFNULL((SELECT MAX(time) FROM " . $this->block->getTableName() . "), 0)");
if ( $this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result() ) if ( $this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result() )
@ -316,8 +316,8 @@ class Statistics extends Base {
} }
$stmt = $this->mysqli->prepare(" $stmt = $this->mysqli->prepare("
SELECT SELECT
ROUND(IFNULL(SUM(IF(our_result='Y', IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 0) AS valid, ROUND(IFNULL(SUM(IF(our_result='Y', IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0), 0) AS valid,
ROUND(IFNULL(SUM(IF(our_result='N', IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 0) AS invalid, ROUND(IFNULL(SUM(IF(our_result='N', IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty), 0)), 0), 0) AS invalid,
u.id AS id, u.id AS id,
u.donate_percent AS donate_percent, u.donate_percent AS donate_percent,
u.is_anonymous AS is_anonymous, u.is_anonymous AS is_anonymous,
@ -368,8 +368,8 @@ class Statistics extends Base {
if ($data = $this->memcache->get(__FUNCTION__ . $account_id)) return $data; if ($data = $this->memcache->get(__FUNCTION__ . $account_id)) return $data;
$stmt = $this->mysqli->prepare(" $stmt = $this->mysqli->prepare("
SELECT SELECT
ROUND(IFNULL(SUM(IF(our_result='Y', IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty), 0)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 0) AS valid, ROUND(IFNULL(SUM(IF(our_result='Y', IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty), 0)), 0), 0) AS valid,
ROUND(IFNULL(SUM(IF(our_result='N', IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty), 0)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 0) AS invalid ROUND(IFNULL(SUM(IF(our_result='N', IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty), 0)), 0), 0) AS invalid
FROM " . $this->share->getTableName() . " FROM " . $this->share->getTableName() . "
WHERE username LIKE ? WHERE username LIKE ?
AND UNIX_TIMESTAMP(time) >IFNULL((SELECT MAX(b.time) FROM " . $this->block->getTableName() . " AS b),0)"); AND UNIX_TIMESTAMP(time) >IFNULL((SELECT MAX(b.time) FROM " . $this->block->getTableName() . " AS b),0)");
@ -500,7 +500,7 @@ class Statistics extends Base {
if ($this->getGetCache() && $data = $this->memcache->get(__FUNCTION__ . $account_id)) return $data; if ($this->getGetCache() && $data = $this->memcache->get(__FUNCTION__ . $account_id)) return $data;
$stmt = $this->mysqli->prepare(" $stmt = $this->mysqli->prepare("
SELECT SELECT
ROUND(IFNULL(SUM(IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 0) AS total ROUND(IFNULL(SUM(IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty)), 0), 0) AS total
FROM " . $this->share->getTableName() . " FROM " . $this->share->getTableName() . "
WHERE username LIKE ? WHERE username LIKE ?
AND id > ? AND id > ?
@ -603,7 +603,7 @@ class Statistics extends Base {
a.username AS account, a.username AS account,
a.donate_percent AS donate_percent, a.donate_percent AS donate_percent,
a.is_anonymous AS is_anonymous, a.is_anonymous AS is_anonymous,
ROUND(IFNULL(SUM(IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 0) AS shares ROUND(IFNULL(SUM(IF(s.difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), s.difficulty)), 0), 0) AS shares
FROM " . $this->share->getTableName() . " AS s FROM " . $this->share->getTableName() . " AS s
LEFT JOIN " . $this->user->getTableName() . " AS a LEFT JOIN " . $this->user->getTableName() . " AS a
ON SUBSTRING_INDEX( s.username, '.', 1 ) = a.username ON SUBSTRING_INDEX( s.username, '.', 1 ) = a.username
@ -892,7 +892,7 @@ class Statistics extends Base {
$pps_reward = $this->config['pps']['reward']['default']; $pps_reward = $this->config['pps']['reward']['default'];
} }
} }
return round($pps_reward / (pow(2, $this->coin->getTargetBits()) * $dDifficulty), 12); return round($this->coin->calcPPSValue($pps_reward, $dDifficulty), 12);
} }
/** /**

2
public/include/classes/user.class.php
View File

@ -863,7 +863,7 @@ class User extends Base {
$this->debug->append("STA " . __METHOD__, 4); $this->debug->append("STA " . __METHOD__, 4);
// Fetch the users mail address // Fetch the users mail address
if (empty($username)) { if (empty($username)) {
$this->serErrorMessage("Username must not be empty"); $this->setErrorMessage("Username must not be empty");
return false; return false;
} }
if (filter_var($username, FILTER_VALIDATE_EMAIL)) { if (filter_var($username, FILTER_VALIDATE_EMAIL)) {

2
public/include/version.inc.php
View File

@ -2,7 +2,7 @@
$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1; $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
define('MPOS_VERSION', '0.0.4'); define('MPOS_VERSION', '0.0.4');
define('DB_VERSION', '0.0.7'); define('DB_VERSION', '0.0.8');
define('CONFIG_VERSION', '0.0.7'); define('CONFIG_VERSION', '0.0.7');
// Fetch installed database version // Fetch installed database version

3
sql/012_accounts_update.sql
View File

@ -1,3 +0,0 @@
ALTER TABLE `accounts` CHANGE `sessionTimeoutStamp` `last_login` INT( 10 ) NULL DEFAULT NULL ;
INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.2') ON DUPLICATE KEY UPDATE `value` = '0.0.2';
INSERT INTO `settings` (`name`, `value`) VALUES ('db_upgrade_required', 0) ON DUPLICATE KEY UPDATE `value` = 0;

6
sql/013_tokentype_update.sql
View File

@ -1,6 +0,0 @@
INSERT INTO `token_types` (`name`, `expiration`) VALUES ('account_edit', 360);
INSERT INTO `token_types` (`name`, `expiration`) VALUES ('change_pw', 360);
INSERT INTO `token_types` (`name`, `expiration`) VALUES ('withdraw_funds', 360);
CREATE INDEX `account_id` ON `notification_settings` (`account_id`);
CREATE UNIQUE INDEX `account_id_type` ON `notification_settings` (`account_id`,`type`);
INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.3') ON DUPLICATE KEY UPDATE `value` = '0.0.3';

5
sql/014_accounts_update.sql
View File

@ -1,5 +0,0 @@
ALTER TABLE `accounts` ADD COLUMN `signup_timestamp` INT( 10 ) NOT NULL DEFAULT '0' AFTER `failed_pins`;
ALTER TABLE `accounts` ADD COLUMN `notify_email` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `email`;
TRUNCATE TABLE `token_types`;
INSERT INTO `token_types` (`id`, `name`, `expiration`) VALUES (1, 'password_reset', 3600), (2, 'confirm_email', 0), (3, 'invitation', 0), (4, 'account_unlock', 0), (5, 'account_edit', 3600), (6, 'change_pw', 3600), (7, 'withdraw_funds', 3600);
INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.4') ON DUPLICATE KEY UPDATE `value` = '0.0.4';

3
sql/015_accounts_update.sql
View File

@ -1,3 +0,0 @@
UPDATE `accounts` SET `coin_address` = NULL WHERE `coin_address` = '';
ALTER TABLE `accounts` ADD UNIQUE INDEX ( `coin_address` ) ;
INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.5') ON DUPLICATE KEY UPDATE `value` = '0.0.5';

2
sql/016_transactions_update.sql
View File

@ -1,2 +0,0 @@
CREATE INDEX `account_id_archived` ON `transactions` (`account_id`,`archived`);
INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.6') ON DUPLICATE KEY UPDATE `value` = '0.0.6';

2
sql/017_blocks_update.sql
View File

@ -1,2 +0,0 @@
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';

19
upgrade/definitions/0.0.1_to_0.0.2.inc.php Executable file
View File

@ -0,0 +1,19 @@
<?php
function run_002() {
// Ugly but haven't found a better way
global $setting;
// Version information
$db_version_old = '0.0.1'; // What version do we expect
$db_version_new = '0.0.2'; // What is the new version we wish to upgrade to
$db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed
// Upgrade specific variables
$aSql[] = "ALTER TABLE `accounts` CHANGE `sessionTimeoutStamp` `last_login` INT( 10 ) NULL DEFAULT NULL";
$aSql[] = "INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.2') ON DUPLICATE KEY UPDATE `value` = '0.0.2'";
if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) {
execute_db_upgrade($aSql);
}
}
?>

23
upgrade/definitions/0.0.2_to_0.0.3.inc.php Executable file
View File

@ -0,0 +1,23 @@
<?php
function run_003() {
// Ugly but haven't found a better way
global $setting;
// Version information
$db_version_old = '0.0.2'; // What version do we expect
$db_version_new = '0.0.3'; // What is the new version we wish to upgrade to
$db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed
// Upgrade specific variables
$aSql[] = "INSERT INTO `token_types` (`name`, `expiration`) VALUES ('account_edit', 360)";
$aSql[] = "INSERT INTO `token_types` (`name`, `expiration`) VALUES ('change_pw', 360)";
$aSql[] = "INSERT INTO `token_types` (`name`, `expiration`) VALUES ('withdraw_funds', 360)";
$aSql[] = "CREATE INDEX `account_id` ON `notification_settings` (`account_id`)";
$aSql[] = "CREATE UNIQUE INDEX `account_id_type` ON `notification_settings` (`account_id`,`type`)";
$aSql[] = "INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.3') ON DUPLICATE KEY UPDATE `value` = '0.0.3'";
if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) {
execute_db_upgrade($aSql);
}
}
?>

22
upgrade/definitions/0.0.3_to_0.0.4.inc.php Executable file
View File

@ -0,0 +1,22 @@
<?php
function run_004() {
// Ugly but haven't found a better way
global $setting;
// Version information
$db_version_old = '0.0.3'; // What version do we expect
$db_version_new = '0.0.4'; // What is the new version we wish to upgrade to
$db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed
// Upgrade specific variables
$aSql[] = "ALTER TABLE `accounts` ADD COLUMN `signup_timestamp` INT( 10 ) NOT NULL DEFAULT '0' AFTER `failed_pins`";
$aSql[] = "ALTER TABLE `accounts` ADD COLUMN `notify_email` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `email`";
$aSql[] = "TRUNCATE TABLE `token_types`";
$aSql[] = "INSERT INTO `token_types` (`id`, `name`, `expiration`) VALUES (1, 'password_reset', 3600), (2, 'confirm_email', 0), (3, 'invitation', 0), (4, 'account_unlock', 0), (5, 'account_edit', 3600), (6, 'change_pw', 3600), (7, 'withdraw_funds', 3600)";
$aSql[] = "INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.4') ON DUPLICATE KEY UPDATE `value` = '0.0.4'";
if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) {
execute_db_upgrade($aSql);
}
}
?>

21
upgrade/definitions/0.0.4_to_0.0.5.inc.php Executable file
View File

@ -0,0 +1,21 @@
<?php
function run_005() {
// Ugly but haven't found a better way
global $setting;
// Version information
$db_version_old = '0.0.4'; // What version do we expect
$db_version_new = '0.0.5'; // What is the new version we wish to upgrade to
$db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed
// Upgrade specific variables
$aSql[] = "ALTER TABLE `accounts` ADD COLUMN `signup_timestamp` INT( 10 ) NOT NULL DEFAULT '0' AFTER `failed_pins`";
$aSql[] = "UPDATE `accounts` SET `coin_address` = NULL WHERE `coin_address` = ''";
$aSql[] = "ALTER TABLE `accounts` ADD UNIQUE INDEX ( `coin_address` )";
$aSql[] = "INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.5') ON DUPLICATE KEY UPDATE `value` = '0.0.5'";
if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) {
execute_db_upgrade($aSql);
}
}
?>

19
upgrade/definitions/0.0.5_to_0.0.6.inc.php Executable file
View File

@ -0,0 +1,19 @@
<?php
function run_006() {
// Ugly but haven't found a better way
global $setting;
// Version information
$db_version_old = '0.0.5'; // What version do we expect
$db_version_new = '0.0.6'; // What is the new version we wish to upgrade to
$db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed
// Upgrade specific variables
$aSql[] = "CREATE INDEX `account_id_archived` ON `transactions` (`account_id`,`archived`)";
$aSql[] = "INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.6') ON DUPLICATE KEY UPDATE `value` = '0.0.6'";
if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) {
execute_db_upgrade($aSql);
}
}
?>

19
upgrade/definitions/0.0.6_to_0.0.7.inc.php Executable file
View File

@ -0,0 +1,19 @@
<?php
function run_007() {
// Ugly but haven't found a better way
global $setting;
// Version information
$db_version_old = '0.0.6'; // What version do we expect
$db_version_new = '0.0.7'; // What is the new version we wish to upgrade to
$db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed
// Upgrade specific variables
$aSql[] = "ALTER TABLE `blocks` CHANGE `share_id` `share_id` BIGINT( 30 ) NULL DEFAULT NULL";
$aSql[] = "INSERT INTO `settings` (`name`, `value`) VALUES ('DB_VERSION', '0.0.7') ON DUPLICATE KEY UPDATE `value` = '0.0.7'";
if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) {
execute_db_upgrade($aSql);
}
}
?>

32
upgrade/definitions/0.0.7_to_0.0.8.inc.php Executable file
View File

@ -0,0 +1,32 @@
<?php
function run_008() {
// Ugly but haven't found a better way
global $setting, $config, $statistics, $block, $mysqli;
// Version information
$db_version_old = '0.0.7'; // What version do we expect
$db_version_new = '0.0.8'; // What is the new version we wish to upgrade to
$db_version_now = $setting->getValue('DB_VERSION'); // Our actual version installed
// Upgrade specific variables
$dDifficulty = POW(2, ($config['difficulty'] - 16));
$aSql[] = "UPDATE " . $statistics->getTableName() . " SET valid = valid / $dDifficulty, invalid = invalid / $dDifficulty, pplns_valid = pplns_valid / $dDifficulty, pplns_invalid = pplns_invalid / $dDifficulty";
$aSql[] = "UPDATE " . $block->getTableName() . " SET shares = shares / $dDifficulty";
$aSql[] = "UPDATE " . $setting->getTableName() . " SET value = '0.0.8' WHERE name = 'DB_VERSION'";
if ($db_version_now == $db_version_old && version_compare($db_version_now, DB_VERSION, '<')) {
// Run the upgrade
echo '- Starting database migration to version ' . $db_version_new . PHP_EOL;
foreach ($aSql as $sql) {
echo '- Preparing: ' . $sql . PHP_EOL;
$stmt = $mysqli->prepare($sql);
if ($stmt && $stmt->execute()) {
echo '- success' . PHP_EOL;
} else {
echo '- failed: ' . $mysqli->error . PHP_EOL;
exit(1);
}
}
}
}
?>

48
upgrade/run_upgrades.php Executable file
View File

@ -0,0 +1,48 @@
#!/usr/bin/php
<?php
/* Upgarde script for https://github.com/MPOS/php-mpos/issues/1981 */
// Change to working directory
chdir(dirname(__FILE__));
// Include all settings and classes
require_once('shared.inc.php');
// Fetch current version
$db_version_now = $setting->getValue('DB_VERSION');
// Helper functions
function run_db_upgrade($db_version_now) {
// Find upgrades
$files = glob(dirname(__FILE__) . "/definitions/${db_version_now}_to_*");
if (count($files) == 0) die('No upgrade definitions found for ' . $db_version_now . PHP_EOL);
foreach ($files as $file) {
$db_version_to = preg_replace("/(.*)\/definitions\/${db_version_now}_to_/", '', $file);
$db_version_to = preg_replace("/.inc.php/", '', $db_version_to);
$run_string = preg_replace("/\./", '', $db_version_to);
if (!require_once($file)) die('Failed to load upgrade definition: ' . $file);
echo "+ Running upgrade from $db_version_now to $db_version_to" . PHP_EOL;
$run = "run_$run_string";
$run();
run_db_upgrade($db_version_to);
}
}
function execute_db_upgrade($aSql) {
global $mysqli;
// Run the upgrade
echo '- Starting database migration to version ' . $db_version_new . PHP_EOL;
foreach ($aSql as $sql) {
echo '- Preparing: ' . $sql . PHP_EOL;
$stmt = $mysqli->prepare($sql);
if ($stmt && $stmt->execute()) {
echo '- success' . PHP_EOL;
} else {
echo '- failed: ' . $mysqli->error . PHP_EOL;
exit(1);
}
}
}
// Initial caller
run_db_upgrade($db_version_now);
?>

51
upgrade/shared.inc.php Normal file
View File

@ -0,0 +1,51 @@
<?php
/*
Copyright:: 2013, Sebastian Grewe
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// MODIFY THIS
// We need to find our include files so set this properly
define("BASEPATH", "../public/");
/*****************************************************
* No need to change beyond this point *
*****************************************************/
define('SECURITY', '*)WT#&YHfd');
// Whether or not to check SECHASH for validity, still checks if SECURITY defined as before if disabled
define('SECHASH_CHECK', false);
// change SECHASH every second, we allow up to 3 sec back for slow servers
if (SECHASH_CHECK) {
function fip($tr=0) { return md5(SECURITY.(time()-$tr).SECURITY); }
define('SECHASH', fip());
function cfip() { return (fip()==SECHASH||fip(1)==SECHASH||fip(2)==SECHASH) ? 1 : 0; }
} else {
function cfip() { return (@defined('SECURITY')) ? 1 : 0; }
}
// Include our configuration (holding defines for the requires)
require_once(BASEPATH . 'include/config/global.inc.dist.php');
require_once(BASEPATH . 'include/config/global.inc.php');
require_once(BASEPATH . 'include/config/security.inc.dist.php');
@include_once(BASEPATH . 'include/config/security.inc.php');
require_once(BASEPATH . 'include/bootstrap.php');
require_once(BASEPATH . 'include/version.inc.php');
?>