From e2011a68b0815f3061eb1dded675726b25ad82d4 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Thu, 12 Sep 2013 08:30:34 +0200 Subject: [PATCH 1/4] [FIX] Unconfirmed Wallet Balance Fixes #646 --- public/include/pages/admin/wallet.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/include/pages/admin/wallet.inc.php b/public/include/pages/admin/wallet.inc.php index de201523..da7c5ed9 100644 --- a/public/include/pages/admin/wallet.inc.php +++ b/public/include/pages/admin/wallet.inc.php @@ -25,7 +25,8 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) { $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to wallet RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg'); } // Fetch unconfirmed amount from blocks table - $aBlocksUnconfirmed = $block->getAllUnconfirmed(); + empty($this->config['network_confirmations']) ? $confirmations = 120 : $confirmations = $this->config['network_confirmations']; + $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations); $dBlocksUnconfirmedBalance = 0; if (!empty($aBlocksUnconfirmed)) foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount']; From c20c9619a4627a53e9f26f5ba862bfbe94e45065 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Sat, 14 Sep 2013 09:37:08 +0200 Subject: [PATCH 2/4] Update wallet.inc.php --- public/include/pages/admin/wallet.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/pages/admin/wallet.inc.php b/public/include/pages/admin/wallet.inc.php index da7c5ed9..5ce4182a 100644 --- a/public/include/pages/admin/wallet.inc.php +++ b/public/include/pages/admin/wallet.inc.php @@ -25,7 +25,7 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) { $_SESSION['POPUP'][] = array('CONTENT' => 'Unable to connect to wallet RPC service: ' . $bitcoin->can_connect(), 'TYPE' => 'errormsg'); } // Fetch unconfirmed amount from blocks table - empty($this->config['network_confirmations']) ? $confirmations = 120 : $confirmations = $this->config['network_confirmations']; + empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations']; $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations); $dBlocksUnconfirmedBalance = 0; if (!empty($aBlocksUnconfirmed)) From 8ad5a234c06b892b8d4260217da7c5e2091d630b Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 16 Sep 2013 15:41:23 +0200 Subject: [PATCH 3/4] fixing website name in pub api --- public/include/pages/api/public.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/pages/api/public.inc.php b/public/include/pages/api/public.inc.php index 3fe69708..7e7c1f6e 100644 --- a/public/include/pages/api/public.inc.php +++ b/public/include/pages/api/public.inc.php @@ -15,7 +15,7 @@ $bitcoin->can_connect() === true ? $dNetworkHashrate = $bitcoin->query('getnetwo echo json_encode( array( - 'pool_name' => $config['website']['name'], + 'pool_name' => $setting->getValue('website_name'), 'hashrate' => $statistics->getCurrentHashrate(), 'workers' => $worker->getCountAllActiveWorkers(), 'shares_this_round' => $aShares['valid'], From 8abe371fbaa35d411c78e2f10993f4ab454df50a Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 16 Sep 2013 17:25:04 +0200 Subject: [PATCH 4/4] fixing cryptsy again, ty @Metice --- public/include/config/global.inc.dist.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php index 6bb31a2b..d2302b0c 100644 --- a/public/include/config/global.inc.dist.php +++ b/public/include/config/global.inc.dist.php @@ -78,9 +78,9 @@ $config['wallet']['password'] = 'testnet'; * currency = `BTC` * * Optional (cryptsy.com): - * url = `https://pubapi.cryptsy.com` - * target = `/api.php?method=marketdata` + * url = `http://pubapi.cryptsy.com` * currency = `BTC` + * target = `/api.php?method=marketdata` **/ $config['price']['url'] = 'https://btc-e.com'; $config['price']['target'] = '/api/2/ltc_usd/ticker';