Merge pull request #1560 from raistlinthewiz/next

Added reward_type and reward info to api/getpoolinfo
This commit is contained in:
Sebastian Grewe 2014-01-23 23:09:06 -08:00
commit f75200ce1e

View File

@ -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]
);