Adding zmq

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "cppzmq"]
 	path = cppzmq
 	url = https://github.com/zeromq/cppzmq.git
+[submodule "rapidjson"]
+	path = rapidjson
+	url = https://github.com/Tencent/rapidjson.git

Makefile.am

@@ -49,7 +49,10 @@ AM_CFLAGS = -DUSER_SPACE -g -Og -rdynamic -Wl,--no-as-needed -lSegFault -DSGXWAL
 AM_CXXFLAGS = ${AM_CPPFLAGS} -rdynamic -Wl,--no-as-needed -lSegFault -DSGXWALLET_VERSION="$(WALLET_VERSION)"
 
 
-AM_CPPFLAGS += -DSGXWALLET_VERSION="$(WALLET_VERSION)" -Wall -DSKALE_SGX=1 -DBINARY_OUTPUT=1 -Ileveldb/include -IlibBLS/bls -IlibBLS/libff -IlibBLS -fno-builtin-memset $(GMP_CPPFLAGS)  -I.  -I./libBLS/deps/deps_inst/x86_or_x64/include -I./libzmq/include -I./cppzmq -I./third_party/zguide
+AM_CPPFLAGS += -DSGXWALLET_VERSION="$(WALLET_VERSION)" -Wall -DSKALE_SGX=1 -DBINARY_OUTPUT=1 -Ileveldb/include -IlibBLS/bls\
+    -IlibBLS/libff -IlibBLS -fno-builtin-memset $(GMP_CPPFLAGS)  -I.  \
+    -I./libBLS/deps/deps_inst/x86_or_x64/include -I./libzmq/include -I./cppzmq -I./third_party/zguide \
+    -I./rapidjson/include/rapidjson
 
 ## Additional targets to remove with 'make clean'. You must list
 ## any edger8r generated files here.
@@ -66,7 +69,7 @@ bin_PROGRAMS =  sgxwallet testw cert_util
 ## have to be explicitly listed.
 ## have to be explicitly listed
 
-COMMON_SRC = ZMQServer.cpp ServerWorker.cpp InvalidStateException.cpp  Exception.cpp InvalidArgumentException.cpp Log.cpp  \
+COMMON_SRC = ZMQMessage.cpp ZMQServer.cpp ServerWorker.cpp InvalidStateException.cpp  Exception.cpp InvalidArgumentException.cpp Log.cpp  \
              SGXWalletServer.cpp SGXRegistrationServer.cpp CSRManagerServer.cpp BLSCrypto.cpp \
              ECDSACrypto.cpp \
              DKGCrypto.cpp ServerInit.cpp BLSPrivateKeyShareSGX.cpp LevelDB.cpp ServerDataChecker.cpp SEKManager.cpp \

ServerInit.cpp

@@ -127,10 +127,13 @@ void initUserSpace() {
 }
 
 void exitZMQServer() {
+
     auto doExit = !exiting.exchange(true);
 
     if (doExit) {
+        spdlog::info("Exiting zmq server ...");
         delete zmqServer;
+        spdlog::info("Exited zmq server ...");
         zmqServer = nullptr;
     }
 

ServerWorker.h

@@ -14,6 +14,7 @@
 #include "zhelpers.hpp"
 
 #include "third_party/spdlog/spdlog.h"
+#include "document.h"
 
 
 class ServerWorker {

ZMQMessage.cpp

+/*
+    Copyright (C) 2020 SKALE Labs
+
+    This file is part of skale-consensus.
+
+    skale-consensus is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    skale-consensus is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with skale-consensus.  If not, see <https://www.gnu.org/licenses/>.
+
+    @file ZMQMessage.cpp
+    @author Stan Kladko
+    @date 2020
+*/
+
+#include "common.h"
+#include "ZMQMessage.h"
+
+
+uint64_t ZMQMessage::getUint64Rapid(const char *_name) {
+    CHECK_STATE(_name);
+    CHECK_STATE(d->HasMember(_name));
+    const rapidjson::Value& a = (*d)[_name];
+    CHECK_STATE(a.IsUint64());
+    return a.GetUint64();
+};
+
+string ZMQMessage::getStringRapid(const char *_name) {
+    CHECK_STATE(_name);
+    CHECK_STATE(d->HasMember(_name));
+    CHECK_STATE((*d)[_name].IsString());
+    return (*d)[_name].GetString();
+};

ZMQMessage.h

+/*
+    Copyright (C) 2018-2019 SKALE Labs
+
+    This file is part of skale-consensus.
+
+    skale-consensus is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    skale-consensus is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with skale-consensus.  If not, see <https://www.gnu.org/licenses/>.
+
+    @file ZMQMessage.h
+    @author Stan Kladko
+    @date 2018
+*/
+
+#pragma once
+
+
+
+#include "document.h"
+
+using namespace std;
+
+class ZMQMessage {
+
+    shared_ptr<rapidjson::Document> d;
+
+
+protected:
+    
+
+public:
+
+    explicit ZMQMessage(string& _jsonMessage);
+
+    virtual ~ZMQMessage();
+
+    string getStringRapid(const char *_name);
+
+    uint64_t getUint64Rapid(const char *_name);
+
+};
\ No newline at end of file

ZMQServer.cpp

@@ -25,9 +25,7 @@
 
 #include "third_party/spdlog/spdlog.h"
 
-#include "ServerWorker.h"
 #include "ZMQServer.h"
-
 #include "sgxwallet_common.h"
 
 using namespace std;
@@ -60,8 +58,6 @@ void ZMQServer::run() {
         exit(-101);
     }
 
-    static std::vector<ServerWorker *> worker;
-    static std::vector<std::thread *> worker_thread;
 
     spdlog::info("Creating {} zmq server workers ...", kMaxThread);
 

ZMQServer.h

@@ -35,6 +35,9 @@
 #include <zmq.hpp>
 #include "zhelpers.hpp"
 
+
+#include "ServerWorker.h"
+
 using namespace std;
 
 
@@ -55,6 +58,10 @@ private:
     zmq::context_t ctx_;
     zmq::socket_t frontend_;
     zmq::socket_t backend_;
+
+    std::vector<ServerWorker *> worker;
+    std::vector<std::thread *> worker_thread;
+
 };
 
 #endif //SGXWALLET_ZMQServer_H

rapidjson @ 0ccdbf36

+Subproject commit 0ccdbf364c577803e2a751f5aededce935314313