Merge pull request #648 from TheSerapher/issue-145

Issue 145

Author: TheSerapher

cronjobs/pplns_payout.php

@@ -48,7 +48,7 @@
   if ($config['pplns']['shares']['type'] == 'blockavg' && $block->getBlockCount() > 0) {
     $pplns_target = round($block->getAvgBlockShares($config['pplns']['blockavg']['blockcount']));
   } else {
-    $pplns_target = $config['pplns']['shares']['default'] ;
+    $pplns_target = $config['pplns']['shares']['default'];
   }
 
   if (!$aBlock['accounted']) {
@@ -68,16 +68,21 @@
 
     if ($iRoundShares >= $pplns_target) {
       $log->logDebug("Matching or exceeding PPLNS target of $pplns_target with $iRoundShares");
-      $aAccountShares = $share->getSharesForAccounts($aBlock['share_id'] - $pplns_target, $aBlock['share_id']);
+      $iMinimumShareId = $share->getMinimumShareId($pplns_target, $aBlock['share_id']);
+      // We need to go one ID lower due to `id >` or we won't match if minimum share ID == $aBlock['share_id']
+      $aAccountShares = $share->getSharesForAccounts($iMinimumShareId - 1, $aBlock['share_id']);
       if (empty($aAccountShares)) {
         $log->logFatal("No shares found for this block, aborted! Block Height : " . $aBlock['height']);
         $monitoring->setStatus($cron_name . "_active", "yesno", 0); 
         $monitoring->setStatus($cron_name . "_message", "message", "No shares found for this block: " . $aBlock['height']);
         $monitoring->setStatus($cron_name . "_status", "okerror", 1); 
         exit(1);
       }
-      $log->logInfo('Adjusting round target to PPLNS target ' . $pplns_target);
-      $iRoundShares = $pplns_target;
+      foreach($aAccountShares as $key => $aData) {
+        $iNewRoundShares += $aData['valid'];
+      }
+      $log->logInfo('Adjusting round target to PPLNS target ' . $iNewRoundShares);
+      $iRoundShares = $iNewRoundShares;
     } else {
       $log->logDebug("Not able to match PPLNS target of $pplns_target with $iRoundShares");
       // We need to fill up with archived shares
@@ -156,6 +161,7 @@
           if (!$statistics->updateShareStatistics($aRoundData, $aBlock['id']))
             $log->logError('Failed to update share statistics for ' . $aData['username']);
       }
+
       // Add new credit transaction
       if (!$transaction->addTransaction($aData['id'], $aData['payout'], 'Credit', $aBlock['id']))
         $log->logFatal('Failed to insert new Credit transaction to database for ' . $aData['username']);

cronjobs/pps_payout.php

@@ -45,18 +45,29 @@
   exit(1);
 }
 
-// Value per share calculation
-if ($config['reward_type'] != 'block') {
-  $pps_value = round($config['reward'] / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12);
+// We support some dynamic reward targets but fall back to our fixed value
+// Re-calculate after each run due to re-targets in this loop
+if ($config['pps']['reward']['type'] == 'blockavg' && $block->getBlockCount() > 0) {
+  $pps_reward = round($block->getAvgBlockReward($config['pps']['blockavg']['blockcount']));
+  $log->logInfo("PPS reward using block average, amount: " . $pps_reward . "\tdifficulty: " . $dDifficulty);
 } else {
-  // Try to find the last block value and use that for future payouts, revert to fixed reward if none found
-  if ($aLastBlock = $block->getLast()) {
-    $pps_value = round($aLastBlock['amount'] / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12);
+  if ($config['pps']['reward']['type'] == 'block') {
+     if ($aLastBlock = $block->getLast()) {
+        $pps_reward = $aLastBlock['amount'];
+        $log->logInfo("PPS reward using last block, amount: " . $pps_reward . "\tdifficulty: " . $dDifficulty);
+     } else {
+       $pps_reward = $config['pps']['reward']['default'];
+       $log->logInfo("PPS reward using default, amount: " . $pps_reward . "\tdifficulty: " . $dDifficulty);
+     }
   } else {
-    $pps_value = round($config['reward'] / (pow(2,32) * $dDifficulty) * pow(2, $config['difficulty']), 12);
+     $pps_reward = $config['pps']['reward']['default'];
+     $log->logInfo("PPS reward fixed default, amount: " . $pps_reward . "\tdifficulty: " . $dDifficulty);
   }
 }
 
+// Per-share value to be paid out to users
+$pps_value = round($pps_reward / (pow(2,32) * $dDifficulty) * pow(2, $config['pps_target']), 12);
+
 // Find our last share accounted and last inserted share for PPS calculations
 $iPreviousShareId = $setting->getValue('pps_last_share_id');
 $iLastShareId = $share->getLastInsertedShareId();
@@ -87,7 +98,7 @@
     number_format($pps_value, 12) . "\t=\t" .
     number_format($aData['payout'], 8) . "\t" .
     number_format($aData['donation'], 8) . "\t" .
-    number_format($aData['fee']), 8);
+    number_format($aData['fee'], 8));
 
   // Add new credit transaction
   if (!$transaction->addTransaction($aData['id'], $aData['payout'], 'Credit_PPS'))
