From 257e2e20f00b2b2867d56cd2e323ed46d9882ea6 Mon Sep 17 00:00:00 2001
From: Balazs Komuves <bkomuves@gmail.com>
Date: Tue, 16 Jun 2026 12:29:54 +0200
Subject: [PATCH] preparation for multiple versions of the dynamic prover

---
 groth16/bn128/arrays.nim                | 10 +++++++
 groth16/dynamic/types.nim               | 19 ------------
 groth16/dynamic/{ => v1}/finish.nim     |  4 +--
 groth16/dynamic/{ => v1}/preprocess.nim | 31 +++++++++++++++++--
 groth16/dynamic/{ => v1}/setup.nim      |  2 +-
 groth16/dynamic/v1/types.nim            | 40 +++++++++++++++++++++++++
 groth16/partial/finish.nim              |  4 +--
 groth16/zkey_types.nim                  |  2 +-
 8 files changed, 84 insertions(+), 28 deletions(-)
 rename groth16/dynamic/{ => v1}/finish.nim (99%)
 rename groth16/dynamic/{ => v1}/preprocess.nim (87%)
 rename groth16/dynamic/{ => v1}/setup.nim (99%)
 create mode 100644 groth16/dynamic/v1/types.nim

diff --git a/groth16/bn128/arrays.nim b/groth16/bn128/arrays.nim
index 18146e3..aac4830 100644
--- a/groth16/bn128/arrays.nim
+++ b/groth16/bn128/arrays.nim
@@ -100,6 +100,16 @@ func orBoolSeqs*( us: seq[bool] , vs: seq[bool]): seq[bool] =
     ws[i] = us[i] or vs[i]
   return ws
 
+#-------------------------------------------------------------------------------
+# int arrays
+
+func sumIntSeq*(xs : seq[int]): int =
+  let n = xs.len
+  var s = 0
+  for i in 0..<n:
+    s += xs[i]
+  return s
+
 #-------------------------------------------------------------------------------
 # Fr arrays
 
diff --git a/groth16/dynamic/types.nim b/groth16/dynamic/types.nim
index 964d0f7..c66bc6b 100644
--- a/groth16/dynamic/types.nim
+++ b/groth16/dynamic/types.nim
@@ -34,25 +34,6 @@ type
     imageB*  : seq[bool]          # image of the witness update space under B
     imageAB* : seq[bool]          # union of the previous two
 
-  # things we can compute at circuit setup time
-  DynaSetupV1* = object
-    weightVec*     : seq[F]       # the values `W_k` (it's surprisingly slow to re-compute in the finish part!)
-    pointsDeltaLZ* : seq[G1]      # the points `delta^-1 * L_i(tau) * Z(tau) * g1` where `Z(x) = x^N-1`
-    wConvDeltaLZ*  : seq[G1]      # the convolution of `W` and `pointsDeltaLZ`
-    diagPhiPoints* : seq[G1]      # the points `delta^-1 * phi_ii(tau) * Z(tau) * g1` from the Dynark paper
-
-  # things we can compute from the partial witness
-  DynaPreprocessV1* = object
-    projA0*       : seq[G1]      # the points `delta^-1 * A0(tau) * L_i(tau) * g1` (well, "modulo Z(tau)")
-    projB0*       : seq[G1]      # the same for B0
-
-  # "pre-proof" of the Dynark paper, which we can finish 
-  DynaPreProofV1* = object
-    partialProof*   : PartialProof       # linear part of the partial proof
-    deltaImages*    : DeltaImages        # image of the witness delta under A and B (where can update happen)
-    dynaSetup*      : DynaSetupV1        # circuit-setup time calculations
-    dynaPreprocess* : DynaPreprocessV1   # "Dynark"-style preprocessing
-
   # this is used in the "cross-term"
   OnlyAB* = object
     valuesAz*    : seq[F]
