Merge remote-tracking branch 'spring/release/1.0-beta3' into GH-278-p…

…2p-sync-main
AntelopeIO · Jun 14, 2024 · 957ffc4 · 957ffc4
2 parents 391be54 + d76aeac
commit 957ffc4
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 88 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ set( CXX_STANDARD_REQUIRED ON)
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 0)
 set(VERSION_PATCH 0)
-set(VERSION_SUFFIX dev)
+set(VERSION_SUFFIX beta3.0)
 
 if(VERSION_SUFFIX)
     set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

diff --git a/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp b/plugins/net_plugin/include/eosio/net_plugin/protocol.hpp
@@ -34,8 +34,8 @@ namespace eosio {
       string                     p2p_address;
       uint32_t                   last_irreversible_block_num = 0;
       block_id_type              last_irreversible_block_id;
-      uint32_t                   head_num = 0;
-      block_id_type              head_id;
+      uint32_t                   fork_head_num = 0;
+      block_id_type              fork_head_id;
       string                     os;
       string                     agent;
       int16_t                    generation = 0;
@@ -155,7 +155,7 @@ FC_REFLECT( eosio::handshake_message,
             (network_version)(chain_id)(node_id)(key)
             (time)(token)(sig)(p2p_address)
             (last_irreversible_block_num)(last_irreversible_block_id)
-            (head_num)(head_id)
+            (fork_head_num)(fork_head_id)
             (os)(agent)(generation) )
 FC_REFLECT( eosio::go_away_message, (reason)(node_id) )
 FC_REFLECT( eosio::time_message, (org)(rec)(xmt)(dst) )