Merge branch 'master' into perf/ec-arithmetic

Consensys · Feb 22, 2024 · 18d4d10 · 18d4d10
2 parents 4c69e3e + 7cfcd5a
commit 18d4d10
Show file tree

Hide file tree

Showing 40 changed files with 2,216 additions and 136 deletions.
diff --git a/backend/groth16/bls12-377/prove.go b/backend/groth16/bls12-377/prove.go
diff --git a/backend/groth16/bls12-381/prove.go b/backend/groth16/bls12-381/prove.go
diff --git a/backend/groth16/bls24-315/prove.go b/backend/groth16/bls24-315/prove.go
diff --git a/backend/groth16/bls24-317/prove.go b/backend/groth16/bls24-317/prove.go
diff --git a/backend/groth16/bn254/prove.go b/backend/groth16/bn254/prove.go
diff --git a/backend/groth16/bw6-633/prove.go b/backend/groth16/bw6-633/prove.go
diff --git a/backend/groth16/bw6-761/prove.go b/backend/groth16/bw6-761/prove.go
diff --git a/backend/plonk/bls12-377/prove.go b/backend/plonk/bls12-377/prove.go
diff --git a/backend/plonk/bls12-381/prove.go b/backend/plonk/bls12-381/prove.go
diff --git a/backend/plonk/bls24-315/prove.go b/backend/plonk/bls24-315/prove.go
diff --git a/backend/plonk/bls24-317/prove.go b/backend/plonk/bls24-317/prove.go
diff --git a/backend/plonk/bn254/prove.go b/backend/plonk/bn254/prove.go
diff --git a/backend/plonk/bw6-633/prove.go b/backend/plonk/bw6-633/prove.go
diff --git a/backend/plonk/bw6-761/prove.go b/backend/plonk/bw6-761/prove.go
diff --git a/constraint/bls12-377/solver.go b/constraint/bls12-377/solver.go
diff --git a/constraint/bls12-381/solver.go b/constraint/bls12-381/solver.go
diff --git a/constraint/bls24-315/solver.go b/constraint/bls24-315/solver.go
diff --git a/constraint/bls24-317/solver.go b/constraint/bls24-317/solver.go
diff --git a/constraint/bn254/solver.go b/constraint/bn254/solver.go
diff --git a/constraint/bw6-633/solver.go b/constraint/bw6-633/solver.go
diff --git a/constraint/bw6-761/solver.go b/constraint/bw6-761/solver.go
diff --git a/internal/generator/backend/main.go b/internal/generator/backend/main.go
@@ -67,6 +67,7 @@ func main() {
 		Curve:     "tinyfield",
 		CurveID:   "UNKNOWN",
 		noBackend: true,
+		NoGKR:     true,
 	}
 
 	// autogenerate tinyfield
@@ -235,4 +236,5 @@ type templateData struct {
 	Curve     string
 	CurveID   string
 	noBackend bool
+	NoGKR     bool
 }
diff --git a/internal/generator/backend/template/representations/solver.go.tmpl b/internal/generator/backend/template/representations/solver.go.tmpl
@@ -37,6 +37,16 @@ type solver struct {
 }
 
 func newSolver(cs *system, witness fr.Vector, opts ...csolver.Option) (*solver, error) {
+    {{ if not .NoGKR -}}
+    // add GKR options to overwrite the placeholder
+	if cs.GkrInfo.Is() {
+		var gkrData GkrSolvingData
+		opts = append(opts,
+			csolver.OverrideHint(cs.GkrInfo.SolveHintID, GkrSolveHint(cs.GkrInfo, &gkrData)),
+			csolver.OverrideHint(cs.GkrInfo.ProveHintID, GkrProveHint(cs.GkrInfo.HashName, &gkrData)))
+	}
+	{{ end -}}
+
 	// parse options
 	opt, err := csolver.NewConfig(opts...)
 	if err != nil {