diff --git a/api.php b/api.php index 6903231..6f0fd95 100755 --- a/api.php +++ b/api.php @@ -185,7 +185,7 @@ if ($q == "getAddress") { * * @apiParam {string} [public_key] Public key * @apiParam {string} [account] Account id / address - * @apiParam {numeric} [limit] Number of confirmed transactions, max 1000, min 1 + * @apiParam {numeric} [limit] Number of confirmed transactions, max 100, min 1 * * @apiSuccess {string} block Block ID * @apiSuccess {numeric} confirmation Number of confirmations diff --git a/doc/api_data.js b/doc/api_data.js index 8a4e33b..067ccac 100644 --- a/doc/api_data.js +++ b/doc/api_data.js @@ -905,7 +905,7 @@ define({ "api": [ "type": "numeric", "optional": true, "field": "limit", - "description": "

Number of confirmed transactions, max 1000, min 1

" + "description": "

Number of confirmed transactions, max 100, min 1

" } ] } diff --git a/doc/api_data.json b/doc/api_data.json index 834cc7e..2a491d7 100644 --- a/doc/api_data.json +++ b/doc/api_data.json @@ -905,7 +905,7 @@ "type": "numeric", "optional": true, "field": "limit", - "description": "

Number of confirmed transactions, max 1000, min 1

" + "description": "

Number of confirmed transactions, max 100, min 1

" } ] } diff --git a/sanity.php b/sanity.php index d6a6b4b..a2c7251 100755 --- a/sanity.php +++ b/sanity.php @@ -647,6 +647,7 @@ if ($current['height'] < $largest_height && $largest_height > 1) { $resyncing=true; } + // needs to be redone due to the assets // if ($resyncing==true) { // _log("Resyncing accounts"); @@ -682,6 +683,7 @@ if ($current['height'] < $largest_height && $largest_height > 1) { // $db->run("DELETE FROM masternode WHERE height>:h", [":h"=>$current['height']]); // $db->exec("UNLOCK TABLES"); // } + } } diff --git a/util.php b/util.php index de9c54e..76e1a96 100755 --- a/util.php +++ b/util.php @@ -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) {