From 3035e5294f78264358dc3a71199c6a36627bc6c2 Mon Sep 17 00:00:00 2001 From: gladcow Date: Fri, 27 Mar 2020 22:51:05 +0300 Subject: [PATCH] add send_transaction_standalone implementation --- .../sidechain_net_handler_bitcoin.hpp | 1 + .../sidechain_net_handler_bitcoin.cpp | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) 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 5c1382ce..2db96dc6 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 @@ -122,6 +122,7 @@ private: bool send_transaction_raw(const sidechain_transaction_object &sto, std::string &sidechain_transaction); bool send_transaction_psbt(const sidechain_transaction_object &sto, std::string &sidechain_transaction); + bool send_transaction_standalone(const sidechain_transaction_object &sto, std::string &sidechain_transaction); void handle_event(const std::string &event_data); std::vector extract_info_from_block(const std::string &_block); diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp index 3aa90b98..d4cb50b2 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp @@ -1229,7 +1229,8 @@ std::string sidechain_net_handler_bitcoin::sign_transaction(const sidechain_tran bool sidechain_net_handler_bitcoin::send_transaction(const sidechain_transaction_object &sto, std::string &sidechain_transaction) { sidechain_transaction = ""; //return send_transaction_raw(sto, sidechain_transaction); - return send_transaction_psbt(sto, sidechain_transaction); + //return send_transaction_psbt(sto, sidechain_transaction); + return send_transaction_standalone(sto, sidechain_transaction); } std::string sidechain_net_handler_bitcoin::create_multisig_address_raw(const std::vector &son_pubkeys) @@ -1505,7 +1506,13 @@ bool sidechain_net_handler_bitcoin::send_transaction_psbt(const sidechain_transa } return false; -} // namespace peerplays_sidechain +} + +bool sidechain_net_handler_bitcoin::send_transaction_standalone(const sidechain_transaction_object &sto, std::string &sidechain_transaction) { + sidechain_transaction = ""; + + return bitcoin_client->sendrawtransaction(sto.transaction); +} void sidechain_net_handler_bitcoin::handle_event(const std::string &event_data) { std::string block = bitcoin_client->getblock(event_data);