SKALE-3951 add rsp methods

Makefile.am

@@ -70,14 +70,13 @@ bin_PROGRAMS = sgxwallet testw sgx_util
 ## have to be explicitly listed
 
 
-COMMON_SRC = SGXException.cpp ExitHandler.cpp zmq_src/ZMQClient.cpp zmq_src/BLSSignRspMessage.cpp \
-             zmq_src/ECDSASignRspMessage.cpp zmq_src/ReqMessage.cpp \
+COMMON_SRC = SGXException.cpp ExitHandler.cpp zmq_src/ZMQClient.cpp zmq_src/RspMessage.cpp zmq_src/ReqMessage.cpp \
              zmq_src/ZMQMessage.cpp zmq_src/ZMQServer.cpp zmq_src/ServerWorker.cpp \
              InvalidStateException.cpp Exception.cpp InvalidArgumentException.cpp Log.cpp  \
              SGXWalletServer.cpp SGXRegistrationServer.cpp CSRManagerServer.cpp BLSCrypto.cpp \
              DKGCrypto.cpp ServerInit.cpp BLSPrivateKeyShareSGX.cpp LevelDB.cpp ServerDataChecker.cpp SEKManager.cpp \
-             third_party/intel/sgx_stub.c third_party/intel/sgx_detect_linux.c third_party/intel/create_enclave.c third_party/intel/oc_alloc.c \
-             ECDSAImpl.c TestUtils.cpp sgxwallet.c SGXInfoServer.cpp ECDSACrypto.cpp
+             third_party/intel/sgx_stub.c third_party/intel/sgx_detect_linux.c third_party/intel/create_enclave.c \
+             third_party/intel/oc_alloc.c ECDSAImpl.c TestUtils.cpp sgxwallet.c SGXInfoServer.cpp ECDSACrypto.cpp
 COMMON_ENCLAVE_SRC = secure_enclave_u.c secure_enclave_u.h
 
 sgxwallet_SOURCES = sgxwall.cpp $(COMMON_SRC)

zmq_src/RspMessage.cpp

+/*
+  Copyright (C) 2018- SKALE Labs
+
+  This file is part of sgxwallet.
+
+  sgxwallet 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.
+
+  sgxwallet 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 sgxwallet. If not, see <https://www.gnu.org/licenses/>.
+
+  @file RspMessage.cpp
+  @author Oleh Nikolaiev
+  @date 2021
+*/
+
+#include "SGXWalletServer.hpp"
+
+#include "RspMessage.h"
+
+Json::Value ECDSASignRspMessage::process() {
+    assert(false);
+}
+
+string ECDSASignRspMessage::getSignature() {
+    string r = getStringRapid("signature_r");
+    string v = getStringRapid("signature_v");
+    string s = getStringRapid("signature_s");
+
+    auto ret = v + ":" + r.substr( 2 ) + ":" + s.substr( 2 );
+
+    return ret;
+}
+
+Json::Value BLSSignRspMessage::process() {
+    assert(false);
+}
+
+Json::Value importBLSRspMessage::process() {
+    assert(false);
+}
+
+Json::Value importECDSARspMessage::process() {
+    assert(false);
+}
+
+Json::Value generateECDSARspMessage::process() {
+    assert(false);
+}
+
+Json::Value getPublicECDSARspMessage::process() {
+    assert(false);
+}
+
+Json::Value generateDKGPolyRspMessage::process() {
+    assert(false);
+}
+
+Json::Value getVerificationVectorRspMessage::process() {
+    assert(false);
+}
+
+Json::Value getSecretShareRspMessage::process() {
+    assert(false);
+}
+
+Json::Value dkgVerificationRspMessage::process() {
+    assert(false);
+}
+
+Json::Value createBLSPrivateKeyRspMessage::process() {
+    assert(false);
+}
+
+Json::Value getBLSPublicRspMessage::process() {
+    assert(false);
+}
+
+Json::Value getAllBLSPublicKeysRspMessage::process() {
+    assert(false);
+}
+
+Json::Value complaintResponseRspMessage::process() {
+    assert(false);
+}
+
+Json::Value multG2RspMessage::process() {
+    assert(false);
+}
+
+Json::Value isPolyExistsRspMessage::process() {
+    assert(false);
+}
+
+Json::Value getServerStatusRspMessage::process() {
+    assert(false);
+}
+
+Json::Value getServerVersionRspMessage::process() {
+    assert(false);
+}
+
+Json::Value deleteBLSKeyRspMessage::process() {
+    assert(false);
+}

zmq_src/RspMessage.h

