sido/node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add mining rewards to getBlockTransactions - review fixes

Browse Source
This commit is contained in:
bogdanadnan
2019-02-08 12:31:49 +02:00
parent 12fa045ba3
commit d1af58ccf9
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api.php
View File

@@ -362,11 +362,10 @@ if ($q == "getAddress") {
*/ */
$height = san($data['height']); $height = san($data['height']);
$block = san($data['block']); $block = san($data['block']);
$includeMiningRewards = san($data['includeMiningRewards'] ?? ''); $includeMiningRewards = (
if(empty($includeMiningRewards) || $includeMiningRewards == '0' || $includeMiningRewards == 'false') isset($data['includeMiningRewards']) &&
$includeMiningRewards = false; !($data['includeMiningRewards'] === '0' || $data['includeMiningRewards'] === 'false')
else );
$includeMiningRewards = true;
$ret = $trx->get_transactions($height, $block, $includeMiningRewards); $ret = $trx->get_transactions($height, $block, $includeMiningRewards);

6
include/transaction.inc.php
View File

@@ -612,11 +612,11 @@ class Transaction
if (empty($id) && empty($height)) { if (empty($id) && empty($height)) {
return false; return false;
} }
$version_limit = $includeMiningRewards ? 0 : 1; $versionLimit = $includeMiningRewards ? 0 : 1;
if (!empty($id)) { if (!empty($id)) {
$r = $db->run("SELECT * FROM transactions WHERE block=:id AND version >= :version", [":id" => $id, ":version" => $version_limit]); $r = $db->run("SELECT * FROM transactions WHERE block=:id AND version >= :version", [":id" => $id, ":version" => $versionLimit]);
} else { } else {
$r = $db->run("SELECT * FROM transactions WHERE height=:height AND version >= :version", [":height" => $height, ":version" => $version_limit]); $r = $db->run("SELECT * FROM transactions WHERE height=:height AND version >= :version", [":height" => $height, ":version" => $versionLimit]);
} }
$res = []; $res = [];
foreach ($r as $x) { foreach ($r as $x) {