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

Feature/571 restricted symbols

Browse source
This commit is contained in:
Vlad Dobromyslov 2023-11-22 12:12:56 +00:00 committed by serkixenos
parent 1f70857d64
commit 5fb63876f6
14 changed files with 268 additions and 281 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/app/api.cpp
View file

@ -368,8 +368,7 @@ vector<operation_history_object> history_api::get_account_history(const std::str
return _app.elasticsearch_thread->async([&es, &account, &stop, &limit, &start]() { return _app.elasticsearch_thread->async([&es, &account, &stop, &limit, &start]() {
return es->get_account_history(account, stop, limit, start); return es->get_account_history(account, stop, limit, start);
}, },
"thread invoke for method " BOOST_PP_STRINGIZE(method_name)) "thread invoke for method " BOOST_PP_STRINGIZE(method_name)).wait();
.wait();
} }
} }

2
libraries/app/application.cpp
View file

@ -733,7 +733,7 @@ public:
low_block_num += (true_high_block_num - low_block_num + 2) / 2; low_block_num += (true_high_block_num - low_block_num + 2) / 2;
} while (low_block_num <= high_block_num); } while (low_block_num <= high_block_num);
//idump((synopsis)); // idump((synopsis));
return synopsis; return synopsis;
} }
FC_CAPTURE_AND_RETHROW() FC_CAPTURE_AND_RETHROW()

10
libraries/app/database_api.cpp
View file

