Add storage helper

0xPolygonHermez · May 28, 2024 · 03324ea · 03324ea
1 parent dcec31e
commit 03324ea
Show file tree

Hide file tree

Showing 9 changed files with 1,030 additions and 1,780 deletions.
diff --git a/src/main_generator/main_generator_10.cpp b/src/main_generator/main_generator_10.cpp
diff --git a/src/main_sm/fork_10/helpers/arith_helper.cpp b/src/main_sm/fork_10/helpers/arith_helper.cpp
@@ -202,7 +202,6 @@ zkresult Arith_verify ( Context &ctx,
             return ZKR_SM_MAIN_ARITH_MISMATCH;
         }
 
-#ifdef USE_REQUIRED
         if (required != NULL)
         {
             ArithAction arithAction;
@@ -265,8 +264,6 @@ zkresult Arith_verify ( Context &ctx,
 
             required->Arith.push_back(arithAction);
         }
-#endif
-
     }
     else if (((arithEquation >= ARITH_ECADD_DIFFERENT) && (arithEquation <= ARITH_BN254_SUBFP2)) ||
              ((arithEquation >= ARITH_BLS12381_MULFP2) && (arithEquation <= ARITH_BLS12381_SUBFP2)))
@@ -582,7 +579,6 @@ zkresult Arith_verify ( Context &ctx,
             return ZKR_SM_MAIN_ARITH_MISMATCH;
         }
 
