diff --git a/web/yaamp/defaultconfig.php b/web/yaamp/defaultconfig.php index 589c11e..71e89b7 100644 --- a/web/yaamp/defaultconfig.php +++ b/web/yaamp/defaultconfig.php @@ -48,6 +48,8 @@ if (!defined('EXCH_STOCKSEXCHANGE_KEY')) define('EXCH_STOCKSEXCHANGE_KEY', ''); if (!defined('YAAMP_BTCADDRESS')) define('YAAMP_BTCADDRESS', ''); if (!defined('YAAMP_SITE_URL')) define('YAAMP_SITE_URL', 'localhost'); if (!defined('YAAMP_API_URL')) define('YAAMP_API_URL', YAAMP_SITE_URL); +if (!defined('YAAMP_API_PAYOUTS')) define('YAAMP_API_PAYOUTS', false); +if (!defined('YAAMP_API_PAYOUTS_PERIOD')) define('YAAMP_API_PAYOUTS_PERIOD', 24 * 60 * 60); if (!defined('YAAMP_STRATUM_URL')) define('YAAMP_STRATUM_URL', YAAMP_SITE_URL); if (!defined('YAAMP_SITE_NAME')) define('YAAMP_SITE_NAME', 'YiiMP'); if (!defined('YAAMP_DEFAULT_ALGO')) define('YAAMP_DEFAULT_ALGO', 'x11'); diff --git a/web/yaamp/modules/api/ApiController.php b/web/yaamp/modules/api/ApiController.php index d1217c5..b6a7f05 100644 --- a/web/yaamp/modules/api/ApiController.php +++ b/web/yaamp/modules/api/ApiController.php @@ -284,6 +284,29 @@ class ApiController extends CommonController } echo "]"; + + if(YAAMP_API_PAYOUTS) + { + $json_payouts = controller()->memcache->get("api_payouts-$user->id"); + if (empty($json_payouts)) { + $json_payouts = ",\"payouts\": "; + $json_payouts .= "["; + $list = getdbolist('db_payouts', "account_id={$user->id} AND completed>0 AND tx IS NOT NULL AND time >= ".(time() - YAAMP_API_PAYOUTS_PERIOD)." ORDER BY time DESC"); + foreach($list as $j => payout) + { + if($j) $json_payouts .= ", "; + $json_payouts .= "{"; + $json_payouts .= "\"time\": \"$payout->time\","; + $json_payouts .= "\"amount\": \"$payout->amount\","; + $json_payouts .= "\"tx\": \"$payout->tx\""; + $json_payouts .= "}"; + } + $json_payouts .= "]"; + controller()->memcache->set("api_payouts-$user->id", $json_payouts, 60, MEMCACHE_COMPRESSED); + } + echo str_replace("},","},\n", $json_payouts); + } + echo "}"; } diff --git a/web/yaamp/modules/site/api.php b/web/yaamp/modules/site/api.php index 2a7520b..0c84881 100644 --- a/web/yaamp/modules/site/api.php +++ b/web/yaamp/modules/site/api.php @@ -45,9 +45,19 @@ result: "accepted": 82463372.083, "rejected": 0 }] + + "payouts":[{ + "time": "1529860641", + "amount": "0.001", + "tx": "transaction_id_of_the_payout" + }] + } - +
Pool Status
request: