chore: merge v4 and v5 network version to same version

Taraxa-project · Dec 18, 2024 · 92005e1 · 92005e1
1 parent 4fef314
commit 92005e1
Show file tree

Hide file tree

Showing 39 changed files with 150 additions and 215 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@ set(TARAXA_PATCH_VERSION 1)
 set(TARAXA_VERSION ${TARAXA_MAJOR_VERSION}.${TARAXA_MINOR_VERSION}.${TARAXA_PATCH_VERSION})
 
 # Any time a change in the network protocol is introduced this version should be increased
-set(TARAXA_NET_VERSION 5)
+set(TARAXA_NET_VERSION 4)
 # Major version is modified when DAG blocks, pbft blocks and any basic building blocks of our blockchain is modified
 # in the db
 set(TARAXA_DB_MAJOR_VERSION 1)

diff --git a/libraries/common/include/common/constants.hpp b/libraries/common/include/common/constants.hpp
@@ -31,7 +31,7 @@ constexpr uint32_t kDefaultTransactionPoolSize{200000};
 constexpr uint32_t kMaxNonFinalizedTransactions{1000000};
 constexpr uint32_t kMaxNonFinalizedDagBlocks{100};
 
-const size_t kV4NetworkVersion = 4;
+const size_t kV3NetworkVersion = 3;
 
 const uint32_t kRecentlyFinalizedTransactionsFactor = 2;
 

