Merge pull request #2084 from bitshares/release

Preparing test-4.0.4 release

libraries/chain/db_debug.cpp

@@ -26,6 +26,7 @@
 
 #include <graphene/chain/account_object.hpp>
 #include <graphene/chain/asset_object.hpp>
+#include <graphene/chain/htlc_object.hpp>
 #include <graphene/chain/market_object.hpp>
 #include <graphene/chain/vesting_balance_object.hpp>
 #include <graphene/chain/witness_object.hpp>
@@ -46,6 +47,7 @@ void database::debug_dump()
    const auto& statistics_index = db.get_index_type<account_stats_index>().indices();
    const auto& bids = db.get_index_type<collateral_bid_index>().indices();
    const auto& settle_index = db.get_index_type<force_settlement_index>().indices();
+   const auto& htlcs = db.get_index_type<htlc_index>().indices();
    map<asset_id_type,share_type> total_balances;
    map<asset_id_type,share_type> total_debts;
    share_type core_in_orders;
@@ -92,6 +94,8 @@ void database::debug_dump()
       total_balances[asset_id_type()] += asset_obj.dynamic_asset_data_id(db).fee_pool;
 //      edump((total_balances[asset_obj.id])(asset_obj.dynamic_asset_data_id(db).current_supply ) );
    }
+   for( const auto& htlc : htlcs )
+      total_balances[htlc.transfer.asset_id] += htlc.transfer.amount;
 
    if( total_balances[asset_id_type()].value != core_asset_data.current_supply.value )
    {

libraries/wallet/include/graphene/wallet/wallet.hpp

@@ -1770,8 +1770,7 @@ class wallet_api
       /**
        * Get \c account_storage_object of an account by using the custom operations plugin.
        *
-       * Storage data added to the map with @ref account_store_map and list data added by
-       * @ref account_list_accounts will be returned.
+       * Storage data added to the map with @ref account_store_map will be returned.
        *
        * @param account Account ID or name to get contact data from.
        * @param catalog The catalog to retrieve.