Merge branch 'bug/562-fix-libbitcoin-build' into 'develop'

#562 - Point to libbitcoin tag v3.8.0

See merge request PBSA/peerplays!248

libraries/app/application.cpp

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

libraries/app/database_api.cpp

@@ -313,7 +313,7 @@ public:
    uint32_t api_limit_get_trade_history = 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,
                                                  bool throw_if_not_found = true) const;
    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) {
-   // edump((clear_filter));
+   //edump((clear_filter));
    _subscribe_callback = cb;
    _notify_remove_create = notify_remove_create;
    _subscribed_accounts.clear();
@@ -2197,7 +2197,7 @@ vector<variant> database_api_impl::lookup_vote_ids(const vector<vote_id_type> &v
       case vote_id_type::committee: {
          auto itr = committee_idx.find(id);
          if (itr != committee_idx.end())
-            result.emplace_back(variant(*itr, 2)); // Depth of committee_member_object is 1, add 1 to be safe
+            result.emplace_back(variant(*itr, 1));
          else
             result.emplace_back(variant());
          break;
@@ -2205,7 +2205,7 @@ vector<variant> database_api_impl::lookup_vote_ids(const vector<vote_id_type> &v
       case vote_id_type::witness: {
          auto itr = witness_idx.find(id);
          if (itr != witness_idx.end())
-            result.emplace_back(variant(*itr, 2)); // Depth of witness_object is 1, add 1 here to be safe
+            result.emplace_back(variant(*itr, 1));
          else
             result.emplace_back(variant());
          break;
@@ -2213,15 +2213,11 @@ vector<variant> database_api_impl::lookup_vote_ids(const vector<vote_id_type> &v
       case vote_id_type::worker: {
          auto itr = for_worker_idx.find(id);
          if (itr != for_worker_idx.end()) {
-            result.emplace_back(variant(*itr, 4)); // Depth of worker_object is 3, add 1 here to be safe.
-                                                   // If we want to extract the balance object inside,
-                                                   //   need to increase this value
+            result.emplace_back(variant(*itr, 1));
          } else {
             auto itr = against_worker_idx.find(id);
             if (itr != against_worker_idx.end()) {
-               result.emplace_back(variant(*itr, 4)); // Depth of worker_object is 3, add 1 here to be safe.
-                                                      // If we want to extract the balance object inside,
-                                                      //   need to increase this value
+               result.emplace_back(variant(*itr, 1));
             } else {
                result.emplace_back(variant());
             }
@@ -2907,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 {
-   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;
 
    result.vesting_factor = _db.calculate_vesting_factor(account(_db));
@@ -3554,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.
       /// if a connection hangs then this could get backed up and result in
       /// a failure to exit cleanly.
-      // fc::async([capture_this,this,updates,market_broadcast_queue](){
-      // if( _subscribe_callback )
+      //fc::async([capture_this,this,updates,market_broadcast_queue](){
+      //if( _subscribe_callback )
       //         _subscribe_callback( updates );
 
       for (auto id : ids) {

libraries/chain/db_getter.cpp

@@ -386,14 +386,23 @@ vector<uint64_t> database::get_random_numbers(uint64_t minimum, uint64_t maximum
 
 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 (head_block_time() < HARDFORK_SON_TIME)
+      if (now < 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 true;
 }
 
-}
-
-}
+} }

libraries/chain/db_maint.cpp

@@ -170,7 +170,6 @@ struct worker_pay_visitor
          worker.pay_worker(pay, db);
       }
 };
-
 void database::update_worker_votes()
 {
    auto& idx = get_index_type<worker_index>();
@@ -186,28 +185,6 @@ void database::update_worker_votes()
    }
 }
 
-void database::hotfix_2024()
-{
-   if (head_block_time() >= HARDFORK_HOTFIX_2024_TIME)
-   {
-      if (get_chain_id().str() == "6b6b5f0ce7a36d323768e534f3edb41c6d6332a541a95725b98e28d140850134")
-      {
-         const auto& vb_idx = get_index_type<vesting_balance_index>().indices().get<by_id>();
-         auto vbo = vb_idx.find(vesting_balance_id_type(388));
-         if (vbo != vb_idx.end())
-         {
-            if (vbo->owner == account_id_type(14786))
-            {
-               modify(*vbo, [&]( vesting_balance_object& _vbo)
-               {
-                  _vbo.owner = account_id_type(0);
-               });
-            }
-         }
-      }
-   }
-}
-
 void database::pay_sons_before_hf_ethereum()
 {
    const auto now = head_block_time();
@@ -2533,7 +2510,6 @@ void database::perform_chain_maintenance(const signed_block& next_block, const g
    update_active_committee_members();
    update_active_sons();
    update_worker_votes();
-   hotfix_2024();
 
    const dynamic_global_property_object& dgpo = get_dynamic_global_properties();
 

libraries/chain/hardfork.d/HOTFIX_2024.hf

@@ -1,7 +0,0 @@
-#ifndef HARDFORK_HOTFIX_2024_TIME
-#ifdef BUILD_PEERPLAYS_TESTNET
-#define HARDFORK_HOTFIX_2024_TIME (fc::time_point_sec::from_iso_string("2023-12-20T00:00:00"))
-#else
-#define HARDFORK_HOTFIX_2024_TIME (fc::time_point_sec::from_iso_string("2023-12-20T00:00:00"))
-#endif
-#endif

libraries/chain/hardfork.d/SON_FOR_ETHEREUM.hf

@@ -2,6 +2,6 @@
 #ifdef BUILD_PEERPLAYS_TESTNET
 #define HARDFORK_SON_FOR_ETHEREUM_TIME (fc::time_point_sec::from_iso_string("2023-07-17T12:00:00"))
 #else
-#define HARDFORK_SON_FOR_ETHEREUM_TIME (fc::time_point_sec::from_iso_string("2023-10-24T12:00:00"))
+#define HARDFORK_SON_FOR_ETHEREUM_TIME (fc::time_point_sec::from_iso_string("2023-07-31T12:00:00"))
 #endif
 #endif

libraries/chain/include/graphene/chain/database.hpp

@@ -594,7 +594,6 @@ namespace graphene { namespace chain {
                                    const flat_map<sidechain_type, vector<son_sidechain_info> >& new_active_sons );
          void update_son_wallet( const flat_map<sidechain_type, vector<son_sidechain_info> >& new_active_sons );
          void update_worker_votes();
-         void hotfix_2024();
 
          public:
             double calculate_vesting_factor(const account_object& stake_account);

libraries/plugins/peerplays_sidechain/bitcoin/bitcoin_transaction.cpp

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

libraries/plugins/peerplays_sidechain/common/rpc_client.cpp

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

libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/hive/types.hpp

@@ -22,15 +22,15 @@ typedef fc::ecc::private_key private_key_type;
 typedef fc::sha256 chain_id_type;
 typedef std::string account_name_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::sha256 digest_type;
 typedef fc::ecc::compact_signature signature_type;
 typedef fc::safe<int64_t> share_type;
-// typedef safe<uint64_t> ushare_type;
-// typedef uint16_t weight_type;
-// typedef uint32_t contribution_id_type;
-// typedef fixed_string<32> custom_id_type;
+//typedef safe<uint64_t> ushare_type;
+//typedef uint16_t weight_type;
+//typedef uint32_t contribution_id_type;
+//typedef fixed_string<32> custom_id_type;
 
 struct public_key_type {
 

libraries/plugins/peerplays_sidechain/peerplays_sidechain_plugin.cpp

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

libraries/plugins/peerplays_sidechain/sidechain_net_handler.cpp

@@ -184,7 +184,7 @@ void sidechain_net_handler::sidechain_event_data_received(const sidechain_event_
 
    bool enable_peerplays_asset_deposits = false;
 #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("ETH") != 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)) {
          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 &addr_itr = sidechain_addresses_idx.find(std::make_tuple(sidechain, swdo.sidechain_from, time_point_sec::maximum()));
       if (addr_itr == sidechain_addresses_idx.end()) {

libraries/plugins/peerplays_sidechain/sidechain_net_handler_ethereum.cpp

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

libraries/plugins/peerplays_sidechain/sidechain_net_handler_hive.cpp

@@ -858,14 +858,14 @@ bool sidechain_net_handler_hive::settle_sidechain_transaction(const sidechain_tr
       boost::property_tree::ptree 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");
       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());
 
-      // std::string tx_address = addr.get_address();
-      // int64_t tx_amount = -1;
+      //std::string tx_address = addr.get_address();
+      //int64_t tx_amount = -1;
 
       if (tx_block_num <= last_irreversible_block) {
          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();
-   // if (!reply.empty()) {
+   //std::string reply = rpc_client->get_last_irreversible_block_num();
+   //if (!reply.empty()) {
    //   uint64_t last_irreversible_block = std::stoul(reply);
    //   if (last_irreversible_block != last_block_received) {
    //      std::string event_data = std::to_string(last_irreversible_block);
    //      handle_event(event_data);
    //      last_block_received = last_irreversible_block;
    //   }
-   // }
+   //}
 }
 
 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");
 
                   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 sidechain_currency = "";
                   price sidechain_currency_price = {};

libraries/plugins/peerplays_sidechain/sidechain_net_handler_peerplays.cpp

@@ -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(sidechain_type::peerplays, _plugin, options) {
-   // 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 &assets_by_symbol = database.get_index_type<asset_index>().indices().get<by_symbol>();
+   //const auto get_asset_id = [&assets_by_symbol](const string &symbol) {
    //   auto asset_itr = assets_by_symbol.find(symbol);
    //   FC_ASSERT(asset_itr != assets_by_symbol.end(), "Unable to find asset '${sym}'", ("sym", symbol));
    //   return asset_itr->get_id();
-   // };
-   // tracked_assets.push_back(get_asset_id("PBTC"));
-   // tracked_assets.push_back(get_asset_id("PETH"));
-   // tracked_assets.push_back(get_asset_id("PEOS"));
+   //};
+   //tracked_assets.push_back(get_asset_id("PBTC"));
+   //tracked_assets.push_back(get_asset_id("PETH"));
+   //tracked_assets.push_back(get_asset_id("PEOS"));
 
    if (options.count("peerplays-private-key")) {
       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>()) {
-      // auto swdo = database.get<son_wallet_deposit_object>(sto.object_id);
-      // settle_amount = asset(swdo.sidechain_amount, swdo.sidechain_currency);
+      //auto swdo = database.get<son_wallet_deposit_object>(sto.object_id);
+      //settle_amount = asset(swdo.sidechain_amount, swdo.sidechain_currency);
    }
 
    if (sto.object_id.is<son_wallet_withdraw_id_type>()) {