Merge pull request #141 from skalenetwork/SKALE-3067-cleanip2

Skale 3067 cleanip2

CSRManagerServer.cpp

@@ -40,7 +40,6 @@ CSRManagerServer::CSRManagerServer(AbstractServerConnector &connector,
                                    serverVersion_t type) : abstractCSRManagerServer(connector, type) {}
 
 Json::Value getUnsignedCSRsImpl() {
-    spdlog::info(__FUNCTION__);
     INIT_RESULT(result)
 
     try {
@@ -50,12 +49,11 @@ Json::Value getUnsignedCSRsImpl() {
         }
     } HANDLE_SGX_EXCEPTION(result);
 
-    return result;
+    RETURN_SUCCESS(result)
 }
 
 Json::Value signByHashImpl(const string &hash, int status) {
-    Json::Value result;
-    result["errorMessage"] = "";
+    INIT_RESULT(result)
 
     try {
         if (!(status == 0 || status == 2)) {
@@ -89,7 +87,6 @@ Json::Value signByHashImpl(const string &hash, int status) {
                 LevelDB::getCsrStatusDb()->deleteKey(status_db_key);
                 LevelDB::getCsrStatusDb()->writeDataUnique(status_db_key, "-1");
                 throw SGXException(FAIL_TO_CREATE_CERTIFICATE, "CLIENT CERTIFICATE GENERATION FAILED");
-                //exit(-1);
             }
         }
 
@@ -102,7 +99,7 @@ Json::Value signByHashImpl(const string &hash, int status) {
 
     } HANDLE_SGX_EXCEPTION(result)
 
-    return result;
+    RETURN_SUCCESS(result)
 }
 
 Json::Value CSRManagerServer::getUnsignedCSRs() {

LevelDB.cpp

@@ -43,15 +43,10 @@ static WriteOptions writeOptions;
 static ReadOptions readOptions;
 
 std::shared_ptr<string> LevelDB::readString(const string &_key) {
-    std::lock_guard<std::recursive_mutex> lock(mutex);
 
     auto result = std::make_shared<string>();
 
-    if (db == nullptr) {
-        throw SGXException(NULL_DATABASE, "Null db");
-    }
-
-    spdlog::debug("key to read from db: {}", _key);
+    CHECK_STATE(db)
 
     auto status = db->Get(readOptions, _key, result.get());
 
@@ -65,18 +60,14 @@ std::shared_ptr<string> LevelDB::readString(const string &_key) {
 }
 
 void LevelDB::writeString(const string &_key, const string &_value) {
-    std::lock_guard<std::recursive_mutex> lock(mutex);
 
     auto status = db->Put(writeOptions, Slice(_key), Slice(_value));
 
     throwExceptionOnError(status);
-
-    spdlog::debug("written key: {}", _key);
 }
 
 
 void LevelDB::deleteDHDKGKey(const string &_key) {
-    std::lock_guard<std::recursive_mutex> lock(mutex);
 
     string full_key = "DKG_DH_KEY_" + _key;
 
@@ -84,48 +75,31 @@ void LevelDB::deleteDHDKGKey(const string &_key) {
 
     throwExceptionOnError(status);
 
-    spdlog::debug("key deleted: {}", full_key);
 }
 
 void LevelDB::deleteTempNEK(const string &_key) {
-    std::lock_guard<std::recursive_mutex> lock(mutex);
 
-    string prefix = _key.substr(0,8);
-    if (prefix != "tmp_NEK:") {
-      return;
-    }
+    CHECK_STATE(_key.rfind("tmp_NEK", 0) == 0);
 
     auto status = db->Delete(writeOptions, Slice(_key));
 
     throwExceptionOnError(status);
-
-    spdlog::debug("key deleted: {}", _key);
 }
 
 void LevelDB::deleteKey(const string &_key) {
-    std::lock_guard<std::recursive_mutex> lock(mutex);
 
     auto status = db->Delete(writeOptions, Slice(_key));
 
     throwExceptionOnError(status);
 
-    spdlog::debug("key deleted: {}", _key);
 }
 
 
-void LevelDB::writeByteArray(const char *_key, size_t _keyLen, const char *value,
-                             size_t _valueLen) {
-    std::lock_guard<std::recursive_mutex> lock(mutex);
-
-    auto status = db->Put(writeOptions, Slice(_key, _keyLen), Slice(value, _valueLen));
-
-    throwExceptionOnError(status);
-}
-
 
 void LevelDB::writeByteArray(string &_key, const char *value,
                              size_t _valueLen) {
-    std::lock_guard<std::recursive_mutex> lock(mutex);
+
+    CHECK_STATE(value);
 
     auto status = db->Put(writeOptions, Slice(_key), Slice(value, _valueLen));
 
@@ -142,6 +116,9 @@ void LevelDB::throwExceptionOnError(Status _status) {
 }
 
 uint64_t LevelDB::visitKeys(LevelDB::KeyVisitor *_visitor, uint64_t _maxKeysToVisit) {
+
+    CHECK_STATE(_visitor);
+
     uint64_t readCounter = 0;
 
     leveldb::Iterator *it = db->NewIterator(readOptions);
@@ -187,7 +164,7 @@ void LevelDB::writeDataUnique(const string & Name, const string &value) {
 
   writeString(key, value);
 
-  spdlog::debug("{}",Name, " is written to db");
+
 }
 
 

Log.h

@@ -74,7 +74,7 @@ public:
 };
 
 #define INIT_RESULT(__RESULT__)     Json::Value __RESULT__; \
-              int errStatus = UNKNOWN_ERROR; string errMsg(BUF_LEN, '\0');__RESULT__["status"] = 0; __RESULT__["errorMessage"] = \
+              int errStatus = UNKNOWN_ERROR; string errMsg(BUF_LEN, '\0');__RESULT__["status"] = UNKNOWN_ERROR; __RESULT__["errorMessage"] = \
 "Server error. Please see server log.";
 
 #define HANDLE_SGX_EXCEPTION(__RESULT__) \

SGXRegistrationServer.cpp

@@ -112,7 +112,7 @@ Json::Value signCertificateImpl(const string &_csr, bool _autoSign = false) {
 
     } HANDLE_SGX_EXCEPTION(result)
 
-    return result;
+    RETURN_SUCCESS(result)
 }
 
 Json::Value getCertificateImpl(const string &hash) {
@@ -147,7 +147,7 @@ Json::Value getCertificateImpl(const string &hash) {
 
     } HANDLE_SGX_EXCEPTION(result)
 
-    return result;
+    RETURN_SUCCESS(result)
 }
 
 

SGXWalletServer.hpp

@@ -24,10 +24,9 @@
 #ifndef SGXWALLET_SGXWALLETSERVER_HPP
 #define SGXWALLET_SGXWALLETSERVER_HPP
 
-#include <boost/thread/shared_mutex.hpp>
 
 #include <jsonrpccpp/server/connectors/httpserver.h>
-#include <mutex>
+
 #include "abstractstubserver.h"
 
 using namespace jsonrpc;

TestUtils.cpp

@@ -174,8 +174,10 @@ void TestUtils::sendRPCRequest() {
     vector <string> pubShares(n);
     vector <string> polyNames(n);
 
-    int schainID = randGen();
-    int dkgID = randGen();
+    static atomic<int> counter(1);
+
+    int schainID = counter.fetch_add(1);
+    int dkgID = counter.fetch_add(1);
     for (uint8_t i = 0; i < n; i++) {
         ethKeys[i] = c.generateECDSAKey();
         CHECK_STATE(ethKeys[i]["status"] == 0);

secure_enclave/secure_enclave.edl

@@ -3,6 +3,8 @@
 #define ECDSA_ENCR_LEN 93
 #define ECDSA_BIN_LEN 33
 #define SMALL_BUF_SIZE 1024
+#define TINY_BUF_SIZE 256
+
 enclave {
 
 	trusted {

sgxwallet_common.h

@@ -89,6 +89,8 @@ extern int autoconfirm;
 #define INVALID_ECDSA_KEY_NAME -20
 #define INVALID_HEX -21
 #define INVALID_ECSDA_SIGNATURE -22
+#define KEY_NAME_ALREADY_EXISTS -23 \
+
 
 #define ERROR_IN_ENCLAVE -33