Merge pull request #2019 from MPOS/development

Development to Master

Author: TheSerapher

cronjobs/etc/logrotate.conf

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

cronjobs/payouts.php

@@ -46,12 +46,12 @@
 
 // Fetch unconfirmed amount from blocks table
 empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
-$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
-$dBlocksUnconfirmedBalance = 0;
+if ($config['getbalancewithunconfirmed']) {
+  $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
+  $dBlocksUnconfirmedBalance = 0;
   if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
-
-$dWalletBalance -= $dBlocksUnconfirmedBalance;
-
+  $dWalletBalance -= $dBlocksUnconfirmedBalance;
+}
 // Fetch Newmint
 $aGetInfo = $bitcoin->getinfo();
 if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {
@@ -133,12 +133,12 @@
 
 // Fetch unconfirmed amount from blocks table
 empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
-$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
-$dBlocksUnconfirmedBalance = 0;
+if ($config['getbalancewithunconfirmed']) {
+  $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
+  $dBlocksUnconfirmedBalance = 0;
   if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
-
-$dWalletBalance -= $dBlocksUnconfirmedBalance;
-
+  $dWalletBalance -= $dBlocksUnconfirmedBalance;
+}
 // Fetch Newmint
 $aGetInfo = $bitcoin->getinfo();
 if (is_array($aGetInfo) && array_key_exists('newmint', $aGetInfo)) {

cronjobs/pps_payout.php

@@ -63,7 +63,7 @@
 }
 
 // Per-share value to be paid out to users
-$pps_value = round($pps_reward / (pow(2, $config['target_bits']) * $dDifficulty), 12);
+$pps_value = round($coin->calcPPSValue($pps_reward, $dDifficulty), 12);
 
 // Find our last share accounted and last inserted share for PPS calculations
 if (!$iPreviousShareId = $setting->getValue('pps_last_share_id')) {
@@ -105,9 +105,8 @@
     continue;
   }
 
-  // MPOS uses a base difficulty setting to avoid showing weightened shares
-  // Since we need weightened shares here, we go back to the proper value for payouts
-  $aData['payout'] = round($aData['valid'] * pow(2, ($config['difficulty'] - 16)) * $pps_value, 12);
+  // Payout for this user
+  $aData['payout'] = round($aData['valid'] * $pps_value, 12);
 
   // Defaults
   $aData['fee' ] = 0;
@@ -120,7 +119,7 @@
   $aData['donation'] = round($user->getDonatePercent($user->getUserId($aData['username'])) / 100 * ( $aData['payout'] - $aData['fee']), 12);
 
   $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)
   ));
 

cronjobs/run-crons.sh

@@ -1,5 +1,7 @@
 #!/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
 
 #########################
 #                       #

cronjobs/tickerupdate.php

@@ -33,18 +33,26 @@
 $strLogMask = "| %-25.25s | %15.15s | %8.8s | %-6.6s | %-80.80s |";
 $log->logInfo(sprintf($strLogMask, 'Method', 'Value', 'Runtime', 'Status', 'Message'));
 
+empty($config['price']['enabled']) ? $tickerupdate = false : $tickerupdate = $config['price']['enabled'];
+
 // Fetch latest coin price via API call
 $start = microtime(true);
