SKALE-3023 write key to db with timestamp

LevelDB.cpp

@@ -43,6 +43,14 @@ using namespace leveldb;
 static WriteOptions writeOptions;
 static ReadOptions readOptions;
 
+shared_ptr<string> LevelDB::readNewStyleValue(const string& value) {
+    Json::Value key_data;
+    Json::Reader reader;
+    reader.parse(value.c_str(), key_data);
+
+    return std::make_shared<string>(key_data["value"].asString());
+}
+
 std::shared_ptr<string> LevelDB::readString(const string &_key) {
 
     auto result = std::make_shared<string>();
@@ -57,17 +65,26 @@ std::shared_ptr<string> LevelDB::readString(const string &_key) {
         return nullptr;
     }
 
+    if (result->at(0) == '{') {
+        return readNewStyleValue(*result);
+    }
+
     return result;
 }
 
 void LevelDB::writeString(const string &_key, const string &_value) {
+    Json::Value writerData;
+    writerData["value"] = _value;
+    writerData["timestamp"] = std::to_string(std::time(nullptr));
+
+    Json::FastWriter fastWriter;
+    std::string output = fastWriter.write(writerData);
 
-    auto status = db->Put(writeOptions, Slice(_key), Slice(_value));
+    auto status = db->Put(writeOptions, Slice(_key), Slice(output));
 
     throwExceptionOnError(status);
 }
 
-
 void LevelDB::deleteDHDKGKey(const string &_key) {
 
     string full_key = "DKG_DH_KEY_" + _key;
@@ -95,18 +112,6 @@ void LevelDB::deleteKey(const string &_key) {
 
 }
 
-
-
-void LevelDB::writeByteArray(string &_key, const char *value,
-                             size_t _valueLen) {
-
-    CHECK_STATE(value);
-
-    auto status = db->Put(writeOptions, Slice(_key), Slice(value, _valueLen));
-
-    throwExceptionOnError(status);
-}
-
 void LevelDB::throwExceptionOnError(Status _status) {
     if (_status.IsNotFound())
         return;
@@ -164,7 +169,6 @@ void LevelDB::writeDataUnique(const string & name, const string &value) {
   }
 
   writeString(key, value);
-
 }
 
 stringstream LevelDB::getAllKeys() {

LevelDB.h

@@ -57,7 +57,6 @@ class LevelDB {
 
 public:
 
-
     static void initDataFolderAndDBs();
 
     static const shared_ptr<LevelDB> &getLevelDb();
@@ -70,6 +69,8 @@ public:
 
     shared_ptr<string> readString(const string& _key);
 
+    shared_ptr<string> readNewStyleValue(const string& value);
+
     stringstream getAllKeys();
 
     pair<string, uint64_t> getLatestCreatedKey();
@@ -78,13 +79,6 @@ public:
 
     void writeDataUnique(const string & Name, const string &value);
 
-    void writeByteArray(const char *_key, size_t _keyLen, const char *value,
-                        size_t _valueLen);
-
-
-    void writeByteArray(string& _key, const char *value,
-                        size_t _valueLen);
-
     void deleteDHDKGKey (const string &_key);
 
     void deleteTempNEK (const string &_key);
@@ -93,7 +87,6 @@ public:
 
 public:
 
-
     void throwExceptionOnError(leveldb::Status result);
 
 

abstractinfoserver.h

@@ -33,7 +33,7 @@ public:
   AbstractInfoServer(jsonrpc::AbstractServerConnector &conn, jsonrpc::serverVersion_t type = jsonrpc::JSONRPC_SERVER_V2) : jsonrpc::AbstractServer<AbstractInfoServer>(conn, type)
   {
     this->bindAndAddMethod(jsonrpc::Procedure("getAllKeysInfo", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, NULL), &AbstractInfoServer::getAllKeysInfoI);
-    this->bindAndAddMethod(jsonrpc::Procedure("getLastCreatedKey", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, NULL), &AbstractInfoServer::getLastCreatedKeyI);
+    this->bindAndAddMethod(jsonrpc::Procedure("getLatestCreatedKey", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, NULL), &AbstractInfoServer::getLatestCreatedKeyI);
     this->bindAndAddMethod(jsonrpc::Procedure("getServerConfiguration", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT, NULL), &AbstractInfoServer::getServerConfigurationI);
     this->bindAndAddMethod(jsonrpc::Procedure("isKeyExist", jsonrpc::PARAMS_BY_NAME, jsonrpc::JSON_OBJECT,"key",jsonrpc::JSON_STRING, NULL), &AbstractInfoServer::isKeyExistI);
   }
@@ -43,9 +43,9 @@ public:
       response = this->getAllKeysInfo();
   }
 
-  inline virtual void getLastCreatedKeyI(const Json::Value &request, Json::Value &response)
+  inline virtual void getLatestCreatedKeyI(const Json::Value &request, Json::Value &response)
   {
-      response = this->getLastCreatedKey();
+      response = this->getLatestCreatedKey();
   }
 
   inline virtual void getServerConfigurationI(const Json::Value &request, Json::Value &response)
@@ -60,7 +60,7 @@ public:
 
 
   virtual Json::Value getAllKeysInfo() = 0;
-  virtual Json::Value getLastCreatedKey() = 0;
+  virtual Json::Value getLatestCreatedKey() = 0;
   virtual Json::Value getServerConfiguration() = 0;
   virtual Json::Value isKeyExist(const std::string& key) = 0;