Merge pull request #137 from peerplays-network/feature/GRPH-92

[GRPH 92] Build optimization
peerplays-network · Dec 3, 2019 · 3a2def7 · 3a2def7
2 parents c49ce31 + 40c2fd8
commit 3a2def7
Show file tree

Hide file tree

Showing 104 changed files with 819 additions and 167 deletions.
diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp
@@ -40,8 +40,19 @@
 
 #include <fc/crypto/hex.hpp>
 #include <fc/smart_ref_impl.hpp>
+#include <fc/rpc/api_connection.hpp>
 #include <fc/thread/future.hpp>
 
+template class fc::api<graphene::app::block_api>;
+template class fc::api<graphene::app::network_broadcast_api>;
+template class fc::api<graphene::app::network_node_api>;
+template class fc::api<graphene::app::history_api>;
+template class fc::api<graphene::app::crypto_api>;
+template class fc::api<graphene::app::asset_api>;
+template class fc::api<graphene::debug_witness::debug_api>;
+template class fc::api<graphene::app::login_api>;
+
+
 namespace graphene { namespace app {
 
     login_api::login_api(application& a)

diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp
@@ -26,11 +26,15 @@
 #include <graphene/chain/get_config.hpp>
 #include <graphene/chain/tournament_object.hpp>
 #include <graphene/chain/account_object.hpp>
+#include <graphene/chain/protocol/address.hpp>
+#include <graphene/chain/pts_address.hpp>
 
 #include <fc/bloom_filter.hpp>
 #include <fc/smart_ref_impl.hpp>
 
 #include <fc/crypto/hex.hpp>
+#include <fc/rpc/api_connection.hpp>
+#include <fc/uint128.hpp>
 
 #include <boost/range/iterator_range.hpp>
 #include <boost/rational.hpp>
@@ -45,6 +49,8 @@
 
 typedef std::map< std::pair<graphene::chain::asset_id_type, graphene::chain::asset_id_type>, std::vector<fc::variant> > market_queue_type;
 
+template class fc::api<graphene::app::database_api>;
+
 namespace graphene { namespace app {
 
 class database_api_impl : public std::enable_shared_from_this<database_api_impl>

diff --git a/libraries/app/include/graphene/app/api.hpp b/libraries/app/include/graphene/app/api.hpp
@@ -357,7 +357,17 @@ namespace graphene { namespace app {
          graphene::chain::database& _db;
          graphene::app::database_api database_api;
    };
+} } // graphene::app
 
+extern template class fc::api<graphene::app::block_api>;
+extern template class fc::api<graphene::app::network_broadcast_api>;
+extern template class fc::api<graphene::app::network_node_api>;
+extern template class fc::api<graphene::app::history_api>;
+extern template class fc::api<graphene::app::crypto_api>;
+extern template class fc::api<graphene::app::asset_api>;
+extern template class fc::api<graphene::debug_witness::debug_api>;
+
+namespace graphene { namespace app {
    /**
     * @brief The login_api class implements the bottom layer of the RPC API
     *
@@ -419,6 +429,8 @@ namespace graphene { namespace app {
 
 }}  // graphene::app
 
+extern template class fc::api<graphene::app::login_api>;
+
 FC_REFLECT( graphene::app::network_broadcast_api::transaction_confirmation,
         (id)(block_num)(trx_num)(trx) )
 FC_REFLECT( graphene::app::verify_range_result,

diff --git a/libraries/app/include/graphene/app/database_api.hpp b/libraries/app/include/graphene/app/database_api.hpp
@@ -715,6 +715,8 @@ class database_api
 
 } }
 
+extern template class fc::api<graphene::app::database_api>;
+
 FC_REFLECT( graphene::app::order, (price)(quote)(base) );
 FC_REFLECT( graphene::app::order_book, (base)(quote)(bids)(asks) );
 FC_REFLECT( graphene::app::market_ticker, (base)(quote)(latest)(lowest_ask)(highest_bid)(percent_change)(base_volume)(quote_volume) );

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
@@ -60,6 +60,7 @@ add_library( graphene_chain
              protocol/confidential.cpp
              protocol/vote.cpp
              protocol/tournament.cpp
+             protocol/small_ops.cpp
 
              genesis_state.cpp
              get_config.cpp
@@ -93,6 +94,7 @@ add_library( graphene_chain
              fba_object.cpp
              proposal_object.cpp
              vesting_balance_object.cpp
+             small_objects.cpp
 
              block_database.cpp
 

diff --git a/libraries/chain/account_object.cpp b/libraries/chain/account_object.cpp
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 #include <graphene/chain/account_object.hpp>
-#include <graphene/chain/asset_object.hpp>
 #include <graphene/chain/database.hpp>
-#include <graphene/chain/hardfork.hpp>
+
+#include <fc/io/raw.hpp>
 #include <fc/uint128.hpp>
 
 namespace graphene { namespace chain {
@@ -320,3 +320,8 @@ const account_balance_object* balances_by_account_index::get_account_balance( co
 }
 
 } } // graphene::chain
+
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::account_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::account_balance_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::account_statistics_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::pending_dividend_payout_balance_for_holder_object )
diff --git a/libraries/chain/asset_object.cpp b/libraries/chain/asset_object.cpp
@@ -24,10 +24,9 @@
 #include <graphene/chain/asset_object.hpp>
 #include <graphene/chain/database.hpp>
 
+#include <fc/io/raw.hpp>
 #include <fc/uint128.hpp>
 
-#include <cmath>
-
 using namespace graphene::chain;
 
 share_type asset_bitasset_data_object::max_force_settlement_volume(share_type current_supply) const
@@ -296,3 +295,11 @@ void sweeps_vesting_balance_object::adjust_balance( const asset& delta )
    FC_ASSERT( delta.asset_id == asset_id );
    balance += delta.amount.value;
 }
+
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::asset_dynamic_data_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::asset_bitasset_data_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::asset_dividend_data_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::total_distributed_dividend_balance_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::asset_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::lottery_balance_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::sweeps_vesting_balance_object )
diff --git a/libraries/chain/balance_evaluator.cpp b/libraries/chain/balance_evaluator.cpp
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include <graphene/chain/balance_evaluator.hpp>
+#include <graphene/chain/pts_address.hpp>
 
 namespace graphene { namespace chain {
 

diff --git a/libraries/chain/genesis_state.cpp b/libraries/chain/genesis_state.cpp
@@ -36,3 +36,72 @@ chain_id_type genesis_state_type::compute_chain_id() const
 }
 
 } } // graphene::chain
+
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_account_type, BOOST_PP_SEQ_NIL, (name)(owner_key)(active_key)(is_lifetime_member))
+
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_asset_type, BOOST_PP_SEQ_NIL,
+           (symbol)(issuer_name)(description)(precision)(max_supply)(accumulated_fees)(is_bitasset)(collateral_records))
+
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_asset_type::initial_collateral_position, BOOST_PP_SEQ_NIL,
+           (owner)(collateral)(debt))
+
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_balance_type, BOOST_PP_SEQ_NIL,
+           (owner)(asset_symbol)(amount))
+
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_vesting_balance_type, BOOST_PP_SEQ_NIL,
+           (owner)(asset_symbol)(amount)(begin_timestamp)(vesting_cliff_seconds)(vesting_duration_seconds)(begin_balance))
+
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_witness_type, BOOST_PP_SEQ_NIL, (owner_name)(block_signing_key))
+
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_committee_member_type, BOOST_PP_SEQ_NIL, (owner_name))
+
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_worker_type, BOOST_PP_SEQ_NIL, (owner_name)(daily_pay))
+
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_bts_account_type::initial_authority, BOOST_PP_SEQ_NIL,
+           (weight_threshold)
+           (account_auths)
+           (key_auths)
+           (address_auths))
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_bts_account_type::initial_cdd_vesting_policy, BOOST_PP_SEQ_NIL,
+           (vesting_seconds)
+           (coin_seconds_earned)
+           (start_claim)
+           (coin_seconds_earned_last_update))
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_bts_account_type::initial_linear_vesting_policy, BOOST_PP_SEQ_NIL,
+           (begin_timestamp)
+           (vesting_cliff_seconds)
+           (vesting_duration_seconds)
+           (begin_balance))
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_bts_account_type::initial_vesting_balance, BOOST_PP_SEQ_NIL,
+           (asset_symbol)
+           (amount)
+           (policy_type)
+           (policy))
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type::initial_bts_account_type, BOOST_PP_SEQ_NIL,
+           (name)
+           (owner_authority)
+           (active_authority)
+           (core_balance)
+           (vesting_balances))
+
+FC_REFLECT_DERIVED_NO_TYPENAME(graphene::chain::genesis_state_type, BOOST_PP_SEQ_NIL,
+           (initial_timestamp)(max_core_supply)(initial_parameters)(initial_bts_accounts)(initial_accounts)(initial_assets)(initial_balances)
+           (initial_vesting_balances)(initial_active_witnesses)(initial_witness_candidates)
+           (initial_committee_candidates)(initial_worker_candidates)
+           (initial_chain_id)
+           (immutable_parameters))
+
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_account_type)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_asset_type)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_asset_type::initial_collateral_position)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_balance_type)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_vesting_balance_type)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_witness_type)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_committee_member_type)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_worker_type)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_bts_account_type::initial_authority)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_bts_account_type::initial_cdd_vesting_policy)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_bts_account_type::initial_linear_vesting_policy)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_bts_account_type::initial_vesting_balance)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type::initial_bts_account_type)
+GRAPHENE_EXTERNAL_SERIALIZATION( /*not extern*/, graphene::chain::genesis_state_type)
diff --git a/libraries/chain/include/graphene/chain/account_object.hpp b/libraries/chain/include/graphene/chain/account_object.hpp
@@ -22,8 +22,9 @@
  * THE SOFTWARE.
  */
 #pragma once
-#include <graphene/chain/protocol/operations.hpp>
+#include <graphene/chain/protocol/types.hpp>
 #include <graphene/db/generic_index.hpp>
+#include <graphene/chain/protocol/account.hpp>
 #include <boost/multi_index/composite_key.hpp>
 
 namespace graphene { namespace chain {
@@ -574,4 +575,7 @@ FC_REFLECT_DERIVED( graphene::chain::pending_dividend_payout_balance_for_holder_
                     (graphene::db::object),
                     (owner)(dividend_holder_asset_type)(dividend_payout_asset_type)(pending_balance) )
 
-
+GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_balance_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::account_statistics_object )
+GRAPHENE_EXTERNAL_SERIALIZATION( extern, graphene::chain::pending_dividend_payout_balance_for_holder_object )