diff --git a/groth16/dynamic/finish.nim b/groth16/dynamic/v1/finish.nim
similarity index 99%
rename from groth16/dynamic/finish.nim
rename to groth16/dynamic/v1/finish.nim
index eb72eb8..ac7ccb0 100644
--- a/groth16/dynamic/finish.nim
+++ b/groth16/dynamic/v1/finish.nim
@@ -34,9 +34,9 @@ import groth16/prover/types
 import groth16/prover/shared
 import groth16/partial/finish
 
-import groth16/dynamic/types
-import groth16/dynamic/setup
 import groth16/dynamic/shared
+import groth16/dynamic/v1/types
+import groth16/dynamic/v1/setup
 
 #-------------------------------------------------------------------------------
 
diff --git a/groth16/dynamic/preprocess.nim b/groth16/dynamic/v1/preprocess.nim
similarity index 87%
rename from groth16/dynamic/preprocess.nim
rename to groth16/dynamic/v1/preprocess.nim
index 75a07de..03d5a8e 100644
--- a/groth16/dynamic/preprocess.nim
+++ b/groth16/dynamic/v1/preprocess.nim
@@ -29,10 +29,10 @@ import groth16/math/poly
 
 import groth16/partial/precalc
 
-import groth16/dynamic/types
-import groth16/dynamic/setup
 import groth16/dynamic/shared
-import groth16/dynamic/finish
+import groth16/dynamic/v1/types
+import groth16/dynamic/v1/setup
+import groth16/dynamic/v1/finish
 
 
 #-------------------------------------------------------------------------------
@@ -139,6 +139,31 @@ proc dynaPreProofV1*(zkey: ZKey, setup: DynaSetupV1, partialWitness: PartialWitn
   let N = zkey.header.domainSize
   let D = createDomain(N)
 
+#[
+  import groth16/math/matrix  
+  import std/tables               # TODO: temporary!
+
+  # TODO: just tmp testing
+  let M = zkey.header.nvars
+  let matABC = zkeyToSparseMatrices(zkey)
+  let dmask = notBoolSeq( partialWitnessMask(partialWitness) )
+  let cntA = selectTrues( dmask , sparseMatrixColumnCounts(matABC.A) )
+  let cntB = selectTrues( dmask , sparseMatrixColumnCounts(matABC.B) )
+  # echo $cntA
+  # echo $cntB
+  echo $sumIntSeq(cntA)
+  echo $sumIntSeq(cntB)
+  echo $countTrues(dmask)
+  for j in 0..<M: 
+    if dmask[j]:
+      for (i,x) in matABC.A.columns[j].pairs:
+        echo toDecimalFr(x)
+  for j in 0..<M: 
+    if dmask[j]:
+      for (i,x) in matABC.B.columns[j].pairs:
+        echo toDecimalFr(x)
+]#
+
   var partialAB : PartialAB
   withMeasureTime(printTimings,"build partial AB"):
     partialAB = buildPartialAB( zkey, partialWitness.values )
diff --git a/groth16/dynamic/setup.nim b/groth16/dynamic/v1/setup.nim
similarity index 99%
rename from groth16/dynamic/setup.nim
rename to groth16/dynamic/v1/setup.nim
index 1f3aa6f..baadcd3 100644
--- a/groth16/dynamic/setup.nim
+++ b/groth16/dynamic/v1/setup.nim
@@ -18,8 +18,8 @@ import groth16/math/convert
 
 import groth16/zkey_types
 
-import groth16/dynamic/types
 import groth16/dynamic/shared
+import groth16/dynamic/v1/types
 
 #-------------------------------------------------------------------------------
 