-#ifdef USE_REQUIRED
         if (required != NULL)
         {
             ArithAction arithAction;
@@ -645,8 +641,6 @@ zkresult Arith_verify ( Context &ctx,
 
             required->Arith.push_back(arithAction);
         }
-#endif
-
     } 
     else if (arithEquation == ARITH_256TO384)
     {
@@ -684,7 +678,6 @@ zkresult Arith_verify ( Context &ctx,
         useCD = 0;
         useE = 0;
 
-#ifdef USE_REQUIRED
         if (required != NULL)
         {
             ArithAction arithAction;
@@ -747,15 +740,14 @@ zkresult Arith_verify ( Context &ctx,
 
             required->Arith.push_back(arithAction);
         }
-#endif
     }
     else
     {
         zklog.error("Arith_verify() invalid arithEquation=" + arith2string(arithEquation));
         exitProcess();
     }
 
-    if (required != NULL)
+    if (!ctx.bProcessBatch)
     {
         ctx.pols.arith[i] = fr.one();
         ctx.pols.arithEquation[i] = fr.fromU64(arithEquation);

diff --git a/src/main_sm/fork_10/helpers/binary_helper.cpp b/src/main_sm/fork_10/helpers/binary_helper.cpp
@@ -250,21 +250,22 @@ zkresult Binary_verify ( Context &ctx,
         }
     }
 
-    if (required != NULL)
+    if (!ctx.bProcessBatch)
     {
         ctx.pols.bin[i] = fr.one();
         ctx.pols.binOpcode[i] = fr.fromU64(binOpcode);
+    }
 
-#ifdef USE_REQUIRED
+    if(required != NULL)
+    {
         // Store the binary action to execute it later with the binary SM
         BinaryAction binaryAction;
         binaryAction.a = a;
         binaryAction.b = b;
         binaryAction.c = c;
         binaryAction.opcode = binOpcode;
         binaryAction.type = 1;
-        required.Binary.push_back(binaryAction);
-#endif
+        required->Binary.push_back(binaryAction);
     }
 
     return ZKR_SUCCESS;

diff --git a/src/main_sm/fork_10/helpers/memalign_helper.cpp b/src/main_sm/fork_10/helpers/memalign_helper.cpp
@@ -170,11 +170,13 @@ zkresult Memalign_verify ( Context &ctx,
             return ZKR_SM_MAIN_MEMALIGN_WRITE_MISMATCH;
         }
 
-        if (required != NULL)
+        if (!ctx.bProcessBatch)
         {
             ctx.pols.memAlignWR[i] = fr.one();
+        }
 
-#ifdef USE_REQUIRED
+        if (required != NULL)
+        {
             MemAlignAction memAlignAction;
             memAlignAction.m0 = m0;
             memAlignAction.m1 = m1;
@@ -183,8 +185,7 @@ zkresult Memalign_verify ( Context &ctx,
             memAlignAction.v = v;
             memAlignAction.mode = mode;
             memAlignAction.wr = 1;
-            required.MemAlign.push_back(memAlignAction);
-#endif
+            required->MemAlign.push_back(memAlignAction);
         }
     }
     else if ((ctx.rom.line[zkPC].memAlignRD == 1) && (ctx.rom.line[zkPC].memAlignWR == 0))
@@ -214,20 +215,21 @@ zkresult Memalign_verify ( Context &ctx,
             zklog.error("Memalign_verify() MemAlign v invalid: v=" + v.get_str(16) + " _V=" + _v.get_str(16) + " m0=" + m0.get_str(16) + " m1=" + m1.get_str(16) + " mode=" + to_string(mode));
             return ZKR_SM_MAIN_MEMALIGN_READ_MISMATCH;
         }
-        if (required != NULL)
+        if (ctx.bProcessBatch)
         {
             ctx.pols.memAlignRD[i] = fr.one();
-#ifdef USE_REQUIRED
-                MemAlignAction memAlignAction;
-                memAlignAction.m0 = m0;
-                memAlignAction.m1 = m1;
-                memAlignAction.w0 = 0;
-                memAlignAction.w1 = 0;
-                memAlignAction.v = v;
-                memAlignAction.mode = mode;
-                memAlignAction.wr = 0;
-                required.MemAlign.push_back(memAlignAction);
-#endif
+        }
+        if (required != NULL)
+        {
+            MemAlignAction memAlignAction;
+            memAlignAction.m0 = m0;
+            memAlignAction.m1 = m1;
+            memAlignAction.w0 = 0;
+            memAlignAction.w1 = 0;
+            memAlignAction.v = v;
+            memAlignAction.mode = mode;
+            memAlignAction.wr = 0;
+            required->MemAlign.push_back(memAlignAction);
         }
     }
     else

diff --git a/src/main_sm/fork_10/helpers/memory_helper.cpp b/src/main_sm/fork_10/helpers/memory_helper.cpp
@@ -49,9 +49,10 @@ zkresult Memory_verify ( Context &ctx,
     zkassert(ctx.pStep != NULL);
     uint64_t i = *ctx.pStep;
 
-    if (required != NULL) ctx.pols.mOp[i] = fr.one();
-
-    if ((required != NULL) && (ctx.rom.line[zkPC].memUseAddrRel == 1)) ctx.pols.memUseAddrRel[i] = fr.one();
+    if ((!ctx.bProcessBatch) && (ctx.rom.line[zkPC].memUseAddrRel == 1))
+    {
+        ctx.pols.memUseAddrRel[i] = fr.one();
+    }
 
     // If MEMORY WRITE, store op in memory
     if (ctx.rom.line[zkPC].mWR == 1)
@@ -65,7 +66,6 @@ zkresult Memory_verify ( Context &ctx,
         ctx.mem[memAddr].fe6 = op6;
         ctx.mem[memAddr].fe7 = op7;
 
-#ifdef USE_REQUIRED 
         if (required != NULL)
         {
             MemoryAccess memoryAccess;
@@ -80,11 +80,13 @@ zkresult Memory_verify ( Context &ctx,
             memoryAccess.fe5 = op5;
             memoryAccess.fe6 = op6;
             memoryAccess.fe7 = op7;
-            required.Memory.push_back(memoryAccess);
+            required->Memory.push_back(memoryAccess);
+        }
+        if (!ctx.bProcessBatch)
+        {
             ctx.pols.mOp[i] = fr.one();
             ctx.pols.mWR[i] = fr.one();
         }
-#endif
 #ifdef LOG_MEMORY
         zklog.info("Memory write mWR: memAddr:" + to_string(memAddr) + " " + fea2stringchain(fr, ctx.mem[memAddr].fe0, ctx.mem[memAddr].fe1, ctx.mem[memAddr].fe2, ctx.mem[memAddr].fe3, ctx.mem[memAddr].fe4, ctx.mem[memAddr].fe5, ctx.mem[memAddr].fe6, ctx.mem[memAddr].fe7));
 #endif
@@ -115,8 +117,7 @@ zkresult Memory_verify ( Context &ctx,
             value[6] = op6;
             value[7] = op7;
         }
-#ifdef USE_REQUIRED
-        if (requested != NULL)
+        if (required != NULL)
         {
             MemoryAccess memoryAccess;
             memoryAccess.bIsWrite = false;
@@ -130,10 +131,12 @@ zkresult Memory_verify ( Context &ctx,
             memoryAccess.fe5 = value[5];
             memoryAccess.fe6 = value[6];
             memoryAccess.fe7 = value[7];
-            required.Memory.push_back(memoryAccess);
+            required->Memory.push_back(memoryAccess);
+        }
+        if (!ctx.bProcessBatch)
+        {
             ctx.pols.mOp[i] = fr.one();
         }
-#endif
         if (ctx.mem.find(memAddr) != ctx.mem.end())
         {
             if ( (!fr.equal(ctx.mem[memAddr].fe0, value[0])) ||