Merge pull request #2274 from MPOS/development

UPDATE : Development to Master

Author: TheSerapher

.gitignore

@@ -18,6 +18,10 @@
 /include/config/global.inc.scrypt.php
 /include/config/global.inc.sha.php
 
+# Test files
+/scripts/test.php
+/cronjobs/test.php
+
 # IDE Settings
 /.idea/*
 .buildpath

cronjobs/findblock.php

@@ -59,7 +59,7 @@
       $config['reward_type'] == 'block' ? $aData['amount'] = $aData['amount'] : $aData['amount'] = $config['reward'];
       $aData['height'] = $aBlockRPCInfo['height'];
       $aTxDetails = $bitcoin->gettransaction($aBlockRPCInfo['tx'][0]);
-      if (!isset($aBlockRPCInfo['confirmations'])) {
+      if (isset($aBlockRPCInfo['confirmations'])) {
         $aData['confirmations'] = $aBlockRPCInfo['confirmations'];
       } else if (isset($aTxDetails['confirmations'])) {
         $aData['confirmations'] = $aTxDetails['confirmations'];

cronjobs/statistics.php

@@ -27,7 +27,7 @@
 
 // Header
 $log->logInfo('Running statistical queries, errors may just mean no shares were available');
-$strLogMask = "| %-26.26s | %8.8s | %-6.6s |";
+$strLogMask = "| %-33.33s | %8.8s | %-6.6s |";
 $log->logInfo(sprintf($strLogMask, 'Method', 'Runtime', 'Status'));
 
 // Per user share statistics based on all shares submitted
@@ -37,9 +37,15 @@
 
 // Get all user hashrate statistics for caching
 $start = microtime(true);
-$statistics->getAllUserMiningStats() ? $status = 'OK' : $status = 'ERROR';
-$log->logInfo(sprintf($strLogMask, 'getAllUserMiningStats', number_format(microtime(true) - $start, 3), $status));
+$statistics->fetchAllUserMiningStats() ? $status = 'OK' : $status = 'ERROR';
+$log->logInfo(sprintf($strLogMask, 'fetchAllUserMiningStats', number_format(microtime(true) - $start, 3), $status));
 
+// Store our statistical data into our `statistics_users` table
+$start = microtime(true);
+$statistics->storeAllUserMiningStatsSnapshot($statistics->getAllUserMiningStats()) ? $status = 'OK' : $status = 'ERROR';
+$log->logInfo(sprintf($strLogMask, 'storeAllUserMiningStatsSnapshot', number_format(microtime(true) - $start, 3), $status));
+
+// Get stats for pool overview
 $start = microtime(true);
 $statistics->getTopContributors('hashes') ? $status = 'OK' : $status = 'ERROR';
 $log->logInfo(sprintf($strLogMask, 'getTopContributors(hashes)', number_format(microtime(true) - $start, 3), $status));

cronjobs/tables_cleanup.php

@@ -65,14 +65,27 @@
 $message = '';
 $affected = $share->purgeArchive();
 if ($affected === false) {
-  $message = 'Failed to delete notifications: ' . $oToken->getCronError();
+  $message = 'Failed to delete shares: ' . $share->getCronError();
   $status = 'ERROR';
   $monitoring->endCronjob($cron_name, 'E0008', 0, false, false);
 } else {
   $affected == 0 ? $message = 'No shares deleted' : $message = 'Deleted old shares';
 }
 $log->logInfo(sprintf($strLogMask, 'purgeArchive', $affected, number_format(microtime(true) - $start, 3), $status, $message));
 
+// Clenaup shares archive
+$start = microtime(true);
+$status = 'OK';
+$message = '';
+$affected = $statistics->purgeUserStats($setting->getValue('statistics_graphing_days', 1));
+if ($affected === false) {
+  $message = 'Failed to delete entries: ' . $statistics->getCronError();
+  $status = 'ERROR';
+  $monitoring->endCronjob($cron_name, 'E0008', 0, false, false);
+} else {
+  $affected == 0 ? $message = 'No entries deleted' : $message = 'Deleted old entries';
+}
+$log->logInfo(sprintf($strLogMask, 'purgeUserStats', $affected, number_format(microtime(true) - $start, 3), $status, $message));
 
 // Cron cleanup and monitoring
 require_once('cron_end.inc.php');

include/autoloader.inc.php

@@ -16,6 +16,7 @@
 // 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 . '/coin_address.class.php');
 require_once(CLASS_DIR . '/setting.class.php');
 require_once(INCLUDE_DIR . '/version.inc.php');
 if (PHP_OS == 'WINNT') require_once(CLASS_DIR . '/memcached.class.php');

include/classes/base.class.php

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

include/classes/coin_address.class.php

@@ -0,0 +1,107 @@
+<?php
+$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
+
+class CoinAddress extends Base {
+  protected $table = 'coin_addresses';
+  private $cache = array();
+
+  /**
+   * Fetch users coin address for a currency
+   * @param userID int UserID
+   * @return data string Coin Address
+   **/
+  public function getCoinAddress($userID, $currency=NULL) {
+    if ($currency === NULL) $currency = $this->config['currency'];
+    $this->debug->append("STA " . __METHOD__, 4);
+    $stmt = $this->mysqli->prepare("
+      SELECT coin_address
+      FROM " . $this->getTableName() . "
+      WHERE account_id = ? AND currency = ?
+      ");
+    if ( $this->checkStmt($stmt) && $stmt->bind_param('is', $userID, $currency) && $stmt->execute() && $result = $stmt->get_result()) {
+      if ($result->num_rows == 1) {
+        return $result->fetch_object()->coin_address;
+      }
+    }
+    $this->debug->append("Unable to fetch users coin address for " . $currency);
+    return $this->sqlError();
+  }
+
+  /**
+   * Check if a coin address is already set
+   * @param address string Coin Address to check for
+   * @return bool true or false
+   **/
+  public function existsCoinAddress($address) {
+    $this->debug->append("STA " . __METHOD__, 4);
+    return $this->getSingle($address, 'coin_address', 'coin_address', 's') === $address;
+  }
+
+  /**
+   * Add a new coin address record for a user
+   * @param userID int Account ID
+   * @param address string Coin Address
+   * @param currency string Currency short handle, defaults to config option
+   * @return bool true or false
+   **/
+  public function add($userID, $address, $currency=NULL) {
+    if ($currency === NULL) $currency = $this->config['currency'];
+    if ($address != $this->getCoinAddress($userID) && $this->existsCoinAddress($address)) {
+      $this->setErrorMessage('Unable to update coin address, address already exists');
+      return false;
+    }
+    $stmt = $this->mysqli->prepare("INSERT INTO " . $this->getTableName() . " (account_id, currency, coin_address) VALUES (?, ?, ?)");
+    if ( $this->checkStmt($stmt) && $stmt->bind_param('iss', $userID, $currency, $address) && $stmt->execute()) {
+      return true;
+    }
+    return $this->sqlError();
+  }
+
+  /**
+   * Remove a coin address record for a user
+   * @param userID int Account ID
+   * @param currency string Currency short handle, defaults to config option
+   * @return bool true or false
+   **/
+  public function remove ($userID, $currency=NULL) {
+    if ($currency === NULL) $currency = $this->config['currency'];
+    $stmt = $this->mysqli->prepare("DELETE FROM " . $this->getTableName() . " WHERE account_id = ? AND currency = ?");
+    if ( $this->checkStmt($stmt) && $stmt->bind_param('is', $userID, $currency) && $stmt->execute()) {
+      return true;
+    }
+    return $this->sqlError();
+  }
+
+  /**
+   * Update a coin address record for a user and a currency
+   * @param userID int Account ID
+   * @param address string Coin Address
+   * @param currency string Currency short handle, defaults to config option
+   * @return bool true or false
+   **/
+  public function update($userID, $address, $currency=NULL) {
+    if ($currency === NULL) $currency = $this->config['currency'];
+    if ($address != $this->getCoinAddress($userID) && $this->existsCoinAddress($address)) {
+      $this->setErrorMessage('Unable to update coin address, address already exists');
+      return false;
+    }
+    if ($this->getCoinAddress($userID) != NULL) {
+      $stmt = $this->mysqli->prepare("UPDATE " . $this->getTableName() . " SET coin_address = ? WHERE account_id = ? AND currency = ?");
+      if ( $this->checkStmt($stmt) && $stmt->bind_param('sis', $address, $userID, $currency) && $stmt->execute()) {
+        return true;
+      }
+    } else {
+      $stmt = $this->mysqli->prepare("INSERT INTO " . $this->getTableName() . " (coin_address, account_id, currency) VALUES (?, ?, ?)");
+      if ( $this->checkStmt($stmt) && $stmt->bind_param('sis', $address, $userID, $currency) && $stmt->execute()) {
+        return true;
+      }
+    }
+    return $this->sqlError();
+  }
+}
+
+$coin_address = new CoinAddress();
+$coin_address->setDebug($debug);
+$coin_address->setConfig($config);
+$coin_address->setMysql($mysqli);
+$coin_address->setErrorCodes($aErrorCodes);

include/classes/coins/coin_base.class.php

@@ -12,13 +12,23 @@ class CoinBase extends Base {
   // Our coins target bits
   protected $target_bits = NULL;
 
+  // Our coins share difficulty precision
+  protected $share_difficulty_precision = 0;
+
   /**
    * Read our target bits
    **/
   public function getTargetBits() {
     return $this->target_bits;
   }
 
+  /**
+   * Read our share difficulty precision
+   **/
+  public function getShareDifficultyPrecision() {
+    return $this->share_difficulty_precision;
+  }
+
   /**
    * Calculate the PPS value for this coin
    * WARNING: Get this wrong and you will over- or underpay your miners!

include/classes/coins/coin_x11.class.php

@@ -8,6 +8,7 @@
  **/
 class Coin extends CoinBase {
   protected $target_bits = 24;
+  protected $share_difficulty_precision = 4;
 }
 
 ?>