Merge branch 'dev' into danger

depends/packages/bdb.mk

@@ -14,7 +14,7 @@ ifneq ($(build_os),darwin)
 $(package)_config_opts_darwin=--disable-atomicsupport
 endif
 $(package)_config_opts_aarch64=--disable-atomicsupport
-$(package)_cxxflags=-std=c++11
+$(package)_cxxflags+=-std=c++11
 endef
 
 define $(package)_preprocess_cmds

depends/packages/boost.mk

@@ -22,7 +22,7 @@ $(package)_archiver_$(host_os)=$($(package)_ar)
 $(package)_toolset_darwin=gcc
 $(package)_archiver_darwin=$($(package)_ar)
 $(package)_config_libraries=chrono,filesystem,program_options,system,thread,test
-$(package)_cxxflags=-std=c++11 -fvisibility=hidden
+$(package)_cxxflags+=-std=c++11 -fvisibility=hidden
 $(package)_cxxflags_linux=-fPIC
 endef
 

src/wallet/rpcwallet.cpp

@@ -3310,6 +3310,7 @@ UniValue z_listreceivedaddress(const UniValue& params, bool fHelp,const CPubKey&
         "\nReturns received outputs.\n"
         "\n"
         "This function only returns information on addresses with full spending keys."
+        "This function is slow if no filters are given, use z_listreceivedbyaddress if you do not need filters."
         "\n"
         "\nArguments:\n"
         "1. \"hushaddress:\"            (string, required) \n"
@@ -3349,13 +3350,13 @@ UniValue z_listreceivedaddress(const UniValue& params, bool fHelp,const CPubKey&
         "   \"walletconflicts\": [conflicts],     An array of wallet conflicts\n"
         "   \"recieved\": {                       A list of receives from the transaction\n"
         "       \"transparentReceived\": [{           An Array of txos received for transparent addresses\n"
-        "           \"address\": \"zeroaddress\",         (string) Hush transparent address (t-address)\n"
+        "           \"address\": \"hushaddress\",         (string) Hush transparent address (t-address)\n"
         "           \"scriptPubKey\": \"script\",         (string) Script for the transparent address (t-address)\n"
         "           \"amount\": x.xxxx,                 (numeric) Value of output being received " + CURRENCY_UNIT + ", positive for receives\n"
         "           \"vout\": : n,                      (numeric) the vout value\n"
         "       }],\n"
         "       \"saplingReceived\": [{               An Array of utxos/notes received for sapling addresses\n"
-        "           \"address\": \"zeroaddress\",         (string) Shielded address (z-address)\n"
+        "           \"address\": \"hushaddress\",         (string) Shielded address (z-address)\n"
         "           \"amount\": x.xxxx,                 (numeric) Value of output being received " + CURRENCY_UNIT + ", positive for receives\n"
         "           \"memo\": xxxxx,            (string) hexademical string representation of memo field\n"
         "           \"memoStr\" : \"memo\",             (string) Only returned if memo contains valid UTF-8 text.\n"