diff --git a/libraries/plugins/peerplays_sidechain/bitcoin/utils.cpp b/libraries/plugins/peerplays_sidechain/bitcoin/utils.cpp index 6d802a2f..a82a7c40 100644 --- a/libraries/plugins/peerplays_sidechain/bitcoin/utils.cpp +++ b/libraries/plugins/peerplays_sidechain/bitcoin/utils.cpp @@ -96,4 +96,49 @@ std::string write_transaction_data(const std::string &tx, const std::vector get_outputs_from_transaction_by_address(const std::string &tx_json, const std::string &to_address) { + std::stringstream ss(tx_json); + boost::property_tree::ptree json; + boost::property_tree::read_json(ss, json); + std::vector result; + + if (json.count("error") && !json.get_child("error").empty()) { + return result; + } + + std::string tx_txid = json.get("result.txid"); + + for (auto &vout : json.get_child("result.vout")) { + std::vector to_addresses; + if (vout.second.find("scriptPubKey") == vout.second.not_found() || + vout.second.get_child("scriptPubKey").find("addresses") == vout.second.get_child("scriptPubKey").not_found()) { + continue; + } + + for (auto &address : vout.second.get_child("scriptPubKey.addresses")) { + to_addresses.push_back(address.second.data()); + } + + if ((to_address == "") || + (std::find(to_addresses.begin(), to_addresses.end(), to_address) != to_addresses.end())) { + std::string tx_amount_s = vout.second.get("value"); + tx_amount_s.erase(std::remove(tx_amount_s.begin(), tx_amount_s.end(), '.'), tx_amount_s.end()); + uint64_t tx_amount = std::stoll(tx_amount_s); + + std::string tx_vout_s = vout.second.get("n"); + uint64_t tx_vout = std::stoll(tx_vout_s); + + prev_out pout; + pout.hash_tx = tx_txid; + pout.n_vout = tx_vout; + pout.amount = tx_amount; + result.push_back(pout); + if (to_address == "") { + return result; + } + } + } + return result; +} + }}} // namespace graphene::peerplays_sidechain::bitcoin diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/types.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/types.hpp index 0997194b..680ab7f8 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/types.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/types.hpp @@ -42,6 +42,15 @@ struct prev_out { return false; } + bool operator==(const prev_out &obj) const { + if (this->hash_tx == obj.hash_tx && + this->n_vout == obj.n_vout && + this->amount == obj.amount) { + return true; + } + return false; + } + std::string hash_tx; uint32_t n_vout; uint64_t amount; diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/utils.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/utils.hpp index 4e1c4b58..430889e5 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/utils.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/utils.hpp @@ -23,4 +23,6 @@ void read_transaction_data(const std::string &string_buf, std::string &tx_hex, s std::string write_transaction_data(const std::string &tx, const std::vector &in_amounts, const std::string &redeem_script); +std::vector get_outputs_from_transaction_by_address(const std::string &tx_json, const std::string &to_address = ""); + }}} // namespace graphene::peerplays_sidechain::bitcoin \ No newline at end of file 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 60d0262a..23c98451 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 @@ -85,6 +85,7 @@ public: sidechain_net_handler_bitcoin(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options); virtual ~sidechain_net_handler_bitcoin(); + std::string get_current_primary_wallet_address(); bool process_proposal(const proposal_object &po); void process_primary_wallet(); void process_sidechain_addresses(); diff --git a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp index 9c9522d2..eb7c7170 100644 --- a/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp +++ b/libraries/plugins/peerplays_sidechain/sidechain_net_handler_bitcoin.cpp @@ -302,8 +302,6 @@ std::string bitcoin_rpc_client::decoderawtransaction(std::string const &tx_hex) boost::property_tree::read_json(ss, json); if (reply.status == 200) { - std::stringstream ss; - boost::property_tree::json_parser::write_json(ss, json.get_child("result")); return ss.str(); } @@ -917,6 +915,22 @@ sidechain_net_handler_bitcoin::~sidechain_net_handler_bitcoin() { } } +std::string sidechain_net_handler_bitcoin::get_current_primary_wallet_address() { + const auto &idx = database.get_index_type().indices().get(); + auto obj = idx.rbegin(); + if (obj == idx.rend() || obj->addresses.find(sidechain_type::bitcoin) == obj->addresses.end()) { + return ""; + } + + std::string pw_address_json = obj->addresses.find(sidechain_type::bitcoin)->second; + std::stringstream ss(pw_address_json); + boost::property_tree::ptree json; + boost::property_tree::read_json(ss, json); + + std::string pw_address = json.get("address"); + return pw_address; +} + bool sidechain_net_handler_bitcoin::process_proposal(const proposal_object &po) { ilog("Proposal to process: ${po}, SON id ${son_id}", ("po", po.id)("son_id", plugin.get_current_son_id())); @@ -1033,29 +1047,18 @@ bool sidechain_net_handler_bitcoin::process_proposal(const proposal_object &po) boost::property_tree::read_json(tx_ss, tx_json); if (tx_json.count("error") && tx_json.get_child("error").empty()) { - std::string tx_txid = tx_json.get("result.txid"); uint32_t tx_confirmations = tx_json.get("result.confirmations"); - std::string tx_address = ""; - int64_t tx_amount = -1; - int64_t tx_vout = -1; + std::string tx_hex = tx_json.get("result.hex"); + std::string tx_hex_json = bitcoin_client->decoderawtransaction(tx_hex); + std::vector pouts = bitcoin::get_outputs_from_transaction_by_address(tx_hex_json, swdo_address); - for (auto &input : tx_json.get_child("result.details")) { - tx_address = input.second.get("address"); - if ((tx_address == swdo_address) && (input.second.get("category") == "receive")) { - std::string tx_amount_s = input.second.get("amount"); - tx_amount_s.erase(std::remove(tx_amount_s.begin(), tx_amount_s.end(), '.'), tx_amount_s.end()); - tx_amount = std::stoll(tx_amount_s); - std::string tx_vout_s = input.second.get("vout"); - tx_vout = std::stoll(tx_vout_s); - break; - } - } + bitcoin::prev_out pout; + pout.hash_tx = swdo_txid; + pout.n_vout = swdo_vout; + pout.amount = swdo_amount; - process_ok = (swdo_txid == tx_txid) && - (swdo_address == tx_address) && - (swdo_amount == tx_amount) && - (swdo_vout == tx_vout) && + process_ok = (std::find(pouts.begin(), pouts.end(), pout) != pouts.end()) && (gpo.parameters.son_bitcoin_min_tx_confirmations() <= tx_confirmations); } @@ -1396,22 +1399,17 @@ int64_t sidechain_net_handler_bitcoin::settle_sidechain_transaction(const sidech std::string tx_txid = tx_json.get("result.txid"); uint32_t tx_confirmations = tx_json.get("result.confirmations"); - std::string tx_address = ""; - int64_t tx_amount = -1; const chain::global_property_object &gpo = database.get_global_properties(); if (tx_confirmations >= gpo.parameters.son_bitcoin_min_tx_confirmations()) { if (sto.object_id.is()) { - for (auto &input : tx_json.get_child("result.details")) { - if (input.second.get("category") == "receive") { - std::string tx_amount_s = input.second.get("amount"); - tx_amount_s.erase(std::remove(tx_amount_s.begin(), tx_amount_s.end(), '.'), tx_amount_s.end()); - tx_amount = std::stoll(tx_amount_s); - break; - } + std::string tx_hex = tx_json.get("result.hex"); + std::string tx_hex_json = bitcoin_client->decoderawtransaction(tx_hex); + std::vector pouts = bitcoin::get_outputs_from_transaction_by_address(tx_hex_json); + if (pouts.size() > 0) { + settle_amount = pouts[0].amount; } - settle_amount = tx_amount; } if (sto.object_id.is()) { @@ -1484,20 +1482,9 @@ std::string sidechain_net_handler_bitcoin::create_primary_wallet_transaction(con } std::string sidechain_net_handler_bitcoin::create_deposit_transaction(const son_wallet_deposit_object &swdo) { - const auto &idx = database.get_index_type().indices().get(); - auto obj = idx.rbegin(); - if (obj == idx.rend() || obj->addresses.find(sidechain_type::bitcoin) == obj->addresses.end()) { - return ""; - } //Get redeem script for deposit address std::string redeem_script = get_redeemscript_for_userdeposit(swdo.sidechain_to); - std::string pw_address_json = obj->addresses.find(sidechain_type::bitcoin)->second; - - std::stringstream ss(pw_address_json); - boost::property_tree::ptree json; - boost::property_tree::read_json(ss, json); - - std::string pw_address = json.get("address"); + std::string pw_address = get_current_primary_wallet_address(); std::string txid = swdo.sidechain_transaction_id; std::string suid = swdo.sidechain_uid; @@ -1645,7 +1632,7 @@ std::string sidechain_net_handler_bitcoin::send_transaction(const sidechain_tran signatures.push_back(read_byte_arrays_from_string(sto.signatures[idx].second)); } //Add empty sig for user signature for Deposit transaction - if (sto.object_id.type() == son_wallet_deposit_object::type_id) { + if (sto.object_id.is()) { add_signatures_to_transaction_user_weighted_multisig(tx, signatures); } else { add_signatures_to_transaction_weighted_multisig(tx, signatures);