getaddressbalance alos retunrs individual balances; version made 2.2.1

Author: a-ok123

configure.ac

@@ -1,9 +1,9 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
-define(_CLIENT_VERSION_MINOR, 3)
+define(_CLIENT_VERSION_MINOR, 2)
 define(_CLIENT_VERSION_REVISION, 1)
-define(_CLIENT_VERSION_BUILD, 0)
+define(_CLIENT_VERSION_BUILD, 50)
 define(_ZC_BUILD_VAL,
     m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD),
         m4_eval(_CLIENT_VERSION_BUILD < 50), 1, 

src/rpc/misc.cpp

@@ -810,8 +810,15 @@ Returns the balance for addresses.
 
 Result:
 {
-  "balance"  (string) The current balance in )" + MINOR_CURRENCY_UNIT + R"(
-  "received"  (string) The total number of )" + MINOR_CURRENCY_UNIT + R"( received (including change)
+  "addressess":
+    [
+      {
+        "address"     (string)  The base58check encoded address
+        "balance"     (string)  (string) The current balance of the address in )" + MINOR_CURRENCY_UNIT + R"(
+      }, ...
+    ],
+  "balance"  (string) The total current balance in )" + MINOR_CURRENCY_UNIT + R"(on all addresses in the request
+  "received"  (string) The total number of )" + MINOR_CURRENCY_UNIT + R"( received (including change) by all addresses in the request
 }
 
 Examples:
@@ -827,6 +834,8 @@ Returns the balance for addresses.
     // to zero (full range, entire blockchain)
     getAddressesInHeightRange(params, make_tuple(0, 0), vAddresses, vAddressIndex);
 
+    UniValue addresses(UniValue::VARR);
+    addresses.reserve(vAddressIndex.size());
     CAmount balance = 0;
     CAmount received = 0;
     for (const auto& it : vAddressIndex)
@@ -835,8 +844,21 @@ Returns the balance for addresses.
             received += it.second;
 
         balance += it.second;
+
+        string address;
+        auto scriptTypeOpt = toScriptType(it.first.type);
+        if (!scriptTypeOpt)
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown script type");
+        if (!getAddressFromIndex(scriptTypeOpt.value(), it.first.hashBytes, address))
+            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Unknown address type");
+
+        UniValue addr_obj(UniValue::VOBJ);
+        addr_obj.pushKV("address", address);
+        addr_obj.pushKV("balance", it.first.index);
+        addresses.push_back(addr_obj);
     }
     UniValue result(UniValue::VOBJ);
+    result.pushKV("deltas", addresses);
     result.pushKV("balance", balance);
     result.pushKV("received", received);
     return result;