fixed: support for v1.5.0

Author: Tal Muskal

README.md

@@ -35,24 +35,21 @@ Total system ram, state_db_size, Processor type, VM or not, etc.
 # Installation instructions
 
 ## Requirements
-- Works on any EOSIO node that runs v1.2.0 and up.
+- Works on any EOSIO node that runs v1.5.0 and up. (see older tags for older versions)
 
 ## Building the plugin [Install on your nodeos server]
 1. run
   ```
-  cd <eosio-source-dir>/plugins
-  git clone https://github.com/bancorprotocol/eos-producer-heartbeat-plugin.git producer_heartbeat_plugin
+  cd <eosio-source-dir>
+  cd plugins
+  git clone https://github.com/LiquidEOS/eos-producer-heartbeat-plugin.git producer_heartbeat_plugin
+  git checkout tags/v1.5.0
+  cd ..
+  git apply plugins/producer_heartbeat_plugin/install.patch
+  ./eosio_build.sh -s "EOS"
+  sudo ./eosio_install.sh
   ```
-2. Add the following line to `<eosio-source-dir>/plugins/CMakeLists.txt` with other `add_subdirectory` items
-  ```
-  add_subdirectory(producer_heartbeat_plugin)
-  ```
-
-3. Add the following line to the bottom of `<eosio-source-dir>/programs/nodeos/CMakeLists.txt`
-  ```
-  target_link_libraries( nodeos PRIVATE -Wl,${whole_archive_flag} producer_heartbeat_plugin -Wl,${no_whole_archive_flag})
-  ```
-4. Build and install nodeos as usual. You could even just `cd <eosio-source-dir>/build` and then `sudo make install`
+2. Build and install nodeos as usual.
 
 # Setup permissions 
 Use a dedicated key for this action. This step is not mandatory (especially on testnets), you can use your active key instead and set ```heartbeat-permission = active```

install.patch

@@ -0,0 +1,25 @@
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index 8c93df9c4..927e1bc5e 100644
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -20,6 +20,7 @@ add_subdirectory(mongo_db_plugin)
+ add_subdirectory(login_plugin)
+ add_subdirectory(test_control_plugin)
+ add_subdirectory(test_control_api_plugin)
++add_subdirectory(producer_heartbeat_plugin)
+ 
+ # Forward variables to top level so packaging picks them up
+ set(CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS} PARENT_SCOPE)
+diff --git a/programs/nodeos/CMakeLists.txt b/programs/nodeos/CMakeLists.txt
+index 6bddeacb8..8c9fafda5 100644
+--- a/programs/nodeos/CMakeLists.txt
++++ b/programs/nodeos/CMakeLists.txt
+@@ -73,6 +73,8 @@ endif()
+ 
+ include(additionalPlugins)
+ 
++target_link_libraries( ${NODE_EXECUTABLE_NAME} PRIVATE -Wl,${whole_archive_flag} producer_heartbeat_plugin -Wl,${no_whole_archive_flag})
++
+ copy_bin( ${NODE_EXECUTABLE_NAME} )
+ install( TARGETS
+    ${NODE_EXECUTABLE_NAME}

producer_heartbeat_plugin.cpp

@@ -9,8 +9,6 @@
 #include <fc/io/json.hpp>
 #include <eosio/chain/abi_serializer.hpp>
 
-#include <eosio/utilities/common.hpp>
-
 #include <algorithm> 
 #include <cctype>
 #include <locale>
@@ -19,7 +17,14 @@
 
 namespace eosio {
    using namespace eosio::chain;
-   
+   template<typename I>
+   std::string itoh(I n, size_t hlen = sizeof(I)<<1) {
+      static const char* digits = "0123456789abcdef";
+      std::string r(hlen, '0');
+      for(size_t i = 0, j = (hlen - 1) * 4 ; i < hlen; ++i, j -= 4)
+         r[i] = digits[(n>>j) & 0x0f];
+      return r;
+   }
    static appbase::abstract_plugin& _template_plugin = app().register_plugin<producer_heartbeat_plugin>();
 
 // https://stackoverflow.com/questions/216823/whats-the-best-way-to-trim-stdstring
@@ -97,16 +102,16 @@ class producer_heartbeat_plugin_impl {
         }
       }
       mutable_variant_object collect_metadata(controller& cc){
-         // boost::mutex::scoped_lock lock(mtx);
-         // // get latencies table & clear table
-         // auto latencies_to_use = latencies;
-         // latencies = mutable_variant_object();
-         // latencies_sum_count.clear();
-         // lock.unlock();
+         boost::mutex::scoped_lock lock(mtx);
+         // get latencies table & clear table
+         auto latencies_to_use = latencies;
+         latencies = mutable_variant_object();
+         latencies_sum_count.clear();
+         lock.unlock();
 
          return mutable_variant_object()
-               ("hb_version", "1.1.02")
-               ("version", eosio::utilities::common::itoh(static_cast<uint32_t>(app().version())))
+               ("hb_version", "1.5.01")
+               ("version", itoh(static_cast<uint32_t>(app().version())))
                ("version_string", app().version_string())
                ("abl_hash", actor_blacklist_hash)
                ("abl_cnt", actor_blacklist_count)
@@ -116,7 +121,7 @@ class producer_heartbeat_plugin_impl {
                ("vtype", virtualization_type)
                ("memory", total_memory)
                ("db_size", state_db_size)
-               // ("latencies", latencies_to_use)
+               ("latencies", latencies_to_use)
                ("head",  cc.fork_db_head_block_num());
       }
       void send_heartbeat_transaction(int retry = 0){
@@ -403,11 +408,11 @@ void producer_heartbeat_plugin::plugin_initialize(const variables_map& options)
 void producer_heartbeat_plugin::plugin_startup() {
    ilog("producer heartbeat plugin:  plugin_startup() begin");
    try{
-      // auto& chain = app().find_plugin<chain_plugin>()->chain();
-      // my->accepted_block_conn.emplace(chain.accepted_block.connect(
-      //    [&](const block_state_ptr& b_state) {
-      //       my->on_accepted_block(b_state);
-      // }));
+      auto& chain = app().find_plugin<chain_plugin>()->chain();
+      my->accepted_block_conn.emplace(chain.accepted_block.connect(
+         [&](const block_state_ptr& b_state) {
+            my->on_accepted_block(b_state);
+      }));
       my->send_heartbeat_transaction();
    }
    FC_LOG_AND_DROP();