From 342e33008ca4f1f3142b8660b027078cb8c766e5 Mon Sep 17 00:00:00 2001 From: elmato Date: Fri, 3 Feb 2017 19:25:52 +0000 Subject: [PATCH 01/16] Restore bloom filter usage: Check if the object changed/removed was previously subscribed (read) before sending updates back to ws clients --- libraries/app/database_api.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index b811ebcd19..f296005a54 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -160,7 +160,7 @@ class database_api_impl : public std::enable_shared_from_this { if( !_subscribe_callback ) return false; - return true; + return _subscribe_filter.contains( i ); } @@ -1818,8 +1818,10 @@ void database_api_impl::on_objects_removed( const vector& objs ) vector updates; updates.reserve(objs.size()); - for( auto obj : objs ) - updates.emplace_back( obj->id ); + for( auto obj : objs ) { + if ( is_subscribed_to_item(obj->id) ) + updates.emplace_back( obj->id ); + } broadcast_updates( updates ); } @@ -1859,7 +1861,7 @@ void database_api_impl::on_objects_changed(const vector& ids) for(auto id : ids) { const object* obj = nullptr; - if( _subscribe_callback ) + if( is_subscribed_to_item(id) ) { obj = _db.find_object( id ); if( obj ) @@ -1874,7 +1876,7 @@ void database_api_impl::on_objects_changed(const vector& ids) if( _market_subscriptions.size() ) { - if( !_subscribe_callback ) + if( !is_subscribed_to_item(id) ) obj = _db.find_object( id ); if( obj ) { @@ -1895,7 +1897,7 @@ void database_api_impl::on_objects_changed(const vector& ids) /// if a connection hangs then this could get backed up and result in /// a failure to exit cleanly. fc::async([capture_this,this,updates,market_broadcast_queue](){ - if( _subscribe_callback ) _subscribe_callback( updates ); + if( _subscribe_callback && updates.size() ) _subscribe_callback( updates ); for( const auto& item : market_broadcast_queue ) { From 0bc0513e206ce221cec37ae4fb6ca5b4395b655a Mon Sep 17 00:00:00 2001 From: elmato Date: Mon, 6 Feb 2017 15:39:42 +0000 Subject: [PATCH 02/16] set_subscribe_callback: always initialize bloom filter --- libraries/app/database_api.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index f296005a54..f92bf97795 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -267,15 +267,13 @@ void database_api_impl::set_subscribe_callback( std::function cb ) From 823beb7fe5a5a888a373bfe439a1189cf0ec6023 Mon Sep 17 00:00:00 2001 From: elmato Date: Fri, 10 Feb 2017 08:18:23 +0000 Subject: [PATCH 03/16] remove call to notify_changed_objects in _push_transaction --- libraries/chain/db_block.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 63306e6621..f7ecd88555 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -241,7 +241,7 @@ processed_transaction database::_push_transaction( const signed_transaction& trx auto processed_trx = _apply_transaction( trx ); _pending_tx.push_back(processed_trx); - notify_changed_objects(); + // notify_changed_objects(); // The transaction applied successfully. Merge its changes into the pending block session. temp_session.merge(); From 02b2672a394b17f70927db73eb0000a50b1818a7 Mon Sep 17 00:00:00 2001 From: elmato Date: Fri, 10 Feb 2017 08:25:39 +0000 Subject: [PATCH 04/16] split notifications (notify_changed_objects) in three signals: new_objects, changed_objects, removed_objects --- libraries/chain/db_block.cpp | 18 ++++++++++-------- .../chain/include/graphene/chain/database.hpp | 6 ++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index f7ecd88555..9d8cee4f8d 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -549,17 +549,19 @@ void database::notify_changed_objects() if( _undo_db.enabled() ) { const auto& head_undo = _undo_db.head(); + + vector new_ids; new_ids.reserve(head_undo.new_ids.size()); + for( const auto& item : head_undo.new_ids ) new_ids.push_back(item); + vector changed_ids; changed_ids.reserve(head_undo.old_values.size()); for( const auto& item : head_undo.old_values ) changed_ids.push_back(item.first); - for( const auto& item : head_undo.new_ids ) changed_ids.push_back(item); - vector removed; - removed.reserve( head_undo.removed.size() ); - for( const auto& item : head_undo.removed ) - { - changed_ids.push_back( item.first ); - removed.emplace_back( item.second.get() ); - } + + vector removed; removed.reserve( head_undo.removed.size() ); + for( const auto& item : head_undo.removed ) removed.emplace_back( item.second.get() ); + + new_objects(new_ids); changed_objects(changed_ids); + removed_objects(removed); } } FC_CAPTURE_AND_RETHROW() } diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 1b721253e6..47fd63b99e 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -189,6 +189,12 @@ namespace graphene { namespace chain { */ fc::signal on_pending_transaction; + /** + * Emitted After a block has been applied and committed. The callback + * should not yield and should execute quickly. + */ + fc::signal&)> new_objects; + /** * Emitted After a block has been applied and committed. The callback * should not yield and should execute quickly. From b2b895ac94c064f91c17be863255da4a84a90ccd Mon Sep 17 00:00:00 2001 From: elmato Date: Fri, 10 Feb 2017 08:29:48 +0000 Subject: [PATCH 05/16] allow to apply_block when exception in database signal handler --- libraries/chain/db_block.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 9d8cee4f8d..33403edfee 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -563,7 +563,7 @@ void database::notify_changed_objects() changed_objects(changed_ids); removed_objects(removed); } -} FC_CAPTURE_AND_RETHROW() } +} FC_CAPTURE_AND_LOG( () ) } processed_transaction database::apply_transaction(const signed_transaction& trx, uint32_t skip) { From 29c636fcef74aeb8a56a0067b04b22e469eece4f Mon Sep 17 00:00:00 2001 From: elmato Date: Fri, 10 Feb 2017 08:33:44 +0000 Subject: [PATCH 06/16] add get_market() function to call_order_object --- libraries/chain/include/graphene/chain/market_object.hpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libraries/chain/include/graphene/chain/market_object.hpp b/libraries/chain/include/graphene/chain/market_object.hpp index c41def13e1..b56f4e9ca3 100644 --- a/libraries/chain/include/graphene/chain/market_object.hpp +++ b/libraries/chain/include/graphene/chain/market_object.hpp @@ -120,6 +120,13 @@ class call_order_object : public abstract_object share_type collateral; ///< call_price.base.asset_id, access via get_collateral share_type debt; ///< call_price.quote.asset_id, access via get_collateral price call_price; ///< Debt / Collateral + + pair get_market()const + { + auto tmp = std::make_pair( call_price.base.asset_id, call_price.quote.asset_id ); + if( tmp.first > tmp.second ) std::swap( tmp.first, tmp.second ); + return tmp; + } }; /** From bfa600c5594cd05519fff72917f47133ebeeb516 Mon Sep 17 00:00:00 2001 From: elmato Date: Fri, 10 Feb 2017 08:36:07 +0000 Subject: [PATCH 07/16] handle new database_object signals, refactor --- libraries/app/database_api.cpp | 156 ++++++++++++++++++++------------- 1 file changed, 94 insertions(+), 62 deletions(-) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index f92bf97795..6b52053bf6 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -41,6 +41,8 @@ #define GET_REQUIRED_FEES_MAX_RECURSION 4 +typedef std::map< std::pair, std::vector > market_queue_type; + namespace graphene { namespace app { class database_api_impl; @@ -164,9 +166,26 @@ class database_api_impl : public std::enable_shared_from_this return _subscribe_filter.contains( i ); } - void broadcast_updates( const vector& updates ); + template + void enqueue_if_subscribed_to_market(const object* obj, market_queue_type& queue, bool full_object=true) + { + const T* order = dynamic_cast(obj); + FC_ASSERT( order != nullptr); + + auto market = order->get_market(); + + auto sub = _market_subscriptions.find( market ); + if( sub != _market_subscriptions.end() ) { + queue[market].emplace_back( full_object ? obj->to_variant() : fc::variant(obj->id) ); + } + } + void broadcast_updates( const vector& updates ); + void broadcast_market_updates( const market_queue_type& queue); + void check_for_market_objects(const vector& ids); + /** called every time a block is applied to report the objects that were changed */ + void on_objects_new(const vector& ids); void on_objects_changed(const vector& ids); void on_objects_removed(const vector& objs); void on_applied_block(); @@ -176,6 +195,7 @@ class database_api_impl : public std::enable_shared_from_this std::function _pending_trx_callback; std::function _block_applied_callback; + boost::signals2::scoped_connection _new_connection; boost::signals2::scoped_connection _change_connection; boost::signals2::scoped_connection _removed_connection; boost::signals2::scoped_connection _applied_block_connection; @@ -198,6 +218,9 @@ database_api::~database_api() {} database_api_impl::database_api_impl( graphene::chain::database& db ):_db(db) { wlog("creating database api ${x}", ("x",int64_t(this)) ); + _new_connection = _db.new_objects.connect([this](const vector& ids) { + on_objects_new(ids); + }); _change_connection = _db.changed_objects.connect([this](const vector& ids) { on_objects_changed(ids); }); @@ -628,7 +651,7 @@ std::map database_api_impl::get_full_accounts( const [&acnt] (const call_order_object& call) { acnt.call_orders.emplace_back(call); }); - + // get assets issued by user auto asset_range = _db.get_index_type().indices().get().equal_range(account->id); std::for_each(asset_range.first, asset_range.second, @@ -1800,10 +1823,27 @@ vector database_api_impl::get_blinded_balances( const fl void database_api_impl::broadcast_updates( const vector& updates ) { - if( updates.size() ) { + if( updates.size() && _subscribe_callback ) { auto capture_this = shared_from_this(); fc::async([capture_this,updates](){ - capture_this->_subscribe_callback( fc::variant(updates) ); + if(capture_this->_subscribe_callback) + capture_this->_subscribe_callback( fc::variant(updates) ); + }); + } +} + +void database_api_impl::broadcast_market_updates( const market_queue_type& queue) +{ + if( queue.size() ) + { + auto capture_this = shared_from_this(); + fc::async([capture_this, this, queue](){ + for( const auto& item : queue ) + { + auto sub = _market_subscriptions.find(item.first); + if( sub != _market_subscriptions.end() ) + sub->second( fc::variant(item.second ) ); + } }); } } @@ -1813,97 +1853,89 @@ void database_api_impl::on_objects_removed( const vector& objs ) /// we need to ensure the database_api is not deleted for the life of the async operation if( _subscribe_callback ) { - vector updates; - updates.reserve(objs.size()); + vector updates; - for( auto obj : objs ) { + for( auto obj : objs ) + { if ( is_subscribed_to_item(obj->id) ) - updates.emplace_back( obj->id ); + { + updates.push_back( fc::variant(obj->id) ); + } } + broadcast_updates( updates ); } if( _market_subscriptions.size() ) { - map< pair, vector > broadcast_queue; + market_queue_type broadcast_queue; + for( const auto& obj : objs ) { - const limit_order_object* order = dynamic_cast(obj); - if( order ) + if( obj->id.is() ) { - auto sub = _market_subscriptions.find( order->get_market() ); - if( sub != _market_subscriptions.end() ) - broadcast_queue[order->get_market()].emplace_back( order->id ); + enqueue_if_subscribed_to_market( obj, broadcast_queue, false ); + } + else if( obj->id.is() ) + { + enqueue_if_subscribed_to_market( obj, broadcast_queue, false ); } } - if( broadcast_queue.size() ) - { - auto capture_this = shared_from_this(); - fc::async([capture_this,this,broadcast_queue](){ - for( const auto& item : broadcast_queue ) - { - auto sub = _market_subscriptions.find(item.first); - if( sub != _market_subscriptions.end() ) - sub->second( fc::variant(item.second ) ); - } - }); - } + + broadcast_market_updates(broadcast_queue); } } -void database_api_impl::on_objects_changed(const vector& ids) +void database_api_impl::check_for_market_objects(const vector& ids) { - vector updates; - map< pair, vector > market_broadcast_queue; - - for(auto id : ids) + if( _market_subscriptions.size() ) { - const object* obj = nullptr; - if( is_subscribed_to_item(id) ) + market_queue_type broadcast_queue; + + for(auto id : ids) { - obj = _db.find_object( id ); - if( obj ) + if( id.is() ) { - updates.emplace_back( obj->to_variant() ); + enqueue_if_subscribed_to_market( _db.find_object(id), broadcast_queue ); } - else + else if( id.is() ) { - updates.emplace_back(id); // send just the id to indicate removal + enqueue_if_subscribed_to_market( _db.find_object(id), broadcast_queue ); } } - if( _market_subscriptions.size() ) + broadcast_market_updates(broadcast_queue); + } +} + +void database_api_impl::on_objects_new(const vector& ids) +{ + check_for_market_objects(ids); +} + +void database_api_impl::on_objects_changed(const vector& ids) +{ + if( _subscribe_callback ) + { + vector updates; + + for(auto id : ids) { - if( !is_subscribed_to_item(id) ) - obj = _db.find_object( id ); - if( obj ) + const object* obj = nullptr; + if( is_subscribed_to_item(id) ) { - const limit_order_object* order = dynamic_cast(obj); - if( order ) + obj = _db.find_object( id ); + if( obj ) { - auto sub = _market_subscriptions.find( order->get_market() ); - if( sub != _market_subscriptions.end() ) - market_broadcast_queue[order->get_market()].emplace_back( order->id ); + updates.emplace_back( obj->to_variant() ); } } } - } - - auto capture_this = shared_from_this(); - /// pushing the future back / popping the prior future if it is complete. - /// if a connection hangs then this could get backed up and result in - /// a failure to exit cleanly. - fc::async([capture_this,this,updates,market_broadcast_queue](){ - if( _subscribe_callback && updates.size() ) _subscribe_callback( updates ); + broadcast_updates(updates); + } - for( const auto& item : market_broadcast_queue ) - { - auto sub = _market_subscriptions.find(item.first); - if( sub != _market_subscriptions.end() ) - sub->second( fc::variant(item.second ) ); - } - }); + check_for_market_objects(ids); } /** note: this method cannot yield because it is called in the middle of From 6f1d8b548be55210bc63fbb296c67039434b0ed9 Mon Sep 17 00:00:00 2001 From: elmato Date: Tue, 14 Feb 2017 21:34:08 +0000 Subject: [PATCH 08/16] Replace clear_filter parameter with notify_remove_create --- libraries/app/database_api.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index 6b52053bf6..4df135511c 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -58,7 +58,7 @@ class database_api_impl : public std::enable_shared_from_this fc::variants get_objects(const vector& ids)const; // Subscriptions - void set_subscribe_callback( std::function cb, bool clear_filter ); + void set_subscribe_callback( std::function cb, bool notify_remove_create ); void set_pending_transaction_callback( std::function cb ); void set_block_applied_callback( std::function cb ); void cancel_all_subscriptions(); @@ -190,7 +190,8 @@ class database_api_impl : public std::enable_shared_from_this void on_objects_removed(const vector& objs); void on_applied_block(); - mutable fc::bloom_filter _subscribe_filter; + bool _notify_remove_create = false; + mutable fc::bloom_filter _subscribe_filter; std::function _subscribe_callback; std::function _pending_trx_callback; std::function _block_applied_callback; @@ -281,15 +282,16 @@ fc::variants database_api_impl::get_objects(const vector& ids)co // // ////////////////////////////////////////////////////////////////////// -void database_api::set_subscribe_callback( std::function cb, bool clear_filter ) +void database_api::set_subscribe_callback( std::function cb, bool notify_remove_create ) { - my->set_subscribe_callback( cb, clear_filter ); + my->set_subscribe_callback( cb, notify_remove_create ); } -void database_api_impl::set_subscribe_callback( std::function cb, bool clear_filter ) +void database_api_impl::set_subscribe_callback( std::function cb, bool notify_remove_create ) { - edump((clear_filter)); + //edump((clear_filter)); _subscribe_callback = cb; + _notify_remove_create = notify_remove_create; static fc::bloom_parameters param; param.projected_element_count = 10000; @@ -589,7 +591,6 @@ std::map database_api_impl::get_full_accounts( const if( subscribe ) { - ilog( "subscribe to ${id}", ("id",account->name) ); subscribe_to_item( account->id ); } From 0ecdc90d4df2ebd80a6d4cfa4388f4b8a608c9c1 Mon Sep 17 00:00:00 2001 From: elmato Date: Tue, 14 Feb 2017 21:38:40 +0000 Subject: [PATCH 09/16] Add the array of ids (that are being removed) to the removed_objects signal --- libraries/chain/db_block.cpp | 9 +++++++-- libraries/chain/include/graphene/chain/database.hpp | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 33403edfee..f55f03962f 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -556,12 +556,17 @@ void database::notify_changed_objects() vector changed_ids; changed_ids.reserve(head_undo.old_values.size()); for( const auto& item : head_undo.old_values ) changed_ids.push_back(item.first); + vector removed_ids; removed_ids.reserve( head_undo.removed.size() ); vector removed; removed.reserve( head_undo.removed.size() ); - for( const auto& item : head_undo.removed ) removed.emplace_back( item.second.get() ); + for( const auto& item : head_undo.removed ) + { + removed_ids.emplace_back( item.first ); + removed.emplace_back( item.second.get() ); + } new_objects(new_ids); changed_objects(changed_ids); - removed_objects(removed); + removed_objects(removed_ids, removed); } } FC_CAPTURE_AND_LOG( () ) } diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 47fd63b99e..9e0f1af13b 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -204,7 +204,7 @@ namespace graphene { namespace chain { /** this signal is emitted any time an object is removed and contains a * pointer to the last value of every object that was removed. */ - fc::signal&)> removed_objects; + fc::signal&, const vector&)> removed_objects; //////////////////// db_witness_schedule.cpp //////////////////// From 31f322c9cd712582e5c74d063d5d9918f6d10e64 Mon Sep 17 00:00:00 2001 From: elmato Date: Tue, 14 Feb 2017 21:39:50 +0000 Subject: [PATCH 10/16] Handle new,changed and removed events from the database_object in one generic function --- libraries/app/database_api.cpp | 103 ++++++++++++++------------------- 1 file changed, 42 insertions(+), 61 deletions(-) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index 4df135511c..d460662b63 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -182,12 +182,12 @@ class database_api_impl : public std::enable_shared_from_this void broadcast_updates( const vector& updates ); void broadcast_market_updates( const market_queue_type& queue); - void check_for_market_objects(const vector& ids); + void handle_object_changed(bool force_notify, const vector& ids, std::function find_object); /** called every time a block is applied to report the objects that were changed */ void on_objects_new(const vector& ids); void on_objects_changed(const vector& ids); - void on_objects_removed(const vector& objs); + void on_objects_removed(const vector& ids, const vector& objs); void on_applied_block(); bool _notify_remove_create = false; @@ -225,8 +225,8 @@ database_api_impl::database_api_impl( graphene::chain::database& db ):_db(db) _change_connection = _db.changed_objects.connect([this](const vector& ids) { on_objects_changed(ids); }); - _removed_connection = _db.removed_objects.connect([this](const vector& objs) { - on_objects_removed(objs); + _removed_connection = _db.removed_objects.connect([this](const vector& ids, const vector& objs) { + on_objects_removed(ids, objs); }); _applied_block_connection = _db.applied_block.connect([this](const signed_block&){ on_applied_block(); }); @@ -1849,72 +1849,36 @@ void database_api_impl::broadcast_market_updates( const market_queue_type& queue } } -void database_api_impl::on_objects_removed( const vector& objs ) +void database_api_impl::on_objects_removed( const vector& ids, const vector& objs ) { - /// we need to ensure the database_api is not deleted for the life of the async operation - if( _subscribe_callback ) - { - vector updates; + handle_object_changed(_notify_remove_create, ids, [objs](object_id_type id) -> const object* { - for( auto obj : objs ) - { - if ( is_subscribed_to_item(obj->id) ) - { - updates.push_back( fc::variant(obj->id) ); - } - } + auto it = std::find_if( + objs.begin(), objs.end(), + [id](const object* o) {return o != nullptr && o->id == id;}); - broadcast_updates( updates ); - } + if (it != objs.end()) + return *it; - if( _market_subscriptions.size() ) - { - market_queue_type broadcast_queue; - - for( const auto& obj : objs ) - { - if( obj->id.is() ) - { - enqueue_if_subscribed_to_market( obj, broadcast_queue, false ); - } - else if( obj->id.is() ) - { - enqueue_if_subscribed_to_market( obj, broadcast_queue, false ); - } - } - - broadcast_market_updates(broadcast_queue); - } + return nullptr; + }); } -void database_api_impl::check_for_market_objects(const vector& ids) +void database_api_impl::on_objects_new(const vector& ids) { - if( _market_subscriptions.size() ) - { - market_queue_type broadcast_queue; - - for(auto id : ids) - { - if( id.is() ) - { - enqueue_if_subscribed_to_market( _db.find_object(id), broadcast_queue ); - } - else if( id.is() ) - { - enqueue_if_subscribed_to_market( _db.find_object(id), broadcast_queue ); - } - } - - broadcast_market_updates(broadcast_queue); - } + handle_object_changed(_notify_remove_create, ids, + std::bind(&object_database::find_object, &_db, std::placeholders::_1) + ); } -void database_api_impl::on_objects_new(const vector& ids) +void database_api_impl::on_objects_changed(const vector& ids) { - check_for_market_objects(ids); + handle_object_changed(false, ids, + std::bind(&object_database::find_object, &_db, std::placeholders::_1) + ); } -void database_api_impl::on_objects_changed(const vector& ids) +void database_api_impl::handle_object_changed(bool force_notify, const vector& ids, std::function find_object) { if( _subscribe_callback ) { @@ -1923,9 +1887,9 @@ void database_api_impl::on_objects_changed(const vector& ids) for(auto id : ids) { const object* obj = nullptr; - if( is_subscribed_to_item(id) ) + if( force_notify || is_subscribed_to_item(id) ) { - obj = _db.find_object( id ); + obj = find_object(id); if( obj ) { updates.emplace_back( obj->to_variant() ); @@ -1936,7 +1900,24 @@ void database_api_impl::on_objects_changed(const vector& ids) broadcast_updates(updates); } - check_for_market_objects(ids); + if( _market_subscriptions.size() ) + { + market_queue_type broadcast_queue; + + for(auto id : ids) + { + if( id.is() ) + { + enqueue_if_subscribed_to_market( find_object(id), broadcast_queue ); + } + else if( id.is() ) + { + enqueue_if_subscribed_to_market( find_object(id), broadcast_queue ); + } + } + + broadcast_market_updates(broadcast_queue); + } } /** note: this method cannot yield because it is called in the middle of From 030577f6719a483314c6de7b7e42214399704adb Mon Sep 17 00:00:00 2001 From: elmato Date: Tue, 14 Feb 2017 21:41:40 +0000 Subject: [PATCH 11/16] Fix handling of events from database_object in debug_witness_plugin --- libraries/plugins/debug_witness/debug_witness.cpp | 12 +++--------- .../include/graphene/debug_witness/debug_witness.hpp | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/libraries/plugins/debug_witness/debug_witness.cpp b/libraries/plugins/debug_witness/debug_witness.cpp index 751d1e82a0..19cf0f499d 100644 --- a/libraries/plugins/debug_witness/debug_witness.cpp +++ b/libraries/plugins/debug_witness/debug_witness.cpp @@ -99,7 +99,7 @@ void debug_witness_plugin::plugin_startup() _applied_block_conn = db.applied_block.connect([this](const graphene::chain::signed_block& b){ on_applied_block(b); }); _changed_objects_conn = db.changed_objects.connect([this](const std::vector& ids){ on_changed_objects(ids); }); - _removed_objects_conn = db.removed_objects.connect([this](const std::vector& objs){ on_removed_objects(objs); }); + _removed_objects_conn = db.removed_objects.connect([this](const std::vector& ids, const std::vector& objs){ on_removed_objects(ids, objs); }); return; } @@ -112,11 +112,7 @@ void debug_witness_plugin::on_changed_objects( const std::vectorto_variant() ) << '\n'; } @@ -124,9 +120,8 @@ void debug_witness_plugin::on_changed_objects( const std::vector objs ) +void debug_witness_plugin::on_removed_objects( const std::vector& ids, const std::vector objs ) { - /* if( _json_object_stream ) { for( const graphene::db::object* obj : objs ) @@ -134,7 +129,6 @@ void debug_witness_plugin::on_removed_objects( const std::vectorid ) << "}\n"; } } - */ } void debug_witness_plugin::on_applied_block( const graphene::chain::signed_block& b ) diff --git a/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp b/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp index 0e5c173f46..fa3878910b 100644 --- a/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp +++ b/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp @@ -51,7 +51,7 @@ class debug_witness_plugin : public graphene::app::plugin { private: void on_changed_objects( const std::vector& ids ); - void on_removed_objects( const std::vector objs ); + void on_removed_objects( const std::vector& ids, const std::vector objs ); void on_applied_block( const graphene::chain::signed_block& b ); boost::program_options::variables_map _options; From 73abb804aecb24ee56e6025adcef044be899eab9 Mon Sep 17 00:00:00 2001 From: alfredo Date: Thu, 16 Feb 2017 19:33:16 -0300 Subject: [PATCH 12/16] make less false positives( no false positive given in tests with this setting) --- libraries/app/database_api.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index d460662b63..3d464dfa7a 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -295,7 +295,7 @@ void database_api_impl::set_subscribe_callback( std::function Date: Wed, 8 Mar 2017 01:37:59 +0000 Subject: [PATCH 13/16] Include information of impacted accounts relative to the objects created/changed/removed. Only extract the impacted accounts information if there are handlers defined in order prevent useless cpu usage on nodes not exposing the rpc api --- libraries/chain/db_block.cpp | 391 +++++++++++++++++- .../chain/include/graphene/chain/database.hpp | 6 +- 2 files changed, 381 insertions(+), 16 deletions(-) diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index f55f03962f..948c7a3431 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -26,18 +26,208 @@ #include #include +#include + +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #include #include #include +#include #include #include #include #include +using namespace fc; +using namespace graphene::chain; + +// TODO: Review all of these, especially no-ops +struct get_impacted_account_visitor +{ + flat_set& _impacted; + get_impacted_account_visitor( flat_set& impact ):_impacted(impact) {} + typedef void result_type; + + void operator()( const transfer_operation& op ) + { + _impacted.insert( op.to ); + } + + void operator()( const asset_claim_fees_operation& op ){} + void operator()( const limit_order_create_operation& op ) {} + void operator()( const limit_order_cancel_operation& op ) + { + _impacted.insert( op.fee_paying_account ); + } + void operator()( const call_order_update_operation& op ) {} + void operator()( const fill_order_operation& op ) + { + _impacted.insert( op.account_id ); + } + + void operator()( const account_create_operation& op ) + { + _impacted.insert( op.registrar ); + _impacted.insert( op.referrer ); + add_authority_accounts( _impacted, op.owner ); + add_authority_accounts( _impacted, op.active ); + } + + void operator()( const account_update_operation& op ) + { + _impacted.insert( op.account ); + if( op.owner ) + add_authority_accounts( _impacted, *(op.owner) ); + if( op.active ) + add_authority_accounts( _impacted, *(op.active) ); + } + + void operator()( const account_whitelist_operation& op ) + { + _impacted.insert( op.account_to_list ); + } + + void operator()( const account_upgrade_operation& op ) {} + void operator()( const account_transfer_operation& op ) + { + _impacted.insert( op.new_owner ); + } + + void operator()( const asset_create_operation& op ) {} + void operator()( const asset_update_operation& op ) + { + if( op.new_issuer ) + _impacted.insert( *(op.new_issuer) ); + } + + void operator()( const asset_update_bitasset_operation& op ) {} + void operator()( const asset_update_feed_producers_operation& op ) {} + + void operator()( const asset_issue_operation& op ) + { + _impacted.insert( op.issue_to_account ); + } + + void operator()( const asset_reserve_operation& op ) {} + void operator()( const asset_fund_fee_pool_operation& op ) {} + void operator()( const asset_settle_operation& op ) {} + void operator()( const asset_global_settle_operation& op ) {} + void operator()( const asset_publish_feed_operation& op ) {} + void operator()( const witness_create_operation& op ) + { + _impacted.insert( op.witness_account ); + } + void operator()( const witness_update_operation& op ) + { + _impacted.insert( op.witness_account ); + } + + void operator()( const proposal_create_operation& op ) + { + vector other; + for( const auto& proposed_op : op.proposed_ops ) + operation_get_required_authorities( proposed_op.op, _impacted, _impacted, other ); + for( auto& o : other ) + add_authority_accounts( _impacted, o ); + } + + void operator()( const proposal_update_operation& op ) {} + void operator()( const proposal_delete_operation& op ) {} + + void operator()( const withdraw_permission_create_operation& op ) + { + _impacted.insert( op.authorized_account ); + } + + void operator()( const withdraw_permission_update_operation& op ) + { + _impacted.insert( op.authorized_account ); + } + + void operator()( const withdraw_permission_claim_operation& op ) + { + _impacted.insert( op.withdraw_from_account ); + } + + void operator()( const withdraw_permission_delete_operation& op ) + { + _impacted.insert( op.authorized_account ); + } + + void operator()( const committee_member_create_operation& op ) + { + _impacted.insert( op.committee_member_account ); + } + void operator()( const committee_member_update_operation& op ) + { + _impacted.insert( op.committee_member_account ); + } + void operator()( const committee_member_update_global_parameters_operation& op ) {} + + void operator()( const vesting_balance_create_operation& op ) + { + _impacted.insert( op.owner ); + } + + void operator()( const vesting_balance_withdraw_operation& op ) {} + void operator()( const worker_create_operation& op ) {} + void operator()( const custom_operation& op ) {} + void operator()( const assert_operation& op ) {} + void operator()( const balance_claim_operation& op ) {} + + void operator()( const override_transfer_operation& op ) + { + _impacted.insert( op.to ); + _impacted.insert( op.from ); + _impacted.insert( op.issuer ); + } + + void operator()( const transfer_to_blind_operation& op ) + { + _impacted.insert( op.from ); + for( const auto& out : op.outputs ) + add_authority_accounts( _impacted, out.owner ); + } + + void operator()( const blind_transfer_operation& op ) + { + for( const auto& in : op.inputs ) + add_authority_accounts( _impacted, in.owner ); + for( const auto& out : op.outputs ) + add_authority_accounts( _impacted, out.owner ); + } + + void operator()( const transfer_from_blind_operation& op ) + { + _impacted.insert( op.to ); + for( const auto& in : op.inputs ) + add_authority_accounts( _impacted, in.owner ); + } + + void operator()( const asset_settle_cancel_operation& op ) + { + _impacted.insert( op.account ); + } + + void operator()( const fba_distribute_operation& op ) + { + _impacted.insert( op.account_id ); + } + +}; + namespace graphene { namespace chain { bool database::is_known_block( const block_id_type& id )const @@ -544,29 +734,204 @@ void database::_apply_block( const signed_block& next_block ) notify_changed_objects(); } FC_CAPTURE_AND_RETHROW( (next_block.block_num()) ) } + +void operation_get_impacted_accounts( const operation& op, flat_set& result ) +{ + get_impacted_account_visitor vtor = get_impacted_account_visitor( result ); + op.visit( vtor ); +} + +void transaction_get_impacted_accounts( const transaction& tx, flat_set& result ) +{ + for( const auto& op : tx.operations ) + operation_get_impacted_accounts( op, result ); +} + +void get_relevant_accounts( const object* obj, flat_set& accounts ) +{ + if( obj->id.space() == protocol_ids ) + { + switch( (object_type)obj->id.type() ) + { + case null_object_type: + case base_object_type: + case OBJECT_TYPE_COUNT: + return; + case account_object_type:{ + accounts.insert( obj->id ); + break; + } case asset_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->issuer ); + break; + } case force_settlement_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->owner ); + break; + } case committee_member_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->committee_member_account ); + break; + } case witness_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->witness_account ); + break; + } case limit_order_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->seller ); + break; + } case call_order_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->borrower ); + break; + } case custom_object_type:{ + break; + } case proposal_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + transaction_get_impacted_accounts( aobj->proposed_transaction, accounts ); + break; + } case operation_history_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + operation_get_impacted_accounts( aobj->op, accounts ); + break; + } case withdraw_permission_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->withdraw_from_account ); + accounts.insert( aobj->authorized_account ); + break; + } case vesting_balance_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->owner ); + break; + } case worker_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->worker_account ); + break; + } case balance_object_type:{ + /** these are free from any accounts */ + break; + } + } + } + else if( obj->id.space() == implementation_ids ) + { + switch( (impl_object_type)obj->id.type() ) + { + case impl_global_property_object_type: + break; + case impl_dynamic_global_property_object_type: + break; + case impl_reserved0_object_type: + break; + case impl_asset_dynamic_data_type: + break; + case impl_asset_bitasset_data_type: + break; + case impl_account_balance_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->owner ); + break; + } case impl_account_statistics_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->owner ); + break; + } case impl_transaction_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + transaction_get_impacted_accounts( aobj->trx, accounts ); + break; + } case impl_blinded_balance_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + for( const auto& a : aobj->owner.account_auths ) + accounts.insert( a.first ); + break; + } case impl_block_summary_object_type: + break; + case impl_account_transaction_history_object_type: + break; + case impl_chain_property_object_type: + break; + case impl_witness_schedule_object_type: + break; + case impl_budget_record_object_type: + break; + case impl_special_authority_object_type: + break; + case impl_buyback_object_type: + break; + case impl_fba_accumulator_object_type: + break; + } + } +} // end get_relevant_accounts( const object* obj, flat_set& accounts ) + + void database::notify_changed_objects() { try { if( _undo_db.enabled() ) { const auto& head_undo = _undo_db.head(); - vector new_ids; new_ids.reserve(head_undo.new_ids.size()); - for( const auto& item : head_undo.new_ids ) new_ids.push_back(item); - - vector changed_ids; changed_ids.reserve(head_undo.old_values.size()); - for( const auto& item : head_undo.old_values ) changed_ids.push_back(item.first); + // New + if( !new_objects.empty() ) + { + vector new_ids; new_ids.reserve(head_undo.new_ids.size()); + flat_set new_accounts_impacted; + for( const auto& item : head_undo.new_ids ) + { + new_ids.push_back(item); + auto obj = find_object(item); + if(obj != nullptr) + get_relevant_accounts(obj, new_accounts_impacted); + } + + new_objects(new_ids, new_accounts_impacted); + } - vector removed_ids; removed_ids.reserve( head_undo.removed.size() ); - vector removed; removed.reserve( head_undo.removed.size() ); - for( const auto& item : head_undo.removed ) + // Changed + if( !changed_objects.empty() ) { - removed_ids.emplace_back( item.first ); - removed.emplace_back( item.second.get() ); + vector changed_ids; changed_ids.reserve(head_undo.old_values.size()); + flat_set changed_accounts_impacted; + for( const auto& item : head_undo.old_values ) + { + changed_ids.push_back(item.first); + get_relevant_accounts(item.second.get(), changed_accounts_impacted); + } + + changed_objects(changed_ids, changed_accounts_impacted); } - new_objects(new_ids); - changed_objects(changed_ids); - removed_objects(removed_ids, removed); + // Removed + if( !removed_objects.empty() ) + { + vector removed_ids; removed_ids.reserve( head_undo.removed.size() ); + vector removed; removed.reserve( head_undo.removed.size() ); + flat_set removed_accounts_impacted; + for( const auto& item : head_undo.removed ) + { + removed_ids.emplace_back( item.first ); + auto obj = item.second.get(); + removed.emplace_back( obj ); + get_relevant_accounts(obj, removed_accounts_impacted); + } + + removed_objects(removed_ids, removed, removed_accounts_impacted); + } } } FC_CAPTURE_AND_LOG( () ) } diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp index 9e0f1af13b..4184fb1d5a 100644 --- a/libraries/chain/include/graphene/chain/database.hpp +++ b/libraries/chain/include/graphene/chain/database.hpp @@ -193,18 +193,18 @@ namespace graphene { namespace chain { * Emitted After a block has been applied and committed. The callback * should not yield and should execute quickly. */ - fc::signal&)> new_objects; + fc::signal&, const flat_set&)> new_objects; /** * Emitted After a block has been applied and committed. The callback * should not yield and should execute quickly. */ - fc::signal&)> changed_objects; + fc::signal&, const flat_set&)> changed_objects; /** this signal is emitted any time an object is removed and contains a * pointer to the last value of every object that was removed. */ - fc::signal&, const vector&)> removed_objects; + fc::signal&, const vector&, const flat_set&)> removed_objects; //////////////////// db_witness_schedule.cpp //////////////////// From aab5fddb2f6521fbc0720eea45392d7c7361e42d Mon Sep 17 00:00:00 2001 From: elmato Date: Wed, 8 Mar 2017 01:50:01 +0000 Subject: [PATCH 14/16] Keep track of subscribed accounts and check for events that reference them --- libraries/app/database_api.cpp | 85 +++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 32 deletions(-) diff --git a/libraries/app/database_api.cpp b/libraries/app/database_api.cpp index 3d464dfa7a..a09c5f7623 100644 --- a/libraries/app/database_api.cpp +++ b/libraries/app/database_api.cpp @@ -166,6 +166,16 @@ class database_api_impl : public std::enable_shared_from_this return _subscribe_filter.contains( i ); } + bool is_impacted_account( const flat_set& accounts) + { + if( !_subscribed_accounts.size() || !accounts.size() ) + return false; + + return std::any_of(accounts.begin(), accounts.end(), [this](const account_id_type& account) { + return _subscribed_accounts.find(account) != _subscribed_accounts.end(); + }); + } + template void enqueue_if_subscribed_to_market(const object* obj, market_queue_type& queue, bool full_object=true) { @@ -182,16 +192,17 @@ class database_api_impl : public std::enable_shared_from_this void broadcast_updates( const vector& updates ); void broadcast_market_updates( const market_queue_type& queue); - void handle_object_changed(bool force_notify, const vector& ids, std::function find_object); + void handle_object_changed(bool force_notify, bool full_object, const vector& ids, const flat_set& impacted_accounts, std::function find_object); /** called every time a block is applied to report the objects that were changed */ - void on_objects_new(const vector& ids); - void on_objects_changed(const vector& ids); - void on_objects_removed(const vector& ids, const vector& objs); + void on_objects_new(const vector& ids, const flat_set& impacted_accounts); + void on_objects_changed(const vector& ids, const flat_set& impacted_accounts); + void on_objects_removed(const vector& ids, const vector& objs, const flat_set& impacted_accounts); void on_applied_block(); bool _notify_remove_create = false; mutable fc::bloom_filter _subscribe_filter; + std::set _subscribed_accounts; std::function _subscribe_callback; std::function _pending_trx_callback; std::function _block_applied_callback; @@ -219,14 +230,14 @@ database_api::~database_api() {} database_api_impl::database_api_impl( graphene::chain::database& db ):_db(db) { wlog("creating database api ${x}", ("x",int64_t(this)) ); - _new_connection = _db.new_objects.connect([this](const vector& ids) { - on_objects_new(ids); + _new_connection = _db.new_objects.connect([this](const vector& ids, const flat_set& impacted_accounts) { + on_objects_new(ids, impacted_accounts); }); - _change_connection = _db.changed_objects.connect([this](const vector& ids) { - on_objects_changed(ids); + _change_connection = _db.changed_objects.connect([this](const vector& ids, const flat_set& impacted_accounts) { + on_objects_changed(ids, impacted_accounts); }); - _removed_connection = _db.removed_objects.connect([this](const vector& ids, const vector& objs) { - on_objects_removed(ids, objs); + _removed_connection = _db.removed_objects.connect([this](const vector& ids, const vector& objs, const flat_set& impacted_accounts) { + on_objects_removed(ids, objs, impacted_accounts); }); _applied_block_connection = _db.applied_block.connect([this](const signed_block&){ on_applied_block(); }); @@ -292,6 +303,7 @@ void database_api_impl::set_subscribe_callback( std::function database_api_impl::get_full_accounts( const if( subscribe ) { + FC_ASSERT( std::distance(_subscribed_accounts.begin(), _subscribed_accounts.end()) < 100 ); + _subscribed_accounts.insert( account->get_id() ); subscribe_to_item( account->id ); } @@ -1849,36 +1863,37 @@ void database_api_impl::broadcast_market_updates( const market_queue_type& queue } } -void database_api_impl::on_objects_removed( const vector& ids, const vector& objs ) +void database_api_impl::on_objects_removed( const vector& ids, const vector& objs, const flat_set& impacted_accounts) { - handle_object_changed(_notify_remove_create, ids, [objs](object_id_type id) -> const object* { - - auto it = std::find_if( - objs.begin(), objs.end(), - [id](const object* o) {return o != nullptr && o->id == id;}); + handle_object_changed(_notify_remove_create, false, ids, impacted_accounts, + [objs](object_id_type id) -> const object* { + auto it = std::find_if( + objs.begin(), objs.end(), + [id](const object* o) {return o != nullptr && o->id == id;}); - if (it != objs.end()) - return *it; + if (it != objs.end()) + return *it; - return nullptr; - }); + return nullptr; + } + ); } -void database_api_impl::on_objects_new(const vector& ids) +void database_api_impl::on_objects_new(const vector& ids, const flat_set& impacted_accounts) { - handle_object_changed(_notify_remove_create, ids, + handle_object_changed(_notify_remove_create, true, ids, impacted_accounts, std::bind(&object_database::find_object, &_db, std::placeholders::_1) ); } -void database_api_impl::on_objects_changed(const vector& ids) +void database_api_impl::on_objects_changed(const vector& ids, const flat_set& impacted_accounts) { - handle_object_changed(false, ids, + handle_object_changed(false, true, ids, impacted_accounts, std::bind(&object_database::find_object, &_db, std::placeholders::_1) ); } -void database_api_impl::handle_object_changed(bool force_notify, const vector& ids, std::function find_object) +void database_api_impl::handle_object_changed(bool force_notify, bool full_object, const vector& ids, const flat_set& impacted_accounts, std::function find_object) { if( _subscribe_callback ) { @@ -1886,13 +1901,19 @@ void database_api_impl::handle_object_changed(bool force_notify, const vectorto_variant() ); + } + } + else { - updates.emplace_back( obj->to_variant() ); + updates.emplace_back( id ); } } } @@ -1908,11 +1929,11 @@ void database_api_impl::handle_object_changed(bool force_notify, const vector() ) { - enqueue_if_subscribed_to_market( find_object(id), broadcast_queue ); + enqueue_if_subscribed_to_market( find_object(id), broadcast_queue, full_object ); } else if( id.is() ) { - enqueue_if_subscribed_to_market( find_object(id), broadcast_queue ); + enqueue_if_subscribed_to_market( find_object(id), broadcast_queue, full_object ); } } From cff792a740d5694b4e0ad94f6039b0d1693ead3a Mon Sep 17 00:00:00 2001 From: elmato Date: Wed, 8 Mar 2017 01:52:25 +0000 Subject: [PATCH 15/16] debug_witness: Handle new params in changed/remove signals from database --- libraries/plugins/debug_witness/debug_witness.cpp | 8 ++++---- .../include/graphene/debug_witness/debug_witness.hpp | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libraries/plugins/debug_witness/debug_witness.cpp b/libraries/plugins/debug_witness/debug_witness.cpp index 19cf0f499d..17f852c52b 100644 --- a/libraries/plugins/debug_witness/debug_witness.cpp +++ b/libraries/plugins/debug_witness/debug_witness.cpp @@ -98,13 +98,13 @@ void debug_witness_plugin::plugin_startup() // connect needed signals _applied_block_conn = db.applied_block.connect([this](const graphene::chain::signed_block& b){ on_applied_block(b); }); - _changed_objects_conn = db.changed_objects.connect([this](const std::vector& ids){ on_changed_objects(ids); }); - _removed_objects_conn = db.removed_objects.connect([this](const std::vector& ids, const std::vector& objs){ on_removed_objects(ids, objs); }); + _changed_objects_conn = db.changed_objects.connect([this](const std::vector& ids, const fc::flat_set& impacted_accounts){ on_changed_objects(ids, impacted_accounts); }); + _removed_objects_conn = db.removed_objects.connect([this](const std::vector& ids, const std::vector& objs, const fc::flat_set& impacted_accounts){ on_removed_objects(ids, objs, impacted_accounts); }); return; } -void debug_witness_plugin::on_changed_objects( const std::vector& ids ) +void debug_witness_plugin::on_changed_objects( const std::vector& ids, const fc::flat_set& impacted_accounts ) { if( _json_object_stream && (ids.size() > 0) ) { @@ -120,7 +120,7 @@ void debug_witness_plugin::on_changed_objects( const std::vector& ids, const std::vector objs ) +void debug_witness_plugin::on_removed_objects( const std::vector& ids, const std::vector objs, const fc::flat_set& impacted_accounts ) { if( _json_object_stream ) { diff --git a/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp b/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp index fa3878910b..907d26ae9a 100644 --- a/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp +++ b/libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp @@ -25,8 +25,10 @@ #include #include +#include #include +#include namespace graphene { namespace debug_witness_plugin { @@ -50,8 +52,8 @@ class debug_witness_plugin : public graphene::app::plugin { private: - void on_changed_objects( const std::vector& ids ); - void on_removed_objects( const std::vector& ids, const std::vector objs ); + void on_changed_objects( const std::vector& ids, const fc::flat_set& impacted_accounts ); + void on_removed_objects( const std::vector& ids, const std::vector objs, const fc::flat_set& impacted_accounts ); void on_applied_block( const graphene::chain::signed_block& b ); boost::program_options::variables_map _options; From 3eb160bed1299ba7b1ec91eec4642868ece03b4a Mon Sep 17 00:00:00 2001 From: elmato Date: Wed, 22 Mar 2017 22:03:45 +0000 Subject: [PATCH 16/16] Move notification related functions from db_block.cpp to db_notify.cpp --- libraries/chain/database.cpp | 1 + libraries/chain/db_block.cpp | 390 +-------------------------------- libraries/chain/db_notify.cpp | 392 ++++++++++++++++++++++++++++++++++ 3 files changed, 394 insertions(+), 389 deletions(-) create mode 100644 libraries/chain/db_notify.cpp diff --git a/libraries/chain/database.cpp b/libraries/chain/database.cpp index aa9f61273b..2d02b1840e 100644 --- a/libraries/chain/database.cpp +++ b/libraries/chain/database.cpp @@ -32,3 +32,4 @@ #include "db_market.cpp" #include "db_update.cpp" #include "db_witness_schedule.cpp" +#include "db_notify.cpp" \ No newline at end of file diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp index 948c7a3431..d3d9a1d3f8 100644 --- a/libraries/chain/db_block.cpp +++ b/libraries/chain/db_block.cpp @@ -26,208 +26,19 @@ #include #include -#include - -#include -#include -#include -#include -#include -#include -#include - #include #include #include -#include + #include #include #include -#include #include #include #include #include -using namespace fc; -using namespace graphene::chain; - -// TODO: Review all of these, especially no-ops -struct get_impacted_account_visitor -{ - flat_set& _impacted; - get_impacted_account_visitor( flat_set& impact ):_impacted(impact) {} - typedef void result_type; - - void operator()( const transfer_operation& op ) - { - _impacted.insert( op.to ); - } - - void operator()( const asset_claim_fees_operation& op ){} - void operator()( const limit_order_create_operation& op ) {} - void operator()( const limit_order_cancel_operation& op ) - { - _impacted.insert( op.fee_paying_account ); - } - void operator()( const call_order_update_operation& op ) {} - void operator()( const fill_order_operation& op ) - { - _impacted.insert( op.account_id ); - } - - void operator()( const account_create_operation& op ) - { - _impacted.insert( op.registrar ); - _impacted.insert( op.referrer ); - add_authority_accounts( _impacted, op.owner ); - add_authority_accounts( _impacted, op.active ); - } - - void operator()( const account_update_operation& op ) - { - _impacted.insert( op.account ); - if( op.owner ) - add_authority_accounts( _impacted, *(op.owner) ); - if( op.active ) - add_authority_accounts( _impacted, *(op.active) ); - } - - void operator()( const account_whitelist_operation& op ) - { - _impacted.insert( op.account_to_list ); - } - - void operator()( const account_upgrade_operation& op ) {} - void operator()( const account_transfer_operation& op ) - { - _impacted.insert( op.new_owner ); - } - - void operator()( const asset_create_operation& op ) {} - void operator()( const asset_update_operation& op ) - { - if( op.new_issuer ) - _impacted.insert( *(op.new_issuer) ); - } - - void operator()( const asset_update_bitasset_operation& op ) {} - void operator()( const asset_update_feed_producers_operation& op ) {} - - void operator()( const asset_issue_operation& op ) - { - _impacted.insert( op.issue_to_account ); - } - - void operator()( const asset_reserve_operation& op ) {} - void operator()( const asset_fund_fee_pool_operation& op ) {} - void operator()( const asset_settle_operation& op ) {} - void operator()( const asset_global_settle_operation& op ) {} - void operator()( const asset_publish_feed_operation& op ) {} - void operator()( const witness_create_operation& op ) - { - _impacted.insert( op.witness_account ); - } - void operator()( const witness_update_operation& op ) - { - _impacted.insert( op.witness_account ); - } - - void operator()( const proposal_create_operation& op ) - { - vector other; - for( const auto& proposed_op : op.proposed_ops ) - operation_get_required_authorities( proposed_op.op, _impacted, _impacted, other ); - for( auto& o : other ) - add_authority_accounts( _impacted, o ); - } - - void operator()( const proposal_update_operation& op ) {} - void operator()( const proposal_delete_operation& op ) {} - - void operator()( const withdraw_permission_create_operation& op ) - { - _impacted.insert( op.authorized_account ); - } - - void operator()( const withdraw_permission_update_operation& op ) - { - _impacted.insert( op.authorized_account ); - } - - void operator()( const withdraw_permission_claim_operation& op ) - { - _impacted.insert( op.withdraw_from_account ); - } - - void operator()( const withdraw_permission_delete_operation& op ) - { - _impacted.insert( op.authorized_account ); - } - - void operator()( const committee_member_create_operation& op ) - { - _impacted.insert( op.committee_member_account ); - } - void operator()( const committee_member_update_operation& op ) - { - _impacted.insert( op.committee_member_account ); - } - void operator()( const committee_member_update_global_parameters_operation& op ) {} - - void operator()( const vesting_balance_create_operation& op ) - { - _impacted.insert( op.owner ); - } - - void operator()( const vesting_balance_withdraw_operation& op ) {} - void operator()( const worker_create_operation& op ) {} - void operator()( const custom_operation& op ) {} - void operator()( const assert_operation& op ) {} - void operator()( const balance_claim_operation& op ) {} - - void operator()( const override_transfer_operation& op ) - { - _impacted.insert( op.to ); - _impacted.insert( op.from ); - _impacted.insert( op.issuer ); - } - - void operator()( const transfer_to_blind_operation& op ) - { - _impacted.insert( op.from ); - for( const auto& out : op.outputs ) - add_authority_accounts( _impacted, out.owner ); - } - - void operator()( const blind_transfer_operation& op ) - { - for( const auto& in : op.inputs ) - add_authority_accounts( _impacted, in.owner ); - for( const auto& out : op.outputs ) - add_authority_accounts( _impacted, out.owner ); - } - - void operator()( const transfer_from_blind_operation& op ) - { - _impacted.insert( op.to ); - for( const auto& in : op.inputs ) - add_authority_accounts( _impacted, in.owner ); - } - - void operator()( const asset_settle_cancel_operation& op ) - { - _impacted.insert( op.account ); - } - - void operator()( const fba_distribute_operation& op ) - { - _impacted.insert( op.account_id ); - } - -}; - namespace graphene { namespace chain { bool database::is_known_block( const block_id_type& id )const @@ -735,205 +546,6 @@ void database::_apply_block( const signed_block& next_block ) } FC_CAPTURE_AND_RETHROW( (next_block.block_num()) ) } -void operation_get_impacted_accounts( const operation& op, flat_set& result ) -{ - get_impacted_account_visitor vtor = get_impacted_account_visitor( result ); - op.visit( vtor ); -} - -void transaction_get_impacted_accounts( const transaction& tx, flat_set& result ) -{ - for( const auto& op : tx.operations ) - operation_get_impacted_accounts( op, result ); -} - -void get_relevant_accounts( const object* obj, flat_set& accounts ) -{ - if( obj->id.space() == protocol_ids ) - { - switch( (object_type)obj->id.type() ) - { - case null_object_type: - case base_object_type: - case OBJECT_TYPE_COUNT: - return; - case account_object_type:{ - accounts.insert( obj->id ); - break; - } case asset_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->issuer ); - break; - } case force_settlement_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->owner ); - break; - } case committee_member_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->committee_member_account ); - break; - } case witness_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->witness_account ); - break; - } case limit_order_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->seller ); - break; - } case call_order_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->borrower ); - break; - } case custom_object_type:{ - break; - } case proposal_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - transaction_get_impacted_accounts( aobj->proposed_transaction, accounts ); - break; - } case operation_history_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - operation_get_impacted_accounts( aobj->op, accounts ); - break; - } case withdraw_permission_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->withdraw_from_account ); - accounts.insert( aobj->authorized_account ); - break; - } case vesting_balance_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->owner ); - break; - } case worker_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->worker_account ); - break; - } case balance_object_type:{ - /** these are free from any accounts */ - break; - } - } - } - else if( obj->id.space() == implementation_ids ) - { - switch( (impl_object_type)obj->id.type() ) - { - case impl_global_property_object_type: - break; - case impl_dynamic_global_property_object_type: - break; - case impl_reserved0_object_type: - break; - case impl_asset_dynamic_data_type: - break; - case impl_asset_bitasset_data_type: - break; - case impl_account_balance_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->owner ); - break; - } case impl_account_statistics_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - accounts.insert( aobj->owner ); - break; - } case impl_transaction_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - transaction_get_impacted_accounts( aobj->trx, accounts ); - break; - } case impl_blinded_balance_object_type:{ - const auto& aobj = dynamic_cast(obj); - assert( aobj != nullptr ); - for( const auto& a : aobj->owner.account_auths ) - accounts.insert( a.first ); - break; - } case impl_block_summary_object_type: - break; - case impl_account_transaction_history_object_type: - break; - case impl_chain_property_object_type: - break; - case impl_witness_schedule_object_type: - break; - case impl_budget_record_object_type: - break; - case impl_special_authority_object_type: - break; - case impl_buyback_object_type: - break; - case impl_fba_accumulator_object_type: - break; - } - } -} // end get_relevant_accounts( const object* obj, flat_set& accounts ) - - -void database::notify_changed_objects() -{ try { - if( _undo_db.enabled() ) - { - const auto& head_undo = _undo_db.head(); - - // New - if( !new_objects.empty() ) - { - vector new_ids; new_ids.reserve(head_undo.new_ids.size()); - flat_set new_accounts_impacted; - for( const auto& item : head_undo.new_ids ) - { - new_ids.push_back(item); - auto obj = find_object(item); - if(obj != nullptr) - get_relevant_accounts(obj, new_accounts_impacted); - } - - new_objects(new_ids, new_accounts_impacted); - } - - // Changed - if( !changed_objects.empty() ) - { - vector changed_ids; changed_ids.reserve(head_undo.old_values.size()); - flat_set changed_accounts_impacted; - for( const auto& item : head_undo.old_values ) - { - changed_ids.push_back(item.first); - get_relevant_accounts(item.second.get(), changed_accounts_impacted); - } - - changed_objects(changed_ids, changed_accounts_impacted); - } - - // Removed - if( !removed_objects.empty() ) - { - vector removed_ids; removed_ids.reserve( head_undo.removed.size() ); - vector removed; removed.reserve( head_undo.removed.size() ); - flat_set removed_accounts_impacted; - for( const auto& item : head_undo.removed ) - { - removed_ids.emplace_back( item.first ); - auto obj = item.second.get(); - removed.emplace_back( obj ); - get_relevant_accounts(obj, removed_accounts_impacted); - } - - removed_objects(removed_ids, removed, removed_accounts_impacted); - } - } -} FC_CAPTURE_AND_LOG( () ) } processed_transaction database::apply_transaction(const signed_transaction& trx, uint32_t skip) { diff --git a/libraries/chain/db_notify.cpp b/libraries/chain/db_notify.cpp new file mode 100644 index 0000000000..7b5375ccba --- /dev/null +++ b/libraries/chain/db_notify.cpp @@ -0,0 +1,392 @@ +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace fc; +using namespace graphene::chain; + +// TODO: Review all of these, especially no-ops +struct get_impacted_account_visitor +{ + flat_set& _impacted; + get_impacted_account_visitor( flat_set& impact ):_impacted(impact) {} + typedef void result_type; + + void operator()( const transfer_operation& op ) + { + _impacted.insert( op.to ); + } + + void operator()( const asset_claim_fees_operation& op ){} + void operator()( const limit_order_create_operation& op ) {} + void operator()( const limit_order_cancel_operation& op ) + { + _impacted.insert( op.fee_paying_account ); + } + void operator()( const call_order_update_operation& op ) {} + void operator()( const fill_order_operation& op ) + { + _impacted.insert( op.account_id ); + } + + void operator()( const account_create_operation& op ) + { + _impacted.insert( op.registrar ); + _impacted.insert( op.referrer ); + add_authority_accounts( _impacted, op.owner ); + add_authority_accounts( _impacted, op.active ); + } + + void operator()( const account_update_operation& op ) + { + _impacted.insert( op.account ); + if( op.owner ) + add_authority_accounts( _impacted, *(op.owner) ); + if( op.active ) + add_authority_accounts( _impacted, *(op.active) ); + } + + void operator()( const account_whitelist_operation& op ) + { + _impacted.insert( op.account_to_list ); + } + + void operator()( const account_upgrade_operation& op ) {} + void operator()( const account_transfer_operation& op ) + { + _impacted.insert( op.new_owner ); + } + + void operator()( const asset_create_operation& op ) {} + void operator()( const asset_update_operation& op ) + { + if( op.new_issuer ) + _impacted.insert( *(op.new_issuer) ); + } + + void operator()( const asset_update_bitasset_operation& op ) {} + void operator()( const asset_update_feed_producers_operation& op ) {} + + void operator()( const asset_issue_operation& op ) + { + _impacted.insert( op.issue_to_account ); + } + + void operator()( const asset_reserve_operation& op ) {} + void operator()( const asset_fund_fee_pool_operation& op ) {} + void operator()( const asset_settle_operation& op ) {} + void operator()( const asset_global_settle_operation& op ) {} + void operator()( const asset_publish_feed_operation& op ) {} + void operator()( const witness_create_operation& op ) + { + _impacted.insert( op.witness_account ); + } + void operator()( const witness_update_operation& op ) + { + _impacted.insert( op.witness_account ); + } + + void operator()( const proposal_create_operation& op ) + { + vector other; + for( const auto& proposed_op : op.proposed_ops ) + operation_get_required_authorities( proposed_op.op, _impacted, _impacted, other ); + for( auto& o : other ) + add_authority_accounts( _impacted, o ); + } + + void operator()( const proposal_update_operation& op ) {} + void operator()( const proposal_delete_operation& op ) {} + + void operator()( const withdraw_permission_create_operation& op ) + { + _impacted.insert( op.authorized_account ); + } + + void operator()( const withdraw_permission_update_operation& op ) + { + _impacted.insert( op.authorized_account ); + } + + void operator()( const withdraw_permission_claim_operation& op ) + { + _impacted.insert( op.withdraw_from_account ); + } + + void operator()( const withdraw_permission_delete_operation& op ) + { + _impacted.insert( op.authorized_account ); + } + + void operator()( const committee_member_create_operation& op ) + { + _impacted.insert( op.committee_member_account ); + } + void operator()( const committee_member_update_operation& op ) + { + _impacted.insert( op.committee_member_account ); + } + void operator()( const committee_member_update_global_parameters_operation& op ) {} + + void operator()( const vesting_balance_create_operation& op ) + { + _impacted.insert( op.owner ); + } + + void operator()( const vesting_balance_withdraw_operation& op ) {} + void operator()( const worker_create_operation& op ) {} + void operator()( const custom_operation& op ) {} + void operator()( const assert_operation& op ) {} + void operator()( const balance_claim_operation& op ) {} + + void operator()( const override_transfer_operation& op ) + { + _impacted.insert( op.to ); + _impacted.insert( op.from ); + _impacted.insert( op.issuer ); + } + + void operator()( const transfer_to_blind_operation& op ) + { + _impacted.insert( op.from ); + for( const auto& out : op.outputs ) + add_authority_accounts( _impacted, out.owner ); + } + + void operator()( const blind_transfer_operation& op ) + { + for( const auto& in : op.inputs ) + add_authority_accounts( _impacted, in.owner ); + for( const auto& out : op.outputs ) + add_authority_accounts( _impacted, out.owner ); + } + + void operator()( const transfer_from_blind_operation& op ) + { + _impacted.insert( op.to ); + for( const auto& in : op.inputs ) + add_authority_accounts( _impacted, in.owner ); + } + + void operator()( const asset_settle_cancel_operation& op ) + { + _impacted.insert( op.account ); + } + + void operator()( const fba_distribute_operation& op ) + { + _impacted.insert( op.account_id ); + } + +}; + +void operation_get_impacted_accounts( const operation& op, flat_set& result ) +{ + get_impacted_account_visitor vtor = get_impacted_account_visitor( result ); + op.visit( vtor ); +} + +void transaction_get_impacted_accounts( const transaction& tx, flat_set& result ) +{ + for( const auto& op : tx.operations ) + operation_get_impacted_accounts( op, result ); +} + +void get_relevant_accounts( const object* obj, flat_set& accounts ) +{ + if( obj->id.space() == protocol_ids ) + { + switch( (object_type)obj->id.type() ) + { + case null_object_type: + case base_object_type: + case OBJECT_TYPE_COUNT: + return; + case account_object_type:{ + accounts.insert( obj->id ); + break; + } case asset_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->issuer ); + break; + } case force_settlement_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->owner ); + break; + } case committee_member_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->committee_member_account ); + break; + } case witness_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->witness_account ); + break; + } case limit_order_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->seller ); + break; + } case call_order_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->borrower ); + break; + } case custom_object_type:{ + break; + } case proposal_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + transaction_get_impacted_accounts( aobj->proposed_transaction, accounts ); + break; + } case operation_history_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + operation_get_impacted_accounts( aobj->op, accounts ); + break; + } case withdraw_permission_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->withdraw_from_account ); + accounts.insert( aobj->authorized_account ); + break; + } case vesting_balance_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->owner ); + break; + } case worker_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->worker_account ); + break; + } case balance_object_type:{ + /** these are free from any accounts */ + break; + } + } + } + else if( obj->id.space() == implementation_ids ) + { + switch( (impl_object_type)obj->id.type() ) + { + case impl_global_property_object_type: + break; + case impl_dynamic_global_property_object_type: + break; + case impl_reserved0_object_type: + break; + case impl_asset_dynamic_data_type: + break; + case impl_asset_bitasset_data_type: + break; + case impl_account_balance_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->owner ); + break; + } case impl_account_statistics_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + accounts.insert( aobj->owner ); + break; + } case impl_transaction_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + transaction_get_impacted_accounts( aobj->trx, accounts ); + break; + } case impl_blinded_balance_object_type:{ + const auto& aobj = dynamic_cast(obj); + assert( aobj != nullptr ); + for( const auto& a : aobj->owner.account_auths ) + accounts.insert( a.first ); + break; + } case impl_block_summary_object_type: + break; + case impl_account_transaction_history_object_type: + break; + case impl_chain_property_object_type: + break; + case impl_witness_schedule_object_type: + break; + case impl_budget_record_object_type: + break; + case impl_special_authority_object_type: + break; + case impl_buyback_object_type: + break; + case impl_fba_accumulator_object_type: + break; + } + } +} // end get_relevant_accounts( const object* obj, flat_set& accounts ) + +namespace graphene { namespace chain { + +void database::notify_changed_objects() +{ try { + if( _undo_db.enabled() ) + { + const auto& head_undo = _undo_db.head(); + + // New + if( !new_objects.empty() ) + { + vector new_ids; new_ids.reserve(head_undo.new_ids.size()); + flat_set new_accounts_impacted; + for( const auto& item : head_undo.new_ids ) + { + new_ids.push_back(item); + auto obj = find_object(item); + if(obj != nullptr) + get_relevant_accounts(obj, new_accounts_impacted); + } + + new_objects(new_ids, new_accounts_impacted); + } + + // Changed + if( !changed_objects.empty() ) + { + vector changed_ids; changed_ids.reserve(head_undo.old_values.size()); + flat_set changed_accounts_impacted; + for( const auto& item : head_undo.old_values ) + { + changed_ids.push_back(item.first); + get_relevant_accounts(item.second.get(), changed_accounts_impacted); + } + + changed_objects(changed_ids, changed_accounts_impacted); + } + + // Removed + if( !removed_objects.empty() ) + { + vector removed_ids; removed_ids.reserve( head_undo.removed.size() ); + vector removed; removed.reserve( head_undo.removed.size() ); + flat_set removed_accounts_impacted; + for( const auto& item : head_undo.removed ) + { + removed_ids.emplace_back( item.first ); + auto obj = item.second.get(); + removed.emplace_back( obj ); + get_relevant_accounts(obj, removed_accounts_impacted); + } + + removed_objects(removed_ids, removed, removed_accounts_impacted); + } + } +} FC_CAPTURE_AND_LOG( () ) } + +} } \ No newline at end of file