Merge pull request #950 from GolosChain/golos-v0.18.5

afalaleev · web-flow · commit 88088b7a0423 · 2018-09-04T19:00:17.000+07:00
Golos v0.18.5
diff --git a/libraries/api/CMakeLists.txt b/libraries/api/CMakeLists.txt
@@ -9,13 +9,15 @@ list(APPEND CURRENT_TARGET_HEADERS
     include/golos/api/vote_state.hpp
     include/golos/api/account_vote.hpp
     include/golos/api/discussion_helper.hpp
+    include/golos/api/block_objects.hpp
 )
 
 list(APPEND CURRENT_TARGET_SOURCES
     account_api_object.cpp
     discussion_helper.cpp
     chain_api_properties.cpp
     witness_api_object.cpp
+    block_objects.cpp
 )
 
 if(BUILD_SHARED_LIBRARIES)
diff --git a/libraries/api/block_objects.cpp b/libraries/api/block_objects.cpp
@@ -0,0 +1,24 @@
+#include <golos/api/block_objects.hpp>
+
+namespace golos { namespace api {
+
+block_operation::block_operation() = default;
+
+annotated_signed_block::annotated_signed_block() = default;
+
+annotated_signed_block::annotated_signed_block(const signed_block& block)
+        : signed_block(block) {
+    block_id = id();
+    signing_key = signee();
+    transaction_ids.reserve(transactions.size());
+    for (const signed_transaction& tx : transactions) {
+        transaction_ids.push_back(tx.id());
+    }
+}
+
+annotated_signed_block::annotated_signed_block(const signed_block& block, const block_operations& ops)
+        : annotated_signed_block(block) {
+    _virtual_operations = ops;
+}
+
+} } // golos::api
diff --git a/libraries/api/include/golos/api/block_objects.hpp b/libraries/api/include/golos/api/block_objects.hpp
@@ -0,0 +1,58 @@
+#pragma once
+
+#include <golos/chain/account_object.hpp>
+#include <golos/chain/database.hpp>
+#include <golos/chain/operation_notification.hpp>
+#include <golos/chain/steem_object_types.hpp>
+#include <golos/protocol/types.hpp>
+
+namespace golos { namespace api {
+
+using namespace golos::protocol;
+using golos::chain::operation_notification;
+
+// block_operation used in block_applied_callback to represent virtual operations.
+// default operation type have no position info (trx, op_in_trx)
+struct block_operation {
+
+    block_operation();
+
+    block_operation(const operation_notification& o) :
+        trx_in_block(o.trx_in_block),
+        op_in_trx(o.op_in_trx),
+        virtual_op(o.virtual_op),
+        op(o.op) {};
+
+    uint32_t trx_in_block = 0;
+    uint16_t op_in_trx = 0;
+    uint32_t virtual_op = 0;
+    operation op;
+};
+
+using block_operations = std::vector<block_operation>;
+
+struct annotated_signed_block : public signed_block {
+
+    annotated_signed_block();
+
+    annotated_signed_block(const signed_block& block);
+
+    annotated_signed_block(const signed_block& block, const block_operations& ops);
+
+    annotated_signed_block(const annotated_signed_block& block) = default;
+
+    block_id_type block_id;
+    public_key_type signing_key;
+    vector<transaction_id_type> transaction_ids;
+
+    // name field starting with _ coz it's not directly related to block
+    optional<block_operations> _virtual_operations;
+};
+
+} } // golos::api
+
+
+FC_REFLECT((golos::api::block_operation),
+    (trx_in_block)(op_in_trx)(virtual_op)(op))
+FC_REFLECT_DERIVED((golos::api::annotated_signed_block), ((golos::chain::signed_block)),
+    (block_id)(signing_key)(transaction_ids)(_virtual_operations))
diff --git a/libraries/protocol/include/golos/protocol/config.hpp b/libraries/protocol/include/golos/protocol/config.hpp
@@ -3,7 +3,7 @@
  */
 #pragma once
 
-#define STEEMIT_BLOCKCHAIN_VERSION              (version(0, 18, 4))
+#define STEEMIT_BLOCKCHAIN_VERSION              (version(0, 18, 5))
 #define STEEMIT_BLOCKCHAIN_HARDFORK_VERSION     (hardfork_version(STEEMIT_BLOCKCHAIN_VERSION))
 
 #ifdef STEEMIT_BUILD_TESTNET
