diff --git a/libraries/app/application.cpp b/libraries/app/application.cpp index 9a22ca70..fe66b3d9 100644 --- a/libraries/app/application.cpp +++ b/libraries/app/application.cpp @@ -226,7 +226,9 @@ namespace detail { if( !_options->count("rpc-endpoint") ) return; - _websocket_server = std::make_shared(); + bool enable_deflate_compression = _options->count("disable-permessage-deflate") == 0; + + _websocket_server = std::make_shared(enable_deflate_compression); _websocket_server->on_connection([&]( const fc::http::websocket_connection_ptr& c ){ auto wsc = std::make_shared(*c); @@ -253,7 +255,8 @@ namespace detail { } string password = _options->count("server-pem-password") ? _options->at("server-pem-password").as() : ""; - _websocket_tls_server = std::make_shared( _options->at("server-pem").as(), password ); + bool enable_deflate_compression = _options->count("disable-permessage-deflate") == 0; + _websocket_tls_server = std::make_shared( _options->at("server-pem").as(), password, enable_deflate_compression ); _websocket_tls_server->on_connection([&]( const fc::http::websocket_connection_ptr& c ){ auto wsc = std::make_shared(*c); @@ -947,6 +950,8 @@ void application::set_program_options(boost::program_options::options_descriptio ("checkpoint,c", bpo::value>()->composing(), "Pairs of [BLOCK_NUM,BLOCK_ID] that should be enforced as checkpoints.") ("rpc-endpoint", bpo::value()->implicit_value("127.0.0.1:8090"), "Endpoint for websocket RPC to listen on") ("rpc-tls-endpoint", bpo::value()->implicit_value("127.0.0.1:8089"), "Endpoint for TLS websocket RPC to listen on") + ("disable-permessage-deflate", "Disable support for per-message deflate compression in the websocket servers " + "(--rpc-endpoint and --rpc-tls-endpoint), enabled by default") ("server-pem,p", bpo::value()->implicit_value("server.pem"), "The TLS certificate file for this server") ("server-pem-password,P", bpo::value()->implicit_value(""), "Password for this certificate") ("genesis-json", bpo::value(), "File to read Genesis State from") diff --git a/libraries/chain/include/graphene/chain/asset_object.hpp b/libraries/chain/include/graphene/chain/asset_object.hpp index f893f34a..3bde61b3 100644 --- a/libraries/chain/include/graphene/chain/asset_object.hpp +++ b/libraries/chain/include/graphene/chain/asset_object.hpp @@ -212,7 +212,7 @@ namespace graphene { namespace chain { time_point_sec feed_expiration_time()const { return current_feed_publication_time + options.feed_lifetime_sec; } bool feed_is_expired(time_point_sec current_time)const - { return feed_expiration_time() >= current_time; } + { return feed_expiration_time() <= current_time; } void update_median_feeds(time_point_sec current_time); }; diff --git a/libraries/chain/include/graphene/chain/protocol/ext.hpp b/libraries/chain/include/graphene/chain/protocol/ext.hpp index 7e8636f5..ac775535 100644 --- a/libraries/chain/include/graphene/chain/protocol/ext.hpp +++ b/libraries/chain/include/graphene/chain/protocol/ext.hpp @@ -82,6 +82,8 @@ void operator<<( Stream& stream, const graphene::chain::extension& value ) fc::reflector::visit( read_vtor ); } + + template< typename Stream, typename T > struct graphene_extension_unpack_visitor { @@ -108,7 +110,7 @@ struct graphene_extension_unpack_visitor { if( (count_left > 0) && (which == next_which) ) { - Member temp; + typename Member::value_type temp; fc::raw::unpack( stream, temp ); (value.*member) = temp; --count_left; diff --git a/libraries/fc b/libraries/fc index d5370fc2..21045dde 160000 --- a/libraries/fc +++ b/libraries/fc @@ -1 +1 @@ -Subproject commit d5370fc2ea436fa4340cda01af98c7993fbc67d5 +Subproject commit 21045dde5faa8fcf5f43b97c85f9df210317633b diff --git a/libraries/net/node.cpp b/libraries/net/node.cpp index db2369a0..6fb212c7 100644 --- a/libraries/net/node.cpp +++ b/libraries/net/node.cpp @@ -3952,12 +3952,20 @@ namespace graphene { namespace net { namespace detail { } unsigned handle_message_call_count = 0; - for (fc::future& handle_message_call : _handle_message_calls_in_progress) + while( true ) { + auto it = _handle_message_calls_in_progress.begin(); + if( it == _handle_message_calls_in_progress.end() ) + break; + if( it->ready() || it->error() || it->canceled() ) + { + _handle_message_calls_in_progress.erase( it ); + continue; + } ++handle_message_call_count; try { - handle_message_call.cancel_and_wait("node_impl::close()"); + it->cancel_and_wait("node_impl::close()"); dlog("handle_message call #${count} task terminated", ("count", handle_message_call_count)); } catch ( const fc::canceled_exception& ) @@ -3973,7 +3981,6 @@ namespace graphene { namespace net { namespace detail { wlog("Exception thrown while terminating handle_message call #${count} task, ignoring",("count", handle_message_call_count)); } } - _handle_message_calls_in_progress.clear(); try { diff --git a/tests/tests/serialization_tests.cpp b/tests/tests/serialization_tests.cpp index 84fced8e..fb87c4c4 100644 --- a/tests/tests/serialization_tests.cpp +++ b/tests/tests/serialization_tests.cpp @@ -122,4 +122,30 @@ BOOST_AUTO_TEST_CASE( extended_public_key_type_test ) } } +BOOST_AUTO_TEST_CASE( extension_serialization_test ) +{ + try + { + buyback_account_options bbo; + bbo.asset_to_buy = asset_id_type(1000); + bbo.asset_to_buy_issuer = account_id_type(2000); + bbo.markets.emplace( asset_id_type() ); + bbo.markets.emplace( asset_id_type(777) ); + account_create_operation create_op = make_account( "rex" ); + create_op.registrar = account_id_type(1234); + create_op.extensions.value.buyback_options = bbo; + + auto packed = fc::raw::pack( create_op ); + account_create_operation unpacked = fc::raw::unpack(packed); + + ilog( "original: ${x}", ("x", create_op) ); + ilog( "unpacked: ${x}", ("x", unpacked) ); + } + catch ( const fc::exception& e ) + { + edump((e.to_detail_string())); + throw; + } +} + BOOST_AUTO_TEST_SUITE_END()