Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Refactor on_changed_objects, move it into task

Browse source
This commit is contained in:
Srdjan Obucina 2020-03-22 21:07:21 +01:00
parent 0d5237dd20
commit dff785667e
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp
View file

@ -100,6 +100,8 @@ private:
std::unique_ptr<bitcoin_rpc_client> bitcoin_client;
std::unique_ptr<zmq_listener> listener;
fc::future<void> on_changed_objects_task;
std::string create_transaction(const std::vector<btc_txout> &inputs, const fc::flat_map<std::string, double> outputs);
std::string sign_transaction(const std::string &tx, bool &complete);
bool send_transaction(const std::string &tx);
@ -115,6 +117,7 @@ private:
void handle_event(const std::string &event_data);
std::vector<info_for_vin> extract_info_from_block(const std::string &_block);
void on_changed_objects(const vector<object_id_type> &ids, const flat_set<account_id_type> &accounts);
void on_changed_objects_cb(const vector<object_id_type> &ids, const flat_set<account_id_type> &accounts);
};
}} // namespace graphene::peerplays_sidechain

21
libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp
View file

@ -795,6 +795,15 @@ sidechain_net_handler_bitcoin::sidechain_net_handler_bitcoin(peerplays_sidechain
}
sidechain_net_handler_bitcoin::~sidechain_net_handler_bitcoin() {
try {
if (on_changed_objects_task.valid()) {
on_changed_objects_task.cancel_and_wait(__FUNCTION__);
}
} catch (fc::canceled_exception &) {
//Expected exception. Move along.
} catch (fc::exception &e) {
edump((e.to_detail_string()));
}
}
void sidechain_net_handler_bitcoin::recreate_primary_wallet() {
@ -1350,6 +1359,18 @@ std::vector<info_for_vin> sidechain_net_handler_bitcoin::extract_info_from_block
}
void sidechain_net_handler_bitcoin::on_changed_objects(const vector<object_id_type> &ids, const flat_set<account_id_type> &accounts) {
fc::time_point now = fc::time_point::now();
int64_t time_to_next_changed_objects_processing = 5000;
fc::time_point next_wakeup(now + fc::microseconds(time_to_next_changed_objects_processing));
on_changed_objects_task = fc::schedule([this, ids, accounts] {
on_changed_objects_cb(ids, accounts);
},
next_wakeup, "SON Processing");
}
void sidechain_net_handler_bitcoin::on_changed_objects_cb(const vector<object_id_type> &ids, const flat_set<account_id_type> &accounts) {
for (auto id : ids) {
if (id.is<son_wallet_object>()) {
const auto &swi = database.get_index_type<son_wallet_index>().indices().get<by_id>();