Merge pull request #21 from skalenetwork/enhancement/SKALE-1955-add-healthcheck

Enhancement/skale 1955 add healthcheck

SGXWalletServer.cpp

@@ -653,6 +653,14 @@ Json::Value MultG2Impl(const std::string& x){
     return result;
 }
 
+Json::Value getServerStatusImpl() {
+  
+  Json::Value result;
+  result["status"] = 0;
+  result["errorMessage"] = "";
+
+  return result;
+}
 
 Json::Value SGXWalletServer::generateDKGPoly(const std::string& polyName, int t){
   std::cerr << "entered generateDKGPoly" << std::endl;
@@ -735,10 +743,14 @@ Json::Value SGXWalletServer::ComplaintResponse(const std::string& polyName, int
 }
 
 Json::Value SGXWalletServer::MultG2(const std::string& x){
-    lock_guard<recursive_mutex> lock(m);
-    return MultG2Impl(x);
+  lock_guard<recursive_mutex> lock(m);
+  return MultG2Impl(x);
 }
 
+Json::Value SGXWalletServer::getServerStatus() {
+  lock_guard<recursive_mutex> lock(m);
+  return getServerStatusImpl();
+}
 
 shared_ptr<string> readFromDb(const string & name, const string & prefix) {
 

SGXWalletServer.hpp

@@ -60,6 +60,7 @@ public:
     virtual Json::Value GetBLSPublicKeyShare(const std::string & BLSKeyName);
     virtual Json::Value ComplaintResponse(const std::string& polyName, int ind);
     virtual Json::Value MultG2(const std::string & x);
+    virtual Json::Value getServerStatus();
 
 };
 
@@ -86,5 +87,6 @@ Json::Value CreateBLSPrivateKeyImpl(const std::string & BLSKeyName, const std::s
 Json::Value GetBLSPublicKeyShareImpl(const std::string & BLSKeyName);
 Json::Value ComplaintResponseImpl(const std::string& polyName, int ind);
 Json::Value MultG2Impl(const std::string & x);
+Json::Value getServerStatusImpl();
 
 #endif //SGXWALLET_SGXWALLETSERVER_HPP
\ No newline at end of file

abstractstubserver.h

@@ -30,6 +30,7 @@ class AbstractStubServer : public jsonrpc::AbstractServer<AbstractStubServer>
           this->bindAndAddMethod(jsonrpc::Procedure("ComplaintResponse", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, "polyName",jsonrpc::JSON_STRING,"ind",jsonrpc::JSON_INTEGER, NULL), &AbstractStubServer::ComplaintResponseI);
           this->bindAndAddMethod(jsonrpc::Procedure("MultG2", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, "x",jsonrpc::JSON_STRING, NULL), &AbstractStubServer::MultG2I);
 
+          this->bindAndAddMethod(jsonrpc::Procedure("getServerStatus", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT,  NULL), &AbstractStubServer::getServerStatusI);
         }
 
         inline virtual void importBLSKeyShareI(const Json::Value &request, Json::Value &response)
@@ -93,6 +94,11 @@ class AbstractStubServer : public jsonrpc::AbstractServer<AbstractStubServer>
         {
             response = this->MultG2(request["x"].asString());
         }
+        inline virtual void getServerStatusI(const Json::Value &request, Json::Value &response)
+        {
+          (void)request;
+          response = this->getServerStatus();
+        }
 
         virtual Json::Value importBLSKeyShare(const std::string& keyShare, const std::string& keyShareName, int t, int n, int index) = 0;
         virtual Json::Value blsSignMessageHash(const std::string& keyShareName, const std::string& messageHash, int t, int n, int signerIndex ) = 0;
@@ -110,6 +116,8 @@ class AbstractStubServer : public jsonrpc::AbstractServer<AbstractStubServer>
         virtual Json::Value GetBLSPublicKeyShare(const std::string & BLSKeyName) = 0;
         virtual Json::Value ComplaintResponse(const std::string& polyName, int ind) = 0;
         virtual Json::Value MultG2(const std::string & x) = 0;
+
+        virtual Json::Value getServerStatus() = 0;
 };
 
 #endif //JSONRPC_CPP_STUB_ABSTRACTSTUBSERVER_H_

scripts/build.py

@@ -60,7 +60,7 @@ print("Top directory is:" + topDir )
 
 makeExecutable = subprocess.check_output(["which", "make"])
 
-SCRIPTS_DIR = topDir + "/scripts" 
+SCRIPTS_DIR = topDir + "/scripts"
 GMP_DIR = topDir +  "/sgx-gmp"
 SSL_DIR =  topDir + "/intel-sgx-ssl"
 SSL_SOURCE_DIR = SSL_DIR + "/openssl_source"
