Merge pull request from GHSA-7p92-x423-vwj6

* feat: bumped gnark-crypto * fix: fixed challenge generation * build: update to gnark-crypto v0.12.1 * fixed: calldataload -> mload * fix: fixed template (declatration of _mPtr) * feat: bumped gnark-crypto * fix: fixed non critical issues * fix: check number of public inputs * build: udpate to latest gnark-crypto --------- Co-authored-by: Gautam Botrel <gautam.botrel@gmail.com>
Consensys · Oct 16, 2023 · 3421eaa · 3421eaa
1 parent 33db4ee
commit 3421eaa
Show file tree

Hide file tree

Showing 19 changed files with 629 additions and 483 deletions.
diff --git a/backend/plonk/bls12-377/prove.go b/backend/plonk/bls12-377/prove.go
diff --git a/backend/plonk/bls12-377/verify.go b/backend/plonk/bls12-377/verify.go
diff --git a/backend/plonk/bls12-381/prove.go b/backend/plonk/bls12-381/prove.go
diff --git a/backend/plonk/bls12-381/verify.go b/backend/plonk/bls12-381/verify.go
diff --git a/backend/plonk/bls24-315/prove.go b/backend/plonk/bls24-315/prove.go
diff --git a/backend/plonk/bls24-315/verify.go b/backend/plonk/bls24-315/verify.go
diff --git a/backend/plonk/bls24-317/prove.go b/backend/plonk/bls24-317/prove.go
diff --git a/backend/plonk/bls24-317/verify.go b/backend/plonk/bls24-317/verify.go
diff --git a/backend/plonk/bn254/prove.go b/backend/plonk/bn254/prove.go
diff --git a/backend/plonk/bn254/solidity.go b/backend/plonk/bn254/solidity.go
diff --git a/backend/plonk/bn254/verify.go b/backend/plonk/bn254/verify.go
diff --git a/backend/plonk/bw6-633/prove.go b/backend/plonk/bw6-633/prove.go
diff --git a/backend/plonk/bw6-633/verify.go b/backend/plonk/bw6-633/verify.go
diff --git a/backend/plonk/bw6-761/prove.go b/backend/plonk/bw6-761/prove.go
diff --git a/backend/plonk/bw6-761/verify.go b/backend/plonk/bw6-761/verify.go
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/bits-and-blooms/bitset v1.8.0
 	github.com/blang/semver/v4 v4.0.0
 	github.com/consensys/bavard v0.1.13
-	github.com/consensys/gnark-crypto v0.12.2-0.20231012161402-206544105834
+	github.com/consensys/gnark-crypto v0.12.2-0.20231013160410-1f65e75b6dfb
 	github.com/fxamacker/cbor/v2 v2.5.0
 	github.com/google/go-cmp v0.5.9
 	github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b

diff --git a/go.sum b/go.sum
@@ -6,6 +6,8 @@ github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/Yj
 github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI=
 github.com/consensys/gnark-crypto v0.12.2-0.20231012161402-206544105834 h1:o+Q1/PSZfNkoUAl/Gf5N/u+H6LkOzR3gF0mS8nRSWYM=
 github.com/consensys/gnark-crypto v0.12.2-0.20231012161402-206544105834/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY=
+github.com/consensys/gnark-crypto v0.12.2-0.20231013160410-1f65e75b6dfb h1:f0BMgIjhZy4lSRHCXFbQst85f5agZAjtDMixQqBWNpc=
+github.com/consensys/gnark-crypto v0.12.2-0.20231013160410-1f65e75b6dfb/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

diff --git a/internal/generator/backend/template/zkpschemes/plonk/plonk.prove.go.tmpl b/internal/generator/backend/template/zkpschemes/plonk/plonk.prove.go.tmpl
@@ -796,6 +796,7 @@ func (s *instance) batchOpening() error {
 		s.zeta,
 		s.hFunc,
 		s.pk.Kzg,
+		s.proof.ZShiftedOpening.ClaimedValue.Marshal(),
 	)
 
 	return err
@@ -1350,4 +1351,4 @@ func computeLinearizedPolynomial(lZeta, rZeta, oZeta, alpha, beta, gamma, zeta,
 	return blindedZCanonical
 }
 
-var errContextDone = errors.New("context done")
+var errContextDone = errors.New("context done")
diff --git a/internal/generator/backend/template/zkpschemes/plonk/plonk.verify.go.tmpl b/internal/generator/backend/template/zkpschemes/plonk/plonk.verify.go.tmpl
@@ -236,6 +236,7 @@ func Verify(proof *Proof, vk *VerifyingKey, publicWitness fr.Vector) error {
 		&proof.BatchedProof,
 		zeta,
 		hFunc,
+		zu.Marshal(),
 	)
 	if err != nil {
 		return err