Implement inFREE0

0xPolygonHermez · Nov 30, 2023 · b634dfa · b634dfa
1 parent b3c9647
commit b634dfa
Show file tree

Hide file tree

Showing 7 changed files with 1,579 additions and 1,531 deletions.
diff --git a/src/main_sm/fork_7/main/main_executor.cpp b/src/main_sm/fork_7/main/main_executor.cpp
@@ -57,6 +57,8 @@ namespace fork_7
 #endif
 #define CHECK_MAX_CNT_AT_THE_END
 
+//#define LOG_COMPLETED_STEPS_TO_FILE
+
 MainExecutor::MainExecutor (Goldilocks &fr, PoseidonGoldilocks &poseidon, const Config &config) :
     fr(fr),
     N(MainCommitPols::pilDegree()),
@@ -794,8 +796,8 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
         /* FREE INPUT */
         /**************/
 
-        // If inFREE, calculate the free input value, and add it to op
-        if (!fr.isZero(rom.line[zkPC].inFREE))
+        // If inFREE or inFREE0, calculate the free input value, and add it to op
+        if (!fr.isZero(rom.line[zkPC].inFREE) || !fr.isZero(rom.line[zkPC].inFREE0))
         {
             // freeInTag must be present
             if (rom.line[zkPC].freeInTag.isPresent == false)
@@ -1989,7 +1991,7 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
             pols.FREE7[i] = fi7;
 
             // op = op + inFREE*fi
-            op0 = fr.add(op0, fr.mul(rom.line[zkPC].inFREE, fi0));
+            op0 = fr.add(op0, fr.mul(fr.add(rom.line[zkPC].inFREE, rom.line[zkPC].inFREE0), fi0));
             op1 = fr.add(op1, fr.mul(rom.line[zkPC].inFREE, fi1));
             op2 = fr.add(op2, fr.mul(rom.line[zkPC].inFREE, fi2));
             op3 = fr.add(op3, fr.mul(rom.line[zkPC].inFREE, fi3));
@@ -2000,6 +2002,7 @@ void MainExecutor::execute (ProverRequest &proverRequest, MainCommitPols &pols,
 
             // Copy ROM flags into the polynomials
             pols.inFREE[i] = rom.line[zkPC].inFREE;
+            pols.inFREE0[i] = rom.line[zkPC].inFREE0;
         }
 
         if (!fr.isZero(op0) && !bProcessBatch)

diff --git a/src/main_sm/fork_7/main/rom.cpp b/src/main_sm/fork_7/main/rom.cpp
@@ -296,6 +296,7 @@ void Rom::loadProgram(Goldilocks &fr, json &romJson)
         if (l["inGAS"].is_string()) fr.fromString(line[i].inGAS, l["inGAS"]); else line[i].inGAS = fr.zero();
         if (l["inSTEP"].is_string()) fr.fromString(line[i].inSTEP, l["inSTEP"]); else line[i].inSTEP = fr.zero();
         if (l["inFREE"].is_string()) fr.fromString(line[i].inFREE, l["inFREE"]); else line[i].inFREE = fr.zero();
+        if (l["inFREE0"].is_string()) fr.fromString(line[i].inFREE0, l["inFREE0"]); else line[i].inFREE0 = fr.zero();
         if (l["inRR"].is_string()) fr.fromString(line[i].inRR, l["inRR"]); else line[i].inRR = fr.zero();
         if (l["inHASHPOS"].is_string()) fr.fromString(line[i].inHASHPOS, l["inHASHPOS"]); else line[i].inHASHPOS = fr.zero();
         if (l["inCntArith"].is_string()) fr.fromString(line[i].inCntArith, l["inCntArith"]); else line[i].inCntArith = fr.zero();

diff --git a/src/main_sm/fork_7/main/rom_line.cpp b/src/main_sm/fork_7/main/rom_line.cpp
@@ -18,9 +18,10 @@ string RomLine::toString(Goldilocks &fr)
     if (!fr.isZero(inPC)) result += " inPC=" + fr.toString(inPC,10);
     if (!fr.isZero(inGAS)) result += " inGAS=" + fr.toString(inGAS,10);
     if (!fr.isZero(inSTEP)) result += " inSTEP=" + fr.toString(inSTEP,10);
-    if (!fr.isZero(inFREE))
+    if (!fr.isZero(inFREE) || !fr.isZero(inFREE0))
     {
         result += " inFREE=" + fr.toString(inFREE,10);
+        result += " inFREE0=" + fr.toString(inFREE0,10);
         result += " freeInTag={" + freeInTag.toString() + "}";
     }
     if (!fr.isZero(inRR)) result += " inRR=" + fr.toString(inRR,10);

diff --git a/src/main_sm/fork_7/main/rom_line.hpp b/src/main_sm/fork_7/main/rom_line.hpp
@@ -30,6 +30,7 @@ class RomLine {
     Goldilocks::Element inGAS;
     Goldilocks::Element inSTEP;
     Goldilocks::Element inFREE;
+    Goldilocks::Element inFREE0;
     Goldilocks::Element inRR;
     Goldilocks::Element inHASHPOS;
     Goldilocks::Element inCntArith;