+/*
+  Copyright (C) 2018- SKALE Labs
+
+  This file is part of sgxwallet.
+
+  sgxwallet 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.
+
+  sgxwallet 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 sgxwallet. If not, see <https://www.gnu.org/licenses/>.
+
+  @file RspMessage.h
+  @author Oleh Nikolaiev
+  @date 2021
+*/
+
+#ifndef SGXWALLET_RSPMESSAGE_H
+#define SGXWALLET_RSPMESSAGE_H
+
+#include "ZMQMessage.h"
+
+class ECDSASignRspMessage : public ZMQMessage {
+public:
+    ECDSASignRspMessage(shared_ptr <rapidjson::Document> &_d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+
+    string getSignature();
+};
+
+
+class BLSSignRspMessage : public ZMQMessage {
+public:
+    BLSSignRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+
+    string getSigShare() {
+        return getStringRapid("signatureShare");
+    }
+};
+
+
+class importBLSRspMessage : public ZMQMessage {
+public:
+    importBLSRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class importECDSARspMessage : public ZMQMessage {
+public:
+    importECDSARspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class generateECDSARspMessage : public ZMQMessage {
+public:
+    generateECDSARspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class getPublicECDSARspMessage : public ZMQMessage {
+public:
+    getPublicECDSARspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class generateDKGPolyRspMessage : public ZMQMessage {
+public:
+    generateDKGPolyRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class getVerificationVectorRspMessage : public ZMQMessage {
+public:
+    getVerificationVectorRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class getSecretShareRspMessage : public ZMQMessage {
+public:
+    getSecretShareRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class dkgVerificationRspMessage : public ZMQMessage {
+public:
+    dkgVerificationRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class createBLSPrivateKeyRspMessage : public ZMQMessage {
+public:
+    createBLSPrivateKeyRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class getBLSPublicRspMessage : public ZMQMessage {
+public:
+    getBLSPublicRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class getAllBLSPublicKeysRspMessage : public ZMQMessage {
+public:
+    getAllBLSPublicKeysRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class complaintResponseRspMessage : public ZMQMessage {
+public:
+    complaintResponseRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class multG2RspMessage : public ZMQMessage {
+public:
+    multG2RspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class isPolyExistsRspMessage : public ZMQMessage {
+public:
+    isPolyExistsRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class getServerStatusRspMessage : public ZMQMessage {
+public:
+    getServerStatusRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class getServerVersionRspMessage : public ZMQMessage {
+public:
+    getServerVersionRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+class deleteBLSKeyRspMessage : public ZMQMessage {
+public:
+    deleteBLSKeyRspMessage(shared_ptr<rapidjson::Document>& _d) : ZMQMessage(_d) {};
+
+    virtual Json::Value process();
+};
+
+
+#endif //SGXWALLET_RSPMESSAGE_H

zmq_src/ZMQClient.h

@@ -75,7 +75,7 @@ public:
     ZMQClient(const string &ip, uint16_t port, bool _sign, const string&  _certPathName,
               const string& _certKeyName);
 
-    void reconnect() ;
+    void reconnect();
 
     static pair<EVP_PKEY*, X509*>  readPublicKeyFromCertStr(const string& _cert);
 

zmq_src/ZMQMessage.cpp

@@ -30,8 +30,7 @@
 #include "ZMQClient.h"
 #include "SGXWalletServer.hpp"
 #include "ReqMessage.h"
-#include "BLSSignRspMessage.h"
-#include "ECDSASignRspMessage.h"
+#include "RspMessage.h"
 #include "ZMQMessage.h"
 
 
@@ -250,55 +249,55 @@ shared_ptr <ZMQMessage> ZMQMessage::buildResponse(string &_type, shared_ptr <rap
             ret = make_shared<ECDSASignRspMessage>(_d);
             break;
         case ENUM_IMPORT_BLS_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<importBLSRspMessage>(_d);
             break;
         case ENUM_IMPORT_ECDSA_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<importECDSARspMessage>(_d);
             break;
         case ENUM_GENERATE_ECDSA_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<generateECDSARspMessage>(_d);
             break;
         case ENUM_GET_PUBLIC_ECDSA_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<getPublicECDSARspMessage>(_d);
             break;
         case ENUM_GENERATE_DKG_POLY_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<generateDKGPolyRspMessage>(_d);
             break;
         case ENUM_GET_VV_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<getVerificationVectorRspMessage>(_d);
             break;
         case ENUM_GET_SECRET_SHARE_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<getSecretShareRspMessage>(_d);
             break;
         case ENUM_DKG_VERIFY_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<dkgVerificationRspMessage>(_d);
             break;
         case ENUM_CREATE_BLS_PRIVATE_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<createBLSPrivateKeyRspMessage>(_d);
             break;
         case ENUM_GET_BLS_PUBLIC_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<getBLSPublicRspMessage>(_d);
             break;
         case ENUM_GET_ALL_BLS_PUBLIC_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<getAllBLSPublicKeysRspMessage>(_d);
             break;
         case ENUM_COMPLAINT_RESPONSE_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<complaintResponseRspMessage>(_d);
             break;
         case ENUM_MULT_G2_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<multG2RspMessage>(_d);
             break;
         case ENUM_IS_POLY_EXISTS_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<isPolyExistsRspMessage>(_d);
             break;
         case ENUM_GET_SERVER_STATUS_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<getServerStatusRspMessage>(_d);
             break;
         case ENUM_GET_SERVER_VERSION_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<getServerVersionRspMessage>(_d);
             break;
         case ENUM_DELETE_BLS_KEY_RSP:
-            ret = make_shared<ECDSASignRspMessage>(_d);
+            ret = make_shared<deleteBLSKeyRspMessage>(_d);
             break;
         default:
             break;