From 1c24820735987031931270e070bffc1e648568aa Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Thu, 22 Aug 2013 11:45:40 +0200 Subject: [PATCH] Adding network_confirmations to configuration * Added new configuration option `$config['network_confirmations']` to dist config * Default to 120 if not set This will allow us to define a different confirmation level for user transactions but still display blocks at their approriate unconfirmed value when displaying them in the wallet information for admins. Risky for pool owners but still a viable option. Fixes #610 --- public/include/classes/block.class.php | 3 ++- public/include/config/global.inc.dist.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/include/classes/block.class.php b/public/include/classes/block.class.php index e6a8fc6d..d98b753c 100644 --- a/public/include/classes/block.class.php +++ b/public/include/classes/block.class.php @@ -123,7 +123,8 @@ class Block { **/ public function getAllUnconfirmed() { $stmt = $this->mysqli->prepare("SELECT * FROM $this->table WHERE confirmations < ? AND confirmations > -1"); - if ($this->checkStmt($stmt) && $stmt->bind_param("i", $this->config['confirmations']) && $stmt->execute() && $result = $stmt->get_result()) + empty($this->config['network_confirmations']) ? $confirmations = 120 : $confirmations = $this->config['network_confirmations']; + if ($this->checkStmt($stmt) && $stmt->bind_param("i", $confirmations) && $stmt->execute() && $result = $stmt->get_result()) return $result->fetch_all(MYSQLI_ASSOC); return false; } diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php index 265dfc7a..ef51043d 100644 --- a/public/include/config/global.inc.dist.php +++ b/public/include/config/global.inc.dist.php @@ -349,7 +349,8 @@ $config['reward'] = 50; // Confirmations per block required to credit transactions, default: 120 $config['confirmations'] = 120; - +// Confirmations per block required in network to confirm its transactions, default: 120 +$config['network_confirmations'] = 120; /** * Memcache configuration