Squashed commit of the following:

commit c19f467 Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 13:24:04 2023 +0100 fix: unused import commit a413c27 Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 13:18:47 2023 +0100 feat: add fixed Groth16 verification commit 5a92eb0 Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 13:18:20 2023 +0100 test: use fixed init commit 548819d Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 12:40:00 2023 +0100 test: add constant and fixed VK test cases commit 40a5586 Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 12:39:48 2023 +0100 feat: add fixed KZG verification key init commit c1f5c87 Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 11:55:43 2023 +0100 docs: add init docs commit 9e8e2ac Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 10:18:09 2023 +0100 chore: go generate commit 465acc8 Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 10:17:39 2023 +0100 chore: serialize lines for KZG key commit 9fe8d98 Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 00:51:01 2023 +0100 refactor: remove fixed Q specialized methods commit 3029542 Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 00:50:10 2023 +0100 fix: DoublePairFixed order commit f2933ec Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Wed Nov 22 00:49:47 2023 +0100 chore: go mod commit bfe1068 Author: Ivo Kubjas <ivo.kubjas@consensys.net> Date: Tue Nov 21 15:53:08 2023 +0100 feat: add lazy line eval for Miller loop commit 3aa2559 Author: Gautam Botrel <gautam.botrel@gmail.com> Date: Mon Nov 20 14:03:52 2023 -0600 feat: if we don't compress we don't need the dict (Consensys#929)
ivokub · Nov 23, 2023 · 3ddd004 · 3ddd004
1 parent f01d7d1
commit 3ddd004
Show file tree

Hide file tree

Showing 19 changed files with 700 additions and 1,149 deletions.
diff --git a/backend/plonk/bls12-377/marshal.go b/backend/plonk/bls12-377/marshal.go
diff --git a/backend/plonk/bls12-381/marshal.go b/backend/plonk/bls12-381/marshal.go
diff --git a/backend/plonk/bls24-315/marshal.go b/backend/plonk/bls24-315/marshal.go
diff --git a/backend/plonk/bls24-317/marshal.go b/backend/plonk/bls24-317/marshal.go
diff --git a/backend/plonk/bn254/marshal.go b/backend/plonk/bn254/marshal.go
diff --git a/backend/plonk/bw6-633/marshal.go b/backend/plonk/bw6-633/marshal.go
diff --git a/backend/plonk/bw6-761/marshal.go b/backend/plonk/bw6-761/marshal.go
diff --git a/go.mod b/go.mod
@@ -6,12 +6,11 @@ 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.20231023220848-538dff926c15
+	github.com/consensys/gnark-crypto v0.12.2-0.20231117165148-e77308824822
 	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
 	github.com/icza/bitio v1.1.0
-	github.com/klauspost/compress v1.17.1
 	github.com/ingonyama-zk/iciclegnark v0.1.0
 	github.com/leanovate/gopter v0.2.9
 	github.com/rs/zerolog v1.30.0

diff --git a/go.sum b/go.sum
@@ -4,8 +4,8 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ=
 github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI=
-github.com/consensys/gnark-crypto v0.12.2-0.20231023220848-538dff926c15 h1:fu5ienFKWWqrfMPbWnhw4zfIFZW3pzVIbv3KtASymbU=
-github.com/consensys/gnark-crypto v0.12.2-0.20231023220848-538dff926c15/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY=
+github.com/consensys/gnark-crypto v0.12.2-0.20231117165148-e77308824822 h1:PvEjRgB/U4bv0jl9w65Wy9g0nIdkkW7vkNoR8Vq/als=
+github.com/consensys/gnark-crypto v0.12.2-0.20231117165148-e77308824822/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -19,13 +19,14 @@ github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b/go.mod h1:czg5+yv1E0Z
 github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/icza/bitio v1.1.0 h1:ysX4vtldjdi3Ygai5m1cWy4oLkhWTAi+SyO6HC8L9T0=
 github.com/icza/bitio v1.1.0/go.mod h1:0jGnlLAx8MKMr9VGnn/4YrvZiprkvBelsVIbA9Jjr9A=
+github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6 h1:8UsGZ2rr2ksmEru6lToqnXgA8Mz1DP11X4zSJ159C3k=
 github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6/go.mod h1:xQig96I1VNBDIWGCdTt54nHt6EeI639SmHycLYL7FkA=
 github.com/ingonyama-zk/icicle v0.0.0-20230928131117-97f0079e5c71 h1:YxI1RTPzpFJ3MBmxPl3Bo0F7ume7CmQEC1M9jL6CT94=
 github.com/ingonyama-zk/icicle v0.0.0-20230928131117-97f0079e5c71/go.mod h1:kAK8/EoN7fUEmakzgZIYdWy1a2rBnpCaZLqSHwZWxEk=
 github.com/ingonyama-zk/iciclegnark v0.1.0 h1:88MkEghzjQBMjrYRJFxZ9oR9CTIpB8NG2zLeCJSvXKQ=
 github.com/ingonyama-zk/iciclegnark v0.1.0/go.mod h1:wz6+IpyHKs6UhMMoQpNqz1VY+ddfKqC/gRwR/64W6WU=
-github.com/klauspost/compress v1.17.1 h1:NE3C767s2ak2bweCZo3+rdP4U/HoyVXLv/X9f2gPS5g=
-github.com/klauspost/compress v1.17.1/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
 github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
@@ -41,6 +42,7 @@ github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFV
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c=
@@ -62,6 +64,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU=

diff --git a/internal/generator/backend/template/zkpschemes/plonk/plonk.marshal.go.tmpl b/internal/generator/backend/template/zkpschemes/plonk/plonk.marshal.go.tmpl
@@ -330,6 +330,7 @@ func (vk *VerifyingKey) writeTo(w io.Writer, options ...func(*curve.Encoder)) (n
 		&vk.Kzg.G1,
 		&vk.Kzg.G2[0],
 		&vk.Kzg.G2[1],
+		&vk.Kzg.Lines,
 		vk.CommitmentConstraintIndexes,
 	}
 
@@ -369,6 +370,7 @@ func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
 		&vk.Kzg.G1,
 		&vk.Kzg.G2[0],
 		&vk.Kzg.G2[1],
+		&vk.Kzg.Lines,
 		&vk.CommitmentConstraintIndexes,
 	}
 