@ -313,7 +313,7 @@ public:
uint32_t api_limit_get_trade_history = 100; uint32_t api_limit_get_trade_history = 100;
uint32_t api_limit_get_trade_history_by_sequence = 100; uint32_t api_limit_get_trade_history_by_sequence = 100;
//private: // private:
const account_object *get_account_from_string(const std::string &name_or_id, const account_object *get_account_from_string(const std::string &name_or_id,
bool throw_if_not_found = true) const; bool throw_if_not_found = true) const;
const asset_object *get_asset_from_string(const std::string &symbol_or_id, const asset_object *get_asset_from_string(const std::string &symbol_or_id,
@ -470,7 +470,7 @@ void database_api::set_subscribe_callback(std::function<void(const variant &)> c
} }
void database_api_impl::set_subscribe_callback(std::function<void(const variant &)> cb, bool notify_remove_create) { void database_api_impl::set_subscribe_callback(std::function<void(const variant &)> cb, bool notify_remove_create) {
//edump((clear_filter)); // edump((clear_filter));
_subscribe_callback = cb; _subscribe_callback = cb;
_notify_remove_create = notify_remove_create; _notify_remove_create = notify_remove_create;
_subscribed_accounts.clear(); _subscribed_accounts.clear();
@ -2903,7 +2903,7 @@ graphene::app::gpos_info database_api::get_gpos_info(const account_id_type accou
} }
graphene::app::gpos_info database_api_impl::get_gpos_info(const account_id_type account) const { graphene::app::gpos_info database_api_impl::get_gpos_info(const account_id_type account) const {
FC_ASSERT(_db.head_block_time() > HARDFORK_GPOS_TIME); //Can be deleted after GPOS hardfork time FC_ASSERT(_db.head_block_time() > HARDFORK_GPOS_TIME); // Can be deleted after GPOS hardfork time
gpos_info result; gpos_info result;
result.vesting_factor = _db.calculate_vesting_factor(account(_db)); result.vesting_factor = _db.calculate_vesting_factor(account(_db));
@ -3550,8 +3550,8 @@ void database_api_impl::handle_object_changed(bool force_notify, bool full_objec
/// pushing the future back / popping the prior future if it is complete. /// pushing the future back / popping the prior future if it is complete.
/// if a connection hangs then this could get backed up and result in /// if a connection hangs then this could get backed up and result in
/// a failure to exit cleanly. /// a failure to exit cleanly.
//fc::async([capture_this,this,updates,market_broadcast_queue](){ // fc::async([capture_this,this,updates,market_broadcast_queue](){
//if( _subscribe_callback ) // if( _subscribe_callback )
// _subscribe_callback( updates ); // _subscribe_callback( updates );
for (auto id : ids) { for (auto id : ids) {

17
libraries/chain/db_getter.cpp
View file

@ -386,23 +386,14 @@ vector<uint64_t> database::get_random_numbers(uint64_t minimum, uint64_t maximum
bool database::is_asset_creation_allowed(const string &symbol) bool database::is_asset_creation_allowed(const string &symbol)
{ {
time_point_sec now = head_block_time();
std::unordered_set<std::string> post_son_hf_symbols = {"ETH", "USDT", "BNB", "ADA", "DOGE", "XRP", "USDC", "DOT", "UNI", "BUSD", "BCH", "LTC", "SOL", "LINK", "MATIC", "THETA",
"WBTC", "XLM", "ICP", "DAI", "VET", "ETC", "TRX", "FIL", "XMR", "EGR", "EOS", "SHIB", "AAVE", "CRO", "ALGO", "AMP", "BTCB",
"BSV", "KLAY", "CAKE", "FTT", "LEO", "XTZ", "TFUEL", "MIOTA", "LUNA", "NEO", "ATOM", "MKR", "FEI", "WBNB", "UST", "AVAX",
"STEEM", "HIVE", "HBD", "SBD", "BTS"};
if (symbol == "BTC") if (symbol == "BTC")
{ {
if (now < HARDFORK_SON_TIME) if (head_block_time() < HARDFORK_SON_TIME)
return false;
}
if (post_son_hf_symbols.find(symbol) != post_son_hf_symbols.end())
{
if (now >= HARDFORK_SON_TIME)
return false; return false;
} }
return true; return true;
} }
} } }
}

2
libraries/plugins/peerplays_sidechain/bitcoin/bitcoin_transaction.cpp
View file

@ -152,7 +152,7 @@ void bitcoin_transaction_builder::add_in(payment_type type, tx_in txin, const by
txin.scriptSig = script_code; txin.scriptSig = script_code;
break; break;
default: { default: {
if (txin.prevout.hash == fc::sha256("0000000000000000000000000000000000000000000000000000000000000000")) { //coinbase if (txin.prevout.hash == fc::sha256("0000000000000000000000000000000000000000000000000000000000000000")) { // coinbase
FC_ASSERT(script_code != bytes()); FC_ASSERT(script_code != bytes());
txin.scriptSig = script_code; txin.scriptSig = script_code;
} }

2
libraries/plugins/peerplays_sidechain/common/rpc_client.cpp
View file

@ -384,7 +384,7 @@ rpc_client::~rpc_client() {
if (connection_selection_task.valid()) if (connection_selection_task.valid())
connection_selection_task.cancel_and_wait(__FUNCTION__); connection_selection_task.cancel_and_wait(__FUNCTION__);
} catch (fc::canceled_exception &) { } catch (fc::canceled_exception &) {
//Expected exception. Move along. // Expected exception. Move along.
} catch (fc::exception &e) { } catch (fc::exception &e) {
edump((e.to_detail_string())); edump((e.to_detail_string()));
} }

10
libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/hive/types.hpp
View file

@ -22,15 +22,15 @@ typedef fc::ecc::private_key private_key_type;
typedef fc::sha256 chain_id_type; typedef fc::sha256 chain_id_type;
typedef std::string account_name_type; typedef std::string account_name_type;
typedef fc::ripemd160 block_id_type; typedef fc::ripemd160 block_id_type;
//typedef fc::ripemd160 checksum_type; // typedef fc::ripemd160 checksum_type;
typedef fc::ripemd160 transaction_id_type; typedef fc::ripemd160 transaction_id_type;
typedef fc::sha256 digest_type; typedef fc::sha256 digest_type;
typedef fc::ecc::compact_signature signature_type; typedef fc::ecc::compact_signature signature_type;
typedef fc::safe<int64_t> share_type; typedef fc::safe<int64_t> share_type;
//typedef safe<uint64_t> ushare_type; // typedef safe<uint64_t> ushare_type;
//typedef uint16_t weight_type; // typedef uint16_t weight_type;
//typedef uint32_t contribution_id_type; // typedef uint32_t contribution_id_type;
//typedef fixed_string<32> custom_id_type; // typedef fixed_string<32> custom_id_type;
struct public_key_type { struct public_key_type {

23
libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp
View file

@ -145,7 +145,7 @@ peerplays_sidechain_plugin_impl::~peerplays_sidechain_plugin_impl() {
if (_heartbeat_task.valid()) if (_heartbeat_task.valid())
_heartbeat_task.cancel_and_wait(__FUNCTION__); _heartbeat_task.cancel_and_wait(__FUNCTION__);
} catch (fc::canceled_exception &) { } catch (fc::canceled_exception &) {
//Expected exception. Move along. // Expected exception. Move along.
} catch (fc::exception &e) { } catch (fc::exception &e) {
edump((e.to_detail_string())); edump((e.to_detail_string()));
} }
@ -156,7 +156,7 @@ peerplays_sidechain_plugin_impl::~peerplays_sidechain_plugin_impl() {
_son_processing_task.at(active_sidechain_type).wait(); _son_processing_task.at(active_sidechain_type).wait();
} }
} catch (fc::canceled_exception &) { } catch (fc::canceled_exception &) {
//Expected exception. Move along. // Expected exception. Move along.
} catch (fc::exception &e) { } catch (fc::exception &e) {
edump((e.to_detail_string())); edump((e.to_detail_string()));
} }
@ -540,11 +540,11 @@ void peerplays_sidechain_plugin_impl::son_processing(sidechain_type sidechain) {
return; return;
} }
//fc::time_point now_fine = fc::time_point::now(); // fc::time_point now_fine = fc::time_point::now();
//fc::time_point_sec now = now_fine + fc::microseconds(500000); // fc::time_point_sec now = now_fine + fc::microseconds(500000);
//if (plugin.database().get_slot_time(1) < now) { // if (plugin.database().get_slot_time(1) < now) {
// return; // Not synced // return; // Not synced
//} // }
const fc::time_point now_fine = fc::time_point::now(); const fc::time_point now_fine = fc::time_point::now();
const fc::time_point_sec now = now_fine - fc::milliseconds(3000); const fc::time_point_sec now = now_fine - fc::milliseconds(3000);
@ -873,15 +873,12 @@ void peerplays_sidechain_plugin_impl::settle_sidechain_transactions(sidechain_ty
void peerplays_sidechain_plugin_impl::on_applied_block(const signed_block &b) { void peerplays_sidechain_plugin_impl::on_applied_block(const signed_block &b) {
if (first_block_skipped) { if (first_block_skipped) {
if(son_processing_enabled) { if (son_processing_enabled) {
schedule_son_processing(); schedule_son_processing();
} } else {
else
{
const fc::time_point now_fine = fc::time_point::now(); const fc::time_point now_fine = fc::time_point::now();
const fc::time_point_sec now = now_fine + fc::microseconds( 500000 ); const fc::time_point_sec now = now_fine + fc::microseconds(500000);
if( plugin.database().get_slot_time(1) >= now ) if (plugin.database().get_slot_time(1) >= now) {
{
son_processing_enabled = true; son_processing_enabled = true;
schedule_son_processing(); schedule_son_processing();
} }

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

@ -184,7 +184,7 @@ void sidechain_net_handler::sidechain_event_data_received(const sidechain_event_
bool enable_peerplays_asset_deposits = false; bool enable_peerplays_asset_deposits = false;
#ifdef ENABLE_PEERPLAYS_ASSET_DEPOSITS #ifdef ENABLE_PEERPLAYS_ASSET_DEPOSITS
//enable_peerplays_asset_deposits = (sed.sidechain == sidechain_type::peerplays) && // enable_peerplays_asset_deposits = (sed.sidechain == sidechain_type::peerplays) &&
// (sed.sidechain_currency.compare("BTC") != 0) && // (sed.sidechain_currency.compare("BTC") != 0) &&
// (sed.sidechain_currency.compare("ETH") != 0) && // (sed.sidechain_currency.compare("ETH") != 0) &&
// (sed.sidechain_currency.compare("HBD") != 0) && // (sed.sidechain_currency.compare("HBD") != 0) &&
@ -451,7 +451,7 @@ void sidechain_net_handler::process_deposits() {
if (swdo.id == object_id_type(0, 0, 0) || !plugin.can_son_participate(sidechain, chain::operation::tag<chain::son_wallet_deposit_process_operation>::value, swdo.id)) { if (swdo.id == object_id_type(0, 0, 0) || !plugin.can_son_participate(sidechain, chain::operation::tag<chain::son_wallet_deposit_process_operation>::value, swdo.id)) {
return; return;
} }
//Ignore the deposits which are not valid anymore, considered refunds. // Ignore the deposits which are not valid anymore, considered refunds.
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, swdo.sidechain_from, time_point_sec::maximum())); const auto &addr_itr = sidechain_addresses_idx.find(std::make_tuple(sidechain, swdo.sidechain_from, time_point_sec::maximum()));
if (addr_itr == sidechain_addresses_idx.end()) { if (addr_itr == sidechain_addresses_idx.end()) {

4
libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp
View file

@ -757,8 +757,8 @@ bool sidechain_net_handler_ethereum::settle_sidechain_transaction(const sidechai
if ("0x1" == json_receipt.get<std::string>("result.status")) { if ("0x1" == json_receipt.get<std::string>("result.status")) {
count += 1; count += 1;
//! Fixme - compare data somehow? //! Fixme - compare data somehow?
//if( sto.transaction == entry_receipt.second.get<std::string>("data") ) { // if( sto.transaction == entry_receipt.second.get<std::string>("data") ) {
//} // }
} }
} }

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

@ -858,14 +858,14 @@ bool sidechain_net_handler_hive::settle_sidechain_transaction(const sidechain_tr
boost::property_tree::ptree tx_json; boost::property_tree::ptree tx_json;
boost::property_tree::read_json(ss_tx, tx_json); boost::property_tree::read_json(ss_tx, tx_json);
//const chain::global_property_object &gpo = database.get_global_properties(); // const chain::global_property_object &gpo = database.get_global_properties();
std::string tx_txid = tx_json.get<std::string>("result.transaction_id"); std::string tx_txid = tx_json.get<std::string>("result.transaction_id");
uint32_t tx_block_num = tx_json.get<uint32_t>("result.block_num"); uint32_t tx_block_num = tx_json.get<uint32_t>("result.block_num");
const uint32_t last_irreversible_block = std::stoul(rpc_client->get_last_irreversible_block_num()); const uint32_t last_irreversible_block = std::stoul(rpc_client->get_last_irreversible_block_num());
//std::string tx_address = addr.get_address(); // std::string tx_address = addr.get_address();
//int64_t tx_amount = -1; // int64_t tx_amount = -1;
if (tx_block_num <= last_irreversible_block) { if (tx_block_num <= last_irreversible_block) {
if (sto.object_id.is<son_wallet_withdraw_id_type>()) { if (sto.object_id.is<son_wallet_withdraw_id_type>()) {
@ -918,15 +918,15 @@ void sidechain_net_handler_hive::hive_listener_loop() {
} }
} }
//std::string reply = rpc_client->get_last_irreversible_block_num(); // std::string reply = rpc_client->get_last_irreversible_block_num();
//if (!reply.empty()) { // if (!reply.empty()) {
// uint64_t last_irreversible_block = std::stoul(reply); // uint64_t last_irreversible_block = std::stoul(reply);
// if (last_irreversible_block != last_block_received) { // if (last_irreversible_block != last_block_received) {
// std::string event_data = std::to_string(last_irreversible_block); // std::string event_data = std::to_string(last_irreversible_block);
// handle_event(event_data); // handle_event(event_data);
// last_block_received = last_irreversible_block; // last_block_received = last_irreversible_block;
// } // }
//} // }
} }
void sidechain_net_handler_hive::handle_event(const std::string &event_data) { void sidechain_net_handler_hive::handle_event(const std::string &event_data) {
@ -960,7 +960,7 @@ void sidechain_net_handler_hive::handle_event(const std::string &event_data) {
const auto &amount_child = op_value.get_child("amount"); const auto &amount_child = op_value.get_child("amount");
uint64_t amount = amount_child.get<uint64_t>("amount"); uint64_t amount = amount_child.get<uint64_t>("amount");
//uint64_t precision = amount_child.get<uint64_t>("precision"); // uint64_t precision = amount_child.get<uint64_t>("precision");
std::string nai = amount_child.get<std::string>("nai"); std::string nai = amount_child.get<std::string>("nai");
std::string sidechain_currency = ""; std::string sidechain_currency = "";
price sidechain_currency_price = {}; price sidechain_currency_price = {};

16
libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp
View file

@ -24,15 +24,15 @@ namespace graphene { namespace peerplays_sidechain {
sidechain_net_handler_peerplays::sidechain_net_handler_peerplays(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options) : sidechain_net_handler_peerplays::sidechain_net_handler_peerplays(peerplays_sidechain_plugin &_plugin, const boost::program_options::variables_map &options) :
sidechain_net_handler(sidechain_type::peerplays, _plugin, options) { sidechain_net_handler(sidechain_type::peerplays, _plugin, options) {
//const auto &assets_by_symbol = database.get_index_type<asset_index>().indices().get<by_symbol>(); // const auto &assets_by_symbol = database.get_index_type<asset_index>().indices().get<by_symbol>();
//const auto get_asset_id = [&assets_by_symbol](const string &symbol) { // const auto get_asset_id = [&assets_by_symbol](const string &symbol) {
// auto asset_itr = assets_by_symbol.find(symbol); // auto asset_itr = assets_by_symbol.find(symbol);
// FC_ASSERT(asset_itr != assets_by_symbol.end(), "Unable to find asset '${sym}'", ("sym", symbol)); // FC_ASSERT(asset_itr != assets_by_symbol.end(), "Unable to find asset '${sym}'", ("sym", symbol));
// return asset_itr->get_id(); // return asset_itr->get_id();
//}; // };
//tracked_assets.push_back(get_asset_id("PBTC")); // tracked_assets.push_back(get_asset_id("PBTC"));
//tracked_assets.push_back(get_asset_id("PETH")); // tracked_assets.push_back(get_asset_id("PETH"));
//tracked_assets.push_back(get_asset_id("PEOS")); // tracked_assets.push_back(get_asset_id("PEOS"));
if (options.count("peerplays-private-key")) { if (options.count("peerplays-private-key")) {
const std::vector<std::string> pub_priv_keys = options["peerplays-private-key"].as<std::vector<std::string>>(); const std::vector<std::string> pub_priv_keys = options["peerplays-private-key"].as<std::vector<std::string>>();
@ -284,8 +284,8 @@ bool sidechain_net_handler_peerplays::settle_sidechain_transaction(const sidecha
} }
if (sto.object_id.is<son_wallet_deposit_id_type>()) { if (sto.object_id.is<son_wallet_deposit_id_type>()) {
//auto swdo = database.get<son_wallet_deposit_object>(sto.object_id); // auto swdo = database.get<son_wallet_deposit_object>(sto.object_id);
//settle_amount = asset(swdo.sidechain_amount, swdo.sidechain_currency); // settle_amount = asset(swdo.sidechain_amount, swdo.sidechain_currency);
} }
if (sto.object_id.is<son_wallet_withdraw_id_type>()) { if (sto.object_id.is<son_wallet_withdraw_id_type>()) {