Port release changes on minTimestampMap

0xPolygonHermez · Apr 23, 2024 · f0f0cc5 · f0f0cc5
1 parent c587ca6
commit f0f0cc5
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 1 deletion.
diff --git a/src/prover/input.cpp b/src/prover/input.cpp
@@ -1243,6 +1243,26 @@ void Input::loadGlobals (json &input)
 #endif
         }        
     }
+
+    // minTimestampMap
+    if ( input.contains("minTimestampMap") &&
+         input["minTimestampMap"].is_array() )
+    {
+        for (uint64_t i = 0; i < input["minTimestampMap"].size(); i++)
+        {
+            if (!input["minTimestampMap"][i].is_array())
+            {
+                zklog.error("Input::loadGlobals() minTimestampMap[" + to_string(i) + "] is not an array");
+                exitProcess();
+            }
+            if (input["minTimestampMap"][i].size() != 2)
+            {
+                zklog.error("Input::loadGlobals() minTimestampMap[" + to_string(i) + "] is an array but size=" + to_string(input["minTimestampMap"][i].size()) + " != 2");
+                exitProcess();
+            }
+            minTimestampMap[input["minTimestampMap"][i][0]] = input["minTimestampMap"][i][1];
+        }
+    }
 }
 
 string Input::saveGlobals (json &input) const
@@ -1592,6 +1612,22 @@ string Input::saveGlobals (json &input) const
         }
     }
 
+    // minTimestampMap
+    if (!minTimestampMap.empty())
+    {
+        s += "minTimestampMap=[";
+        unordered_map<uint64_t, uint64_t>::const_iterator minTimestampMapIt;
+        uint64_t minTimestampCounter = 0;
+        for (minTimestampMapIt = minTimestampMap.begin(); minTimestampMapIt != minTimestampMap.end(); minTimestampMapIt++)
+        {
+            input["minTimestampMap"][minTimestampCounter][0] = minTimestampMapIt->first;
+            input["minTimestampMap"][minTimestampCounter][1] = minTimestampMapIt->second;
+            s += "[" + to_string(minTimestampMapIt->first) + "," + to_string(minTimestampMapIt->second) + "]";
+            minTimestampCounter++;
+        }
+        s += "] ";
+    }
+
     return s;
 }
 

diff --git a/src/prover/input.hpp b/src/prover/input.hpp
@@ -73,6 +73,7 @@ class Input
     unordered_map<string, OverrideEntry> stateOverride;
     uint64_t stepsN;
     InputDebug debug;
+    unordered_map<uint64_t, uint64_t> minTimestampMap;
 
     // Constructor
     Input (Goldilocks &fr) :

diff --git a/src/prover/witness.cpp b/src/prover/witness.cpp
@@ -537,7 +537,7 @@ zkresult witness2db (const string &witness, DatabaseMap::MTMap &db, DatabaseMap:
     // Convert state root
     fea2scalar(fr, stateRoot, hash);
 
-    zklog.info("witness2db() calculated stateRoot=" + stateRoot.get_str(16));
+    zklog.info("witness2db() calculated stateRoot=" + stateRoot.get_str(16) + " from size=" + to_string(witness.size()));
 
 #ifdef WITNESS_CHECK_SMT
     zklog.info("witness2db() calculated SMT root=" + fea2string(fr, ctx.root));

diff --git a/src/service/executor/executor_service_v2.cpp b/src/service/executor/executor_service_v2.cpp
@@ -1217,6 +1217,28 @@ ::grpc::Status ExecutorServiceImpl::ProcessStatelessBatchV2 (::grpc::ServerConte
     proverRequest.input.publicInputsExtended.newLocalExitRoot = "0x0";
     proverRequest.input.publicInputsExtended.newBatchNum = 0;
 
+    // l1_info_tree_index_min_timestamp
+    google::protobuf::Map<google::protobuf::uint64, google::protobuf::uint64>::const_iterator minTimestampIt;
+    for (minTimestampIt = request->l1_info_tree_index_min_timestamp().begin(); minTimestampIt != request->l1_info_tree_index_min_timestamp().end(); minTimestampIt++)
+    {
+        proverRequest.input.minTimestampMap[minTimestampIt->first] = minTimestampIt->second;
+    }
+
+    // Generate l1InfoTreeData from data stream and from l1_info_tree_index_min_timestamp
+    for (uint64_t i = 0; i < batch.blocks.size(); i++)
+    {
+        L1Data data;
+        data.blockHashL1.set_str(batch.blocks[i].l1BlockHash, 16);
+        data.globalExitRoot.set_str(batch.blocks[i].globalExitRoot, 16);
+        unordered_map<uint64_t, uint64_t>::const_iterator it;
+        it = proverRequest.input.minTimestampMap.find(batch.blocks[i].l1InfoTreeIndex);
+        if (it != proverRequest.input.minTimestampMap.end())
+        {
+            data.minTimestamp = it->second;
+        }
+        proverRequest.input.l1InfoTreeData[batch.blocks[i].l1InfoTreeIndex] = data;
+    }
+
 #ifdef LOG_SERVICE_EXECUTOR_INPUT
     string l1InfoTreeDataString = " l1InfoTreeData.size=" + to_string(proverRequest.input.l1InfoTreeData.size()) + "=";
     unordered_map<uint64_t, L1Data>::const_iterator itl1;
@@ -1644,6 +1666,8 @@ ::grpc::Status ExecutorServiceImpl::ProcessStatelessBatchV2 (::grpc::ServerConte
         " totalTime=" + to_string(totalTime) +
         " filedesc=" + to_string(nfd),
         &proverRequest.tags);
+
+    //zklog.info("ExecutorServiceImpl::ProcessStatelessBatchV2() response.ByteSizeLong=" + to_string(response->ByteSizeLong()));
 
     // If the TP in gas/s is < threshold, log the input, unless it has been done before
     if (!config.logExecutorServerInput && (config.logExecutorServerInputGasThreshold > 0) && ((double(execGas)/execTime) < config.logExecutorServerInputGasThreshold))