Merge pull request #2123 from bitshares/jmj_releas_hardfork

Merge release branch to hardfork

Author: abitmore

.travis.yml

@@ -1,6 +1,9 @@
 language: c++
 
-cache: ccache
+cache:
+  ccache: true
+  directories:
+  - sonar_cache
 
 git:
   depth: 1

README.md

@@ -16,7 +16,7 @@ BitShares Core
 * [License](#license)
 
 BitShares Core is the BitShares blockchain implementation and command-line interface.
-The web wallet is [BitShares UI](https://github.com/bitshares/bitshares-ui).
+The web browser based wallet is [BitShares UI](https://github.com/bitshares/bitshares-ui).
 
 Visit [BitShares.org](https://bitshares.org/) to learn about BitShares and join the community at [BitSharesTalk.org](https://bitsharestalk.org/).
 
@@ -31,7 +31,7 @@ Build instructions and additional documentation are available in the
 
 We recommend building on Ubuntu 16.04 LTS (64-bit) 
 
-**Build Dependencies**:
+**Build Dependencies:**
 
     sudo apt-get update
     sudo apt-get install autoconf cmake make automake libtool git libboost-all-dev libssl-dev g++ libcurl4-openssl-dev
@@ -45,7 +45,7 @@ We recommend building on Ubuntu 16.04 LTS (64-bit)
     cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
     make
 
-**Upgrade Script** (prepend to the Build Script above if you built a prior release):
+**Upgrade Script:** (prepend to the Build Script above if you built a prior release):
 
     git remote set-url origin https://github.com/bitshares/bitshares-core.git
     git checkout master
@@ -95,6 +95,13 @@ Set your inital password:
     >>> set_password <PASSWORD>
     >>> unlock <PASSWORD>
 
+**IMPORTANT:** The cli_wallet or API interfaces to the witness node wouldn't be fully functional unless the witness node is fully synchronized with the blockchain. The cli_wallet command `info` will show result `head_block_age` which will tell you how far you are from the live current block of the blockchain.
+
+
+To check your current block:
+
+    >>> info
+
 To import your initial balance:
 
     >>> import_balance <ACCOUNT NAME> [<WIF_KEY>] true

docker/default_config.ini

@@ -164,7 +164,7 @@ enable-stale-production = false
 partial-operations = true
 
 # Maximum number of operations per account will be kept in memory
-max-ops-per-account = 1000
+max-ops-per-account = 100
 
 
 # ==============================================================================

libraries/app/api.cpp

@@ -302,7 +302,7 @@ namespace graphene { namespace app {
        return *_debug_api;
     }
 
-    fc::api<custom_operations_api> login_api::custom() const
+    fc::api<custom_operations_api> login_api::custom_operations() const
     {
        FC_ASSERT(_custom_operations_api);
        return *_custom_operations_api;
@@ -676,7 +676,7 @@ namespace graphene { namespace app {
          max_price = std::max( std::min( max_price, *start ), min_price );
 
       auto itr = limit_groups.lower_bound( limit_order_group_key( group, max_price ) );
-      // use an end itrator to try to avoid expensive price comparison
+      // use an end iterator to try to avoid expensive price comparison
       auto end = limit_groups.upper_bound( limit_order_group_key( group, min_price ) );
       while( itr != end && result.size() < limit )
       {
@@ -696,12 +696,10 @@ namespace graphene { namespace app {
       const auto account_id = database_api.get_account_id_from_string(account_id_or_name);
       vector<account_storage_object> results;
       const auto& storage_index = _app.chain_database()->get_index_type<account_storage_index>();
-      const auto& by_account_catalog_idx = storage_index.indices().get<by_account_catalog>();
-      auto itr = by_account_catalog_idx.lower_bound(make_tuple(account_id, catalog));
-      while(itr != by_account_catalog_idx.end() && itr->account == account_id && itr->catalog == catalog) {
-         results.push_back(*itr);
-         ++itr;
-      }
+      const auto& by_account_catalog_idx = storage_index.indices().get<by_account_catalog_key>();
+      auto range = by_account_catalog_idx.equal_range(make_tuple(account_id, catalog));
+      for( const account_storage_object& aso : boost::make_iterator_range( range.first, range.second ) )
+         results.push_back(aso);
       return results;
    }
 

libraries/app/include/graphene/app/api.hpp

@@ -534,12 +534,12 @@ namespace graphene { namespace app {
          /**
           * @brief Get all stored objects of an account in a particular catalog
           *
-          * @param account Account name to get info from
+          * @param account The account ID or name to get info from
           * @param catalog Category classification. Each account can store multiple catalogs.
           *
           * @return The vector of objects of the account or empty
           */
-         vector<account_storage_object> get_storage_info(std::string account, std::string catalog)const;
+         vector<account_storage_object> get_storage_info(std::string account_id_or_name, std::string catalog)const;
 
    private:
          application& _app;
@@ -598,7 +598,7 @@ namespace graphene { namespace app {
          /// @brief Retrieve the debug API (if available)
          fc::api<graphene::debug_witness::debug_api> debug()const;
          /// @brief Retrieve the custom operations API
-         fc::api<custom_operations_api> custom()const;
+         fc::api<custom_operations_api> custom_operations()const;
 
          /// @brief Called to enable an API, not reflected.
          void enable_api( const string& api_name );
@@ -695,5 +695,5 @@ FC_API(graphene::app::login_api,
        (asset)
        (orders)
        (debug)
-       (custom)
+       (custom_operations)
      )

libraries/chain/asset_evaluator.cpp

@@ -63,7 +63,8 @@ void_result asset_create_evaluator::do_evaluate( const asset_create_operation& o
       {
          auto prefix = op.symbol.substr( 0, dotpos );
          auto asset_symbol_itr = asset_indx.find( prefix );
-         FC_ASSERT( asset_symbol_itr != asset_indx.end(), "Asset ${s} may only be created by issuer of ${p}, but ${p} has not been registered",
+         FC_ASSERT( asset_symbol_itr != asset_indx.end(),
+                    "Asset ${s} may only be created by issuer of asset ${p}, but asset ${p} has not been created",
                     ("s",op.symbol)("p",prefix) );
          FC_ASSERT( asset_symbol_itr->issuer == op.issuer, "Asset ${s} may only be created by issuer of ${p}, ${i}",
                     ("s",op.symbol)("p",prefix)("i", op.issuer(d).name) );

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/fc

@@ -854,17 +854,16 @@ namespace graphene { namespace net { namespace detail {
         // timeout for any active peers is two block intervals
         uint32_t active_disconnect_timeout = 10 * _recent_block_interval_in_seconds;
         uint32_t active_send_keepalive_timeout = active_disconnect_timeout / 2;
-        
-        // set the ignored request time out to 1 second.  When we request a block
+
+        // set the ignored request time out to 6 second.  When we request a block
         // or transaction from a peer, this timeout determines how long we wait for them
         // to reply before we give up and ask another peer for the item.
         // Ideally this should be significantly shorter than the block interval, because
-        // we'd like to realize the block isn't coming and fetch it from a different 
-        // peer before the next block comes in.  At the current target of 3 second blocks,
-        // 1 second seems reasonable.  When we get closer to our eventual target of 1 second 
-        // blocks, this will need to be re-evaluated (i.e., can we set the timeout to 500ms
-        // and still handle normal network & processing delays without excessive disconnects)
-        fc::microseconds active_ignored_request_timeout = fc::seconds(1);
+        // we'd like to realize the block isn't coming and fetch it from a different
+        // peer before the next block comes in.
+        // Increased to 6 from 1 in #1660 due to heavy load. May need to adjust further
+        // Note: #1660 is https://github.com/steemit/steem/issues/1660
+        fc::microseconds active_ignored_request_timeout = fc::seconds(6);
 
         fc::time_point active_disconnect_threshold = fc::time_point::now() - fc::seconds(active_disconnect_timeout);
         fc::time_point active_send_keepalive_threshold = fc::time_point::now() - fc::seconds(active_send_keepalive_timeout);

libraries/net/node.cpp

@@ -50,7 +50,8 @@ namespace graphene { namespace net {
                                            indexed_by<ordered_non_unique<tag<last_seen_time_index>, 
                                                                          member<potential_peer_record, 
                                                                                 fc::time_point_sec, 
-                                                                                &potential_peer_record::last_seen_time> >,
+                                                                                &potential_peer_record::last_seen_time>,
+                                                                         std::greater<fc::time_point_sec> >,
                                                       hashed_unique<tag<endpoint_index>, 
                                                                     member<potential_peer_record, 
                                                                            fc::ip::endpoint,