Enable execution with stateManager=false, mandatory for hashDBSinglet…

…on=false
0xPolygonHermez · Aug 28, 2024 · 4095868 · 4095868
1 parent a5c0b30
commit 4095868
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 5 deletions.
diff --git a/src/config/config.cpp b/src/config/config.cpp
@@ -756,5 +756,11 @@ bool Config::check (void)
         bError = true;
     }
 
+    if (!hashDBSingleton && stateManager)
+    {
+        zklog.error("hashDBSingleton=false but stateManager=true");
+        bError = true;
+    }
+
     return bError;
 }
diff --git a/src/service/hashdb/hashdb.cpp b/src/service/hashdb/hashdb.cpp
@@ -90,7 +90,15 @@ zkresult HashDB::setProgram (const string &batchUUID, uint64_t block, uint64_t t
     string keyString = fea2string(fr, key);
 
     // Call writeProgram()
-    zkresult zkr = stateManager.writeProgram(batchUUID, block, tx, keyString, data, persistence);
+    zkresult zkr;
+    if (config.stateManager)
+    {
+        zkr = stateManager.writeProgram(batchUUID, block, tx, keyString, data, persistence);
+    }
+    else
+    {
+        zkr = db.setProgram(keyString, data, persistence == PERSISTENCE_DATABASE);
+    }
 
 #ifdef LOG_TIME_STATISTICS_HASHDB
     tms.add("setProgram", TimeDiff(t));
@@ -116,14 +124,21 @@ zkresult HashDB::getProgram (const string &batchUUID, const Goldilocks::Element
     data.clear();
 
     // Call readProgram
-    zkresult zkr = stateManager.readProgram(batchUUID, keyString, data, dbReadLog);
-    if (zkr != ZKR_SUCCESS)
+    zkresult zkr;
+    if (config.stateManager)
     {
-        zkr = db.getProgram(keyString, data, dbReadLog);
+        zkr = stateManager.readProgram(batchUUID, keyString, data, dbReadLog);
         if (zkr != ZKR_SUCCESS)
         {
-            zklog.error("HashDB::getProgram() failed result=" + zkresult2string(zkr) + " key=" + keyString);
+            zkr = db.getProgram(keyString, data, dbReadLog);
         }
+    } else
+    {
+        zkr = db.getProgram(keyString, data, dbReadLog);
+    }
+    if (zkr != ZKR_SUCCESS)
+    {
+        zklog.error("HashDB::getProgram() failed result=" + zkresult2string(zkr) + " key=" + keyString);
     }
 
 #ifdef LOG_TIME_STATISTICS_HASHDB