Port changes to reset cache before importing input.db

0xPolygonHermez · May 13, 2024 · f6fee38 · f6fee38
1 parent 251cdca
commit f6fee38
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 0 deletions.
diff --git a/src/main_generator/main_generator.cpp b/src/main_generator/main_generator.cpp
@@ -352,6 +352,12 @@ string generate(const json &rom, uint64_t forkID, string forkNamespace, const st
     code += "    remove(\"c.txt\");\n";
     code += "#endif\n\n";
 
+    code += "   // Clear cache if configured and we are using a local database\n";
+    code += "   if (mainExecutor.config.dbClearCache && (mainExecutor.config.databaseURL == \"local\"))\n";
+    code += "   {\n";
+    code += "       mainExecutor.pHashDB->clearCache();\n";
+    code += "   }\n";
+
     code += "    // Copy input database content into context database\n";
     code += "    if (proverRequest.input.db.size() > 0)\n";
     code += "    {\n";

diff --git a/src/main_sm/fork_1/main/main_executor.cpp b/src/main_sm/fork_1/main/main_executor.cpp
@@ -152,6 +152,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {

diff --git a/src/main_sm/fork_10/main/main_executor.cpp b/src/main_sm/fork_10/main/main_executor.cpp
@@ -206,6 +206,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {

diff --git a/src/main_sm/fork_10_blob/main/main_executor.cpp b/src/main_sm/fork_10_blob/main/main_executor.cpp
@@ -206,6 +206,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {

diff --git a/src/main_sm/fork_2/main/main_executor.cpp b/src/main_sm/fork_2/main/main_executor.cpp
@@ -143,6 +143,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {

diff --git a/src/main_sm/fork_3/main/main_executor.cpp b/src/main_sm/fork_3/main/main_executor.cpp
@@ -143,6 +143,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {

diff --git a/src/main_sm/fork_4/main/main_executor.cpp b/src/main_sm/fork_4/main/main_executor.cpp
@@ -139,6 +139,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {

diff --git a/src/main_sm/fork_5/main/main_executor.cpp b/src/main_sm/fork_5/main/main_executor.cpp
@@ -137,6 +137,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {

diff --git a/src/main_sm/fork_6/main/main_executor.cpp b/src/main_sm/fork_6/main/main_executor.cpp
@@ -137,6 +137,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {

diff --git a/src/main_sm/fork_7/main/main_executor.cpp b/src/main_sm/fork_7/main/main_executor.cpp
@@ -191,6 +191,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {

diff --git a/src/main_sm/fork_8/main/main_executor.cpp b/src/main_sm/fork_8/main/main_executor.cpp
@@ -198,6 +198,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {

diff --git a/src/main_sm/fork_9/main/main_executor.cpp b/src/main_sm/fork_9/main/main_executor.cpp
@@ -198,6 +198,12 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
     remove("c.txt");
 #endif
 
+    // Clear cache if configured and we are using a local database
+    if (config.dbClearCache && (config.databaseURL == "local"))
+    {
+        pHashDB->clearCache();
+    }
+
     // Copy input database content into context database
     if (proverRequest.input.db.size() > 0)
     {
@@ -2621,6 +2627,7 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
                 SmtAction smtAction;
                 smtAction.bIsSet = true;
                 smtAction.setResult = ctx.lastSWrite.res;
+                zklog.info("SMT SIBLINGS SIZE=" + to_string(smtAction.setResult.siblings.size()));
                 required.Storage.push_back(smtAction);
             }
 #endif

diff --git a/src/prover/witness.cpp b/src/prover/witness.cpp
@@ -496,6 +496,10 @@ zkresult calculateWitnessHash (WitnessContext &ctx, Goldilocks::Element (&hash)[
 
     } while ((numberOfOpcodes == 1) && (numberOfCodeOpcodes == 1));
 
+#ifdef LOG_WITNESS
+    zklog.info("calculateWitnessHash() returns hash=" + fea2string(fr, hash));
+#endif
+
     return ZKR_SUCCESS;
 }