diff --git a/std/algebra/emulated/sw_bw6761/g2.go b/std/algebra/emulated/sw_bw6761/g2.go
@@ -6,11 +6,50 @@ import (
 	"github.com/consensys/gnark/std/math/emulated"
 )
 
-type G2Affine = sw_emulated.AffinePoint[BaseField]
+// g2AffP is the raw G2 element without precomputations.
+type g2AffP = sw_emulated.AffinePoint[BaseField]
 
-func NewG2Affine(v bw6761.G2Affine) G2Affine {
-	return G2Affine{
+// G2Affine represents G2 element with optional embedded line precomputations.
+type G2Affine struct {
+	P     g2AffP
+	Lines *lineEvaluations
+}
+
+func newG2AffP(v bw6761.G2Affine) g2AffP {
+	return sw_emulated.AffinePoint[BaseField]{
 		X: emulated.ValueOf[BaseField](v.X),
 		Y: emulated.ValueOf[BaseField](v.Y),
 	}
 }
+
+// NewG2Affine returns the witness of v without precomputations. In case of
+// pairing the precomputation will be done in-circuit.
+func NewG2Affine(v bw6761.G2Affine) G2Affine {
+	return G2Affine{
+		P: newG2AffP(v),
+	}
+}
+
+// NewG2AffineFixed returns witness of v with precomputations for efficient
+// pairing computation.
+func NewG2AffineFixed(v bw6761.G2Affine) G2Affine {
+	lines := precomputeLines(v)
+	return G2Affine{
+		P:     newG2AffP(v),
+		Lines: &lines,
+	}
+}
+
+// NewG2AffineFixedPlaceholder returns a placeholder for the circuit compilation
+// when witness will be given with line precomputations using
+// [NewG2AffineFixed].
+func NewG2AffineFixedPlaceholder() G2Affine {
+	var lines lineEvaluations
+	for i := 0; i < len(bw6761.LoopCounter)-1; i++ {
+		lines[0][i] = &lineEvaluation{}
+		lines[1][i] = &lineEvaluation{}
+	}
+	return G2Affine{
+		Lines: &lines,
+	}
+}