diff --git a/CMakeLists.txt b/CMakeLists.txt index 279a65d5..4df202b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,7 +128,7 @@ else( WIN32 ) # Apple AND Linux endif( APPLE ) if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" ) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-memcmp -Wno-parentheses -Wno-terminate -Wno-invalid-offsetof" ) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-memcmp -Wno-parentheses -Wno-terminate -Wno-invalid-offsetof -Wno-sign-compare" ) elseif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" ) if( CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0.0 ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" ) diff --git a/libraries/app/api.cpp b/libraries/app/api.cpp index c76fa940..1e876634 100644 --- a/libraries/app/api.cpp +++ b/libraries/app/api.cpp @@ -190,7 +190,7 @@ namespace graphene { namespace app { fc::variant network_broadcast_api::broadcast_transaction_synchronous(const signed_transaction& trx) { _app.chain_database()->check_tansaction_for_duplicated_operations(trx); - + fc::promise::ptr prom( new fc::promise() ); broadcast_transaction_with_callback( [=]( const fc::variant& v ){ prom->set_value(v); @@ -639,7 +639,7 @@ namespace graphene { namespace app { try { account = database_api.get_account_id_from_string(account_id_or_name); } catch (...) { return result; } - + const auto& stats = account(db).statistics(db); if( stats.most_recent_op == account_transaction_history_id_type() ) return result; const account_transaction_history_object* node = &stats.most_recent_op(db); @@ -676,7 +676,7 @@ namespace graphene { namespace app { FC_ASSERT( limit <= api_limit_get_relative_account_history, "Number of querying accounts can not be greater than ${configured_limit}", ("configured_limit", api_limit_get_relative_account_history) ); - + vector result; account_id_type account; try { @@ -806,7 +806,7 @@ namespace graphene { namespace app { } // asset_api - asset_api::asset_api(graphene::app::application& app) : + asset_api::asset_api(graphene::app::application& app) : _app(app), _db( *app.chain_database()), database_api( std::ref(*app.chain_database())) { } diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index 61b11475..95303223 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -245,7 +245,7 @@ class database_api_impl : public std::enable_shared_from_this uint32_t api_limit_lookup_committee_member_accounts = 1000; uint32_t api_limit_get_trade_history = 100; uint32_t api_limit_get_trade_history_by_sequence = 100; - + // Account Role vector get_account_roles_by_owner(account_id_type owner) const; @@ -928,7 +928,7 @@ vector database_api::get_account_balances(const std::string& account_name return my->get_account_balances( account_name_or_id, assets ); } -vector database_api_impl::get_account_balances( const std::string& account_name_or_id, +vector database_api_impl::get_account_balances( const std::string& account_name_or_id, const flat_set& assets)const { const account_object* account = get_account_from_string(account_name_or_id); @@ -2602,9 +2602,9 @@ graphene::app::gpos_info database_api_impl::get_gpos_info(const account_id_type && balance.balance.asset_id == asset_id_type()) account_vbos.emplace_back(balance); }); - + share_type allowed_withdraw_amount = 0, account_vested_balance = 0; - + for (const vesting_balance_object& vesting_balance_obj : account_vbos) { account_vested_balance += vesting_balance_obj.balance.amount; diff --git a/libraries/chain/hardfork.d/SON.hf b/libraries/chain/hardfork.d/SON.hf index b3947a75..5cc86af6 100644 --- a/libraries/chain/hardfork.d/SON.hf +++ b/libraries/chain/hardfork.d/SON.hf @@ -1,7 +1,5 @@ -// SON HARDFORK Wednesday, January 1, 2020 12:00:00 AM - 1577836800 -// SON HARDFORK Monday, March 30, 2020 3:00:00 PM - 1585573200 -// SON HARDFORK Monday, September 21, 2020 1:43:11 PM - 1600695791 +// SON HARDFORK Wednesday, October 28, 2020 0:00:00 GMT #ifndef HARDFORK_SON_TIME #include -#define HARDFORK_SON_TIME (fc::time_point_sec( 1585573200 )) +#define HARDFORK_SON_TIME (fc::time_point_sec( 1603843200 )) #endif