diff --git a/groth16/dynamic/v1/types.nim b/groth16/dynamic/v1/types.nim
new file mode 100644
index 0000000..9f0f4ef
--- /dev/null
+++ b/groth16/dynamic/v1/types.nim
@@ -0,0 +1,40 @@
+
+{.push raises:[].}
+
+#import constantine/named/properties_fields
+
+import groth16/bn128
+import groth16/math/domain
+#import groth16/math/ntt
+#import groth16/math/poly
+
+import groth16/partial/types as ptypes
+import groth16/dynamic/types as dtypes
+
+export ptypes
+export dtypes
+
+#-------------------------------------------------------------------------------
+
+type 
+
+  # things we can compute at circuit setup time
+  DynaSetupV1* = object
+    weightVec*     : seq[F]       # the values `W_k` (it's surprisingly slow to re-compute in the finish part!)
+    pointsDeltaLZ* : seq[G1]      # the points `delta^-1 * L_i(tau) * Z(tau) * g1` where `Z(x) = x^N-1`
+    wConvDeltaLZ*  : seq[G1]      # the convolution of `W` and `pointsDeltaLZ`
+    diagPhiPoints* : seq[G1]      # the points `delta^-1 * phi_ii(tau) * Z(tau) * g1` from the Dynark paper
+
+  # things we can compute from the partial witness
+  DynaPreprocessV1* = object
+    projA0*       : seq[G1]      # the points `delta^-1 * A0(tau) * L_i(tau) * g1` (well, "modulo Z(tau)")
+    projB0*       : seq[G1]      # the same for B0
+
+  # "pre-proof" of the Dynark paper, which we can finish 
+  DynaPreProofV1* = object
+    partialProof*   : PartialProof       # linear part of the partial proof
+    deltaImages*    : DeltaImages        # image of the witness delta under A and B (where can update happen)
+    dynaSetup*      : DynaSetupV1        # circuit-setup time calculations
+    dynaPreprocess* : DynaPreprocessV1   # "Dynark"-style preprocessing
+
+#-------------------------------------------------------------------------------
diff --git a/groth16/partial/finish.nim b/groth16/partial/finish.nim
index d58ddab..86c9655 100644
--- a/groth16/partial/finish.nim
+++ b/groth16/partial/finish.nim
@@ -125,7 +125,7 @@ proc finishPartialProofWithMaskGeneric*( nonlinear_term: bool, zkey: ZKey, wtns:
 
   var rho : G1 = partialProof.partial_rho
   withMeasureTime(printTimings,"computing rho (G1 MSM)"):
-    rho += s ** spec.delta1
+    # rho += s ** spec.delta1
     rho += msmMultiThreadedG1( compact_witness , compact_pointsB1, pool )
 
   var pi_b : G2 = partialProof.partial_pi_b
@@ -137,7 +137,7 @@ proc finishPartialProofWithMaskGeneric*( nonlinear_term: bool, zkey: ZKey, wtns:
   withMeasureTime(printTimings,"computing pi_C linear part (G1 MSM)"):
     pi_c += s ** pi_a
     pi_c += r ** rho
-    pi_c += negFr(r*s) ** spec.delta1
+    # pi_c += negFr(r*s) ** spec.delta1
     pi_c += msmMultiThreadedG1( compact_zs , compact_pointsC1, pool )
 
   withMeasureTime(printTimings,"computing pi_C nonlinear part (large G1 MSM)"):
diff --git a/groth16/zkey_types.nim b/groth16/zkey_types.nim
index 41aa95e..c2f7926 100644
--- a/groth16/zkey_types.nim
+++ b/groth16/zkey_types.nim
@@ -77,7 +77,7 @@ func extractVKey*(zkey: Zkey): VKey =
   return VKey(curve:curve, spec:spec, vpoints:vpts)
 
 #-------------------------------------------------------------------------------
-# extract the three matrices from the ZKey
+# extract the three matrices from the ZKey (TODO: C is actually not there...)
 
 func coeffsToSparseMatrices*( dims: MatrixDims, coeffs: seq[Coeff]): SparseMatrices = 
   var A: SparseMatrixColumns[Fr[BN254_Snarks]] = newSeq[SparseColumn[Fr[BN254_Snarks]]] ( dims.ncols )