diff --git a/...common/ext_pillar_vote_packet_handler.hpp → ...common/ext_pillar_vote_packet_handler.hpp b/...common/ext_pillar_vote_packet_handler.hpp → ...common/ext_pillar_vote_packet_handler.hpp
@@ -16,7 +16,7 @@ class FinalChain;
 
 }  // namespace taraxa
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class ExtPillarVotePacketHandler : public PacketHandler {
  public:
@@ -32,4 +32,4 @@ class ExtPillarVotePacketHandler : public PacketHandler {
   std::shared_ptr<pillar_chain::PillarChainManager> pillar_chain_manager_;
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/.../v4/common/ext_syncing_packet_handler.hpp → .../v3/common/ext_syncing_packet_handler.hpp b/.../v4/common/ext_syncing_packet_handler.hpp → .../v3/common/ext_syncing_packet_handler.hpp
@@ -14,7 +14,7 @@ namespace taraxa::network::tarcap {
 class PbftSyncingState;
 }
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 /**
  * @brief ExtSyncingPacketHandler is extended abstract PacketHandler with added functions that are used in packet
@@ -63,4 +63,4 @@ class ExtSyncingPacketHandler : public PacketHandler {
   std::shared_ptr<DbStorage> db_{nullptr};
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...rs/v4/common/ext_votes_packet_handler.hpp → ...rs/v3/common/ext_votes_packet_handler.hpp b/...rs/v4/common/ext_votes_packet_handler.hpp → ...rs/v3/common/ext_votes_packet_handler.hpp
@@ -11,7 +11,7 @@ class VoteManager;
 class SlashingManager;
 }  // namespace taraxa
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 /**
  * @brief ExtVotesPacketHandler is extended abstract PacketHandler with added functions that are used in packet
@@ -88,4 +88,4 @@ class ExtVotesPacketHandler : public PacketHandler {
   std::shared_ptr<SlashingManager> slashing_manager_;
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...ets_handlers/v4/common/packet_handler.hpp → ...ets_handlers/v3/common/packet_handler.hpp b/...ets_handlers/v4/common/packet_handler.hpp → ...ets_handlers/v3/common/packet_handler.hpp
@@ -13,7 +13,7 @@
 #include "network/tarcap/taraxa_peer.hpp"
 #include "network/threadpool/packet_data.hpp"
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 // class TimePeriodPacketsStats;
 
@@ -83,4 +83,4 @@ class PacketHandler : public BasePacketHandler {
   LOG_OBJECTS_DEFINE
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/..._handlers/v4/dag_block_packet_handler.hpp → ..._handlers/v3/dag_block_packet_handler.hpp b/..._handlers/v4/dag_block_packet_handler.hpp → ..._handlers/v3/dag_block_packet_handler.hpp
@@ -6,7 +6,7 @@ namespace taraxa {
 class TransactionManager;
 }  // namespace taraxa
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class DagBlockPacketHandler : public ExtSyncingPacketHandler {
  public:
@@ -34,4 +34,4 @@ class DagBlockPacketHandler : public ExtSyncingPacketHandler {
   std::shared_ptr<TransactionManager> trx_mgr_{nullptr};
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...s_handlers/v4/dag_sync_packet_handler.hpp → ...s_handlers/v3/dag_sync_packet_handler.hpp b/...s_handlers/v4/dag_sync_packet_handler.hpp → ...s_handlers/v3/dag_sync_packet_handler.hpp
@@ -6,7 +6,7 @@ namespace taraxa {
 class TransactionManager;
 }  // namespace taraxa
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class DagSyncPacketHandler : public ExtSyncingPacketHandler {
  public:
@@ -28,4 +28,4 @@ class DagSyncPacketHandler : public ExtSyncingPacketHandler {
   std::shared_ptr<TransactionManager> trx_mgr_{nullptr};
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...ndlers/v4/get_dag_sync_packet_handler.hpp → ...ndlers/v3/get_dag_sync_packet_handler.hpp b/...ndlers/v4/get_dag_sync_packet_handler.hpp → ...ndlers/v3/get_dag_sync_packet_handler.hpp
@@ -9,7 +9,7 @@ class DbStorage;
 class TransactionManager;
 }  // namespace taraxa
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class GetDagSyncPacketHandler : public PacketHandler {
  public:
@@ -35,4 +35,4 @@ class GetDagSyncPacketHandler : public PacketHandler {
   std::shared_ptr<DbStorage> db_;
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/.../get_next_votes_bundle_packet_handler.hpp → .../get_next_votes_bundle_packet_handler.hpp b/.../get_next_votes_bundle_packet_handler.hpp → .../get_next_votes_bundle_packet_handler.hpp
@@ -7,7 +7,7 @@ class PbftManager;
 class VoteManager;
 }  // namespace taraxa
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class GetNextVotesBundlePacketHandler : public ExtVotesPacketHandler {
  public:
@@ -26,4 +26,4 @@ class GetNextVotesBundlePacketHandler : public ExtVotesPacketHandler {
   virtual void process(const threadpool::PacketData& packet_data, const std::shared_ptr<TaraxaPeer>& peer) override;
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...dlers/v4/get_pbft_sync_packet_handler.hpp → ...dlers/v3/get_pbft_sync_packet_handler.hpp b/...dlers/v4/get_pbft_sync_packet_handler.hpp → ...dlers/v3/get_pbft_sync_packet_handler.hpp
@@ -1,34 +1,27 @@
 #pragma once
-
-#include "common/packet_handler.hpp"
-
+#include "../v3/common/packet_handler.hpp"
 namespace taraxa {
 class PbftChain;
 class DbStorage;
 class VoteManager;
 }  // namespace taraxa
-
 namespace taraxa::network::tarcap {
 class PbftSyncingState;
 }
-
-namespace taraxa::network::tarcap::v4 {
-
+namespace taraxa::network::tarcap::v3 {
 class GetPbftSyncPacketHandler : public PacketHandler {
  public:
-  GetPbftSyncPacketHandler(const FullNodeConfig& conf, std::shared_ptr<PeersState> peers_state,
-                           std::shared_ptr<TimePeriodPacketsStats> packets_stats,
+  GetPbftSyncPacketHandler(const FullNodeConfig& conf, std::shared_ptr<taraxa::network::tarcap::PeersState> peers_state,
+                           std::shared_ptr<taraxa::network::tarcap::TimePeriodPacketsStats> packets_stats,
                            std::shared_ptr<PbftSyncingState> pbft_syncing_state, std::shared_ptr<PbftChain> pbft_chain,
                            std::shared_ptr<VoteManager> vote_mgr, std::shared_ptr<DbStorage> db,
                            const addr_t& node_addr, const std::string& logs_prefix = "GET_PBFT_SYNC_PH");
-
   // Packet type that is processed by this handler
   static constexpr SubprotocolPacketType kPacketType_ = SubprotocolPacketType::kGetPbftSyncPacket;
 
  private:
   virtual void validatePacketRlpFormat(const threadpool::PacketData& packet_data) const override;
   virtual void process(const threadpool::PacketData& packet_data, const std::shared_ptr<TaraxaPeer>& peer) override;
-
   virtual void sendPbftBlocks(const std::shared_ptr<TaraxaPeer>& peer, PbftPeriod from_period,
                               size_t blocks_to_transfer, bool pbft_chain_synced);
 
@@ -38,5 +31,4 @@ class GetPbftSyncPacketHandler : public PacketHandler {
   std::shared_ptr<VoteManager> vote_mgr_;
   std::shared_ptr<DbStorage> db_;
 };
-
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...et_pillar_votes_bundle_packet_handler.hpp → ...et_pillar_votes_bundle_packet_handler.hpp b/...et_pillar_votes_bundle_packet_handler.hpp → ...et_pillar_votes_bundle_packet_handler.hpp
@@ -3,7 +3,7 @@
 #include "common/packet_handler.hpp"
 #include "pillar_chain/pillar_chain_manager.hpp"
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class GetPillarVotesBundlePacketHandler : public PacketHandler {
  public:
@@ -28,4 +28,4 @@ class GetPillarVotesBundlePacketHandler : public PacketHandler {
   std::shared_ptr<pillar_chain::PillarChainManager> pillar_chain_manager_;
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/..._handlers/v4/pbft_sync_packet_handler.hpp → ..._handlers/v3/pbft_sync_packet_handler.hpp b/..._handlers/v4/pbft_sync_packet_handler.hpp → ..._handlers/v3/pbft_sync_packet_handler.hpp
@@ -1,11 +1,8 @@
 #pragma once
-
-#include "common/ext_syncing_packet_handler.hpp"
+#include "../v3/common/ext_syncing_packet_handler.hpp"
 #include "common/thread_pool.hpp"
 #include "vote_manager/vote_manager.hpp"
-
-namespace taraxa::network::tarcap::v4 {
-
+namespace taraxa::network::tarcap::v3 {
 class PbftSyncPacketHandler : public ExtSyncingPacketHandler {
  public:
   PbftSyncPacketHandler(const FullNodeConfig& conf, std::shared_ptr<PeersState> peers_state,
@@ -14,9 +11,7 @@ class PbftSyncPacketHandler : public ExtSyncingPacketHandler {
                         std::shared_ptr<PbftManager> pbft_mgr, std::shared_ptr<DagManager> dag_mgr,
                         std::shared_ptr<VoteManager> vote_mgr, std::shared_ptr<DbStorage> db, const addr_t& node_addr,
                         const std::string& logs_prefix = "PBFT_SYNC_PH");
-
   void handleMaliciousSyncPeer(const dev::p2p::NodeID& id);
-
   // Packet type that is processed by this handler
   static constexpr SubprotocolPacketType kPacketType_ = SubprotocolPacketType::kPbftSyncPacket;
 
@@ -27,17 +22,12 @@ class PbftSyncPacketHandler : public ExtSyncingPacketHandler {
  protected:
   virtual PeriodData decodePeriodData(const dev::RLP& period_data_rlp) const;
   virtual std::vector<std::shared_ptr<PbftVote>> decodeVotesBundle(const dev::RLP& votes_bundle_rlp) const;
-
   void pbftSyncComplete();
   void delayedPbftSync(uint32_t counter);
-
   static constexpr uint32_t kDelayedPbftSyncDelayMs = 10;
-
   std::shared_ptr<VoteManager> vote_mgr_;
   util::ThreadPool periodic_events_tp_;
-
   static constexpr size_t kStandardPacketSize = 2;
   static constexpr size_t kChainSyncedPacketSize = 3;
 };
-
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...andlers/v4/pillar_vote_packet_handler.hpp → ...andlers/v3/pillar_vote_packet_handler.hpp b/...andlers/v4/pillar_vote_packet_handler.hpp → ...andlers/v3/pillar_vote_packet_handler.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "network/tarcap/packets_handlers/v4/common/ext_pillar_vote_packet_handler.hpp"
+#include "network/tarcap/packets_handlers/v3/common/ext_pillar_vote_packet_handler.hpp"
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class PillarVotePacketHandler : public ExtPillarVotePacketHandler {
  public:
@@ -22,4 +22,4 @@ class PillarVotePacketHandler : public ExtPillarVotePacketHandler {
   virtual void process(const threadpool::PacketData& packet_data, const std::shared_ptr<TaraxaPeer>& peer) override;
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...v4/pillar_votes_bundle_packet_handler.hpp → ...v3/pillar_votes_bundle_packet_handler.hpp b/...v4/pillar_votes_bundle_packet_handler.hpp → ...v3/pillar_votes_bundle_packet_handler.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "network/tarcap/packets_handlers/v4/common/ext_pillar_vote_packet_handler.hpp"
+#include "network/tarcap/packets_handlers/v3/common/ext_pillar_vote_packet_handler.hpp"
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class PillarVotesBundlePacketHandler : public ExtPillarVotePacketHandler {
  public:
@@ -22,4 +22,4 @@ class PillarVotesBundlePacketHandler : public ExtPillarVotePacketHandler {
   constexpr static size_t kMaxPillarVotesInBundleRlp{250};
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...ets_handlers/v4/status_packet_handler.hpp → ...ets_handlers/v3/status_packet_handler.hpp b/...ets_handlers/v4/status_packet_handler.hpp → ...ets_handlers/v3/status_packet_handler.hpp
@@ -2,7 +2,7 @@
 
 #include "common/ext_syncing_packet_handler.hpp"
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class StatusPacketHandler : public ExtSyncingPacketHandler {
  public:
@@ -30,4 +30,4 @@ class StatusPacketHandler : public ExtSyncingPacketHandler {
   const h256 kGenesisHash;
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...andlers/v4/transaction_packet_handler.hpp → ...andlers/v3/transaction_packet_handler.hpp b/...andlers/v4/transaction_packet_handler.hpp → ...andlers/v3/transaction_packet_handler.hpp
@@ -8,7 +8,7 @@ class TransactionManager;
 enum class TransactionStatus;
 }  // namespace taraxa
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class TestState;
 
@@ -75,4 +75,4 @@ class TransactionPacketHandler : public PacketHandler {
   std::atomic<uint64_t> unique_received_trx_count_{0};
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...ckets_handlers/v4/vote_packet_handler.hpp → ...ckets_handlers/v3/vote_packet_handler.hpp b/...ckets_handlers/v4/vote_packet_handler.hpp → ...ckets_handlers/v3/vote_packet_handler.hpp
@@ -2,7 +2,7 @@
 
 #include "common/ext_votes_packet_handler.hpp"
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class VotePacketHandler : public ExtVotesPacketHandler {
  public:
@@ -36,4 +36,4 @@ class VotePacketHandler : public ExtVotesPacketHandler {
   const size_t kExtendedVotePacketSize{3};
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3
diff --git a/...ndlers/v4/votes_bundle_packet_handler.hpp → ...ndlers/v3/votes_bundle_packet_handler.hpp b/...ndlers/v4/votes_bundle_packet_handler.hpp → ...ndlers/v3/votes_bundle_packet_handler.hpp
@@ -2,7 +2,7 @@
 
 #include "common/ext_votes_packet_handler.hpp"
 
-namespace taraxa::network::tarcap::v4 {
+namespace taraxa::network::tarcap::v3 {
 
 class VotesBundlePacketHandler : public ExtVotesPacketHandler {
  public:
@@ -30,4 +30,4 @@ class VotesBundlePacketHandler : public ExtVotesPacketHandler {
   virtual void process(const threadpool::PacketData& packet_data, const std::shared_ptr<TaraxaPeer>& peer) override;
 };
 
-}  // namespace taraxa::network::tarcap::v4
+}  // namespace taraxa::network::tarcap::v3