From b3904bb2e6bba0c1da9f9df47c30dcae6b37f025 Mon Sep 17 00:00:00 2001 From: Srdjan Obucina Date: Thu, 20 Feb 2020 23:43:37 +0100 Subject: [PATCH] Withdrawal refactoring --- .../graphene/peerplays_sidechain/sidechain_net_handler.hpp | 2 ++ .../peerplays_sidechain/sidechain_net_handler_bitcoin.hpp | 2 ++ .../peerplays_sidechain/sidechain_net_handler_peerplays.hpp | 2 ++ .../plugins/peerplays_sidechain/sidechain_net_handler.cpp | 4 ++++ .../peerplays_sidechain/sidechain_net_handler_bitcoin.cpp | 6 ++++++ .../peerplays_sidechain/sidechain_net_handler_peerplays.cpp | 6 ++++++ 6 files changed, 22 insertions(+) diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp index 537d892d..fe042306 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler.hpp @@ -23,7 +23,9 @@ public: virtual void recreate_primary_wallet() = 0; virtual void process_deposits() = 0; + virtual void process_deposit(const son_wallet_deposit_object& swdo) = 0; virtual void process_withdrawals() = 0; + virtual void process_withdrawal(const son_wallet_withdraw_object& swwo) = 0; protected: peerplays_sidechain_plugin& plugin; diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp index b4ec347e..6128ced8 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_bitcoin.hpp @@ -72,7 +72,9 @@ public: void recreate_primary_wallet(); void process_deposits(); + void process_deposit(const son_wallet_deposit_object& swdo); void process_withdrawals(); + void process_withdrawal(const son_wallet_withdraw_object& swwo); std::string create_multisignature_wallet( const std::vector public_keys ); std::string transfer( const std::string& from, const std::string& to, const uint64_t amount ); diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_peerplays.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_peerplays.hpp index 90b7cb3c..13d5de52 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_peerplays.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/sidechain_net_handler_peerplays.hpp @@ -15,7 +15,9 @@ public: void recreate_primary_wallet(); void process_deposits(); + void process_deposit(const son_wallet_deposit_object& swdo); void process_withdrawals(); + void process_withdrawal(const son_wallet_withdraw_object& swwo); std::string create_multisignature_wallet( const std::vector public_keys ); std::string transfer( const std::string& from, const std::string& to, const uint64_t amount ); diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp index 1f201106..e89bd9c8 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp @@ -158,6 +158,8 @@ void sidechain_net_handler::process_deposits() { std::for_each(idx_range.first, idx_range.second, [&] (const son_wallet_deposit_object& swdo) { + process_deposit(swdo); + const chain::global_property_object& gpo = plugin.database().get_global_properties(); for (son_id_type son_id : plugin.get_sons()) { @@ -196,6 +198,8 @@ void sidechain_net_handler::process_withdrawals() { std::for_each(idx_range.first, idx_range.second, [&] (const son_wallet_withdraw_object& swwo) { + process_withdrawal(swwo); + const chain::global_property_object& gpo = plugin.database().get_global_properties(); for (son_id_type son_id : plugin.get_sons()) { diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp index c0e8c5f6..9dd5ab39 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp @@ -428,10 +428,16 @@ void sidechain_net_handler_bitcoin::process_deposits() { sidechain_net_handler::process_deposits(); } +void sidechain_net_handler_bitcoin::process_deposit(const son_wallet_deposit_object& swdo) { +} + void sidechain_net_handler_bitcoin::process_withdrawals() { sidechain_net_handler::process_withdrawals(); } +void sidechain_net_handler_bitcoin::process_withdrawal(const son_wallet_withdraw_object& swwo) { +} + std::string sidechain_net_handler_bitcoin::create_multisignature_wallet( const std::vector public_keys ) { return bitcoin_client->add_multisig_address(public_keys); } diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp index 609616f2..bfdd5370 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp @@ -35,10 +35,16 @@ void sidechain_net_handler_peerplays::process_deposits() { sidechain_net_handler::process_deposits(); } +void sidechain_net_handler_peerplays::process_deposit(const son_wallet_deposit_object& swdo) { +} + void sidechain_net_handler_peerplays::process_withdrawals() { sidechain_net_handler::process_withdrawals(); } +void sidechain_net_handler_peerplays::process_withdrawal(const son_wallet_withdraw_object& swwo) { +} + std::string sidechain_net_handler_peerplays::create_multisignature_wallet( const std::vector public_keys ) { return ""; }