Fix FullTracer::onOpcode with no_counters

0xPolygonHermez · Aug 22, 2024 · 6e86eb3 · 6e86eb3
1 parent 1f74381
commit 6e86eb3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 27 deletions.
diff --git a/src/main_sm/fork_10/main/full_tracer.cpp b/src/main_sm/fork_10/main/full_tracer.cpp
@@ -1494,15 +1494,6 @@ zkresult FullTracer::onOpcode(Context &ctx, const RomCommand &cmd)
 
     Opcode singleInfo;
 
-    if (ctx.proverRequest.input.bNoCounters)
-    {
-        full_trace.emplace_back(singleInfo);
-#ifdef LOG_TIME_STATISTICS
-        tms.add("onOpcode", TimeDiff(t));
-#endif
-        return ZKR_SUCCESS;
-    }
-
     mpz_class auxScalar;
 
 #ifdef LOG_TIME_STATISTICS
@@ -1530,6 +1521,16 @@ zkresult FullTracer::onOpcode(Context &ctx, const RomCommand &cmd)
 #ifdef LOG_TIME_STATISTICS
     tmsop.add("getCodeID", TimeDiff(top));
 #endif
+
+    if (ctx.proverRequest.input.bNoCounters && (codeId != 0xa0 /* LOG0 */))
+    {
+        full_trace.emplace_back(singleInfo);
+#ifdef LOG_TIME_STATISTICS
+        tms.add("onOpcode", TimeDiff(t));
+#endif
+        return ZKR_SUCCESS;
+    }
+
 #ifdef LOG_TIME_STATISTICS
     gettimeofday(&top, NULL);
 #endif

diff --git a/src/main_sm/fork_12/main/full_tracer.cpp b/src/main_sm/fork_12/main/full_tracer.cpp
@@ -1494,15 +1494,6 @@ zkresult FullTracer::onOpcode(Context &ctx, const RomCommand &cmd)
 
     Opcode singleInfo;
 
-    if (ctx.proverRequest.input.bNoCounters)
-    {
-        full_trace.emplace_back(singleInfo);
-#ifdef LOG_TIME_STATISTICS
-        tms.add("onOpcode", TimeDiff(t));
-#endif
-        return ZKR_SUCCESS;
-    }
-
     mpz_class auxScalar;
 
 #ifdef LOG_TIME_STATISTICS
@@ -1530,6 +1521,16 @@ zkresult FullTracer::onOpcode(Context &ctx, const RomCommand &cmd)
 #ifdef LOG_TIME_STATISTICS
     tmsop.add("getCodeID", TimeDiff(top));
 #endif
+
+    if (ctx.proverRequest.input.bNoCounters && (codeId != 0xa0 /* LOG0 */))
+    {
+        full_trace.emplace_back(singleInfo);
+#ifdef LOG_TIME_STATISTICS
+        tms.add("onOpcode", TimeDiff(t));
+#endif
+        return ZKR_SUCCESS;
+    }
+
 #ifdef LOG_TIME_STATISTICS
     gettimeofday(&top, NULL);
 #endif

diff --git a/src/main_sm/fork_9/main/full_tracer.cpp b/src/main_sm/fork_9/main/full_tracer.cpp
@@ -1498,15 +1498,6 @@ zkresult FullTracer::onOpcode(Context &ctx, const RomCommand &cmd)
 
     Opcode singleInfo;
 
-    if (ctx.proverRequest.input.bNoCounters)
-    {
-        full_trace.emplace_back(singleInfo);
-#ifdef LOG_TIME_STATISTICS
-        tms.add("onOpcode", TimeDiff(t));
-#endif
-        return ZKR_SUCCESS;
-    }
-
     mpz_class auxScalar;
 
 #ifdef LOG_TIME_STATISTICS
@@ -1534,6 +1525,16 @@ zkresult FullTracer::onOpcode(Context &ctx, const RomCommand &cmd)
 #ifdef LOG_TIME_STATISTICS
     tmsop.add("getCodeID", TimeDiff(top));
 #endif
+
+    if (ctx.proverRequest.input.bNoCounters && (codeId != 0xa0 /* LOG0 */))
+    {
+        full_trace.emplace_back(singleInfo);
+#ifdef LOG_TIME_STATISTICS
+        tms.add("onOpcode", TimeDiff(t));
+#endif
+        return ZKR_SUCCESS;
+    }
+
 #ifdef LOG_TIME_STATISTICS
     gettimeofday(&top, NULL);
 #endif