Merge pull request MPOS#1770 from iAmShorty/realbalance-wrapper

[FIX] return balance from main account
omagian · Feb 19, 2014 · 8cb42aa · 8cb42aa
2 parents 63a6672 + a67b7a9
commit 8cb42aa
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/cronjobs/payouts.php b/cronjobs/payouts.php
@@ -29,7 +29,7 @@
   $log->logInfo(" payouts disabled via admin panel");
   $monitoring->endCronjob($cron_name, 'E0009', 0, true, false);
 }
-$log->logDebug("Starting Payout...");
+$log->logInfo("Starting Payout...");
 if ($bitcoin->can_connect() !== true) {
   $log->logFatal(" unable to connect to RPC server, exiting");
   $monitoring->endCronjob($cron_name, 'E0006', 1, true);
@@ -44,6 +44,14 @@
 if (!$dWalletBalance = $bitcoin->getrealbalance())
   $dWalletBalance = 0;
 
+// Fetch unconfirmed amount from blocks table
+empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
+$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
+$dBlocksUnconfirmedBalance = 0;
+  if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
+
+$dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance;
+
 // Fetch outstanding manual-payouts
 $aManualPayouts = $transaction->getMPQueue($config['payout']['txlimit_manual']);
 
@@ -57,7 +65,8 @@
     $log->logError(" Wallet does not cover MP payouts - Payout: " . $dMPTotalAmount . " - Balance: " . $dWalletBalance);
     $monitoring->endCronjob($cron_name, 'E0079', 0, true);
   }
-
+
+  $log->logInfo("Manual Payout Sum: " . $dMPTotalAmount . " | Liquid Assets: " . $dWalletBalance . " | Wallet Balance: " . ($dWalletBalance + $dBlocksUnconfirmedBalance) . " | Unconfirmed: " . $dBlocksUnconfirmedBalance);
   $log->logInfo('  found ' . count($aManualPayouts) . ' queued manual payouts');
   $mask = '    | %-10.10s | %-25.25s | %-20.20s | %-40.40s | %-20.20s |';
   $log->logInfo(sprintf($mask, 'UserID', 'Username', 'Balance', 'Address', 'Payout ID'));
@@ -116,6 +125,14 @@
 if (!$dWalletBalance = $bitcoin->getrealbalance())
   $dWalletBalance = 0;
 
+// Fetch unconfirmed amount from blocks table
+empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
+$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
+$dBlocksUnconfirmedBalance = 0;
+  if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
+
+$dWalletBalance = $dWalletBalance - $dBlocksUnconfirmedBalance;
+
 // Fetch outstanding auto-payouts
 $aAutoPayouts = $transaction->getAPQueue($config['payout']['txlimit_auto']);
 
@@ -129,7 +146,8 @@
     $log->logError(" Wallet does not cover AP payouts - Payout: " . $dAPTotalAmount . " - Balance: " . $dWalletBalance);
     $monitoring->endCronjob($cron_name, 'E0079', 0, true);
   }
-
+
+  $log->logInfo("Auto Payout Sum: " . $dAPTotalAmount . " | Liquid Assets: " . $dWalletBalance . " | Wallet Balance: " . ($dWalletBalance + $dBlocksUnconfirmedBalance) . " | Unconfirmed: " . $dBlocksUnconfirmedBalance);
   $log->logInfo('  found ' . count($aAutoPayouts) . ' queued auto payouts');
   $mask = '    | %-10.10s | %-25.25s | %-20.20s | %-40.40s | %-20.20s |';
   $log->logInfo(sprintf($mask, 'UserID', 'Username', 'Balance', 'Address', 'Threshold'));

diff --git a/public/include/classes/bitcoinwrapper.class.php b/public/include/classes/bitcoinwrapper.class.php
@@ -47,9 +47,7 @@ public function getrealbalance() {
       return $dBalance;
     } else {
       $dMainBalance = $aAccounts[''];
-      if ($dMainBalance < 0) return $dMainBalance;
-      $dUnconfirmed = $dMainBalance - abs($dBalance);
-      return $dMainBalance - abs($dUnconfirmed);
+      return $dMainBalance;
     }
   }
   public function getdifficulty() {

diff --git a/public/templates/mpos/admin/wallet/default.tpl b/public/templates/mpos/admin/wallet/default.tpl
@@ -19,7 +19,7 @@
     </tr>
     <tr>
       <td align="left">Liquid Assets</td>
-      <td align="left">{($BALANCE - $LOCKED)|number_format:"8"}</td>
+      <td align="left">{($BALANCE - $LOCKED - $UNCONFIRMED)|number_format:"8"}</td>
     </tr>
 {if $NEWMINT >= 0}
     <tr>