From 0639af54b3c0b5f48552a5276ec3a83ac55c9a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Uslu?= Date: Fri, 24 Jan 2014 00:37:50 +0200 Subject: [PATCH 1/2] Added reward_type and reward info to api/getpoolinfo --- public/include/pages/api/getpoolinfo.inc.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/public/include/pages/api/getpoolinfo.inc.php b/public/include/pages/api/getpoolinfo.inc.php index 0fbd8b37..4084ca8a 100644 --- a/public/include/pages/api/getpoolinfo.inc.php +++ b/public/include/pages/api/getpoolinfo.inc.php @@ -22,13 +22,15 @@ $data = array( 'stratumport' => $config[gettingstarted][stratumport], // payments 'payout_system' => $config[payout_system], - 'confirmations' => $config['confirmations'], + 'confirmations' => $config['confirmations'], 'min_ap_threshold' => $config[ap_threshold][min], 'max_ap_threshold' => $config[ap_threshold][max], - // backwards compatibility for old API calls - 'txfee' => $config['txfee_manual'], - 'txfee_manual' => $config['txfee_manual'], - 'txfee_auto' => $config['txfee_auto'], + 'reward_type' => $config[payout_system] == 'pps' ? $config['pps']['reward']['type'] : $config['reward_type'], + 'reward' => $config[payout_system] == 'pps' ? $config['pps']['reward']['default'] : $config['reward'], + // fees + 'txfee' => $config['txfee_manual'], // make it backwards compatible + 'txfee_manual' => $config['txfee_manual'], + 'txfee_auto' => $config['txfee_auto'], 'fees' => $config[fees] ); From b518ce0799779af07b7a2fb17eb553332e30b160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20Uslu?= Date: Fri, 24 Jan 2014 00:38:28 +0200 Subject: [PATCH 2/2] Tiny update. --- public/include/pages/api/getpoolinfo.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/include/pages/api/getpoolinfo.inc.php b/public/include/pages/api/getpoolinfo.inc.php index 4084ca8a..66d87004 100644 --- a/public/include/pages/api/getpoolinfo.inc.php +++ b/public/include/pages/api/getpoolinfo.inc.php @@ -22,15 +22,15 @@ $data = array( 'stratumport' => $config[gettingstarted][stratumport], // payments 'payout_system' => $config[payout_system], - 'confirmations' => $config['confirmations'], + 'confirmations' => $config[confirmations], 'min_ap_threshold' => $config[ap_threshold][min], 'max_ap_threshold' => $config[ap_threshold][max], 'reward_type' => $config[payout_system] == 'pps' ? $config['pps']['reward']['type'] : $config['reward_type'], 'reward' => $config[payout_system] == 'pps' ? $config['pps']['reward']['default'] : $config['reward'], // fees - 'txfee' => $config['txfee_manual'], // make it backwards compatible - 'txfee_manual' => $config['txfee_manual'], - 'txfee_auto' => $config['txfee_auto'], + 'txfee' => $config[txfee_manual], // make it backwards compatible + 'txfee_manual' => $config[txfee_manual], + 'txfee_auto' => $config[txfee_auto], 'fees' => $config[fees] );