Merge branch 'master' into assets

This commit is contained in:
arionum
2019-09-14 02:04:09 +03:00
committed by GitHub
5 changed files with 7 additions and 3 deletions

View File

@@ -475,8 +475,10 @@ elseif ($cmd == 'get-address') {
}
$rec=$db->single("SELECT SUM(val) FROM transactions WHERE (dst=:id or dst=:alias) AND (height<80000 OR version!=100) and version<111", [":id"=>$x['id'], ":alias"=>$alias]);
$releases=$db->single("SELECT COUNT(1) FROM transactions WHERE dst=:id AND version=103", [":id"=>$x['id']]);
if ($releases>0) { //masternode releases
$rec+=$releases*100000;
}
$spent=$db->single("SELECT SUM(val+fee) FROM transactions WHERE public_key=:pub AND version>0", [":pub"=>$x['public_key']]);
if ($spent==false) {