Merge branch 'develop' into bug/SKALE-2977-sgx-crash

DKGCrypto.cpp

@@ -202,10 +202,10 @@ string trustedGetSecretShares(const string &_polyName, const char *_encryptedPol
         string dhKeyName = "DKG_DH_KEY_" + _polyName + "_" + to_string(i) + ":";
 
         spdlog::debug("hexEncr DH Key: { }", hexEncrKey.data());
+        spdlog::debug("name to write to db is {}", dhKeyName);
         SGXWalletServer::writeDataToDB(dhKeyName, hexEncrKey.data());
 
         string shareG2_name = "shareG2_" + _polyName + "_" + to_string(i) + ":";
-        spdlog::debug("name to write to db is {}", dhKeyName);
         spdlog::debug("name to write to db is {}", shareG2_name);
         spdlog::debug("s_shareG2: {}", sShareG2.data());
 

LevelDB.cpp

@@ -80,7 +80,7 @@ void LevelDB::deleteDHDKGKey(const string &_key) {
 
     string full_key = "DKG_DH_KEY_" + _key;
 
-    auto status = db->Delete(writeOptions, Slice(_key));
+    auto status = db->Delete(writeOptions, Slice(full_key));
 
     throwExceptionOnError(status);
 

SGXWalletServer.cpp

@@ -564,8 +564,8 @@ SGXWalletServer::createBLSPrivateKeyImpl(const string &_blsKeyName, const string
             LevelDB::getLevelDb()->deleteDHDKGKey(name);
             string shareG2_name = "shareG2_" + _polyName + "_" + to_string(i) + ":";
             LevelDB::getLevelDb()->deleteKey(shareG2_name);
-            LevelDB::getLevelDb()->deleteKey(_polyName);
         }
+        LevelDB::getLevelDb()->deleteKey(_polyName);
 
     } HANDLE_SGX_EXCEPTION(result)