806 Adding BITE

CMakeLists.txt

@@ -74,18 +74,21 @@ add_definitions("-DUSER_SPACE")
 add_definitions("-DZMQ_EXPERIMENTAL")
 add_definitions("-DZMQ_NONBLOCKING")
 
-if (PL)
-    set(BITE)
-endif()
 
-if (PL)
-    add_definitions(-DPL)
+
+if (DEFINED PL)
+    add_definitions("-DPL")
+    set(BITE ON)
 endif()
 
-if (BITE)
-    add_definitions(-DBITE)
+
+if (DEFINED BITE)
+    add_definitions("-DBITE")
 endif()
 
+message(STATUS "PL value is: ${PL}")
+message(STATUS "BITE value is: ${BITE}")
+
 
 #add_definitions(-DGOOGLE_PROFILE) // uncomment to profile
 
@@ -146,10 +149,10 @@ AUX_SOURCE_DIRECTORY(monitoring monitoring_src)
 AUX_SOURCE_DIRECTORY(utils utils_src)
 AUX_SOURCE_DIRECTORY(statusserver statusserver_src)
 AUX_SOURCE_DIRECTORY(sgxclient sgxclient_src)
-if (NOT PL)
+if (NOT DEFINED PL)
      AUX_SOURCE_DIRECTORY(oracle oracle_src)
 endif()
-if (BITE)
+if (DEFINED BITE)
     AUX_SOURCE_DIRECTORY( bite bite_src)
     AUX_SOURCE_DIRECTORY( bite/client bite_client_src)
     AUX_SOURCE_DIRECTORY( bite/server bite_server_src)
@@ -197,11 +200,11 @@ SET(SRC_FILES
         ${sgxclient_src}
         Agent.h Agent.cpp SkaleCommon.cpp Log.cpp microprofile.cpp miniz.c db/VersionUpdateHistory.cpp db/VersionUpdateHistory.h)
 
-if (NOT PL)
+if (NOT DEFINED PL)
     SET(SRC_FILES ${SRC_FILES}  ${oracle_src})
 endif()
 
-if (BITE`)
+if (DEFINED BITE)
     SET(SRC_FILES ${SRC_FILES}  ${bite_src} ${bite_client_src} ${bite_server_src})
 endif()
 

bite/BITEManager.h

@@ -5,7 +5,7 @@
 #ifndef SKALED_BITEMANAGER_H
 #define SKALED_BITEMANAGER_H
 
-#include "BITEClient.h"
+#include "bite/client/BITEClient.h"
 
 class BITEManager {
 

bite/server/BiteBlockFinalizeAndDecryptServer.cpp

@@ -27,26 +27,14 @@
 #include "chains/Schain.h"
 #include "exceptions/FatalError.h"
 #include "node/Node.h"
-#include "node/NodeInfo.h"
-#include <db/MsgDB.h>
-
-#include "unordered_set"
 
 
 #include "exceptions/ExitRequestedException.h"
 #include "exceptions/InvalidMessageFormatException.h"
-#include "protocols/blockconsensus/BlockConsensusAgent.h"
 
-#include "utils/Time.h"
-#include "threads/GlobalThreadRegistry.h"
 
 #include "BiteBlockFinalizeAndDecryptServer.h"
 
-void BiteBlockFinalizeAndDecryptServer::startThreads() {
-}
-
-
-
 BiteBlockFinalizeAndDecryptServer::BiteBlockFinalizeAndDecryptServer( Schain& _sChain )
     : Agent( _sChain,  true ) {
 

bite/server/BiteBlockFinalizeAndDecryptServer.h

@@ -28,18 +28,13 @@
 class Schain;
 class Node;
 
-enum TransportType { ZMQ };
 
 class BiteBlockFinalizeAndDecryptServer : public Agent {
-protected:
 
+public:
 
     explicit BiteBlockFinalizeAndDecryptServer( Schain& _sChain );
 
-
-public:
-    void startThreads();
-
     ~BiteBlockFinalizeAndDecryptServer() override;
 
 };

chains/Schain.cpp

@@ -102,7 +102,15 @@
 #include "protocols/blockconsensus/BlockConsensusAgent.h"
 
 
+#ifdef BITE
+#include "bite/server/BiteBlockFinalizeAndDecryptServer.h"
+#endif
+
+
 #include "Schain.h"
+
+#include <statusserver/StatusServer.h>
+
 #include "SchainMessageThreadPool.h"
 #include "SchainTest.h"
 #include "TestConfig.h"
@@ -1227,6 +1235,10 @@ void Schain::constructServers( const ptr< Sockets >& _sockets ) {
 
     catchupServerAgent = make_shared< CatchupServerAgent >( *this, _sockets->catchupSocket );
 
+#ifdef BITE
+    biteBlockFinalizeAndDecryptServer = make_shared< BiteBlockFinalizeAndDecryptServer >( *this);
+#endif
+
 
     if ( getNode()->isSyncOnlyNode() )
         return;

chains/Schain.h

@@ -90,6 +90,10 @@ class StatusServer;
 class OracleClient;
 class OracleResultAssemblyAgent;
 
+#ifdef BITE
+class BiteBlockFinalizeAndDecryptServer;
+#endif
+
 class Schain : public Agent {
     queue< ptr< MessageEnvelope > > messageQueue;
 
@@ -115,7 +119,11 @@ class Schain : public Agent {
 
     ptr< BlockProposalServerAgent > blockProposalServerAgent;
 
-    ptr< CatchupServerAgent > catchupServerAgent;
+    ptr<  CatchupServerAgent > catchupServerAgent;
+
+#ifdef BITE
+    ptr <BiteBlockFinalizeAndDecryptServer> biteBlockFinalizeAndDecryptServer;
+#endif
 
     ptr< MonitoringAgent > monitoringAgent;