fix: missing wait on channel in plonk prover (#926)

Consensys · Nov 17, 2023 · 5b37273 · 5b37273
1 parent 51719fe
commit 5b37273
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 0 deletions.
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/solver/hint_registry.go b/constraint/solver/hint_registry.go
@@ -34,6 +34,8 @@ func RegisterHint(hintFns ...Hint) {
 }
 
 func GetRegisteredHint(key HintID) Hint {
+	registryM.Lock()
+	defer registryM.Unlock()
 	return registry[key]
 }
 

diff --git a/internal/generator/backend/template/zkpschemes/plonk/plonk.prove.go.tmpl b/internal/generator/backend/template/zkpschemes/plonk/plonk.prove.go.tmpl
@@ -813,6 +813,14 @@ func (s *instance) batchOpening() error {
 // evaluate the full set of constraints, all polynomials in x are back in
 // canonical regular form at the end
 func (s *instance) computeNumerator() (*iop.Polynomial, error) {
+
+	// wait for chQk to be closed (or ctx.Done())
+	select {
+	case <-s.ctx.Done():
+		return nil, errContextDone
+	case <-s.chQk:
+	}
+
 	n := s.pk.Domain[0].Cardinality
 
 	nbBsbGates := (len(s.x) - id_Qci + 1) >> 1