@@ -115,7 +115,7 @@ assert subprocess.call(["bash","-c", "cmake -H. -Bbuild && cmake --build build -
 os.chdir(SCRIPTS_DIR)
 
 
-assert subprocess.call(["bash","-c", "./sgx_linux_x64_sdk_2.5.100.49891.bin --prefix=" + topDir + "/sgx-sdk-build"]) == 0 
+assert subprocess.call(["bash","-c", "./sgx_linux_x64_sdk_2.5.100.49891.bin --prefix=" + topDir + "/sgx-sdk-build"]) == 0
 
 
 os.chdir(GMP_DIR);
@@ -141,14 +141,14 @@ assert subprocess.call(["cp", "sgx_tgmp.h", TGMP_BUILD_DIR + "/include/sgx_tgmp.
 os.chdir(SSL_DIR);
 
 
-print "===>>> Downloading vanilla openssl source package"
+print("===>>> Downloading vanilla openssl source package")
 
 os.chdir(SSL_SOURCE_DIR);
 
 
 assert subprocess.call(["wget", "https://www.openssl.org/source/openssl-1.1.1b.tar.gz"]) == 0
 
-print "===>>> Making SSL  project"
+print("===>>> Making SSL  project")
 
 os.chdir(SSL_MAKE_DIR);
 

stubclient.h

@@ -26,6 +26,7 @@ class StubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
+
         Json::Value blsSignMessageHash(const std::string& keyShareName, const std::string& messageHash, int t, int n, int signerIndex) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
@@ -40,6 +41,7 @@ class StubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
+
         Json::Value importECDSAKey(const std::string& key, const std::string& keyName) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
@@ -51,6 +53,7 @@ class StubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
+
         Json::Value generateECDSAKey() throw (jsonrpc::JsonRpcException)
         {
           Json::Value p;
@@ -61,6 +64,7 @@ class StubClient : public jsonrpc::Client
           else
             throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
+
         Json::Value renameECDSAKey(const std::string& KeyName, const std::string& tempKeyName) throw (jsonrpc::JsonRpcException)
         {
           Json::Value p;
@@ -72,6 +76,7 @@ class StubClient : public jsonrpc::Client
           else
             throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
+
         Json::Value getPublicECDSAKey(const std::string& keyName) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
@@ -82,6 +87,7 @@ class StubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
+
         Json::Value ecdsaSignMessageHash(int base, const std::string& keyName, const std::string& messageHash) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
@@ -94,6 +100,7 @@ class StubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
+
         Json::Value generateDKGPoly(const std::string& polyName, int t) throw (jsonrpc::JsonRpcException)
         {
             Json::Value p;
@@ -105,98 +112,112 @@ class StubClient : public jsonrpc::Client
             else
                 throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
         }
-    Json::Value getVerificationVector(const std::string& polyName, int t, int n) throw (jsonrpc::JsonRpcException)
-    {
-        Json::Value p;
-        p["polyName"] = polyName;
-        p["n"] = n;
-        p["t"] = t;
-        Json::Value result = this->CallMethod("getVerificationVector",p);
-        if (result.isObject())
-            return result;
-        else
-            throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-    }
-    Json::Value getSecretShare(const std::string& polyName, const Json::Value& publicKeys, int t, int n) throw (jsonrpc::JsonRpcException)
-    {
-        Json::Value p;
-        p["polyName"] = polyName;
-        p["publicKeys"] = publicKeys;
-        p["n"] = n;
-        p["t"] = t;
-        Json::Value result = this->CallMethod("getSecretShare",p);
-        if (result.isObject())
-            return result;
-        else
-            throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-    }
-    Json::Value DKGVerification(const std::string& publicShares, const std::string& EthKeyName, const std::string& SecretShare, int t, int n, int index) throw (jsonrpc::JsonRpcException)
-    {
-        Json::Value p;
-        p["EthKeyName"] = EthKeyName;
-        p["SecretShare"] = SecretShare;
-        p["index"] = index;
-        p["n"] = n;
-        p["publicShares"] = publicShares;
-        p["t"] = t;
-        Json::Value result = this->CallMethod("DKGVerification",p);
-        if (result.isObject())
-          return result;
-        else
-          throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-    }
-    Json::Value CreateBLSPrivateKey(const std::string & BLSKeyName, const std::string& EthKeyName, const std::string& polyName, const std::string& SecretShare, int t, int n) throw (jsonrpc::JsonRpcException)
-    {
-      Json::Value p;
-      p["BLSKeyName"] = BLSKeyName;
-      p["EthKeyName"] = EthKeyName;
-      p["polyName"] = polyName;
-      p["SecretShare"] = SecretShare;
-      p["n"] = n;
-      p["t"] = t;
-      Json::Value result = this->CallMethod("CreateBLSPrivateKey",p);
-      if (result.isObject())
-       return result;
-      else
-       throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-    }
-
-    Json::Value GetBLSPublicKeyShare(const std::string & BLSKeyName) throw (jsonrpc::JsonRpcException)
-    {
-        Json::Value p;
-        p["BLSKeyName"] = BLSKeyName;
-
-        Json::Value result = this->CallMethod("GetBLSPublicKeyShare",p);
-        if (result.isObject())
-            return result;
-        else
-            throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-    }
-
-    Json::Value ComplaintResponse(const std::string& polyName, int ind) throw (jsonrpc::JsonRpcException)
-    {
-      Json::Value p;
-      p["polyName"] = polyName;
-      p["ind"] = ind;
-      Json::Value result = this->CallMethod("ComplaintResponse",p);
-      if (result.isObject())
-        return result;
-      else
-        throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-    }
-
-    Json::Value MultG2(const std::string & x) throw (jsonrpc::JsonRpcException)
-    {
-        Json::Value p;
-        p["x"] = x;
-
-        Json::Value result = this->CallMethod("MultG2",p);
-        if (result.isObject())
+
+        Json::Value getVerificationVector(const std::string& polyName, int t, int n) throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p["polyName"] = polyName;
+            p["n"] = n;
+            p["t"] = t;
+            Json::Value result = this->CallMethod("getVerificationVector",p);
+            if (result.isObject())
+                return result;
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+
+        Json::Value getSecretShare(const std::string& polyName, const Json::Value& publicKeys, int t, int n) throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p["polyName"] = polyName;
+            p["publicKeys"] = publicKeys;
+            p["n"] = n;
+            p["t"] = t;
+            Json::Value result = this->CallMethod("getSecretShare",p);
+            if (result.isObject())
+                return result;
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+
+        Json::Value DKGVerification(const std::string& publicShares, const std::string& EthKeyName, const std::string& SecretShare, int t, int n, int index) throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p["EthKeyName"] = EthKeyName;
+            p["SecretShare"] = SecretShare;
+            p["index"] = index;
+            p["n"] = n;
+            p["publicShares"] = publicShares;
+            p["t"] = t;
+            Json::Value result = this->CallMethod("DKGVerification",p);
+            if (result.isObject())
+              return result;
+            else
+              throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+
+        Json::Value CreateBLSPrivateKey(const std::string & BLSKeyName, const std::string& EthKeyName, const std::string& polyName, const std::string& SecretShare, int t, int n) throw (jsonrpc::JsonRpcException)
+        {
+          Json::Value p;
+          p["BLSKeyName"] = BLSKeyName;
+          p["EthKeyName"] = EthKeyName;
+          p["polyName"] = polyName;
+          p["SecretShare"] = SecretShare;
+          p["n"] = n;
+          p["t"] = t;
+          Json::Value result = this->CallMethod("CreateBLSPrivateKey",p);
+          if (result.isObject())
+           return result;
+          else
+           throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+
+        Json::Value GetBLSPublicKeyShare(const std::string & BLSKeyName) throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p["BLSKeyName"] = BLSKeyName;
+
+            Json::Value result = this->CallMethod("GetBLSPublicKeyShare",p);
+            if (result.isObject())
+                return result;
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
+
+        Json::Value ComplaintResponse(const std::string& polyName, int ind) throw (jsonrpc::JsonRpcException)
+        {
+          Json::Value p;
+          p["polyName"] = polyName;
+          p["ind"] = ind;
+          Json::Value result = this->CallMethod("ComplaintResponse",p);
+          if (result.isObject())
             return result;
-        else
+          else
             throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
-    }
+        }
+
+        Json::Value MultG2(const std::string & x) throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p["x"] = x;
+
+            Json::Value result = this->CallMethod("MultG2",p);
+            if (result.isObject())
+                return result;
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
 
+        Json::Value getServerStatus() throw (jsonrpc::JsonRpcException)
+        {
+            Json::Value p;
+            p = Json::nullValue;
+            Json::Value result = this->CallMethod("getServerStatus",p);
+            if (result.isObject())
+                return result;
+            else
+                throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+        }
 };
 
 #endif //JSONRPC_CPP_STUB_STUBCLIENT_H_

testw.cpp

@@ -955,4 +955,11 @@ TEST_CASE("API test", "[api_test]") {
   sgx_destroy_enclave(eid);
 }
 
+TEST_CASE("getServerStatus test", "[getServerStatus_test]") {
+  init_all();
+  HttpClient client("http://localhost:1028");
+  StubClient c(client, JSONRPC_CLIENT_V2);
 
+  REQUIRE(c.getServerStatus()["status"] == 0);
+  sgx_destroy_enclave(eid);
+}