diff --git a/libraries/wallet/include/golos/wallet/remote_node_api.hpp b/libraries/wallet/include/golos/wallet/remote_node_api.hpp
@@ -17,6 +17,7 @@
 
 #include <golos/api/account_api_object.hpp>
 #include <golos/api/account_vote.hpp>
+#include <golos/api/block_objects.hpp>
 #include <golos/api/discussion.hpp>
 #include <golos/api/vote_state.hpp>
 
@@ -46,7 +47,7 @@ using namespace golos::api;
  * Class is used by wallet to send formatted API calls to database_api plugin on remote node.
  */
 struct remote_database_api {
-    optional< database_api::signed_block > get_block( uint32_t );
+    optional< golos::api::annotated_signed_block > get_block( uint32_t );
     optional< block_header > get_block_header( uint32_t );
     fc::variant_object get_config();
     database_api::dynamic_global_property_object get_dynamic_global_properties();
diff --git a/libraries/wallet/include/golos/wallet/wallet.hpp b/libraries/wallet/include/golos/wallet/wallet.hpp
@@ -115,15 +115,6 @@ namespace golos { namespace wallet {
             string                    ws_server = "ws://localhost:8091";
         };
 
-        struct signed_block_with_info: public signed_block {
-            signed_block_with_info(const signed_block& block);
-            signed_block_with_info(const signed_block_with_info& block) = default;
-
-            block_id_type block_id;
-            public_key_type signing_key;
-            vector<transaction_id_type> transaction_ids;
-        };
-
         struct key_with_data {
             std::string account;
             std::string type;
@@ -262,7 +253,7 @@ namespace golos { namespace wallet {
              *
              * @returns Public block data on the blockchain
              */
-            optional<signed_block_with_info> get_block(uint32_t num);
+            optional<golos::api::annotated_signed_block> get_block(uint32_t num);
 
             /** Returns sequence of operations included/generated in a specified block
              *
@@ -1345,9 +1336,6 @@ namespace golos { namespace wallet {
 
 FC_REFLECT((golos::wallet::wallet_data), (cipher_keys)(ws_server))
 
-FC_REFLECT_DERIVED((golos::wallet::signed_block_with_info), ((golos::chain::signed_block)),
-        (block_id)(signing_key)(transaction_ids))
-
 FC_REFLECT( (golos::wallet::brain_key_info), (brain_priv_key)(wif_priv_key) (pub_key))
 
 FC_REFLECT( (golos::wallet::plain_keys), (checksum)(keys) )
diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
@@ -1262,7 +1262,7 @@ namespace golos { namespace wallet {
             return my->copy_wallet_file(destination_filename);
         }
 
-        optional<signed_block_with_info> wallet_api::get_block(uint32_t num) {
+        optional<golos::api::annotated_signed_block> wallet_api::get_block(uint32_t num) {
             return my->_remote_database_api->get_block( num );
         }
 
@@ -1644,15 +1644,6 @@ fc::ecc::private_key wallet_api::derive_private_key(const std::string& prefix_st
             return std::make_pair( public_key_type( priv.get_public_key() ), key_to_wif( priv ) );
         }
 
-        signed_block_with_info::signed_block_with_info(const signed_block& block): signed_block(block) {
-            block_id = id();
-            signing_key = signee();
-            transaction_ids.reserve(transactions.size());
-            for (const signed_transaction& tx : transactions) {
-                transaction_ids.push_back(tx.id());
-            }
-        }
-
         witness_api::feed_history_api_object wallet_api::get_feed_history()const {
             return my->_remote_witness_api->get_feed_history();
         }
diff --git a/plugins/account_history/plugin.cpp b/plugins/account_history/plugin.cpp
@@ -513,7 +513,7 @@ if (options.count(name)) { \
     }
 
     void plugin::set_program_options(bpo::options_description& cli, bpo::options_description& cfg) {
-        cli.add_options()(
+        cfg.add_options()(
             "track-account-range",
             bpo::value<std::vector<std::string>>()->composing()->multitoken(),
             "Defines a range of accounts to track as a json pair [\"from\",\"to\"] [from,to]. "
@@ -525,7 +525,6 @@ if (options.count(name)) { \
             "Defines a individual account to track (in addition to ranges). "
             "Can be specified multiple times"
         );
-        cfg.add(cli);
     }
 
     void plugin::plugin_initialize(const bpo::variables_map& options) {
diff --git a/plugins/database_api/api.cpp b/plugins/database_api/api.cpp
@@ -5,6 +5,7 @@
 #include <golos/protocol/get_config.hpp>
 #include <golos/protocol/exceptions.hpp>
 #include <golos/chain/operation_notification.hpp>
+#include <golos/api/block_objects.hpp>
 
 #include <fc/smart_ref_impl.hpp>
 
@@ -15,6 +16,8 @@
 
 namespace golos { namespace plugins { namespace database_api {
 
+using golos::api::annotated_signed_block;
+using golos::api::block_operations;
 
 template<typename arg>
 struct callback_info {
@@ -49,31 +52,6 @@ using pending_tx_callback_info = callback_info<const signed_transaction&>;
 using pending_tx_callback = pending_tx_callback_info::callback_t;
 
 
-// block_operation used in block_applied_callback to represent virtual operations.
-// default operation type have no position info (trx, op_in_trx)
-struct block_operation {
-    block_operation(const operation_notification& o) :
-        trx_in_block(o.trx_in_block),
-        op_in_trx(o.op_in_trx),
-        virtual_op(o.virtual_op),
-        op(o.op) {};
-
-    uint32_t trx_in_block = 0;
-    uint16_t op_in_trx = 0;
-    uint32_t virtual_op = 0;
-    operation op;
-};
-
-using block_operations = std::vector<block_operation>;
-
-struct block_with_vops : public signed_block {
-    block_with_vops(signed_block b, block_operations ops): signed_block(b), _virtual_operations(ops) {
-    };
-
-    // name field starting with _ coz it's not directly related to block
-    block_operations _virtual_operations;
-};
-
 struct virtual_operations {
     virtual_operations(uint32_t block_num, block_operations ops): block_num(block_num), operations(ops) {
     };
@@ -243,7 +221,7 @@ DEFINE_API(plugin, set_block_applied_callback) {
                     r = fc::variant(virtual_operations(block.block_num(), my->get_block_vops()));
                     break;
                 case full:
-                    r = fc::variant(block_with_vops(block, my->get_block_vops()));
+                    r = fc::variant(annotated_signed_block(block, my->get_block_vops()));
                     break;
                 default:
                     break;
@@ -926,9 +904,5 @@ void plugin::plugin_startup() {
 } } } // golos::plugins::database_api
 
 FC_REFLECT((golos::plugins::database_api::virtual_operations), (block_num)(operations))
-FC_REFLECT((golos::plugins::database_api::block_operation),
-    (trx_in_block)(op_in_trx)(virtual_op)(op))
-FC_REFLECT_DERIVED((golos::plugins::database_api::block_with_vops), ((golos::protocol::signed_block)),
-    (_virtual_operations))
 FC_REFLECT_ENUM(golos::plugins::database_api::block_applied_callback_result_type,
     (block)(header)(virtual_ops)(full))
diff --git a/plugins/debug_node/plugin.cpp b/plugins/debug_node/plugin.cpp
@@ -107,7 +107,7 @@ void plugin::set_program_options (
    boost::program_options::options_description &cli,
    boost::program_options::options_description &cfg
 ) {
-   cli.add_options()
+   cfg.add_options()
       ("debug-node-edit-script,e",
          boost::program_options::value< std::vector< std::string > >()->composing(),
          "Database edits to apply on startup (may specify multiple times)")
diff --git a/plugins/follow/plugin.cpp b/plugins/follow/plugin.cpp
@@ -405,10 +405,9 @@ namespace golos {
 
             void plugin::set_program_options(boost::program_options::options_description& cli,
                                                     boost::program_options::options_description& cfg) {
-                cli.add_options()
+                cfg.add_options()
                     ("follow-max-feed-size", boost::program_options::value<uint32_t>()->default_value(500),
                         "Set the maximum size of cached feed for an account");
-                cfg.add(cli);
             }
 
             void plugin::plugin_initialize(const boost::program_options::variables_map& options) {
diff --git a/plugins/market_history/market_history_plugin.cpp b/plugins/market_history/market_history_plugin.cpp
@@ -382,14 +382,13 @@ namespace golos {
                     boost::program_options::options_description &cli,
                     boost::program_options::options_description &cfg
             ) {
-                cli.add_options()
+                cfg.add_options()
                         ("market-history-bucket-size",
                          boost::program_options::value<string>()->default_value("[15,60,300,3600,86400]"),
                          "Track market history by grouping orders into buckets of equal size measured in seconds specified as a JSON array of numbers")
                         ("market-history-buckets-per-size",
                          boost::program_options::value<uint32_t>()->default_value(5760),
                          "How far back in time to track history for each bucket size, measured in the number of buckets (default: 5760)");
-                cfg.add(cli);
             }
 
             void market_history_plugin::plugin_initialize(const boost::program_options::variables_map &options) {
diff --git a/plugins/mongo_db/mongo_db_plugin.cpp b/plugins/mongo_db/mongo_db_plugin.cpp
@@ -55,7 +55,7 @@ namespace mongo_db {
         boost::program_options::options_description &cli,
         boost::program_options::options_description &cfg
     ) {
-        cli.add_options()
+        cfg.add_options()
             ("mongodb-uri",
              boost::program_options::value<string>()->default_value("mongodb://127.0.0.1:27017/Golos"),
              "Mongo DB connection string")
@@ -71,7 +71,6 @@ namespace mongo_db {
             ("mongodb-store-wso-history",
              boost::program_options::value<unsigned int>()->default_value(100),
              "Mode of storing witness_schedule_object history for each N block");
-        cfg.add(cli);
     }
 
     void mongo_db_plugin::plugin_initialize(const boost::program_options::variables_map &options) {
diff --git a/plugins/network_broadcast_api/network_broadcast_api.cpp b/plugins/network_broadcast_api/network_broadcast_api.cpp
@@ -57,10 +57,11 @@ namespace golos {
 
             DEFINE_API(network_broadcast_api_plugin, broadcast_transaction_synchronous) {
                 PLUGIN_API_VALIDATE_ARGS(
+                    (std::string,        unused)            // TODO: remove in HF
                     (signed_transaction, trx)
                     (uint32_t,           max_block_age, 0)
                 );
-                if (n_args >= 2) {
+                if (n_args >= 3) {
                     GOLOS_CHECK_PARAM(max_block_age, GOLOS_CHECK_VALUE(!check_max_block_age(max_block_age), "Invalid value"));
                 }
 
diff --git a/plugins/operation_history/CMakeLists.txt b/plugins/operation_history/CMakeLists.txt
@@ -35,6 +35,7 @@ target_link_libraries (
     graphene_time
     chainbase
     fc
+    golos::api
 )
 
 target_include_directories(golos_${CURRENT_TARGET}
diff --git a/plugins/operation_history/include/golos/plugins/operation_history/plugin.hpp b/plugins/operation_history/include/golos/plugins/operation_history/plugin.hpp
@@ -26,6 +26,7 @@
 #include <appbase/application.hpp>
 #include <golos/plugins/chain/plugin.hpp>
 
+#include <golos/api/block_objects.hpp>
 #include <golos/chain/database.hpp>
 #include <boost/program_options.hpp>
 
@@ -38,10 +39,15 @@
 namespace golos { namespace plugins { namespace operation_history {
     using namespace chain;
 
+    using golos::api::annotated_signed_block;
+    using golos::api::block_operation;
+    using golos::api::block_operations;
+
     using plugins::json_rpc::void_type;
     using plugins::json_rpc::msg_pack;
     using plugins::json_rpc::msg_pack_transfer;
 
+    DEFINE_API_ARGS(get_block_with_virtual_ops, msg_pack, annotated_signed_block)
     DEFINE_API_ARGS(get_ops_in_block, msg_pack, std::vector<applied_operation>)
     DEFINE_API_ARGS(get_transaction,  msg_pack, annotated_signed_transaction)
 
@@ -70,6 +76,8 @@ namespace golos { namespace plugins { namespace operation_history {
         void plugin_shutdown() override;
 
         DECLARE_API(
+            (get_block_with_virtual_ops)
+
             /**
              *  @brief Get sequence of operations included/generated within a particular block
              *  @param block_num Height of the block whose generated virtual operations should be returned
diff --git a/plugins/operation_history/plugin.cpp b/plugins/operation_history/plugin.cpp
diff --git a/plugins/statsd/plugin.cpp b/plugins/statsd/plugin.cpp
diff --git a/plugins/witness/witness.cpp b/plugins/witness/witness.cpp

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,15 @@ list(APPEND CURRENT_TARGET_HEADERS`
`9`	`9`	`include/golos/api/vote_state.hpp`
`10`	`10`	`include/golos/api/account_vote.hpp`
`11`	`11`	`include/golos/api/discussion_helper.hpp`
	`12`	`+ include/golos/api/block_objects.hpp`
`12`	`13`	`)`
`13`	`14`
`14`	`15`	`list(APPEND CURRENT_TARGET_SOURCES`
`15`	`16`	`account_api_object.cpp`
`16`	`17`	`discussion_helper.cpp`
`17`	`18`	`chain_api_properties.cpp`
`18`	`19`	`witness_api_object.cpp`
	`20`	`+ block_objects.cpp`
`19`	`21`	`)`
`20`	`22`
`21`	`23`	`if(BUILD_SHARED_LIBRARIES)`
Original file line number	Diff line number	Diff line change
`@@ -1262,7 +1262,7 @@ namespace golos { namespace wallet {`
`1262`	`1262`	`return my->copy_wallet_file(destination_filename);`
`1263`	`1263`	`}`
`1264`	`1264`
`1265`		`- optional<signed_block_with_info> wallet_api::get_block(uint32_t num) {`
	`1265`	`+ optional<golos::api::annotated_signed_block> wallet_api::get_block(uint32_t num) {`
`1266`	`1266`	`return my->_remote_database_api->get_block( num );`
`1267`	`1267`	`}`
`1268`	`1268`
`@@ -1644,15 +1644,6 @@ fc::ecc::private_key wallet_api::derive_private_key(const std::string& prefix_st`
`1644`	`1644`	`return std::make_pair( public_key_type( priv.get_public_key() ), key_to_wif( priv ) );`
`1645`	`1645`	`}`
`1646`	`1646`
`1647`		`- signed_block_with_info::signed_block_with_info(const signed_block& block): signed_block(block) {`
`1648`		`- block_id = id();`
`1649`		`- signing_key = signee();`
`1650`		`- transaction_ids.reserve(transactions.size());`
`1651`		`- for (const signed_transaction& tx : transactions) {`
`1652`		`- transaction_ids.push_back(tx.id());`
`1653`		`- }`
`1654`		`- }`
`1655`		`-`
`1656`	`1647`	`witness_api::feed_history_api_object wallet_api::get_feed_history()const {`
`1657`	`1648`	`return my->_remote_witness_api->get_feed_history();`
`1658`	`1649`	`}`
Original file line number	Diff line number	Diff line change
`@@ -513,7 +513,7 @@ if (options.count(name)) { \`
`513`	`513`	`}`
`514`	`514`
`515`	`515`	`void plugin::set_program_options(bpo::options_description& cli, bpo::options_description& cfg) {`
`516`		`- cli.add_options()(`
	`516`	`+ cfg.add_options()(`
`517`	`517`	`"track-account-range",`
`518`	`518`	`bpo::value<std::vector<std::string>>()->composing()->multitoken(),`
`519`	`519`	`"Defines a range of accounts to track as a json pair [\"from\",\"to\"] [from,to]. "`
`@@ -525,7 +525,6 @@ if (options.count(name)) { \`
`525`	`525`	`"Defines a individual account to track (in addition to ranges). "`
`526`	`526`	`"Can be specified multiple times"`
`527`	`527`	`);`
`528`		`- cfg.add(cli);`
`529`	`528`	`}`
`530`	`529`
`531`	`530`	`void plugin::plugin_initialize(const bpo::variables_map& options) {`