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 f3a7aa41..833cfff6 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 @@ -35,11 +35,6 @@ protected: std::map private_keys; - virtual std::string create_multisignature_wallet(const std::vector public_keys) = 0; - virtual std::string transfer(const std::string &from, const std::string &to, const uint64_t amount) = 0; - virtual std::string sign_transaction(const std::string &transaction) = 0; - virtual std::string send_transaction(const std::string &transaction) = 0; - private: }; 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 09799832..8deaf26d 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 @@ -22,7 +22,6 @@ public: class bitcoin_rpc_client { public: bitcoin_rpc_client(std::string _ip, uint32_t _rpc, std::string _user, std::string _password, std::string _wallet, std::string _wallet_password); - bool connection_is_not_defined() const; std::string addmultisigaddress(const std::vector public_keys); std::string createpsbt(const std::vector &ins, const fc::flat_map outs); @@ -64,9 +63,6 @@ private: class zmq_listener { public: zmq_listener(std::string _ip, uint32_t _zmq); - bool connection_is_not_defined() const { - return zmq_port == 0; - } fc::signal event_received; @@ -104,10 +100,6 @@ private: std::unique_ptr bitcoin_client; std::unique_ptr listener; - 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); - std::string sign_transaction(const std::string &transaction); - std::string send_transaction(const std::string &transaction); std::string sign_and_send_transaction_with_wallet(const std::string &tx_json); std::string processpsbt(const std::string &tx_psbt); std::string transfer_all_btc(const std::string &from_address, const std::string &to_address); 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 943c3a90..bac146a1 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 @@ -18,11 +18,6 @@ public: void process_withdrawal(const son_wallet_withdraw_object &swwo); private: - 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); - std::string sign_transaction(const std::string &transaction); - std::string send_transaction(const std::string &transaction); - void on_applied_block(const signed_block &b); }; diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp index 8aa935dd..54ce8be6 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp @@ -32,10 +32,6 @@ bitcoin_rpc_client::bitcoin_rpc_client(std::string _ip, uint32_t _rpc, std::stri authorization.val = "Basic " + fc::base64_encode(user + ":" + password); } -bool bitcoin_rpc_client::connection_is_not_defined() const { - return ip.empty() || rpc_port == 0 || user.empty() || password.empty(); -} - std::string bitcoin_rpc_client::addmultisigaddress(const std::vector public_keys) { std::string body = std::string("{\"jsonrpc\": \"1.0\", \"id\":\"addmultisigaddress\", " "\"method\": \"addmultisigaddress\", \"params\": ["); @@ -789,7 +785,7 @@ void sidechain_net_handler_bitcoin::recreate_primary_wallet() { for (const son_info &si : active_sons) { son_pubkeys_bitcoin.push_back(si.sidechain_public_keys.at(sidechain_type::bitcoin)); } - string reply_str = create_multisignature_wallet(son_pubkeys_bitcoin); + string reply_str = bitcoin_client->addmultisigaddress(son_pubkeys_bitcoin); std::stringstream active_pw_ss(reply_str); boost::property_tree::ptree active_pw_pt; @@ -845,22 +841,6 @@ void sidechain_net_handler_bitcoin::process_withdrawal(const son_wallet_withdraw transfer_withdrawal_from_primary_wallet(swwo); } -std::string sidechain_net_handler_bitcoin::create_multisignature_wallet(const std::vector public_keys) { - return bitcoin_client->addmultisigaddress(public_keys); -} - -std::string sidechain_net_handler_bitcoin::transfer(const std::string &from, const std::string &to, const uint64_t amount) { - return ""; -} - -std::string sidechain_net_handler_bitcoin::sign_transaction(const std::string &transaction) { - return ""; -} - -std::string sidechain_net_handler_bitcoin::send_transaction(const std::string &transaction) { - return ""; -} - std::string sidechain_net_handler_bitcoin::sign_and_send_transaction_with_wallet(const std::string &tx_json) { std::string reply_str = tx_json; diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp index a30dc4d7..8c0ff815 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp @@ -39,22 +39,6 @@ void sidechain_net_handler_peerplays::process_deposit(const son_wallet_deposit_o 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 ""; -} - -std::string sidechain_net_handler_peerplays::transfer(const std::string &from, const std::string &to, const uint64_t amount) { - return ""; -} - -std::string sidechain_net_handler_peerplays::sign_transaction(const std::string &transaction) { - return ""; -} - -std::string sidechain_net_handler_peerplays::send_transaction(const std::string &transaction) { - return ""; -} - void sidechain_net_handler_peerplays::on_applied_block(const signed_block &b) { for (const auto &trx : b.transactions) { size_t operation_index = -1;