@@ -107,9 +118,7 @@
 
 // Fetch all unaccounted blocks
 $aAllBlocks = $block->getAllUnaccounted('ASC');
-if (empty($aAllBlocks)) {
-  $log->logDebug("No new unaccounted blocks found");
-}
+if (empty($aAllBlocks)) $log->logDebug("No new unaccounted blocks found");
 
 // Go through blocks and archive/delete shares that have been accounted for
 foreach ($aAllBlocks as $iIndex => $aBlock) {

public/include/classes/block.class.php

@@ -116,6 +116,18 @@ public function getAvgBlockShares($limit=1) {
     return false;
   }
 
+  /**
+   * Fetch our average rewards for the past N blocks
+   * @param limit int Maximum blocks to check
+   * @return data float Float value of average shares
+   **/
+  public function getAvgBlockReward($limit=1) {
+    $stmt = $this->mysqli->prepare("SELECT AVG(x.amount) AS average FROM (SELECT amount FROM $this->table ORDER BY height DESC LIMIT ?) AS x");
+    if ($this->checkStmt($stmt) && $stmt->bind_param('i', $limit) && $stmt->execute() && $result = $stmt->get_result())
+      return (float)$result->fetch_object()->average;
+    return false;
+  }
+
   /**
    * Fetch all unconfirmed blocks from table
    * @param confirmations int Required confirmations to consider block confirmed

public/include/classes/share.class.php

@@ -11,7 +11,7 @@ class Share {
   private $oUpstream;
   private $iLastUpstreamId;
   // This defines each share
-  public $rem_host, $username, $our_result, $upstream_result, $reason, $solution, $time;
+  public $rem_host, $username, $our_result, $upstream_result, $reason, $solution, $time, $difficulty;
 
   public function __construct($debug, $mysqli, $user, $block, $config) {
     $this->debug = $debug;
@@ -70,7 +70,7 @@ public function getLastInsertedShareId() {
    **/
   public function getRoundShares($previous_upstream=0, $current_upstream) {
     $stmt = $this->mysqli->prepare("SELECT
-      count(id) as total
+      ROUND(IFNULL(SUM(IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty)), 0) / POW(2, (" . $this->config['difficulty'] . " - 16)), 8) AS total
       FROM $this->table
       WHERE our_result = 'Y'
       AND id > ? AND id <= ?
@@ -98,8 +98,8 @@ public function getSharesForAccounts($previous_upstream=0, $current_upstream) {
         a.id,
         SUBSTRING_INDEX( s.username , '.', 1 ) as username,
         a.no_fees AS no_fees,
-        IFNULL(SUM(IF(our_result='Y', 1, 0)), 0) AS valid,
-        IFNULL(SUM(IF(our_result='N', 1, 0)), 0) AS invalid
+        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,
+        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
       FROM $this->table AS s
       LEFT JOIN " . $this->user->getTableName() . " AS a
       ON a.username = SUBSTRING_INDEX( s.username , '.', 1 )
@@ -140,15 +140,15 @@ function getMaxArchiveShareId() {
    * return array data Returns an array with usernames as keys for easy access
    **/
   function getArchiveShares($iCount) {
-    $iMinId = $this->getMaxArchiveShareId() - $iCount;
+    $iMinId = $this->getMinArchiveShareId($iCount);
     $iMaxId = $this->getMaxArchiveShareId();
     $stmt = $this->mysqli->prepare("
       SELECT
         a.id,
         SUBSTRING_INDEX( s.username , '.', 1 ) as account,
         a.no_fees AS no_fees,
-        IFNULL(SUM(IF(our_result='Y', 1, 0)), 0) AS valid,
-        IFNULL(SUM(IF(our_result='N', 1, 0)), 0) AS invalid
+        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,
+        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
       FROM $this->tableArchive AS s
       LEFT JOIN " . $this->user->getTableName() . " AS a
       ON a.username = SUBSTRING_INDEX( s.username , '.', 1 )
@@ -198,8 +198,8 @@ public function purgeArchive() {
    **/
   public function moveArchive($current_upstream, $block_id, $previous_upstream=0) {
     $archive_stmt = $this->mysqli->prepare("
-      INSERT INTO $this->tableArchive (share_id, username, our_result, upstream_result, block_id, time)
-        SELECT id, username, our_result, upstream_result, ?, time
+      INSERT INTO $this->tableArchive (share_id, username, our_result, upstream_result, block_id, time, difficulty)
+        SELECT id, username, our_result, upstream_result, ?, time, IF(difficulty=0, pow(2, (" . $this->config['difficulty'] . " - 16)), difficulty) AS difficulty
         FROM $this->table
         WHERE id > ? AND id <= ?");
     if ($this->checkStmt($archive_stmt) && $archive_stmt->bind_param('iii', $block_id, $previous_upstream, $current_upstream) && $archive_stmt->execute()) {
@@ -317,6 +317,48 @@ public function setUpstream($aBlock, $last=0) {
     return false;
   }
 
+  /**
+   * Fetch the lowest needed share ID from shares
+   **/
+  function getMinimumShareId($iCount, $current_upstream) {
+    // We don't use baseline here to be more accurate
+    $iCount = $iCount * pow(2, ($this->config['difficulty'] - 16));
+    $stmt = $this->mysqli->prepare("
+      SELECT MIN(b.id) AS id FROM
+      (
+        SELECT id, @total := @total + IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty) AS total
+        FROM $this->table, (SELECT @total := 0) AS a
+        WHERE our_result = 'Y'
+        AND id <= ? AND @total < ?
+        ORDER BY id DESC
+      ) AS b
+      WHERE total <= ?
+      ");
+    if ($this->checkStmt($stmt) && $stmt->bind_param('iii', $current_upstream, $iCount, $iCount) && $stmt->execute() && $result = $stmt->get_result())
+      return $result->fetch_object()->id;
+    return false;
+  }
+
+  /**
+   * Fetch the lowest needed share ID from archive
+   **/
+  function getMinArchiveShareId($iCount) {
+    $stmt = $this->mysqli->prepare("
+      SELECT MIN(b.share_id) AS share_id FROM
+      (
+        SELECT share_id, @total := @total + (IF(difficulty=0, POW(2, (" . $this->config['difficulty'] . " - 16)), difficulty) / POW(2, (" . $this->config['difficulty'] . " - 16))) AS total
+        FROM $this->tableArchive, (SELECT @total := 0) AS a
+        WHERE our_result = 'Y'
+        AND @total < ?
+        ORDER BY share_id DESC
+      ) AS b
+      WHERE total <= ?
+      ");
+    if ($this->checkStmt($stmt) && $stmt->bind_param('ii', $iCount, $iCount) && $stmt->execute() && $result = $stmt->get_result())
+      return $result->fetch_object()->share_id;
+    return false;
+  }
+
   /**
    * Helper function
    **/