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

Merge branch 'feature/SON-353' into feature/SON-349_SON-350

Browse source
This commit is contained in:
Srdjan Obucina 2020-04-14 23:26:46 +02:00
commit 0a5ad52ee1
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -610,7 +610,7 @@ std::string bitcoin_rpc_client::sendrawtransaction(const std::string &tx_hex) {
"\"method\": \"sendrawtransaction\", \"params\": [") + "\"method\": \"sendrawtransaction\", \"params\": [") +
std::string("\"") + tx_hex + std::string("\"") + std::string("] }"); std::string("\"") + tx_hex + std::string("\"") + std::string("] }");
const auto reply = send_post_request(body, true); const auto reply = send_post_request(body);
if (reply.body.empty()) { if (reply.body.empty()) {
wlog("Bitcoin RPC call ${function} failed", ("function", __FUNCTION__)); wlog("Bitcoin RPC call ${function} failed", ("function", __FUNCTION__));
@ -984,8 +984,7 @@ bool sidechain_net_handler_bitcoin::process_proposal(const proposal_object &po)
const auto &idx = database.get_index_type<son_wallet_index>().indices().get<by_id>(); const auto &idx = database.get_index_type<son_wallet_index>().indices().get<by_id>();
const auto swo = idx.find(object_id); const auto swo = idx.find(object_id);
if (swo != idx.end()) { if (swo != idx.end()) {
const auto prec_swo = std::next(swo); tx_str = create_primary_wallet_transaction(*swo, new_pw_address);
tx_str = create_primary_wallet_transaction(*prec_swo, new_pw_address);
} }
} }