-$message = 'Updated latest ' . $config['currency'] . ' price from ' . $config['price']['url'] . ' API';
-$status = 'OK';
-if ($price = $tools->getPrice()) {
-  if (!$setting->setValue('price', $price)) {
-    $message = 'Unable to store new price value: ' . $setting->getCronError();
+if ($tickerupdate) {
+  $message = 'Updated latest ' . $config['currency'] . ' price from ' . $config['price']['url'] . ' API';
+  $status = 'OK';
+  if ($price = $tools->getPrice()) {
+    if (!$setting->setValue('price', $price)) {
+      $message = 'Unable to store new price value: ' . $setting->getCronError();
+      $status = 'ERROR';
+    }
+  } else {
+    $message = 'Failed to fetch price from API: ' . $tools->getCronError();
     $status = 'ERROR';
   }
 } else {
-  $message = 'Failed to fetch price from API: ' . $tools->getCronError();
-  $status = 'ERROR';
+  $message = 'Tickerupdate is disabled';
+  $status = 'OK';
+  $price = 0;
 }
 $log->logInfo(sprintf($strLogMask, 'Price Update', $price, number_format(microtime(true) - $start, 3), $status, $message));
 

public/include/admin_checks.php

@@ -127,16 +127,16 @@
 
   // display the errors
   foreach ($enotice as $en) {
-    $_SESSION['POPUP'][] = array('CONTENT' => $en, 'TYPE' => 'info');
+    $_SESSION['POPUP'][] = array('CONTENT' => $en, 'TYPE' => 'alert alert-info');
   }
   if (!count($notice) && !count($error)) {
-    $_SESSION['POPUP'][] = array('CONTENT' => 'The config options we checked seem OK', 'TYPE' => 'success');
+    $_SESSION['POPUP'][] = array('CONTENT' => 'The config options we checked seem OK', 'TYPE' => 'alert alert-success');
   } else {
     foreach ($notice as $n) {
-      $_SESSION['POPUP'][] = array('CONTENT' => $n, 'TYPE' => 'warning');
+      $_SESSION['POPUP'][] = array('CONTENT' => $n, 'TYPE' => 'alert alert-warning');
     }
     foreach ($error as $e) {
-      $_SESSION['POPUP'][] = array('CONTENT' => $e, 'TYPE' => 'errormsg');
+      $_SESSION['POPUP'][] = array('CONTENT' => $e, 'TYPE' => 'alert alert-danger');
     }
   }
 }

public/include/autoloader.inc.php

@@ -2,13 +2,6 @@
 (SECURITY == "*)WT#&YHfd" && SECHASH_CHECK) ? die("public/index.php -> Set a new SECURITY value to continue") : 0;
 $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
 
-// SHA/Scrypt check
-if (empty($config['algorithm']) || $config['algorithm'] == 'scrypt') {
-  $config['target_bits'] = 16;
-} else {
-  $config['target_bits'] = 32;
-}
-
 // Default classes
 require_once(INCLUDE_DIR . '/lib/KLogger.php');
 require_once(CLASS_DIR . '/logger.class.php');
@@ -20,24 +13,28 @@
 require_once(INCLUDE_DIR . '/config/memcache_keys.inc.php');
 require_once(INCLUDE_DIR . '/config/error_codes.inc.php');
 
-// We need to load these two first
+// We need to load these first
 require_once(CLASS_DIR . '/base.class.php');
+require_once(CLASS_DIR . '/coins/coin_base.class.php');
 require_once(CLASS_DIR . '/setting.class.php');
 
-// We need this one in here to properly set our theme
-require_once(INCLUDE_DIR . '/lib/Mobile_Detect.php');
+// Now decide on which coin class to load and instantiate
+if (file_exists(CLASS_DIR . '/coins/coin_' . $config['algorithm'] . '.class.php')) {
+  require_once(CLASS_DIR . '/coins/coin_' . $config['algorithm'] . '.class.php');
+  $coin = new Coin();
+  $coin->setConfig($config);
+} else {
+  die('Unable to load your coins class definition for ' . $config['algorithm']);
+}
 
 // Detect device
-if ($detect->isMobile() && $setting->getValue('website_mobile_theme')) {
-  // Set to mobile theme
-  $setting->getValue('website_mobile_theme') ? $theme = $setting->getValue('website_mobile_theme') : $theme = 'mobile';
-} else if ( PHP_SAPI == 'cli') {
+if ( PHP_SAPI == 'cli') {
   // Create a new compile folder just for crons
   // We call mail templates directly anyway
   $theme = 'cron';
 } else {
   // Use configured theme, fallback to default theme
-  $setting->getValue('website_theme') ? $theme = $setting->getValue('website_theme') : $theme = 'mpos';
+  $setting->getValue('website_theme') ? $theme = $setting->getValue('website_theme') : $theme = 'bootstrap';
 }
 define('THEME', $theme);
 
@@ -73,4 +70,4 @@
 require_once(INCLUDE_DIR . '/lib/Michelf/Markdown.php');
 require_once(INCLUDE_DIR . '/lib/scrypt.php');
 
-?>
+?>

public/include/bootstrap.php

@@ -11,11 +11,11 @@
 $quickstartlink = "<a href='https://github.com/MPOS/php-mpos/wiki/Quick-Start-Guide' title='MPOS Quick Start Guide'>Quick Start Guide</a>";
 
 // Include our configuration (holding defines for the requires)
-if (!include_once(BASEPATH . 'include/config/global.inc.dist.php')) die('Unable to load base global config - '.$quickstartlink);
-if (!@include_once(BASEPATH . 'include/config/global.inc.php')) die('Unable to load your global config - '.$quickstartlink);
+if (!include_once(BASEPATH . 'include/config/global.inc.dist.php')) die('Unable to load base global config from ['.BASEPATH . 'include/config/global.inc.dist.php' . '] - '.$quickstartlink);
+if (!@include_once(BASEPATH . 'include/config/global.inc.php')) die('Unable to load your global config from ['.BASEPATH . 'include/config/global.inc.php' . '] - '.$quickstartlink);
 
 // load our security configs
-if (!include_once(BASEPATH . 'include/config/security.inc.dist.php')) die('Unable to load base security config - '.$quickstartlink);
+if (!include_once(BASEPATH . 'include/config/security.inc.dist.php')) die('Unable to load base security config from ['.BASEPATH . 'include/config/security.inc.dist.php' . '] - '.$quickstartlink);
 if (@file_exists(BASEPATH . 'include/config/security.inc.php')) include_once(BASEPATH . 'include/config/security.inc.php');
 
 // start our session, we need it for smarty caching
@@ -36,4 +36,4 @@
 // We include all needed files here, even though our templates could load them themself
 require_once(INCLUDE_DIR . '/autoloader.inc.php');
 
-?>
+?>

public/include/classes/base.class.php

@@ -19,6 +19,9 @@ public function getTableName() {
   public function setDebug($debug) {
     $this->debug = $debug;
   }
+  public function setCoin($coin) {
+    $this->coin = $coin;
+  }
   public function setLog($log) {
     $this->log = $log;
   }

public/include/classes/coins/coin_base.class.php

@@ -0,0 +1,60 @@
+<?php
+$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
+
+
+/**
+ * Our coin base class that we extend our other coins from
+ *
+ * We are implementing all basic coin methods into this class but it
+ * must be extended for customized coins.
+ **/
+class CoinBase extends Base {
+  // Our coins target bits
+  protected $target_bits = NULL;
+
+  /**
+   * Read our target bits
+   **/
+  public function getTargetBits() {
+    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
+   * We use diff1 share values, not a baseline one
+   **/
+  public function calcHashrate($shares, $interval) {
+    return $shares * pow(2, $this->target_bits) / $interval / 1000;
+  }
+
+  /**
+   * Calculate estimated shares of this coin, this is using baseline
+   * according to our configuration difficulty
+   **/
+  public function calcEstaimtedShares($dDifficulty) {
+    return (int)round(pow(2, (32 - $this->target_bits)) * $dDifficulty, 0);
+  }
+
+  /**
+   * Calculate our networks expected time per block
+   **/
+  public function calcNetworkExpectedTimePerBlock($dDifficulty, $dNetworkHashrate) {
+    return pow(2, 32) * $dDifficulty / $dNetworkHashrate;
+  }
+  /**
+   * Calculate next expected difficulty based on current difficulty
+   **/
+  public function calcExpectedNextDifficulty($dDifficulty, $dNetworkHashrate) {
+    return round($dDifficulty * $this->config['cointarget'] / $this->calcNetworkExpectedTimePerBlock($dDifficulty, $dNetworkHashrate), 8);
+  }
+}
+
+?>