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

Deposit from any Hive account to any Peerplays account

Browse source
This commit is contained in:
serkixenos 2021-07-27 23:41:00 +02:00
parent a55a4ecaad
commit 380a1260bf
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp
View file

@ -5,6 +5,7 @@
#include <thread> #include <thread>
#include <boost/algorithm/hex.hpp> #include <boost/algorithm/hex.hpp>
#include <boost/algorithm/string.hpp>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
@ -313,7 +314,7 @@ bool sidechain_net_handler_hive::process_proposal(const proposal_object &po) {
if (operation_type == "transfer_operation") { if (operation_type == "transfer_operation") {
const auto &op_value = op.get_child("value"); const auto &op_value = op.get_child("value");
std::string address = op_value.get<std::string>("from"); std::string sidechain_from = op_value.get<std::string>("from");
const auto &amount_child = op_value.get_child("amount"); const auto &amount_child = op_value.get_child("amount");
@ -327,7 +328,17 @@ bool sidechain_net_handler_hive::process_proposal(const proposal_object &po) {
sidechain_currency = "HIVE"; sidechain_currency = "HIVE";
} }
process_ok = (swdo_sidechain_from == address) && std::string memo = op_value.get<std::string>("memo");
if (!memo.empty()) {
boost::trim(memo);
if (memo.find("son-payment-to:") == 0) {
memo = memo.substr(15);
boost::trim(memo);
sidechain_from = memo;
}
}
process_ok = (swdo_sidechain_from == sidechain_from) &&
(swdo_sidechain_currency == sidechain_currency) && (swdo_sidechain_currency == sidechain_currency) &&
(swdo_sidechain_amount == amount); (swdo_sidechain_amount == amount);
} }
@ -867,6 +878,16 @@ void sidechain_net_handler_hive::handle_event(const std::string &event_data) {
sidechain_currency_price = database.get<asset_object>(database.get_global_properties().parameters.hive_asset()).options.core_exchange_rate; sidechain_currency_price = database.get<asset_object>(database.get_global_properties().parameters.hive_asset()).options.core_exchange_rate;
} }
std::string memo = op_value.get<std::string>("memo");
if (!memo.empty()) {
boost::trim(memo);
if (memo.find("son-payment-to:") == 0) {
memo = memo.substr(15);
boost::trim(memo);
from = memo;
}
}
if (to == "son-account") { if (to == "son-account") {
const auto &sidechain_addresses_idx = database.get_index_type<sidechain_address_index>().indices().get<by_sidechain_and_deposit_address_and_expires>(); const auto &sidechain_addresses_idx = database.get_index_type<sidechain_address_index>().indices().get<by_sidechain_and_deposit_address_and_expires>();
const auto &addr_itr = sidechain_addresses_idx.find(std::make_tuple(sidechain, from, time_point_sec::maximum())); const auto &addr_itr = sidechain_addresses_idx.find(std::make_tuple(sidechain, from, time_point_sec::maximum()));