Merge pull request #545 from 0xPolygonHermez/fractasy_hashdb_64

Fractasy hashdb 64
0xPolygonHermez · Sep 7, 2023 · 167e4ba · 167e4ba
2 parents 64b288f + f4499a0
commit 167e4ba
Show file tree

Hide file tree

Showing 13 changed files with 178 additions and 222 deletions.
diff --git a/src/hashdb64/database_64.cpp b/src/hashdb64/database_64.cpp
@@ -468,10 +468,10 @@ zkresult Database64::readKV(const Goldilocks::Element (&root)[4], vector<KeyValu
     zkresult zkr;
     for (uint64_t i=0; i<KVs.size(); i++)
     {
-        zkr = readKV(root, KVs[i].key.fe, KVs[i].value, dbReadLog);
+        zkr = readKV(root, KVs[i].key, KVs[i].value, dbReadLog);
         if (zkr != ZKR_SUCCESS)
         {
-            zklog.error("Database64::readKV(KBs) failed calling read() result=" + zkresult2string(zkr) + " key=" + fea2string(fr, KVs[i].key.fe[0], KVs[i].key.fe[1], KVs[i].key.fe[2], KVs[i].key.fe[3]) );
+            zklog.error("Database64::readKV(KBs) failed calling read() result=" + zkresult2string(zkr) + " key=" + fea2string(fr, KVs[i].key) );
             return zkr;
         }
     }
@@ -590,10 +590,10 @@ zkresult Database64::writeKV(const Goldilocks::Element (&root)[4], const vector<
     zkresult zkr;
     for (uint64_t i=0; i<KVs.size(); i++)
     {
-        zkr = writeKV(root, KVs[i].key.fe, KVs[i].value, persistent);
+        zkr = writeKV(root, KVs[i].key, KVs[i].value, persistent);
         if (zkr != ZKR_SUCCESS)
         {
-            zklog.error("Database64::writeKV(KBs) failed calling write() result=" + zkresult2string(zkr) + " key=" + fea2string(fr, KVs[i].key.fe[0], KVs[i].key.fe[1], KVs[i].key.fe[2], KVs[i].key.fe[3]) );
+            zklog.error("Database64::writeKV(KBs) failed calling write() result=" + zkresult2string(zkr) + " key=" + fea2string(fr, KVs[i].key) );
             return zkr;
         }
     }
@@ -604,10 +604,10 @@ zkresult Database64::writeKV(const uint64_t& version, const vector<KeyValue> &KV
     zkresult zkr;
     for (uint64_t i=0; i<KVs.size(); i++)
     {
-        zkr = writeKV(version, KVs[i].key.fe, KVs[i].value, persistent);
+        zkr = writeKV(version, KVs[i].key, KVs[i].value, persistent);
         if (zkr != ZKR_SUCCESS)
         {
-            zklog.error("Database64::writeKV(KBs) failed calling write() result=" + zkresult2string(zkr) + " key=" + fea2string(fr, KVs[i].key.fe[0], KVs[i].key.fe[1], KVs[i].key.fe[2], KVs[i].key.fe[3]) );
+            zklog.error("Database64::writeKV(KBs) failed calling write() result=" + zkresult2string(zkr) + " key=" + fea2string(fr, KVs[i].key) );
             return zkr;
         }
     }
@@ -1341,10 +1341,10 @@ zkresult Database64::writeRemoteKV(const uint64_t version, const Goldilocks::Ele
     {
         multiWrite.Lock();
         KeyValue auxKV;
-        auxKV.key.fe[0] = key[0];
-        auxKV.key.fe[1] = key[1];
-        auxKV.key.fe[2] = key[2];
-        auxKV.key.fe[3] = key[3];
+        auxKV.key[0] = key[0];
+        auxKV.key[1] = key[1];
+        auxKV.key[2] = key[2];
+        auxKV.key[3] = key[3];
         auxKV.value = value;
         multiWrite.data[multiWrite.pendingToFlushDataIndex].keyValueIntray[version] = auxKV;
 #ifdef LOG_DB_WRITE_REMOTE
@@ -2329,7 +2329,7 @@ zkresult Database64::sendData (void)
                 unordered_map<uint64_t, KeyValue>::const_iterator it=data.keyValue.begin();
                 while (it != data.keyValue.end())
                 {
-                   writeRemoteKV(it->first,it->second.key.fe,it->second.value, true);
+                   writeRemoteKV(it->first,it->second.key,it->second.value, true);
                 }
             }
             // If there are versions add to db

diff --git a/src/hashdb64/key.hpp b/src/hashdb64/key.hpp
diff --git a/src/hashdb64/key_value.hpp b/src/hashdb64/key_value.hpp
@@ -1,13 +1,12 @@
 #ifndef KEY_VALUE_HPP
 #define KEY_VALUE_HPP
 
-#include "key.hpp"
 #include "scalar.hpp"
 
 class KeyValue
 {
 public:
-    Key key;
+    Goldilocks::Element key[4];
     mpz_class value;
 };
 

diff --git a/src/hashdb64/smt_64.cpp b/src/hashdb64/smt_64.cpp
@@ -6,7 +6,6 @@
 #include "zklog.hpp"
 #include <bitset>
 #include "state_manager_64.hpp"
-#include "key.hpp"
 #include "key_utils.hpp"
 #include "tree_chunk.hpp"
 
@@ -28,8 +27,7 @@ zkresult Smt64::set (const string &batchUUID, uint64_t tx, Database64 &db, const
         // Set the old state root
         string oldRootString;
         oldRootString = fea2string(fr, oldRoot);
-        bool bIsVirtual = stateManager64.isVirtualStateRoot(oldRootString);
-        stateManager64.setOldStateRoot(batchUUID, tx, oldRootString, bIsVirtual, persistence);
+        stateManager64.setOldStateRoot(batchUUID, tx, oldRootString, persistence);
 
         // Write the key-value pair
         string hashString = NormalizeToNFormat(fea2string(fr, key), 64);
@@ -45,7 +43,7 @@ zkresult Smt64::set (const string &batchUUID, uint64_t tx, Database64 &db, const
         stateManager64.getVirtualStateRoot(newRoot, newRootString);
 
         // Set the new sttae root
-        stateManager64.setNewStateRoot(batchUUID, tx, newRootString, true, persistence);
+        stateManager64.setNewStateRoot(batchUUID, tx, newRootString, persistence);
 
         result.newRoot[0] = newRoot[0];
         result.newRoot[1] = newRoot[1];

diff --git a/src/hashdb64/smt_64.hpp b/src/hashdb64/smt_64.hpp
@@ -15,7 +15,6 @@
 #include "smt_set_result.hpp"
 #include "smt_get_result.hpp"
 #include "tree_chunk.hpp"
-#include "key.hpp"
 #include "key_value.hpp"
 
 using namespace std;