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

Align with SONs-base

Browse source
This commit is contained in:
Srdjan Obucina 2020-04-15 01:15:34 +02:00
parent 40fb681162
commit d937863949
2 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp
View file

@ -531,4 +531,28 @@ void sidechain_net_handler::settle_sidechain_transactions() {
});
}
bool sidechain_net_handler::process_proposal(const proposal_object &po) {
FC_ASSERT(false, "process_proposal not implemented");
}
void sidechain_net_handler::process_primary_wallet() {
FC_ASSERT(false, "process_primary_wallet not implemented");
}
bool sidechain_net_handler::process_deposit(const son_wallet_deposit_object &swdo) {
FC_ASSERT(false, "process_deposit not implemented");
}
bool sidechain_net_handler::process_withdrawal(const son_wallet_withdraw_object &swwo) {
FC_ASSERT(false, "process_withdrawal not implemented");
}
std::string sidechain_net_handler::process_sidechain_transaction(const sidechain_transaction_object &sto) {
FC_ASSERT(false, "process_sidechain_transaction not implemented");
}
std::string sidechain_net_handler::send_sidechain_transaction(const sidechain_transaction_object &sto) {
FC_ASSERT(false, "send_sidechain_transaction not implemented");
}
}} // namespace graphene::peerplays_sidechain

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

@ -17,8 +17,7 @@
#include <graphene/chain/son_info.hpp>
#include <graphene/chain/son_wallet_object.hpp>
namespace graphene {
namespace peerplays_sidechain {
namespace graphene { namespace peerplays_sidechain {
// =============================================================================
@ -1317,21 +1316,6 @@ int64_t sidechain_net_handler_bitcoin::settle_sidechain_transaction(const sidech
}
std::string sidechain_net_handler_bitcoin::create_primary_wallet_transaction(const son_wallet_object &prev_swo, std::string new_sw_address) {
const auto &swi = database.get_index_type<son_wallet_index>().indices().get<by_id>();
const auto &active_sw = swi.rbegin();
if (active_sw == swi.rend() || active_sw->addresses.find(sidechain_type::bitcoin) == active_sw->addresses.end()) {
return "";
}
const auto &prev_sw = std::next(active_sw);
if (prev_sw == swi.rend()) {
return "";
}
std::stringstream active_pw_ss(active_sw->addresses.find(sidechain_type::bitcoin)->second);
boost::property_tree::ptree active_pw_pt;
boost::property_tree::read_json(active_pw_ss, active_pw_pt);
std::string active_pw_address = active_pw_pt.get_child("result").get<std::string>("address");
std::stringstream prev_sw_ss(prev_swo.addresses.find(sidechain_type::bitcoin)->second);
boost::property_tree::ptree prev_sw_pt;
@ -1810,5 +1794,4 @@ void sidechain_net_handler_bitcoin::on_changed_objects_cb(const vector<object_id
}
// =============================================================================
}
} // namespace graphene::peerplays_sidechain
}} // namespace graphene::peerplays_sidechain