Find ALL transactions, even unconfirmed

* This ensures that credits are not unlocked and available to the pool
This commit is contained in:
Sebastian Grewe 2013-06-04 14:28:34 +02:00
parent 91d225e340
commit af3252abb2

View File

@ -130,6 +130,7 @@ class Transaction {
/** /**
* Get total balance for all users locked in wallet * Get total balance for all users locked in wallet
* This includes any outstanding unconfirmed transactions!
* @param none * @param none
* @return data double Amount locked for users * @return data double Amount locked for users
**/ **/
@ -141,9 +142,7 @@ class Transaction {
( (
SELECT sum(t.amount) AS credit SELECT sum(t.amount) AS credit
FROM $this->table AS t FROM $this->table AS t
LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id
WHERE t.type = 'Credit' WHERE t.type = 'Credit'
AND b.confirmations >= ?
) AS t1, ) AS t1,
( (
SELECT sum(t.amount) AS debit SELECT sum(t.amount) AS debit
@ -152,12 +151,10 @@ class Transaction {
) AS t2, ) AS t2,
( (
SELECT sum(t.amount) AS other SELECT sum(t.amount) AS other
FROM transactions AS t FROM " . $this->table . " AS t
LEFT JOIN " . $this->block->getTableName() . " AS b ON t.block_id = b.id
WHERE t.type IN ('Donation','Fee') WHERE t.type IN ('Donation','Fee')
AND b.confirmations >= ?
) AS t3"); ) AS t3");
if ($this->checkStmt($stmt) && $stmt->bind_param('ii', $this->config['confirmations'], $this->config['confirmations']) && $stmt->execute() && $stmt->bind_result($dBalance) && $stmt->fetch()) if ($this->checkStmt($stmt) && $stmt->execute() && $stmt->bind_result($dBalance) && $stmt->fetch())
return $dBalance; return $dBalance;
// Catchall // Catchall
$this->setErrorMessage('Unable to find locked credits for all users'); $this->setErrorMessage('Unable to find locked credits for all users');