From 2fc6b96f1eca0d76f88b174267a49ad9d85a81e8 Mon Sep 17 00:00:00 2001
From: Justin Traglia <95511699+jtraglia@users.noreply.github.com>
Date: Thu, 4 May 2023 12:44:21 -0500
Subject: [PATCH 01/51] Fix some typos (#394)
* Fix some typos
* Run gofmt (to fix IDE's autofixes)
* Run go generate
---
.github/workflows/pr.yml | 2 +-
CHANGELOG.md | 16 ++++++-------
ecc/bls12-377/fp/element.go | 2 +-
ecc/bls12-377/fp/element_test.go | 2 +-
ecc/bls12-377/fr/element.go | 2 +-
ecc/bls12-377/fr/element_test.go | 2 +-
ecc/bls12-377/fr/kzg/kzg.go | 4 ++--
ecc/bls12-377/fr/kzg/kzg_test.go | 2 +-
ecc/bls12-377/fr/plookup/vector.go | 4 ++--
.../fr/polynomial/polynomial_test.go | 2 +-
ecc/bls12-377/fr/polynomial/pool.go | 4 ++--
ecc/bls12-377/g1.go | 2 +-
ecc/bls12-377/g2.go | 2 +-
ecc/bls12-377/internal/fptower/e12.go | 8 +++----
ecc/bls12-377/internal/fptower/e2.go | 2 +-
ecc/bls12-377/internal/fptower/e6.go | 2 +-
ecc/bls12-377/multiexp.go | 24 +++++++++----------
ecc/bls12-377/multiexp_affine.go | 4 ++--
ecc/bls12-377/multiexp_jacobian.go | 4 ++--
ecc/bls12-377/multiexp_test.go | 20 ++++++++--------
.../twistededwards/eddsa/eddsa_test.go | 12 +++++-----
ecc/bls12-377/twistededwards/eddsa/marshal.go | 4 ++--
ecc/bls12-378/fp/element.go | 2 +-
ecc/bls12-378/fp/element_test.go | 2 +-
ecc/bls12-378/fr/element.go | 2 +-
ecc/bls12-378/fr/element_test.go | 2 +-
ecc/bls12-378/fr/kzg/kzg.go | 4 ++--
ecc/bls12-378/fr/kzg/kzg_test.go | 2 +-
ecc/bls12-378/fr/plookup/vector.go | 4 ++--
.../fr/polynomial/polynomial_test.go | 2 +-
ecc/bls12-378/fr/polynomial/pool.go | 4 ++--
ecc/bls12-378/g1.go | 2 +-
ecc/bls12-378/g2.go | 2 +-
ecc/bls12-378/internal/fptower/e12.go | 8 +++----
ecc/bls12-378/internal/fptower/e2.go | 2 +-
ecc/bls12-378/internal/fptower/e6.go | 2 +-
ecc/bls12-378/multiexp.go | 24 +++++++++----------
ecc/bls12-378/multiexp_affine.go | 4 ++--
ecc/bls12-378/multiexp_jacobian.go | 4 ++--
ecc/bls12-378/multiexp_test.go | 20 ++++++++--------
.../twistededwards/eddsa/eddsa_test.go | 12 +++++-----
ecc/bls12-378/twistededwards/eddsa/marshal.go | 4 ++--
.../bandersnatch/eddsa/eddsa_test.go | 12 +++++-----
ecc/bls12-381/bandersnatch/eddsa/marshal.go | 4 ++--
ecc/bls12-381/fp/element.go | 2 +-
ecc/bls12-381/fp/element_test.go | 2 +-
ecc/bls12-381/fr/element.go | 2 +-
ecc/bls12-381/fr/element_test.go | 2 +-
ecc/bls12-381/fr/kzg/kzg.go | 4 ++--
ecc/bls12-381/fr/kzg/kzg_test.go | 2 +-
ecc/bls12-381/fr/plookup/vector.go | 4 ++--
.../fr/polynomial/polynomial_test.go | 2 +-
ecc/bls12-381/fr/polynomial/pool.go | 4 ++--
ecc/bls12-381/g1.go | 2 +-
ecc/bls12-381/g2.go | 2 +-
ecc/bls12-381/internal/fptower/e12.go | 8 +++----
ecc/bls12-381/internal/fptower/e2.go | 2 +-
ecc/bls12-381/internal/fptower/e6.go | 2 +-
ecc/bls12-381/multiexp.go | 24 +++++++++----------
ecc/bls12-381/multiexp_affine.go | 4 ++--
ecc/bls12-381/multiexp_jacobian.go | 4 ++--
ecc/bls12-381/multiexp_test.go | 20 ++++++++--------
.../twistededwards/eddsa/eddsa_test.go | 12 +++++-----
ecc/bls12-381/twistededwards/eddsa/marshal.go | 4 ++--
ecc/bls24-315/fp/element.go | 2 +-
ecc/bls24-315/fp/element_test.go | 2 +-
ecc/bls24-315/fr/element.go | 2 +-
ecc/bls24-315/fr/element_test.go | 2 +-
ecc/bls24-315/fr/kzg/kzg.go | 4 ++--
ecc/bls24-315/fr/kzg/kzg_test.go | 2 +-
ecc/bls24-315/fr/plookup/vector.go | 4 ++--
.../fr/polynomial/polynomial_test.go | 2 +-
ecc/bls24-315/fr/polynomial/pool.go | 4 ++--
ecc/bls24-315/g1.go | 2 +-
ecc/bls24-315/g2.go | 2 +-
ecc/bls24-315/internal/fptower/e12.go | 4 ++--
ecc/bls24-315/internal/fptower/e2.go | 2 +-
ecc/bls24-315/internal/fptower/e24.go | 8 +++----
ecc/bls24-315/internal/fptower/e4.go | 6 ++---
ecc/bls24-315/multiexp.go | 24 +++++++++----------
ecc/bls24-315/multiexp_affine.go | 4 ++--
ecc/bls24-315/multiexp_jacobian.go | 4 ++--
ecc/bls24-315/multiexp_test.go | 20 ++++++++--------
.../twistededwards/eddsa/eddsa_test.go | 12 +++++-----
ecc/bls24-315/twistededwards/eddsa/marshal.go | 4 ++--
ecc/bls24-317/fp/element.go | 2 +-
ecc/bls24-317/fp/element_test.go | 2 +-
ecc/bls24-317/fr/element.go | 2 +-
ecc/bls24-317/fr/element_test.go | 2 +-
ecc/bls24-317/fr/kzg/kzg.go | 4 ++--
ecc/bls24-317/fr/kzg/kzg_test.go | 2 +-
ecc/bls24-317/fr/plookup/vector.go | 4 ++--
.../fr/polynomial/polynomial_test.go | 2 +-
ecc/bls24-317/fr/polynomial/pool.go | 4 ++--
ecc/bls24-317/g1.go | 2 +-
ecc/bls24-317/g2.go | 2 +-
ecc/bls24-317/internal/fptower/e12.go | 4 ++--
ecc/bls24-317/internal/fptower/e2.go | 2 +-
ecc/bls24-317/internal/fptower/e24.go | 8 +++----
ecc/bls24-317/internal/fptower/e4.go | 6 ++---
ecc/bls24-317/multiexp.go | 24 +++++++++----------
ecc/bls24-317/multiexp_affine.go | 4 ++--
ecc/bls24-317/multiexp_jacobian.go | 4 ++--
ecc/bls24-317/multiexp_test.go | 20 ++++++++--------
.../twistededwards/eddsa/eddsa_test.go | 12 +++++-----
ecc/bls24-317/twistededwards/eddsa/marshal.go | 4 ++--
ecc/bn254/fp/element.go | 2 +-
ecc/bn254/fp/element_test.go | 2 +-
ecc/bn254/fr/element.go | 2 +-
ecc/bn254/fr/element_test.go | 2 +-
ecc/bn254/fr/kzg/kzg.go | 4 ++--
ecc/bn254/fr/kzg/kzg_test.go | 2 +-
ecc/bn254/fr/plookup/vector.go | 4 ++--
ecc/bn254/fr/polynomial/polynomial_test.go | 2 +-
ecc/bn254/fr/polynomial/pool.go | 4 ++--
ecc/bn254/fr/sis/sis.go | 10 ++++----
ecc/bn254/fr/sis/sis_test.go | 10 ++++----
ecc/bn254/fr/tensor-commitment/commitment.go | 8 +++----
.../fr/tensor-commitment/commitment_test.go | 8 +++----
ecc/bn254/g1.go | 2 +-
ecc/bn254/g2.go | 2 +-
ecc/bn254/internal/fptower/e12.go | 8 +++----
ecc/bn254/internal/fptower/e2.go | 2 +-
ecc/bn254/internal/fptower/e6.go | 2 +-
ecc/bn254/multiexp.go | 24 +++++++++----------
ecc/bn254/multiexp_affine.go | 4 ++--
ecc/bn254/multiexp_jacobian.go | 4 ++--
ecc/bn254/multiexp_test.go | 20 ++++++++--------
ecc/bn254/twistededwards/eddsa/eddsa_test.go | 12 +++++-----
ecc/bn254/twistededwards/eddsa/marshal.go | 4 ++--
ecc/bw6-633/fp/element.go | 2 +-
ecc/bw6-633/fp/element_test.go | 2 +-
ecc/bw6-633/fr/element.go | 2 +-
ecc/bw6-633/fr/element_test.go | 2 +-
ecc/bw6-633/fr/kzg/kzg.go | 4 ++--
ecc/bw6-633/fr/kzg/kzg_test.go | 2 +-
ecc/bw6-633/fr/plookup/vector.go | 4 ++--
ecc/bw6-633/fr/polynomial/polynomial_test.go | 2 +-
ecc/bw6-633/fr/polynomial/pool.go | 4 ++--
ecc/bw6-633/g1.go | 2 +-
ecc/bw6-633/g2.go | 2 +-
ecc/bw6-633/internal/fptower/e3.go | 4 ++--
ecc/bw6-633/internal/fptower/e6.go | 6 ++---
ecc/bw6-633/multiexp.go | 24 +++++++++----------
ecc/bw6-633/multiexp_affine.go | 4 ++--
ecc/bw6-633/multiexp_jacobian.go | 4 ++--
ecc/bw6-633/multiexp_test.go | 20 ++++++++--------
ecc/bw6-633/twistededwards/eddsa/eddsa.go | 2 +-
.../twistededwards/eddsa/eddsa_test.go | 12 +++++-----
ecc/bw6-633/twistededwards/eddsa/marshal.go | 4 ++--
ecc/bw6-756/fp/element.go | 2 +-
ecc/bw6-756/fp/element_test.go | 2 +-
ecc/bw6-756/fr/element.go | 2 +-
ecc/bw6-756/fr/element_test.go | 2 +-
ecc/bw6-756/fr/kzg/kzg.go | 4 ++--
ecc/bw6-756/fr/kzg/kzg_test.go | 2 +-
ecc/bw6-756/fr/plookup/vector.go | 4 ++--
ecc/bw6-756/fr/polynomial/polynomial_test.go | 2 +-
ecc/bw6-756/fr/polynomial/pool.go | 4 ++--
ecc/bw6-756/g1.go | 2 +-
ecc/bw6-756/g2.go | 2 +-
ecc/bw6-756/internal/fptower/e3.go | 4 ++--
ecc/bw6-756/internal/fptower/e6.go | 6 ++---
ecc/bw6-756/multiexp.go | 24 +++++++++----------
ecc/bw6-756/multiexp_affine.go | 4 ++--
ecc/bw6-756/multiexp_jacobian.go | 4 ++--
ecc/bw6-756/multiexp_test.go | 20 ++++++++--------
ecc/bw6-756/twistededwards/eddsa/eddsa.go | 2 +-
.../twistededwards/eddsa/eddsa_test.go | 12 +++++-----
ecc/bw6-756/twistededwards/eddsa/marshal.go | 4 ++--
ecc/bw6-761/fp/element.go | 2 +-
ecc/bw6-761/fp/element_test.go | 2 +-
ecc/bw6-761/fr/element.go | 2 +-
ecc/bw6-761/fr/element_test.go | 2 +-
ecc/bw6-761/fr/kzg/kzg.go | 4 ++--
ecc/bw6-761/fr/kzg/kzg_test.go | 2 +-
ecc/bw6-761/fr/plookup/vector.go | 4 ++--
ecc/bw6-761/fr/polynomial/polynomial_test.go | 2 +-
ecc/bw6-761/fr/polynomial/pool.go | 4 ++--
ecc/bw6-761/g1.go | 2 +-
ecc/bw6-761/g2.go | 2 +-
ecc/bw6-761/internal/fptower/e3.go | 4 ++--
ecc/bw6-761/internal/fptower/e6.go | 6 ++---
ecc/bw6-761/multiexp.go | 24 +++++++++----------
ecc/bw6-761/multiexp_affine.go | 4 ++--
ecc/bw6-761/multiexp_jacobian.go | 4 ++--
ecc/bw6-761/multiexp_test.go | 20 ++++++++--------
ecc/bw6-761/twistededwards/eddsa/eddsa.go | 2 +-
.../twistededwards/eddsa/eddsa_test.go | 12 +++++-----
ecc/bw6-761/twistededwards/eddsa/marshal.go | 4 ++--
ecc/secp256k1/fp/element.go | 2 +-
ecc/secp256k1/fr/element.go | 2 +-
ecc/secp256k1/g1.go | 2 +-
ecc/secp256k1/multiexp.go | 16 ++++++-------
ecc/secp256k1/multiexp_affine.go | 2 +-
ecc/secp256k1/multiexp_jacobian.go | 2 +-
ecc/secp256k1/multiexp_test.go | 10 ++++----
ecc/stark-curve/fp/element.go | 2 +-
ecc/stark-curve/fp/element_test.go | 2 +-
ecc/stark-curve/fr/element.go | 2 +-
ecc/stark-curve/fr/element_test.go | 2 +-
ecc/stark-curve/marshal.go | 4 ++--
ecc/twistededwards/twistededwards.go | 2 +-
fiat-shamir/transcript_test.go | 2 +-
field/generator/config/field_test.go | 2 +-
field/generator/internal/addchain/addchain.go | 2 +-
.../internal/templates/element/base.go | 2 +-
.../internal/templates/element/mul_cios.go | 8 +++----
.../internal/templates/element/tests.go | 2 +-
field/goldilocks/element.go | 2 +-
internal/generator/ecc/generate.go | 4 ++--
.../generator/ecc/template/multiexp.go.tmpl | 16 ++++++-------
.../ecc/template/multiexp_affine.go.tmpl | 2 +-
.../ecc/template/multiexp_jacobian.go.tmpl | 2 +-
internal/generator/ecc/template/point.go.tmpl | 2 +-
.../ecc/template/tests/multiexp.go.tmpl | 10 ++++----
.../edwards/eddsa/template/eddsa.go.tmpl | 2 +-
.../edwards/eddsa/template/eddsa.test.go.tmpl | 12 +++++-----
.../edwards/eddsa/template/marshal.go.tmpl | 12 +++++-----
internal/generator/kzg/template/fuzz.go.tmpl | 6 ++---
internal/generator/kzg/template/kzg.go.tmpl | 4 ++--
.../generator/kzg/template/kzg.test.go.tmpl | 2 +-
.../generator/plookup/template/vector.go.tmpl | 4 ++--
.../template/polynomial.test.go.tmpl | 2 +-
.../polynomial/template/pool.go.tmpl | 4 ++--
.../template/fq12over6over2/fq12.go.tmpl | 8 +++----
.../tower/template/fq12over6over2/fq2.go.tmpl | 6 ++---
.../tower/template/fq12over6over2/fq6.go.tmpl | 2 +-
228 files changed, 614 insertions(+), 614 deletions(-)
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 06d34a0c9..9267b9ffb 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -38,7 +38,7 @@ jobs:
go generate ./...
git update-index --assume-unchanged go.mod
git update-index --assume-unchanged go.sum
- if [[ -n $(git status --porcelain) ]]; then echo "git repo is dirty after runing go generate -- please don't modify generated files"; echo $(git diff);echo $(git status --porcelain); exit 1; fi
+ if [[ -n $(git status --porcelain) ]]; then echo "git repo is dirty after running go generate -- please don't modify generated files"; echo $(git diff);echo $(git status --porcelain); exit 1; fi
test:
strategy:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a142c31e1..d7fd88885 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,8 +24,8 @@ The scope of the audit covered `bn254` and `bls12-381` packages (including field
### Perf
-- remove unecessary inverse in KZG-verify
-- faster GLV scalar decompostion
+- remove unnecessary inverse in KZG-verify
+- faster GLV scalar decomposition
### Refactor & Docs
@@ -34,7 +34,7 @@ The scope of the audit covered `bn254` and `bls12-381` packages (including field
- remove dead code ([#230](https://github.com/ConsenSys/gnark-crypto/issues/230))
- cosmetic changes ([#197](https://github.com/ConsenSys/gnark-crypto/issues/197))
- replace modulus generated by constants, add zero-alloc SetRandom ([#194](https://github.com/ConsenSys/gnark-crypto/issues/194))
-- remove uneeded x86 asm and files ([#192](https://github.com/ConsenSys/gnark-crypto/issues/192))
+- remove unneeded x86 asm and files ([#192](https://github.com/ConsenSys/gnark-crypto/issues/192))
- polish readme.md with updated godoc subpackage links ([#235](https://github.com/ConsenSys/gnark-crypto/issues/235))
- acknowledge that inv(0)==0 in comments as a convention ([#233](https://github.com/ConsenSys/gnark-crypto/issues/233))
- added note in pairing godoc - doesn't check inputs are in correct subgroup ([#231](https://github.com/ConsenSys/gnark-crypto/issues/231))
@@ -137,7 +137,7 @@ The scope of the audit covered `bn254` and `bls12-381` packages (including field
- **field:** added UnmarshalJSON and MarshalJSON on fields
- **field:** added field.Text(base) to return field element string in a given base, like big.Int
- **field:** field.SetString now supports 0b 0o 0x prefixes (base 2, 8 and 16)
-- **kzg:** test tampered proofs whith quotient set to zero
+- **kzg:** test tampered proofs with quotient set to zero
- **bls24:** Fp-Fp2-Fp4-Fp12-Fp24 tower
### Fix
@@ -265,9 +265,9 @@ The scope of the audit covered `bn254` and `bls12-381` packages (including field
- ecc encoder now handles []Element so gnark don't have to
- ecc encoders uses binary.Write and binary.Read to support basic types
- added ecc.Implemented() that returns list of curve fully implemented
-- added Reference bencharks for continuous benchmarking. fixes [#54](https://github.com/ConsenSys/gnark-crypto/issues/54)
+- added Reference benchmarks for continuous benchmarking. fixes [#54](https://github.com/ConsenSys/gnark-crypto/issues/54)
- added curve level go-fuzz fuzz functions
-- **all curves:** faster GT memebership
+- **all curves:** faster GT membership
- **twisted Edwards:** tests use gopter, no more hardcoded values
- **bls12-377:** change G2 generator (+Fp QNR) to match other libs
- **bls12-377:** change G1 generator to match other libs
@@ -294,7 +294,7 @@ The scope of the audit covered `bn254` and `bls12-381` packages (including field
- **bw6:** new optimized final exp (hard part)
- **bw6-633:** divide G1 cofactor formula by 4
- **bw6-633:** optimized hard part in final exp
-- **fft:** introduced flatten kernel for n==8 and asm impl for butterfly to minimze memory writes
+- **fft:** introduced flatten kernel for n==8 and asm impl for butterfly to minimize memory writes
### Refactor
@@ -344,7 +344,7 @@ The scope of the audit covered `bn254` and `bls12-381` packages (including field
- handle case where numCPU < 4 in precomputeExpTable
- incorrect comment and size returned in twistededwards SetBytes fixes [#34](https://github.com/ConsenSys/gnark-crypto/issues/34)
-- point.SetBytes can now be called concurently with same byte slice input
+- point.SetBytes can now be called concurrently with same byte slice input
diff --git a/ecc/bls12-377/fp/element.go b/ecc/bls12-377/fp/element.go
index 1080d80b3..c0a01bd34 100644
--- a/ecc/bls12-377/fp/element.go
+++ b/ecc/bls12-377/fp/element.go
@@ -356,7 +356,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1<= 0; i-- {
t.Mul(&f[i+1], &a)
diff --git a/ecc/bls12-377/fr/kzg/kzg_test.go b/ecc/bls12-377/fr/kzg/kzg_test.go
index 15fd138c8..d034ac109 100644
--- a/ecc/bls12-377/fr/kzg/kzg_test.go
+++ b/ecc/bls12-377/fr/kzg/kzg_test.go
@@ -142,7 +142,7 @@ func TestVerifySinglePoint(t *testing.T) {
// verify the claimed valued
expected := eval(f, point)
if !proof.ClaimedValue.Equal(&expected) {
- t.Fatal("inconsistant claimed value")
+ t.Fatal("inconsistent claimed value")
}
// verify correct proof
diff --git a/ecc/bls12-377/fr/plookup/vector.go b/ecc/bls12-377/fr/plookup/vector.go
index 9633f589b..8273c663d 100644
--- a/ecc/bls12-377/fr/plookup/vector.go
+++ b/ecc/bls12-377/fr/plookup/vector.go
@@ -349,7 +349,7 @@ func computeQuotientCanonical(alpha fr.Element, lh, lh0, lhn, lh1h2 []fr.Element
//
// /!\IMPORTANT/!\
//
-// If the table t is already commited somewhere (which is the normal workflow
+// If the table t is already committed somewhere (which is the normal workflow
// before generating a lookup proof), the commitment needs to be done on the
// table sorted. Otherwise the commitment in proof.t will not be the same as
// the public commitment: it will contain the same values, but permuted.
@@ -673,7 +673,7 @@ func VerifyLookupVector(vk kzg.VerifyingKey, proof ProofLookupVector) error {
lhs.Sub(&lhs, &rhs)
- // check consistancy of bounds
+ // check consistency of bounds
var l0, ln, d1, d2 fr.Element
l0.Exp(nu, big.NewInt(int64(proof.size))).Sub(&l0, &one)
ln.Set(&l0)
diff --git a/ecc/bls12-377/fr/polynomial/polynomial_test.go b/ecc/bls12-377/fr/polynomial/polynomial_test.go
index eab8d3797..81843e7f3 100644
--- a/ecc/bls12-377/fr/polynomial/polynomial_test.go
+++ b/ecc/bls12-377/fr/polynomial/polynomial_test.go
@@ -171,7 +171,7 @@ func TestPolynomialAdd(t *testing.T) {
t.Fatal("side effect, f2 should not have been modified")
}
- // all operands are distincts
+ // all operands are distinct
_f1 := f1.Clone()
_f1.Add(f1, f2)
if !_f1.Equal(expectedSum) {
diff --git a/ecc/bls12-377/fr/polynomial/pool.go b/ecc/bls12-377/fr/polynomial/pool.go
index ba9e8ae9a..454667462 100644
--- a/ecc/bls12-377/fr/polynomial/pool.go
+++ b/ecc/bls12-377/fr/polynomial/pool.go
@@ -49,7 +49,7 @@ type Pool struct {
}
func (p *sizedPool) get(n int) *fr.Element {
- p.stats.maake(n)
+ p.stats.make(n)
return p.pool.Get().(*fr.Element)
}
@@ -153,7 +153,7 @@ type poolsStats struct {
InUse int
}
-func (s *poolStats) maake(n int) {
+func (s *poolStats) make(n int) {
s.Used++
s.InUse++
if n > s.GreatestNUsed {
diff --git a/ecc/bls12-377/g1.go b/ecc/bls12-377/g1.go
index 54b590234..0cf4a7df2 100644
--- a/ecc/bls12-377/g1.go
+++ b/ecc/bls12-377/g1.go
@@ -1027,7 +1027,7 @@ func BatchScalarMultiplicationG1(base *G1Affine, scalars []fr.Element) []G1Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddMixed(&baseTableAff[(digit>>1)-1])
diff --git a/ecc/bls12-377/g2.go b/ecc/bls12-377/g2.go
index bb8e3e5a6..a372a3ceb 100644
--- a/ecc/bls12-377/g2.go
+++ b/ecc/bls12-377/g2.go
@@ -944,7 +944,7 @@ func BatchScalarMultiplicationG2(base *G2Affine, scalars []fr.Element) []G2Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddAssign(&baseTable[(digit>>1)-1])
diff --git a/ecc/bls12-377/internal/fptower/e12.go b/ecc/bls12-377/internal/fptower/e12.go
index 0d5d2b553..956d6cace 100644
--- a/ecc/bls12-377/internal/fptower/e12.go
+++ b/ecc/bls12-377/internal/fptower/e12.go
@@ -36,7 +36,7 @@ type E12 struct {
C0, C1 E6
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E12) Equal(x *E12) bool {
return z.C0.Equal(&x.C0) && z.C1.Equal(&x.C1)
}
@@ -99,7 +99,7 @@ func (z *E12) SetRandom() (*E12, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E12) IsZero() bool {
return z.C0.IsZero() && z.C1.IsZero()
}
@@ -650,7 +650,7 @@ func (z *E12) Marshal() []byte {
return b[:]
}
-// Unmarshal is an allias to SetBytes()
+// Unmarshal is an alias to SetBytes()
func (z *E12) Unmarshal(buf []byte) error {
return z.SetBytes(buf)
}
@@ -723,7 +723,7 @@ func (z *E12) SetBytes(e []byte) error {
return nil
}
-// IsInSubGroup ensures GT/E12 is in correct sugroup
+// IsInSubGroup ensures GT/E12 is in correct subgroup
func (z *E12) IsInSubGroup() bool {
var a, b E12
diff --git a/ecc/bls12-377/internal/fptower/e2.go b/ecc/bls12-377/internal/fptower/e2.go
index 640fd5209..227570dc5 100644
--- a/ecc/bls12-377/internal/fptower/e2.go
+++ b/ecc/bls12-377/internal/fptower/e2.go
@@ -203,7 +203,7 @@ func (z *E2) Exp(x E2, k *big.Int) *E2 {
}
// Sqrt sets z to the square root of and returns z
-// The function does not test wether the square root
+// The function does not test whether the square root
// exists or not, it's up to the caller to call
// Legendre beforehand.
// cf https://eprint.iacr.org/2012/685.pdf (algo 10)
diff --git a/ecc/bls12-377/internal/fptower/e6.go b/ecc/bls12-377/internal/fptower/e6.go
index d4f80de95..90aba83b2 100644
--- a/ecc/bls12-377/internal/fptower/e6.go
+++ b/ecc/bls12-377/internal/fptower/e6.go
@@ -21,7 +21,7 @@ type E6 struct {
B0, B1, B2 E2
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E6) Equal(x *E6) bool {
return z.B0.Equal(&x.B0) && z.B1.Equal(&x.B1) && z.B2.Equal(&x.B2)
}
diff --git a/ecc/bls12-377/multiexp.go b/ecc/bls12-377/multiexp.go
index f75f78aa0..cb727fa24 100644
--- a/ecc/bls12-377/multiexp.go
+++ b/ecc/bls12-377/multiexp.go
@@ -45,7 +45,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -55,7 +55,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -65,7 +65,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -107,7 +107,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -302,7 +302,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -312,7 +312,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -322,7 +322,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -364,7 +364,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -552,13 +552,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits + c - 1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -577,7 +577,7 @@ type chunkStat struct {
}
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -634,7 +634,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []
digit += int(scalar[s.index+1]&s.maskHigh) << s.shiftHigh
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
diff --git a/ecc/bls12-377/multiexp_affine.go b/ecc/bls12-377/multiexp_affine.go
index 5aa3546b5..31fb86384 100644
--- a/ecc/bls12-377/multiexp_affine.go
+++ b/ecc/bls12-377/multiexp_affine.go
@@ -47,7 +47,7 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g1JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
@@ -363,7 +363,7 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g2JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/ecc/bls12-377/multiexp_jacobian.go b/ecc/bls12-377/multiexp_jacobian.go
index e01f5567f..1a24aa25b 100644
--- a/ecc/bls12-377/multiexp_jacobian.go
+++ b/ecc/bls12-377/multiexp_jacobian.go
@@ -33,7 +33,7 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
@@ -110,7 +110,7 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/ecc/bls12-377/multiexp_test.go b/ecc/bls12-377/multiexp_test.go
index 4b2373bc2..f07f32dd1 100644
--- a/ecc/bls12-377/multiexp_test.go
+++ b/ecc/bls12-377/multiexp_test.go
@@ -73,7 +73,7 @@ func TestMultiExpG1(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G1] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G1Affine
for i := 0; i < 13; i++ {
@@ -105,7 +105,7 @@ func TestMultiExpG1(t *testing.T) {
cRange = []uint64{5, 14}
}
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G1Jac
@@ -138,7 +138,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G1Affine
@@ -174,7 +174,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -196,7 +196,7 @@ func TestMultiExpG1(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G1] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G1Jac
@@ -489,7 +489,7 @@ func TestMultiExpG2(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G2] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G2Affine
for i := 0; i < 13; i++ {
@@ -519,7 +519,7 @@ func TestMultiExpG2(t *testing.T) {
// test only "odd" and "even" (ie windows size divide word size vs not)
cRange := []uint64{5, 14}
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G2Jac
@@ -552,7 +552,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G2Affine
@@ -588,7 +588,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -610,7 +610,7 @@ func TestMultiExpG2(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G2] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G2Jac
diff --git a/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go b/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go
index 1175d7458..2c2148143 100644
--- a/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go
@@ -77,7 +77,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -89,7 +89,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -125,7 +125,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -136,7 +136,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -168,7 +168,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -177,7 +177,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/ecc/bls12-377/twistededwards/eddsa/marshal.go b/ecc/bls12-377/twistededwards/eddsa/marshal.go
index 485e9b710..acf3c4173 100644
--- a/ecc/bls12-377/twistededwards/eddsa/marshal.go
+++ b/ecc/bls12-377/twistededwards/eddsa/marshal.go
@@ -96,7 +96,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// - x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -111,7 +111,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// - x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
//
diff --git a/ecc/bls12-378/fp/element.go b/ecc/bls12-378/fp/element.go
index 51105fe16..cf7a8a852 100644
--- a/ecc/bls12-378/fp/element.go
+++ b/ecc/bls12-378/fp/element.go
@@ -356,7 +356,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1<= 0; i-- {
t.Mul(&f[i+1], &a)
diff --git a/ecc/bls12-378/fr/kzg/kzg_test.go b/ecc/bls12-378/fr/kzg/kzg_test.go
index ac3431326..df9e08abb 100644
--- a/ecc/bls12-378/fr/kzg/kzg_test.go
+++ b/ecc/bls12-378/fr/kzg/kzg_test.go
@@ -142,7 +142,7 @@ func TestVerifySinglePoint(t *testing.T) {
// verify the claimed valued
expected := eval(f, point)
if !proof.ClaimedValue.Equal(&expected) {
- t.Fatal("inconsistant claimed value")
+ t.Fatal("inconsistent claimed value")
}
// verify correct proof
diff --git a/ecc/bls12-378/fr/plookup/vector.go b/ecc/bls12-378/fr/plookup/vector.go
index 67384cf7b..edc0adfee 100644
--- a/ecc/bls12-378/fr/plookup/vector.go
+++ b/ecc/bls12-378/fr/plookup/vector.go
@@ -349,7 +349,7 @@ func computeQuotientCanonical(alpha fr.Element, lh, lh0, lhn, lh1h2 []fr.Element
//
// /!\IMPORTANT/!\
//
-// If the table t is already commited somewhere (which is the normal workflow
+// If the table t is already committed somewhere (which is the normal workflow
// before generating a lookup proof), the commitment needs to be done on the
// table sorted. Otherwise the commitment in proof.t will not be the same as
// the public commitment: it will contain the same values, but permuted.
@@ -673,7 +673,7 @@ func VerifyLookupVector(vk kzg.VerifyingKey, proof ProofLookupVector) error {
lhs.Sub(&lhs, &rhs)
- // check consistancy of bounds
+ // check consistency of bounds
var l0, ln, d1, d2 fr.Element
l0.Exp(nu, big.NewInt(int64(proof.size))).Sub(&l0, &one)
ln.Set(&l0)
diff --git a/ecc/bls12-378/fr/polynomial/polynomial_test.go b/ecc/bls12-378/fr/polynomial/polynomial_test.go
index 7cf5ee479..effa4af1b 100644
--- a/ecc/bls12-378/fr/polynomial/polynomial_test.go
+++ b/ecc/bls12-378/fr/polynomial/polynomial_test.go
@@ -171,7 +171,7 @@ func TestPolynomialAdd(t *testing.T) {
t.Fatal("side effect, f2 should not have been modified")
}
- // all operands are distincts
+ // all operands are distinct
_f1 := f1.Clone()
_f1.Add(f1, f2)
if !_f1.Equal(expectedSum) {
diff --git a/ecc/bls12-378/fr/polynomial/pool.go b/ecc/bls12-378/fr/polynomial/pool.go
index 62e0dbded..e7c2ae68b 100644
--- a/ecc/bls12-378/fr/polynomial/pool.go
+++ b/ecc/bls12-378/fr/polynomial/pool.go
@@ -49,7 +49,7 @@ type Pool struct {
}
func (p *sizedPool) get(n int) *fr.Element {
- p.stats.maake(n)
+ p.stats.make(n)
return p.pool.Get().(*fr.Element)
}
@@ -153,7 +153,7 @@ type poolsStats struct {
InUse int
}
-func (s *poolStats) maake(n int) {
+func (s *poolStats) make(n int) {
s.Used++
s.InUse++
if n > s.GreatestNUsed {
diff --git a/ecc/bls12-378/g1.go b/ecc/bls12-378/g1.go
index 1c246ca4b..9c47102f0 100644
--- a/ecc/bls12-378/g1.go
+++ b/ecc/bls12-378/g1.go
@@ -1027,7 +1027,7 @@ func BatchScalarMultiplicationG1(base *G1Affine, scalars []fr.Element) []G1Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddMixed(&baseTableAff[(digit>>1)-1])
diff --git a/ecc/bls12-378/g2.go b/ecc/bls12-378/g2.go
index 61b0f209e..53f44e24e 100644
--- a/ecc/bls12-378/g2.go
+++ b/ecc/bls12-378/g2.go
@@ -944,7 +944,7 @@ func BatchScalarMultiplicationG2(base *G2Affine, scalars []fr.Element) []G2Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddAssign(&baseTable[(digit>>1)-1])
diff --git a/ecc/bls12-378/internal/fptower/e12.go b/ecc/bls12-378/internal/fptower/e12.go
index 431228a08..91a5d375d 100644
--- a/ecc/bls12-378/internal/fptower/e12.go
+++ b/ecc/bls12-378/internal/fptower/e12.go
@@ -36,7 +36,7 @@ type E12 struct {
C0, C1 E6
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E12) Equal(x *E12) bool {
return z.C0.Equal(&x.C0) && z.C1.Equal(&x.C1)
}
@@ -99,7 +99,7 @@ func (z *E12) SetRandom() (*E12, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E12) IsZero() bool {
return z.C0.IsZero() && z.C1.IsZero()
}
@@ -650,7 +650,7 @@ func (z *E12) Marshal() []byte {
return b[:]
}
-// Unmarshal is an allias to SetBytes()
+// Unmarshal is an alias to SetBytes()
func (z *E12) Unmarshal(buf []byte) error {
return z.SetBytes(buf)
}
@@ -723,7 +723,7 @@ func (z *E12) SetBytes(e []byte) error {
return nil
}
-// IsInSubGroup ensures GT/E12 is in correct sugroup
+// IsInSubGroup ensures GT/E12 is in correct subgroup
func (z *E12) IsInSubGroup() bool {
var a, b E12
diff --git a/ecc/bls12-378/internal/fptower/e2.go b/ecc/bls12-378/internal/fptower/e2.go
index 0279a9d66..e94708585 100644
--- a/ecc/bls12-378/internal/fptower/e2.go
+++ b/ecc/bls12-378/internal/fptower/e2.go
@@ -203,7 +203,7 @@ func (z *E2) Exp(x E2, k *big.Int) *E2 {
}
// Sqrt sets z to the square root of and returns z
-// The function does not test wether the square root
+// The function does not test whether the square root
// exists or not, it's up to the caller to call
// Legendre beforehand.
// cf https://eprint.iacr.org/2012/685.pdf (algo 10)
diff --git a/ecc/bls12-378/internal/fptower/e6.go b/ecc/bls12-378/internal/fptower/e6.go
index d4f80de95..90aba83b2 100644
--- a/ecc/bls12-378/internal/fptower/e6.go
+++ b/ecc/bls12-378/internal/fptower/e6.go
@@ -21,7 +21,7 @@ type E6 struct {
B0, B1, B2 E2
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E6) Equal(x *E6) bool {
return z.B0.Equal(&x.B0) && z.B1.Equal(&x.B1) && z.B2.Equal(&x.B2)
}
diff --git a/ecc/bls12-378/multiexp.go b/ecc/bls12-378/multiexp.go
index 48e136e41..30594aeb2 100644
--- a/ecc/bls12-378/multiexp.go
+++ b/ecc/bls12-378/multiexp.go
@@ -45,7 +45,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -55,7 +55,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -65,7 +65,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -107,7 +107,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -304,7 +304,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -314,7 +314,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -324,7 +324,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -366,7 +366,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -556,13 +556,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits + c - 1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -581,7 +581,7 @@ type chunkStat struct {
}
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -638,7 +638,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []
digit += int(scalar[s.index+1]&s.maskHigh) << s.shiftHigh
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
diff --git a/ecc/bls12-378/multiexp_affine.go b/ecc/bls12-378/multiexp_affine.go
index 28301102c..fe7f2d628 100644
--- a/ecc/bls12-378/multiexp_affine.go
+++ b/ecc/bls12-378/multiexp_affine.go
@@ -47,7 +47,7 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g1JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
@@ -363,7 +363,7 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g2JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/ecc/bls12-378/multiexp_jacobian.go b/ecc/bls12-378/multiexp_jacobian.go
index 0e9d572e7..7ebc06921 100644
--- a/ecc/bls12-378/multiexp_jacobian.go
+++ b/ecc/bls12-378/multiexp_jacobian.go
@@ -33,7 +33,7 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
@@ -112,7 +112,7 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/ecc/bls12-378/multiexp_test.go b/ecc/bls12-378/multiexp_test.go
index dea9f4bbd..bffa3a5d1 100644
--- a/ecc/bls12-378/multiexp_test.go
+++ b/ecc/bls12-378/multiexp_test.go
@@ -73,7 +73,7 @@ func TestMultiExpG1(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G1] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G1Affine
for i := 0; i < 13; i++ {
@@ -105,7 +105,7 @@ func TestMultiExpG1(t *testing.T) {
cRange = []uint64{5, 14}
}
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G1Jac
@@ -138,7 +138,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G1Affine
@@ -174,7 +174,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -196,7 +196,7 @@ func TestMultiExpG1(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G1] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G1Jac
@@ -489,7 +489,7 @@ func TestMultiExpG2(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G2] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G2Affine
for i := 0; i < 13; i++ {
@@ -519,7 +519,7 @@ func TestMultiExpG2(t *testing.T) {
// test only "odd" and "even" (ie windows size divide word size vs not)
cRange := []uint64{5, 14}
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G2Jac
@@ -552,7 +552,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G2Affine
@@ -588,7 +588,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -610,7 +610,7 @@ func TestMultiExpG2(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G2] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G2Jac
diff --git a/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go b/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go
index f7e095669..14ebba1f1 100644
--- a/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go
@@ -77,7 +77,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -89,7 +89,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -125,7 +125,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -136,7 +136,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -168,7 +168,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -177,7 +177,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/ecc/bls12-378/twistededwards/eddsa/marshal.go b/ecc/bls12-378/twistededwards/eddsa/marshal.go
index 485e9b710..acf3c4173 100644
--- a/ecc/bls12-378/twistededwards/eddsa/marshal.go
+++ b/ecc/bls12-378/twistededwards/eddsa/marshal.go
@@ -96,7 +96,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// - x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -111,7 +111,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// - x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
//
diff --git a/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go b/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
index 85bd27ca0..890b0980b 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
@@ -77,7 +77,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -89,7 +89,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -125,7 +125,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -136,7 +136,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -168,7 +168,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -177,7 +177,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/ecc/bls12-381/bandersnatch/eddsa/marshal.go b/ecc/bls12-381/bandersnatch/eddsa/marshal.go
index 485e9b710..acf3c4173 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/marshal.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/marshal.go
@@ -96,7 +96,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// - x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -111,7 +111,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// - x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
//
diff --git a/ecc/bls12-381/fp/element.go b/ecc/bls12-381/fp/element.go
index 0cc4fe61f..df66624b0 100644
--- a/ecc/bls12-381/fp/element.go
+++ b/ecc/bls12-381/fp/element.go
@@ -356,7 +356,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1<= 0; i-- {
t.Mul(&f[i+1], &a)
diff --git a/ecc/bls12-381/fr/kzg/kzg_test.go b/ecc/bls12-381/fr/kzg/kzg_test.go
index eb72cadb3..9b30bb591 100644
--- a/ecc/bls12-381/fr/kzg/kzg_test.go
+++ b/ecc/bls12-381/fr/kzg/kzg_test.go
@@ -142,7 +142,7 @@ func TestVerifySinglePoint(t *testing.T) {
// verify the claimed valued
expected := eval(f, point)
if !proof.ClaimedValue.Equal(&expected) {
- t.Fatal("inconsistant claimed value")
+ t.Fatal("inconsistent claimed value")
}
// verify correct proof
diff --git a/ecc/bls12-381/fr/plookup/vector.go b/ecc/bls12-381/fr/plookup/vector.go
index 0bcc48769..7d2e6251b 100644
--- a/ecc/bls12-381/fr/plookup/vector.go
+++ b/ecc/bls12-381/fr/plookup/vector.go
@@ -349,7 +349,7 @@ func computeQuotientCanonical(alpha fr.Element, lh, lh0, lhn, lh1h2 []fr.Element
//
// /!\IMPORTANT/!\
//
-// If the table t is already commited somewhere (which is the normal workflow
+// If the table t is already committed somewhere (which is the normal workflow
// before generating a lookup proof), the commitment needs to be done on the
// table sorted. Otherwise the commitment in proof.t will not be the same as
// the public commitment: it will contain the same values, but permuted.
@@ -673,7 +673,7 @@ func VerifyLookupVector(vk kzg.VerifyingKey, proof ProofLookupVector) error {
lhs.Sub(&lhs, &rhs)
- // check consistancy of bounds
+ // check consistency of bounds
var l0, ln, d1, d2 fr.Element
l0.Exp(nu, big.NewInt(int64(proof.size))).Sub(&l0, &one)
ln.Set(&l0)
diff --git a/ecc/bls12-381/fr/polynomial/polynomial_test.go b/ecc/bls12-381/fr/polynomial/polynomial_test.go
index 5df4aebae..27f4a2f04 100644
--- a/ecc/bls12-381/fr/polynomial/polynomial_test.go
+++ b/ecc/bls12-381/fr/polynomial/polynomial_test.go
@@ -171,7 +171,7 @@ func TestPolynomialAdd(t *testing.T) {
t.Fatal("side effect, f2 should not have been modified")
}
- // all operands are distincts
+ // all operands are distinct
_f1 := f1.Clone()
_f1.Add(f1, f2)
if !_f1.Equal(expectedSum) {
diff --git a/ecc/bls12-381/fr/polynomial/pool.go b/ecc/bls12-381/fr/polynomial/pool.go
index c50331e19..d28ad9307 100644
--- a/ecc/bls12-381/fr/polynomial/pool.go
+++ b/ecc/bls12-381/fr/polynomial/pool.go
@@ -49,7 +49,7 @@ type Pool struct {
}
func (p *sizedPool) get(n int) *fr.Element {
- p.stats.maake(n)
+ p.stats.make(n)
return p.pool.Get().(*fr.Element)
}
@@ -153,7 +153,7 @@ type poolsStats struct {
InUse int
}
-func (s *poolStats) maake(n int) {
+func (s *poolStats) make(n int) {
s.Used++
s.InUse++
if n > s.GreatestNUsed {
diff --git a/ecc/bls12-381/g1.go b/ecc/bls12-381/g1.go
index fdedb8aa8..33538de79 100644
--- a/ecc/bls12-381/g1.go
+++ b/ecc/bls12-381/g1.go
@@ -1027,7 +1027,7 @@ func BatchScalarMultiplicationG1(base *G1Affine, scalars []fr.Element) []G1Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddMixed(&baseTableAff[(digit>>1)-1])
diff --git a/ecc/bls12-381/g2.go b/ecc/bls12-381/g2.go
index f54168f46..7cb3b0926 100644
--- a/ecc/bls12-381/g2.go
+++ b/ecc/bls12-381/g2.go
@@ -945,7 +945,7 @@ func BatchScalarMultiplicationG2(base *G2Affine, scalars []fr.Element) []G2Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddAssign(&baseTable[(digit>>1)-1])
diff --git a/ecc/bls12-381/internal/fptower/e12.go b/ecc/bls12-381/internal/fptower/e12.go
index bc6391723..b9f93b6b0 100644
--- a/ecc/bls12-381/internal/fptower/e12.go
+++ b/ecc/bls12-381/internal/fptower/e12.go
@@ -36,7 +36,7 @@ type E12 struct {
C0, C1 E6
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E12) Equal(x *E12) bool {
return z.C0.Equal(&x.C0) && z.C1.Equal(&x.C1)
}
@@ -99,7 +99,7 @@ func (z *E12) SetRandom() (*E12, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E12) IsZero() bool {
return z.C0.IsZero() && z.C1.IsZero()
}
@@ -650,7 +650,7 @@ func (z *E12) Marshal() []byte {
return b[:]
}
-// Unmarshal is an allias to SetBytes()
+// Unmarshal is an alias to SetBytes()
func (z *E12) Unmarshal(buf []byte) error {
return z.SetBytes(buf)
}
@@ -723,7 +723,7 @@ func (z *E12) SetBytes(e []byte) error {
return nil
}
-// IsInSubGroup ensures GT/E12 is in correct sugroup
+// IsInSubGroup ensures GT/E12 is in correct subgroup
func (z *E12) IsInSubGroup() bool {
var a, b E12
diff --git a/ecc/bls12-381/internal/fptower/e2.go b/ecc/bls12-381/internal/fptower/e2.go
index 45338f189..6c873ce36 100644
--- a/ecc/bls12-381/internal/fptower/e2.go
+++ b/ecc/bls12-381/internal/fptower/e2.go
@@ -214,7 +214,7 @@ func init() {
var sqrtExp1, sqrtExp2 big.Int
// Sqrt sets z to the square root of and returns z
-// The function does not test wether the square root
+// The function does not test whether the square root
// exists or not, it's up to the caller to call
// Legendre beforehand.
// cf https://eprint.iacr.org/2012/685.pdf (algo 9)
diff --git a/ecc/bls12-381/internal/fptower/e6.go b/ecc/bls12-381/internal/fptower/e6.go
index d4f80de95..90aba83b2 100644
--- a/ecc/bls12-381/internal/fptower/e6.go
+++ b/ecc/bls12-381/internal/fptower/e6.go
@@ -21,7 +21,7 @@ type E6 struct {
B0, B1, B2 E2
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E6) Equal(x *E6) bool {
return z.B0.Equal(&x.B0) && z.B1.Equal(&x.B1) && z.B2.Equal(&x.B2)
}
diff --git a/ecc/bls12-381/multiexp.go b/ecc/bls12-381/multiexp.go
index 68e8b38ea..8462d8abe 100644
--- a/ecc/bls12-381/multiexp.go
+++ b/ecc/bls12-381/multiexp.go
@@ -45,7 +45,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -55,7 +55,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -65,7 +65,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -107,7 +107,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -302,7 +302,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -312,7 +312,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -322,7 +322,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -364,7 +364,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -552,13 +552,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits + c - 1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -577,7 +577,7 @@ type chunkStat struct {
}
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -634,7 +634,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []
digit += int(scalar[s.index+1]&s.maskHigh) << s.shiftHigh
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
diff --git a/ecc/bls12-381/multiexp_affine.go b/ecc/bls12-381/multiexp_affine.go
index f2fcc0573..799457d18 100644
--- a/ecc/bls12-381/multiexp_affine.go
+++ b/ecc/bls12-381/multiexp_affine.go
@@ -47,7 +47,7 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g1JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
@@ -363,7 +363,7 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g2JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/ecc/bls12-381/multiexp_jacobian.go b/ecc/bls12-381/multiexp_jacobian.go
index 2a2f8caa8..169f32034 100644
--- a/ecc/bls12-381/multiexp_jacobian.go
+++ b/ecc/bls12-381/multiexp_jacobian.go
@@ -33,7 +33,7 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
@@ -110,7 +110,7 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/ecc/bls12-381/multiexp_test.go b/ecc/bls12-381/multiexp_test.go
index 37893d7b1..64b5a0348 100644
--- a/ecc/bls12-381/multiexp_test.go
+++ b/ecc/bls12-381/multiexp_test.go
@@ -73,7 +73,7 @@ func TestMultiExpG1(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G1] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G1Affine
for i := 0; i < 13; i++ {
@@ -105,7 +105,7 @@ func TestMultiExpG1(t *testing.T) {
cRange = []uint64{5, 14}
}
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G1Jac
@@ -138,7 +138,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G1Affine
@@ -174,7 +174,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -196,7 +196,7 @@ func TestMultiExpG1(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G1] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G1Jac
@@ -489,7 +489,7 @@ func TestMultiExpG2(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G2] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G2Affine
for i := 0; i < 13; i++ {
@@ -519,7 +519,7 @@ func TestMultiExpG2(t *testing.T) {
// test only "odd" and "even" (ie windows size divide word size vs not)
cRange := []uint64{5, 14}
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G2Jac
@@ -552,7 +552,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G2Affine
@@ -588,7 +588,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -610,7 +610,7 @@ func TestMultiExpG2(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G2] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G2Jac
diff --git a/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go b/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go
index 85bd27ca0..890b0980b 100644
--- a/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go
@@ -77,7 +77,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -89,7 +89,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -125,7 +125,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -136,7 +136,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -168,7 +168,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -177,7 +177,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/ecc/bls12-381/twistededwards/eddsa/marshal.go b/ecc/bls12-381/twistededwards/eddsa/marshal.go
index 485e9b710..acf3c4173 100644
--- a/ecc/bls12-381/twistededwards/eddsa/marshal.go
+++ b/ecc/bls12-381/twistededwards/eddsa/marshal.go
@@ -96,7 +96,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// - x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -111,7 +111,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// - x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
//
diff --git a/ecc/bls24-315/fp/element.go b/ecc/bls24-315/fp/element.go
index 234f87bb4..4bb276b66 100644
--- a/ecc/bls24-315/fp/element.go
+++ b/ecc/bls24-315/fp/element.go
@@ -345,7 +345,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1<= 0; i-- {
t.Mul(&f[i+1], &a)
diff --git a/ecc/bls24-315/fr/kzg/kzg_test.go b/ecc/bls24-315/fr/kzg/kzg_test.go
index 31183a618..8177038c5 100644
--- a/ecc/bls24-315/fr/kzg/kzg_test.go
+++ b/ecc/bls24-315/fr/kzg/kzg_test.go
@@ -142,7 +142,7 @@ func TestVerifySinglePoint(t *testing.T) {
// verify the claimed valued
expected := eval(f, point)
if !proof.ClaimedValue.Equal(&expected) {
- t.Fatal("inconsistant claimed value")
+ t.Fatal("inconsistent claimed value")
}
// verify correct proof
diff --git a/ecc/bls24-315/fr/plookup/vector.go b/ecc/bls24-315/fr/plookup/vector.go
index b88c6d5a6..7fda13b9c 100644
--- a/ecc/bls24-315/fr/plookup/vector.go
+++ b/ecc/bls24-315/fr/plookup/vector.go
@@ -349,7 +349,7 @@ func computeQuotientCanonical(alpha fr.Element, lh, lh0, lhn, lh1h2 []fr.Element
//
// /!\IMPORTANT/!\
//
-// If the table t is already commited somewhere (which is the normal workflow
+// If the table t is already committed somewhere (which is the normal workflow
// before generating a lookup proof), the commitment needs to be done on the
// table sorted. Otherwise the commitment in proof.t will not be the same as
// the public commitment: it will contain the same values, but permuted.
@@ -673,7 +673,7 @@ func VerifyLookupVector(vk kzg.VerifyingKey, proof ProofLookupVector) error {
lhs.Sub(&lhs, &rhs)
- // check consistancy of bounds
+ // check consistency of bounds
var l0, ln, d1, d2 fr.Element
l0.Exp(nu, big.NewInt(int64(proof.size))).Sub(&l0, &one)
ln.Set(&l0)
diff --git a/ecc/bls24-315/fr/polynomial/polynomial_test.go b/ecc/bls24-315/fr/polynomial/polynomial_test.go
index ad1f480f0..b71f20093 100644
--- a/ecc/bls24-315/fr/polynomial/polynomial_test.go
+++ b/ecc/bls24-315/fr/polynomial/polynomial_test.go
@@ -171,7 +171,7 @@ func TestPolynomialAdd(t *testing.T) {
t.Fatal("side effect, f2 should not have been modified")
}
- // all operands are distincts
+ // all operands are distinct
_f1 := f1.Clone()
_f1.Add(f1, f2)
if !_f1.Equal(expectedSum) {
diff --git a/ecc/bls24-315/fr/polynomial/pool.go b/ecc/bls24-315/fr/polynomial/pool.go
index a0ddf7c15..c22ebc83b 100644
--- a/ecc/bls24-315/fr/polynomial/pool.go
+++ b/ecc/bls24-315/fr/polynomial/pool.go
@@ -49,7 +49,7 @@ type Pool struct {
}
func (p *sizedPool) get(n int) *fr.Element {
- p.stats.maake(n)
+ p.stats.make(n)
return p.pool.Get().(*fr.Element)
}
@@ -153,7 +153,7 @@ type poolsStats struct {
InUse int
}
-func (s *poolStats) maake(n int) {
+func (s *poolStats) make(n int) {
s.Used++
s.InUse++
if n > s.GreatestNUsed {
diff --git a/ecc/bls24-315/g1.go b/ecc/bls24-315/g1.go
index 59e1e91ed..83426d4e9 100644
--- a/ecc/bls24-315/g1.go
+++ b/ecc/bls24-315/g1.go
@@ -1029,7 +1029,7 @@ func BatchScalarMultiplicationG1(base *G1Affine, scalars []fr.Element) []G1Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddMixed(&baseTableAff[(digit>>1)-1])
diff --git a/ecc/bls24-315/g2.go b/ecc/bls24-315/g2.go
index 89d1555ab..d73145d73 100644
--- a/ecc/bls24-315/g2.go
+++ b/ecc/bls24-315/g2.go
@@ -960,7 +960,7 @@ func BatchScalarMultiplicationG2(base *G2Affine, scalars []fr.Element) []G2Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddAssign(&baseTable[(digit>>1)-1])
diff --git a/ecc/bls24-315/internal/fptower/e12.go b/ecc/bls24-315/internal/fptower/e12.go
index 0bc4d0b28..f2c392201 100644
--- a/ecc/bls24-315/internal/fptower/e12.go
+++ b/ecc/bls24-315/internal/fptower/e12.go
@@ -23,7 +23,7 @@ type E12 struct {
C0, C1, C2 E4
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E12) Equal(x *E12) bool {
return z.C0.Equal(&x.C0) && z.C1.Equal(&x.C1) && z.C2.Equal(&x.C2)
}
@@ -70,7 +70,7 @@ func (z *E12) SetRandom() (*E12, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E12) IsZero() bool {
return z.C0.IsZero() && z.C1.IsZero() && z.C2.IsZero()
}
diff --git a/ecc/bls24-315/internal/fptower/e2.go b/ecc/bls24-315/internal/fptower/e2.go
index 73cf36264..a23c0ebb9 100644
--- a/ecc/bls24-315/internal/fptower/e2.go
+++ b/ecc/bls24-315/internal/fptower/e2.go
@@ -187,7 +187,7 @@ func (z *E2) Exp(x E2, k *big.Int) *E2 {
}
// Sqrt sets z to the square root of and returns z
-// The function does not test wether the square root
+// The function does not test whether the square root
// exists or not, it's up to the caller to call
// Legendre beforehand.
// cf https://eprint.iacr.org/2012/685.pdf (algo 10)
diff --git a/ecc/bls24-315/internal/fptower/e24.go b/ecc/bls24-315/internal/fptower/e24.go
index 053e329da..5a7af0fdf 100644
--- a/ecc/bls24-315/internal/fptower/e24.go
+++ b/ecc/bls24-315/internal/fptower/e24.go
@@ -34,7 +34,7 @@ type E24 struct {
D0, D1 E12
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E24) Equal(x *E24) bool {
return z.D0.Equal(&x.D0) && z.D1.Equal(&x.D1)
}
@@ -97,7 +97,7 @@ func (z *E24) SetRandom() (*E24, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E24) IsZero() bool {
return z.D0.IsZero() && z.D1.IsZero()
}
@@ -640,7 +640,7 @@ func (z *E24) Marshal() []byte {
return b[:]
}
-// Unmarshal is an allias to SetBytes()
+// Unmarshal is an alias to SetBytes()
func (z *E24) Unmarshal(buf []byte) error {
return z.SetBytes(buf)
}
@@ -806,7 +806,7 @@ func (z *E24) SetBytes(e []byte) error {
return nil
}
-// IsInSubGroup ensures GT/E24 is in correct sugroup
+// IsInSubGroup ensures GT/E24 is in correct subgroup
func (z *E24) IsInSubGroup() bool {
var a, b E24
diff --git a/ecc/bls24-315/internal/fptower/e4.go b/ecc/bls24-315/internal/fptower/e4.go
index a77125da6..204cf5bd3 100644
--- a/ecc/bls24-315/internal/fptower/e4.go
+++ b/ecc/bls24-315/internal/fptower/e4.go
@@ -25,7 +25,7 @@ type E4 struct {
B0, B1 E2
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E4) Equal(x *E4) bool {
return z.B0.Equal(&x.B0) && z.B1.Equal(&x.B1)
}
@@ -133,7 +133,7 @@ func (z *E4) SetRandom() (*E4, error) {
return z, nil
}
-// IsZero returns true if the element is zero, fasle otherwise
+// IsZero returns true if the element is zero, false otherwise
func (z *E4) IsZero() bool {
return z.B0.IsZero() && z.B1.IsZero()
}
@@ -270,7 +270,7 @@ func (z *E4) Legendre() int {
}
// Sqrt sets z to the square root of and returns z
-// The function does not test wether the square root
+// The function does not test whether the square root
// exists or not, it's up to the caller to call
// Legendre beforehand.
// cf https://eprint.iacr.org/2012/685.pdf (algo 10)
diff --git a/ecc/bls24-315/multiexp.go b/ecc/bls24-315/multiexp.go
index 52abe34e0..a705a1e10 100644
--- a/ecc/bls24-315/multiexp.go
+++ b/ecc/bls24-315/multiexp.go
@@ -45,7 +45,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -55,7 +55,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -65,7 +65,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -107,7 +107,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -302,7 +302,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -312,7 +312,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -322,7 +322,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -364,7 +364,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -552,13 +552,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits + c - 1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -577,7 +577,7 @@ type chunkStat struct {
}
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -634,7 +634,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []
digit += int(scalar[s.index+1]&s.maskHigh) << s.shiftHigh
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
diff --git a/ecc/bls24-315/multiexp_affine.go b/ecc/bls24-315/multiexp_affine.go
index 40a45408f..7bfb33351 100644
--- a/ecc/bls24-315/multiexp_affine.go
+++ b/ecc/bls24-315/multiexp_affine.go
@@ -47,7 +47,7 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g1JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
@@ -363,7 +363,7 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g2JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/ecc/bls24-315/multiexp_jacobian.go b/ecc/bls24-315/multiexp_jacobian.go
index be0bb121b..e7636a28d 100644
--- a/ecc/bls24-315/multiexp_jacobian.go
+++ b/ecc/bls24-315/multiexp_jacobian.go
@@ -33,7 +33,7 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
@@ -110,7 +110,7 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/ecc/bls24-315/multiexp_test.go b/ecc/bls24-315/multiexp_test.go
index e8e61b049..b4f5e17db 100644
--- a/ecc/bls24-315/multiexp_test.go
+++ b/ecc/bls24-315/multiexp_test.go
@@ -73,7 +73,7 @@ func TestMultiExpG1(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G1] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G1Affine
for i := 0; i < 13; i++ {
@@ -105,7 +105,7 @@ func TestMultiExpG1(t *testing.T) {
cRange = []uint64{5, 14}
}
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G1Jac
@@ -138,7 +138,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G1Affine
@@ -174,7 +174,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -196,7 +196,7 @@ func TestMultiExpG1(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G1] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G1Jac
@@ -489,7 +489,7 @@ func TestMultiExpG2(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G2] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G2Affine
for i := 0; i < 13; i++ {
@@ -519,7 +519,7 @@ func TestMultiExpG2(t *testing.T) {
// test only "odd" and "even" (ie windows size divide word size vs not)
cRange := []uint64{5, 14}
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G2Jac
@@ -552,7 +552,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G2Affine
@@ -588,7 +588,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -610,7 +610,7 @@ func TestMultiExpG2(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G2] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G2Jac
diff --git a/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go b/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go
index 669bce5e6..2ca085f9c 100644
--- a/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go
@@ -77,7 +77,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -89,7 +89,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -125,7 +125,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -136,7 +136,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -168,7 +168,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -177,7 +177,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/ecc/bls24-315/twistededwards/eddsa/marshal.go b/ecc/bls24-315/twistededwards/eddsa/marshal.go
index 485e9b710..acf3c4173 100644
--- a/ecc/bls24-315/twistededwards/eddsa/marshal.go
+++ b/ecc/bls24-315/twistededwards/eddsa/marshal.go
@@ -96,7 +96,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// - x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -111,7 +111,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// - x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
//
diff --git a/ecc/bls24-317/fp/element.go b/ecc/bls24-317/fp/element.go
index 89cafe1a2..9e2d025db 100644
--- a/ecc/bls24-317/fp/element.go
+++ b/ecc/bls24-317/fp/element.go
@@ -345,7 +345,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1<= 0; i-- {
t.Mul(&f[i+1], &a)
diff --git a/ecc/bls24-317/fr/kzg/kzg_test.go b/ecc/bls24-317/fr/kzg/kzg_test.go
index 079aa49ee..c01df9153 100644
--- a/ecc/bls24-317/fr/kzg/kzg_test.go
+++ b/ecc/bls24-317/fr/kzg/kzg_test.go
@@ -142,7 +142,7 @@ func TestVerifySinglePoint(t *testing.T) {
// verify the claimed valued
expected := eval(f, point)
if !proof.ClaimedValue.Equal(&expected) {
- t.Fatal("inconsistant claimed value")
+ t.Fatal("inconsistent claimed value")
}
// verify correct proof
diff --git a/ecc/bls24-317/fr/plookup/vector.go b/ecc/bls24-317/fr/plookup/vector.go
index b3ef82389..169ee7ccd 100644
--- a/ecc/bls24-317/fr/plookup/vector.go
+++ b/ecc/bls24-317/fr/plookup/vector.go
@@ -349,7 +349,7 @@ func computeQuotientCanonical(alpha fr.Element, lh, lh0, lhn, lh1h2 []fr.Element
//
// /!\IMPORTANT/!\
//
-// If the table t is already commited somewhere (which is the normal workflow
+// If the table t is already committed somewhere (which is the normal workflow
// before generating a lookup proof), the commitment needs to be done on the
// table sorted. Otherwise the commitment in proof.t will not be the same as
// the public commitment: it will contain the same values, but permuted.
@@ -673,7 +673,7 @@ func VerifyLookupVector(vk kzg.VerifyingKey, proof ProofLookupVector) error {
lhs.Sub(&lhs, &rhs)
- // check consistancy of bounds
+ // check consistency of bounds
var l0, ln, d1, d2 fr.Element
l0.Exp(nu, big.NewInt(int64(proof.size))).Sub(&l0, &one)
ln.Set(&l0)
diff --git a/ecc/bls24-317/fr/polynomial/polynomial_test.go b/ecc/bls24-317/fr/polynomial/polynomial_test.go
index 25d87b841..024f71a3f 100644
--- a/ecc/bls24-317/fr/polynomial/polynomial_test.go
+++ b/ecc/bls24-317/fr/polynomial/polynomial_test.go
@@ -171,7 +171,7 @@ func TestPolynomialAdd(t *testing.T) {
t.Fatal("side effect, f2 should not have been modified")
}
- // all operands are distincts
+ // all operands are distinct
_f1 := f1.Clone()
_f1.Add(f1, f2)
if !_f1.Equal(expectedSum) {
diff --git a/ecc/bls24-317/fr/polynomial/pool.go b/ecc/bls24-317/fr/polynomial/pool.go
index 2ab5c7979..8dc834b2e 100644
--- a/ecc/bls24-317/fr/polynomial/pool.go
+++ b/ecc/bls24-317/fr/polynomial/pool.go
@@ -49,7 +49,7 @@ type Pool struct {
}
func (p *sizedPool) get(n int) *fr.Element {
- p.stats.maake(n)
+ p.stats.make(n)
return p.pool.Get().(*fr.Element)
}
@@ -153,7 +153,7 @@ type poolsStats struct {
InUse int
}
-func (s *poolStats) maake(n int) {
+func (s *poolStats) make(n int) {
s.Used++
s.InUse++
if n > s.GreatestNUsed {
diff --git a/ecc/bls24-317/g1.go b/ecc/bls24-317/g1.go
index 9827f258f..36bb6c6ad 100644
--- a/ecc/bls24-317/g1.go
+++ b/ecc/bls24-317/g1.go
@@ -1029,7 +1029,7 @@ func BatchScalarMultiplicationG1(base *G1Affine, scalars []fr.Element) []G1Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddMixed(&baseTableAff[(digit>>1)-1])
diff --git a/ecc/bls24-317/g2.go b/ecc/bls24-317/g2.go
index 52d088f19..ef831f154 100644
--- a/ecc/bls24-317/g2.go
+++ b/ecc/bls24-317/g2.go
@@ -960,7 +960,7 @@ func BatchScalarMultiplicationG2(base *G2Affine, scalars []fr.Element) []G2Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddAssign(&baseTable[(digit>>1)-1])
diff --git a/ecc/bls24-317/internal/fptower/e12.go b/ecc/bls24-317/internal/fptower/e12.go
index 9f41f03a3..5d33f44aa 100644
--- a/ecc/bls24-317/internal/fptower/e12.go
+++ b/ecc/bls24-317/internal/fptower/e12.go
@@ -23,7 +23,7 @@ type E12 struct {
C0, C1, C2 E4
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E12) Equal(x *E12) bool {
return z.C0.Equal(&x.C0) && z.C1.Equal(&x.C1) && z.C2.Equal(&x.C2)
}
@@ -70,7 +70,7 @@ func (z *E12) SetRandom() (*E12, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E12) IsZero() bool {
return z.C0.IsZero() && z.C1.IsZero() && z.C2.IsZero()
}
diff --git a/ecc/bls24-317/internal/fptower/e2.go b/ecc/bls24-317/internal/fptower/e2.go
index c8091c6f9..e88426e59 100644
--- a/ecc/bls24-317/internal/fptower/e2.go
+++ b/ecc/bls24-317/internal/fptower/e2.go
@@ -198,7 +198,7 @@ func init() {
var sqrtExp1, sqrtExp2 big.Int
// Sqrt sets z to the square root of and returns z
-// The function does not test wether the square root
+// The function does not test whether the square root
// exists or not, it's up to the caller to call
// Legendre beforehand.
// cf https://eprint.iacr.org/2012/685.pdf (algo 9)
diff --git a/ecc/bls24-317/internal/fptower/e24.go b/ecc/bls24-317/internal/fptower/e24.go
index dc9dc25b6..85af0a8cd 100644
--- a/ecc/bls24-317/internal/fptower/e24.go
+++ b/ecc/bls24-317/internal/fptower/e24.go
@@ -34,7 +34,7 @@ type E24 struct {
D0, D1 E12
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E24) Equal(x *E24) bool {
return z.D0.Equal(&x.D0) && z.D1.Equal(&x.D1)
}
@@ -97,7 +97,7 @@ func (z *E24) SetRandom() (*E24, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E24) IsZero() bool {
return z.D0.IsZero() && z.D1.IsZero()
}
@@ -562,7 +562,7 @@ func (z *E24) Marshal() []byte {
return b[:]
}
-// Unmarshal is an allias to SetBytes()
+// Unmarshal is an alias to SetBytes()
func (z *E24) Unmarshal(buf []byte) error {
return z.SetBytes(buf)
}
@@ -728,7 +728,7 @@ func (z *E24) SetBytes(e []byte) error {
return nil
}
-// IsInSubGroup ensures GT/E24 is in correct sugroup
+// IsInSubGroup ensures GT/E24 is in correct subgroup
func (z *E24) IsInSubGroup() bool {
var a, b E24
diff --git a/ecc/bls24-317/internal/fptower/e4.go b/ecc/bls24-317/internal/fptower/e4.go
index 71e514882..3569253c7 100644
--- a/ecc/bls24-317/internal/fptower/e4.go
+++ b/ecc/bls24-317/internal/fptower/e4.go
@@ -25,7 +25,7 @@ type E4 struct {
B0, B1 E2
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E4) Equal(x *E4) bool {
return z.B0.Equal(&x.B0) && z.B1.Equal(&x.B1)
}
@@ -133,7 +133,7 @@ func (z *E4) SetRandom() (*E4, error) {
return z, nil
}
-// IsZero returns true if the element is zero, fasle otherwise
+// IsZero returns true if the element is zero, false otherwise
func (z *E4) IsZero() bool {
return z.B0.IsZero() && z.B1.IsZero()
}
@@ -271,7 +271,7 @@ func (z *E4) Legendre() int {
}
// Sqrt sets z to the square root of and returns z
-// The function does not test wether the square root
+// The function does not test whether the square root
// exists or not, it's up to the caller to call
// Legendre beforehand.
// cf https://eprint.iacr.org/2012/685.pdf (algo 10)
diff --git a/ecc/bls24-317/multiexp.go b/ecc/bls24-317/multiexp.go
index 037aa6538..db30c174d 100644
--- a/ecc/bls24-317/multiexp.go
+++ b/ecc/bls24-317/multiexp.go
@@ -45,7 +45,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -55,7 +55,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -65,7 +65,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -107,7 +107,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -302,7 +302,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -312,7 +312,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -322,7 +322,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -364,7 +364,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -552,13 +552,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits + c - 1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -577,7 +577,7 @@ type chunkStat struct {
}
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -634,7 +634,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []
digit += int(scalar[s.index+1]&s.maskHigh) << s.shiftHigh
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
diff --git a/ecc/bls24-317/multiexp_affine.go b/ecc/bls24-317/multiexp_affine.go
index 803835d81..afe3e43ab 100644
--- a/ecc/bls24-317/multiexp_affine.go
+++ b/ecc/bls24-317/multiexp_affine.go
@@ -47,7 +47,7 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g1JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
@@ -363,7 +363,7 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g2JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/ecc/bls24-317/multiexp_jacobian.go b/ecc/bls24-317/multiexp_jacobian.go
index 15fbf46f0..eb284f3bc 100644
--- a/ecc/bls24-317/multiexp_jacobian.go
+++ b/ecc/bls24-317/multiexp_jacobian.go
@@ -33,7 +33,7 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
@@ -110,7 +110,7 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/ecc/bls24-317/multiexp_test.go b/ecc/bls24-317/multiexp_test.go
index ec6b08265..44196e0c0 100644
--- a/ecc/bls24-317/multiexp_test.go
+++ b/ecc/bls24-317/multiexp_test.go
@@ -73,7 +73,7 @@ func TestMultiExpG1(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G1] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G1Affine
for i := 0; i < 13; i++ {
@@ -105,7 +105,7 @@ func TestMultiExpG1(t *testing.T) {
cRange = []uint64{5, 14}
}
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G1Jac
@@ -138,7 +138,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G1Affine
@@ -174,7 +174,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -196,7 +196,7 @@ func TestMultiExpG1(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G1] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G1Jac
@@ -489,7 +489,7 @@ func TestMultiExpG2(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G2] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G2Affine
for i := 0; i < 13; i++ {
@@ -519,7 +519,7 @@ func TestMultiExpG2(t *testing.T) {
// test only "odd" and "even" (ie windows size divide word size vs not)
cRange := []uint64{5, 14}
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G2Jac
@@ -552,7 +552,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G2Affine
@@ -588,7 +588,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -610,7 +610,7 @@ func TestMultiExpG2(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G2] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G2Jac
diff --git a/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go b/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go
index 34464874c..b480a83fe 100644
--- a/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go
@@ -77,7 +77,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -89,7 +89,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -125,7 +125,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -136,7 +136,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -168,7 +168,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -177,7 +177,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/ecc/bls24-317/twistededwards/eddsa/marshal.go b/ecc/bls24-317/twistededwards/eddsa/marshal.go
index 485e9b710..acf3c4173 100644
--- a/ecc/bls24-317/twistededwards/eddsa/marshal.go
+++ b/ecc/bls24-317/twistededwards/eddsa/marshal.go
@@ -96,7 +96,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// - x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -111,7 +111,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// - x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
//
diff --git a/ecc/bn254/fp/element.go b/ecc/bn254/fp/element.go
index 5671c9900..e601c0ffa 100644
--- a/ecc/bn254/fp/element.go
+++ b/ecc/bn254/fp/element.go
@@ -334,7 +334,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1<= 0; i-- {
t.Mul(&f[i+1], &a)
diff --git a/ecc/bn254/fr/kzg/kzg_test.go b/ecc/bn254/fr/kzg/kzg_test.go
index e571341ae..0cdd9c24b 100644
--- a/ecc/bn254/fr/kzg/kzg_test.go
+++ b/ecc/bn254/fr/kzg/kzg_test.go
@@ -142,7 +142,7 @@ func TestVerifySinglePoint(t *testing.T) {
// verify the claimed valued
expected := eval(f, point)
if !proof.ClaimedValue.Equal(&expected) {
- t.Fatal("inconsistant claimed value")
+ t.Fatal("inconsistent claimed value")
}
// verify correct proof
diff --git a/ecc/bn254/fr/plookup/vector.go b/ecc/bn254/fr/plookup/vector.go
index 30179a31d..8094072c7 100644
--- a/ecc/bn254/fr/plookup/vector.go
+++ b/ecc/bn254/fr/plookup/vector.go
@@ -349,7 +349,7 @@ func computeQuotientCanonical(alpha fr.Element, lh, lh0, lhn, lh1h2 []fr.Element
//
// /!\IMPORTANT/!\
//
-// If the table t is already commited somewhere (which is the normal workflow
+// If the table t is already committed somewhere (which is the normal workflow
// before generating a lookup proof), the commitment needs to be done on the
// table sorted. Otherwise the commitment in proof.t will not be the same as
// the public commitment: it will contain the same values, but permuted.
@@ -673,7 +673,7 @@ func VerifyLookupVector(vk kzg.VerifyingKey, proof ProofLookupVector) error {
lhs.Sub(&lhs, &rhs)
- // check consistancy of bounds
+ // check consistency of bounds
var l0, ln, d1, d2 fr.Element
l0.Exp(nu, big.NewInt(int64(proof.size))).Sub(&l0, &one)
ln.Set(&l0)
diff --git a/ecc/bn254/fr/polynomial/polynomial_test.go b/ecc/bn254/fr/polynomial/polynomial_test.go
index a97c4df62..173af697c 100644
--- a/ecc/bn254/fr/polynomial/polynomial_test.go
+++ b/ecc/bn254/fr/polynomial/polynomial_test.go
@@ -171,7 +171,7 @@ func TestPolynomialAdd(t *testing.T) {
t.Fatal("side effect, f2 should not have been modified")
}
- // all operands are distincts
+ // all operands are distinct
_f1 := f1.Clone()
_f1.Add(f1, f2)
if !_f1.Equal(expectedSum) {
diff --git a/ecc/bn254/fr/polynomial/pool.go b/ecc/bn254/fr/polynomial/pool.go
index de0b42983..67881d1f6 100644
--- a/ecc/bn254/fr/polynomial/pool.go
+++ b/ecc/bn254/fr/polynomial/pool.go
@@ -49,7 +49,7 @@ type Pool struct {
}
func (p *sizedPool) get(n int) *fr.Element {
- p.stats.maake(n)
+ p.stats.make(n)
return p.pool.Get().(*fr.Element)
}
@@ -153,7 +153,7 @@ type poolsStats struct {
InUse int
}
-func (s *poolStats) maake(n int) {
+func (s *poolStats) make(n int) {
s.Used++
s.InUse++
if n > s.GreatestNUsed {
diff --git a/ecc/bn254/fr/sis/sis.go b/ecc/bn254/fr/sis/sis.go
index 411db7887..494bdef35 100644
--- a/ecc/bn254/fr/sis/sis.go
+++ b/ecc/bn254/fr/sis/sis.go
@@ -45,7 +45,7 @@ type RSis struct {
A [][]fr.Element
Ag [][]fr.Element
- // LogTwoBound (Inifinty norm) of the vector to hash. It means that each component in m
+ // LogTwoBound (Infinity norm) of the vector to hash. It means that each component in m
// is < 2^B, where m is the vector to hash (the hash being A*m).
// cf https://hackmd.io/7OODKWQZRRW9RxM5BaXtIw , B >= 3.
LogTwoBound int
@@ -146,7 +146,7 @@ func NewRSis(seed int64, logTwoDegree, logTwoBound, maxNbElementsToHash int) (*R
r.Domain.FFT(r.Ag[i], fft.DIF, fft.OnCoset())
}
})
- // TODO @gbotrel add nbtasks here; whiile in tests it's more convenient to paralellize
+ // TODO @gbotrel add nbtasks here; while in tests it's more convenient to parallelize
// in tensor-commitment we may not want to do that.
return r, nil
@@ -253,7 +253,7 @@ func genRandom(seed, i, j int64, buf *bytes.Buffer) fr.Element {
}
// mulMod computes p * q in ℤ_{p}[X]/Xᵈ+1.
-// Is assumed that pLagrangeShifted and qLagrangeShifted are of the corret sizes
+// Is assumed that pLagrangeShifted and qLagrangeShifted are of the correct sizes
// and that they are in evaluation form on √(g) *
// The result is not FFTinversed. The fft inverse is done once every
// multiplications are done.
@@ -303,7 +303,7 @@ func (r *RSis) cleanupBuffers() {
// Split an slice of bytes representing an array of serialized field element in
// big-endian form into an array of limbs representing the same field elements
-// in little-endian form. Namely, if our field is reprented with 64 bits and we
+// in little-endian form. Namely, if our field is represented with 64 bits and we
// have the following field element 0x0123456789abcdef (0 being the most significant
// character and and f being the least significant one) and our log norm bound is
// 16 (so 1 hex character = 1 limb). The function assigns the values of m to [f, e,
@@ -316,7 +316,7 @@ func LimbDecomposeBytes(buf []byte, m fr.Vector, logTwoBound int) {
// Split an slice of bytes representing an array of serialized field element in
// big-endian form into an array of limbs representing the same field elements
-// in little-endian form. Namely, if our field is reprented with 64 bits and we
+// in little-endian form. Namely, if our field is represented with 64 bits and we
// have the following field element 0x0123456789abcdef (0 being the most significant
// character and and f being the least significant one) and our log norm bound is
// 16 (so 1 hex character = 1 limb). The function assigns the values of m to [f, e,
diff --git a/ecc/bn254/fr/sis/sis_test.go b/ecc/bn254/fr/sis/sis_test.go
index 6a9432d4e..6925c7c9e 100644
--- a/ecc/bn254/fr/sis/sis_test.go
+++ b/ecc/bn254/fr/sis/sis_test.go
@@ -75,7 +75,7 @@ func TestReference(t *testing.T) {
assert.NoError(err)
// key generation same than in sage
- makeKeyDeterminitic(t, sis, testCase.Params.Seed)
+ makeKeyDeterministic(t, sis, testCase.Params.Seed)
for i, in := range testCases.Inputs {
sis.Reset()
@@ -99,7 +99,7 @@ func TestReference(t *testing.T) {
if len(in) < testCase.Params.MaxNbElementsToHash {
sis2, err := NewRSis(testCase.Params.Seed, testCase.Params.LogTwoDegree, testCase.Params.LogTwoBound, len(in))
assert.NoError(err)
- makeKeyDeterminitic(t, sis2, testCase.Params.Seed)
+ makeKeyDeterministic(t, sis2, testCase.Params.Seed)
got2, err := sis2.Hash(in)
assert.NoError(err)
@@ -226,7 +226,7 @@ func TestLimbDecomposition(t *testing.T) {
}
}
-func makeKeyDeterminitic(t *testing.T, sis *RSis, _seed int64) {
+func makeKeyDeterministic(t *testing.T, sis *RSis, _seed int64) {
t.Helper()
// generate the key deterministically, the same way
// we do in sage to generate the test vectors.
@@ -307,7 +307,7 @@ func BenchmarkSIS(b *testing.B) {
}
}
-func benchmarkSIS(b *testing.B, input []fr.Element, sparse bool, logTwoBound, logTwoDegree int, theoritical float64) {
+func benchmarkSIS(b *testing.B, input []fr.Element, sparse bool, logTwoBound, logTwoDegree int, theoretical float64) {
b.Helper()
n := len(input)
@@ -343,7 +343,7 @@ func benchmarkSIS(b *testing.B, input []fr.Element, sparse bool, logTwoBound, lo
b.ReportMetric(float64(nsPerField), "ns/field")
- b.ReportMetric(theoritical, "ns/field(theory)")
+ b.ReportMetric(theoretical, "ns/field(theory)")
})
}
diff --git a/ecc/bn254/fr/tensor-commitment/commitment.go b/ecc/bn254/fr/tensor-commitment/commitment.go
index 20ce566a9..923cbef2a 100644
--- a/ecc/bn254/fr/tensor-commitment/commitment.go
+++ b/ecc/bn254/fr/tensor-commitment/commitment.go
@@ -104,14 +104,14 @@ type TensorCommitment struct {
// same content as state, but the polynomials are displayed as a matrix
// and the rows are encoded.
// encodedState = encodeRows(M_0 || .. || M_n)
- // where M_i is the i-th polynomial layed out as a matrix, that is
+ // where M_i is the i-th polynomial laid out as a matrix, that is
// M_i_jk = p_i[i*m+j] where m = \sqrt(len(p)).
EncodedState [][]fr.Element
// boolean telling if the commitment has already been done.
// The method BuildProof cannot be called before Commit(),
// because it would allow to build a proof before giving the commitment
- // to a verifier, making the worklow not secure.
+ // to a verifier, making the workflow not secure.
isCommitted bool
// number of columns which have already been hashed (atomic)
@@ -121,7 +121,7 @@ type TensorCommitment struct {
NbAppendsSoFar int
}
-// NewTensorCommitment retunrs a new TensorCommitment
+// NewTensorCommitment returns a new TensorCommitment
// * ρ rate of the code ( > 1)
// * size size of the polynomial to be committed. The size of the commitment is
// then ρ * √(m) where m² = size
@@ -296,7 +296,7 @@ func (tc *TensorCommitment) Commit() (Digest, error) {
}
})
- // records that the ccommitment has been built
+ // records that the commitment has been built
tc.isCommitted = true
return res, nil
diff --git a/ecc/bn254/fr/tensor-commitment/commitment_test.go b/ecc/bn254/fr/tensor-commitment/commitment_test.go
index 19e7be893..a970a2dee 100644
--- a/ecc/bn254/fr/tensor-commitment/commitment_test.go
+++ b/ecc/bn254/fr/tensor-commitment/commitment_test.go
@@ -254,7 +254,7 @@ func TestCommitmentDummyHash(t *testing.T) {
t.Fatal(err)
}
- // verfiy that the proof is correct
+ // verify that the proof is correct
err = Verify(proof, digest, l, h)
if err != nil {
t.Fatal(err)
@@ -316,7 +316,7 @@ func TestOpeningDummyHash(t *testing.T) {
t.Fatal(err)
}
- // finish the evalutation by computing
+ // finish the evaluation by computing
// [linearCombination] * [hi]^t
var eval, tmp fr.Element
for i := 0; i < nbColumns; i++ {
@@ -456,7 +456,7 @@ func TestCommitmentSis(t *testing.T) {
t.Fatal(err)
}
- // verfiy that the proof is correct
+ // verify that the proof is correct
err = Verify(proof, digest, l, hMaker())
if err != nil {
t.Fatal(err)
@@ -475,7 +475,7 @@ func TestCommitmentSis(t *testing.T) {
t.Fatal(err)
}
- // verfiy that the proof is correct
+ // verify that the proof is correct
err = Verify(proof, digest, l, hMaker())
if err != nil {
t.Fatal(err)
diff --git a/ecc/bn254/g1.go b/ecc/bn254/g1.go
index b3d16cc60..af6ce43d9 100644
--- a/ecc/bn254/g1.go
+++ b/ecc/bn254/g1.go
@@ -998,7 +998,7 @@ func BatchScalarMultiplicationG1(base *G1Affine, scalars []fr.Element) []G1Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddMixed(&baseTableAff[(digit>>1)-1])
diff --git a/ecc/bn254/g2.go b/ecc/bn254/g2.go
index da0b89b9c..e87a8aef4 100644
--- a/ecc/bn254/g2.go
+++ b/ecc/bn254/g2.go
@@ -949,7 +949,7 @@ func BatchScalarMultiplicationG2(base *G2Affine, scalars []fr.Element) []G2Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddAssign(&baseTable[(digit>>1)-1])
diff --git a/ecc/bn254/internal/fptower/e12.go b/ecc/bn254/internal/fptower/e12.go
index 35961e009..6830ee105 100644
--- a/ecc/bn254/internal/fptower/e12.go
+++ b/ecc/bn254/internal/fptower/e12.go
@@ -36,7 +36,7 @@ type E12 struct {
C0, C1 E6
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E12) Equal(x *E12) bool {
return z.C0.Equal(&x.C0) && z.C1.Equal(&x.C1)
}
@@ -99,7 +99,7 @@ func (z *E12) SetRandom() (*E12, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E12) IsZero() bool {
return z.C0.IsZero() && z.C1.IsZero()
}
@@ -650,7 +650,7 @@ func (z *E12) Marshal() []byte {
return b[:]
}
-// Unmarshal is an allias to SetBytes()
+// Unmarshal is an alias to SetBytes()
func (z *E12) Unmarshal(buf []byte) error {
return z.SetBytes(buf)
}
@@ -723,7 +723,7 @@ func (z *E12) SetBytes(e []byte) error {
return nil
}
-// IsInSubGroup ensures GT/E12 is in correct sugroup
+// IsInSubGroup ensures GT/E12 is in correct subgroup
func (z *E12) IsInSubGroup() bool {
var a, b, _b E12
diff --git a/ecc/bn254/internal/fptower/e2.go b/ecc/bn254/internal/fptower/e2.go
index 65dda3992..1a954aa38 100644
--- a/ecc/bn254/internal/fptower/e2.go
+++ b/ecc/bn254/internal/fptower/e2.go
@@ -214,7 +214,7 @@ func init() {
var sqrtExp1, sqrtExp2 big.Int
// Sqrt sets z to the square root of and returns z
-// The function does not test wether the square root
+// The function does not test whether the square root
// exists or not, it's up to the caller to call
// Legendre beforehand.
// cf https://eprint.iacr.org/2012/685.pdf (algo 9)
diff --git a/ecc/bn254/internal/fptower/e6.go b/ecc/bn254/internal/fptower/e6.go
index d4f80de95..90aba83b2 100644
--- a/ecc/bn254/internal/fptower/e6.go
+++ b/ecc/bn254/internal/fptower/e6.go
@@ -21,7 +21,7 @@ type E6 struct {
B0, B1, B2 E2
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E6) Equal(x *E6) bool {
return z.B0.Equal(&x.B0) && z.B1.Equal(&x.B1) && z.B2.Equal(&x.B2)
}
diff --git a/ecc/bn254/multiexp.go b/ecc/bn254/multiexp.go
index bb4a7d6e1..bca697954 100644
--- a/ecc/bn254/multiexp.go
+++ b/ecc/bn254/multiexp.go
@@ -45,7 +45,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -55,7 +55,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -65,7 +65,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -107,7 +107,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -304,7 +304,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -314,7 +314,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -324,7 +324,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -366,7 +366,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -556,13 +556,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits + c - 1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -581,7 +581,7 @@ type chunkStat struct {
}
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -638,7 +638,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []
digit += int(scalar[s.index+1]&s.maskHigh) << s.shiftHigh
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
diff --git a/ecc/bn254/multiexp_affine.go b/ecc/bn254/multiexp_affine.go
index c0fd33431..b761c3bf4 100644
--- a/ecc/bn254/multiexp_affine.go
+++ b/ecc/bn254/multiexp_affine.go
@@ -47,7 +47,7 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g1JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
@@ -363,7 +363,7 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g2JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/ecc/bn254/multiexp_jacobian.go b/ecc/bn254/multiexp_jacobian.go
index 0bd2482a9..2a9c92a8d 100644
--- a/ecc/bn254/multiexp_jacobian.go
+++ b/ecc/bn254/multiexp_jacobian.go
@@ -33,7 +33,7 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
@@ -112,7 +112,7 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/ecc/bn254/multiexp_test.go b/ecc/bn254/multiexp_test.go
index 0ea889322..b0aca8e31 100644
--- a/ecc/bn254/multiexp_test.go
+++ b/ecc/bn254/multiexp_test.go
@@ -73,7 +73,7 @@ func TestMultiExpG1(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G1] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G1Affine
for i := 0; i < 13; i++ {
@@ -105,7 +105,7 @@ func TestMultiExpG1(t *testing.T) {
cRange = []uint64{5, 14}
}
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G1Jac
@@ -138,7 +138,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G1Affine
@@ -174,7 +174,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -196,7 +196,7 @@ func TestMultiExpG1(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G1] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G1Jac
@@ -489,7 +489,7 @@ func TestMultiExpG2(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G2] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G2Affine
for i := 0; i < 13; i++ {
@@ -519,7 +519,7 @@ func TestMultiExpG2(t *testing.T) {
// test only "odd" and "even" (ie windows size divide word size vs not)
cRange := []uint64{5, 14}
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G2Jac
@@ -552,7 +552,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G2Affine
@@ -588,7 +588,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -610,7 +610,7 @@ func TestMultiExpG2(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G2] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G2Jac
diff --git a/ecc/bn254/twistededwards/eddsa/eddsa_test.go b/ecc/bn254/twistededwards/eddsa/eddsa_test.go
index 3bf8c9d98..eb23ddd96 100644
--- a/ecc/bn254/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bn254/twistededwards/eddsa/eddsa_test.go
@@ -77,7 +77,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -89,7 +89,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -125,7 +125,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -136,7 +136,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -168,7 +168,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -177,7 +177,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/ecc/bn254/twistededwards/eddsa/marshal.go b/ecc/bn254/twistededwards/eddsa/marshal.go
index 485e9b710..acf3c4173 100644
--- a/ecc/bn254/twistededwards/eddsa/marshal.go
+++ b/ecc/bn254/twistededwards/eddsa/marshal.go
@@ -96,7 +96,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// - x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -111,7 +111,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// - x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
//
diff --git a/ecc/bw6-633/fp/element.go b/ecc/bw6-633/fp/element.go
index ee9f329c9..31cd9222e 100644
--- a/ecc/bw6-633/fp/element.go
+++ b/ecc/bw6-633/fp/element.go
@@ -400,7 +400,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1<= 0; i-- {
t.Mul(&f[i+1], &a)
diff --git a/ecc/bw6-633/fr/kzg/kzg_test.go b/ecc/bw6-633/fr/kzg/kzg_test.go
index 0d0ddedcb..69e843175 100644
--- a/ecc/bw6-633/fr/kzg/kzg_test.go
+++ b/ecc/bw6-633/fr/kzg/kzg_test.go
@@ -142,7 +142,7 @@ func TestVerifySinglePoint(t *testing.T) {
// verify the claimed valued
expected := eval(f, point)
if !proof.ClaimedValue.Equal(&expected) {
- t.Fatal("inconsistant claimed value")
+ t.Fatal("inconsistent claimed value")
}
// verify correct proof
diff --git a/ecc/bw6-633/fr/plookup/vector.go b/ecc/bw6-633/fr/plookup/vector.go
index 06b556191..588f51bfc 100644
--- a/ecc/bw6-633/fr/plookup/vector.go
+++ b/ecc/bw6-633/fr/plookup/vector.go
@@ -349,7 +349,7 @@ func computeQuotientCanonical(alpha fr.Element, lh, lh0, lhn, lh1h2 []fr.Element
//
// /!\IMPORTANT/!\
//
-// If the table t is already commited somewhere (which is the normal workflow
+// If the table t is already committed somewhere (which is the normal workflow
// before generating a lookup proof), the commitment needs to be done on the
// table sorted. Otherwise the commitment in proof.t will not be the same as
// the public commitment: it will contain the same values, but permuted.
@@ -673,7 +673,7 @@ func VerifyLookupVector(vk kzg.VerifyingKey, proof ProofLookupVector) error {
lhs.Sub(&lhs, &rhs)
- // check consistancy of bounds
+ // check consistency of bounds
var l0, ln, d1, d2 fr.Element
l0.Exp(nu, big.NewInt(int64(proof.size))).Sub(&l0, &one)
ln.Set(&l0)
diff --git a/ecc/bw6-633/fr/polynomial/polynomial_test.go b/ecc/bw6-633/fr/polynomial/polynomial_test.go
index e91d99ac0..f2316234d 100644
--- a/ecc/bw6-633/fr/polynomial/polynomial_test.go
+++ b/ecc/bw6-633/fr/polynomial/polynomial_test.go
@@ -171,7 +171,7 @@ func TestPolynomialAdd(t *testing.T) {
t.Fatal("side effect, f2 should not have been modified")
}
- // all operands are distincts
+ // all operands are distinct
_f1 := f1.Clone()
_f1.Add(f1, f2)
if !_f1.Equal(expectedSum) {
diff --git a/ecc/bw6-633/fr/polynomial/pool.go b/ecc/bw6-633/fr/polynomial/pool.go
index d16b377b7..a903db55c 100644
--- a/ecc/bw6-633/fr/polynomial/pool.go
+++ b/ecc/bw6-633/fr/polynomial/pool.go
@@ -49,7 +49,7 @@ type Pool struct {
}
func (p *sizedPool) get(n int) *fr.Element {
- p.stats.maake(n)
+ p.stats.make(n)
return p.pool.Get().(*fr.Element)
}
@@ -153,7 +153,7 @@ type poolsStats struct {
InUse int
}
-func (s *poolStats) maake(n int) {
+func (s *poolStats) make(n int) {
s.Used++
s.InUse++
if n > s.GreatestNUsed {
diff --git a/ecc/bw6-633/g1.go b/ecc/bw6-633/g1.go
index 65c7176f5..2458b7430 100644
--- a/ecc/bw6-633/g1.go
+++ b/ecc/bw6-633/g1.go
@@ -1132,7 +1132,7 @@ func BatchScalarMultiplicationG1(base *G1Affine, scalars []fr.Element) []G1Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddMixed(&baseTableAff[(digit>>1)-1])
diff --git a/ecc/bw6-633/g2.go b/ecc/bw6-633/g2.go
index 66ff5c998..6a44da4a0 100644
--- a/ecc/bw6-633/g2.go
+++ b/ecc/bw6-633/g2.go
@@ -916,7 +916,7 @@ func BatchScalarMultiplicationG2(base *G2Affine, scalars []fr.Element) []G2Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddAssign(&baseTable[(digit>>1)-1])
diff --git a/ecc/bw6-633/internal/fptower/e3.go b/ecc/bw6-633/internal/fptower/e3.go
index c46ce8b57..33c3b5a72 100644
--- a/ecc/bw6-633/internal/fptower/e3.go
+++ b/ecc/bw6-633/internal/fptower/e3.go
@@ -21,7 +21,7 @@ type E3 struct {
A0, A1, A2 fp.Element
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
// TODO can this be deleted? Should be able to use == operator instead
func (z *E3) Equal(x *E3) bool {
return z.A0.Equal(&x.A0) && z.A1.Equal(&x.A1) && z.A2.Equal(&x.A2)
@@ -82,7 +82,7 @@ func (z *E3) SetRandom() (*E3, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E3) IsZero() bool {
return z.A0.IsZero() && z.A1.IsZero() && z.A2.IsZero()
}
diff --git a/ecc/bw6-633/internal/fptower/e6.go b/ecc/bw6-633/internal/fptower/e6.go
index 5a86ac770..c04aedc07 100644
--- a/ecc/bw6-633/internal/fptower/e6.go
+++ b/ecc/bw6-633/internal/fptower/e6.go
@@ -35,7 +35,7 @@ type E6 struct {
B0, B1 E3
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E6) Equal(x *E6) bool {
return z.B0.Equal(&x.B0) && z.B1.Equal(&x.B1)
}
@@ -98,7 +98,7 @@ func (z *E6) SetRandom() (*E6, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E6) IsZero() bool {
return z.B0.IsZero() && z.B1.IsZero()
}
@@ -691,7 +691,7 @@ func (z *E6) SetBytes(e []byte) error {
return nil
}
-// IsInSubGroup ensures GT/E6 is in correct sugroup
+// IsInSubGroup ensures GT/E6 is in correct subgroup
func (z *E6) IsInSubGroup() bool {
var tmp, a, _a, b E6
var t [13]E6
diff --git a/ecc/bw6-633/multiexp.go b/ecc/bw6-633/multiexp.go
index 93e279ac6..e5bdcbb41 100644
--- a/ecc/bw6-633/multiexp.go
+++ b/ecc/bw6-633/multiexp.go
@@ -45,7 +45,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -55,7 +55,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -65,7 +65,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -107,7 +107,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -251,7 +251,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -261,7 +261,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -271,7 +271,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -313,7 +313,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -450,13 +450,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits + c - 1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -475,7 +475,7 @@ type chunkStat struct {
}
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -532,7 +532,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []
digit += int(scalar[s.index+1]&s.maskHigh) << s.shiftHigh
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
diff --git a/ecc/bw6-633/multiexp_affine.go b/ecc/bw6-633/multiexp_affine.go
index ae821f8bb..7272cadee 100644
--- a/ecc/bw6-633/multiexp_affine.go
+++ b/ecc/bw6-633/multiexp_affine.go
@@ -46,7 +46,7 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g1JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
@@ -302,7 +302,7 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g2JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/ecc/bw6-633/multiexp_jacobian.go b/ecc/bw6-633/multiexp_jacobian.go
index 2d992da14..96efd1f61 100644
--- a/ecc/bw6-633/multiexp_jacobian.go
+++ b/ecc/bw6-633/multiexp_jacobian.go
@@ -33,7 +33,7 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
@@ -94,7 +94,7 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/ecc/bw6-633/multiexp_test.go b/ecc/bw6-633/multiexp_test.go
index 4651adb79..e17370e5e 100644
--- a/ecc/bw6-633/multiexp_test.go
+++ b/ecc/bw6-633/multiexp_test.go
@@ -73,7 +73,7 @@ func TestMultiExpG1(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G1] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G1Affine
for i := 0; i < 13; i++ {
@@ -105,7 +105,7 @@ func TestMultiExpG1(t *testing.T) {
cRange = []uint64{5, 14}
}
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G1Jac
@@ -138,7 +138,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G1Affine
@@ -174,7 +174,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -196,7 +196,7 @@ func TestMultiExpG1(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G1] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G1Jac
@@ -489,7 +489,7 @@ func TestMultiExpG2(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G2] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G2Affine
for i := 0; i < 13; i++ {
@@ -519,7 +519,7 @@ func TestMultiExpG2(t *testing.T) {
// test only "odd" and "even" (ie windows size divide word size vs not)
cRange := []uint64{5, 14}
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G2Jac
@@ -552,7 +552,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G2Affine
@@ -588,7 +588,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -610,7 +610,7 @@ func TestMultiExpG2(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G2] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G2Jac
diff --git a/ecc/bw6-633/twistededwards/eddsa/eddsa.go b/ecc/bw6-633/twistededwards/eddsa/eddsa.go
index 64468787f..554aeacee 100644
--- a/ecc/bw6-633/twistededwards/eddsa/eddsa.go
+++ b/ecc/bw6-633/twistededwards/eddsa/eddsa.go
@@ -66,7 +66,7 @@ func GenerateKey(r io.Reader) (*PrivateKey, error) {
var pub PublicKey
var priv PrivateKey
// The source of randomness and the secret scalar must come
- // from 2 distincts sources. Since the scalar is the size of the
+ // from 2 distinct sources. Since the scalar is the size of the
// field of definition (48 bytes), the scalar must come from a
// different digest so there is no overlap between the source of
// randomness and the scalar.
diff --git a/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go b/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go
index 066a7ac20..a3e75f5c4 100644
--- a/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go
@@ -77,7 +77,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -89,7 +89,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -125,7 +125,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -136,7 +136,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -168,7 +168,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -177,7 +177,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/ecc/bw6-633/twistededwards/eddsa/marshal.go b/ecc/bw6-633/twistededwards/eddsa/marshal.go
index 485e9b710..acf3c4173 100644
--- a/ecc/bw6-633/twistededwards/eddsa/marshal.go
+++ b/ecc/bw6-633/twistededwards/eddsa/marshal.go
@@ -96,7 +96,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// - x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -111,7 +111,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// - x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
//
diff --git a/ecc/bw6-756/fp/element.go b/ecc/bw6-756/fp/element.go
index ab7dcde2d..5f9fe192f 100644
--- a/ecc/bw6-756/fp/element.go
+++ b/ecc/bw6-756/fp/element.go
@@ -422,7 +422,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1<= 0; i-- {
t.Mul(&f[i+1], &a)
diff --git a/ecc/bw6-756/fr/kzg/kzg_test.go b/ecc/bw6-756/fr/kzg/kzg_test.go
index 92446f9d7..4e3d7285d 100644
--- a/ecc/bw6-756/fr/kzg/kzg_test.go
+++ b/ecc/bw6-756/fr/kzg/kzg_test.go
@@ -142,7 +142,7 @@ func TestVerifySinglePoint(t *testing.T) {
// verify the claimed valued
expected := eval(f, point)
if !proof.ClaimedValue.Equal(&expected) {
- t.Fatal("inconsistant claimed value")
+ t.Fatal("inconsistent claimed value")
}
// verify correct proof
diff --git a/ecc/bw6-756/fr/plookup/vector.go b/ecc/bw6-756/fr/plookup/vector.go
index 3a034baef..63834a44f 100644
--- a/ecc/bw6-756/fr/plookup/vector.go
+++ b/ecc/bw6-756/fr/plookup/vector.go
@@ -349,7 +349,7 @@ func computeQuotientCanonical(alpha fr.Element, lh, lh0, lhn, lh1h2 []fr.Element
//
// /!\IMPORTANT/!\
//
-// If the table t is already commited somewhere (which is the normal workflow
+// If the table t is already committed somewhere (which is the normal workflow
// before generating a lookup proof), the commitment needs to be done on the
// table sorted. Otherwise the commitment in proof.t will not be the same as
// the public commitment: it will contain the same values, but permuted.
@@ -673,7 +673,7 @@ func VerifyLookupVector(vk kzg.VerifyingKey, proof ProofLookupVector) error {
lhs.Sub(&lhs, &rhs)
- // check consistancy of bounds
+ // check consistency of bounds
var l0, ln, d1, d2 fr.Element
l0.Exp(nu, big.NewInt(int64(proof.size))).Sub(&l0, &one)
ln.Set(&l0)
diff --git a/ecc/bw6-756/fr/polynomial/polynomial_test.go b/ecc/bw6-756/fr/polynomial/polynomial_test.go
index 414f3a307..34e8749c7 100644
--- a/ecc/bw6-756/fr/polynomial/polynomial_test.go
+++ b/ecc/bw6-756/fr/polynomial/polynomial_test.go
@@ -171,7 +171,7 @@ func TestPolynomialAdd(t *testing.T) {
t.Fatal("side effect, f2 should not have been modified")
}
- // all operands are distincts
+ // all operands are distinct
_f1 := f1.Clone()
_f1.Add(f1, f2)
if !_f1.Equal(expectedSum) {
diff --git a/ecc/bw6-756/fr/polynomial/pool.go b/ecc/bw6-756/fr/polynomial/pool.go
index 06fca83cf..9b37e72e4 100644
--- a/ecc/bw6-756/fr/polynomial/pool.go
+++ b/ecc/bw6-756/fr/polynomial/pool.go
@@ -49,7 +49,7 @@ type Pool struct {
}
func (p *sizedPool) get(n int) *fr.Element {
- p.stats.maake(n)
+ p.stats.make(n)
return p.pool.Get().(*fr.Element)
}
@@ -153,7 +153,7 @@ type poolsStats struct {
InUse int
}
-func (s *poolStats) maake(n int) {
+func (s *poolStats) make(n int) {
s.Used++
s.InUse++
if n > s.GreatestNUsed {
diff --git a/ecc/bw6-756/g1.go b/ecc/bw6-756/g1.go
index de931f160..eca93a406 100644
--- a/ecc/bw6-756/g1.go
+++ b/ecc/bw6-756/g1.go
@@ -1132,7 +1132,7 @@ func BatchScalarMultiplicationG1(base *G1Affine, scalars []fr.Element) []G1Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddMixed(&baseTableAff[(digit>>1)-1])
diff --git a/ecc/bw6-756/g2.go b/ecc/bw6-756/g2.go
index 40c786ce8..f0ba94d23 100644
--- a/ecc/bw6-756/g2.go
+++ b/ecc/bw6-756/g2.go
@@ -909,7 +909,7 @@ func BatchScalarMultiplicationG2(base *G2Affine, scalars []fr.Element) []G2Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddAssign(&baseTable[(digit>>1)-1])
diff --git a/ecc/bw6-756/internal/fptower/e3.go b/ecc/bw6-756/internal/fptower/e3.go
index 148fecded..b2fa2859d 100644
--- a/ecc/bw6-756/internal/fptower/e3.go
+++ b/ecc/bw6-756/internal/fptower/e3.go
@@ -21,7 +21,7 @@ type E3 struct {
A0, A1, A2 fp.Element
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
// note this is more efficient than calling "z == x"
func (z *E3) Equal(x *E3) bool {
return z.A0.Equal(&x.A0) && z.A1.Equal(&x.A1) && z.A2.Equal(&x.A2)
@@ -78,7 +78,7 @@ func (z *E3) SetRandom() (*E3, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E3) IsZero() bool {
return z.A0.IsZero() && z.A1.IsZero() && z.A2.IsZero()
}
diff --git a/ecc/bw6-756/internal/fptower/e6.go b/ecc/bw6-756/internal/fptower/e6.go
index 71f2b305c..530287414 100644
--- a/ecc/bw6-756/internal/fptower/e6.go
+++ b/ecc/bw6-756/internal/fptower/e6.go
@@ -35,7 +35,7 @@ type E6 struct {
B0, B1 E3
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E6) Equal(x *E6) bool {
return z.B0.Equal(&x.B0) && z.B1.Equal(&x.B1)
}
@@ -97,7 +97,7 @@ func (z *E6) SetRandom() (*E6, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E6) IsZero() bool {
return z.B0.IsZero() && z.B1.IsZero()
}
@@ -613,7 +613,7 @@ func (z *E6) SetBytes(e []byte) error {
return nil
}
-// IsInSubGroup ensures GT/E6 is in correct sugroup
+// IsInSubGroup ensures GT/E6 is in correct subgroup
func (z *E6) IsInSubGroup() bool {
var tmp, a, _a, b E6
var t [6]E6
diff --git a/ecc/bw6-756/multiexp.go b/ecc/bw6-756/multiexp.go
index fa9bd11b0..c20a86f56 100644
--- a/ecc/bw6-756/multiexp.go
+++ b/ecc/bw6-756/multiexp.go
@@ -45,7 +45,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -55,7 +55,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -65,7 +65,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -107,7 +107,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -251,7 +251,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -261,7 +261,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -271,7 +271,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -313,7 +313,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -450,13 +450,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits + c - 1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -475,7 +475,7 @@ type chunkStat struct {
}
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -532,7 +532,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []
digit += int(scalar[s.index+1]&s.maskHigh) << s.shiftHigh
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
diff --git a/ecc/bw6-756/multiexp_affine.go b/ecc/bw6-756/multiexp_affine.go
index 086c2e9f8..ce9b48dae 100644
--- a/ecc/bw6-756/multiexp_affine.go
+++ b/ecc/bw6-756/multiexp_affine.go
@@ -46,7 +46,7 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g1JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
@@ -302,7 +302,7 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g2JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/ecc/bw6-756/multiexp_jacobian.go b/ecc/bw6-756/multiexp_jacobian.go
index cd1504413..2f8d9904e 100644
--- a/ecc/bw6-756/multiexp_jacobian.go
+++ b/ecc/bw6-756/multiexp_jacobian.go
@@ -33,7 +33,7 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
@@ -94,7 +94,7 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/ecc/bw6-756/multiexp_test.go b/ecc/bw6-756/multiexp_test.go
index 6381f5e9d..e45d451a8 100644
--- a/ecc/bw6-756/multiexp_test.go
+++ b/ecc/bw6-756/multiexp_test.go
@@ -73,7 +73,7 @@ func TestMultiExpG1(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G1] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G1Affine
for i := 0; i < 13; i++ {
@@ -105,7 +105,7 @@ func TestMultiExpG1(t *testing.T) {
cRange = []uint64{5, 14}
}
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G1Jac
@@ -138,7 +138,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G1Affine
@@ -174,7 +174,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -196,7 +196,7 @@ func TestMultiExpG1(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G1] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G1Jac
@@ -489,7 +489,7 @@ func TestMultiExpG2(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G2] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G2Affine
for i := 0; i < 13; i++ {
@@ -519,7 +519,7 @@ func TestMultiExpG2(t *testing.T) {
// test only "odd" and "even" (ie windows size divide word size vs not)
cRange := []uint64{5, 14}
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G2Jac
@@ -552,7 +552,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G2Affine
@@ -588,7 +588,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -610,7 +610,7 @@ func TestMultiExpG2(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G2] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G2Jac
diff --git a/ecc/bw6-756/twistededwards/eddsa/eddsa.go b/ecc/bw6-756/twistededwards/eddsa/eddsa.go
index cca418c74..13f4e4512 100644
--- a/ecc/bw6-756/twistededwards/eddsa/eddsa.go
+++ b/ecc/bw6-756/twistededwards/eddsa/eddsa.go
@@ -66,7 +66,7 @@ func GenerateKey(r io.Reader) (*PrivateKey, error) {
var pub PublicKey
var priv PrivateKey
// The source of randomness and the secret scalar must come
- // from 2 distincts sources. Since the scalar is the size of the
+ // from 2 distinct sources. Since the scalar is the size of the
// field of definition (48 bytes), the scalar must come from a
// different digest so there is no overlap between the source of
// randomness and the scalar.
diff --git a/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go b/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go
index 82388cfdd..b83ba2805 100644
--- a/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go
@@ -77,7 +77,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -89,7 +89,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -125,7 +125,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -136,7 +136,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -168,7 +168,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -177,7 +177,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/ecc/bw6-756/twistededwards/eddsa/marshal.go b/ecc/bw6-756/twistededwards/eddsa/marshal.go
index 485e9b710..acf3c4173 100644
--- a/ecc/bw6-756/twistededwards/eddsa/marshal.go
+++ b/ecc/bw6-756/twistededwards/eddsa/marshal.go
@@ -96,7 +96,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// - x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -111,7 +111,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// - x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
//
diff --git a/ecc/bw6-761/fp/element.go b/ecc/bw6-761/fp/element.go
index 72ff7dda2..93aa6d6c7 100644
--- a/ecc/bw6-761/fp/element.go
+++ b/ecc/bw6-761/fp/element.go
@@ -422,7 +422,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1<= 0; i-- {
t.Mul(&f[i+1], &a)
diff --git a/ecc/bw6-761/fr/kzg/kzg_test.go b/ecc/bw6-761/fr/kzg/kzg_test.go
index a48206647..5b103701d 100644
--- a/ecc/bw6-761/fr/kzg/kzg_test.go
+++ b/ecc/bw6-761/fr/kzg/kzg_test.go
@@ -142,7 +142,7 @@ func TestVerifySinglePoint(t *testing.T) {
// verify the claimed valued
expected := eval(f, point)
if !proof.ClaimedValue.Equal(&expected) {
- t.Fatal("inconsistant claimed value")
+ t.Fatal("inconsistent claimed value")
}
// verify correct proof
diff --git a/ecc/bw6-761/fr/plookup/vector.go b/ecc/bw6-761/fr/plookup/vector.go
index 25be7af31..9b8630890 100644
--- a/ecc/bw6-761/fr/plookup/vector.go
+++ b/ecc/bw6-761/fr/plookup/vector.go
@@ -349,7 +349,7 @@ func computeQuotientCanonical(alpha fr.Element, lh, lh0, lhn, lh1h2 []fr.Element
//
// /!\IMPORTANT/!\
//
-// If the table t is already commited somewhere (which is the normal workflow
+// If the table t is already committed somewhere (which is the normal workflow
// before generating a lookup proof), the commitment needs to be done on the
// table sorted. Otherwise the commitment in proof.t will not be the same as
// the public commitment: it will contain the same values, but permuted.
@@ -673,7 +673,7 @@ func VerifyLookupVector(vk kzg.VerifyingKey, proof ProofLookupVector) error {
lhs.Sub(&lhs, &rhs)
- // check consistancy of bounds
+ // check consistency of bounds
var l0, ln, d1, d2 fr.Element
l0.Exp(nu, big.NewInt(int64(proof.size))).Sub(&l0, &one)
ln.Set(&l0)
diff --git a/ecc/bw6-761/fr/polynomial/polynomial_test.go b/ecc/bw6-761/fr/polynomial/polynomial_test.go
index c293e9a26..cb0857b51 100644
--- a/ecc/bw6-761/fr/polynomial/polynomial_test.go
+++ b/ecc/bw6-761/fr/polynomial/polynomial_test.go
@@ -171,7 +171,7 @@ func TestPolynomialAdd(t *testing.T) {
t.Fatal("side effect, f2 should not have been modified")
}
- // all operands are distincts
+ // all operands are distinct
_f1 := f1.Clone()
_f1.Add(f1, f2)
if !_f1.Equal(expectedSum) {
diff --git a/ecc/bw6-761/fr/polynomial/pool.go b/ecc/bw6-761/fr/polynomial/pool.go
index fc3ccd489..96d581d0f 100644
--- a/ecc/bw6-761/fr/polynomial/pool.go
+++ b/ecc/bw6-761/fr/polynomial/pool.go
@@ -49,7 +49,7 @@ type Pool struct {
}
func (p *sizedPool) get(n int) *fr.Element {
- p.stats.maake(n)
+ p.stats.make(n)
return p.pool.Get().(*fr.Element)
}
@@ -153,7 +153,7 @@ type poolsStats struct {
InUse int
}
-func (s *poolStats) maake(n int) {
+func (s *poolStats) make(n int) {
s.Used++
s.InUse++
if n > s.GreatestNUsed {
diff --git a/ecc/bw6-761/g1.go b/ecc/bw6-761/g1.go
index 958fe7450..827dbf89f 100644
--- a/ecc/bw6-761/g1.go
+++ b/ecc/bw6-761/g1.go
@@ -1143,7 +1143,7 @@ func BatchScalarMultiplicationG1(base *G1Affine, scalars []fr.Element) []G1Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddMixed(&baseTableAff[(digit>>1)-1])
diff --git a/ecc/bw6-761/g2.go b/ecc/bw6-761/g2.go
index 73a3a9ba8..7b6854631 100644
--- a/ecc/bw6-761/g2.go
+++ b/ecc/bw6-761/g2.go
@@ -923,7 +923,7 @@ func BatchScalarMultiplicationG2(base *G2Affine, scalars []fr.Element) []G2Affin
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
p.AddAssign(&baseTable[(digit>>1)-1])
diff --git a/ecc/bw6-761/internal/fptower/e3.go b/ecc/bw6-761/internal/fptower/e3.go
index 5f2a5d537..7434ebd59 100644
--- a/ecc/bw6-761/internal/fptower/e3.go
+++ b/ecc/bw6-761/internal/fptower/e3.go
@@ -21,7 +21,7 @@ type E3 struct {
A0, A1, A2 fp.Element
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
// note this is more efficient than calling "z == x"
func (z *E3) Equal(x *E3) bool {
return z.A0.Equal(&x.A0) && z.A1.Equal(&x.A1) && z.A2.Equal(&x.A2)
@@ -78,7 +78,7 @@ func (z *E3) SetRandom() (*E3, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E3) IsZero() bool {
return z.A0.IsZero() && z.A1.IsZero() && z.A2.IsZero()
}
diff --git a/ecc/bw6-761/internal/fptower/e6.go b/ecc/bw6-761/internal/fptower/e6.go
index 046e3eec5..09c1e52a8 100644
--- a/ecc/bw6-761/internal/fptower/e6.go
+++ b/ecc/bw6-761/internal/fptower/e6.go
@@ -35,7 +35,7 @@ type E6 struct {
B0, B1 E3
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E6) Equal(x *E6) bool {
return z.B0.Equal(&x.B0) && z.B1.Equal(&x.B1)
}
@@ -97,7 +97,7 @@ func (z *E6) SetRandom() (*E6, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E6) IsZero() bool {
return z.B0.IsZero() && z.B1.IsZero()
}
@@ -613,7 +613,7 @@ func (z *E6) SetBytes(e []byte) error {
return nil
}
-// IsInSubGroup ensures GT/E6 is in correct sugroup
+// IsInSubGroup ensures GT/E6 is in correct subgroup
func (z *E6) IsInSubGroup() bool {
var tmp, a, _a, b E6
var t [6]E6
diff --git a/ecc/bw6-761/multiexp.go b/ecc/bw6-761/multiexp.go
index 3f39f3c6e..71fff74f7 100644
--- a/ecc/bw6-761/multiexp.go
+++ b/ecc/bw6-761/multiexp.go
@@ -45,7 +45,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -55,7 +55,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -65,7 +65,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -107,7 +107,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -253,7 +253,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -263,7 +263,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -273,7 +273,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -315,7 +315,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -454,13 +454,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits + c - 1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -479,7 +479,7 @@ type chunkStat struct {
}
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -536,7 +536,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []
digit += int(scalar[s.index+1]&s.maskHigh) << s.shiftHigh
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
diff --git a/ecc/bw6-761/multiexp_affine.go b/ecc/bw6-761/multiexp_affine.go
index 5f423838c..5cbc271e3 100644
--- a/ecc/bw6-761/multiexp_affine.go
+++ b/ecc/bw6-761/multiexp_affine.go
@@ -46,7 +46,7 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g1JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
@@ -302,7 +302,7 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g2JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/ecc/bw6-761/multiexp_jacobian.go b/ecc/bw6-761/multiexp_jacobian.go
index ca6b1610d..b300811d9 100644
--- a/ecc/bw6-761/multiexp_jacobian.go
+++ b/ecc/bw6-761/multiexp_jacobian.go
@@ -33,7 +33,7 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
@@ -96,7 +96,7 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/ecc/bw6-761/multiexp_test.go b/ecc/bw6-761/multiexp_test.go
index 01184d325..05173f16a 100644
--- a/ecc/bw6-761/multiexp_test.go
+++ b/ecc/bw6-761/multiexp_test.go
@@ -73,7 +73,7 @@ func TestMultiExpG1(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G1] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G1Affine
for i := 0; i < 13; i++ {
@@ -105,7 +105,7 @@ func TestMultiExpG1(t *testing.T) {
cRange = []uint64{5, 14}
}
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G1Jac
@@ -138,7 +138,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G1Affine
@@ -174,7 +174,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -196,7 +196,7 @@ func TestMultiExpG1(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G1] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G1Jac
@@ -489,7 +489,7 @@ func TestMultiExpG2(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G2] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G2Affine
for i := 0; i < 13; i++ {
@@ -519,7 +519,7 @@ func TestMultiExpG2(t *testing.T) {
// test only "odd" and "even" (ie windows size divide word size vs not)
cRange := []uint64{5, 14}
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G2Jac
@@ -552,7 +552,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G2Affine
@@ -588,7 +588,7 @@ func TestMultiExpG2(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G2] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G2] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -610,7 +610,7 @@ func TestMultiExpG2(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G2] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G2] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G2Jac
diff --git a/ecc/bw6-761/twistededwards/eddsa/eddsa.go b/ecc/bw6-761/twistededwards/eddsa/eddsa.go
index c0facc74e..fb00ae284 100644
--- a/ecc/bw6-761/twistededwards/eddsa/eddsa.go
+++ b/ecc/bw6-761/twistededwards/eddsa/eddsa.go
@@ -66,7 +66,7 @@ func GenerateKey(r io.Reader) (*PrivateKey, error) {
var pub PublicKey
var priv PrivateKey
// The source of randomness and the secret scalar must come
- // from 2 distincts sources. Since the scalar is the size of the
+ // from 2 distinct sources. Since the scalar is the size of the
// field of definition (48 bytes), the scalar must come from a
// different digest so there is no overlap between the source of
// randomness and the scalar.
diff --git a/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go b/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go
index f8929c461..9e145fbaa 100644
--- a/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go
@@ -77,7 +77,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -89,7 +89,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -125,7 +125,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -136,7 +136,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -168,7 +168,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -177,7 +177,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/ecc/bw6-761/twistededwards/eddsa/marshal.go b/ecc/bw6-761/twistededwards/eddsa/marshal.go
index 485e9b710..acf3c4173 100644
--- a/ecc/bw6-761/twistededwards/eddsa/marshal.go
+++ b/ecc/bw6-761/twistededwards/eddsa/marshal.go
@@ -96,7 +96,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// - x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -111,7 +111,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// - x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// - s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// - s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
//
diff --git a/ecc/secp256k1/fp/element.go b/ecc/secp256k1/fp/element.go
index 9daa6873e..753c2f386 100644
--- a/ecc/secp256k1/fp/element.go
+++ b/ecc/secp256k1/fp/element.go
@@ -334,7 +334,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1<>1)-1])
diff --git a/ecc/secp256k1/multiexp.go b/ecc/secp256k1/multiexp.go
index 792459cc3..319f27b80 100644
--- a/ecc/secp256k1/multiexp.go
+++ b/ecc/secp256k1/multiexp.go
@@ -45,7 +45,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -55,7 +55,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -65,7 +65,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -107,7 +107,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints / 2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit * 2
@@ -288,13 +288,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits + c - 1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -313,7 +313,7 @@ type chunkStat struct {
}
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -370,7 +370,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []
digit += int(scalar[s.index+1]&s.maskHigh) << s.shiftHigh
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
diff --git a/ecc/secp256k1/multiexp_affine.go b/ecc/secp256k1/multiexp_affine.go
index 722733e23..a6c0abef8 100644
--- a/ecc/secp256k1/multiexp_affine.go
+++ b/ecc/secp256k1/multiexp_affine.go
@@ -46,7 +46,7 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// g1JacExtended coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/ecc/secp256k1/multiexp_jacobian.go b/ecc/secp256k1/multiexp_jacobian.go
index e7dd70df4..eaa737d3b 100644
--- a/ecc/secp256k1/multiexp_jacobian.go
+++ b/ecc/secp256k1/multiexp_jacobian.go
@@ -33,7 +33,7 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit&1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/ecc/secp256k1/multiexp_test.go b/ecc/secp256k1/multiexp_test.go
index 8055985ce..b3f2e74f3 100644
--- a/ecc/secp256k1/multiexp_test.go
+++ b/ecc/secp256k1/multiexp_test.go
@@ -73,7 +73,7 @@ func TestMultiExpG1(t *testing.T) {
scalar.Div(&scalar, new(big.Int).SetInt64(6))
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[G1] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples * 13]G1Affine
for i := 0; i < 13; i++ {
@@ -105,7 +105,7 @@ func TestMultiExpG1(t *testing.T) {
cRange = []uint64{5, 14}
}
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected G1Jac
@@ -138,7 +138,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]G1Affine
@@ -174,7 +174,7 @@ func TestMultiExpG1(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[G1] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[G1] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -196,7 +196,7 @@ func TestMultiExpG1(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[G1] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[G1] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g G1Jac
diff --git a/ecc/stark-curve/fp/element.go b/ecc/stark-curve/fp/element.go
index 9d729df35..073dc4081 100644
--- a/ecc/stark-curve/fp/element.go
+++ b/ecc/stark-curve/fp/element.go
@@ -334,7 +334,7 @@ func (z *Element) SetRandom() (*Element, error) {
return nil, err
}
- // Clear unused bits in in the most signicant byte to increase probability
+ // Clear unused bits in in the most significant byte to increase probability
// that the candidate is < q.
bytes[k-1] &= uint8(int(1< c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -94,7 +94,7 @@ func Generate(conf config.Curve, baseDir string, bgen *bavard.BatchGenerator) er
// in theory, larger batch size == less inversions
// but if nbBuckets is small, then a large batch size will produce lots of collisions
// and queue ops.
- // there is probably a cache-friendlyness factor at play here too.
+ // there is probably a cache-friendliness factor at play here too.
switch c {
case 10:
return 80
diff --git a/internal/generator/ecc/template/multiexp.go.tmpl b/internal/generator/ecc/template/multiexp.go.tmpl
index 7dd57048c..b79994d7f 100644
--- a/internal/generator/ecc/template/multiexp.go.tmpl
+++ b/internal/generator/ecc/template/multiexp.go.tmpl
@@ -37,13 +37,13 @@ type selector struct {
}
// return number of chunks for a given window size c
-// the last chunk may be bigger to accomodate a potential carry from the NAF decomposition
+// the last chunk may be bigger to accommodate a potential carry from the NAF decomposition
func computeNbChunks(c uint64) uint64 {
return (fr.Bits+c-1) / c
}
// return the last window size for a scalar;
-// this last window should accomodate a carry (from the NAF decomposition)
+// this last window should accommodate a carry (from the NAF decomposition)
// it can be == c if we have 1 available bit
// it can be > c if we have 0 available bit
// it can be < c if we have 2+ available bits
@@ -64,7 +64,7 @@ type chunkStat struct {
// partitionScalars compute, for each scalars over c-bit wide windows, nbChunk digits
-// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+// if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
@@ -124,7 +124,7 @@ func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, [
}
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
if digit > max {
digit -= (1 << c)
@@ -244,7 +244,7 @@ func (p *{{ $.TJacobian }}) MultiExp(points []{{ $.TAffine }}, scalars []fr.Elem
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
// the choice of c needs to be improved:
- // there is a theoritical value that gives optimal asymptotics
+ // there is a theoretical value that gives optimal asymptotics
// but in practice, other factors come into play, including:
// * if c doesn't divide 64, the word size, then we're bound to select bits over 2 words of our scalars, instead of 1
// * number of CPUs
@@ -254,7 +254,7 @@ func (p *{{ $.TJacobian }}) MultiExp(points []{{ $.TAffine }}, scalars []fr.Elem
// for each msmCX
// step 1
// we compute, for each scalars over c-bit wide windows, nbChunk digits
- // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and substract
+ // if the digit is larger than 2^{c-1}, then, we borrow 2^c from the next window and subtract
// 2^{c} to the current digit, making it negative.
// negative digits will be processed in the next step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets)
@@ -264,7 +264,7 @@ func (p *{{ $.TJacobian }}) MultiExp(points []{{ $.TAffine }}, scalars []fr.Elem
// we use jacobian extended formulas here as they are faster than mixed addition
// msmProcessChunk places points into buckets base on their selector and return the weighted bucket sum in given channel
// step 3
- // reduce the buckets weigthed sums into our result (msmReduceChunk)
+ // reduce the buckets weighed sums into our result (msmReduceChunk)
// ensure len(points) == len(scalars)
nbPoints := len(points)
@@ -308,7 +308,7 @@ func (p *{{ $.TJacobian }}) MultiExp(points []{{ $.TAffine }}, scalars []fr.Elem
// if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before spliting, let's see if we endup with more tasks than thread;
+ // before splitting, let's see if we end up with more tasks than thread;
cSplit := bestC(nbPoints/2)
nbChunksPostSplit := int(computeNbChunks(cSplit))
nbTasksPostSplit := nbChunksPostSplit*2
diff --git a/internal/generator/ecc/template/multiexp_affine.go.tmpl b/internal/generator/ecc/template/multiexp_affine.go.tmpl
index edb687829..6c4672b3d 100644
--- a/internal/generator/ecc/template/multiexp_affine.go.tmpl
+++ b/internal/generator/ecc/template/multiexp_affine.go.tmpl
@@ -48,7 +48,7 @@ func processChunk{{ $.UPointName }}BatchAffine[BJE ib{{ $.TJacobianExtended }},B
// if the queue is full, we "flush it"; we sequentially add the points to the buckets in
// {{ $.TJacobianExtended }} coordinates.
// The reasoning behind this is the following; batchSize is chosen such as, for a uniformly random
- // input, the number of conflicts is going to be low, and the element added to the queue should be immediatly
+ // input, the number of conflicts is going to be low, and the element added to the queue should be immediately
// processed in the next batch. If it's not the case, then our inputs are not random; and we fallback to
// non-batch-affine version.
diff --git a/internal/generator/ecc/template/multiexp_jacobian.go.tmpl b/internal/generator/ecc/template/multiexp_jacobian.go.tmpl
index 27112dbda..89b4fbe80 100644
--- a/internal/generator/ecc/template/multiexp_jacobian.go.tmpl
+++ b/internal/generator/ecc/template/multiexp_jacobian.go.tmpl
@@ -36,7 +36,7 @@ func processChunk{{ $.UPointName }}Jacobian[B ib{{ $.TJacobianExtended }}](chunk
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit & 1 == 0 {
// add
buckets[(digit>>1)-1].addMixed(&points[i])
diff --git a/internal/generator/ecc/template/point.go.tmpl b/internal/generator/ecc/template/point.go.tmpl
index bd7344360..6fcddde16 100644
--- a/internal/generator/ecc/template/point.go.tmpl
+++ b/internal/generator/ecc/template/point.go.tmpl
@@ -1671,7 +1671,7 @@ func BatchScalarMultiplication{{ toUpper .PointName }}(base *{{ $TAffine }}, sca
continue
}
- // if msbWindow bit is set, we need to substract
+ // if msbWindow bit is set, we need to subtract
if digit & 1 == 0 {
// add
{{- if eq .PointName "g1"}}
diff --git a/internal/generator/ecc/template/tests/multiexp.go.tmpl b/internal/generator/ecc/template/tests/multiexp.go.tmpl
index 24f4bad14..e6bf73409 100644
--- a/internal/generator/ecc/template/tests/multiexp.go.tmpl
+++ b/internal/generator/ecc/template/tests/multiexp.go.tmpl
@@ -76,7 +76,7 @@ func TestMultiExp{{$.UPointName}}(t *testing.T) {
// ensure a multiexp that's splitted has the same result as a non-splitted one..
- properties.Property("[{{ $.UPointName }}] Multi exponentation (cmax) should be consistent with splitted multiexp", prop.ForAll(
+ properties.Property("[{{ $.UPointName }}] Multi exponentiation (cmax) should be consistent with splitted multiexp", prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsLarge [nbSamples*13]{{ $.TAffine }}
for i:=0; i<13; i++ {
@@ -116,7 +116,7 @@ func TestMultiExp{{$.UPointName}}(t *testing.T) {
cRange := []uint64{5, 14}
{{- end}}
- properties.Property(fmt.Sprintf("[{{ $.UPointName }}] Multi exponentation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[{{ $.UPointName }}] Multi exponentiation (c in %v) should be consistent with sum of square", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var expected {{ $.TJacobian }}
@@ -150,7 +150,7 @@ func TestMultiExp{{$.UPointName}}(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[{{ $.UPointName }}] Multi exponentation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[{{ $.UPointName }}] Multi exponentiation (c in %v) of points at infinity should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
var samplePointsZero [nbSamples]{{ $.TAffine }}
@@ -186,7 +186,7 @@ func TestMultiExp{{$.UPointName}}(t *testing.T) {
genScalar,
))
- properties.Property(fmt.Sprintf("[{{ $.UPointName }}] Multi exponentation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
+ properties.Property(fmt.Sprintf("[{{ $.UPointName }}] Multi exponentiation (c in %v) with a vector of 0s as input should output a point at infinity", cRange), prop.ForAll(
func(mixer fr.Element) bool {
// mixer ensures that all the words of a fpElement are set
var sampleScalars [nbSamples]fr.Element
@@ -210,7 +210,7 @@ func TestMultiExp{{$.UPointName}}(t *testing.T) {
// note : this test is here as we expect to have a different multiExp than the above bucket method
// for small number of points
- properties.Property("[{{ $.UPointName }}] Multi exponentation (<50points) should be consistent with sum of square", prop.ForAll(
+ properties.Property("[{{ $.UPointName }}] Multi exponentiation (<50points) should be consistent with sum of square", prop.ForAll(
func(mixer fr.Element) bool {
var g {{ $.TJacobian }}
diff --git a/internal/generator/edwards/eddsa/template/eddsa.go.tmpl b/internal/generator/edwards/eddsa/template/eddsa.go.tmpl
index 7b345572d..938edd702 100644
--- a/internal/generator/edwards/eddsa/template/eddsa.go.tmpl
+++ b/internal/generator/edwards/eddsa/template/eddsa.go.tmpl
@@ -51,7 +51,7 @@ func GenerateKey(r io.Reader) (*PrivateKey, error) {
{{- if or (eq .Name "bw6-761") (eq .Name "bw6-633") (eq .Name "bw6-756")}}
// The source of randomness and the secret scalar must come
- // from 2 distincts sources. Since the scalar is the size of the
+ // from 2 distinct sources. Since the scalar is the size of the
// field of definition (48 bytes), the scalar must come from a
// different digest so there is no overlap between the source of
// randomness and the scalar.
diff --git a/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl b/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl
index 2b34c551e..7cb21bd85 100644
--- a/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl
+++ b/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl
@@ -60,7 +60,7 @@ func TestSerialization(t *testing.T) {
pubKey2.SetBytes(pubKeyBin1)
pubKeyBin2 := pubKey2.Bytes()
if len(pubKeyBin1) != len(pubKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(pubKeyBin1); i++ {
if pubKeyBin1[i] != pubKeyBin2[i] {
@@ -72,7 +72,7 @@ func TestSerialization(t *testing.T) {
privKey2.SetBytes(privKeyBin1)
privKeyBin2 := privKey2.Bytes()
if len(privKeyBin1) != len(privKeyBin2) {
- t.Fatal("Inconistent size")
+ t.Fatal("Inconsistent size")
}
for i := 0; i < len(privKeyBin1); i++ {
if privKeyBin1[i] != privKeyBin2[i] {
@@ -108,7 +108,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -119,7 +119,7 @@ func TestEddsaMIMC(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
@@ -151,7 +151,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if !res {
- t.Fatal("Verifiy correct signature should return true")
+ t.Fatal("Verify correct signature should return true")
}
// verifies wrong msg
@@ -160,7 +160,7 @@ func TestEddsaSHA256(t *testing.T) {
t.Fatal(err)
}
if res {
- t.Fatal("Verfiy wrong signature should be false")
+ t.Fatal("Verify wrong signature should be false")
}
}
diff --git a/internal/generator/edwards/eddsa/template/marshal.go.tmpl b/internal/generator/edwards/eddsa/template/marshal.go.tmpl
index a299cb637..398ac6df8 100644
--- a/internal/generator/edwards/eddsa/template/marshal.go.tmpl
+++ b/internal/generator/edwards/eddsa/template/marshal.go.tmpl
@@ -4,9 +4,9 @@ import (
)
// Bytes returns the binary representation of the public key
-// follows https://tools.ietf.org/html/rfc8032#section-3.1
+// follows https://tools.ietf.org/html/rfc8032#section-3.1
// and returns a compressed representation of the point (x,y)
-//
+//
// x, y are the coordinates of the point
// on the twisted Edwards as big endian integers.
// compressed representation store x with a parity bit to recompute y
@@ -28,7 +28,7 @@ func (pk *PublicKey) SetBytes(buf []byte) (int, error) {
return n, io.ErrShortBuffer
}
if _, err := pk.A.SetBytes(buf[:sizeFr]); err != nil {
- return 0, err
+ return 0, err
}
n += sizeFr
if !pk.A.IsOnCurve() {
@@ -78,7 +78,7 @@ func (privKey *PrivateKey) SetBytes(buf []byte) (int, error) {
// as a byte array of size 3*sizeFr x||y||s where
// * x, y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// * s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// * s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
func (sig *Signature) Bytes() []byte {
@@ -93,7 +93,7 @@ func (sig *Signature) Bytes() []byte {
// buf is read interpreted as x||y||s where
// * x,y are the coordinates of a point on the twisted
// Edwards represented in big endian
-// * s=r+h(r,a,m) mod l, the Hasse bound guarantess that
+// * s=r+h(r,a,m) mod l, the Hasse bound guarantees that
// s is smaller than sizeFr (in particular it is supposed
// s is NOT blinded)
// It returns the number of bytes read from buf.
@@ -103,7 +103,7 @@ func (sig *Signature) SetBytes(buf []byte) (int, error) {
return n, io.ErrShortBuffer
}
if _, err := sig.R.SetBytes(buf[:sizeFr]); err != nil {
- return 0, err
+ return 0, err
}
n += sizeFr
if !sig.R.IsOnCurve() {
diff --git a/internal/generator/kzg/template/fuzz.go.tmpl b/internal/generator/kzg/template/fuzz.go.tmpl
index 9ee81d02f..baea473a7 100644
--- a/internal/generator/kzg/template/fuzz.go.tmpl
+++ b/internal/generator/kzg/template/fuzz.go.tmpl
@@ -19,7 +19,7 @@ func Fuzz(data []byte) int {
size = 1 << 15
}
r := bytes.NewReader(data[1:])
- var alpha, point fr.Element
+ var alpha, point fr.Element
alpha.SetRawBytes(r)
point.SetRawBytes(r)
s := NewScheme(size, alpha)
@@ -49,7 +49,7 @@ func Fuzz(data []byte) int {
for i := 0; i < len(f); i++ {
expectedClaim := f[i].Eval(&point)
if !expectedClaim.Equal(&proof.ClaimedValues[i]) {
- panic("inconsistant claimed values")
+ panic("inconsistent claimed values")
}
}
@@ -64,4 +64,4 @@ func Fuzz(data []byte) int {
}
-
+
diff --git a/internal/generator/kzg/template/kzg.go.tmpl b/internal/generator/kzg/template/kzg.go.tmpl
index d5918e535..382b81cd2 100644
--- a/internal/generator/kzg/template/kzg.go.tmpl
+++ b/internal/generator/kzg/template/kzg.go.tmpl
@@ -261,7 +261,7 @@ func BatchOpenSinglePoint(polynomials [][]fr.Element, digests []Digest, point fr
}()
// compute ∑ᵢγⁱfᵢ
- // note: if we are willing to paralellize that, we could clone the poly and scale them by
+ // note: if we are willing to parallelize that, we could clone the poly and scale them by
// gamma n in parallel, before reducing into foldedPolynomials
foldedPolynomials := make([]fr.Element, largestPoly)
copy(foldedPolynomials, polynomials[0])
@@ -524,7 +524,7 @@ func dividePolyByXminusA(f []fr.Element, fa, a fr.Element) []fr.Element {
// first we compute f-f(a)
f[0].Sub(&f[0], &fa)
- // now we use syntetic division to divide by x-a
+ // now we use synthetic division to divide by x-a
var t fr.Element
for i := len(f) - 2; i >= 0; i-- {
t.Mul(&f[i+1], &a)
diff --git a/internal/generator/kzg/template/kzg.test.go.tmpl b/internal/generator/kzg/template/kzg.test.go.tmpl
index 31c82727a..91fc650c5 100644
--- a/internal/generator/kzg/template/kzg.test.go.tmpl
+++ b/internal/generator/kzg/template/kzg.test.go.tmpl
@@ -124,7 +124,7 @@ func TestVerifySinglePoint(t *testing.T) {
// verify the claimed valued
expected := eval(f, point)
if !proof.ClaimedValue.Equal(&expected) {
- t.Fatal("inconsistant claimed value")
+ t.Fatal("inconsistent claimed value")
}
// verify correct proof
diff --git a/internal/generator/plookup/template/vector.go.tmpl b/internal/generator/plookup/template/vector.go.tmpl
index a506523b4..56af2c697 100644
--- a/internal/generator/plookup/template/vector.go.tmpl
+++ b/internal/generator/plookup/template/vector.go.tmpl
@@ -331,7 +331,7 @@ func computeQuotientCanonical(alpha fr.Element, lh, lh0, lhn, lh1h2 []fr.Element
//
// /!\IMPORTANT/!\
//
-// If the table t is already commited somewhere (which is the normal workflow
+// If the table t is already committed somewhere (which is the normal workflow
// before generating a lookup proof), the commitment needs to be done on the
// table sorted. Otherwise the commitment in proof.t will not be the same as
// the public commitment: it will contain the same values, but permuted.
@@ -656,7 +656,7 @@ func VerifyLookupVector(vk kzg.VerifyingKey, proof ProofLookupVector) error {
lhs.Sub(&lhs, &rhs)
- // check consistancy of bounds
+ // check consistency of bounds
var l0, ln, d1, d2 fr.Element
l0.Exp(nu, big.NewInt(int64(proof.size))).Sub(&l0, &one)
ln.Set(&l0)
diff --git a/internal/generator/polynomial/template/polynomial.test.go.tmpl b/internal/generator/polynomial/template/polynomial.test.go.tmpl
index 727b2f2e1..441a70da8 100644
--- a/internal/generator/polynomial/template/polynomial.test.go.tmpl
+++ b/internal/generator/polynomial/template/polynomial.test.go.tmpl
@@ -153,7 +153,7 @@ func TestPolynomialAdd(t *testing.T) {
t.Fatal("side effect, f2 should not have been modified")
}
- // all operands are distincts
+ // all operands are distinct
_f1 := f1.Clone()
_f1.Add(f1, f2)
if !_f1.Equal(expectedSum) {
diff --git a/internal/generator/polynomial/template/pool.go.tmpl b/internal/generator/polynomial/template/pool.go.tmpl
index 1555ff84a..d3a03c12e 100644
--- a/internal/generator/polynomial/template/pool.go.tmpl
+++ b/internal/generator/polynomial/template/pool.go.tmpl
@@ -56,7 +56,7 @@ type Pool struct {
}
func (p *sizedPool) get(n int) *{{.ElementType}} {
- p.stats.maake(n)
+ p.stats.make(n)
return p.pool.Get().(*{{.ElementType}})
}
@@ -160,7 +160,7 @@ type poolsStats struct {
InUse int
}
-func (s *poolStats) maake(n int) {
+func (s *poolStats) make(n int) {
s.Used++
s.InUse++
if n > s.GreatestNUsed {
diff --git a/internal/generator/tower/template/fq12over6over2/fq12.go.tmpl b/internal/generator/tower/template/fq12over6over2/fq12.go.tmpl
index eaddb89ff..6a5eb4912 100644
--- a/internal/generator/tower/template/fq12over6over2/fq12.go.tmpl
+++ b/internal/generator/tower/template/fq12over6over2/fq12.go.tmpl
@@ -18,7 +18,7 @@ type E12 struct {
C0, C1 E6
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E12) Equal(x *E12) bool {
return z.C0.Equal(&x.C0) && z.C1.Equal(&x.C1)
}
@@ -81,7 +81,7 @@ func (z *E12) SetRandom() (*E12, error) {
return z, nil
}
-// IsZero returns true if the two elements are equal, fasle otherwise
+// IsZero returns true if the two elements are equal, false otherwise
func (z *E12) IsZero() bool {
return z.C0.IsZero() && z.C1.IsZero()
}
@@ -630,7 +630,7 @@ func (z *E12) Marshal() ([]byte) {
return b[:]
}
-// Unmarshal is an allias to SetBytes()
+// Unmarshal is an alias to SetBytes()
func (z *E12) Unmarshal(buf []byte) error {
return z.SetBytes(buf)
}
@@ -727,7 +727,7 @@ func (z *E12) SetBytes(e []byte) error {
return nil
}
-// IsInSubGroup ensures GT/E12 is in correct sugroup
+// IsInSubGroup ensures GT/E12 is in correct subgroup
func (z *E12) IsInSubGroup() bool {
{{- if eq .Curve.Name "bn254"}}
var a, b, _b E12
diff --git a/internal/generator/tower/template/fq12over6over2/fq2.go.tmpl b/internal/generator/tower/template/fq12over6over2/fq2.go.tmpl
index c79042021..68b33f07d 100644
--- a/internal/generator/tower/template/fq12over6over2/fq2.go.tmpl
+++ b/internal/generator/tower/template/fq12over6over2/fq2.go.tmpl
@@ -20,7 +20,7 @@ func (z *E2) Bits() E2 {
r := E2 {}
r.A0 = z.A0.Bits()
r.A1 = z.A1.Bits()
- return r
+ return r
}
@@ -202,7 +202,7 @@ func (z *E2) Exp(x E2, k *big.Int) *E2 {
var sqrtExp1, sqrtExp2 big.Int
// Sqrt sets z to the square root of and returns z
- // The function does not test wether the square root
+ // The function does not test whether the square root
// exists or not, it's up to the caller to call
// Legendre beforehand.
// cf https://eprint.iacr.org/2012/685.pdf (algo 9)
@@ -232,7 +232,7 @@ func (z *E2) Exp(x E2, k *big.Int) *E2 {
}
{{else }}
// Sqrt sets z to the square root of and returns z
- // The function does not test wether the square root
+ // The function does not test whether the square root
// exists or not, it's up to the caller to call
// Legendre beforehand.
// cf https://eprint.iacr.org/2012/685.pdf (algo 10)
diff --git a/internal/generator/tower/template/fq12over6over2/fq6.go.tmpl b/internal/generator/tower/template/fq12over6over2/fq6.go.tmpl
index 347f00f37..621a57701 100644
--- a/internal/generator/tower/template/fq12over6over2/fq6.go.tmpl
+++ b/internal/generator/tower/template/fq12over6over2/fq6.go.tmpl
@@ -3,7 +3,7 @@ type E6 struct {
B0, B1, B2 E2
}
-// Equal returns true if z equals x, fasle otherwise
+// Equal returns true if z equals x, false otherwise
func (z *E6) Equal(x *E6) bool {
return z.B0.Equal(&x.B0) && z.B1.Equal(&x.B1) && z.B2.Equal(&x.B2)
}
From 3f61172c800be1528353f1cf96cc63b62458ab63 Mon Sep 17 00:00:00 2001
From: Antonio Sanso
Date: Thu, 4 May 2023 20:09:44 +0200
Subject: [PATCH 02/51] Adding testing for deserialization of G1 and G2 points
(#393)
* Add testing
* Adding test
* adding test
* adding test
* add dep
* adding case
* adding new files
* adding new files
* removing folders
---
ecc/bls12-381/bls12381_test.go | 89 +++++++++++++++++++
...tion_fails_infinity_with_false_b_flag.yaml | 2 +
...ation_fails_infinity_with_true_b_flag.yaml | 2 +
.../deserialization_fails_not_in_G1.yaml | 2 +
.../deserialization_fails_not_in_curve.yaml | 2 +
.../deserialization_fails_too_few_bytes.yaml | 2 +
.../deserialization_fails_too_many_bytes.yaml | 2 +
...ion_fails_with_b_flag_and_a_flag_true.yaml | 2 +
...ation_fails_with_b_flag_and_x_nonzero.yaml | 2 +
...erialization_fails_with_mask_bits_001.yaml | 2 +
...erialization_fails_with_mask_bits_011.yaml | 2 +
...erialization_fails_with_mask_bits_111.yaml | 2 +
...serialization_fails_with_wrong_c_flag.yaml | 2 +
...erialization_fails_x_equal_to_modulus.yaml | 2 +
...lization_fails_x_greater_than_modulus.yaml | 2 +
...eserialization_succeeds_correct_point.yaml | 2 +
...on_succeeds_infinity_with_true_b_flag.yaml | 2 +
...tion_fails_infinity_with_false_b_flag.yaml | 2 +
...ation_fails_infinity_with_true_b_flag.yaml | 2 +
.../deserialization_fails_not_in_G2.yaml | 2 +
.../deserialization_fails_not_in_curve.yaml | 2 +
.../deserialization_fails_too_few_bytes.yaml | 2 +
.../deserialization_fails_too_many_bytes.yaml | 2 +
...ion_fails_with_b_flag_and_a_flag_true.yaml | 2 +
...ation_fails_with_b_flag_and_x_nonzero.yaml | 2 +
...erialization_fails_with_mask_bits_001.yaml | 2 +
...erialization_fails_with_mask_bits_011.yaml | 2 +
...erialization_fails_with_mask_bits_111.yaml | 2 +
...serialization_fails_with_wrong_c_flag.yaml | 2 +
...ialization_fails_xim_equal_to_modulus.yaml | 2 +
...zation_fails_xim_greater_than_modulus.yaml | 2 +
...ialization_fails_xre_equal_to_modulus.yaml | 2 +
...zation_fails_xre_greater_than_modulus.yaml | 2 +
...eserialization_succeeds_correct_point.yaml | 2 +
...on_succeeds_infinity_with_true_b_flag.yaml | 2 +
go.mod | 1 +
go.sum | 1 +
37 files changed, 159 insertions(+)
create mode 100644 ecc/bls12-381/bls12381_test.go
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_infinity_with_false_b_flag.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_infinity_with_true_b_flag.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_not_in_G1.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_not_in_curve.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_too_few_bytes.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_too_many_bytes.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_b_flag_and_a_flag_true.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_b_flag_and_x_nonzero.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_001.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_011.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_111.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_wrong_c_flag.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_x_equal_to_modulus.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_x_greater_than_modulus.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_succeeds_correct_point.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G1/deserialization_succeeds_infinity_with_true_b_flag.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_infinity_with_false_b_flag.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_infinity_with_true_b_flag.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_not_in_G2.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_not_in_curve.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_too_few_bytes.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_too_many_bytes.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_b_flag_and_a_flag_true.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_b_flag_and_x_nonzero.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_001.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_011.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_111.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_wrong_c_flag.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xim_equal_to_modulus.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xim_greater_than_modulus.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xre_equal_to_modulus.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xre_greater_than_modulus.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_succeeds_correct_point.yaml
create mode 100644 ecc/bls12-381/testing/bls/deserialization_G2/deserialization_succeeds_infinity_with_true_b_flag.yaml
diff --git a/ecc/bls12-381/bls12381_test.go b/ecc/bls12-381/bls12381_test.go
new file mode 100644
index 000000000..113491d97
--- /dev/null
+++ b/ecc/bls12-381/bls12381_test.go
@@ -0,0 +1,89 @@
+package bls12381
+
+import (
+ "encoding/hex"
+ "os"
+ "path/filepath"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+ "gopkg.in/yaml.v2"
+)
+
+var (
+ testDir = "testing/bls"
+ deserializationG1Tests = filepath.Join(testDir, "deserialization_G1/*")
+ deserializationG2Tests = filepath.Join(testDir, "deserialization_G2/*")
+)
+
+func TestDeserializationG1(t *testing.T) {
+
+ type Test struct {
+ Input struct {
+ PubKeyHexStr string `yaml:"pubkey"`
+ }
+ IsValidPredicate *bool `yaml:"output"`
+ }
+ tests, err := filepath.Glob(deserializationG1Tests)
+ require.NoError(t, err)
+ for _, testPath := range tests {
+ t.Run(testPath, func(t *testing.T) {
+ testFile, err := os.Open(testPath)
+ require.NoError(t, err)
+ test := Test{}
+ err = yaml.NewDecoder(testFile).Decode(&test)
+ require.NoError(t, testFile.Close())
+ require.NoError(t, err)
+ testCaseValid := test.IsValidPredicate != nil
+ byts, err := hex.DecodeString(test.Input.PubKeyHexStr)
+ if err != nil && testCaseValid {
+ panic(err)
+ }
+
+ var point G1Affine
+ _, err = point.SetBytes(byts[:])
+ if err == nil && !testCaseValid {
+ panic("err should not be nil")
+ }
+ if err != nil && testCaseValid {
+ panic("err should be nil")
+ }
+ })
+ }
+}
+
+func TestDeserializationG2(t *testing.T) {
+
+ type Test struct {
+ Input struct {
+ SignatureHexStr string `yaml:"signature"`
+ }
+ IsValidPredicate *bool `yaml:"output"`
+ }
+ tests, err := filepath.Glob(deserializationG2Tests)
+ require.NoError(t, err)
+ for _, testPath := range tests {
+ t.Run(testPath, func(t *testing.T) {
+ testFile, err := os.Open(testPath)
+ require.NoError(t, err)
+ test := Test{}
+ err = yaml.NewDecoder(testFile).Decode(&test)
+ require.NoError(t, testFile.Close())
+ require.NoError(t, err)
+ testCaseValid := test.IsValidPredicate != nil
+ byts, err := hex.DecodeString(test.Input.SignatureHexStr)
+ if err != nil && testCaseValid {
+ panic(err)
+ }
+
+ var point G2Affine
+ _, err = point.SetBytes(byts[:])
+ if err == nil && !testCaseValid {
+ panic("err should not be nil")
+ }
+ if err != nil && testCaseValid {
+ panic("err should be nil")
+ }
+ })
+ }
+}
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_infinity_with_false_b_flag.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_infinity_with_false_b_flag.yaml
new file mode 100644
index 000000000..5cc6d5f7b
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_infinity_with_false_b_flag.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: '800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_infinity_with_true_b_flag.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_infinity_with_true_b_flag.yaml
new file mode 100644
index 000000000..dae294679
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_infinity_with_true_b_flag.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: c01000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_not_in_G1.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_not_in_G1.yaml
new file mode 100644
index 000000000..cc944582d
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_not_in_G1.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: 8123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_not_in_curve.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_not_in_curve.yaml
new file mode 100644
index 000000000..ab6040870
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_not_in_curve.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: 8123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcde0}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_too_few_bytes.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_too_few_bytes.yaml
new file mode 100644
index 000000000..905fcd65d
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_too_few_bytes.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: 9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaa}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_too_many_bytes.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_too_many_bytes.yaml
new file mode 100644
index 000000000..890aba359
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_too_many_bytes.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: 9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaa900}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_b_flag_and_a_flag_true.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_b_flag_and_a_flag_true.yaml
new file mode 100644
index 000000000..96b0ab379
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_b_flag_and_a_flag_true.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_b_flag_and_x_nonzero.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_b_flag_and_x_nonzero.yaml
new file mode 100644
index 000000000..021ae7849
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_b_flag_and_x_nonzero.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: c123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_001.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_001.yaml
new file mode 100644
index 000000000..d723dcee6
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_001.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: 2491d1b0ecd9bb917989f0e74f0dea0422eac4a873e5e2644f368dffb9a6e20fd6e10c1b77654d067c0618f6e5a7f79a}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_011.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_011.yaml
new file mode 100644
index 000000000..752c35f67
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_011.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: 6491d1b0ecd9bb917989f0e74f0dea0422eac4a873e5e2644f368dffb9a6e20fd6e10c1b77654d067c0618f6e5a7f79a}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_111.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_111.yaml
new file mode 100644
index 000000000..26e427f18
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_mask_bits_111.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: e491d1b0ecd9bb917989f0e74f0dea0422eac4a873e5e2644f368dffb9a6e20fd6e10c1b77654d067c0618f6e5a7f79a}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_wrong_c_flag.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_wrong_c_flag.yaml
new file mode 100644
index 000000000..0e15aeb72
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_with_wrong_c_flag.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_x_equal_to_modulus.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_x_equal_to_modulus.yaml
new file mode 100644
index 000000000..4874f2385
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_x_equal_to_modulus.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: 9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_x_greater_than_modulus.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_x_greater_than_modulus.yaml
new file mode 100644
index 000000000..1adf5238e
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_fails_x_greater_than_modulus.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: 9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaac}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_succeeds_correct_point.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_succeeds_correct_point.yaml
new file mode 100644
index 000000000..c6aaac832
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_succeeds_correct_point.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: a491d1b0ecd9bb917989f0e74f0dea0422eac4a873e5e2644f368dffb9a6e20fd6e10c1b77654d067c0618f6e5a7f79a}
+output: true
diff --git a/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_succeeds_infinity_with_true_b_flag.yaml b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_succeeds_infinity_with_true_b_flag.yaml
new file mode 100644
index 000000000..8ea16b87c
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G1/deserialization_succeeds_infinity_with_true_b_flag.yaml
@@ -0,0 +1,2 @@
+input: {pubkey: c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000}
+output: true
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_infinity_with_false_b_flag.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_infinity_with_false_b_flag.yaml
new file mode 100644
index 000000000..83fc12379
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_infinity_with_false_b_flag.yaml
@@ -0,0 +1,2 @@
+input: {signature: '800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000'}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_infinity_with_true_b_flag.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_infinity_with_true_b_flag.yaml
new file mode 100644
index 000000000..05ce6d8fa
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_infinity_with_true_b_flag.yaml
@@ -0,0 +1,2 @@
+input: {signature: c01000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_not_in_G2.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_not_in_G2.yaml
new file mode 100644
index 000000000..e17440c01
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_not_in_G2.yaml
@@ -0,0 +1,2 @@
+input: {signature: 8123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef}
+output: null
\ No newline at end of file
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_not_in_curve.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_not_in_curve.yaml
new file mode 100644
index 000000000..bd2d54d94
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_not_in_curve.yaml
@@ -0,0 +1,2 @@
+input: {signature: 8123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcde0}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_too_few_bytes.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_too_few_bytes.yaml
new file mode 100644
index 000000000..638b8545d
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_too_few_bytes.yaml
@@ -0,0 +1,2 @@
+input: {signature: 8123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_too_many_bytes.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_too_many_bytes.yaml
new file mode 100644
index 000000000..08fe23623
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_too_many_bytes.yaml
@@ -0,0 +1,2 @@
+input: {signature: 8123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdefff}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_b_flag_and_a_flag_true.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_b_flag_and_a_flag_true.yaml
new file mode 100644
index 000000000..996809267
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_b_flag_and_a_flag_true.yaml
@@ -0,0 +1,2 @@
+input: {signature: e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_b_flag_and_x_nonzero.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_b_flag_and_x_nonzero.yaml
new file mode 100644
index 000000000..5db435afb
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_b_flag_and_x_nonzero.yaml
@@ -0,0 +1,2 @@
+input: {signature: c123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_001.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_001.yaml
new file mode 100644
index 000000000..c3313bfdb
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_001.yaml
@@ -0,0 +1,2 @@
+input: {signature: 32cc74bc9f089ed9764bbceac5edba416bef5e73701288977b9cac1ccb6964269d4ebf78b4e8aa7792ba09d3e49c8e6a1351bdf582971f796bbaf6320e81251c9d28f674d720cca07ed14596b96697cf18238e0e03ebd7fc1353d885a39407e0}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_011.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_011.yaml
new file mode 100644
index 000000000..0c2d5158f
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_011.yaml
@@ -0,0 +1,2 @@
+input: {signature: 72cc74bc9f089ed9764bbceac5edba416bef5e73701288977b9cac1ccb6964269d4ebf78b4e8aa7792ba09d3e49c8e6a1351bdf582971f796bbaf6320e81251c9d28f674d720cca07ed14596b96697cf18238e0e03ebd7fc1353d885a39407e0}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_111.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_111.yaml
new file mode 100644
index 000000000..736564d79
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_mask_bits_111.yaml
@@ -0,0 +1,2 @@
+input: {signature: f2cc74bc9f089ed9764bbceac5edba416bef5e73701288977b9cac1ccb6964269d4ebf78b4e8aa7792ba09d3e49c8e6a1351bdf582971f796bbaf6320e81251c9d28f674d720cca07ed14596b96697cf18238e0e03ebd7fc1353d885a39407e0}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_wrong_c_flag.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_wrong_c_flag.yaml
new file mode 100644
index 000000000..1540476d1
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_with_wrong_c_flag.yaml
@@ -0,0 +1,2 @@
+input: {signature: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xim_equal_to_modulus.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xim_equal_to_modulus.yaml
new file mode 100644
index 000000000..dcfc2bd0b
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xim_equal_to_modulus.yaml
@@ -0,0 +1,2 @@
+input: {signature: 9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xim_greater_than_modulus.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xim_greater_than_modulus.yaml
new file mode 100644
index 000000000..4fa1e92b2
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xim_greater_than_modulus.yaml
@@ -0,0 +1,2 @@
+input: {signature: 9a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaac000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xre_equal_to_modulus.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xre_equal_to_modulus.yaml
new file mode 100644
index 000000000..d21bf7166
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xre_equal_to_modulus.yaml
@@ -0,0 +1,2 @@
+input: {signature: 8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaab}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xre_greater_than_modulus.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xre_greater_than_modulus.yaml
new file mode 100644
index 000000000..c0696683d
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_fails_xre_greater_than_modulus.yaml
@@ -0,0 +1,2 @@
+input: {signature: 8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001a0111ea397fe69a4b1ba7b6434bacd764774b84f38512bf6730d2a0f6b0f6241eabfffeb153ffffb9feffffffffaaac}
+output: null
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_succeeds_correct_point.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_succeeds_correct_point.yaml
new file mode 100644
index 000000000..c0195cac4
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_succeeds_correct_point.yaml
@@ -0,0 +1,2 @@
+input: {signature: b2cc74bc9f089ed9764bbceac5edba416bef5e73701288977b9cac1ccb6964269d4ebf78b4e8aa7792ba09d3e49c8e6a1351bdf582971f796bbaf6320e81251c9d28f674d720cca07ed14596b96697cf18238e0e03ebd7fc1353d885a39407e0}
+output: true
diff --git a/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_succeeds_infinity_with_true_b_flag.yaml b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_succeeds_infinity_with_true_b_flag.yaml
new file mode 100644
index 000000000..b2886b5b0
--- /dev/null
+++ b/ecc/bls12-381/testing/bls/deserialization_G2/deserialization_succeeds_infinity_with_true_b_flag.yaml
@@ -0,0 +1,2 @@
+input: {signature: c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000}
+output: true
diff --git a/go.mod b/go.mod
index 843b7bcad..ce11373fb 100644
--- a/go.mod
+++ b/go.mod
@@ -11,6 +11,7 @@ require (
github.com/stretchr/testify v1.8.0
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
golang.org/x/sys v0.2.0
+ gopkg.in/yaml.v2 v2.4.0
)
require (
diff --git a/go.sum b/go.sum
index 0b3798313..cdd6f655b 100644
--- a/go.sum
+++ b/go.sum
@@ -32,6 +32,7 @@ golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
From 8fa7e7c8b6e09ccfe67fde8ab712d2fd04fc45e8 Mon Sep 17 00:00:00 2001
From: Justin Traglia <95511699+jtraglia@users.noreply.github.com>
Date: Fri, 5 May 2023 15:02:50 -0500
Subject: [PATCH 03/51] Fix some implicit memory aliasing in for loops (#395)
* Fix some implicit memory aliasing in for loops
* Fix the other findings
* Remove replaced "do not edit" comments
* Revert "Remove replaced "do not edit" comments"
This reverts commit 2bf662138eb4f7d733eae1bf3ebe5f8fdeeffec5.
* Revert "Revert "Remove replaced "do not edit" comments""
This reverts commit 37ff68feb9c69f389e01e2eb126f26409557f84a.
* Revert changed imports
* Use different fix style
* Add back newline
* Revert "Add back newline"
This reverts commit 4a2a4fa0648a569fe36a727098065b666f021689.
---
ecc/bls12-377/fp/element_test.go | 68 ++++++++++++-------
ecc/bls12-377/fr/element_test.go | 68 ++++++++++++-------
ecc/bls12-377/fr/gkr/gkr.go | 6 +-
ecc/bls12-377/fr/polynomial/multilin.go | 4 +-
ecc/bls12-378/fp/element_test.go | 68 ++++++++++++-------
ecc/bls12-378/fr/element_test.go | 68 ++++++++++++-------
ecc/bls12-378/fr/gkr/gkr.go | 6 +-
ecc/bls12-378/fr/polynomial/multilin.go | 4 +-
ecc/bls12-381/fp/element_test.go | 68 ++++++++++++-------
ecc/bls12-381/fr/element_test.go | 68 ++++++++++++-------
ecc/bls12-381/fr/gkr/gkr.go | 6 +-
ecc/bls12-381/fr/polynomial/multilin.go | 4 +-
ecc/bls24-315/fp/element_test.go | 68 ++++++++++++-------
ecc/bls24-315/fr/element_test.go | 68 ++++++++++++-------
ecc/bls24-315/fr/gkr/gkr.go | 6 +-
ecc/bls24-315/fr/polynomial/multilin.go | 4 +-
ecc/bls24-317/fp/element_test.go | 68 ++++++++++++-------
ecc/bls24-317/fr/element_test.go | 68 ++++++++++++-------
ecc/bls24-317/fr/gkr/gkr.go | 6 +-
ecc/bls24-317/fr/polynomial/multilin.go | 4 +-
ecc/bn254/fp/element_test.go | 68 ++++++++++++-------
ecc/bn254/fr/element_test.go | 68 ++++++++++++-------
ecc/bn254/fr/gkr/gkr.go | 6 +-
ecc/bn254/fr/polynomial/multilin.go | 4 +-
ecc/bw6-633/fp/element_test.go | 68 ++++++++++++-------
ecc/bw6-633/fr/element_test.go | 68 ++++++++++++-------
ecc/bw6-633/fr/gkr/gkr.go | 6 +-
ecc/bw6-633/fr/polynomial/multilin.go | 4 +-
ecc/bw6-756/fp/element_test.go | 68 ++++++++++++-------
ecc/bw6-756/fr/element_test.go | 68 ++++++++++++-------
ecc/bw6-756/fr/gkr/gkr.go | 6 +-
ecc/bw6-756/fr/polynomial/multilin.go | 4 +-
ecc/bw6-761/fp/element_test.go | 68 ++++++++++++-------
ecc/bw6-761/fr/element_test.go | 68 ++++++++++++-------
ecc/bw6-761/fr/gkr/gkr.go | 6 +-
ecc/bw6-761/fr/polynomial/multilin.go | 4 +-
ecc/secp256k1/fp/element_test.go | 68 ++++++++++++-------
ecc/secp256k1/fr/element_test.go | 68 ++++++++++++-------
ecc/stark-curve/fp/element_test.go | 68 ++++++++++++-------
ecc/stark-curve/fr/element_test.go | 68 ++++++++++++-------
.../internal/templates/element/tests.go | 16 +++--
field/goldilocks/element_test.go | 68 ++++++++++++-------
internal/generator/gkr/template/gkr.go.tmpl | 6 +-
.../polynomial/template/multilin.go.tmpl | 4 +-
.../small_rational/gkr/gkr.go | 6 +-
.../small_rational/polynomial/multilin.go | 4 +-
46 files changed, 1031 insertions(+), 659 deletions(-)
diff --git a/ecc/bls12-377/fp/element_test.go b/ecc/bls12-377/fp/element_test.go
index cbf950f67..bf37777eb 100644
--- a/ecc/bls12-377/fp/element_test.go
+++ b/ecc/bls12-377/fp/element_test.go
@@ -376,7 +376,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -760,7 +761,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -795,11 +797,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -869,7 +872,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -904,11 +908,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -978,7 +983,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1032,11 +1038,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1114,7 +1121,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1150,11 +1158,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1225,7 +1234,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1260,11 +1270,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1336,7 +1347,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1408,7 +1420,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1480,7 +1493,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1552,7 +1566,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1624,7 +1639,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bls12-377/fr/element_test.go b/ecc/bls12-377/fr/element_test.go
index 4cf60880f..98159a115 100644
--- a/ecc/bls12-377/fr/element_test.go
+++ b/ecc/bls12-377/fr/element_test.go
@@ -372,7 +372,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -756,7 +757,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -791,11 +793,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -865,7 +868,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -900,11 +904,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -974,7 +979,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1028,11 +1034,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1110,7 +1117,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1146,11 +1154,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1221,7 +1230,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1256,11 +1266,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1332,7 +1343,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1404,7 +1416,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1476,7 +1489,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1548,7 +1562,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1620,7 +1635,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bls12-377/fr/gkr/gkr.go b/ecc/bls12-377/fr/gkr/gkr.go
index af2fac8fb..1a07e8505 100644
--- a/ecc/bls12-377/fr/gkr/gkr.go
+++ b/ecc/bls12-377/fr/gkr/gkr.go
@@ -203,7 +203,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -212,7 +212,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -221,7 +221,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/ecc/bls12-377/fr/polynomial/multilin.go b/ecc/bls12-377/fr/polynomial/multilin.go
index 23b802d39..bce5d27c8 100644
--- a/ecc/bls12-377/fr/polynomial/multilin.go
+++ b/ecc/bls12-377/fr/polynomial/multilin.go
@@ -173,12 +173,12 @@ func (m *MultiLin) Eq(q []fr.Element) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
diff --git a/ecc/bls12-378/fp/element_test.go b/ecc/bls12-378/fp/element_test.go
index 40d101487..5eb80277b 100644
--- a/ecc/bls12-378/fp/element_test.go
+++ b/ecc/bls12-378/fp/element_test.go
@@ -376,7 +376,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -760,7 +761,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -795,11 +797,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -869,7 +872,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -904,11 +908,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -978,7 +983,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1032,11 +1038,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1114,7 +1121,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1150,11 +1158,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1225,7 +1234,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1260,11 +1270,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1336,7 +1347,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1408,7 +1420,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1480,7 +1493,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1552,7 +1566,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1624,7 +1639,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bls12-378/fr/element_test.go b/ecc/bls12-378/fr/element_test.go
index 6372c7f19..e779b000e 100644
--- a/ecc/bls12-378/fr/element_test.go
+++ b/ecc/bls12-378/fr/element_test.go
@@ -372,7 +372,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -756,7 +757,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -791,11 +793,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -865,7 +868,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -900,11 +904,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -974,7 +979,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1028,11 +1034,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1110,7 +1117,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1146,11 +1154,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1221,7 +1230,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1256,11 +1266,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1332,7 +1343,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1404,7 +1416,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1476,7 +1489,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1548,7 +1562,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1620,7 +1635,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bls12-378/fr/gkr/gkr.go b/ecc/bls12-378/fr/gkr/gkr.go
index cadb5d0e9..100458f7c 100644
--- a/ecc/bls12-378/fr/gkr/gkr.go
+++ b/ecc/bls12-378/fr/gkr/gkr.go
@@ -203,7 +203,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -212,7 +212,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -221,7 +221,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/ecc/bls12-378/fr/polynomial/multilin.go b/ecc/bls12-378/fr/polynomial/multilin.go
index 03d08cf46..2408407b6 100644
--- a/ecc/bls12-378/fr/polynomial/multilin.go
+++ b/ecc/bls12-378/fr/polynomial/multilin.go
@@ -173,12 +173,12 @@ func (m *MultiLin) Eq(q []fr.Element) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
diff --git a/ecc/bls12-381/fp/element_test.go b/ecc/bls12-381/fp/element_test.go
index 38517f4ce..69a58b365 100644
--- a/ecc/bls12-381/fp/element_test.go
+++ b/ecc/bls12-381/fp/element_test.go
@@ -376,7 +376,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -760,7 +761,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -795,11 +797,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -869,7 +872,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -904,11 +908,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -978,7 +983,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1032,11 +1038,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1114,7 +1121,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1150,11 +1158,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1225,7 +1234,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1260,11 +1270,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1336,7 +1347,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1408,7 +1420,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1480,7 +1493,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1552,7 +1566,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1624,7 +1639,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bls12-381/fr/element_test.go b/ecc/bls12-381/fr/element_test.go
index 85fa755e2..af178afa4 100644
--- a/ecc/bls12-381/fr/element_test.go
+++ b/ecc/bls12-381/fr/element_test.go
@@ -372,7 +372,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -756,7 +757,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -791,11 +793,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -865,7 +868,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -900,11 +904,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -974,7 +979,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1028,11 +1034,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1110,7 +1117,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1146,11 +1154,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1221,7 +1230,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1256,11 +1266,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1332,7 +1343,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1404,7 +1416,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1476,7 +1489,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1548,7 +1562,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1620,7 +1635,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bls12-381/fr/gkr/gkr.go b/ecc/bls12-381/fr/gkr/gkr.go
index 24c7277f4..2ec5cc7c6 100644
--- a/ecc/bls12-381/fr/gkr/gkr.go
+++ b/ecc/bls12-381/fr/gkr/gkr.go
@@ -203,7 +203,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -212,7 +212,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -221,7 +221,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/ecc/bls12-381/fr/polynomial/multilin.go b/ecc/bls12-381/fr/polynomial/multilin.go
index e71e1795e..03f9598cd 100644
--- a/ecc/bls12-381/fr/polynomial/multilin.go
+++ b/ecc/bls12-381/fr/polynomial/multilin.go
@@ -173,12 +173,12 @@ func (m *MultiLin) Eq(q []fr.Element) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
diff --git a/ecc/bls24-315/fp/element_test.go b/ecc/bls24-315/fp/element_test.go
index f9131d65a..a0a9ec427 100644
--- a/ecc/bls24-315/fp/element_test.go
+++ b/ecc/bls24-315/fp/element_test.go
@@ -374,7 +374,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -758,7 +759,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -793,11 +795,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -867,7 +870,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -902,11 +906,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -976,7 +981,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1030,11 +1036,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1112,7 +1119,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1148,11 +1156,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1223,7 +1232,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1258,11 +1268,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1334,7 +1345,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1406,7 +1418,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1478,7 +1491,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1550,7 +1564,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1622,7 +1637,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bls24-315/fr/element_test.go b/ecc/bls24-315/fr/element_test.go
index 818b0d93e..2b17883c0 100644
--- a/ecc/bls24-315/fr/element_test.go
+++ b/ecc/bls24-315/fr/element_test.go
@@ -372,7 +372,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -756,7 +757,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -791,11 +793,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -865,7 +868,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -900,11 +904,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -974,7 +979,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1028,11 +1034,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1110,7 +1117,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1146,11 +1154,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1221,7 +1230,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1256,11 +1266,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1332,7 +1343,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1404,7 +1416,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1476,7 +1489,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1548,7 +1562,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1620,7 +1635,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bls24-315/fr/gkr/gkr.go b/ecc/bls24-315/fr/gkr/gkr.go
index 18c8ab9ce..58e34cc15 100644
--- a/ecc/bls24-315/fr/gkr/gkr.go
+++ b/ecc/bls24-315/fr/gkr/gkr.go
@@ -203,7 +203,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -212,7 +212,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -221,7 +221,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/ecc/bls24-315/fr/polynomial/multilin.go b/ecc/bls24-315/fr/polynomial/multilin.go
index 325df0a80..504fc69d1 100644
--- a/ecc/bls24-315/fr/polynomial/multilin.go
+++ b/ecc/bls24-315/fr/polynomial/multilin.go
@@ -173,12 +173,12 @@ func (m *MultiLin) Eq(q []fr.Element) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
diff --git a/ecc/bls24-317/fp/element_test.go b/ecc/bls24-317/fp/element_test.go
index cae9032b8..f140e8004 100644
--- a/ecc/bls24-317/fp/element_test.go
+++ b/ecc/bls24-317/fp/element_test.go
@@ -374,7 +374,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -758,7 +759,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -793,11 +795,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -867,7 +870,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -902,11 +906,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -976,7 +981,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1030,11 +1036,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1112,7 +1119,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1148,11 +1156,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1223,7 +1232,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1258,11 +1268,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1334,7 +1345,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1406,7 +1418,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1478,7 +1491,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1550,7 +1564,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1622,7 +1637,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bls24-317/fr/element_test.go b/ecc/bls24-317/fr/element_test.go
index 674a51908..456de1334 100644
--- a/ecc/bls24-317/fr/element_test.go
+++ b/ecc/bls24-317/fr/element_test.go
@@ -372,7 +372,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -756,7 +757,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -791,11 +793,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -865,7 +868,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -900,11 +904,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -974,7 +979,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1028,11 +1034,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1110,7 +1117,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1146,11 +1154,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1221,7 +1230,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1256,11 +1266,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1332,7 +1343,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1404,7 +1416,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1476,7 +1489,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1548,7 +1562,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1620,7 +1635,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bls24-317/fr/gkr/gkr.go b/ecc/bls24-317/fr/gkr/gkr.go
index f869934f4..3e692ec34 100644
--- a/ecc/bls24-317/fr/gkr/gkr.go
+++ b/ecc/bls24-317/fr/gkr/gkr.go
@@ -203,7 +203,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -212,7 +212,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -221,7 +221,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/ecc/bls24-317/fr/polynomial/multilin.go b/ecc/bls24-317/fr/polynomial/multilin.go
index 86d00f09d..a4ab44796 100644
--- a/ecc/bls24-317/fr/polynomial/multilin.go
+++ b/ecc/bls24-317/fr/polynomial/multilin.go
@@ -173,12 +173,12 @@ func (m *MultiLin) Eq(q []fr.Element) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
diff --git a/ecc/bn254/fp/element_test.go b/ecc/bn254/fp/element_test.go
index 5d2729e06..db8137828 100644
--- a/ecc/bn254/fp/element_test.go
+++ b/ecc/bn254/fp/element_test.go
@@ -372,7 +372,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -756,7 +757,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -791,11 +793,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -865,7 +868,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -900,11 +904,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -974,7 +979,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1028,11 +1034,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1110,7 +1117,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1146,11 +1154,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1221,7 +1230,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1256,11 +1266,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1332,7 +1343,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1404,7 +1416,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1476,7 +1489,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1548,7 +1562,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1620,7 +1635,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bn254/fr/element_test.go b/ecc/bn254/fr/element_test.go
index dfeab886a..da53c913e 100644
--- a/ecc/bn254/fr/element_test.go
+++ b/ecc/bn254/fr/element_test.go
@@ -372,7 +372,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -756,7 +757,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -791,11 +793,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -865,7 +868,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -900,11 +904,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -974,7 +979,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1028,11 +1034,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1110,7 +1117,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1146,11 +1154,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1221,7 +1230,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1256,11 +1266,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1332,7 +1343,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1404,7 +1416,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1476,7 +1489,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1548,7 +1562,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1620,7 +1635,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bn254/fr/gkr/gkr.go b/ecc/bn254/fr/gkr/gkr.go
index b6099fee7..6ab745666 100644
--- a/ecc/bn254/fr/gkr/gkr.go
+++ b/ecc/bn254/fr/gkr/gkr.go
@@ -203,7 +203,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -212,7 +212,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -221,7 +221,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/ecc/bn254/fr/polynomial/multilin.go b/ecc/bn254/fr/polynomial/multilin.go
index 9fa7144c2..7712a0359 100644
--- a/ecc/bn254/fr/polynomial/multilin.go
+++ b/ecc/bn254/fr/polynomial/multilin.go
@@ -173,12 +173,12 @@ func (m *MultiLin) Eq(q []fr.Element) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
diff --git a/ecc/bw6-633/fp/element_test.go b/ecc/bw6-633/fp/element_test.go
index 55412f369..6bf72df13 100644
--- a/ecc/bw6-633/fp/element_test.go
+++ b/ecc/bw6-633/fp/element_test.go
@@ -384,7 +384,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -768,7 +769,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -803,11 +805,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -877,7 +880,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -912,11 +916,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -986,7 +991,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1040,11 +1046,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1122,7 +1129,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1158,11 +1166,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1233,7 +1242,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1268,11 +1278,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1344,7 +1355,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1416,7 +1428,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1488,7 +1501,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1560,7 +1574,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1632,7 +1647,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bw6-633/fr/element_test.go b/ecc/bw6-633/fr/element_test.go
index 202b26186..0a12af05b 100644
--- a/ecc/bw6-633/fr/element_test.go
+++ b/ecc/bw6-633/fr/element_test.go
@@ -374,7 +374,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -758,7 +759,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -793,11 +795,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -867,7 +870,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -902,11 +906,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -976,7 +981,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1030,11 +1036,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1112,7 +1119,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1148,11 +1156,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1223,7 +1232,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1258,11 +1268,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1334,7 +1345,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1406,7 +1418,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1478,7 +1491,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1550,7 +1564,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1622,7 +1637,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bw6-633/fr/gkr/gkr.go b/ecc/bw6-633/fr/gkr/gkr.go
index 2206685a2..8ec1f3672 100644
--- a/ecc/bw6-633/fr/gkr/gkr.go
+++ b/ecc/bw6-633/fr/gkr/gkr.go
@@ -203,7 +203,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -212,7 +212,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -221,7 +221,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/ecc/bw6-633/fr/polynomial/multilin.go b/ecc/bw6-633/fr/polynomial/multilin.go
index 9d08dc02b..0f23d4fad 100644
--- a/ecc/bw6-633/fr/polynomial/multilin.go
+++ b/ecc/bw6-633/fr/polynomial/multilin.go
@@ -173,12 +173,12 @@ func (m *MultiLin) Eq(q []fr.Element) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
diff --git a/ecc/bw6-756/fp/element_test.go b/ecc/bw6-756/fp/element_test.go
index d1bd113fe..d5197424e 100644
--- a/ecc/bw6-756/fp/element_test.go
+++ b/ecc/bw6-756/fp/element_test.go
@@ -388,7 +388,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -772,7 +773,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -807,11 +809,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -881,7 +884,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -916,11 +920,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -990,7 +995,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1044,11 +1050,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1126,7 +1133,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1162,11 +1170,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1237,7 +1246,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1272,11 +1282,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1348,7 +1359,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1420,7 +1432,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1492,7 +1505,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1564,7 +1578,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1636,7 +1651,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bw6-756/fr/element_test.go b/ecc/bw6-756/fr/element_test.go
index 59fc125ea..58c1502e6 100644
--- a/ecc/bw6-756/fr/element_test.go
+++ b/ecc/bw6-756/fr/element_test.go
@@ -376,7 +376,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -760,7 +761,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -795,11 +797,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -869,7 +872,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -904,11 +908,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -978,7 +983,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1032,11 +1038,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1114,7 +1121,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1150,11 +1158,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1225,7 +1234,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1260,11 +1270,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1336,7 +1347,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1408,7 +1420,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1480,7 +1493,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1552,7 +1566,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1624,7 +1639,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bw6-756/fr/gkr/gkr.go b/ecc/bw6-756/fr/gkr/gkr.go
index 86b724776..dacbfeffa 100644
--- a/ecc/bw6-756/fr/gkr/gkr.go
+++ b/ecc/bw6-756/fr/gkr/gkr.go
@@ -203,7 +203,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -212,7 +212,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -221,7 +221,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/ecc/bw6-756/fr/polynomial/multilin.go b/ecc/bw6-756/fr/polynomial/multilin.go
index d859aca93..3361d7237 100644
--- a/ecc/bw6-756/fr/polynomial/multilin.go
+++ b/ecc/bw6-756/fr/polynomial/multilin.go
@@ -173,12 +173,12 @@ func (m *MultiLin) Eq(q []fr.Element) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
diff --git a/ecc/bw6-761/fp/element_test.go b/ecc/bw6-761/fp/element_test.go
index c089a22ea..6e0d6beea 100644
--- a/ecc/bw6-761/fp/element_test.go
+++ b/ecc/bw6-761/fp/element_test.go
@@ -388,7 +388,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -772,7 +773,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -807,11 +809,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -881,7 +884,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -916,11 +920,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -990,7 +995,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1044,11 +1050,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1126,7 +1133,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1162,11 +1170,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1237,7 +1246,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1272,11 +1282,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1348,7 +1359,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1420,7 +1432,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1492,7 +1505,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1564,7 +1578,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1636,7 +1651,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bw6-761/fr/element_test.go b/ecc/bw6-761/fr/element_test.go
index 66d3f95f7..a42aef5f3 100644
--- a/ecc/bw6-761/fr/element_test.go
+++ b/ecc/bw6-761/fr/element_test.go
@@ -376,7 +376,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -760,7 +761,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -795,11 +797,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -869,7 +872,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -904,11 +908,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -978,7 +983,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1032,11 +1038,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1114,7 +1121,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1150,11 +1158,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1225,7 +1234,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1260,11 +1270,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1336,7 +1347,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1408,7 +1420,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1480,7 +1493,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1552,7 +1566,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1624,7 +1639,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/bw6-761/fr/gkr/gkr.go b/ecc/bw6-761/fr/gkr/gkr.go
index 94f9dcc86..931ee3249 100644
--- a/ecc/bw6-761/fr/gkr/gkr.go
+++ b/ecc/bw6-761/fr/gkr/gkr.go
@@ -203,7 +203,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -212,7 +212,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -221,7 +221,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/ecc/bw6-761/fr/polynomial/multilin.go b/ecc/bw6-761/fr/polynomial/multilin.go
index 567a2dda8..89c27b9f7 100644
--- a/ecc/bw6-761/fr/polynomial/multilin.go
+++ b/ecc/bw6-761/fr/polynomial/multilin.go
@@ -173,12 +173,12 @@ func (m *MultiLin) Eq(q []fr.Element) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
diff --git a/ecc/secp256k1/fp/element_test.go b/ecc/secp256k1/fp/element_test.go
index 4f2a851fd..6790f233b 100644
--- a/ecc/secp256k1/fp/element_test.go
+++ b/ecc/secp256k1/fp/element_test.go
@@ -370,7 +370,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -754,7 +755,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -789,11 +791,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -863,7 +866,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -898,11 +902,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -972,7 +977,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1026,11 +1032,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1108,7 +1115,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1144,11 +1152,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1219,7 +1228,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1254,11 +1264,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1330,7 +1341,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1402,7 +1414,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1474,7 +1487,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1546,7 +1560,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1618,7 +1633,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/secp256k1/fr/element_test.go b/ecc/secp256k1/fr/element_test.go
index 59f4fee10..64906afca 100644
--- a/ecc/secp256k1/fr/element_test.go
+++ b/ecc/secp256k1/fr/element_test.go
@@ -370,7 +370,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -754,7 +755,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -789,11 +791,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -863,7 +866,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -898,11 +902,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -972,7 +977,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1026,11 +1032,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1108,7 +1115,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1144,11 +1152,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1219,7 +1228,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1254,11 +1264,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1330,7 +1341,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1402,7 +1414,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1474,7 +1487,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1546,7 +1560,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1618,7 +1633,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/stark-curve/fp/element_test.go b/ecc/stark-curve/fp/element_test.go
index 53d70ed7a..e76f65c3a 100644
--- a/ecc/stark-curve/fp/element_test.go
+++ b/ecc/stark-curve/fp/element_test.go
@@ -372,7 +372,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -756,7 +757,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -791,11 +793,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -865,7 +868,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -900,11 +904,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -974,7 +979,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1028,11 +1034,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1110,7 +1117,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1146,11 +1154,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1221,7 +1230,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1256,11 +1266,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1332,7 +1343,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1404,7 +1416,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1476,7 +1489,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1548,7 +1562,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1620,7 +1635,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/ecc/stark-curve/fr/element_test.go b/ecc/stark-curve/fr/element_test.go
index 91a592313..a91d22944 100644
--- a/ecc/stark-curve/fr/element_test.go
+++ b/ecc/stark-curve/fr/element_test.go
@@ -372,7 +372,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -756,7 +757,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -791,11 +793,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -865,7 +868,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -900,11 +904,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -974,7 +979,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1028,11 +1034,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1110,7 +1117,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1146,11 +1154,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1221,7 +1230,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1256,11 +1266,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1332,7 +1343,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1404,7 +1416,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1476,7 +1489,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1548,7 +1562,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1620,7 +1635,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/field/generator/internal/templates/element/tests.go b/field/generator/internal/templates/element/tests.go
index b123789c8..5a58b065b 100644
--- a/field/generator/internal/templates/element/tests.go
+++ b/field/generator/internal/templates/element/tests.go
@@ -380,7 +380,8 @@ func Test{{toTitle .ElementName}}Reduce(t *testing.T) {
testValues := make([]{{.ElementName}}, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -807,7 +808,8 @@ func Test{{toTitle .all.ElementName}}{{.Op}}(t *testing.T) {
testValues := make([]{{.all.ElementName}}, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -878,11 +880,12 @@ func Test{{toTitle .all.ElementName}}{{.Op}}(t *testing.T) {
testValues := make([]{{.all.ElementName}}, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1009,7 +1012,8 @@ func Test{{toTitle .all.ElementName}}{{.Op}}(t *testing.T) {
testValues := make([]{{.all.ElementName}}, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c {{.all.ElementName}}
diff --git a/field/goldilocks/element_test.go b/field/goldilocks/element_test.go
index ae5cfe420..195919bfe 100644
--- a/field/goldilocks/element_test.go
+++ b/field/goldilocks/element_test.go
@@ -317,7 +317,8 @@ func TestElementReduce(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, s := range testValues {
+ for i := range testValues {
+ s := testValues[i]
expected := s
reduce(&s)
_reduceGeneric(&expected)
@@ -701,7 +702,8 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -736,11 +738,12 @@ func TestElementAdd(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -810,7 +813,8 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -845,11 +849,12 @@ func TestElementSub(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -919,7 +924,8 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -973,11 +979,12 @@ func TestElementMul(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1055,7 +1062,8 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1091,11 +1099,12 @@ func TestElementDiv(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1166,7 +1175,8 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, r := range testValues {
+ for i := range testValues {
+ r := testValues[i]
var d, e, rb big.Int
r.BigInt(&rb)
@@ -1201,11 +1211,12 @@ func TestElementExp(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
- for _, b := range testValues {
-
+ for j := range testValues {
+ b := testValues[j]
var bBig, d, e big.Int
b.BigInt(&bBig)
@@ -1277,7 +1288,8 @@ func TestElementSquare(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1349,7 +1361,8 @@ func TestElementInverse(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1421,7 +1434,8 @@ func TestElementSqrt(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1493,7 +1507,8 @@ func TestElementDouble(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
@@ -1565,7 +1580,8 @@ func TestElementNeg(t *testing.T) {
testValues := make([]Element, len(staticTestValues))
copy(testValues, staticTestValues)
- for _, a := range testValues {
+ for i := range testValues {
+ a := testValues[i]
var aBig big.Int
a.BigInt(&aBig)
var c Element
diff --git a/internal/generator/gkr/template/gkr.go.tmpl b/internal/generator/gkr/template/gkr.go.tmpl
index 6af6d66e5..32fd81158 100644
--- a/internal/generator/gkr/template/gkr.go.tmpl
+++ b/internal/generator/gkr/template/gkr.go.tmpl
@@ -187,7 +187,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -196,7 +196,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -205,7 +205,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/internal/generator/polynomial/template/multilin.go.tmpl b/internal/generator/polynomial/template/multilin.go.tmpl
index 50c65f04f..431ee193f 100644
--- a/internal/generator/polynomial/template/multilin.go.tmpl
+++ b/internal/generator/polynomial/template/multilin.go.tmpl
@@ -154,12 +154,12 @@ func (m *MultiLin) Eq(q []{{.ElementType}}) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
diff --git a/internal/generator/test_vector_utils/small_rational/gkr/gkr.go b/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
index 73d314ff3..800a1d692 100644
--- a/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
+++ b/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
@@ -203,7 +203,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
var wgs []*sync.WaitGroup
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
const threshold = 1 << 6
k := 1 << i
@@ -212,7 +212,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
} else {
@@ -221,7 +221,7 @@ func (c *eqTimesGateEvalSumcheckClaims) innerWork(e, m polynomial.MultiLin, q []
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- m[j1].Mul(&qI, &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ m[j1].Mul(&q[i], &m[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
m[j0].Sub(&m[j0], &m[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}, 1024))
diff --git a/internal/generator/test_vector_utils/small_rational/polynomial/multilin.go b/internal/generator/test_vector_utils/small_rational/polynomial/multilin.go
index f49c4c23b..3ff25f94a 100644
--- a/internal/generator/test_vector_utils/small_rational/polynomial/multilin.go
+++ b/internal/generator/test_vector_utils/small_rational/polynomial/multilin.go
@@ -173,12 +173,12 @@ func (m *MultiLin) Eq(q []small_rational.SmallRational) {
}
//At the end of each iteration, m(h₁, ..., hₙ) = Eq(q₁, ..., qᵢ₊₁, h₁, ..., hᵢ₊₁)
- for i, qI := range q { // In the comments we use a 1-based index so qI = qᵢ₊₁
+ for i := range q { // In the comments we use a 1-based index so q[i] = qᵢ₊₁
// go through all assignments of (b₁, ..., bᵢ) ∈ {0,1}ⁱ
for j := 0; j < (1 << i); j++ {
j0 := j << (n - i) // bᵢ₊₁ = 0
j1 := j0 + 1<<(n-1-i) // bᵢ₊₁ = 1
- (*m)[j1].Mul(&qI, &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
+ (*m)[j1].Mul(&q[i], &(*m)[j0]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 1) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) qᵢ₊₁
(*m)[j0].Sub(&(*m)[j0], &(*m)[j1]) // Eq(q₁, ..., qᵢ₊₁, b₁, ..., bᵢ, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) Eq(qᵢ₊₁, 0) = Eq(q₁, ..., qᵢ, b₁, ..., bᵢ) (1-qᵢ₊₁)
}
}
From f7b99e3003508384477b0ee0c8dd7cc90d46423b Mon Sep 17 00:00:00 2001
From: Justin Traglia <95511699+jtraglia@users.noreply.github.com>
Date: Fri, 5 May 2023 15:04:42 -0500
Subject: [PATCH 04/51] Do not XOR with zero (#398)
---
ecc/secp256k1/fp/element.go | 2 +-
ecc/secp256k1/fr/element.go | 2 +-
field/generator/internal/templates/element/base.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ecc/secp256k1/fp/element.go b/ecc/secp256k1/fp/element.go
index 753c2f386..dbd9d7370 100644
--- a/ecc/secp256k1/fp/element.go
+++ b/ecc/secp256k1/fp/element.go
@@ -232,7 +232,7 @@ func (z *Element) IsZero() bool {
// IsOne returns z == 1
func (z *Element) IsOne() bool {
- return (z[3] ^ 0 | z[2] ^ 0 | z[1] ^ 0 | z[0] ^ 4294968273) == 0
+ return (z[3] | z[2] | z[1] | z[0] ^ 4294968273) == 0
}
// IsUint64 reports whether z can be represented as an uint64.
diff --git a/ecc/secp256k1/fr/element.go b/ecc/secp256k1/fr/element.go
index 706b9e0b9..0cd7986de 100644
--- a/ecc/secp256k1/fr/element.go
+++ b/ecc/secp256k1/fr/element.go
@@ -232,7 +232,7 @@ func (z *Element) IsZero() bool {
// IsOne returns z == 1
func (z *Element) IsOne() bool {
- return (z[3] ^ 0 | z[2] ^ 1 | z[1] ^ 4994812053365940164 | z[0] ^ 4624529908474429119) == 0
+ return (z[3] | z[2] ^ 1 | z[1] ^ 4994812053365940164 | z[0] ^ 4624529908474429119) == 0
}
// IsUint64 reports whether z can be represented as an uint64.
diff --git a/field/generator/internal/templates/element/base.go b/field/generator/internal/templates/element/base.go
index 9c6c6297b..d1eb42fed 100644
--- a/field/generator/internal/templates/element/base.go
+++ b/field/generator/internal/templates/element/base.go
@@ -218,7 +218,7 @@ func (z *{{.ElementName}}) IsOne() bool {
{{- if eq .NbWords 1}}
return z[0] == {{index $.One 0}}
{{- else}}
- return ( {{- range $i := reverse .NbWordsIndexesNoZero }} z[{{$i}}] ^ {{index $.One $i}} | {{- end}} z[0] ^ {{index $.One 0}} ) == 0
+ return ( {{- range $i := reverse .NbWordsIndexesNoZero -}}{{if ne (index $.One $i) 0}}z[{{$i}}] ^ {{index $.One $i}} | {{else}}z[{{$i}}] | {{end}}{{- end}}z[0] ^ {{index $.One 0}} ) == 0
{{- end}}
}
From 2fde31d1485617281c5efc759ebf3f93d85e6733 Mon Sep 17 00:00:00 2001
From: Justin Traglia <95511699+jtraglia@users.noreply.github.com>
Date: Fri, 5 May 2023 15:37:53 -0500
Subject: [PATCH 05/51] Disable check shadowing in govet linter (#397)
* Disable check shadowing in govet linter
* Rename poolsStats var to stats
---
.golangci.yml | 4 ----
ecc/bls12-377/fr/polynomial/pool.go | 4 ++--
ecc/bls12-378/fr/polynomial/pool.go | 4 ++--
ecc/bls12-381/fr/polynomial/pool.go | 4 ++--
ecc/bls24-315/fr/polynomial/pool.go | 4 ++--
ecc/bls24-317/fr/polynomial/pool.go | 4 ++--
ecc/bn254/fr/polynomial/pool.go | 4 ++--
ecc/bw6-633/fr/polynomial/pool.go | 4 ++--
ecc/bw6-756/fr/polynomial/pool.go | 4 ++--
ecc/bw6-761/fr/polynomial/pool.go | 4 ++--
internal/generator/polynomial/template/pool.go.tmpl | 4 ++--
11 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/.golangci.yml b/.golangci.yml
index 091d52e10..2d9c8b2f6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,3 @@
-linters-settings:
- govet:
- check-shadowing: true
-
linters:
disable-all: true
enable:
diff --git a/ecc/bls12-377/fr/polynomial/pool.go b/ecc/bls12-377/fr/polynomial/pool.go
index 454667462..d46e198fb 100644
--- a/ecc/bls12-377/fr/polynomial/pool.go
+++ b/ecc/bls12-377/fr/polynomial/pool.go
@@ -187,11 +187,11 @@ func (p *Pool) PrintPoolStats() {
InUse += subPool.stats.InUse
}
- poolsStats := poolsStats{
+ stats := poolsStats{
SubPools: subStats,
InUse: InUse,
}
- serialized, _ := json.MarshalIndent(poolsStats, "", " ")
+ serialized, _ := json.MarshalIndent(stats, "", " ")
fmt.Println(string(serialized))
p.printInUse()
}
diff --git a/ecc/bls12-378/fr/polynomial/pool.go b/ecc/bls12-378/fr/polynomial/pool.go
index e7c2ae68b..0eeb4d6ef 100644
--- a/ecc/bls12-378/fr/polynomial/pool.go
+++ b/ecc/bls12-378/fr/polynomial/pool.go
@@ -187,11 +187,11 @@ func (p *Pool) PrintPoolStats() {
InUse += subPool.stats.InUse
}
- poolsStats := poolsStats{
+ stats := poolsStats{
SubPools: subStats,
InUse: InUse,
}
- serialized, _ := json.MarshalIndent(poolsStats, "", " ")
+ serialized, _ := json.MarshalIndent(stats, "", " ")
fmt.Println(string(serialized))
p.printInUse()
}
diff --git a/ecc/bls12-381/fr/polynomial/pool.go b/ecc/bls12-381/fr/polynomial/pool.go
index d28ad9307..41801037e 100644
--- a/ecc/bls12-381/fr/polynomial/pool.go
+++ b/ecc/bls12-381/fr/polynomial/pool.go
@@ -187,11 +187,11 @@ func (p *Pool) PrintPoolStats() {
InUse += subPool.stats.InUse
}
- poolsStats := poolsStats{
+ stats := poolsStats{
SubPools: subStats,
InUse: InUse,
}
- serialized, _ := json.MarshalIndent(poolsStats, "", " ")
+ serialized, _ := json.MarshalIndent(stats, "", " ")
fmt.Println(string(serialized))
p.printInUse()
}
diff --git a/ecc/bls24-315/fr/polynomial/pool.go b/ecc/bls24-315/fr/polynomial/pool.go
index c22ebc83b..f260426e0 100644
--- a/ecc/bls24-315/fr/polynomial/pool.go
+++ b/ecc/bls24-315/fr/polynomial/pool.go
@@ -187,11 +187,11 @@ func (p *Pool) PrintPoolStats() {
InUse += subPool.stats.InUse
}
- poolsStats := poolsStats{
+ stats := poolsStats{
SubPools: subStats,
InUse: InUse,
}
- serialized, _ := json.MarshalIndent(poolsStats, "", " ")
+ serialized, _ := json.MarshalIndent(stats, "", " ")
fmt.Println(string(serialized))
p.printInUse()
}
diff --git a/ecc/bls24-317/fr/polynomial/pool.go b/ecc/bls24-317/fr/polynomial/pool.go
index 8dc834b2e..3179ae51f 100644
--- a/ecc/bls24-317/fr/polynomial/pool.go
+++ b/ecc/bls24-317/fr/polynomial/pool.go
@@ -187,11 +187,11 @@ func (p *Pool) PrintPoolStats() {
InUse += subPool.stats.InUse
}
- poolsStats := poolsStats{
+ stats := poolsStats{
SubPools: subStats,
InUse: InUse,
}
- serialized, _ := json.MarshalIndent(poolsStats, "", " ")
+ serialized, _ := json.MarshalIndent(stats, "", " ")
fmt.Println(string(serialized))
p.printInUse()
}
diff --git a/ecc/bn254/fr/polynomial/pool.go b/ecc/bn254/fr/polynomial/pool.go
index 67881d1f6..8826313e6 100644
--- a/ecc/bn254/fr/polynomial/pool.go
+++ b/ecc/bn254/fr/polynomial/pool.go
@@ -187,11 +187,11 @@ func (p *Pool) PrintPoolStats() {
InUse += subPool.stats.InUse
}
- poolsStats := poolsStats{
+ stats := poolsStats{
SubPools: subStats,
InUse: InUse,
}
- serialized, _ := json.MarshalIndent(poolsStats, "", " ")
+ serialized, _ := json.MarshalIndent(stats, "", " ")
fmt.Println(string(serialized))
p.printInUse()
}
diff --git a/ecc/bw6-633/fr/polynomial/pool.go b/ecc/bw6-633/fr/polynomial/pool.go
index a903db55c..8b676e50a 100644
--- a/ecc/bw6-633/fr/polynomial/pool.go
+++ b/ecc/bw6-633/fr/polynomial/pool.go
@@ -187,11 +187,11 @@ func (p *Pool) PrintPoolStats() {
InUse += subPool.stats.InUse
}
- poolsStats := poolsStats{
+ stats := poolsStats{
SubPools: subStats,
InUse: InUse,
}
- serialized, _ := json.MarshalIndent(poolsStats, "", " ")
+ serialized, _ := json.MarshalIndent(stats, "", " ")
fmt.Println(string(serialized))
p.printInUse()
}
diff --git a/ecc/bw6-756/fr/polynomial/pool.go b/ecc/bw6-756/fr/polynomial/pool.go
index 9b37e72e4..b7281d6b4 100644
--- a/ecc/bw6-756/fr/polynomial/pool.go
+++ b/ecc/bw6-756/fr/polynomial/pool.go
@@ -187,11 +187,11 @@ func (p *Pool) PrintPoolStats() {
InUse += subPool.stats.InUse
}
- poolsStats := poolsStats{
+ stats := poolsStats{
SubPools: subStats,
InUse: InUse,
}
- serialized, _ := json.MarshalIndent(poolsStats, "", " ")
+ serialized, _ := json.MarshalIndent(stats, "", " ")
fmt.Println(string(serialized))
p.printInUse()
}
diff --git a/ecc/bw6-761/fr/polynomial/pool.go b/ecc/bw6-761/fr/polynomial/pool.go
index 96d581d0f..d6ca5b806 100644
--- a/ecc/bw6-761/fr/polynomial/pool.go
+++ b/ecc/bw6-761/fr/polynomial/pool.go
@@ -187,11 +187,11 @@ func (p *Pool) PrintPoolStats() {
InUse += subPool.stats.InUse
}
- poolsStats := poolsStats{
+ stats := poolsStats{
SubPools: subStats,
InUse: InUse,
}
- serialized, _ := json.MarshalIndent(poolsStats, "", " ")
+ serialized, _ := json.MarshalIndent(stats, "", " ")
fmt.Println(string(serialized))
p.printInUse()
}
diff --git a/internal/generator/polynomial/template/pool.go.tmpl b/internal/generator/polynomial/template/pool.go.tmpl
index d3a03c12e..3899d8353 100644
--- a/internal/generator/polynomial/template/pool.go.tmpl
+++ b/internal/generator/polynomial/template/pool.go.tmpl
@@ -194,11 +194,11 @@ func (p *Pool) PrintPoolStats() {
InUse += subPool.stats.InUse
}
- poolsStats := poolsStats{
+ stats := poolsStats{
SubPools: subStats,
InUse: InUse,
}
- serialized, _ := json.MarshalIndent(poolsStats, "", " ")
+ serialized, _ := json.MarshalIndent(stats, "", " ")
fmt.Println(string(serialized))
p.printInUse()
}
From d11bbde7881b03d70cbf756f0799b93ddb6447f9 Mon Sep 17 00:00:00 2001
From: Justin Traglia <95511699+jtraglia@users.noreply.github.com>
Date: Fri, 5 May 2023 15:38:10 -0500
Subject: [PATCH 06/51] Add a bunch of "nosec G404" comments in test code
(#399)
---
ecc/bls12-377/fp/element_test.go | 16 +++++-----
ecc/bls12-377/fr/element_test.go | 16 +++++-----
ecc/bls12-377/hash_to_g1_test.go | 4 +--
ecc/bls12-377/hash_to_g2_test.go | 4 +--
ecc/bls12-377/marshal_test.go | 12 +++----
ecc/bls12-377/multiexp_test.go | 32 +++++++++----------
.../twistededwards/eddsa/eddsa_test.go | 8 ++---
ecc/bls12-377/twistededwards/point_test.go | 2 +-
ecc/bls12-378/fp/element_test.go | 16 +++++-----
ecc/bls12-378/fr/element_test.go | 16 +++++-----
ecc/bls12-378/hash_to_g1_test.go | 4 +--
ecc/bls12-378/marshal_test.go | 12 +++----
ecc/bls12-378/multiexp_test.go | 32 +++++++++----------
.../twistededwards/eddsa/eddsa_test.go | 8 ++---
ecc/bls12-378/twistededwards/point_test.go | 2 +-
.../bandersnatch/eddsa/eddsa_test.go | 8 ++---
ecc/bls12-381/bandersnatch/point_test.go | 2 +-
ecc/bls12-381/fp/element_test.go | 16 +++++-----
ecc/bls12-381/fr/element_test.go | 16 +++++-----
ecc/bls12-381/hash_to_g1_test.go | 4 +--
ecc/bls12-381/hash_to_g2_test.go | 4 +--
ecc/bls12-381/marshal_test.go | 12 +++----
ecc/bls12-381/multiexp_test.go | 32 +++++++++----------
.../twistededwards/eddsa/eddsa_test.go | 8 ++---
ecc/bls12-381/twistededwards/point_test.go | 2 +-
ecc/bls24-315/fp/element_test.go | 16 +++++-----
ecc/bls24-315/fr/element_test.go | 16 +++++-----
ecc/bls24-315/hash_to_g1_test.go | 4 +--
ecc/bls24-315/marshal_test.go | 12 +++----
ecc/bls24-315/multiexp_test.go | 32 +++++++++----------
.../twistededwards/eddsa/eddsa_test.go | 8 ++---
ecc/bls24-315/twistededwards/point_test.go | 2 +-
ecc/bls24-317/fp/element_test.go | 16 +++++-----
ecc/bls24-317/fr/element_test.go | 16 +++++-----
ecc/bls24-317/hash_to_g1_test.go | 4 +--
ecc/bls24-317/marshal_test.go | 12 +++----
ecc/bls24-317/multiexp_test.go | 32 +++++++++----------
.../twistededwards/eddsa/eddsa_test.go | 8 ++---
ecc/bls24-317/twistededwards/point_test.go | 2 +-
ecc/bn254/fp/element_test.go | 16 +++++-----
ecc/bn254/fr/element_test.go | 16 +++++-----
ecc/bn254/hash_to_g1_test.go | 4 +--
ecc/bn254/hash_to_g2_test.go | 4 +--
ecc/bn254/marshal_test.go | 8 ++---
ecc/bn254/multiexp_test.go | 32 +++++++++----------
ecc/bn254/twistededwards/eddsa/eddsa_test.go | 8 ++---
ecc/bn254/twistededwards/point_test.go | 2 +-
ecc/bw6-633/fp/element_test.go | 16 +++++-----
ecc/bw6-633/fr/element_test.go | 16 +++++-----
ecc/bw6-633/hash_to_g1_test.go | 4 +--
ecc/bw6-633/hash_to_g2_test.go | 4 +--
ecc/bw6-633/marshal_test.go | 12 +++----
ecc/bw6-633/multiexp_test.go | 32 +++++++++----------
.../twistededwards/eddsa/eddsa_test.go | 8 ++---
ecc/bw6-633/twistededwards/point_test.go | 2 +-
ecc/bw6-756/fp/element_test.go | 16 +++++-----
ecc/bw6-756/fr/element_test.go | 16 +++++-----
ecc/bw6-756/hash_to_g1_test.go | 4 +--
ecc/bw6-756/hash_to_g2_test.go | 4 +--
ecc/bw6-756/marshal_test.go | 12 +++----
ecc/bw6-756/multiexp_test.go | 32 +++++++++----------
.../twistededwards/eddsa/eddsa_test.go | 8 ++---
ecc/bw6-756/twistededwards/point_test.go | 2 +-
ecc/bw6-761/fp/element_test.go | 16 +++++-----
ecc/bw6-761/fr/element_test.go | 16 +++++-----
ecc/bw6-761/hash_to_g1_test.go | 4 +--
ecc/bw6-761/hash_to_g2_test.go | 4 +--
ecc/bw6-761/marshal_test.go | 12 +++----
ecc/bw6-761/multiexp_test.go | 32 +++++++++----------
.../twistededwards/eddsa/eddsa_test.go | 8 ++---
ecc/bw6-761/twistededwards/point_test.go | 2 +-
ecc/secp256k1/g1_test.go | 2 +-
ecc/secp256k1/hash_to_g1_test.go | 4 +--
ecc/secp256k1/multiexp_test.go | 16 +++++-----
ecc/stark-curve/fp/element_test.go | 16 +++++-----
ecc/stark-curve/fr/element_test.go | 16 +++++-----
ecc/stark-curve/g1_test.go | 2 +-
ecc/stark-curve/hash_to_g1_test.go | 4 +--
ecc/stark-curve/marshal_test.go | 4 +--
.../templates/element/inverse_tests.go | 16 +++++-----
.../ecc/template/tests/hash_to_curve.go.tmpl | 10 +++---
.../ecc/template/tests/marshal.go.tmpl | 20 ++++++------
.../ecc/template/tests/multiexp.go.tmpl | 16 +++++-----
.../ecc/template/tests/point.go.tmpl | 2 +-
.../edwards/eddsa/template/eddsa.test.go.tmpl | 8 ++---
.../edwards/template/tests/point.go.tmpl | 2 +-
86 files changed, 489 insertions(+), 489 deletions(-)
diff --git a/ecc/bls12-377/fp/element_test.go b/ecc/bls12-377/fp/element_test.go
index bf37777eb..a4045c3bc 100644
--- a/ecc/bls12-377/fp/element_test.go
+++ b/ecc/bls12-377/fp/element_test.go
@@ -2384,7 +2384,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2428,7 +2428,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2488,13 +2488,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2764,7 +2764,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2774,7 +2774,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2799,7 +2799,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2808,7 +2808,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bls12-377/fr/element_test.go b/ecc/bls12-377/fr/element_test.go
index 98159a115..819e4d57e 100644
--- a/ecc/bls12-377/fr/element_test.go
+++ b/ecc/bls12-377/fr/element_test.go
@@ -2370,7 +2370,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2412,7 +2412,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2470,13 +2470,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2744,7 +2744,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2754,7 +2754,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2779,7 +2779,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2788,7 +2788,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bls12-377/hash_to_g1_test.go b/ecc/bls12-377/hash_to_g1_test.go
index a5a45d5f0..467aa1c55 100644
--- a/ecc/bls12-377/hash_to_g1_test.go
+++ b/ecc/bls12-377/hash_to_g1_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bls12-377/hash_to_g2_test.go b/ecc/bls12-377/hash_to_g2_test.go
index 79a9e8979..453480234 100644
--- a/ecc/bls12-377/hash_to_g2_test.go
+++ b/ecc/bls12-377/hash_to_g2_test.go
@@ -198,7 +198,7 @@ func BenchmarkEncodeToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG2(bytes, dst); err != nil {
b.Fail()
@@ -214,7 +214,7 @@ func BenchmarkHashToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG2(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bls12-377/marshal_test.go b/ecc/bls12-377/marshal_test.go
index 87dd70bf0..02004b7c8 100644
--- a/ecc/bls12-377/marshal_test.go
+++ b/ecc/bls12-377/marshal_test.go
@@ -54,12 +54,12 @@ func TestEncoder(t *testing.T) {
var inK fr.Vector
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
- inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
inG = make([]G1Affine, 2)
inH = make([]G2Affine, 0)
inG[1] = inD
@@ -219,7 +219,7 @@ func TestIsCompressed(t *testing.T) {
func TestG1AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG1AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G1Affine
buf[0] = 0b111 << 5
@@ -332,7 +332,7 @@ func TestG1AffineSerialization(t *testing.T) {
func TestG2AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG2AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G2Affine
buf[0] = 0b111 << 5
@@ -506,7 +506,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bls12-377/multiexp_test.go b/ecc/bls12-377/multiexp_test.go
index f07f32dd1..16c498e01 100644
--- a/ecc/bls12-377/multiexp_test.go
+++ b/ecc/bls12-377/multiexp_test.go
@@ -59,10 +59,10 @@ func TestMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -244,10 +244,10 @@ func TestCrossMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
@@ -475,10 +475,10 @@ func TestMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -658,10 +658,10 @@ func TestCrossMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
diff --git a/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go b/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go
index 2c2148143..f8681709b 100644
--- a/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go
@@ -59,7 +59,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -101,7 +101,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -144,7 +144,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -187,7 +187,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_BLS12_377.New()
diff --git a/ecc/bls12-377/twistededwards/point_test.go b/ecc/bls12-377/twistededwards/point_test.go
index 950ea15ac..e4b5c5c0b 100644
--- a/ecc/bls12-377/twistededwards/point_test.go
+++ b/ecc/bls12-377/twistededwards/point_test.go
@@ -735,7 +735,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bls12-378/fp/element_test.go b/ecc/bls12-378/fp/element_test.go
index 5eb80277b..0a785a7fe 100644
--- a/ecc/bls12-378/fp/element_test.go
+++ b/ecc/bls12-378/fp/element_test.go
@@ -2384,7 +2384,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2428,7 +2428,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2488,13 +2488,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2764,7 +2764,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2774,7 +2774,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2799,7 +2799,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2808,7 +2808,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bls12-378/fr/element_test.go b/ecc/bls12-378/fr/element_test.go
index e779b000e..bff7017c8 100644
--- a/ecc/bls12-378/fr/element_test.go
+++ b/ecc/bls12-378/fr/element_test.go
@@ -2370,7 +2370,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2412,7 +2412,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2470,13 +2470,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2744,7 +2744,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2754,7 +2754,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2779,7 +2779,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2788,7 +2788,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bls12-378/hash_to_g1_test.go b/ecc/bls12-378/hash_to_g1_test.go
index 74040eb56..bb5795baf 100644
--- a/ecc/bls12-378/hash_to_g1_test.go
+++ b/ecc/bls12-378/hash_to_g1_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bls12-378/marshal_test.go b/ecc/bls12-378/marshal_test.go
index 89693623b..ef0d65dd2 100644
--- a/ecc/bls12-378/marshal_test.go
+++ b/ecc/bls12-378/marshal_test.go
@@ -54,12 +54,12 @@ func TestEncoder(t *testing.T) {
var inK fr.Vector
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
- inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
inG = make([]G1Affine, 2)
inH = make([]G2Affine, 0)
inG[1] = inD
@@ -219,7 +219,7 @@ func TestIsCompressed(t *testing.T) {
func TestG1AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG1AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G1Affine
buf[0] = 0b111 << 5
@@ -332,7 +332,7 @@ func TestG1AffineSerialization(t *testing.T) {
func TestG2AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG2AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G2Affine
buf[0] = 0b111 << 5
@@ -506,7 +506,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bls12-378/multiexp_test.go b/ecc/bls12-378/multiexp_test.go
index bffa3a5d1..f84127642 100644
--- a/ecc/bls12-378/multiexp_test.go
+++ b/ecc/bls12-378/multiexp_test.go
@@ -59,10 +59,10 @@ func TestMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -244,10 +244,10 @@ func TestCrossMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
@@ -475,10 +475,10 @@ func TestMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -658,10 +658,10 @@ func TestCrossMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
diff --git a/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go b/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go
index 14ebba1f1..cd91303d3 100644
--- a/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go
@@ -59,7 +59,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -101,7 +101,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -144,7 +144,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -187,7 +187,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_BLS12_378.New()
diff --git a/ecc/bls12-378/twistededwards/point_test.go b/ecc/bls12-378/twistededwards/point_test.go
index b3baa3e27..f5ae6f170 100644
--- a/ecc/bls12-378/twistededwards/point_test.go
+++ b/ecc/bls12-378/twistededwards/point_test.go
@@ -735,7 +735,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go b/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
index 890b0980b..7541836fa 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
@@ -59,7 +59,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -101,7 +101,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -144,7 +144,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -187,7 +187,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_BLS12_381.New()
diff --git a/ecc/bls12-381/bandersnatch/point_test.go b/ecc/bls12-381/bandersnatch/point_test.go
index d8b8fbc9c..95cc832be 100644
--- a/ecc/bls12-381/bandersnatch/point_test.go
+++ b/ecc/bls12-381/bandersnatch/point_test.go
@@ -735,7 +735,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bls12-381/fp/element_test.go b/ecc/bls12-381/fp/element_test.go
index 69a58b365..2ca4c5101 100644
--- a/ecc/bls12-381/fp/element_test.go
+++ b/ecc/bls12-381/fp/element_test.go
@@ -2384,7 +2384,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2428,7 +2428,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2488,13 +2488,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2764,7 +2764,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2774,7 +2774,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2799,7 +2799,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2808,7 +2808,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bls12-381/fr/element_test.go b/ecc/bls12-381/fr/element_test.go
index af178afa4..40527fda5 100644
--- a/ecc/bls12-381/fr/element_test.go
+++ b/ecc/bls12-381/fr/element_test.go
@@ -2370,7 +2370,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2412,7 +2412,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2470,13 +2470,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2744,7 +2744,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2754,7 +2754,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2779,7 +2779,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2788,7 +2788,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bls12-381/hash_to_g1_test.go b/ecc/bls12-381/hash_to_g1_test.go
index 9ace94ccc..6253f705c 100644
--- a/ecc/bls12-381/hash_to_g1_test.go
+++ b/ecc/bls12-381/hash_to_g1_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bls12-381/hash_to_g2_test.go b/ecc/bls12-381/hash_to_g2_test.go
index 1a29cd5e6..ee12cf792 100644
--- a/ecc/bls12-381/hash_to_g2_test.go
+++ b/ecc/bls12-381/hash_to_g2_test.go
@@ -198,7 +198,7 @@ func BenchmarkEncodeToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG2(bytes, dst); err != nil {
b.Fail()
@@ -214,7 +214,7 @@ func BenchmarkHashToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG2(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bls12-381/marshal_test.go b/ecc/bls12-381/marshal_test.go
index 7080b13d7..681217d6a 100644
--- a/ecc/bls12-381/marshal_test.go
+++ b/ecc/bls12-381/marshal_test.go
@@ -54,12 +54,12 @@ func TestEncoder(t *testing.T) {
var inK fr.Vector
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
- inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
inG = make([]G1Affine, 2)
inH = make([]G2Affine, 0)
inG[1] = inD
@@ -219,7 +219,7 @@ func TestIsCompressed(t *testing.T) {
func TestG1AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG1AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G1Affine
buf[0] = 0b111 << 5
@@ -332,7 +332,7 @@ func TestG1AffineSerialization(t *testing.T) {
func TestG2AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG2AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G2Affine
buf[0] = 0b111 << 5
@@ -506,7 +506,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bls12-381/multiexp_test.go b/ecc/bls12-381/multiexp_test.go
index 64b5a0348..cf4676b2e 100644
--- a/ecc/bls12-381/multiexp_test.go
+++ b/ecc/bls12-381/multiexp_test.go
@@ -59,10 +59,10 @@ func TestMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -244,10 +244,10 @@ func TestCrossMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
@@ -475,10 +475,10 @@ func TestMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -658,10 +658,10 @@ func TestCrossMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
diff --git a/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go b/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go
index 890b0980b..7541836fa 100644
--- a/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go
@@ -59,7 +59,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -101,7 +101,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -144,7 +144,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -187,7 +187,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_BLS12_381.New()
diff --git a/ecc/bls12-381/twistededwards/point_test.go b/ecc/bls12-381/twistededwards/point_test.go
index 0d5bf5cb0..b3af05cc5 100644
--- a/ecc/bls12-381/twistededwards/point_test.go
+++ b/ecc/bls12-381/twistededwards/point_test.go
@@ -735,7 +735,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bls24-315/fp/element_test.go b/ecc/bls24-315/fp/element_test.go
index a0a9ec427..68abac875 100644
--- a/ecc/bls24-315/fp/element_test.go
+++ b/ecc/bls24-315/fp/element_test.go
@@ -2377,7 +2377,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2420,7 +2420,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2479,13 +2479,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2754,7 +2754,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2764,7 +2764,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2789,7 +2789,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2798,7 +2798,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bls24-315/fr/element_test.go b/ecc/bls24-315/fr/element_test.go
index 2b17883c0..2000441ed 100644
--- a/ecc/bls24-315/fr/element_test.go
+++ b/ecc/bls24-315/fr/element_test.go
@@ -2370,7 +2370,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2412,7 +2412,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2470,13 +2470,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2744,7 +2744,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2754,7 +2754,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2779,7 +2779,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2788,7 +2788,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bls24-315/hash_to_g1_test.go b/ecc/bls24-315/hash_to_g1_test.go
index bdbbcf42f..af66a2c63 100644
--- a/ecc/bls24-315/hash_to_g1_test.go
+++ b/ecc/bls24-315/hash_to_g1_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bls24-315/marshal_test.go b/ecc/bls24-315/marshal_test.go
index 553c5e1b3..bfb70098d 100644
--- a/ecc/bls24-315/marshal_test.go
+++ b/ecc/bls24-315/marshal_test.go
@@ -54,12 +54,12 @@ func TestEncoder(t *testing.T) {
var inK fr.Vector
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
- inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
inG = make([]G1Affine, 2)
inH = make([]G2Affine, 0)
inG[1] = inD
@@ -219,7 +219,7 @@ func TestIsCompressed(t *testing.T) {
func TestG1AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG1AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G1Affine
buf[0] = 0b111 << 5
@@ -332,7 +332,7 @@ func TestG1AffineSerialization(t *testing.T) {
func TestG2AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG2AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G2Affine
buf[0] = 0b111 << 5
@@ -516,7 +516,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bls24-315/multiexp_test.go b/ecc/bls24-315/multiexp_test.go
index b4f5e17db..7a6a2e75e 100644
--- a/ecc/bls24-315/multiexp_test.go
+++ b/ecc/bls24-315/multiexp_test.go
@@ -59,10 +59,10 @@ func TestMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -244,10 +244,10 @@ func TestCrossMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
@@ -475,10 +475,10 @@ func TestMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -658,10 +658,10 @@ func TestCrossMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
diff --git a/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go b/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go
index 2ca085f9c..a0cc2a163 100644
--- a/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go
@@ -59,7 +59,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -101,7 +101,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -144,7 +144,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -187,7 +187,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_BLS24_315.New()
diff --git a/ecc/bls24-315/twistededwards/point_test.go b/ecc/bls24-315/twistededwards/point_test.go
index 6c96a37f9..3f0a43244 100644
--- a/ecc/bls24-315/twistededwards/point_test.go
+++ b/ecc/bls24-315/twistededwards/point_test.go
@@ -735,7 +735,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bls24-317/fp/element_test.go b/ecc/bls24-317/fp/element_test.go
index f140e8004..1324638f0 100644
--- a/ecc/bls24-317/fp/element_test.go
+++ b/ecc/bls24-317/fp/element_test.go
@@ -2377,7 +2377,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2420,7 +2420,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2479,13 +2479,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2754,7 +2754,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2764,7 +2764,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2789,7 +2789,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2798,7 +2798,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bls24-317/fr/element_test.go b/ecc/bls24-317/fr/element_test.go
index 456de1334..37cabe823 100644
--- a/ecc/bls24-317/fr/element_test.go
+++ b/ecc/bls24-317/fr/element_test.go
@@ -2370,7 +2370,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2412,7 +2412,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2470,13 +2470,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2744,7 +2744,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2754,7 +2754,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2779,7 +2779,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2788,7 +2788,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bls24-317/hash_to_g1_test.go b/ecc/bls24-317/hash_to_g1_test.go
index e287586e0..c74036999 100644
--- a/ecc/bls24-317/hash_to_g1_test.go
+++ b/ecc/bls24-317/hash_to_g1_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bls24-317/marshal_test.go b/ecc/bls24-317/marshal_test.go
index 98eb09e68..01bde9d86 100644
--- a/ecc/bls24-317/marshal_test.go
+++ b/ecc/bls24-317/marshal_test.go
@@ -54,12 +54,12 @@ func TestEncoder(t *testing.T) {
var inK fr.Vector
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
- inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
inG = make([]G1Affine, 2)
inH = make([]G2Affine, 0)
inG[1] = inD
@@ -219,7 +219,7 @@ func TestIsCompressed(t *testing.T) {
func TestG1AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG1AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G1Affine
buf[0] = 0b111 << 5
@@ -332,7 +332,7 @@ func TestG1AffineSerialization(t *testing.T) {
func TestG2AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG2AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G2Affine
buf[0] = 0b111 << 5
@@ -516,7 +516,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bls24-317/multiexp_test.go b/ecc/bls24-317/multiexp_test.go
index 44196e0c0..638c59255 100644
--- a/ecc/bls24-317/multiexp_test.go
+++ b/ecc/bls24-317/multiexp_test.go
@@ -59,10 +59,10 @@ func TestMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -244,10 +244,10 @@ func TestCrossMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
@@ -475,10 +475,10 @@ func TestMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -658,10 +658,10 @@ func TestCrossMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
diff --git a/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go b/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go
index b480a83fe..6f12c390a 100644
--- a/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go
@@ -59,7 +59,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -101,7 +101,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -144,7 +144,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -187,7 +187,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_BLS24_317.New()
diff --git a/ecc/bls24-317/twistededwards/point_test.go b/ecc/bls24-317/twistededwards/point_test.go
index 2da327d28..8a8def1c8 100644
--- a/ecc/bls24-317/twistededwards/point_test.go
+++ b/ecc/bls24-317/twistededwards/point_test.go
@@ -735,7 +735,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bn254/fp/element_test.go b/ecc/bn254/fp/element_test.go
index db8137828..51db5e1e3 100644
--- a/ecc/bn254/fp/element_test.go
+++ b/ecc/bn254/fp/element_test.go
@@ -2370,7 +2370,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2412,7 +2412,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2470,13 +2470,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2744,7 +2744,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2754,7 +2754,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2779,7 +2779,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2788,7 +2788,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bn254/fr/element_test.go b/ecc/bn254/fr/element_test.go
index da53c913e..47d3eac90 100644
--- a/ecc/bn254/fr/element_test.go
+++ b/ecc/bn254/fr/element_test.go
@@ -2370,7 +2370,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2412,7 +2412,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2470,13 +2470,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2744,7 +2744,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2754,7 +2754,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2779,7 +2779,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2788,7 +2788,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bn254/hash_to_g1_test.go b/ecc/bn254/hash_to_g1_test.go
index 0a18db90f..98ee9b89b 100644
--- a/ecc/bn254/hash_to_g1_test.go
+++ b/ecc/bn254/hash_to_g1_test.go
@@ -151,7 +151,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -167,7 +167,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bn254/hash_to_g2_test.go b/ecc/bn254/hash_to_g2_test.go
index 9804d4713..de7f103cb 100644
--- a/ecc/bn254/hash_to_g2_test.go
+++ b/ecc/bn254/hash_to_g2_test.go
@@ -153,7 +153,7 @@ func BenchmarkEncodeToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG2(bytes, dst); err != nil {
b.Fail()
@@ -169,7 +169,7 @@ func BenchmarkHashToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG2(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bn254/marshal_test.go b/ecc/bn254/marshal_test.go
index 45504bdf5..67f3f9a6c 100644
--- a/ecc/bn254/marshal_test.go
+++ b/ecc/bn254/marshal_test.go
@@ -54,12 +54,12 @@ func TestEncoder(t *testing.T) {
var inK fr.Vector
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
- inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
inG = make([]G1Affine, 2)
inH = make([]G2Affine, 0)
inG[1] = inD
@@ -466,7 +466,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bn254/multiexp_test.go b/ecc/bn254/multiexp_test.go
index b0aca8e31..a6ce9fe66 100644
--- a/ecc/bn254/multiexp_test.go
+++ b/ecc/bn254/multiexp_test.go
@@ -59,10 +59,10 @@ func TestMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -244,10 +244,10 @@ func TestCrossMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
@@ -475,10 +475,10 @@ func TestMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -658,10 +658,10 @@ func TestCrossMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
diff --git a/ecc/bn254/twistededwards/eddsa/eddsa_test.go b/ecc/bn254/twistededwards/eddsa/eddsa_test.go
index eb23ddd96..78a2efb88 100644
--- a/ecc/bn254/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bn254/twistededwards/eddsa/eddsa_test.go
@@ -59,7 +59,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -101,7 +101,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -144,7 +144,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -187,7 +187,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_BN254.New()
diff --git a/ecc/bn254/twistededwards/point_test.go b/ecc/bn254/twistededwards/point_test.go
index c8434cff6..d070082b9 100644
--- a/ecc/bn254/twistededwards/point_test.go
+++ b/ecc/bn254/twistededwards/point_test.go
@@ -735,7 +735,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bw6-633/fp/element_test.go b/ecc/bw6-633/fp/element_test.go
index 6bf72df13..08729f0be 100644
--- a/ecc/bw6-633/fp/element_test.go
+++ b/ecc/bw6-633/fp/element_test.go
@@ -2412,7 +2412,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2460,7 +2460,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2524,13 +2524,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2804,7 +2804,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2814,7 +2814,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2839,7 +2839,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2848,7 +2848,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bw6-633/fr/element_test.go b/ecc/bw6-633/fr/element_test.go
index 0a12af05b..b69182ef4 100644
--- a/ecc/bw6-633/fr/element_test.go
+++ b/ecc/bw6-633/fr/element_test.go
@@ -2377,7 +2377,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2420,7 +2420,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2479,13 +2479,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2754,7 +2754,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2764,7 +2764,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2789,7 +2789,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2798,7 +2798,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bw6-633/hash_to_g1_test.go b/ecc/bw6-633/hash_to_g1_test.go
index 7e8814aa3..986a4d7d0 100644
--- a/ecc/bw6-633/hash_to_g1_test.go
+++ b/ecc/bw6-633/hash_to_g1_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bw6-633/hash_to_g2_test.go b/ecc/bw6-633/hash_to_g2_test.go
index 44371b4dd..75daa9960 100644
--- a/ecc/bw6-633/hash_to_g2_test.go
+++ b/ecc/bw6-633/hash_to_g2_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG2(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG2(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bw6-633/marshal_test.go b/ecc/bw6-633/marshal_test.go
index beec029d4..a5325d26a 100644
--- a/ecc/bw6-633/marshal_test.go
+++ b/ecc/bw6-633/marshal_test.go
@@ -54,12 +54,12 @@ func TestEncoder(t *testing.T) {
var inK fr.Vector
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
- inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
inG = make([]G1Affine, 2)
inH = make([]G2Affine, 0)
inG[1] = inD
@@ -219,7 +219,7 @@ func TestIsCompressed(t *testing.T) {
func TestG1AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG1AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G1Affine
buf[0] = 0b111 << 5
@@ -332,7 +332,7 @@ func TestG1AffineSerialization(t *testing.T) {
func TestG2AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG2AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G2Affine
buf[0] = 0b111 << 5
@@ -496,7 +496,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bw6-633/multiexp_test.go b/ecc/bw6-633/multiexp_test.go
index e17370e5e..b36d3db65 100644
--- a/ecc/bw6-633/multiexp_test.go
+++ b/ecc/bw6-633/multiexp_test.go
@@ -59,10 +59,10 @@ func TestMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -244,10 +244,10 @@ func TestCrossMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
@@ -475,10 +475,10 @@ func TestMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -658,10 +658,10 @@ func TestCrossMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
diff --git a/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go b/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go
index a3e75f5c4..0ed2470d4 100644
--- a/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go
@@ -59,7 +59,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -101,7 +101,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -144,7 +144,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -187,7 +187,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_BW6_633.New()
diff --git a/ecc/bw6-633/twistededwards/point_test.go b/ecc/bw6-633/twistededwards/point_test.go
index 0ffa87454..e9fcb4347 100644
--- a/ecc/bw6-633/twistededwards/point_test.go
+++ b/ecc/bw6-633/twistededwards/point_test.go
@@ -735,7 +735,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bw6-756/fp/element_test.go b/ecc/bw6-756/fp/element_test.go
index d5197424e..e500871a6 100644
--- a/ecc/bw6-756/fp/element_test.go
+++ b/ecc/bw6-756/fp/element_test.go
@@ -2426,7 +2426,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2476,7 +2476,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2542,13 +2542,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2824,7 +2824,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2834,7 +2834,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2859,7 +2859,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2868,7 +2868,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bw6-756/fr/element_test.go b/ecc/bw6-756/fr/element_test.go
index 58c1502e6..1a040e856 100644
--- a/ecc/bw6-756/fr/element_test.go
+++ b/ecc/bw6-756/fr/element_test.go
@@ -2384,7 +2384,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2428,7 +2428,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2488,13 +2488,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2764,7 +2764,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2774,7 +2774,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2799,7 +2799,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2808,7 +2808,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bw6-756/hash_to_g1_test.go b/ecc/bw6-756/hash_to_g1_test.go
index 230a841d9..ffa80a08f 100644
--- a/ecc/bw6-756/hash_to_g1_test.go
+++ b/ecc/bw6-756/hash_to_g1_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bw6-756/hash_to_g2_test.go b/ecc/bw6-756/hash_to_g2_test.go
index 77d526ffa..f444e2a1d 100644
--- a/ecc/bw6-756/hash_to_g2_test.go
+++ b/ecc/bw6-756/hash_to_g2_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG2(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG2(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bw6-756/marshal_test.go b/ecc/bw6-756/marshal_test.go
index c706745f4..0b4fb5df3 100644
--- a/ecc/bw6-756/marshal_test.go
+++ b/ecc/bw6-756/marshal_test.go
@@ -54,12 +54,12 @@ func TestEncoder(t *testing.T) {
var inK fr.Vector
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
- inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
inG = make([]G1Affine, 2)
inH = make([]G2Affine, 0)
inG[1] = inD
@@ -219,7 +219,7 @@ func TestIsCompressed(t *testing.T) {
func TestG1AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG1AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G1Affine
buf[0] = 0b111 << 5
@@ -332,7 +332,7 @@ func TestG1AffineSerialization(t *testing.T) {
func TestG2AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG2AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G2Affine
buf[0] = 0b111 << 5
@@ -496,7 +496,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bw6-756/multiexp_test.go b/ecc/bw6-756/multiexp_test.go
index e45d451a8..a944459b7 100644
--- a/ecc/bw6-756/multiexp_test.go
+++ b/ecc/bw6-756/multiexp_test.go
@@ -59,10 +59,10 @@ func TestMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -244,10 +244,10 @@ func TestCrossMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
@@ -475,10 +475,10 @@ func TestMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -658,10 +658,10 @@ func TestCrossMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
diff --git a/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go b/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go
index b83ba2805..a0258d121 100644
--- a/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go
@@ -59,7 +59,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -101,7 +101,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -144,7 +144,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -187,7 +187,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_BW6_756.New()
diff --git a/ecc/bw6-756/twistededwards/point_test.go b/ecc/bw6-756/twistededwards/point_test.go
index fc5347fb0..9b28026a6 100644
--- a/ecc/bw6-756/twistededwards/point_test.go
+++ b/ecc/bw6-756/twistededwards/point_test.go
@@ -735,7 +735,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bw6-761/fp/element_test.go b/ecc/bw6-761/fp/element_test.go
index 6e0d6beea..4bdf251c7 100644
--- a/ecc/bw6-761/fp/element_test.go
+++ b/ecc/bw6-761/fp/element_test.go
@@ -2426,7 +2426,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2476,7 +2476,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2542,13 +2542,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2824,7 +2824,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2834,7 +2834,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2859,7 +2859,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2868,7 +2868,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bw6-761/fr/element_test.go b/ecc/bw6-761/fr/element_test.go
index a42aef5f3..dafeea8ed 100644
--- a/ecc/bw6-761/fr/element_test.go
+++ b/ecc/bw6-761/fr/element_test.go
@@ -2384,7 +2384,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2428,7 +2428,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2488,13 +2488,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2764,7 +2764,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2774,7 +2774,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2799,7 +2799,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2808,7 +2808,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/bw6-761/hash_to_g1_test.go b/ecc/bw6-761/hash_to_g1_test.go
index ddfc96c56..db33614c6 100644
--- a/ecc/bw6-761/hash_to_g1_test.go
+++ b/ecc/bw6-761/hash_to_g1_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bw6-761/hash_to_g2_test.go b/ecc/bw6-761/hash_to_g2_test.go
index a030e271b..e669c88c5 100644
--- a/ecc/bw6-761/hash_to_g2_test.go
+++ b/ecc/bw6-761/hash_to_g2_test.go
@@ -196,7 +196,7 @@ func BenchmarkEncodeToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG2(bytes, dst); err != nil {
b.Fail()
@@ -212,7 +212,7 @@ func BenchmarkHashToG2(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG2(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/bw6-761/marshal_test.go b/ecc/bw6-761/marshal_test.go
index 452f68177..1801fb2e0 100644
--- a/ecc/bw6-761/marshal_test.go
+++ b/ecc/bw6-761/marshal_test.go
@@ -54,12 +54,12 @@ func TestEncoder(t *testing.T) {
var inK fr.Vector
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
- inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
inG = make([]G1Affine, 2)
inH = make([]G2Affine, 0)
inG[1] = inD
@@ -219,7 +219,7 @@ func TestIsCompressed(t *testing.T) {
func TestG1AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG1AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G1Affine
buf[0] = 0b111 << 5
@@ -332,7 +332,7 @@ func TestG1AffineSerialization(t *testing.T) {
func TestG2AffineInvalidBitMask(t *testing.T) {
t.Parallel()
var buf [SizeOfG2AffineCompressed]byte
- rand.Read(buf[:])
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p G2Affine
buf[0] = 0b111 << 5
@@ -496,7 +496,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/bw6-761/multiexp_test.go b/ecc/bw6-761/multiexp_test.go
index 05173f16a..13e025fa2 100644
--- a/ecc/bw6-761/multiexp_test.go
+++ b/ecc/bw6-761/multiexp_test.go
@@ -59,10 +59,10 @@ func TestMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -244,10 +244,10 @@ func TestCrossMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
@@ -475,10 +475,10 @@ func TestMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -658,10 +658,10 @@ func TestCrossMultiExpG2(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
diff --git a/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go b/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go
index 9e145fbaa..a5654456a 100644
--- a/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go
@@ -59,7 +59,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -101,7 +101,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -144,7 +144,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -187,7 +187,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_BW6_761.New()
diff --git a/ecc/bw6-761/twistededwards/point_test.go b/ecc/bw6-761/twistededwards/point_test.go
index 56225dc1b..eae940691 100644
--- a/ecc/bw6-761/twistededwards/point_test.go
+++ b/ecc/bw6-761/twistededwards/point_test.go
@@ -735,7 +735,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/secp256k1/g1_test.go b/ecc/secp256k1/g1_test.go
index a88a358f6..2dae2547f 100644
--- a/ecc/secp256k1/g1_test.go
+++ b/ecc/secp256k1/g1_test.go
@@ -716,7 +716,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/secp256k1/hash_to_g1_test.go b/ecc/secp256k1/hash_to_g1_test.go
index e4d31d0d1..fe00906fc 100644
--- a/ecc/secp256k1/hash_to_g1_test.go
+++ b/ecc/secp256k1/hash_to_g1_test.go
@@ -151,7 +151,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -167,7 +167,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/secp256k1/multiexp_test.go b/ecc/secp256k1/multiexp_test.go
index b3f2e74f3..08996728a 100644
--- a/ecc/secp256k1/multiexp_test.go
+++ b/ecc/secp256k1/multiexp_test.go
@@ -59,10 +59,10 @@ func TestMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -244,10 +244,10 @@ func TestCrossMultiExpG1(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
fillBenchScalars(sampleScalars[:])
diff --git a/ecc/stark-curve/fp/element_test.go b/ecc/stark-curve/fp/element_test.go
index e76f65c3a..897893cdf 100644
--- a/ecc/stark-curve/fp/element_test.go
+++ b/ecc/stark-curve/fp/element_test.go
@@ -2370,7 +2370,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2412,7 +2412,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2470,13 +2470,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2744,7 +2744,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2754,7 +2754,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2779,7 +2779,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2788,7 +2788,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/stark-curve/fr/element_test.go b/ecc/stark-curve/fr/element_test.go
index a91d22944..f983e8e78 100644
--- a/ecc/stark-curve/fr/element_test.go
+++ b/ecc/stark-curve/fr/element_test.go
@@ -2322,7 +2322,7 @@ func TestElementInversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs-j] = 0
}
@@ -2364,7 +2364,7 @@ func TestElementLinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -2422,13 +2422,13 @@ func TestElementBigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func TestElementVeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x Element
x.SetRandom()
var xInt big.Int
@@ -2696,7 +2696,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -2706,7 +2706,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -2731,7 +2731,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -2740,7 +2740,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/ecc/stark-curve/g1_test.go b/ecc/stark-curve/g1_test.go
index a88306b32..b8062a8b0 100644
--- a/ecc/stark-curve/g1_test.go
+++ b/ecc/stark-curve/g1_test.go
@@ -66,7 +66,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/ecc/stark-curve/hash_to_g1_test.go b/ecc/stark-curve/hash_to_g1_test.go
index b53f89bba..b180e6952 100644
--- a/ecc/stark-curve/hash_to_g1_test.go
+++ b/ecc/stark-curve/hash_to_g1_test.go
@@ -151,7 +151,7 @@ func BenchmarkEncodeToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeToG1(bytes, dst); err != nil {
b.Fail()
@@ -167,7 +167,7 @@ func BenchmarkHashToG1(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashToG1(bytes, dst); err != nil {
b.Fail()
diff --git a/ecc/stark-curve/marshal_test.go b/ecc/stark-curve/marshal_test.go
index 470f6fc0f..21a2fea2b 100644
--- a/ecc/stark-curve/marshal_test.go
+++ b/ecc/stark-curve/marshal_test.go
@@ -44,10 +44,10 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
inG = make([]G1Affine, 2)
inG[1] = inD
diff --git a/field/generator/internal/templates/element/inverse_tests.go b/field/generator/internal/templates/element/inverse_tests.go
index d85d1ead8..6631658cc 100644
--- a/field/generator/internal/templates/element/inverse_tests.go
+++ b/field/generator/internal/templates/element/inverse_tests.go
@@ -10,7 +10,7 @@ func Test{{.ElementName}}InversionApproximation(t *testing.T) {
x.SetRandom()
// Normally small elements are unlikely. Here we give them a higher chance
- xZeros := mrand.Int() % Limbs
+ xZeros := mrand.Int() % Limbs //#nosec G404 weak rng is fine here
for j := 1; j < xZeros; j++ {
x[Limbs - j] = 0
}
@@ -51,7 +51,7 @@ func Test{{.ElementName}}LinearComb(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
y.SetRandom()
- testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63())
+ testLinearComb(t, &x, mrand.Int63(), &y, mrand.Int63()) //#nosec G404 weak rng is fine here
}
}
@@ -108,13 +108,13 @@ func Test{{.ElementName}}BigNumWMul(t *testing.T) {
for i := 0; i < 1000; i++ {
x.SetRandom()
- w := mrand.Int63()
+ w := mrand.Int63() //#nosec G404 weak rng is fine here
testBigNumWMul(t, &x, w)
}
}
func Test{{.ElementName}}VeryBigIntConversion(t *testing.T) {
- xHi := mrand.Uint64()
+ xHi := mrand.Uint64() //#nosec G404 weak rng is fine here
var x {{.ElementName}}
x.SetRandom()
var xInt big.Int
@@ -385,7 +385,7 @@ func TestUpdateFactorsRandomization(t *testing.T) {
func randomizeUpdateFactor(absLimit uint32) int64 {
const maxSizeLikelihood = 10
- maxSize := mrand.Intn(maxSizeLikelihood)
+ maxSize := mrand.Intn(maxSizeLikelihood) //#nosec G404 weak rng is fine here
absLimit64 := int64(absLimit)
var f int64
@@ -395,7 +395,7 @@ func randomizeUpdateFactor(absLimit uint32) int64 {
case 1:
f = -absLimit64
default:
- f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64
+ f = int64(mrand.Uint64()%(2*uint64(absLimit64)+1)) - absLimit64 //#nosec G404 weak rng is fine here
}
if f > 1<<31 {
@@ -420,7 +420,7 @@ func abs64T32(f int64) uint32 {
func randomizeUpdateFactors() (int64, int64) {
var f [2]int64
- b := mrand.Int() % 2
+ b := mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b] = randomizeUpdateFactor(1 << 31)
@@ -429,7 +429,7 @@ func randomizeUpdateFactors() (int64, int64) {
//Patching another edge case
if f[0]+f[1] == -1<<31 {
- b = mrand.Int() % 2
+ b = mrand.Int() % 2 //#nosec G404 weak rng is fine here
f[b]++
}
diff --git a/internal/generator/ecc/template/tests/hash_to_curve.go.tmpl b/internal/generator/ecc/template/tests/hash_to_curve.go.tmpl
index 5cd6e2f00..a44edff7a 100644
--- a/internal/generator/ecc/template/tests/hash_to_curve.go.tmpl
+++ b/internal/generator/ecc/template/tests/hash_to_curve.go.tmpl
@@ -38,9 +38,9 @@ func Test{{$CurveTitle}}SqrtRatio(t *testing.T) {
properties := gopter.NewProperties(parameters)
-
+
gen := {{$fuzzer}}
-
+
properties.Property("{{$CurveTitle}}SqrtRatio must square back to the right value", prop.ForAll(
func(u {{$CoordType}}, v {{$CoordType}}) bool {
@@ -205,7 +205,7 @@ func BenchmarkEncodeTo{{$CurveTitle}}(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := EncodeTo{{$CurveTitle}}(bytes, dst); err != nil {
b.Fail()
@@ -221,7 +221,7 @@ func BenchmarkHashTo{{$CurveTitle}}(b *testing.B) {
for i := 0; i < b.N; i++ {
- bytes[rand.Int()%size] = byte(rand.Int())
+ bytes[rand.Int()%size] = byte(rand.Int()) //#nosec G404 weak rng is fine here
if _, err := HashTo{{$CurveTitle}}(bytes, dst); err != nil {
b.Fail()
@@ -293,7 +293,7 @@ func {{$CurveName}}CoordAt(slice []fp.Element, i int) {{$CoordType}} {
func {{$CurveName}}TestMatchCoord(t *testing.T, coordName string, msg string, expectedStr string, seen {{$CoordType}}) {
var expected {{$CoordType}}
-
+
{{$CurveName}}CoordSetString(&expected, expectedStr)
if !expected.Equal(&seen) {
diff --git a/internal/generator/ecc/template/tests/marshal.go.tmpl b/internal/generator/ecc/template/tests/marshal.go.tmpl
index 50ffd5651..9ca3df8e0 100644
--- a/internal/generator/ecc/template/tests/marshal.go.tmpl
+++ b/internal/generator/ecc/template/tests/marshal.go.tmpl
@@ -44,12 +44,12 @@ func TestEncoder(t *testing.T) {
var inK fr.Vector
// set values of inputs
- inA = rand.Uint64()
+ inA = rand.Uint64() //#nosec G404 weak rng is fine here
inB.SetRandom()
inC.SetRandom()
- inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inD.ScalarMultiplication(&g1GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
// inE --> infinity
- inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64()))
+ inF.ScalarMultiplication(&g2GenAff, new(big.Int).SetUint64(rand.Uint64())) //#nosec G404 weak rng is fine here
inG = make([]G1Affine, 2)
inH = make([]G2Affine, 0)
inG[1] = inD
@@ -227,8 +227,8 @@ func TestIsCompressed(t *testing.T) {
{{if ge $.FpUnusedBits 3}}
func Test{{ $.TAffine }}InvalidBitMask(t *testing.T) {
t.Parallel()
- var buf [SizeOf{{ $.TAffine }}Compressed]byte
- rand.Read(buf[:])
+ var buf [SizeOf{{ $.TAffine }}Compressed]byte
+ rand.Read(buf[:]) //#nosec G404 weak rng is fine here
var p {{ $.TAffine }}
buf[0] = 0b111 << 5
@@ -352,11 +352,11 @@ func Test{{ $.TAffine }}Serialization(t *testing.T) {
func GenFr() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var elmt fr.Element
-
+
if _, err := elmt.SetRandom(); err != nil {
panic(err)
}
-
+
return gopter.NewGenResult(elmt, gopter.NoShrinker)
}
}
@@ -365,11 +365,11 @@ func GenFr() gopter.Gen {
func GenFp() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var elmt fp.Element
-
+
if _, err := elmt.SetRandom(); err != nil {
panic(err)
}
-
+
return gopter.NewGenResult(elmt, gopter.NoShrinker)
}
}
@@ -472,7 +472,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/internal/generator/ecc/template/tests/multiexp.go.tmpl b/internal/generator/ecc/template/tests/multiexp.go.tmpl
index e6bf73409..0201ada49 100644
--- a/internal/generator/ecc/template/tests/multiexp.go.tmpl
+++ b/internal/generator/ecc/template/tests/multiexp.go.tmpl
@@ -61,10 +61,10 @@ func TestMultiExp{{$.UPointName}}(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
// final scalar to use in double and add method (without mixer factor)
// n(n+1)(2n+1)/6 (sum of the squares from 1 to n)
@@ -260,10 +260,10 @@ func TestCrossMultiExp{{ $.UPointName }}(t *testing.T) {
// sprinkle some points at infinity
rand.Seed(time.Now().UnixNano())
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
- samplePoints[rand.Intn(nbSamples)].setInfinity()
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
+ samplePoints[rand.Intn(nbSamples)].setInfinity() //#nosec G404 weak rng is fine here
var sampleScalars [nbSamples]fr.Element
diff --git a/internal/generator/ecc/template/tests/point.go.tmpl b/internal/generator/ecc/template/tests/point.go.tmpl
index 23b67956c..932221628 100644
--- a/internal/generator/ecc/template/tests/point.go.tmpl
+++ b/internal/generator/ecc/template/tests/point.go.tmpl
@@ -840,7 +840,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fp.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
diff --git a/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl b/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl
index 7cb21bd85..b2bf054a8 100644
--- a/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl
+++ b/internal/generator/edwards/eddsa/template/eddsa.test.go.tmpl
@@ -42,7 +42,7 @@ func Example() {
func TestSerialization(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
privKey1, err := GenerateKey(r)
if err != nil {
@@ -84,7 +84,7 @@ func TestSerialization(t *testing.T) {
func TestEddsaMIMC(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
// create eddsa obj and sign a message
privKey, err := GenerateKey(r)
@@ -127,7 +127,7 @@ func TestEddsaMIMC(t *testing.T) {
func TestEddsaSHA256(t *testing.T) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := sha256.New()
@@ -170,7 +170,7 @@ func TestEddsaSHA256(t *testing.T) {
func BenchmarkVerify(b *testing.B) {
src := rand.NewSource(0)
- r := rand.New(src)
+ r := rand.New(src) //#nosec G404 weak rng is fine here
hFunc := hash.MIMC_{{ .EnumID }}.New()
diff --git a/internal/generator/edwards/template/tests/point.go.tmpl b/internal/generator/edwards/template/tests/point.go.tmpl
index 650dd93d4..e0bf457c8 100644
--- a/internal/generator/edwards/template/tests/point.go.tmpl
+++ b/internal/generator/edwards/template/tests/point.go.tmpl
@@ -719,7 +719,7 @@ func GenBigInt() gopter.Gen {
return func(genParams *gopter.GenParameters) *gopter.GenResult {
var s big.Int
var b [fr.Bytes]byte
- _, err := rand.Read(b[:])
+ _, err := rand.Read(b[:]) //#nosec G404 weak rng is fine here
if err != nil {
panic(err)
}
From 133446addf3be704e2ffb4683e903d037511a218 Mon Sep 17 00:00:00 2001
From: Justin Traglia <95511699+jtraglia@users.noreply.github.com>
Date: Fri, 5 May 2023 15:44:20 -0500
Subject: [PATCH 07/51] Enable misspell linter & fix findings (#401)
---
.golangci.yml | 2 +-
ecc/stark-curve/pedersen-hash/pedersen_hash_test.go | 4 ++--
internal/bench/main.go | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.golangci.yml b/.golangci.yml
index 2d9c8b2f6..04ae36669 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -7,7 +7,7 @@ linters:
- gosimple
- govet
- ineffassign
- # - errcheck
+ - misspell
run:
issues-exit-code: 1
\ No newline at end of file
diff --git a/ecc/stark-curve/pedersen-hash/pedersen_hash_test.go b/ecc/stark-curve/pedersen-hash/pedersen_hash_test.go
index 638257b99..fbd562c13 100644
--- a/ecc/stark-curve/pedersen-hash/pedersen_hash_test.go
+++ b/ecc/stark-curve/pedersen-hash/pedersen_hash_test.go
@@ -146,12 +146,12 @@ func BenchmarkPedersenArray(b *testing.B) {
func BenchmarkPedersen(b *testing.B) {
e0, err := new(fp.Element).SetString("0x3d937c035c878245caf64531a5756109c53068da139362728feb561405371cb")
if err != nil {
- b.Errorf("Error occured %s", err)
+ b.Errorf("Error occurred %s", err)
}
e1, err := new(fp.Element).SetString("0x208a0a10250e382e1e4bbe2880906c2791bf6275695e02fbbc6aeff9cd8b31a")
if err != nil {
- b.Errorf("Error occured %s", err)
+ b.Errorf("Error occurred %s", err)
}
var f fp.Element
diff --git a/internal/bench/main.go b/internal/bench/main.go
index 3611d10ec..5c09bd2f3 100644
--- a/internal/bench/main.go
+++ b/internal/bench/main.go
@@ -18,7 +18,7 @@ type entry struct {
}
func main() {
- // quick and dirty helper to benchmark field elements accross branches
+ // quick and dirty helper to benchmark field elements across branches
var entries []entry
err := filepath.WalkDir("../../ecc", func(path string, d fs.DirEntry, err error) error {
From d084e89346e4f30a74a221c63a0e55a4d6c2c4cd Mon Sep 17 00:00:00 2001
From: AlexandreBelling
Date: Mon, 8 May 2023 04:48:06 +0200
Subject: [PATCH 08/51] copy with fresh buffer now also copies all bufM,
bufMValues, bufRes (#402)
---
ecc/bn254/fr/sis/sis.go | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ecc/bn254/fr/sis/sis.go b/ecc/bn254/fr/sis/sis.go
index 494bdef35..e3af02026 100644
--- a/ecc/bn254/fr/sis/sis.go
+++ b/ecc/bn254/fr/sis/sis.go
@@ -287,6 +287,9 @@ func mulModAcc(res []fr.Element, pLagrangeCosetBitReversed, qLagrangeCosetBitRev
func (r *RSis) CopyWithFreshBuffer() RSis {
res := *r
res.buffer = bytes.Buffer{}
+ res.bufM = make(fr.Vector, len(r.bufM))
+ res.bufMValues = bitset.New(r.bufMValues.Len())
+ res.bufRes = make(fr.Vector, len(r.bufRes))
return res
}
From 0cd4994b7f0b47cb22592c927ce0e97c47bb8107 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Sun, 7 May 2023 21:48:55 -0500
Subject: [PATCH 09/51] feat: Marshal [][]fr.Element (#400)
* feat: Marshal [][]fr.Element
* test: marshal [][]fr.Element
* fix: nbBytesWritten
---
ecc/bls12-377/marshal.go | 35 +++++++++++++++++++
ecc/bls12-377/marshal_test.go | 10 ++++--
ecc/bls12-378/marshal.go | 35 +++++++++++++++++++
ecc/bls12-378/marshal_test.go | 10 ++++--
ecc/bls12-381/marshal.go | 35 +++++++++++++++++++
ecc/bls12-381/marshal_test.go | 10 ++++--
ecc/bls24-315/marshal.go | 35 +++++++++++++++++++
ecc/bls24-315/marshal_test.go | 10 ++++--
ecc/bls24-317/marshal.go | 35 +++++++++++++++++++
ecc/bls24-317/marshal_test.go | 10 ++++--
ecc/bn254/marshal.go | 35 +++++++++++++++++++
ecc/bn254/marshal_test.go | 10 ++++--
ecc/bw6-633/marshal.go | 35 +++++++++++++++++++
ecc/bw6-633/marshal_test.go | 10 ++++--
ecc/bw6-756/marshal.go | 35 +++++++++++++++++++
ecc/bw6-756/marshal_test.go | 10 ++++--
ecc/bw6-761/marshal.go | 35 +++++++++++++++++++
ecc/bw6-761/marshal_test.go | 10 ++++--
.../generator/ecc/template/marshal.go.tmpl | 26 +++++++++++++-
.../ecc/template/tests/marshal.go.tmpl | 10 ++++--
20 files changed, 420 insertions(+), 21 deletions(-)
diff --git a/ecc/bls12-377/marshal.go b/ecc/bls12-377/marshal.go
index 7912f7f1d..48450677d 100644
--- a/ecc/bls12-377/marshal.go
+++ b/ecc/bls12-377/marshal.go
@@ -147,6 +147,19 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
read64, err = (*fp.Vector)(t).ReadFrom(dec.r)
dec.n += read64
return
+ case *[][]fr.Element:
+ var sliceLen uint32
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ if len(*t) != int(sliceLen) {
+ *t = make([][]fr.Element, sliceLen)
+ }
+ for i := range *t {
+ read64, err = (*fr.Vector)(&(*t)[i]).ReadFrom(dec.r)
+ dec.n += read64
+ }
+ return
case *G1Affine:
// we start by reading compressed point size, if metadata tells us it is uncompressed, we read more.
read, err = io.ReadFull(dec.r, buf[:SizeOfG1AffineCompressed])
@@ -490,6 +503,17 @@ func (enc *Encoder) encode(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
@@ -595,6 +619,17 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
diff --git a/ecc/bls12-377/marshal_test.go b/ecc/bls12-377/marshal_test.go
index 02004b7c8..72e4a000d 100644
--- a/ecc/bls12-377/marshal_test.go
+++ b/ecc/bls12-377/marshal_test.go
@@ -52,6 +52,7 @@ func TestEncoder(t *testing.T) {
var inI []fp.Element
var inJ []fr.Element
var inK fr.Vector
+ var inL [][]fr.Element
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -68,12 +69,13 @@ func TestEncoder(t *testing.T) {
inJ = make([]fr.Element, 0)
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
+ inL = [][]fr.Element{inJ, inK}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -98,8 +100,9 @@ func TestEncoder(t *testing.T) {
var outI []fp.Element
var outJ []fr.Element
var outK fr.Vector
+ var outL [][]fr.Element
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -139,6 +142,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inK, outK) {
t.Fatal("decode(encode(vector)) failed")
}
+ if !reflect.DeepEqual(inL, outL) {
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bls12-378/marshal.go b/ecc/bls12-378/marshal.go
index bc006c35f..a69a7b3d0 100644
--- a/ecc/bls12-378/marshal.go
+++ b/ecc/bls12-378/marshal.go
@@ -147,6 +147,19 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
read64, err = (*fp.Vector)(t).ReadFrom(dec.r)
dec.n += read64
return
+ case *[][]fr.Element:
+ var sliceLen uint32
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ if len(*t) != int(sliceLen) {
+ *t = make([][]fr.Element, sliceLen)
+ }
+ for i := range *t {
+ read64, err = (*fr.Vector)(&(*t)[i]).ReadFrom(dec.r)
+ dec.n += read64
+ }
+ return
case *G1Affine:
// we start by reading compressed point size, if metadata tells us it is uncompressed, we read more.
read, err = io.ReadFull(dec.r, buf[:SizeOfG1AffineCompressed])
@@ -490,6 +503,17 @@ func (enc *Encoder) encode(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
@@ -595,6 +619,17 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
diff --git a/ecc/bls12-378/marshal_test.go b/ecc/bls12-378/marshal_test.go
index ef0d65dd2..4e4b08e3d 100644
--- a/ecc/bls12-378/marshal_test.go
+++ b/ecc/bls12-378/marshal_test.go
@@ -52,6 +52,7 @@ func TestEncoder(t *testing.T) {
var inI []fp.Element
var inJ []fr.Element
var inK fr.Vector
+ var inL [][]fr.Element
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -68,12 +69,13 @@ func TestEncoder(t *testing.T) {
inJ = make([]fr.Element, 0)
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
+ inL = [][]fr.Element{inJ, inK}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -98,8 +100,9 @@ func TestEncoder(t *testing.T) {
var outI []fp.Element
var outJ []fr.Element
var outK fr.Vector
+ var outL [][]fr.Element
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -139,6 +142,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inK, outK) {
t.Fatal("decode(encode(vector)) failed")
}
+ if !reflect.DeepEqual(inL, outL) {
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bls12-381/marshal.go b/ecc/bls12-381/marshal.go
index 244a1c17b..dc1e76eec 100644
--- a/ecc/bls12-381/marshal.go
+++ b/ecc/bls12-381/marshal.go
@@ -147,6 +147,19 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
read64, err = (*fp.Vector)(t).ReadFrom(dec.r)
dec.n += read64
return
+ case *[][]fr.Element:
+ var sliceLen uint32
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ if len(*t) != int(sliceLen) {
+ *t = make([][]fr.Element, sliceLen)
+ }
+ for i := range *t {
+ read64, err = (*fr.Vector)(&(*t)[i]).ReadFrom(dec.r)
+ dec.n += read64
+ }
+ return
case *G1Affine:
// we start by reading compressed point size, if metadata tells us it is uncompressed, we read more.
read, err = io.ReadFull(dec.r, buf[:SizeOfG1AffineCompressed])
@@ -490,6 +503,17 @@ func (enc *Encoder) encode(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
@@ -595,6 +619,17 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
diff --git a/ecc/bls12-381/marshal_test.go b/ecc/bls12-381/marshal_test.go
index 681217d6a..3c0d03376 100644
--- a/ecc/bls12-381/marshal_test.go
+++ b/ecc/bls12-381/marshal_test.go
@@ -52,6 +52,7 @@ func TestEncoder(t *testing.T) {
var inI []fp.Element
var inJ []fr.Element
var inK fr.Vector
+ var inL [][]fr.Element
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -68,12 +69,13 @@ func TestEncoder(t *testing.T) {
inJ = make([]fr.Element, 0)
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
+ inL = [][]fr.Element{inJ, inK}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -98,8 +100,9 @@ func TestEncoder(t *testing.T) {
var outI []fp.Element
var outJ []fr.Element
var outK fr.Vector
+ var outL [][]fr.Element
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -139,6 +142,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inK, outK) {
t.Fatal("decode(encode(vector)) failed")
}
+ if !reflect.DeepEqual(inL, outL) {
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bls24-315/marshal.go b/ecc/bls24-315/marshal.go
index 7a4ad467c..0b22441ef 100644
--- a/ecc/bls24-315/marshal.go
+++ b/ecc/bls24-315/marshal.go
@@ -147,6 +147,19 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
read64, err = (*fp.Vector)(t).ReadFrom(dec.r)
dec.n += read64
return
+ case *[][]fr.Element:
+ var sliceLen uint32
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ if len(*t) != int(sliceLen) {
+ *t = make([][]fr.Element, sliceLen)
+ }
+ for i := range *t {
+ read64, err = (*fr.Vector)(&(*t)[i]).ReadFrom(dec.r)
+ dec.n += read64
+ }
+ return
case *G1Affine:
// we start by reading compressed point size, if metadata tells us it is uncompressed, we read more.
read, err = io.ReadFull(dec.r, buf[:SizeOfG1AffineCompressed])
@@ -490,6 +503,17 @@ func (enc *Encoder) encode(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
@@ -595,6 +619,17 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
diff --git a/ecc/bls24-315/marshal_test.go b/ecc/bls24-315/marshal_test.go
index bfb70098d..e5c665fa0 100644
--- a/ecc/bls24-315/marshal_test.go
+++ b/ecc/bls24-315/marshal_test.go
@@ -52,6 +52,7 @@ func TestEncoder(t *testing.T) {
var inI []fp.Element
var inJ []fr.Element
var inK fr.Vector
+ var inL [][]fr.Element
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -68,12 +69,13 @@ func TestEncoder(t *testing.T) {
inJ = make([]fr.Element, 0)
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
+ inL = [][]fr.Element{inJ, inK}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -98,8 +100,9 @@ func TestEncoder(t *testing.T) {
var outI []fp.Element
var outJ []fr.Element
var outK fr.Vector
+ var outL [][]fr.Element
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -139,6 +142,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inK, outK) {
t.Fatal("decode(encode(vector)) failed")
}
+ if !reflect.DeepEqual(inL, outL) {
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bls24-317/marshal.go b/ecc/bls24-317/marshal.go
index 9c9b662c9..89e7bcf5c 100644
--- a/ecc/bls24-317/marshal.go
+++ b/ecc/bls24-317/marshal.go
@@ -147,6 +147,19 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
read64, err = (*fp.Vector)(t).ReadFrom(dec.r)
dec.n += read64
return
+ case *[][]fr.Element:
+ var sliceLen uint32
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ if len(*t) != int(sliceLen) {
+ *t = make([][]fr.Element, sliceLen)
+ }
+ for i := range *t {
+ read64, err = (*fr.Vector)(&(*t)[i]).ReadFrom(dec.r)
+ dec.n += read64
+ }
+ return
case *G1Affine:
// we start by reading compressed point size, if metadata tells us it is uncompressed, we read more.
read, err = io.ReadFull(dec.r, buf[:SizeOfG1AffineCompressed])
@@ -490,6 +503,17 @@ func (enc *Encoder) encode(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
@@ -595,6 +619,17 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
diff --git a/ecc/bls24-317/marshal_test.go b/ecc/bls24-317/marshal_test.go
index 01bde9d86..23f3b8a10 100644
--- a/ecc/bls24-317/marshal_test.go
+++ b/ecc/bls24-317/marshal_test.go
@@ -52,6 +52,7 @@ func TestEncoder(t *testing.T) {
var inI []fp.Element
var inJ []fr.Element
var inK fr.Vector
+ var inL [][]fr.Element
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -68,12 +69,13 @@ func TestEncoder(t *testing.T) {
inJ = make([]fr.Element, 0)
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
+ inL = [][]fr.Element{inJ, inK}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -98,8 +100,9 @@ func TestEncoder(t *testing.T) {
var outI []fp.Element
var outJ []fr.Element
var outK fr.Vector
+ var outL [][]fr.Element
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -139,6 +142,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inK, outK) {
t.Fatal("decode(encode(vector)) failed")
}
+ if !reflect.DeepEqual(inL, outL) {
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bn254/marshal.go b/ecc/bn254/marshal.go
index c11de4526..3ef63696d 100644
--- a/ecc/bn254/marshal.go
+++ b/ecc/bn254/marshal.go
@@ -142,6 +142,19 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
read64, err = (*fp.Vector)(t).ReadFrom(dec.r)
dec.n += read64
return
+ case *[][]fr.Element:
+ var sliceLen uint32
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ if len(*t) != int(sliceLen) {
+ *t = make([][]fr.Element, sliceLen)
+ }
+ for i := range *t {
+ read64, err = (*fr.Vector)(&(*t)[i]).ReadFrom(dec.r)
+ dec.n += read64
+ }
+ return
case *G1Affine:
// we start by reading compressed point size, if metadata tells us it is uncompressed, we read more.
read, err = io.ReadFull(dec.r, buf[:SizeOfG1AffineCompressed])
@@ -455,6 +468,17 @@ func (enc *Encoder) encode(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
@@ -560,6 +584,17 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
diff --git a/ecc/bn254/marshal_test.go b/ecc/bn254/marshal_test.go
index 67f3f9a6c..ddc699b9c 100644
--- a/ecc/bn254/marshal_test.go
+++ b/ecc/bn254/marshal_test.go
@@ -52,6 +52,7 @@ func TestEncoder(t *testing.T) {
var inI []fp.Element
var inJ []fr.Element
var inK fr.Vector
+ var inL [][]fr.Element
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -68,12 +69,13 @@ func TestEncoder(t *testing.T) {
inJ = make([]fr.Element, 0)
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
+ inL = [][]fr.Element{inJ, inK}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -98,8 +100,9 @@ func TestEncoder(t *testing.T) {
var outI []fp.Element
var outJ []fr.Element
var outK fr.Vector
+ var outL [][]fr.Element
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -139,6 +142,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inK, outK) {
t.Fatal("decode(encode(vector)) failed")
}
+ if !reflect.DeepEqual(inL, outL) {
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bw6-633/marshal.go b/ecc/bw6-633/marshal.go
index fd13100e0..49f29735e 100644
--- a/ecc/bw6-633/marshal.go
+++ b/ecc/bw6-633/marshal.go
@@ -147,6 +147,19 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
read64, err = (*fp.Vector)(t).ReadFrom(dec.r)
dec.n += read64
return
+ case *[][]fr.Element:
+ var sliceLen uint32
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ if len(*t) != int(sliceLen) {
+ *t = make([][]fr.Element, sliceLen)
+ }
+ for i := range *t {
+ read64, err = (*fr.Vector)(&(*t)[i]).ReadFrom(dec.r)
+ dec.n += read64
+ }
+ return
case *G1Affine:
// we start by reading compressed point size, if metadata tells us it is uncompressed, we read more.
read, err = io.ReadFull(dec.r, buf[:SizeOfG1AffineCompressed])
@@ -490,6 +503,17 @@ func (enc *Encoder) encode(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
@@ -595,6 +619,17 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
diff --git a/ecc/bw6-633/marshal_test.go b/ecc/bw6-633/marshal_test.go
index a5325d26a..5e6cab476 100644
--- a/ecc/bw6-633/marshal_test.go
+++ b/ecc/bw6-633/marshal_test.go
@@ -52,6 +52,7 @@ func TestEncoder(t *testing.T) {
var inI []fp.Element
var inJ []fr.Element
var inK fr.Vector
+ var inL [][]fr.Element
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -68,12 +69,13 @@ func TestEncoder(t *testing.T) {
inJ = make([]fr.Element, 0)
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
+ inL = [][]fr.Element{inJ, inK}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -98,8 +100,9 @@ func TestEncoder(t *testing.T) {
var outI []fp.Element
var outJ []fr.Element
var outK fr.Vector
+ var outL [][]fr.Element
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -139,6 +142,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inK, outK) {
t.Fatal("decode(encode(vector)) failed")
}
+ if !reflect.DeepEqual(inL, outL) {
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bw6-756/marshal.go b/ecc/bw6-756/marshal.go
index 31046c5f7..b62d30e48 100644
--- a/ecc/bw6-756/marshal.go
+++ b/ecc/bw6-756/marshal.go
@@ -147,6 +147,19 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
read64, err = (*fp.Vector)(t).ReadFrom(dec.r)
dec.n += read64
return
+ case *[][]fr.Element:
+ var sliceLen uint32
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ if len(*t) != int(sliceLen) {
+ *t = make([][]fr.Element, sliceLen)
+ }
+ for i := range *t {
+ read64, err = (*fr.Vector)(&(*t)[i]).ReadFrom(dec.r)
+ dec.n += read64
+ }
+ return
case *G1Affine:
// we start by reading compressed point size, if metadata tells us it is uncompressed, we read more.
read, err = io.ReadFull(dec.r, buf[:SizeOfG1AffineCompressed])
@@ -490,6 +503,17 @@ func (enc *Encoder) encode(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
@@ -595,6 +619,17 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
diff --git a/ecc/bw6-756/marshal_test.go b/ecc/bw6-756/marshal_test.go
index 0b4fb5df3..fa06db299 100644
--- a/ecc/bw6-756/marshal_test.go
+++ b/ecc/bw6-756/marshal_test.go
@@ -52,6 +52,7 @@ func TestEncoder(t *testing.T) {
var inI []fp.Element
var inJ []fr.Element
var inK fr.Vector
+ var inL [][]fr.Element
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -68,12 +69,13 @@ func TestEncoder(t *testing.T) {
inJ = make([]fr.Element, 0)
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
+ inL = [][]fr.Element{inJ, inK}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -98,8 +100,9 @@ func TestEncoder(t *testing.T) {
var outI []fp.Element
var outJ []fr.Element
var outK fr.Vector
+ var outL [][]fr.Element
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -139,6 +142,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inK, outK) {
t.Fatal("decode(encode(vector)) failed")
}
+ if !reflect.DeepEqual(inL, outL) {
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bw6-761/marshal.go b/ecc/bw6-761/marshal.go
index a116dbbc2..1c5cc799b 100644
--- a/ecc/bw6-761/marshal.go
+++ b/ecc/bw6-761/marshal.go
@@ -147,6 +147,19 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
read64, err = (*fp.Vector)(t).ReadFrom(dec.r)
dec.n += read64
return
+ case *[][]fr.Element:
+ var sliceLen uint32
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ if len(*t) != int(sliceLen) {
+ *t = make([][]fr.Element, sliceLen)
+ }
+ for i := range *t {
+ read64, err = (*fr.Vector)(&(*t)[i]).ReadFrom(dec.r)
+ dec.n += read64
+ }
+ return
case *G1Affine:
// we start by reading compressed point size, if metadata tells us it is uncompressed, we read more.
read, err = io.ReadFull(dec.r, buf[:SizeOfG1AffineCompressed])
@@ -490,6 +503,17 @@ func (enc *Encoder) encode(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
@@ -595,6 +619,17 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
diff --git a/ecc/bw6-761/marshal_test.go b/ecc/bw6-761/marshal_test.go
index 1801fb2e0..99b6bcfa2 100644
--- a/ecc/bw6-761/marshal_test.go
+++ b/ecc/bw6-761/marshal_test.go
@@ -52,6 +52,7 @@ func TestEncoder(t *testing.T) {
var inI []fp.Element
var inJ []fr.Element
var inK fr.Vector
+ var inL [][]fr.Element
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -68,12 +69,13 @@ func TestEncoder(t *testing.T) {
inJ = make([]fr.Element, 0)
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
+ inL = [][]fr.Element{inJ, inK}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -98,8 +100,9 @@ func TestEncoder(t *testing.T) {
var outI []fp.Element
var outJ []fr.Element
var outK fr.Vector
+ var outL [][]fr.Element
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -139,6 +142,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inK, outK) {
t.Fatal("decode(encode(vector)) failed")
}
+ if !reflect.DeepEqual(inL, outL) {
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/internal/generator/ecc/template/marshal.go.tmpl b/internal/generator/ecc/template/marshal.go.tmpl
index 132b1c957..795cb13ec 100644
--- a/internal/generator/ecc/template/marshal.go.tmpl
+++ b/internal/generator/ecc/template/marshal.go.tmpl
@@ -152,6 +152,19 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
read64, err = (*fp.Vector)(t).ReadFrom(dec.r)
dec.n+=read64
return
+ case *[][]fr.Element:
+ var sliceLen uint32
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ if len(*t) != int(sliceLen) {
+ *t = make([][]fr.Element, sliceLen)
+ }
+ for i := range *t {
+ read64, err = (*fr.Vector)(&(*t)[i]).ReadFrom(dec.r)
+ dec.n+=read64
+ }
+ return
case *G1Affine:
// we start by reading compressed point size, if metadata tells us it is uncompressed, we read more.
read, err = io.ReadFull(dec.r, buf[:SizeOfG1AffineCompressed])
@@ -532,7 +545,18 @@ func (enc *Encoder) encode{{- $.Raw}}(v interface{}) (err error) {
case []fp.Element:
written64, err = (*fp.Vector)(&t).WriteTo(enc.w)
enc.n += written64
- return
+ return
+ case [][]fr.Element:
+ // write slice length
+ if err = binary.Write(enc.w, binary.BigEndian, uint32(len(t))); err != nil {
+ return
+ }
+ enc.n += 4
+ for i := range t {
+ written64, err = (*fr.Vector)(&t[i]).WriteTo(enc.w)
+ enc.n += written64
+ }
+ return
case []G1Affine:
// write slice length
err = binary.Write(enc.w, binary.BigEndian, uint32(len(t)))
diff --git a/internal/generator/ecc/template/tests/marshal.go.tmpl b/internal/generator/ecc/template/tests/marshal.go.tmpl
index 9ca3df8e0..88e4269ee 100644
--- a/internal/generator/ecc/template/tests/marshal.go.tmpl
+++ b/internal/generator/ecc/template/tests/marshal.go.tmpl
@@ -42,6 +42,7 @@ func TestEncoder(t *testing.T) {
var inI []fp.Element
var inJ []fr.Element
var inK fr.Vector
+ var inL [][]fr.Element
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -58,13 +59,14 @@ func TestEncoder(t *testing.T) {
inJ = make([]fr.Element, 0)
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
+ inL =[][]fr.Element {inJ, inK}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -90,8 +92,9 @@ func TestEncoder(t *testing.T) {
var outI []fp.Element
var outJ []fr.Element
var outK fr.Vector
+ var outL [][]fr.Element
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -131,6 +134,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inK, outK) {
t.Fatal("decode(encode(vector)) failed")
}
+ if !reflect.DeepEqual(inL, outL) {
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
From a7b13ddec332d00eb6f252faed38ee889c0507f8 Mon Sep 17 00:00:00 2001
From: Gautam Botrel
Date: Wed, 10 May 2023 16:18:09 -0500
Subject: [PATCH 10/51] fix: innef assignment in test
---
ecc/bls12-377/pairing_test.go | 3 +--
ecc/bls12-378/pairing_test.go | 3 +--
ecc/bls12-381/pairing_test.go | 3 +--
ecc/bls24-315/pairing_test.go | 3 +--
ecc/bls24-317/pairing_test.go | 3 +--
ecc/bn254/pairing_test.go | 3 +--
ecc/bw6-633/pairing_test.go | 3 +--
ecc/bw6-756/pairing_test.go | 3 +--
ecc/bw6-761/pairing_test.go | 3 +--
ecc/secp256k1/marshal.go | 2 +-
ecc/secp256k1/marshal_test.go | 2 +-
ecc/stark-curve/g1.go | 2 +-
ecc/stark-curve/g1_test.go | 2 +-
ecc/stark-curve/hash_to_g1.go | 2 +-
ecc/stark-curve/hash_to_g1_test.go | 2 +-
ecc/stark-curve/marshal.go | 2 +-
ecc/stark-curve/marshal_test.go | 2 +-
internal/generator/pairing/template/tests/pairing.go.tmpl | 3 +--
18 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/ecc/bls12-377/pairing_test.go b/ecc/bls12-377/pairing_test.go
index 5c0d371b2..75d277447 100644
--- a/ecc/bls12-377/pairing_test.go
+++ b/ecc/bls12-377/pairing_test.go
@@ -49,8 +49,7 @@ func TestPairing(t *testing.T) {
properties.Property("[BLS12-377] Having the receiver as operand (final expo) should output the same result", prop.ForAll(
func(a GT) bool {
- b := a
- b = FinalExponentiation(&a)
+ b := FinalExponentiation(&a)
a = FinalExponentiation(&a)
return a.Equal(&b)
},
diff --git a/ecc/bls12-378/pairing_test.go b/ecc/bls12-378/pairing_test.go
index 18772721c..4a3ad4889 100644
--- a/ecc/bls12-378/pairing_test.go
+++ b/ecc/bls12-378/pairing_test.go
@@ -49,8 +49,7 @@ func TestPairing(t *testing.T) {
properties.Property("[BLS12-378] Having the receiver as operand (final expo) should output the same result", prop.ForAll(
func(a GT) bool {
- b := a
- b = FinalExponentiation(&a)
+ b := FinalExponentiation(&a)
a = FinalExponentiation(&a)
return a.Equal(&b)
},
diff --git a/ecc/bls12-381/pairing_test.go b/ecc/bls12-381/pairing_test.go
index 4360e7b09..f57e4572c 100644
--- a/ecc/bls12-381/pairing_test.go
+++ b/ecc/bls12-381/pairing_test.go
@@ -49,8 +49,7 @@ func TestPairing(t *testing.T) {
properties.Property("[BLS12-381] Having the receiver as operand (final expo) should output the same result", prop.ForAll(
func(a GT) bool {
- b := a
- b = FinalExponentiation(&a)
+ b := FinalExponentiation(&a)
a = FinalExponentiation(&a)
return a.Equal(&b)
},
diff --git a/ecc/bls24-315/pairing_test.go b/ecc/bls24-315/pairing_test.go
index b7bb32925..0d5611404 100644
--- a/ecc/bls24-315/pairing_test.go
+++ b/ecc/bls24-315/pairing_test.go
@@ -50,8 +50,7 @@ func TestPairing(t *testing.T) {
properties.Property("[BLS24-315] Having the receiver as operand (final expo) should output the same result", prop.ForAll(
func(a GT) bool {
- b := a
- b = FinalExponentiation(&a)
+ b := FinalExponentiation(&a)
a = FinalExponentiation(&a)
return a.Equal(&b)
},
diff --git a/ecc/bls24-317/pairing_test.go b/ecc/bls24-317/pairing_test.go
index f1248e79a..780bc5092 100644
--- a/ecc/bls24-317/pairing_test.go
+++ b/ecc/bls24-317/pairing_test.go
@@ -50,8 +50,7 @@ func TestPairing(t *testing.T) {
properties.Property("[BLS24-317] Having the receiver as operand (final expo) should output the same result", prop.ForAll(
func(a GT) bool {
- b := a
- b = FinalExponentiation(&a)
+ b := FinalExponentiation(&a)
a = FinalExponentiation(&a)
return a.Equal(&b)
},
diff --git a/ecc/bn254/pairing_test.go b/ecc/bn254/pairing_test.go
index 9f2ba1e4d..d2fe42518 100644
--- a/ecc/bn254/pairing_test.go
+++ b/ecc/bn254/pairing_test.go
@@ -49,8 +49,7 @@ func TestPairing(t *testing.T) {
properties.Property("[BN254] Having the receiver as operand (final expo) should output the same result", prop.ForAll(
func(a GT) bool {
- b := a
- b = FinalExponentiation(&a)
+ b := FinalExponentiation(&a)
a = FinalExponentiation(&a)
return a.Equal(&b)
},
diff --git a/ecc/bw6-633/pairing_test.go b/ecc/bw6-633/pairing_test.go
index 2303c0438..0a78e5d00 100644
--- a/ecc/bw6-633/pairing_test.go
+++ b/ecc/bw6-633/pairing_test.go
@@ -50,8 +50,7 @@ func TestPairing(t *testing.T) {
properties.Property("[BW6-633] Having the receiver as operand (final expo) should output the same result", prop.ForAll(
func(a GT) bool {
- b := a
- b = FinalExponentiation(&a)
+ b := FinalExponentiation(&a)
a = FinalExponentiation(&a)
return a.Equal(&b)
},
diff --git a/ecc/bw6-756/pairing_test.go b/ecc/bw6-756/pairing_test.go
index 779743a1f..61b47f4fd 100644
--- a/ecc/bw6-756/pairing_test.go
+++ b/ecc/bw6-756/pairing_test.go
@@ -50,8 +50,7 @@ func TestPairing(t *testing.T) {
properties.Property("[BW6-756] Having the receiver as operand (final expo) should output the same result", prop.ForAll(
func(a GT) bool {
- b := a
- b = FinalExponentiation(&a)
+ b := FinalExponentiation(&a)
a = FinalExponentiation(&a)
return a.Equal(&b)
},
diff --git a/ecc/bw6-761/pairing_test.go b/ecc/bw6-761/pairing_test.go
index 37255a3e9..d77080644 100644
--- a/ecc/bw6-761/pairing_test.go
+++ b/ecc/bw6-761/pairing_test.go
@@ -50,8 +50,7 @@ func TestPairing(t *testing.T) {
properties.Property("[BW6-761] Having the receiver as operand (final expo) should output the same result", prop.ForAll(
func(a GT) bool {
- b := a
- b = FinalExponentiation(&a)
+ b := FinalExponentiation(&a)
a = FinalExponentiation(&a)
return a.Equal(&b)
},
diff --git a/ecc/secp256k1/marshal.go b/ecc/secp256k1/marshal.go
index de81d4006..8cca33d47 100644
--- a/ecc/secp256k1/marshal.go
+++ b/ecc/secp256k1/marshal.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Code generated by consensys/gnark-crypto DO NOT EDIT
+// FOO
package secp256k1
diff --git a/ecc/secp256k1/marshal_test.go b/ecc/secp256k1/marshal_test.go
index 9195ed864..1cd3058de 100644
--- a/ecc/secp256k1/marshal_test.go
+++ b/ecc/secp256k1/marshal_test.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Code generated by consensys/gnark-crypto DO NOT EDIT
+// FOO
package secp256k1
diff --git a/ecc/stark-curve/g1.go b/ecc/stark-curve/g1.go
index 848c036ef..11b50ba23 100644
--- a/ecc/stark-curve/g1.go
+++ b/ecc/stark-curve/g1.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Code generated by consensys/gnark-crypto DO NOT EDIT
+// FOO
package starkcurve
diff --git a/ecc/stark-curve/g1_test.go b/ecc/stark-curve/g1_test.go
index b8062a8b0..31abc377f 100644
--- a/ecc/stark-curve/g1_test.go
+++ b/ecc/stark-curve/g1_test.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Code generated by consensys/gnark-crypto DO NOT EDIT
+// FOO
package starkcurve
diff --git a/ecc/stark-curve/hash_to_g1.go b/ecc/stark-curve/hash_to_g1.go
index 68ac69e5f..58d319230 100644
--- a/ecc/stark-curve/hash_to_g1.go
+++ b/ecc/stark-curve/hash_to_g1.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Code generated by consensys/gnark-crypto DO NOT EDIT
+// FOO
package starkcurve
diff --git a/ecc/stark-curve/hash_to_g1_test.go b/ecc/stark-curve/hash_to_g1_test.go
index b180e6952..ae10337e6 100644
--- a/ecc/stark-curve/hash_to_g1_test.go
+++ b/ecc/stark-curve/hash_to_g1_test.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Code generated by consensys/gnark-crypto DO NOT EDIT
+// FOO
package starkcurve
diff --git a/ecc/stark-curve/marshal.go b/ecc/stark-curve/marshal.go
index ab1a29dbc..f2c78c3e9 100644
--- a/ecc/stark-curve/marshal.go
+++ b/ecc/stark-curve/marshal.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Code generated by consensys/gnark-crypto DO NOT EDIT
+// FOO
package starkcurve
diff --git a/ecc/stark-curve/marshal_test.go b/ecc/stark-curve/marshal_test.go
index 21a2fea2b..a3a899a15 100644
--- a/ecc/stark-curve/marshal_test.go
+++ b/ecc/stark-curve/marshal_test.go
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-// Code generated by consensys/gnark-crypto DO NOT EDIT
+// FOO
package starkcurve
diff --git a/internal/generator/pairing/template/tests/pairing.go.tmpl b/internal/generator/pairing/template/tests/pairing.go.tmpl
index 4839053c6..6f875e675 100644
--- a/internal/generator/pairing/template/tests/pairing.go.tmpl
+++ b/internal/generator/pairing/template/tests/pairing.go.tmpl
@@ -37,8 +37,7 @@ func TestPairing(t *testing.T) {
properties.Property("[{{ toUpper .Name}}] Having the receiver as operand (final expo) should output the same result", prop.ForAll(
func(a GT) bool {
- b := a
- b = FinalExponentiation(&a)
+ b := FinalExponentiation(&a)
a = FinalExponentiation(&a)
return a.Equal(&b)
},
From 5df9fb31e04b2dff75829caab68768e06e731d3c Mon Sep 17 00:00:00 2001
From: Gautam Botrel
Date: Wed, 10 May 2023 16:21:11 -0500
Subject: [PATCH 11/51] fix: more innef assign
---
ecc/bls12-377/fr/kzg/kzg.go | 3 +--
ecc/bls12-377/fr/kzg/kzg_test.go | 2 +-
ecc/bls12-378/fr/kzg/kzg.go | 3 +--
ecc/bls12-378/fr/kzg/kzg_test.go | 2 +-
ecc/bls12-381/fr/kzg/kzg.go | 3 +--
ecc/bls12-381/fr/kzg/kzg_test.go | 2 +-
ecc/bls24-315/fr/kzg/kzg.go | 3 +--
ecc/bls24-315/fr/kzg/kzg_test.go | 2 +-
ecc/bls24-317/fr/kzg/kzg.go | 3 +--
ecc/bls24-317/fr/kzg/kzg_test.go | 2 +-
ecc/bn254/fr/kzg/kzg.go | 3 +--
ecc/bn254/fr/kzg/kzg_test.go | 2 +-
ecc/bw6-633/fr/kzg/kzg.go | 3 +--
ecc/bw6-633/fr/kzg/kzg_test.go | 2 +-
ecc/bw6-756/fr/kzg/kzg.go | 3 +--
ecc/bw6-756/fr/kzg/kzg_test.go | 2 +-
ecc/bw6-761/fr/kzg/kzg.go | 3 +--
ecc/bw6-761/fr/kzg/kzg_test.go | 2 +-
internal/generator/kzg/template/kzg.go.tmpl | 3 +--
internal/generator/kzg/template/kzg.test.go.tmpl | 2 +-
20 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/ecc/bls12-377/fr/kzg/kzg.go b/ecc/bls12-377/fr/kzg/kzg.go
index 4bb8d8322..682fc6af7 100644
--- a/ecc/bls12-377/fr/kzg/kzg.go
+++ b/ecc/bls12-377/fr/kzg/kzg.go
@@ -161,12 +161,11 @@ func Open(p []fr.Element, point fr.Element, pk ProvingKey) (OpeningProof, error)
}
// compute H
+ // h reuses memory from _p
_p := make([]fr.Element, len(p))
copy(_p, p)
h := dividePolyByXminusA(_p, res.ClaimedValue, point)
- _p = nil // h re-use this memory
-
// commit to H
hCommit, err := Commit(h, pk)
if err != nil {
diff --git a/ecc/bls12-377/fr/kzg/kzg_test.go b/ecc/bls12-377/fr/kzg/kzg_test.go
index d034ac109..58acf3feb 100644
--- a/ecc/bls12-377/fr/kzg/kzg_test.go
+++ b/ecc/bls12-377/fr/kzg/kzg_test.go
@@ -60,8 +60,8 @@ func TestDividePolyByXminusA(t *testing.T) {
polRandpoint.Sub(&polRandpoint, &evaluation) // f(rand)-f(point)
// compute f-f(a)/x-a
+ // h re-uses the memory of pol
h := dividePolyByXminusA(pol, evaluation, point)
- pol = nil // h reuses this memory
if len(h) != 229 {
t.Fatal("inconsistent size of quotient")
diff --git a/ecc/bls12-378/fr/kzg/kzg.go b/ecc/bls12-378/fr/kzg/kzg.go
index 02f6c7467..889424f61 100644
--- a/ecc/bls12-378/fr/kzg/kzg.go
+++ b/ecc/bls12-378/fr/kzg/kzg.go
@@ -161,12 +161,11 @@ func Open(p []fr.Element, point fr.Element, pk ProvingKey) (OpeningProof, error)
}
// compute H
+ // h reuses memory from _p
_p := make([]fr.Element, len(p))
copy(_p, p)
h := dividePolyByXminusA(_p, res.ClaimedValue, point)
- _p = nil // h re-use this memory
-
// commit to H
hCommit, err := Commit(h, pk)
if err != nil {
diff --git a/ecc/bls12-378/fr/kzg/kzg_test.go b/ecc/bls12-378/fr/kzg/kzg_test.go
index df9e08abb..e92e5ffd3 100644
--- a/ecc/bls12-378/fr/kzg/kzg_test.go
+++ b/ecc/bls12-378/fr/kzg/kzg_test.go
@@ -60,8 +60,8 @@ func TestDividePolyByXminusA(t *testing.T) {
polRandpoint.Sub(&polRandpoint, &evaluation) // f(rand)-f(point)
// compute f-f(a)/x-a
+ // h re-uses the memory of pol
h := dividePolyByXminusA(pol, evaluation, point)
- pol = nil // h reuses this memory
if len(h) != 229 {
t.Fatal("inconsistent size of quotient")
diff --git a/ecc/bls12-381/fr/kzg/kzg.go b/ecc/bls12-381/fr/kzg/kzg.go
index 1570fcb9b..8ca6277e5 100644
--- a/ecc/bls12-381/fr/kzg/kzg.go
+++ b/ecc/bls12-381/fr/kzg/kzg.go
@@ -161,12 +161,11 @@ func Open(p []fr.Element, point fr.Element, pk ProvingKey) (OpeningProof, error)
}
// compute H
+ // h reuses memory from _p
_p := make([]fr.Element, len(p))
copy(_p, p)
h := dividePolyByXminusA(_p, res.ClaimedValue, point)
- _p = nil // h re-use this memory
-
// commit to H
hCommit, err := Commit(h, pk)
if err != nil {
diff --git a/ecc/bls12-381/fr/kzg/kzg_test.go b/ecc/bls12-381/fr/kzg/kzg_test.go
index 9b30bb591..8e0723bbc 100644
--- a/ecc/bls12-381/fr/kzg/kzg_test.go
+++ b/ecc/bls12-381/fr/kzg/kzg_test.go
@@ -60,8 +60,8 @@ func TestDividePolyByXminusA(t *testing.T) {
polRandpoint.Sub(&polRandpoint, &evaluation) // f(rand)-f(point)
// compute f-f(a)/x-a
+ // h re-uses the memory of pol
h := dividePolyByXminusA(pol, evaluation, point)
- pol = nil // h reuses this memory
if len(h) != 229 {
t.Fatal("inconsistent size of quotient")
diff --git a/ecc/bls24-315/fr/kzg/kzg.go b/ecc/bls24-315/fr/kzg/kzg.go
index c08664c83..a948f9007 100644
--- a/ecc/bls24-315/fr/kzg/kzg.go
+++ b/ecc/bls24-315/fr/kzg/kzg.go
@@ -161,12 +161,11 @@ func Open(p []fr.Element, point fr.Element, pk ProvingKey) (OpeningProof, error)
}
// compute H
+ // h reuses memory from _p
_p := make([]fr.Element, len(p))
copy(_p, p)
h := dividePolyByXminusA(_p, res.ClaimedValue, point)
- _p = nil // h re-use this memory
-
// commit to H
hCommit, err := Commit(h, pk)
if err != nil {
diff --git a/ecc/bls24-315/fr/kzg/kzg_test.go b/ecc/bls24-315/fr/kzg/kzg_test.go
index 8177038c5..5eb15fef1 100644
--- a/ecc/bls24-315/fr/kzg/kzg_test.go
+++ b/ecc/bls24-315/fr/kzg/kzg_test.go
@@ -60,8 +60,8 @@ func TestDividePolyByXminusA(t *testing.T) {
polRandpoint.Sub(&polRandpoint, &evaluation) // f(rand)-f(point)
// compute f-f(a)/x-a
+ // h re-uses the memory of pol
h := dividePolyByXminusA(pol, evaluation, point)
- pol = nil // h reuses this memory
if len(h) != 229 {
t.Fatal("inconsistent size of quotient")
diff --git a/ecc/bls24-317/fr/kzg/kzg.go b/ecc/bls24-317/fr/kzg/kzg.go
index ea6f12b15..9f5e723ee 100644
--- a/ecc/bls24-317/fr/kzg/kzg.go
+++ b/ecc/bls24-317/fr/kzg/kzg.go
@@ -161,12 +161,11 @@ func Open(p []fr.Element, point fr.Element, pk ProvingKey) (OpeningProof, error)
}
// compute H
+ // h reuses memory from _p
_p := make([]fr.Element, len(p))
copy(_p, p)
h := dividePolyByXminusA(_p, res.ClaimedValue, point)
- _p = nil // h re-use this memory
-
// commit to H
hCommit, err := Commit(h, pk)
if err != nil {
diff --git a/ecc/bls24-317/fr/kzg/kzg_test.go b/ecc/bls24-317/fr/kzg/kzg_test.go
index c01df9153..3aaf3d558 100644
--- a/ecc/bls24-317/fr/kzg/kzg_test.go
+++ b/ecc/bls24-317/fr/kzg/kzg_test.go
@@ -60,8 +60,8 @@ func TestDividePolyByXminusA(t *testing.T) {
polRandpoint.Sub(&polRandpoint, &evaluation) // f(rand)-f(point)
// compute f-f(a)/x-a
+ // h re-uses the memory of pol
h := dividePolyByXminusA(pol, evaluation, point)
- pol = nil // h reuses this memory
if len(h) != 229 {
t.Fatal("inconsistent size of quotient")
diff --git a/ecc/bn254/fr/kzg/kzg.go b/ecc/bn254/fr/kzg/kzg.go
index 5d016680d..ab492b53b 100644
--- a/ecc/bn254/fr/kzg/kzg.go
+++ b/ecc/bn254/fr/kzg/kzg.go
@@ -161,12 +161,11 @@ func Open(p []fr.Element, point fr.Element, pk ProvingKey) (OpeningProof, error)
}
// compute H
+ // h reuses memory from _p
_p := make([]fr.Element, len(p))
copy(_p, p)
h := dividePolyByXminusA(_p, res.ClaimedValue, point)
- _p = nil // h re-use this memory
-
// commit to H
hCommit, err := Commit(h, pk)
if err != nil {
diff --git a/ecc/bn254/fr/kzg/kzg_test.go b/ecc/bn254/fr/kzg/kzg_test.go
index 0cdd9c24b..ca35c1160 100644
--- a/ecc/bn254/fr/kzg/kzg_test.go
+++ b/ecc/bn254/fr/kzg/kzg_test.go
@@ -60,8 +60,8 @@ func TestDividePolyByXminusA(t *testing.T) {
polRandpoint.Sub(&polRandpoint, &evaluation) // f(rand)-f(point)
// compute f-f(a)/x-a
+ // h re-uses the memory of pol
h := dividePolyByXminusA(pol, evaluation, point)
- pol = nil // h reuses this memory
if len(h) != 229 {
t.Fatal("inconsistent size of quotient")
diff --git a/ecc/bw6-633/fr/kzg/kzg.go b/ecc/bw6-633/fr/kzg/kzg.go
index 4ea9401a2..ec5fd06da 100644
--- a/ecc/bw6-633/fr/kzg/kzg.go
+++ b/ecc/bw6-633/fr/kzg/kzg.go
@@ -161,12 +161,11 @@ func Open(p []fr.Element, point fr.Element, pk ProvingKey) (OpeningProof, error)
}
// compute H
+ // h reuses memory from _p
_p := make([]fr.Element, len(p))
copy(_p, p)
h := dividePolyByXminusA(_p, res.ClaimedValue, point)
- _p = nil // h re-use this memory
-
// commit to H
hCommit, err := Commit(h, pk)
if err != nil {
diff --git a/ecc/bw6-633/fr/kzg/kzg_test.go b/ecc/bw6-633/fr/kzg/kzg_test.go
index 69e843175..b17c0523a 100644
--- a/ecc/bw6-633/fr/kzg/kzg_test.go
+++ b/ecc/bw6-633/fr/kzg/kzg_test.go
@@ -60,8 +60,8 @@ func TestDividePolyByXminusA(t *testing.T) {
polRandpoint.Sub(&polRandpoint, &evaluation) // f(rand)-f(point)
// compute f-f(a)/x-a
+ // h re-uses the memory of pol
h := dividePolyByXminusA(pol, evaluation, point)
- pol = nil // h reuses this memory
if len(h) != 229 {
t.Fatal("inconsistent size of quotient")
diff --git a/ecc/bw6-756/fr/kzg/kzg.go b/ecc/bw6-756/fr/kzg/kzg.go
index 23836fb37..ccce3971e 100644
--- a/ecc/bw6-756/fr/kzg/kzg.go
+++ b/ecc/bw6-756/fr/kzg/kzg.go
@@ -161,12 +161,11 @@ func Open(p []fr.Element, point fr.Element, pk ProvingKey) (OpeningProof, error)
}
// compute H
+ // h reuses memory from _p
_p := make([]fr.Element, len(p))
copy(_p, p)
h := dividePolyByXminusA(_p, res.ClaimedValue, point)
- _p = nil // h re-use this memory
-
// commit to H
hCommit, err := Commit(h, pk)
if err != nil {
diff --git a/ecc/bw6-756/fr/kzg/kzg_test.go b/ecc/bw6-756/fr/kzg/kzg_test.go
index 4e3d7285d..df248ff66 100644
--- a/ecc/bw6-756/fr/kzg/kzg_test.go
+++ b/ecc/bw6-756/fr/kzg/kzg_test.go
@@ -60,8 +60,8 @@ func TestDividePolyByXminusA(t *testing.T) {
polRandpoint.Sub(&polRandpoint, &evaluation) // f(rand)-f(point)
// compute f-f(a)/x-a
+ // h re-uses the memory of pol
h := dividePolyByXminusA(pol, evaluation, point)
- pol = nil // h reuses this memory
if len(h) != 229 {
t.Fatal("inconsistent size of quotient")
diff --git a/ecc/bw6-761/fr/kzg/kzg.go b/ecc/bw6-761/fr/kzg/kzg.go
index f1bae8f4a..9dfe56592 100644
--- a/ecc/bw6-761/fr/kzg/kzg.go
+++ b/ecc/bw6-761/fr/kzg/kzg.go
@@ -161,12 +161,11 @@ func Open(p []fr.Element, point fr.Element, pk ProvingKey) (OpeningProof, error)
}
// compute H
+ // h reuses memory from _p
_p := make([]fr.Element, len(p))
copy(_p, p)
h := dividePolyByXminusA(_p, res.ClaimedValue, point)
- _p = nil // h re-use this memory
-
// commit to H
hCommit, err := Commit(h, pk)
if err != nil {
diff --git a/ecc/bw6-761/fr/kzg/kzg_test.go b/ecc/bw6-761/fr/kzg/kzg_test.go
index 5b103701d..281bc2a89 100644
--- a/ecc/bw6-761/fr/kzg/kzg_test.go
+++ b/ecc/bw6-761/fr/kzg/kzg_test.go
@@ -60,8 +60,8 @@ func TestDividePolyByXminusA(t *testing.T) {
polRandpoint.Sub(&polRandpoint, &evaluation) // f(rand)-f(point)
// compute f-f(a)/x-a
+ // h re-uses the memory of pol
h := dividePolyByXminusA(pol, evaluation, point)
- pol = nil // h reuses this memory
if len(h) != 229 {
t.Fatal("inconsistent size of quotient")
diff --git a/internal/generator/kzg/template/kzg.go.tmpl b/internal/generator/kzg/template/kzg.go.tmpl
index 382b81cd2..cb31d48c8 100644
--- a/internal/generator/kzg/template/kzg.go.tmpl
+++ b/internal/generator/kzg/template/kzg.go.tmpl
@@ -143,12 +143,11 @@ func Open(p []fr.Element, point fr.Element, pk ProvingKey) (OpeningProof, error)
}
// compute H
+ // h reuses memory from _p
_p := make([]fr.Element, len(p))
copy(_p, p)
h := dividePolyByXminusA(_p, res.ClaimedValue, point)
- _p = nil // h re-use this memory
-
// commit to H
hCommit, err := Commit(h, pk)
if err != nil {
diff --git a/internal/generator/kzg/template/kzg.test.go.tmpl b/internal/generator/kzg/template/kzg.test.go.tmpl
index 91fc650c5..a489c93a6 100644
--- a/internal/generator/kzg/template/kzg.test.go.tmpl
+++ b/internal/generator/kzg/template/kzg.test.go.tmpl
@@ -42,8 +42,8 @@ func TestDividePolyByXminusA(t *testing.T) {
polRandpoint.Sub(&polRandpoint, &evaluation) // f(rand)-f(point)
// compute f-f(a)/x-a
+ // h re-uses the memory of pol
h := dividePolyByXminusA(pol, evaluation, point)
- pol = nil // h reuses this memory
if len(h) != 229 {
t.Fatal("inconsistent size of quotient")
From 62e5595c3fc3ad18e21594c133a3f1aceb0657b5 Mon Sep 17 00:00:00 2001
From: Justin Traglia <95511699+jtraglia@users.noreply.github.com>
Date: Wed, 10 May 2023 16:28:26 -0500
Subject: [PATCH 12/51] Run golangci-lint on generated files (#396)
* Run golangci-lint on generated files
* Make it more portable
* Run golangci-lint last
---
.github/workflows/pr.yml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 9267b9ffb..7dcd4e46d 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -27,10 +27,6 @@ jobs:
${{ runner.os }}-go-
- name: gofmt
run: if [[ -n $(gofmt -l .) ]]; then echo "please run gofmt"; exit 1; fi
- - name: golangci-lint
- uses: golangci/golangci-lint-action@v3
- with:
- args: --timeout=5m
- name: install deps
run: go install golang.org/x/tools/cmd/goimports@latest && go install github.com/klauspost/asmfmt/cmd/asmfmt@latest
- name: generated files should not be modified
@@ -39,6 +35,13 @@ jobs:
git update-index --assume-unchanged go.mod
git update-index --assume-unchanged go.sum
if [[ -n $(git status --porcelain) ]]; then echo "git repo is dirty after running go generate -- please don't modify generated files"; echo $(git diff);echo $(git status --porcelain); exit 1; fi
+ # A hack to get golangci-lint to examine generated files
+ - name: remove "generated by" comments
+ run: find . -type f -name "*.go" -exec perl -i -pe 's/Code generated by .* DO NOT EDIT/FOO/g' {} \;
+ - name: golangci-lint
+ uses: golangci/golangci-lint-action@v3
+ with:
+ args: --timeout=5m
test:
strategy:
From 0c0b9aad529b4cc047ef5277b83435e9d1185192 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Tue, 23 May 2023 18:19:44 -0500
Subject: [PATCH 13/51] feat: pedersen folding proofs
---
ecc/bn254/fr/pedersen/pedersen.go | 155 ++++++++++++++++++++++---
ecc/bn254/fr/pedersen/pedersen_test.go | 51 +++++++-
2 files changed, 188 insertions(+), 18 deletions(-)
diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go
index b7f60bf2e..413abbb31 100644
--- a/ecc/bn254/fr/pedersen/pedersen.go
+++ b/ecc/bn254/fr/pedersen/pedersen.go
@@ -18,10 +18,12 @@ package pedersen
import (
"crypto/rand"
+ "crypto/sha256"
"fmt"
"github.com/consensys/gnark-crypto/ecc"
curve "github.com/consensys/gnark-crypto/ecc/bn254"
"github.com/consensys/gnark-crypto/ecc/bn254/fr"
+ fiatshamir "github.com/consensys/gnark-crypto/fiat-shamir"
"io"
"math/big"
)
@@ -51,7 +53,7 @@ func randomOnG2() (curve.G2Affine, error) { // TODO: Add to G2.go?
}
}
-func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
+func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err error) {
if vk.g, err = randomOnG2(); err != nil {
return
@@ -70,19 +72,22 @@ func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
sigmaInvNeg.Sub(fr.Modulus(), &sigmaInvNeg)
vk.gRootSigmaNeg.ScalarMultiplication(&vk.g, &sigmaInvNeg)
- pk.basisExpSigma = make([]curve.G1Affine, len(basis))
- for i := range basis {
- pk.basisExpSigma[i].ScalarMultiplication(&basis[i], sigma)
+ pk = make([]ProvingKey, len(bases))
+ for i := range bases {
+ pk[i].basisExpSigma = make([]curve.G1Affine, len(bases[i]))
+ for j := range bases[i] {
+ pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
+ }
+
+ pk[i].basis = bases[i]
}
- pk.basis = basis
return
}
-func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, knowledgeProof curve.G1Affine, err error) {
-
+func (pk *ProvingKey) ProveKnowledge(values []fr.Element) (pok curve.G1Affine, err error) {
if len(values) != len(pk.basis) {
- err = fmt.Errorf("unexpected number of values")
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
@@ -92,15 +97,135 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, kn
NbTasks: 1, // TODO Experiment
}
- if _, err = commitment.MultiExp(pk.basis, values, config); err != nil {
+ _, err = pok.MultiExp(pk.basisExpSigma, values, config)
+ return
+}
+
+func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, err error) {
+
+ if len(values) != len(pk.basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
- _, err = knowledgeProof.MultiExp(pk.basisExpSigma, values, config)
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(pk.basis, values, config)
return
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
+// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
+func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
+ if len(pk) != len(values) {
+ err = fmt.Errorf("must have as many value vectors as bases")
+ return
+ }
+
+ if len(pk) == 1 { // no need to fold
+ return pk[0].ProveKnowledge(values[0])
+ }
+
+ offset := 0
+ for i := range pk {
+ if len(values[i]) != len(pk[i].basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+ offset += len(values[i])
+ }
+
+ var r fr.Element
+ if r, err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+
+ // prepare one amalgamated MSM
+ scaledValues := make([]fr.Element, offset)
+ basis := make([]curve.G1Affine, offset)
+
+ copy(basis, pk[0].basis)
+ copy(scaledValues, values[0])
+
+ offset = len(values[0])
+ rI := r
+ for i := 1; i < len(pk); i++ {
+ copy(basis[offset:], pk[i].basis)
+ for j := range pk[i].basis {
+ scaledValues[offset].Mul(&values[i][j], &rI)
+ offset++
+ }
+
+ if i+1 < len(pk) {
+ rI.Mul(&rI, &r)
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+
+ _, err = pok.MultiExp(basis, scaledValues, config)
+ return
+}
+
+// FoldCommitments amalgamates
+func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
+
+ if len(commitments) == 1 { // no need to fold
+ commitment = commitments[0]
+ return
+ }
+
+ r := make([]fr.Element, len(commitments))
+ r[0].SetOne()
+ if r[1], err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+ for i := 2; i < len(commitments); i++ {
+ r[i].Mul(&r[i-1], &r[1])
+ }
+
+ for i := range commitments { // TODO @Tabaie Remove if MSM does subgroup check for you
+ if !commitments[i].IsInSubGroup() {
+ err = fmt.Errorf("subgroup check failed")
+ return
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(commitments, r, config)
+ return
+}
+
// Verify checks if the proof of knowledge is valid
func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G1Affine) error {
@@ -108,14 +233,12 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return fmt.Errorf("subgroup check failed")
}
- product, err := curve.Pair([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg})
- if err != nil {
+ if isOne, err := curve.PairingCheck([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg}); err != nil {
return err
+ } else if !isOne {
+ return fmt.Errorf("proof rejected")
}
- if product.IsOne() {
- return nil
- }
- return fmt.Errorf("proof rejected")
+ return nil
}
// Marshal
diff --git a/ecc/bn254/fr/pedersen/pedersen_test.go b/ecc/bn254/fr/pedersen/pedersen_test.go
index 14fa00d83..37a9b9fa0 100644
--- a/ecc/bn254/fr/pedersen/pedersen_test.go
+++ b/ecc/bn254/fr/pedersen/pedersen_test.go
@@ -17,6 +17,7 @@
package pedersen
import (
+ "fmt"
curve "github.com/consensys/gnark-crypto/ecc/bn254"
"github.com/consensys/gnark-crypto/ecc/bn254/fr"
"github.com/consensys/gnark-crypto/utils"
@@ -67,15 +68,19 @@ func testCommit(t *testing.T, values ...interface{}) {
basis := randomG1Slice(t, len(values))
var (
- pk ProvingKey
+ pk []ProvingKey
vk VerifyingKey
err error
commitment, pok curve.G1Affine
)
+ valuesFr := interfaceSliceToFrSlice(t, values...)
+
pk, vk, err = Setup(basis)
assert.NoError(t, err)
- commitment, pok, err = pk.Commit(interfaceSliceToFrSlice(t, values...))
+ commitment, err = pk[0].Commit(valuesFr)
+ assert.NoError(t, err)
+ pok, err = pk[0].ProveKnowledge(valuesFr)
assert.NoError(t, err)
assert.NoError(t, vk.Verify(commitment, pok))
@@ -83,6 +88,48 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
+func TestFoldCommitments(t *testing.T) {
+
+ values := [][]fr.Element{
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ }
+
+ bases := make([][]curve.G1Affine, len(values))
+ for i := range bases {
+ bases[i] = randomG1Slice(t, len(values[i]))
+ }
+
+ pk, vk, err := Setup(bases...)
+ assert.NoError(t, err)
+
+ run := func(values [][]fr.Element) func(t *testing.T) {
+ return func(t *testing.T) {
+
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ var pok, foldedCommitment curve.G1Affine
+ pok, err = BatchProve(pk[:len(values)], values, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments(commitments, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+
+ pok.Neg(&pok)
+ assert.NotNil(t, vk.Verify(foldedCommitment, pok))
+ }
+ }
+
+ for i := range values {
+ t.Run(fmt.Sprintf("folding %d proofs", i+1), run(values[:i+1]))
+ }
+}
+
func TestCommitToOne(t *testing.T) {
testCommit(t, 1)
}
From 04ad7dcfbc269a8efcc315da7d2319b9ab29efe8 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Tue, 23 May 2023 18:35:41 -0500
Subject: [PATCH 14/51] fix: pedersen folding bug
---
ecc/bn254/fr/pedersen/pedersen.go | 4 ++--
ecc/bn254/fr/pedersen/pedersen_test.go | 32 ++++++++++++++++++--------
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go
index 413abbb31..1e3fd8a78 100644
--- a/ecc/bn254/fr/pedersen/pedersen.go
+++ b/ecc/bn254/fr/pedersen/pedersen.go
@@ -166,13 +166,13 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
scaledValues := make([]fr.Element, offset)
basis := make([]curve.G1Affine, offset)
- copy(basis, pk[0].basis)
+ copy(basis, pk[0].basisExpSigma)
copy(scaledValues, values[0])
offset = len(values[0])
rI := r
for i := 1; i < len(pk); i++ {
- copy(basis[offset:], pk[i].basis)
+ copy(basis[offset:], pk[i].basisExpSigma)
for j := range pk[i].basis {
scaledValues[offset].Mul(&values[i][j], &rI)
offset++
diff --git a/ecc/bn254/fr/pedersen/pedersen_test.go b/ecc/bn254/fr/pedersen/pedersen_test.go
index 37a9b9fa0..62f6aee7e 100644
--- a/ecc/bn254/fr/pedersen/pedersen_test.go
+++ b/ecc/bn254/fr/pedersen/pedersen_test.go
@@ -88,7 +88,7 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
-func TestFoldCommitments(t *testing.T) {
+func TestFoldProofs(t *testing.T) {
values := [][]fr.Element{
interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
@@ -104,19 +104,31 @@ func TestFoldCommitments(t *testing.T) {
pk, vk, err := Setup(bases...)
assert.NoError(t, err)
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ t.Run("folding with zeros", func(t *testing.T) {
+ pokFolded, err := BatchProve(pk[:2], [][]fr.Element{
+ values[0],
+ make([]fr.Element, len(values[1])),
+ }, []byte("test"))
+ assert.NoError(t, err)
+ var pok curve.G1Affine
+ pok, err = pk[0].ProveKnowledge(values[0])
+ assert.NoError(t, err)
+ assert.Equal(t, pok, pokFolded)
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
- commitments := make([]curve.G1Affine, len(values))
- for i := range values {
- commitments[i], err = pk[i].Commit(values[i])
- }
-
- var pok, foldedCommitment curve.G1Affine
- pok, err = BatchProve(pk[:len(values)], values, []byte("test"))
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve(pk[:len(values)], values, []byte("test"))
assert.NoError(t, err)
- foldedCommitment, err = FoldCommitments(commitments, []byte("test"))
+ foldedCommitment, err = FoldCommitments(commitments[:len(values)], []byte("test"))
assert.NoError(t, err)
assert.NoError(t, vk.Verify(foldedCommitment, pok))
@@ -126,7 +138,7 @@ func TestFoldCommitments(t *testing.T) {
}
for i := range values {
- t.Run(fmt.Sprintf("folding %d proofs", i+1), run(values[:i+1]))
+ t.Run(fmt.Sprintf("folding %d", i+1), run(values[:i+1]))
}
}
From 6ecf8d897dc8c28f63008636190da4417eaff027 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Tue, 23 May 2023 18:55:27 -0500
Subject: [PATCH 15/51] build: generify bn254 changes
---
ecc/bls12-377/fr/pedersen/pedersen.go | 152 +++++++++++++++--
ecc/bls12-377/fr/pedersen/pedersen_test.go | 62 ++++++-
ecc/bls12-378/fr/pedersen/pedersen.go | 152 +++++++++++++++--
ecc/bls12-378/fr/pedersen/pedersen_test.go | 62 ++++++-
ecc/bls12-381/fr/pedersen/pedersen.go | 152 +++++++++++++++--
ecc/bls12-381/fr/pedersen/pedersen_test.go | 62 ++++++-
ecc/bls24-315/fr/pedersen/pedersen.go | 152 +++++++++++++++--
ecc/bls24-315/fr/pedersen/pedersen_test.go | 62 ++++++-
ecc/bls24-317/fr/pedersen/pedersen.go | 152 +++++++++++++++--
ecc/bls24-317/fr/pedersen/pedersen_test.go | 62 ++++++-
ecc/bn254/fr/pedersen/pedersen.go | 3 -
ecc/bn254/fr/pedersen/pedersen_test.go | 1 -
ecc/bw6-633/fr/pedersen/pedersen.go | 152 +++++++++++++++--
ecc/bw6-633/fr/pedersen/pedersen_test.go | 62 ++++++-
ecc/bw6-756/fr/pedersen/pedersen.go | 152 +++++++++++++++--
ecc/bw6-756/fr/pedersen/pedersen_test.go | 62 ++++++-
ecc/bw6-761/fr/pedersen/pedersen.go | 152 +++++++++++++++--
ecc/bw6-761/fr/pedersen/pedersen_test.go | 62 ++++++-
.../pedersen/template/pedersen.go.tmpl | 158 +++++++++++++++---
.../pedersen/template/pedersen.test.go.tmpl | 62 ++++++-
20 files changed, 1767 insertions(+), 169 deletions(-)
diff --git a/ecc/bls12-377/fr/pedersen/pedersen.go b/ecc/bls12-377/fr/pedersen/pedersen.go
index cee17840b..6adf2e125 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen.go
@@ -18,10 +18,12 @@ package pedersen
import (
"crypto/rand"
+ "crypto/sha256"
"fmt"
"github.com/consensys/gnark-crypto/ecc"
curve "github.com/consensys/gnark-crypto/ecc/bls12-377"
"github.com/consensys/gnark-crypto/ecc/bls12-377/fr"
+ fiatshamir "github.com/consensys/gnark-crypto/fiat-shamir"
"io"
"math/big"
)
@@ -51,7 +53,7 @@ func randomOnG2() (curve.G2Affine, error) { // TODO: Add to G2.go?
}
}
-func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
+func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err error) {
if vk.g, err = randomOnG2(); err != nil {
return
@@ -70,34 +72,154 @@ func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
sigmaInvNeg.Sub(fr.Modulus(), &sigmaInvNeg)
vk.gRootSigmaNeg.ScalarMultiplication(&vk.g, &sigmaInvNeg)
- pk.basisExpSigma = make([]curve.G1Affine, len(basis))
- for i := range basis {
- pk.basisExpSigma[i].ScalarMultiplication(&basis[i], sigma)
+ pk = make([]ProvingKey, len(bases))
+ for i := range bases {
+ pk[i].basisExpSigma = make([]curve.G1Affine, len(bases[i]))
+ for j := range bases[i] {
+ pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
+ }
+ pk[i].basis = bases[i]
+ }
+ return
+}
+
+func (pk *ProvingKey) ProveKnowledge(values []fr.Element) (pok curve.G1Affine, err error) {
+ if len(values) != len(pk.basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1, // TODO Experiment
}
- pk.basis = basis
+ _, err = pok.MultiExp(pk.basisExpSigma, values, config)
return
}
-func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, knowledgeProof curve.G1Affine, err error) {
+func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, err error) {
if len(values) != len(pk.basis) {
- err = fmt.Errorf("unexpected number of values")
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
// TODO @gbotrel this will spawn more than one task, see
// https://github.com/ConsenSys/gnark-crypto/issues/269
config := ecc.MultiExpConfig{
- NbTasks: 1, // TODO Experiment
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(pk.basis, values, config)
+
+ return
+}
+
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
}
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
- if _, err = commitment.MultiExp(pk.basis, values, config); err != nil {
+// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
+func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
+ if len(pk) != len(values) {
+ err = fmt.Errorf("must have as many value vectors as bases")
return
}
- _, err = knowledgeProof.MultiExp(pk.basisExpSigma, values, config)
+ if len(pk) == 1 { // no need to fold
+ return pk[0].ProveKnowledge(values[0])
+ }
+ offset := 0
+ for i := range pk {
+ if len(values[i]) != len(pk[i].basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+ offset += len(values[i])
+ }
+
+ var r fr.Element
+ if r, err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+
+ // prepare one amalgamated MSM
+ scaledValues := make([]fr.Element, offset)
+ basis := make([]curve.G1Affine, offset)
+
+ copy(basis, pk[0].basisExpSigma)
+ copy(scaledValues, values[0])
+
+ offset = len(values[0])
+ rI := r
+ for i := 1; i < len(pk); i++ {
+ copy(basis[offset:], pk[i].basisExpSigma)
+ for j := range pk[i].basis {
+ scaledValues[offset].Mul(&values[i][j], &rI)
+ offset++
+ }
+ if i+1 < len(pk) {
+ rI.Mul(&rI, &r)
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+
+ _, err = pok.MultiExp(basis, scaledValues, config)
+ return
+}
+
+// FoldCommitments amalgamates
+func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
+
+ if len(commitments) == 1 { // no need to fold
+ commitment = commitments[0]
+ return
+ }
+
+ r := make([]fr.Element, len(commitments))
+ r[0].SetOne()
+ if r[1], err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+ for i := 2; i < len(commitments); i++ {
+ r[i].Mul(&r[i-1], &r[1])
+ }
+
+ for i := range commitments { // TODO @Tabaie Remove if MSM does subgroup check for you
+ if !commitments[i].IsInSubGroup() {
+ err = fmt.Errorf("subgroup check failed")
+ return
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(commitments, r, config)
return
}
@@ -108,14 +230,12 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return fmt.Errorf("subgroup check failed")
}
- product, err := curve.Pair([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg})
- if err != nil {
+ if isOne, err := curve.PairingCheck([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg}); err != nil {
return err
+ } else if !isOne {
+ return fmt.Errorf("proof rejected")
}
- if product.IsOne() {
- return nil
- }
- return fmt.Errorf("proof rejected")
+ return nil
}
// Marshal
diff --git a/ecc/bls12-377/fr/pedersen/pedersen_test.go b/ecc/bls12-377/fr/pedersen/pedersen_test.go
index 939642488..d80621c06 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen_test.go
@@ -17,6 +17,7 @@
package pedersen
import (
+ "fmt"
curve "github.com/consensys/gnark-crypto/ecc/bls12-377"
"github.com/consensys/gnark-crypto/ecc/bls12-377/fr"
"github.com/consensys/gnark-crypto/utils"
@@ -67,15 +68,18 @@ func testCommit(t *testing.T, values ...interface{}) {
basis := randomG1Slice(t, len(values))
var (
- pk ProvingKey
+ pk []ProvingKey
vk VerifyingKey
err error
commitment, pok curve.G1Affine
)
+ valuesFr := interfaceSliceToFrSlice(t, values...)
pk, vk, err = Setup(basis)
assert.NoError(t, err)
- commitment, pok, err = pk.Commit(interfaceSliceToFrSlice(t, values...))
+ commitment, err = pk[0].Commit(valuesFr)
+ assert.NoError(t, err)
+ pok, err = pk[0].ProveKnowledge(valuesFr)
assert.NoError(t, err)
assert.NoError(t, vk.Verify(commitment, pok))
@@ -83,6 +87,60 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
+func TestFoldProofs(t *testing.T) {
+
+ values := [][]fr.Element{
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ }
+
+ bases := make([][]curve.G1Affine, len(values))
+ for i := range bases {
+ bases[i] = randomG1Slice(t, len(values[i]))
+ }
+
+ pk, vk, err := Setup(bases...)
+ assert.NoError(t, err)
+
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ t.Run("folding with zeros", func(t *testing.T) {
+ pokFolded, err := BatchProve(pk[:2], [][]fr.Element{
+ values[0],
+ make([]fr.Element, len(values[1])),
+ }, []byte("test"))
+ assert.NoError(t, err)
+ var pok curve.G1Affine
+ pok, err = pk[0].ProveKnowledge(values[0])
+ assert.NoError(t, err)
+ assert.Equal(t, pok, pokFolded)
+ })
+
+ run := func(values [][]fr.Element) func(t *testing.T) {
+ return func(t *testing.T) {
+
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve(pk[:len(values)], values, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments(commitments[:len(values)], []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+
+ pok.Neg(&pok)
+ assert.NotNil(t, vk.Verify(foldedCommitment, pok))
+ }
+ }
+
+ for i := range values {
+ t.Run(fmt.Sprintf("folding %d", i+1), run(values[:i+1]))
+ }
+}
+
func TestCommitToOne(t *testing.T) {
testCommit(t, 1)
}
diff --git a/ecc/bls12-378/fr/pedersen/pedersen.go b/ecc/bls12-378/fr/pedersen/pedersen.go
index a526dd71c..70043a31b 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen.go
@@ -18,10 +18,12 @@ package pedersen
import (
"crypto/rand"
+ "crypto/sha256"
"fmt"
"github.com/consensys/gnark-crypto/ecc"
curve "github.com/consensys/gnark-crypto/ecc/bls12-378"
"github.com/consensys/gnark-crypto/ecc/bls12-378/fr"
+ fiatshamir "github.com/consensys/gnark-crypto/fiat-shamir"
"io"
"math/big"
)
@@ -51,7 +53,7 @@ func randomOnG2() (curve.G2Affine, error) { // TODO: Add to G2.go?
}
}
-func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
+func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err error) {
if vk.g, err = randomOnG2(); err != nil {
return
@@ -70,34 +72,154 @@ func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
sigmaInvNeg.Sub(fr.Modulus(), &sigmaInvNeg)
vk.gRootSigmaNeg.ScalarMultiplication(&vk.g, &sigmaInvNeg)
- pk.basisExpSigma = make([]curve.G1Affine, len(basis))
- for i := range basis {
- pk.basisExpSigma[i].ScalarMultiplication(&basis[i], sigma)
+ pk = make([]ProvingKey, len(bases))
+ for i := range bases {
+ pk[i].basisExpSigma = make([]curve.G1Affine, len(bases[i]))
+ for j := range bases[i] {
+ pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
+ }
+ pk[i].basis = bases[i]
+ }
+ return
+}
+
+func (pk *ProvingKey) ProveKnowledge(values []fr.Element) (pok curve.G1Affine, err error) {
+ if len(values) != len(pk.basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1, // TODO Experiment
}
- pk.basis = basis
+ _, err = pok.MultiExp(pk.basisExpSigma, values, config)
return
}
-func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, knowledgeProof curve.G1Affine, err error) {
+func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, err error) {
if len(values) != len(pk.basis) {
- err = fmt.Errorf("unexpected number of values")
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
// TODO @gbotrel this will spawn more than one task, see
// https://github.com/ConsenSys/gnark-crypto/issues/269
config := ecc.MultiExpConfig{
- NbTasks: 1, // TODO Experiment
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(pk.basis, values, config)
+
+ return
+}
+
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
}
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
- if _, err = commitment.MultiExp(pk.basis, values, config); err != nil {
+// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
+func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
+ if len(pk) != len(values) {
+ err = fmt.Errorf("must have as many value vectors as bases")
return
}
- _, err = knowledgeProof.MultiExp(pk.basisExpSigma, values, config)
+ if len(pk) == 1 { // no need to fold
+ return pk[0].ProveKnowledge(values[0])
+ }
+ offset := 0
+ for i := range pk {
+ if len(values[i]) != len(pk[i].basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+ offset += len(values[i])
+ }
+
+ var r fr.Element
+ if r, err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+
+ // prepare one amalgamated MSM
+ scaledValues := make([]fr.Element, offset)
+ basis := make([]curve.G1Affine, offset)
+
+ copy(basis, pk[0].basisExpSigma)
+ copy(scaledValues, values[0])
+
+ offset = len(values[0])
+ rI := r
+ for i := 1; i < len(pk); i++ {
+ copy(basis[offset:], pk[i].basisExpSigma)
+ for j := range pk[i].basis {
+ scaledValues[offset].Mul(&values[i][j], &rI)
+ offset++
+ }
+ if i+1 < len(pk) {
+ rI.Mul(&rI, &r)
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+
+ _, err = pok.MultiExp(basis, scaledValues, config)
+ return
+}
+
+// FoldCommitments amalgamates
+func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
+
+ if len(commitments) == 1 { // no need to fold
+ commitment = commitments[0]
+ return
+ }
+
+ r := make([]fr.Element, len(commitments))
+ r[0].SetOne()
+ if r[1], err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+ for i := 2; i < len(commitments); i++ {
+ r[i].Mul(&r[i-1], &r[1])
+ }
+
+ for i := range commitments { // TODO @Tabaie Remove if MSM does subgroup check for you
+ if !commitments[i].IsInSubGroup() {
+ err = fmt.Errorf("subgroup check failed")
+ return
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(commitments, r, config)
return
}
@@ -108,14 +230,12 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return fmt.Errorf("subgroup check failed")
}
- product, err := curve.Pair([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg})
- if err != nil {
+ if isOne, err := curve.PairingCheck([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg}); err != nil {
return err
+ } else if !isOne {
+ return fmt.Errorf("proof rejected")
}
- if product.IsOne() {
- return nil
- }
- return fmt.Errorf("proof rejected")
+ return nil
}
// Marshal
diff --git a/ecc/bls12-378/fr/pedersen/pedersen_test.go b/ecc/bls12-378/fr/pedersen/pedersen_test.go
index b2119020d..16616f309 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen_test.go
@@ -17,6 +17,7 @@
package pedersen
import (
+ "fmt"
curve "github.com/consensys/gnark-crypto/ecc/bls12-378"
"github.com/consensys/gnark-crypto/ecc/bls12-378/fr"
"github.com/consensys/gnark-crypto/utils"
@@ -67,15 +68,18 @@ func testCommit(t *testing.T, values ...interface{}) {
basis := randomG1Slice(t, len(values))
var (
- pk ProvingKey
+ pk []ProvingKey
vk VerifyingKey
err error
commitment, pok curve.G1Affine
)
+ valuesFr := interfaceSliceToFrSlice(t, values...)
pk, vk, err = Setup(basis)
assert.NoError(t, err)
- commitment, pok, err = pk.Commit(interfaceSliceToFrSlice(t, values...))
+ commitment, err = pk[0].Commit(valuesFr)
+ assert.NoError(t, err)
+ pok, err = pk[0].ProveKnowledge(valuesFr)
assert.NoError(t, err)
assert.NoError(t, vk.Verify(commitment, pok))
@@ -83,6 +87,60 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
+func TestFoldProofs(t *testing.T) {
+
+ values := [][]fr.Element{
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ }
+
+ bases := make([][]curve.G1Affine, len(values))
+ for i := range bases {
+ bases[i] = randomG1Slice(t, len(values[i]))
+ }
+
+ pk, vk, err := Setup(bases...)
+ assert.NoError(t, err)
+
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ t.Run("folding with zeros", func(t *testing.T) {
+ pokFolded, err := BatchProve(pk[:2], [][]fr.Element{
+ values[0],
+ make([]fr.Element, len(values[1])),
+ }, []byte("test"))
+ assert.NoError(t, err)
+ var pok curve.G1Affine
+ pok, err = pk[0].ProveKnowledge(values[0])
+ assert.NoError(t, err)
+ assert.Equal(t, pok, pokFolded)
+ })
+
+ run := func(values [][]fr.Element) func(t *testing.T) {
+ return func(t *testing.T) {
+
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve(pk[:len(values)], values, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments(commitments[:len(values)], []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+
+ pok.Neg(&pok)
+ assert.NotNil(t, vk.Verify(foldedCommitment, pok))
+ }
+ }
+
+ for i := range values {
+ t.Run(fmt.Sprintf("folding %d", i+1), run(values[:i+1]))
+ }
+}
+
func TestCommitToOne(t *testing.T) {
testCommit(t, 1)
}
diff --git a/ecc/bls12-381/fr/pedersen/pedersen.go b/ecc/bls12-381/fr/pedersen/pedersen.go
index e9efb6008..1edf26074 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen.go
@@ -18,10 +18,12 @@ package pedersen
import (
"crypto/rand"
+ "crypto/sha256"
"fmt"
"github.com/consensys/gnark-crypto/ecc"
curve "github.com/consensys/gnark-crypto/ecc/bls12-381"
"github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
+ fiatshamir "github.com/consensys/gnark-crypto/fiat-shamir"
"io"
"math/big"
)
@@ -51,7 +53,7 @@ func randomOnG2() (curve.G2Affine, error) { // TODO: Add to G2.go?
}
}
-func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
+func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err error) {
if vk.g, err = randomOnG2(); err != nil {
return
@@ -70,34 +72,154 @@ func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
sigmaInvNeg.Sub(fr.Modulus(), &sigmaInvNeg)
vk.gRootSigmaNeg.ScalarMultiplication(&vk.g, &sigmaInvNeg)
- pk.basisExpSigma = make([]curve.G1Affine, len(basis))
- for i := range basis {
- pk.basisExpSigma[i].ScalarMultiplication(&basis[i], sigma)
+ pk = make([]ProvingKey, len(bases))
+ for i := range bases {
+ pk[i].basisExpSigma = make([]curve.G1Affine, len(bases[i]))
+ for j := range bases[i] {
+ pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
+ }
+ pk[i].basis = bases[i]
+ }
+ return
+}
+
+func (pk *ProvingKey) ProveKnowledge(values []fr.Element) (pok curve.G1Affine, err error) {
+ if len(values) != len(pk.basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1, // TODO Experiment
}
- pk.basis = basis
+ _, err = pok.MultiExp(pk.basisExpSigma, values, config)
return
}
-func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, knowledgeProof curve.G1Affine, err error) {
+func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, err error) {
if len(values) != len(pk.basis) {
- err = fmt.Errorf("unexpected number of values")
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
// TODO @gbotrel this will spawn more than one task, see
// https://github.com/ConsenSys/gnark-crypto/issues/269
config := ecc.MultiExpConfig{
- NbTasks: 1, // TODO Experiment
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(pk.basis, values, config)
+
+ return
+}
+
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
}
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
- if _, err = commitment.MultiExp(pk.basis, values, config); err != nil {
+// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
+func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
+ if len(pk) != len(values) {
+ err = fmt.Errorf("must have as many value vectors as bases")
return
}
- _, err = knowledgeProof.MultiExp(pk.basisExpSigma, values, config)
+ if len(pk) == 1 { // no need to fold
+ return pk[0].ProveKnowledge(values[0])
+ }
+ offset := 0
+ for i := range pk {
+ if len(values[i]) != len(pk[i].basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+ offset += len(values[i])
+ }
+
+ var r fr.Element
+ if r, err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+
+ // prepare one amalgamated MSM
+ scaledValues := make([]fr.Element, offset)
+ basis := make([]curve.G1Affine, offset)
+
+ copy(basis, pk[0].basisExpSigma)
+ copy(scaledValues, values[0])
+
+ offset = len(values[0])
+ rI := r
+ for i := 1; i < len(pk); i++ {
+ copy(basis[offset:], pk[i].basisExpSigma)
+ for j := range pk[i].basis {
+ scaledValues[offset].Mul(&values[i][j], &rI)
+ offset++
+ }
+ if i+1 < len(pk) {
+ rI.Mul(&rI, &r)
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+
+ _, err = pok.MultiExp(basis, scaledValues, config)
+ return
+}
+
+// FoldCommitments amalgamates
+func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
+
+ if len(commitments) == 1 { // no need to fold
+ commitment = commitments[0]
+ return
+ }
+
+ r := make([]fr.Element, len(commitments))
+ r[0].SetOne()
+ if r[1], err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+ for i := 2; i < len(commitments); i++ {
+ r[i].Mul(&r[i-1], &r[1])
+ }
+
+ for i := range commitments { // TODO @Tabaie Remove if MSM does subgroup check for you
+ if !commitments[i].IsInSubGroup() {
+ err = fmt.Errorf("subgroup check failed")
+ return
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(commitments, r, config)
return
}
@@ -108,14 +230,12 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return fmt.Errorf("subgroup check failed")
}
- product, err := curve.Pair([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg})
- if err != nil {
+ if isOne, err := curve.PairingCheck([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg}); err != nil {
return err
+ } else if !isOne {
+ return fmt.Errorf("proof rejected")
}
- if product.IsOne() {
- return nil
- }
- return fmt.Errorf("proof rejected")
+ return nil
}
// Marshal
diff --git a/ecc/bls12-381/fr/pedersen/pedersen_test.go b/ecc/bls12-381/fr/pedersen/pedersen_test.go
index 78e04273e..3ae2b6eec 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen_test.go
@@ -17,6 +17,7 @@
package pedersen
import (
+ "fmt"
curve "github.com/consensys/gnark-crypto/ecc/bls12-381"
"github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
"github.com/consensys/gnark-crypto/utils"
@@ -67,15 +68,18 @@ func testCommit(t *testing.T, values ...interface{}) {
basis := randomG1Slice(t, len(values))
var (
- pk ProvingKey
+ pk []ProvingKey
vk VerifyingKey
err error
commitment, pok curve.G1Affine
)
+ valuesFr := interfaceSliceToFrSlice(t, values...)
pk, vk, err = Setup(basis)
assert.NoError(t, err)
- commitment, pok, err = pk.Commit(interfaceSliceToFrSlice(t, values...))
+ commitment, err = pk[0].Commit(valuesFr)
+ assert.NoError(t, err)
+ pok, err = pk[0].ProveKnowledge(valuesFr)
assert.NoError(t, err)
assert.NoError(t, vk.Verify(commitment, pok))
@@ -83,6 +87,60 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
+func TestFoldProofs(t *testing.T) {
+
+ values := [][]fr.Element{
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ }
+
+ bases := make([][]curve.G1Affine, len(values))
+ for i := range bases {
+ bases[i] = randomG1Slice(t, len(values[i]))
+ }
+
+ pk, vk, err := Setup(bases...)
+ assert.NoError(t, err)
+
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ t.Run("folding with zeros", func(t *testing.T) {
+ pokFolded, err := BatchProve(pk[:2], [][]fr.Element{
+ values[0],
+ make([]fr.Element, len(values[1])),
+ }, []byte("test"))
+ assert.NoError(t, err)
+ var pok curve.G1Affine
+ pok, err = pk[0].ProveKnowledge(values[0])
+ assert.NoError(t, err)
+ assert.Equal(t, pok, pokFolded)
+ })
+
+ run := func(values [][]fr.Element) func(t *testing.T) {
+ return func(t *testing.T) {
+
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve(pk[:len(values)], values, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments(commitments[:len(values)], []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+
+ pok.Neg(&pok)
+ assert.NotNil(t, vk.Verify(foldedCommitment, pok))
+ }
+ }
+
+ for i := range values {
+ t.Run(fmt.Sprintf("folding %d", i+1), run(values[:i+1]))
+ }
+}
+
func TestCommitToOne(t *testing.T) {
testCommit(t, 1)
}
diff --git a/ecc/bls24-315/fr/pedersen/pedersen.go b/ecc/bls24-315/fr/pedersen/pedersen.go
index 0580e8449..975b7137d 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen.go
@@ -18,10 +18,12 @@ package pedersen
import (
"crypto/rand"
+ "crypto/sha256"
"fmt"
"github.com/consensys/gnark-crypto/ecc"
curve "github.com/consensys/gnark-crypto/ecc/bls24-315"
"github.com/consensys/gnark-crypto/ecc/bls24-315/fr"
+ fiatshamir "github.com/consensys/gnark-crypto/fiat-shamir"
"io"
"math/big"
)
@@ -51,7 +53,7 @@ func randomOnG2() (curve.G2Affine, error) { // TODO: Add to G2.go?
}
}
-func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
+func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err error) {
if vk.g, err = randomOnG2(); err != nil {
return
@@ -70,34 +72,154 @@ func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
sigmaInvNeg.Sub(fr.Modulus(), &sigmaInvNeg)
vk.gRootSigmaNeg.ScalarMultiplication(&vk.g, &sigmaInvNeg)
- pk.basisExpSigma = make([]curve.G1Affine, len(basis))
- for i := range basis {
- pk.basisExpSigma[i].ScalarMultiplication(&basis[i], sigma)
+ pk = make([]ProvingKey, len(bases))
+ for i := range bases {
+ pk[i].basisExpSigma = make([]curve.G1Affine, len(bases[i]))
+ for j := range bases[i] {
+ pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
+ }
+ pk[i].basis = bases[i]
+ }
+ return
+}
+
+func (pk *ProvingKey) ProveKnowledge(values []fr.Element) (pok curve.G1Affine, err error) {
+ if len(values) != len(pk.basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1, // TODO Experiment
}
- pk.basis = basis
+ _, err = pok.MultiExp(pk.basisExpSigma, values, config)
return
}
-func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, knowledgeProof curve.G1Affine, err error) {
+func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, err error) {
if len(values) != len(pk.basis) {
- err = fmt.Errorf("unexpected number of values")
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
// TODO @gbotrel this will spawn more than one task, see
// https://github.com/ConsenSys/gnark-crypto/issues/269
config := ecc.MultiExpConfig{
- NbTasks: 1, // TODO Experiment
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(pk.basis, values, config)
+
+ return
+}
+
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
}
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
- if _, err = commitment.MultiExp(pk.basis, values, config); err != nil {
+// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
+func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
+ if len(pk) != len(values) {
+ err = fmt.Errorf("must have as many value vectors as bases")
return
}
- _, err = knowledgeProof.MultiExp(pk.basisExpSigma, values, config)
+ if len(pk) == 1 { // no need to fold
+ return pk[0].ProveKnowledge(values[0])
+ }
+ offset := 0
+ for i := range pk {
+ if len(values[i]) != len(pk[i].basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+ offset += len(values[i])
+ }
+
+ var r fr.Element
+ if r, err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+
+ // prepare one amalgamated MSM
+ scaledValues := make([]fr.Element, offset)
+ basis := make([]curve.G1Affine, offset)
+
+ copy(basis, pk[0].basisExpSigma)
+ copy(scaledValues, values[0])
+
+ offset = len(values[0])
+ rI := r
+ for i := 1; i < len(pk); i++ {
+ copy(basis[offset:], pk[i].basisExpSigma)
+ for j := range pk[i].basis {
+ scaledValues[offset].Mul(&values[i][j], &rI)
+ offset++
+ }
+ if i+1 < len(pk) {
+ rI.Mul(&rI, &r)
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+
+ _, err = pok.MultiExp(basis, scaledValues, config)
+ return
+}
+
+// FoldCommitments amalgamates
+func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
+
+ if len(commitments) == 1 { // no need to fold
+ commitment = commitments[0]
+ return
+ }
+
+ r := make([]fr.Element, len(commitments))
+ r[0].SetOne()
+ if r[1], err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+ for i := 2; i < len(commitments); i++ {
+ r[i].Mul(&r[i-1], &r[1])
+ }
+
+ for i := range commitments { // TODO @Tabaie Remove if MSM does subgroup check for you
+ if !commitments[i].IsInSubGroup() {
+ err = fmt.Errorf("subgroup check failed")
+ return
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(commitments, r, config)
return
}
@@ -108,14 +230,12 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return fmt.Errorf("subgroup check failed")
}
- product, err := curve.Pair([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg})
- if err != nil {
+ if isOne, err := curve.PairingCheck([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg}); err != nil {
return err
+ } else if !isOne {
+ return fmt.Errorf("proof rejected")
}
- if product.IsOne() {
- return nil
- }
- return fmt.Errorf("proof rejected")
+ return nil
}
// Marshal
diff --git a/ecc/bls24-315/fr/pedersen/pedersen_test.go b/ecc/bls24-315/fr/pedersen/pedersen_test.go
index 475026061..1bbe4f9ca 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen_test.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen_test.go
@@ -17,6 +17,7 @@
package pedersen
import (
+ "fmt"
curve "github.com/consensys/gnark-crypto/ecc/bls24-315"
"github.com/consensys/gnark-crypto/ecc/bls24-315/fr"
"github.com/consensys/gnark-crypto/utils"
@@ -67,15 +68,18 @@ func testCommit(t *testing.T, values ...interface{}) {
basis := randomG1Slice(t, len(values))
var (
- pk ProvingKey
+ pk []ProvingKey
vk VerifyingKey
err error
commitment, pok curve.G1Affine
)
+ valuesFr := interfaceSliceToFrSlice(t, values...)
pk, vk, err = Setup(basis)
assert.NoError(t, err)
- commitment, pok, err = pk.Commit(interfaceSliceToFrSlice(t, values...))
+ commitment, err = pk[0].Commit(valuesFr)
+ assert.NoError(t, err)
+ pok, err = pk[0].ProveKnowledge(valuesFr)
assert.NoError(t, err)
assert.NoError(t, vk.Verify(commitment, pok))
@@ -83,6 +87,60 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
+func TestFoldProofs(t *testing.T) {
+
+ values := [][]fr.Element{
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ }
+
+ bases := make([][]curve.G1Affine, len(values))
+ for i := range bases {
+ bases[i] = randomG1Slice(t, len(values[i]))
+ }
+
+ pk, vk, err := Setup(bases...)
+ assert.NoError(t, err)
+
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ t.Run("folding with zeros", func(t *testing.T) {
+ pokFolded, err := BatchProve(pk[:2], [][]fr.Element{
+ values[0],
+ make([]fr.Element, len(values[1])),
+ }, []byte("test"))
+ assert.NoError(t, err)
+ var pok curve.G1Affine
+ pok, err = pk[0].ProveKnowledge(values[0])
+ assert.NoError(t, err)
+ assert.Equal(t, pok, pokFolded)
+ })
+
+ run := func(values [][]fr.Element) func(t *testing.T) {
+ return func(t *testing.T) {
+
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve(pk[:len(values)], values, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments(commitments[:len(values)], []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+
+ pok.Neg(&pok)
+ assert.NotNil(t, vk.Verify(foldedCommitment, pok))
+ }
+ }
+
+ for i := range values {
+ t.Run(fmt.Sprintf("folding %d", i+1), run(values[:i+1]))
+ }
+}
+
func TestCommitToOne(t *testing.T) {
testCommit(t, 1)
}
diff --git a/ecc/bls24-317/fr/pedersen/pedersen.go b/ecc/bls24-317/fr/pedersen/pedersen.go
index 3b8fc2509..7850c341b 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen.go
@@ -18,10 +18,12 @@ package pedersen
import (
"crypto/rand"
+ "crypto/sha256"
"fmt"
"github.com/consensys/gnark-crypto/ecc"
curve "github.com/consensys/gnark-crypto/ecc/bls24-317"
"github.com/consensys/gnark-crypto/ecc/bls24-317/fr"
+ fiatshamir "github.com/consensys/gnark-crypto/fiat-shamir"
"io"
"math/big"
)
@@ -51,7 +53,7 @@ func randomOnG2() (curve.G2Affine, error) { // TODO: Add to G2.go?
}
}
-func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
+func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err error) {
if vk.g, err = randomOnG2(); err != nil {
return
@@ -70,34 +72,154 @@ func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
sigmaInvNeg.Sub(fr.Modulus(), &sigmaInvNeg)
vk.gRootSigmaNeg.ScalarMultiplication(&vk.g, &sigmaInvNeg)
- pk.basisExpSigma = make([]curve.G1Affine, len(basis))
- for i := range basis {
- pk.basisExpSigma[i].ScalarMultiplication(&basis[i], sigma)
+ pk = make([]ProvingKey, len(bases))
+ for i := range bases {
+ pk[i].basisExpSigma = make([]curve.G1Affine, len(bases[i]))
+ for j := range bases[i] {
+ pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
+ }
+ pk[i].basis = bases[i]
+ }
+ return
+}
+
+func (pk *ProvingKey) ProveKnowledge(values []fr.Element) (pok curve.G1Affine, err error) {
+ if len(values) != len(pk.basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1, // TODO Experiment
}
- pk.basis = basis
+ _, err = pok.MultiExp(pk.basisExpSigma, values, config)
return
}
-func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, knowledgeProof curve.G1Affine, err error) {
+func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, err error) {
if len(values) != len(pk.basis) {
- err = fmt.Errorf("unexpected number of values")
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
// TODO @gbotrel this will spawn more than one task, see
// https://github.com/ConsenSys/gnark-crypto/issues/269
config := ecc.MultiExpConfig{
- NbTasks: 1, // TODO Experiment
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(pk.basis, values, config)
+
+ return
+}
+
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
}
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
- if _, err = commitment.MultiExp(pk.basis, values, config); err != nil {
+// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
+func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
+ if len(pk) != len(values) {
+ err = fmt.Errorf("must have as many value vectors as bases")
return
}
- _, err = knowledgeProof.MultiExp(pk.basisExpSigma, values, config)
+ if len(pk) == 1 { // no need to fold
+ return pk[0].ProveKnowledge(values[0])
+ }
+ offset := 0
+ for i := range pk {
+ if len(values[i]) != len(pk[i].basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+ offset += len(values[i])
+ }
+
+ var r fr.Element
+ if r, err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+
+ // prepare one amalgamated MSM
+ scaledValues := make([]fr.Element, offset)
+ basis := make([]curve.G1Affine, offset)
+
+ copy(basis, pk[0].basisExpSigma)
+ copy(scaledValues, values[0])
+
+ offset = len(values[0])
+ rI := r
+ for i := 1; i < len(pk); i++ {
+ copy(basis[offset:], pk[i].basisExpSigma)
+ for j := range pk[i].basis {
+ scaledValues[offset].Mul(&values[i][j], &rI)
+ offset++
+ }
+ if i+1 < len(pk) {
+ rI.Mul(&rI, &r)
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+
+ _, err = pok.MultiExp(basis, scaledValues, config)
+ return
+}
+
+// FoldCommitments amalgamates
+func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
+
+ if len(commitments) == 1 { // no need to fold
+ commitment = commitments[0]
+ return
+ }
+
+ r := make([]fr.Element, len(commitments))
+ r[0].SetOne()
+ if r[1], err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+ for i := 2; i < len(commitments); i++ {
+ r[i].Mul(&r[i-1], &r[1])
+ }
+
+ for i := range commitments { // TODO @Tabaie Remove if MSM does subgroup check for you
+ if !commitments[i].IsInSubGroup() {
+ err = fmt.Errorf("subgroup check failed")
+ return
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(commitments, r, config)
return
}
@@ -108,14 +230,12 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return fmt.Errorf("subgroup check failed")
}
- product, err := curve.Pair([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg})
- if err != nil {
+ if isOne, err := curve.PairingCheck([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg}); err != nil {
return err
+ } else if !isOne {
+ return fmt.Errorf("proof rejected")
}
- if product.IsOne() {
- return nil
- }
- return fmt.Errorf("proof rejected")
+ return nil
}
// Marshal
diff --git a/ecc/bls24-317/fr/pedersen/pedersen_test.go b/ecc/bls24-317/fr/pedersen/pedersen_test.go
index ee64c9aa3..f256102b0 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen_test.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen_test.go
@@ -17,6 +17,7 @@
package pedersen
import (
+ "fmt"
curve "github.com/consensys/gnark-crypto/ecc/bls24-317"
"github.com/consensys/gnark-crypto/ecc/bls24-317/fr"
"github.com/consensys/gnark-crypto/utils"
@@ -67,15 +68,18 @@ func testCommit(t *testing.T, values ...interface{}) {
basis := randomG1Slice(t, len(values))
var (
- pk ProvingKey
+ pk []ProvingKey
vk VerifyingKey
err error
commitment, pok curve.G1Affine
)
+ valuesFr := interfaceSliceToFrSlice(t, values...)
pk, vk, err = Setup(basis)
assert.NoError(t, err)
- commitment, pok, err = pk.Commit(interfaceSliceToFrSlice(t, values...))
+ commitment, err = pk[0].Commit(valuesFr)
+ assert.NoError(t, err)
+ pok, err = pk[0].ProveKnowledge(valuesFr)
assert.NoError(t, err)
assert.NoError(t, vk.Verify(commitment, pok))
@@ -83,6 +87,60 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
+func TestFoldProofs(t *testing.T) {
+
+ values := [][]fr.Element{
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ }
+
+ bases := make([][]curve.G1Affine, len(values))
+ for i := range bases {
+ bases[i] = randomG1Slice(t, len(values[i]))
+ }
+
+ pk, vk, err := Setup(bases...)
+ assert.NoError(t, err)
+
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ t.Run("folding with zeros", func(t *testing.T) {
+ pokFolded, err := BatchProve(pk[:2], [][]fr.Element{
+ values[0],
+ make([]fr.Element, len(values[1])),
+ }, []byte("test"))
+ assert.NoError(t, err)
+ var pok curve.G1Affine
+ pok, err = pk[0].ProveKnowledge(values[0])
+ assert.NoError(t, err)
+ assert.Equal(t, pok, pokFolded)
+ })
+
+ run := func(values [][]fr.Element) func(t *testing.T) {
+ return func(t *testing.T) {
+
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve(pk[:len(values)], values, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments(commitments[:len(values)], []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+
+ pok.Neg(&pok)
+ assert.NotNil(t, vk.Verify(foldedCommitment, pok))
+ }
+ }
+
+ for i := range values {
+ t.Run(fmt.Sprintf("folding %d", i+1), run(values[:i+1]))
+ }
+}
+
func TestCommitToOne(t *testing.T) {
testCommit(t, 1)
}
diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go
index 1e3fd8a78..5bdb0a171 100644
--- a/ecc/bn254/fr/pedersen/pedersen.go
+++ b/ecc/bn254/fr/pedersen/pedersen.go
@@ -78,10 +78,8 @@ func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err err
for j := range bases[i] {
pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
}
-
pk[i].basis = bases[i]
}
-
return
}
@@ -177,7 +175,6 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
scaledValues[offset].Mul(&values[i][j], &rI)
offset++
}
-
if i+1 < len(pk) {
rI.Mul(&rI, &r)
}
diff --git a/ecc/bn254/fr/pedersen/pedersen_test.go b/ecc/bn254/fr/pedersen/pedersen_test.go
index 62f6aee7e..32bd2f7d1 100644
--- a/ecc/bn254/fr/pedersen/pedersen_test.go
+++ b/ecc/bn254/fr/pedersen/pedersen_test.go
@@ -73,7 +73,6 @@ func testCommit(t *testing.T, values ...interface{}) {
err error
commitment, pok curve.G1Affine
)
-
valuesFr := interfaceSliceToFrSlice(t, values...)
pk, vk, err = Setup(basis)
diff --git a/ecc/bw6-633/fr/pedersen/pedersen.go b/ecc/bw6-633/fr/pedersen/pedersen.go
index a680a17c6..5d72498a3 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen.go
@@ -18,10 +18,12 @@ package pedersen
import (
"crypto/rand"
+ "crypto/sha256"
"fmt"
"github.com/consensys/gnark-crypto/ecc"
curve "github.com/consensys/gnark-crypto/ecc/bw6-633"
"github.com/consensys/gnark-crypto/ecc/bw6-633/fr"
+ fiatshamir "github.com/consensys/gnark-crypto/fiat-shamir"
"io"
"math/big"
)
@@ -51,7 +53,7 @@ func randomOnG2() (curve.G2Affine, error) { // TODO: Add to G2.go?
}
}
-func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
+func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err error) {
if vk.g, err = randomOnG2(); err != nil {
return
@@ -70,34 +72,154 @@ func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
sigmaInvNeg.Sub(fr.Modulus(), &sigmaInvNeg)
vk.gRootSigmaNeg.ScalarMultiplication(&vk.g, &sigmaInvNeg)
- pk.basisExpSigma = make([]curve.G1Affine, len(basis))
- for i := range basis {
- pk.basisExpSigma[i].ScalarMultiplication(&basis[i], sigma)
+ pk = make([]ProvingKey, len(bases))
+ for i := range bases {
+ pk[i].basisExpSigma = make([]curve.G1Affine, len(bases[i]))
+ for j := range bases[i] {
+ pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
+ }
+ pk[i].basis = bases[i]
+ }
+ return
+}
+
+func (pk *ProvingKey) ProveKnowledge(values []fr.Element) (pok curve.G1Affine, err error) {
+ if len(values) != len(pk.basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1, // TODO Experiment
}
- pk.basis = basis
+ _, err = pok.MultiExp(pk.basisExpSigma, values, config)
return
}
-func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, knowledgeProof curve.G1Affine, err error) {
+func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, err error) {
if len(values) != len(pk.basis) {
- err = fmt.Errorf("unexpected number of values")
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
// TODO @gbotrel this will spawn more than one task, see
// https://github.com/ConsenSys/gnark-crypto/issues/269
config := ecc.MultiExpConfig{
- NbTasks: 1, // TODO Experiment
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(pk.basis, values, config)
+
+ return
+}
+
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
}
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
- if _, err = commitment.MultiExp(pk.basis, values, config); err != nil {
+// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
+func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
+ if len(pk) != len(values) {
+ err = fmt.Errorf("must have as many value vectors as bases")
return
}
- _, err = knowledgeProof.MultiExp(pk.basisExpSigma, values, config)
+ if len(pk) == 1 { // no need to fold
+ return pk[0].ProveKnowledge(values[0])
+ }
+ offset := 0
+ for i := range pk {
+ if len(values[i]) != len(pk[i].basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+ offset += len(values[i])
+ }
+
+ var r fr.Element
+ if r, err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+
+ // prepare one amalgamated MSM
+ scaledValues := make([]fr.Element, offset)
+ basis := make([]curve.G1Affine, offset)
+
+ copy(basis, pk[0].basisExpSigma)
+ copy(scaledValues, values[0])
+
+ offset = len(values[0])
+ rI := r
+ for i := 1; i < len(pk); i++ {
+ copy(basis[offset:], pk[i].basisExpSigma)
+ for j := range pk[i].basis {
+ scaledValues[offset].Mul(&values[i][j], &rI)
+ offset++
+ }
+ if i+1 < len(pk) {
+ rI.Mul(&rI, &r)
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+
+ _, err = pok.MultiExp(basis, scaledValues, config)
+ return
+}
+
+// FoldCommitments amalgamates
+func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
+
+ if len(commitments) == 1 { // no need to fold
+ commitment = commitments[0]
+ return
+ }
+
+ r := make([]fr.Element, len(commitments))
+ r[0].SetOne()
+ if r[1], err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+ for i := 2; i < len(commitments); i++ {
+ r[i].Mul(&r[i-1], &r[1])
+ }
+
+ for i := range commitments { // TODO @Tabaie Remove if MSM does subgroup check for you
+ if !commitments[i].IsInSubGroup() {
+ err = fmt.Errorf("subgroup check failed")
+ return
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(commitments, r, config)
return
}
@@ -108,14 +230,12 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return fmt.Errorf("subgroup check failed")
}
- product, err := curve.Pair([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg})
- if err != nil {
+ if isOne, err := curve.PairingCheck([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg}); err != nil {
return err
+ } else if !isOne {
+ return fmt.Errorf("proof rejected")
}
- if product.IsOne() {
- return nil
- }
- return fmt.Errorf("proof rejected")
+ return nil
}
// Marshal
diff --git a/ecc/bw6-633/fr/pedersen/pedersen_test.go b/ecc/bw6-633/fr/pedersen/pedersen_test.go
index f2b9bb6e4..c00a5cca7 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen_test.go
@@ -17,6 +17,7 @@
package pedersen
import (
+ "fmt"
curve "github.com/consensys/gnark-crypto/ecc/bw6-633"
"github.com/consensys/gnark-crypto/ecc/bw6-633/fr"
"github.com/consensys/gnark-crypto/utils"
@@ -67,15 +68,18 @@ func testCommit(t *testing.T, values ...interface{}) {
basis := randomG1Slice(t, len(values))
var (
- pk ProvingKey
+ pk []ProvingKey
vk VerifyingKey
err error
commitment, pok curve.G1Affine
)
+ valuesFr := interfaceSliceToFrSlice(t, values...)
pk, vk, err = Setup(basis)
assert.NoError(t, err)
- commitment, pok, err = pk.Commit(interfaceSliceToFrSlice(t, values...))
+ commitment, err = pk[0].Commit(valuesFr)
+ assert.NoError(t, err)
+ pok, err = pk[0].ProveKnowledge(valuesFr)
assert.NoError(t, err)
assert.NoError(t, vk.Verify(commitment, pok))
@@ -83,6 +87,60 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
+func TestFoldProofs(t *testing.T) {
+
+ values := [][]fr.Element{
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ }
+
+ bases := make([][]curve.G1Affine, len(values))
+ for i := range bases {
+ bases[i] = randomG1Slice(t, len(values[i]))
+ }
+
+ pk, vk, err := Setup(bases...)
+ assert.NoError(t, err)
+
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ t.Run("folding with zeros", func(t *testing.T) {
+ pokFolded, err := BatchProve(pk[:2], [][]fr.Element{
+ values[0],
+ make([]fr.Element, len(values[1])),
+ }, []byte("test"))
+ assert.NoError(t, err)
+ var pok curve.G1Affine
+ pok, err = pk[0].ProveKnowledge(values[0])
+ assert.NoError(t, err)
+ assert.Equal(t, pok, pokFolded)
+ })
+
+ run := func(values [][]fr.Element) func(t *testing.T) {
+ return func(t *testing.T) {
+
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve(pk[:len(values)], values, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments(commitments[:len(values)], []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+
+ pok.Neg(&pok)
+ assert.NotNil(t, vk.Verify(foldedCommitment, pok))
+ }
+ }
+
+ for i := range values {
+ t.Run(fmt.Sprintf("folding %d", i+1), run(values[:i+1]))
+ }
+}
+
func TestCommitToOne(t *testing.T) {
testCommit(t, 1)
}
diff --git a/ecc/bw6-756/fr/pedersen/pedersen.go b/ecc/bw6-756/fr/pedersen/pedersen.go
index e6377e136..f324ad4d2 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen.go
@@ -18,10 +18,12 @@ package pedersen
import (
"crypto/rand"
+ "crypto/sha256"
"fmt"
"github.com/consensys/gnark-crypto/ecc"
curve "github.com/consensys/gnark-crypto/ecc/bw6-756"
"github.com/consensys/gnark-crypto/ecc/bw6-756/fr"
+ fiatshamir "github.com/consensys/gnark-crypto/fiat-shamir"
"io"
"math/big"
)
@@ -51,7 +53,7 @@ func randomOnG2() (curve.G2Affine, error) { // TODO: Add to G2.go?
}
}
-func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
+func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err error) {
if vk.g, err = randomOnG2(); err != nil {
return
@@ -70,34 +72,154 @@ func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
sigmaInvNeg.Sub(fr.Modulus(), &sigmaInvNeg)
vk.gRootSigmaNeg.ScalarMultiplication(&vk.g, &sigmaInvNeg)
- pk.basisExpSigma = make([]curve.G1Affine, len(basis))
- for i := range basis {
- pk.basisExpSigma[i].ScalarMultiplication(&basis[i], sigma)
+ pk = make([]ProvingKey, len(bases))
+ for i := range bases {
+ pk[i].basisExpSigma = make([]curve.G1Affine, len(bases[i]))
+ for j := range bases[i] {
+ pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
+ }
+ pk[i].basis = bases[i]
+ }
+ return
+}
+
+func (pk *ProvingKey) ProveKnowledge(values []fr.Element) (pok curve.G1Affine, err error) {
+ if len(values) != len(pk.basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1, // TODO Experiment
}
- pk.basis = basis
+ _, err = pok.MultiExp(pk.basisExpSigma, values, config)
return
}
-func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, knowledgeProof curve.G1Affine, err error) {
+func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, err error) {
if len(values) != len(pk.basis) {
- err = fmt.Errorf("unexpected number of values")
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
// TODO @gbotrel this will spawn more than one task, see
// https://github.com/ConsenSys/gnark-crypto/issues/269
config := ecc.MultiExpConfig{
- NbTasks: 1, // TODO Experiment
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(pk.basis, values, config)
+
+ return
+}
+
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
}
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
- if _, err = commitment.MultiExp(pk.basis, values, config); err != nil {
+// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
+func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
+ if len(pk) != len(values) {
+ err = fmt.Errorf("must have as many value vectors as bases")
return
}
- _, err = knowledgeProof.MultiExp(pk.basisExpSigma, values, config)
+ if len(pk) == 1 { // no need to fold
+ return pk[0].ProveKnowledge(values[0])
+ }
+ offset := 0
+ for i := range pk {
+ if len(values[i]) != len(pk[i].basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+ offset += len(values[i])
+ }
+
+ var r fr.Element
+ if r, err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+
+ // prepare one amalgamated MSM
+ scaledValues := make([]fr.Element, offset)
+ basis := make([]curve.G1Affine, offset)
+
+ copy(basis, pk[0].basisExpSigma)
+ copy(scaledValues, values[0])
+
+ offset = len(values[0])
+ rI := r
+ for i := 1; i < len(pk); i++ {
+ copy(basis[offset:], pk[i].basisExpSigma)
+ for j := range pk[i].basis {
+ scaledValues[offset].Mul(&values[i][j], &rI)
+ offset++
+ }
+ if i+1 < len(pk) {
+ rI.Mul(&rI, &r)
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+
+ _, err = pok.MultiExp(basis, scaledValues, config)
+ return
+}
+
+// FoldCommitments amalgamates
+func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
+
+ if len(commitments) == 1 { // no need to fold
+ commitment = commitments[0]
+ return
+ }
+
+ r := make([]fr.Element, len(commitments))
+ r[0].SetOne()
+ if r[1], err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+ for i := 2; i < len(commitments); i++ {
+ r[i].Mul(&r[i-1], &r[1])
+ }
+
+ for i := range commitments { // TODO @Tabaie Remove if MSM does subgroup check for you
+ if !commitments[i].IsInSubGroup() {
+ err = fmt.Errorf("subgroup check failed")
+ return
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(commitments, r, config)
return
}
@@ -108,14 +230,12 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return fmt.Errorf("subgroup check failed")
}
- product, err := curve.Pair([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg})
- if err != nil {
+ if isOne, err := curve.PairingCheck([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg}); err != nil {
return err
+ } else if !isOne {
+ return fmt.Errorf("proof rejected")
}
- if product.IsOne() {
- return nil
- }
- return fmt.Errorf("proof rejected")
+ return nil
}
// Marshal
diff --git a/ecc/bw6-756/fr/pedersen/pedersen_test.go b/ecc/bw6-756/fr/pedersen/pedersen_test.go
index 62319db8a..8a370ec74 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen_test.go
@@ -17,6 +17,7 @@
package pedersen
import (
+ "fmt"
curve "github.com/consensys/gnark-crypto/ecc/bw6-756"
"github.com/consensys/gnark-crypto/ecc/bw6-756/fr"
"github.com/consensys/gnark-crypto/utils"
@@ -67,15 +68,18 @@ func testCommit(t *testing.T, values ...interface{}) {
basis := randomG1Slice(t, len(values))
var (
- pk ProvingKey
+ pk []ProvingKey
vk VerifyingKey
err error
commitment, pok curve.G1Affine
)
+ valuesFr := interfaceSliceToFrSlice(t, values...)
pk, vk, err = Setup(basis)
assert.NoError(t, err)
- commitment, pok, err = pk.Commit(interfaceSliceToFrSlice(t, values...))
+ commitment, err = pk[0].Commit(valuesFr)
+ assert.NoError(t, err)
+ pok, err = pk[0].ProveKnowledge(valuesFr)
assert.NoError(t, err)
assert.NoError(t, vk.Verify(commitment, pok))
@@ -83,6 +87,60 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
+func TestFoldProofs(t *testing.T) {
+
+ values := [][]fr.Element{
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ }
+
+ bases := make([][]curve.G1Affine, len(values))
+ for i := range bases {
+ bases[i] = randomG1Slice(t, len(values[i]))
+ }
+
+ pk, vk, err := Setup(bases...)
+ assert.NoError(t, err)
+
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ t.Run("folding with zeros", func(t *testing.T) {
+ pokFolded, err := BatchProve(pk[:2], [][]fr.Element{
+ values[0],
+ make([]fr.Element, len(values[1])),
+ }, []byte("test"))
+ assert.NoError(t, err)
+ var pok curve.G1Affine
+ pok, err = pk[0].ProveKnowledge(values[0])
+ assert.NoError(t, err)
+ assert.Equal(t, pok, pokFolded)
+ })
+
+ run := func(values [][]fr.Element) func(t *testing.T) {
+ return func(t *testing.T) {
+
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve(pk[:len(values)], values, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments(commitments[:len(values)], []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+
+ pok.Neg(&pok)
+ assert.NotNil(t, vk.Verify(foldedCommitment, pok))
+ }
+ }
+
+ for i := range values {
+ t.Run(fmt.Sprintf("folding %d", i+1), run(values[:i+1]))
+ }
+}
+
func TestCommitToOne(t *testing.T) {
testCommit(t, 1)
}
diff --git a/ecc/bw6-761/fr/pedersen/pedersen.go b/ecc/bw6-761/fr/pedersen/pedersen.go
index f22b49970..fce545f06 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen.go
@@ -18,10 +18,12 @@ package pedersen
import (
"crypto/rand"
+ "crypto/sha256"
"fmt"
"github.com/consensys/gnark-crypto/ecc"
curve "github.com/consensys/gnark-crypto/ecc/bw6-761"
"github.com/consensys/gnark-crypto/ecc/bw6-761/fr"
+ fiatshamir "github.com/consensys/gnark-crypto/fiat-shamir"
"io"
"math/big"
)
@@ -51,7 +53,7 @@ func randomOnG2() (curve.G2Affine, error) { // TODO: Add to G2.go?
}
}
-func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
+func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err error) {
if vk.g, err = randomOnG2(); err != nil {
return
@@ -70,34 +72,154 @@ func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
sigmaInvNeg.Sub(fr.Modulus(), &sigmaInvNeg)
vk.gRootSigmaNeg.ScalarMultiplication(&vk.g, &sigmaInvNeg)
- pk.basisExpSigma = make([]curve.G1Affine, len(basis))
- for i := range basis {
- pk.basisExpSigma[i].ScalarMultiplication(&basis[i], sigma)
+ pk = make([]ProvingKey, len(bases))
+ for i := range bases {
+ pk[i].basisExpSigma = make([]curve.G1Affine, len(bases[i]))
+ for j := range bases[i] {
+ pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
+ }
+ pk[i].basis = bases[i]
+ }
+ return
+}
+
+func (pk *ProvingKey) ProveKnowledge(values []fr.Element) (pok curve.G1Affine, err error) {
+ if len(values) != len(pk.basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1, // TODO Experiment
}
- pk.basis = basis
+ _, err = pok.MultiExp(pk.basisExpSigma, values, config)
return
}
-func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, knowledgeProof curve.G1Affine, err error) {
+func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, err error) {
if len(values) != len(pk.basis) {
- err = fmt.Errorf("unexpected number of values")
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
// TODO @gbotrel this will spawn more than one task, see
// https://github.com/ConsenSys/gnark-crypto/issues/269
config := ecc.MultiExpConfig{
- NbTasks: 1, // TODO Experiment
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(pk.basis, values, config)
+
+ return
+}
+
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
}
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
- if _, err = commitment.MultiExp(pk.basis, values, config); err != nil {
+// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
+func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
+ if len(pk) != len(values) {
+ err = fmt.Errorf("must have as many value vectors as bases")
return
}
- _, err = knowledgeProof.MultiExp(pk.basisExpSigma, values, config)
+ if len(pk) == 1 { // no need to fold
+ return pk[0].ProveKnowledge(values[0])
+ }
+ offset := 0
+ for i := range pk {
+ if len(values[i]) != len(pk[i].basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+ offset += len(values[i])
+ }
+
+ var r fr.Element
+ if r, err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+
+ // prepare one amalgamated MSM
+ scaledValues := make([]fr.Element, offset)
+ basis := make([]curve.G1Affine, offset)
+
+ copy(basis, pk[0].basisExpSigma)
+ copy(scaledValues, values[0])
+
+ offset = len(values[0])
+ rI := r
+ for i := 1; i < len(pk); i++ {
+ copy(basis[offset:], pk[i].basisExpSigma)
+ for j := range pk[i].basis {
+ scaledValues[offset].Mul(&values[i][j], &rI)
+ offset++
+ }
+ if i+1 < len(pk) {
+ rI.Mul(&rI, &r)
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+
+ _, err = pok.MultiExp(basis, scaledValues, config)
+ return
+}
+
+// FoldCommitments amalgamates
+func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
+
+ if len(commitments) == 1 { // no need to fold
+ commitment = commitments[0]
+ return
+ }
+
+ r := make([]fr.Element, len(commitments))
+ r[0].SetOne()
+ if r[1], err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+ for i := 2; i < len(commitments); i++ {
+ r[i].Mul(&r[i-1], &r[1])
+ }
+
+ for i := range commitments { // TODO @Tabaie Remove if MSM does subgroup check for you
+ if !commitments[i].IsInSubGroup() {
+ err = fmt.Errorf("subgroup check failed")
+ return
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(commitments, r, config)
return
}
@@ -108,14 +230,12 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return fmt.Errorf("subgroup check failed")
}
- product, err := curve.Pair([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg})
- if err != nil {
+ if isOne, err := curve.PairingCheck([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg}); err != nil {
return err
+ } else if !isOne {
+ return fmt.Errorf("proof rejected")
}
- if product.IsOne() {
- return nil
- }
- return fmt.Errorf("proof rejected")
+ return nil
}
// Marshal
diff --git a/ecc/bw6-761/fr/pedersen/pedersen_test.go b/ecc/bw6-761/fr/pedersen/pedersen_test.go
index 646cf0e9b..06d16e679 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen_test.go
@@ -17,6 +17,7 @@
package pedersen
import (
+ "fmt"
curve "github.com/consensys/gnark-crypto/ecc/bw6-761"
"github.com/consensys/gnark-crypto/ecc/bw6-761/fr"
"github.com/consensys/gnark-crypto/utils"
@@ -67,15 +68,18 @@ func testCommit(t *testing.T, values ...interface{}) {
basis := randomG1Slice(t, len(values))
var (
- pk ProvingKey
+ pk []ProvingKey
vk VerifyingKey
err error
commitment, pok curve.G1Affine
)
+ valuesFr := interfaceSliceToFrSlice(t, values...)
pk, vk, err = Setup(basis)
assert.NoError(t, err)
- commitment, pok, err = pk.Commit(interfaceSliceToFrSlice(t, values...))
+ commitment, err = pk[0].Commit(valuesFr)
+ assert.NoError(t, err)
+ pok, err = pk[0].ProveKnowledge(valuesFr)
assert.NoError(t, err)
assert.NoError(t, vk.Verify(commitment, pok))
@@ -83,6 +87,60 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
+func TestFoldProofs(t *testing.T) {
+
+ values := [][]fr.Element{
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ }
+
+ bases := make([][]curve.G1Affine, len(values))
+ for i := range bases {
+ bases[i] = randomG1Slice(t, len(values[i]))
+ }
+
+ pk, vk, err := Setup(bases...)
+ assert.NoError(t, err)
+
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ t.Run("folding with zeros", func(t *testing.T) {
+ pokFolded, err := BatchProve(pk[:2], [][]fr.Element{
+ values[0],
+ make([]fr.Element, len(values[1])),
+ }, []byte("test"))
+ assert.NoError(t, err)
+ var pok curve.G1Affine
+ pok, err = pk[0].ProveKnowledge(values[0])
+ assert.NoError(t, err)
+ assert.Equal(t, pok, pokFolded)
+ })
+
+ run := func(values [][]fr.Element) func(t *testing.T) {
+ return func(t *testing.T) {
+
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve(pk[:len(values)], values, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments(commitments[:len(values)], []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+
+ pok.Neg(&pok)
+ assert.NotNil(t, vk.Verify(foldedCommitment, pok))
+ }
+ }
+
+ for i := range values {
+ t.Run(fmt.Sprintf("folding %d", i+1), run(values[:i+1]))
+ }
+}
+
func TestCommitToOne(t *testing.T) {
testCommit(t, 1)
}
diff --git a/internal/generator/pedersen/template/pedersen.go.tmpl b/internal/generator/pedersen/template/pedersen.go.tmpl
index 6957402e1..133c93e72 100644
--- a/internal/generator/pedersen/template/pedersen.go.tmpl
+++ b/internal/generator/pedersen/template/pedersen.go.tmpl
@@ -1,9 +1,11 @@
import (
"crypto/rand"
+ "crypto/sha256"
"fmt"
"github.com/consensys/gnark-crypto/ecc"
curve "github.com/consensys/gnark-crypto/ecc/{{.Name}}"
"github.com/consensys/gnark-crypto/ecc/{{.Name}}/fr"
+ fiatshamir "github.com/consensys/gnark-crypto/fiat-shamir"
"io"
"math/big"
)
@@ -33,7 +35,7 @@ func randomOnG2() (curve.G2Affine, error) { // TODO: Add to G2.go?
}
}
-func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
+func Setup(bases ...[]curve.G1Affine) (pk []ProvingKey, vk VerifyingKey, err error) {
if vk.g, err = randomOnG2(); err != nil {
return
@@ -52,37 +54,157 @@ func Setup(basis []curve.G1Affine) (pk ProvingKey, vk VerifyingKey, err error) {
sigmaInvNeg.Sub(fr.Modulus(), &sigmaInvNeg)
vk.gRootSigmaNeg.ScalarMultiplication(&vk.g, &sigmaInvNeg)
- pk.basisExpSigma = make([]curve.G1Affine, len(basis))
- for i := range basis {
- pk.basisExpSigma[i].ScalarMultiplication(&basis[i], sigma)
+ pk = make([]ProvingKey, len(bases))
+ for i := range bases {
+ pk[i].basisExpSigma = make([]curve.G1Affine, len(bases[i]))
+ for j := range bases[i] {
+ pk[i].basisExpSigma[j].ScalarMultiplication(&bases[i][j], sigma)
+ }
+ pk[i].basis = bases[i]
}
+ return
+}
- pk.basis = basis
+func (pk *ProvingKey) ProveKnowledge(values []fr.Element) (pok curve.G1Affine, err error) {
+ if len(values) != len(pk.basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1, // TODO Experiment
+ }
+
+ _, err = pok.MultiExp(pk.basisExpSigma, values, config)
return
}
-func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, knowledgeProof curve.G1Affine, err error) {
+func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, err error) {
if len(values) != len(pk.basis) {
- err = fmt.Errorf("unexpected number of values")
+ err = fmt.Errorf("must have as many values as basis elements")
return
}
// TODO @gbotrel this will spawn more than one task, see
- // https://github.com/ConsenSys/gnark-crypto/issues/269
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
config := ecc.MultiExpConfig{
- NbTasks: 1, // TODO Experiment
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(pk.basis, values, config)
+
+ return
+}
+
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
+// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
+func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
+ if len(pk) != len(values) {
+ err = fmt.Errorf("must have as many value vectors as bases")
+ return
+ }
+
+ if len(pk) == 1 { // no need to fold
+ return pk[0].ProveKnowledge(values[0])
+ }
+
+ offset := 0
+ for i := range pk {
+ if len(values[i]) != len(pk[i].basis) {
+ err = fmt.Errorf("must have as many values as basis elements")
+ return
+ }
+ offset += len(values[i])
}
- if _, err = commitment.MultiExp(pk.basis, values, config); err != nil {
+ var r fr.Element
+ if r, err = getChallenge(fiatshamirSeeds); err != nil {
return
}
- _, err = knowledgeProof.MultiExp(pk.basisExpSigma, values, config)
+ // prepare one amalgamated MSM
+ scaledValues := make([]fr.Element, offset)
+ basis := make([]curve.G1Affine, offset)
+
+ copy(basis, pk[0].basisExpSigma)
+ copy(scaledValues, values[0])
+
+ offset = len(values[0])
+ rI := r
+ for i := 1; i < len(pk); i++ {
+ copy(basis[offset:], pk[i].basisExpSigma)
+ for j := range pk[i].basis {
+ scaledValues[offset].Mul(&values[i][j], &rI)
+ offset++
+ }
+ if i+1 < len(pk) {
+ rI.Mul(&rI, &r)
+ }
+ }
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+
+ _, err = pok.MultiExp(basis, scaledValues, config)
return
}
+// FoldCommitments amalgamates
+func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
+
+ if len(commitments) == 1 { // no need to fold
+ commitment = commitments[0]
+ return
+ }
+
+ r := make([]fr.Element, len(commitments))
+ r[0].SetOne()
+ if r[1], err = getChallenge(fiatshamirSeeds); err != nil {
+ return
+ }
+ for i := 2; i < len(commitments); i++ {
+ r[i].Mul(&r[i-1], &r[1])
+ }
+
+ for i := range commitments { // TODO @Tabaie Remove if MSM does subgroup check for you
+ if !commitments[i].IsInSubGroup() {
+ err = fmt.Errorf("subgroup check failed")
+ return
+ }
+ }
+
+ // TODO @gbotrel this will spawn more than one task, see
+ // https://github.com/ConsenSys/gnark-crypto/issues/269
+ config := ecc.MultiExpConfig{
+ NbTasks: 1,
+ }
+ _, err = commitment.MultiExp(commitments, r, config)
+ return
+}
+
// Verify checks if the proof of knowledge is valid
func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G1Affine) error {
@@ -90,14 +212,12 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return fmt.Errorf("subgroup check failed")
}
- product, err := curve.Pair([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg})
- if err != nil {
- return err
- }
- if product.IsOne() {
- return nil
- }
- return fmt.Errorf("proof rejected")
+ if isOne, err := curve.PairingCheck([]curve.G1Affine{commitment, knowledgeProof}, []curve.G2Affine{vk.g, vk.gRootSigmaNeg}); err != nil {
+ return err
+ } else if !isOne {
+ return fmt.Errorf("proof rejected")
+ }
+ return nil
}
diff --git a/internal/generator/pedersen/template/pedersen.test.go.tmpl b/internal/generator/pedersen/template/pedersen.test.go.tmpl
index 12f6f8002..d159ed641 100644
--- a/internal/generator/pedersen/template/pedersen.test.go.tmpl
+++ b/internal/generator/pedersen/template/pedersen.test.go.tmpl
@@ -1,4 +1,5 @@
import (
+ "fmt"
curve "github.com/consensys/gnark-crypto/ecc/{{.Name}}"
"github.com/consensys/gnark-crypto/ecc/{{.Name}}/fr"
"github.com/consensys/gnark-crypto/utils"
@@ -49,15 +50,18 @@ func testCommit(t *testing.T, values ...interface{}) {
basis := randomG1Slice(t, len(values))
var (
- pk ProvingKey
+ pk []ProvingKey
vk VerifyingKey
err error
commitment, pok curve.G1Affine
)
+ valuesFr := interfaceSliceToFrSlice(t, values...)
pk, vk, err = Setup(basis)
assert.NoError(t, err)
- commitment, pok, err = pk.Commit(interfaceSliceToFrSlice(t, values...))
+ commitment, err = pk[0].Commit(valuesFr)
+ assert.NoError(t, err)
+ pok, err = pk[0].ProveKnowledge(valuesFr)
assert.NoError(t, err)
assert.NoError(t, vk.Verify(commitment, pok))
@@ -65,6 +69,60 @@ func testCommit(t *testing.T, values ...interface{}) {
assert.NotNil(t, vk.Verify(commitment, pok))
}
+func TestFoldProofs(t *testing.T) {
+
+ values := [][]fr.Element{
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ interfaceSliceToFrSlice(t, randomFrSlice(t, 5)...),
+ }
+
+ bases := make([][]curve.G1Affine, len(values))
+ for i := range bases {
+ bases[i] = randomG1Slice(t, len(values[i]))
+ }
+
+ pk, vk, err := Setup(bases...)
+ assert.NoError(t, err)
+
+ commitments := make([]curve.G1Affine, len(values))
+ for i := range values {
+ commitments[i], err = pk[i].Commit(values[i])
+ }
+
+ t.Run("folding with zeros", func(t *testing.T) {
+ pokFolded, err := BatchProve(pk[:2], [][]fr.Element{
+ values[0],
+ make([]fr.Element, len(values[1])),
+ }, []byte("test"))
+ assert.NoError(t, err)
+ var pok curve.G1Affine
+ pok, err = pk[0].ProveKnowledge(values[0])
+ assert.NoError(t, err)
+ assert.Equal(t, pok, pokFolded)
+ })
+
+ run := func(values [][]fr.Element) func(t *testing.T) {
+ return func(t *testing.T) {
+
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve(pk[:len(values)], values, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments(commitments[:len(values)], []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+
+ pok.Neg(&pok)
+ assert.NotNil(t, vk.Verify(foldedCommitment, pok))
+ }
+ }
+
+ for i := range values {
+ t.Run(fmt.Sprintf("folding %d", i+1), run(values[:i+1]))
+ }
+}
+
func TestCommitToOne(t *testing.T) {
testCommit(t, 1)
}
From 45da9219a3a72606957fbfea4ebf8bc8edd777f9 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Tue, 23 May 2023 18:58:48 -0500
Subject: [PATCH 16/51] style: move aux func down
---
ecc/bls12-377/fr/pedersen/pedersen.go | 38 +++++++++----------
ecc/bls12-378/fr/pedersen/pedersen.go | 38 +++++++++----------
ecc/bls12-381/fr/pedersen/pedersen.go | 38 +++++++++----------
ecc/bls24-315/fr/pedersen/pedersen.go | 38 +++++++++----------
ecc/bls24-317/fr/pedersen/pedersen.go | 38 +++++++++----------
ecc/bn254/fr/pedersen/pedersen.go | 38 +++++++++----------
ecc/bw6-633/fr/pedersen/pedersen.go | 38 +++++++++----------
ecc/bw6-756/fr/pedersen/pedersen.go | 38 +++++++++----------
ecc/bw6-761/fr/pedersen/pedersen.go | 38 +++++++++----------
.../pedersen/template/pedersen.go.tmpl | 37 +++++++++---------
10 files changed, 189 insertions(+), 190 deletions(-)
diff --git a/ecc/bls12-377/fr/pedersen/pedersen.go b/ecc/bls12-377/fr/pedersen/pedersen.go
index 6adf2e125..80c1acf60 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen.go
@@ -116,25 +116,6 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, er
return
}
-func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
- // incorporate user-provided seeds into the transcript
- t := fiatshamir.NewTranscript(sha256.New(), "r")
- for i := range fiatshamirSeeds {
- if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
- return
- }
- }
-
- // obtain the challenge
- var rBytes []byte
-
- if rBytes, err = t.ComputeChallenge("r"); err != nil {
- return
- }
- r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
- return
-}
-
// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
if len(pk) != len(values) {
@@ -238,6 +219,25 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return nil
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
// Marshal
func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
diff --git a/ecc/bls12-378/fr/pedersen/pedersen.go b/ecc/bls12-378/fr/pedersen/pedersen.go
index 70043a31b..5188adf4b 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen.go
@@ -116,25 +116,6 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, er
return
}
-func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
- // incorporate user-provided seeds into the transcript
- t := fiatshamir.NewTranscript(sha256.New(), "r")
- for i := range fiatshamirSeeds {
- if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
- return
- }
- }
-
- // obtain the challenge
- var rBytes []byte
-
- if rBytes, err = t.ComputeChallenge("r"); err != nil {
- return
- }
- r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
- return
-}
-
// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
if len(pk) != len(values) {
@@ -238,6 +219,25 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return nil
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
// Marshal
func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
diff --git a/ecc/bls12-381/fr/pedersen/pedersen.go b/ecc/bls12-381/fr/pedersen/pedersen.go
index 1edf26074..81abcc5ce 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen.go
@@ -116,25 +116,6 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, er
return
}
-func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
- // incorporate user-provided seeds into the transcript
- t := fiatshamir.NewTranscript(sha256.New(), "r")
- for i := range fiatshamirSeeds {
- if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
- return
- }
- }
-
- // obtain the challenge
- var rBytes []byte
-
- if rBytes, err = t.ComputeChallenge("r"); err != nil {
- return
- }
- r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
- return
-}
-
// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
if len(pk) != len(values) {
@@ -238,6 +219,25 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return nil
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
// Marshal
func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
diff --git a/ecc/bls24-315/fr/pedersen/pedersen.go b/ecc/bls24-315/fr/pedersen/pedersen.go
index 975b7137d..42b2ca585 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen.go
@@ -116,25 +116,6 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, er
return
}
-func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
- // incorporate user-provided seeds into the transcript
- t := fiatshamir.NewTranscript(sha256.New(), "r")
- for i := range fiatshamirSeeds {
- if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
- return
- }
- }
-
- // obtain the challenge
- var rBytes []byte
-
- if rBytes, err = t.ComputeChallenge("r"); err != nil {
- return
- }
- r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
- return
-}
-
// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
if len(pk) != len(values) {
@@ -238,6 +219,25 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return nil
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
// Marshal
func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
diff --git a/ecc/bls24-317/fr/pedersen/pedersen.go b/ecc/bls24-317/fr/pedersen/pedersen.go
index 7850c341b..5b37488c2 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen.go
@@ -116,25 +116,6 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, er
return
}
-func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
- // incorporate user-provided seeds into the transcript
- t := fiatshamir.NewTranscript(sha256.New(), "r")
- for i := range fiatshamirSeeds {
- if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
- return
- }
- }
-
- // obtain the challenge
- var rBytes []byte
-
- if rBytes, err = t.ComputeChallenge("r"); err != nil {
- return
- }
- r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
- return
-}
-
// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
if len(pk) != len(values) {
@@ -238,6 +219,25 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return nil
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
// Marshal
func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go
index 5bdb0a171..14bb467f5 100644
--- a/ecc/bn254/fr/pedersen/pedersen.go
+++ b/ecc/bn254/fr/pedersen/pedersen.go
@@ -116,25 +116,6 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, er
return
}
-func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
- // incorporate user-provided seeds into the transcript
- t := fiatshamir.NewTranscript(sha256.New(), "r")
- for i := range fiatshamirSeeds {
- if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
- return
- }
- }
-
- // obtain the challenge
- var rBytes []byte
-
- if rBytes, err = t.ComputeChallenge("r"); err != nil {
- return
- }
- r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
- return
-}
-
// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
if len(pk) != len(values) {
@@ -238,6 +219,25 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return nil
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
// Marshal
func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
diff --git a/ecc/bw6-633/fr/pedersen/pedersen.go b/ecc/bw6-633/fr/pedersen/pedersen.go
index 5d72498a3..8eeaa5871 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen.go
@@ -116,25 +116,6 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, er
return
}
-func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
- // incorporate user-provided seeds into the transcript
- t := fiatshamir.NewTranscript(sha256.New(), "r")
- for i := range fiatshamirSeeds {
- if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
- return
- }
- }
-
- // obtain the challenge
- var rBytes []byte
-
- if rBytes, err = t.ComputeChallenge("r"); err != nil {
- return
- }
- r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
- return
-}
-
// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
if len(pk) != len(values) {
@@ -238,6 +219,25 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return nil
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
// Marshal
func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
diff --git a/ecc/bw6-756/fr/pedersen/pedersen.go b/ecc/bw6-756/fr/pedersen/pedersen.go
index f324ad4d2..b51ceaeb5 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen.go
@@ -116,25 +116,6 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, er
return
}
-func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
- // incorporate user-provided seeds into the transcript
- t := fiatshamir.NewTranscript(sha256.New(), "r")
- for i := range fiatshamirSeeds {
- if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
- return
- }
- }
-
- // obtain the challenge
- var rBytes []byte
-
- if rBytes, err = t.ComputeChallenge("r"); err != nil {
- return
- }
- r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
- return
-}
-
// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
if len(pk) != len(values) {
@@ -238,6 +219,25 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return nil
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
// Marshal
func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
diff --git a/ecc/bw6-761/fr/pedersen/pedersen.go b/ecc/bw6-761/fr/pedersen/pedersen.go
index fce545f06..a216146f0 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen.go
@@ -116,25 +116,6 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, er
return
}
-func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
- // incorporate user-provided seeds into the transcript
- t := fiatshamir.NewTranscript(sha256.New(), "r")
- for i := range fiatshamirSeeds {
- if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
- return
- }
- }
-
- // obtain the challenge
- var rBytes []byte
-
- if rBytes, err = t.ComputeChallenge("r"); err != nil {
- return
- }
- r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
- return
-}
-
// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
if len(pk) != len(values) {
@@ -238,6 +219,25 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return nil
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
+
// Marshal
func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
diff --git a/internal/generator/pedersen/template/pedersen.go.tmpl b/internal/generator/pedersen/template/pedersen.go.tmpl
index 133c93e72..c2cfd100a 100644
--- a/internal/generator/pedersen/template/pedersen.go.tmpl
+++ b/internal/generator/pedersen/template/pedersen.go.tmpl
@@ -98,25 +98,6 @@ func (pk *ProvingKey) Commit(values []fr.Element) (commitment curve.G1Affine, er
return
}
-func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
- // incorporate user-provided seeds into the transcript
- t := fiatshamir.NewTranscript(sha256.New(), "r")
- for i := range fiatshamirSeeds {
- if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
- return
- }
- }
-
- // obtain the challenge
- var rBytes []byte
-
- if rBytes, err = t.ComputeChallenge("r"); err != nil {
- return
- }
- r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
- return
-}
-
// BatchProve generates a single proof of knowledge for multiple commitments for faster verification
func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byte) (pok curve.G1Affine, err error) {
if len(pk) != len(values) {
@@ -220,6 +201,24 @@ func (vk *VerifyingKey) Verify(commitment curve.G1Affine, knowledgeProof curve.G
return nil
}
+func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
+ // incorporate user-provided seeds into the transcript
+ t := fiatshamir.NewTranscript(sha256.New(), "r")
+ for i := range fiatshamirSeeds {
+ if err = t.Bind("r", fiatshamirSeeds[i]); err != nil {
+ return
+ }
+ }
+
+ // obtain the challenge
+ var rBytes []byte
+
+ if rBytes, err = t.ComputeChallenge("r"); err != nil {
+ return
+ }
+ r.SetBytes(rBytes) // TODO @Tabaie Plonk challenge generation done the same way; replace both with hash to fr?
+ return
+}
// Marshal
From 882e8288539e7cb91ab0e9b0eaa4c406a41e57f1 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Tue, 23 May 2023 19:00:51 -0500
Subject: [PATCH 17/51] test: check error
---
ecc/bls12-377/fr/pedersen/pedersen_test.go | 1 +
ecc/bls12-378/fr/pedersen/pedersen_test.go | 1 +
ecc/bls12-381/fr/pedersen/pedersen_test.go | 1 +
ecc/bls24-315/fr/pedersen/pedersen_test.go | 1 +
ecc/bls24-317/fr/pedersen/pedersen_test.go | 1 +
ecc/bn254/fr/pedersen/pedersen_test.go | 1 +
ecc/bw6-633/fr/pedersen/pedersen_test.go | 1 +
ecc/bw6-756/fr/pedersen/pedersen_test.go | 1 +
ecc/bw6-761/fr/pedersen/pedersen_test.go | 1 +
internal/generator/pedersen/template/pedersen.test.go.tmpl | 1 +
10 files changed, 10 insertions(+)
diff --git a/ecc/bls12-377/fr/pedersen/pedersen_test.go b/ecc/bls12-377/fr/pedersen/pedersen_test.go
index d80621c06..74a883b47 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen_test.go
@@ -106,6 +106,7 @@ func TestFoldProofs(t *testing.T) {
commitments := make([]curve.G1Affine, len(values))
for i := range values {
commitments[i], err = pk[i].Commit(values[i])
+ assert.NoError(t, err)
}
t.Run("folding with zeros", func(t *testing.T) {
diff --git a/ecc/bls12-378/fr/pedersen/pedersen_test.go b/ecc/bls12-378/fr/pedersen/pedersen_test.go
index 16616f309..73b82e17e 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen_test.go
@@ -106,6 +106,7 @@ func TestFoldProofs(t *testing.T) {
commitments := make([]curve.G1Affine, len(values))
for i := range values {
commitments[i], err = pk[i].Commit(values[i])
+ assert.NoError(t, err)
}
t.Run("folding with zeros", func(t *testing.T) {
diff --git a/ecc/bls12-381/fr/pedersen/pedersen_test.go b/ecc/bls12-381/fr/pedersen/pedersen_test.go
index 3ae2b6eec..7f8aa0431 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen_test.go
@@ -106,6 +106,7 @@ func TestFoldProofs(t *testing.T) {
commitments := make([]curve.G1Affine, len(values))
for i := range values {
commitments[i], err = pk[i].Commit(values[i])
+ assert.NoError(t, err)
}
t.Run("folding with zeros", func(t *testing.T) {
diff --git a/ecc/bls24-315/fr/pedersen/pedersen_test.go b/ecc/bls24-315/fr/pedersen/pedersen_test.go
index 1bbe4f9ca..74340ee49 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen_test.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen_test.go
@@ -106,6 +106,7 @@ func TestFoldProofs(t *testing.T) {
commitments := make([]curve.G1Affine, len(values))
for i := range values {
commitments[i], err = pk[i].Commit(values[i])
+ assert.NoError(t, err)
}
t.Run("folding with zeros", func(t *testing.T) {
diff --git a/ecc/bls24-317/fr/pedersen/pedersen_test.go b/ecc/bls24-317/fr/pedersen/pedersen_test.go
index f256102b0..a0023349b 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen_test.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen_test.go
@@ -106,6 +106,7 @@ func TestFoldProofs(t *testing.T) {
commitments := make([]curve.G1Affine, len(values))
for i := range values {
commitments[i], err = pk[i].Commit(values[i])
+ assert.NoError(t, err)
}
t.Run("folding with zeros", func(t *testing.T) {
diff --git a/ecc/bn254/fr/pedersen/pedersen_test.go b/ecc/bn254/fr/pedersen/pedersen_test.go
index 32bd2f7d1..752064fa7 100644
--- a/ecc/bn254/fr/pedersen/pedersen_test.go
+++ b/ecc/bn254/fr/pedersen/pedersen_test.go
@@ -106,6 +106,7 @@ func TestFoldProofs(t *testing.T) {
commitments := make([]curve.G1Affine, len(values))
for i := range values {
commitments[i], err = pk[i].Commit(values[i])
+ assert.NoError(t, err)
}
t.Run("folding with zeros", func(t *testing.T) {
diff --git a/ecc/bw6-633/fr/pedersen/pedersen_test.go b/ecc/bw6-633/fr/pedersen/pedersen_test.go
index c00a5cca7..df5ba283c 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen_test.go
@@ -106,6 +106,7 @@ func TestFoldProofs(t *testing.T) {
commitments := make([]curve.G1Affine, len(values))
for i := range values {
commitments[i], err = pk[i].Commit(values[i])
+ assert.NoError(t, err)
}
t.Run("folding with zeros", func(t *testing.T) {
diff --git a/ecc/bw6-756/fr/pedersen/pedersen_test.go b/ecc/bw6-756/fr/pedersen/pedersen_test.go
index 8a370ec74..cf82258e5 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen_test.go
@@ -106,6 +106,7 @@ func TestFoldProofs(t *testing.T) {
commitments := make([]curve.G1Affine, len(values))
for i := range values {
commitments[i], err = pk[i].Commit(values[i])
+ assert.NoError(t, err)
}
t.Run("folding with zeros", func(t *testing.T) {
diff --git a/ecc/bw6-761/fr/pedersen/pedersen_test.go b/ecc/bw6-761/fr/pedersen/pedersen_test.go
index 06d16e679..ad42e818f 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen_test.go
@@ -106,6 +106,7 @@ func TestFoldProofs(t *testing.T) {
commitments := make([]curve.G1Affine, len(values))
for i := range values {
commitments[i], err = pk[i].Commit(values[i])
+ assert.NoError(t, err)
}
t.Run("folding with zeros", func(t *testing.T) {
diff --git a/internal/generator/pedersen/template/pedersen.test.go.tmpl b/internal/generator/pedersen/template/pedersen.test.go.tmpl
index d159ed641..cff21ff41 100644
--- a/internal/generator/pedersen/template/pedersen.test.go.tmpl
+++ b/internal/generator/pedersen/template/pedersen.test.go.tmpl
@@ -88,6 +88,7 @@ func TestFoldProofs(t *testing.T) {
commitments := make([]curve.G1Affine, len(values))
for i := range values {
commitments[i], err = pk[i].Commit(values[i])
+ assert.NoError(t, err)
}
t.Run("folding with zeros", func(t *testing.T) {
From 85db474ed631a9263a8b649c5789da9267770234 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Tue, 23 May 2023 19:31:06 -0500
Subject: [PATCH 18/51] docs: explain FoldCommitments
---
ecc/bls12-377/fr/pedersen/pedersen.go | 2 +-
ecc/bls12-378/fr/pedersen/pedersen.go | 2 +-
ecc/bls12-381/fr/pedersen/pedersen.go | 2 +-
ecc/bls24-315/fr/pedersen/pedersen.go | 2 +-
ecc/bls24-317/fr/pedersen/pedersen.go | 2 +-
ecc/bn254/fr/pedersen/pedersen.go | 2 +-
ecc/bw6-633/fr/pedersen/pedersen.go | 2 +-
ecc/bw6-756/fr/pedersen/pedersen.go | 2 +-
ecc/bw6-761/fr/pedersen/pedersen.go | 2 +-
internal/generator/pedersen/template/pedersen.go.tmpl | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ecc/bls12-377/fr/pedersen/pedersen.go b/ecc/bls12-377/fr/pedersen/pedersen.go
index 80c1acf60..ffd56c2ae 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen.go
@@ -171,7 +171,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
return
}
-// FoldCommitments amalgamates
+// FoldCommitments amalgamates multiple commitments into one, which can be verifier against a folded proof obtained from BatchProve
func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
if len(commitments) == 1 { // no need to fold
diff --git a/ecc/bls12-378/fr/pedersen/pedersen.go b/ecc/bls12-378/fr/pedersen/pedersen.go
index 5188adf4b..4e86e0f54 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen.go
@@ -171,7 +171,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
return
}
-// FoldCommitments amalgamates
+// FoldCommitments amalgamates multiple commitments into one, which can be verifier against a folded proof obtained from BatchProve
func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
if len(commitments) == 1 { // no need to fold
diff --git a/ecc/bls12-381/fr/pedersen/pedersen.go b/ecc/bls12-381/fr/pedersen/pedersen.go
index 81abcc5ce..810bf94c3 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen.go
@@ -171,7 +171,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
return
}
-// FoldCommitments amalgamates
+// FoldCommitments amalgamates multiple commitments into one, which can be verifier against a folded proof obtained from BatchProve
func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
if len(commitments) == 1 { // no need to fold
diff --git a/ecc/bls24-315/fr/pedersen/pedersen.go b/ecc/bls24-315/fr/pedersen/pedersen.go
index 42b2ca585..e0ec19448 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen.go
@@ -171,7 +171,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
return
}
-// FoldCommitments amalgamates
+// FoldCommitments amalgamates multiple commitments into one, which can be verifier against a folded proof obtained from BatchProve
func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
if len(commitments) == 1 { // no need to fold
diff --git a/ecc/bls24-317/fr/pedersen/pedersen.go b/ecc/bls24-317/fr/pedersen/pedersen.go
index 5b37488c2..5c677cdc2 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen.go
@@ -171,7 +171,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
return
}
-// FoldCommitments amalgamates
+// FoldCommitments amalgamates multiple commitments into one, which can be verifier against a folded proof obtained from BatchProve
func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
if len(commitments) == 1 { // no need to fold
diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go
index 14bb467f5..28f7c9176 100644
--- a/ecc/bn254/fr/pedersen/pedersen.go
+++ b/ecc/bn254/fr/pedersen/pedersen.go
@@ -171,7 +171,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
return
}
-// FoldCommitments amalgamates
+// FoldCommitments amalgamates multiple commitments into one, which can be verifier against a folded proof obtained from BatchProve
func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
if len(commitments) == 1 { // no need to fold
diff --git a/ecc/bw6-633/fr/pedersen/pedersen.go b/ecc/bw6-633/fr/pedersen/pedersen.go
index 8eeaa5871..e8dd2f469 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen.go
@@ -171,7 +171,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
return
}
-// FoldCommitments amalgamates
+// FoldCommitments amalgamates multiple commitments into one, which can be verifier against a folded proof obtained from BatchProve
func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
if len(commitments) == 1 { // no need to fold
diff --git a/ecc/bw6-756/fr/pedersen/pedersen.go b/ecc/bw6-756/fr/pedersen/pedersen.go
index b51ceaeb5..ffe10d4d7 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen.go
@@ -171,7 +171,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
return
}
-// FoldCommitments amalgamates
+// FoldCommitments amalgamates multiple commitments into one, which can be verifier against a folded proof obtained from BatchProve
func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
if len(commitments) == 1 { // no need to fold
diff --git a/ecc/bw6-761/fr/pedersen/pedersen.go b/ecc/bw6-761/fr/pedersen/pedersen.go
index a216146f0..69cf4333c 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen.go
@@ -171,7 +171,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
return
}
-// FoldCommitments amalgamates
+// FoldCommitments amalgamates multiple commitments into one, which can be verifier against a folded proof obtained from BatchProve
func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
if len(commitments) == 1 { // no need to fold
diff --git a/internal/generator/pedersen/template/pedersen.go.tmpl b/internal/generator/pedersen/template/pedersen.go.tmpl
index c2cfd100a..a6a8357e1 100644
--- a/internal/generator/pedersen/template/pedersen.go.tmpl
+++ b/internal/generator/pedersen/template/pedersen.go.tmpl
@@ -153,7 +153,7 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
return
}
-// FoldCommitments amalgamates
+// FoldCommitments amalgamates multiple commitments into one, which can be verifier against a folded proof obtained from BatchProve
func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (commitment curve.G1Affine, err error) {
if len(commitments) == 1 { // no need to fold
From 684135cb641095579d645773702158c6d2922804 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Thu, 25 May 2023 13:30:59 -0500
Subject: [PATCH 19/51] feat: fold 0 proofs edge case
---
ecc/bls12-377/fr/pedersen/pedersen.go | 4 ++++
ecc/bls12-377/fr/pedersen/pedersen_test.go | 10 ++++++++++
ecc/bls12-378/fr/pedersen/pedersen.go | 4 ++++
ecc/bls12-378/fr/pedersen/pedersen_test.go | 10 ++++++++++
ecc/bls12-381/fr/pedersen/pedersen.go | 4 ++++
ecc/bls12-381/fr/pedersen/pedersen_test.go | 10 ++++++++++
ecc/bls24-315/fr/pedersen/pedersen.go | 4 ++++
ecc/bls24-315/fr/pedersen/pedersen_test.go | 10 ++++++++++
ecc/bls24-317/fr/pedersen/pedersen.go | 4 ++++
ecc/bls24-317/fr/pedersen/pedersen_test.go | 10 ++++++++++
ecc/bn254/fr/pedersen/pedersen.go | 4 ++++
ecc/bn254/fr/pedersen/pedersen_test.go | 10 ++++++++++
ecc/bw6-633/fr/pedersen/pedersen.go | 4 ++++
ecc/bw6-633/fr/pedersen/pedersen_test.go | 10 ++++++++++
ecc/bw6-756/fr/pedersen/pedersen.go | 4 ++++
ecc/bw6-756/fr/pedersen/pedersen_test.go | 10 ++++++++++
ecc/bw6-761/fr/pedersen/pedersen.go | 4 ++++
ecc/bw6-761/fr/pedersen/pedersen_test.go | 10 ++++++++++
internal/generator/pedersen/template/pedersen.go.tmpl | 6 +++++-
.../generator/pedersen/template/pedersen.test.go.tmpl | 10 ++++++++++
20 files changed, 141 insertions(+), 1 deletion(-)
diff --git a/ecc/bls12-377/fr/pedersen/pedersen.go b/ecc/bls12-377/fr/pedersen/pedersen.go
index ffd56c2ae..e61939299 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen.go
@@ -125,6 +125,8 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
if len(pk) == 1 { // no need to fold
return pk[0].ProveKnowledge(values[0])
+ } else if len(pk) == 0 { // nothing to do at all
+ return
}
offset := 0
@@ -177,6 +179,8 @@ func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (c
if len(commitments) == 1 { // no need to fold
commitment = commitments[0]
return
+ } else if len(commitments) == 0 { // nothing to do at all
+ return
}
r := make([]fr.Element, len(commitments))
diff --git a/ecc/bls12-377/fr/pedersen/pedersen_test.go b/ecc/bls12-377/fr/pedersen/pedersen_test.go
index 74a883b47..d01b39e5e 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen_test.go
@@ -121,6 +121,16 @@ func TestFoldProofs(t *testing.T) {
assert.Equal(t, pok, pokFolded)
})
+ t.Run("run empty", func(t *testing.T) {
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve([]ProvingKey{}, [][]fr.Element{}, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments([]curve.G1Affine{}, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
diff --git a/ecc/bls12-378/fr/pedersen/pedersen.go b/ecc/bls12-378/fr/pedersen/pedersen.go
index 4e86e0f54..ba787bece 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen.go
@@ -125,6 +125,8 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
if len(pk) == 1 { // no need to fold
return pk[0].ProveKnowledge(values[0])
+ } else if len(pk) == 0 { // nothing to do at all
+ return
}
offset := 0
@@ -177,6 +179,8 @@ func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (c
if len(commitments) == 1 { // no need to fold
commitment = commitments[0]
return
+ } else if len(commitments) == 0 { // nothing to do at all
+ return
}
r := make([]fr.Element, len(commitments))
diff --git a/ecc/bls12-378/fr/pedersen/pedersen_test.go b/ecc/bls12-378/fr/pedersen/pedersen_test.go
index 73b82e17e..1b925b93d 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen_test.go
@@ -121,6 +121,16 @@ func TestFoldProofs(t *testing.T) {
assert.Equal(t, pok, pokFolded)
})
+ t.Run("run empty", func(t *testing.T) {
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve([]ProvingKey{}, [][]fr.Element{}, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments([]curve.G1Affine{}, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
diff --git a/ecc/bls12-381/fr/pedersen/pedersen.go b/ecc/bls12-381/fr/pedersen/pedersen.go
index 810bf94c3..1cabe8655 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen.go
@@ -125,6 +125,8 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
if len(pk) == 1 { // no need to fold
return pk[0].ProveKnowledge(values[0])
+ } else if len(pk) == 0 { // nothing to do at all
+ return
}
offset := 0
@@ -177,6 +179,8 @@ func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (c
if len(commitments) == 1 { // no need to fold
commitment = commitments[0]
return
+ } else if len(commitments) == 0 { // nothing to do at all
+ return
}
r := make([]fr.Element, len(commitments))
diff --git a/ecc/bls12-381/fr/pedersen/pedersen_test.go b/ecc/bls12-381/fr/pedersen/pedersen_test.go
index 7f8aa0431..d03a79cc5 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen_test.go
@@ -121,6 +121,16 @@ func TestFoldProofs(t *testing.T) {
assert.Equal(t, pok, pokFolded)
})
+ t.Run("run empty", func(t *testing.T) {
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve([]ProvingKey{}, [][]fr.Element{}, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments([]curve.G1Affine{}, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
diff --git a/ecc/bls24-315/fr/pedersen/pedersen.go b/ecc/bls24-315/fr/pedersen/pedersen.go
index e0ec19448..ec9797ad6 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen.go
@@ -125,6 +125,8 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
if len(pk) == 1 { // no need to fold
return pk[0].ProveKnowledge(values[0])
+ } else if len(pk) == 0 { // nothing to do at all
+ return
}
offset := 0
@@ -177,6 +179,8 @@ func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (c
if len(commitments) == 1 { // no need to fold
commitment = commitments[0]
return
+ } else if len(commitments) == 0 { // nothing to do at all
+ return
}
r := make([]fr.Element, len(commitments))
diff --git a/ecc/bls24-315/fr/pedersen/pedersen_test.go b/ecc/bls24-315/fr/pedersen/pedersen_test.go
index 74340ee49..377a5de3f 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen_test.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen_test.go
@@ -121,6 +121,16 @@ func TestFoldProofs(t *testing.T) {
assert.Equal(t, pok, pokFolded)
})
+ t.Run("run empty", func(t *testing.T) {
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve([]ProvingKey{}, [][]fr.Element{}, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments([]curve.G1Affine{}, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
diff --git a/ecc/bls24-317/fr/pedersen/pedersen.go b/ecc/bls24-317/fr/pedersen/pedersen.go
index 5c677cdc2..180d9299a 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen.go
@@ -125,6 +125,8 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
if len(pk) == 1 { // no need to fold
return pk[0].ProveKnowledge(values[0])
+ } else if len(pk) == 0 { // nothing to do at all
+ return
}
offset := 0
@@ -177,6 +179,8 @@ func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (c
if len(commitments) == 1 { // no need to fold
commitment = commitments[0]
return
+ } else if len(commitments) == 0 { // nothing to do at all
+ return
}
r := make([]fr.Element, len(commitments))
diff --git a/ecc/bls24-317/fr/pedersen/pedersen_test.go b/ecc/bls24-317/fr/pedersen/pedersen_test.go
index a0023349b..3cfe6e368 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen_test.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen_test.go
@@ -121,6 +121,16 @@ func TestFoldProofs(t *testing.T) {
assert.Equal(t, pok, pokFolded)
})
+ t.Run("run empty", func(t *testing.T) {
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve([]ProvingKey{}, [][]fr.Element{}, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments([]curve.G1Affine{}, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go
index 28f7c9176..d629a4d36 100644
--- a/ecc/bn254/fr/pedersen/pedersen.go
+++ b/ecc/bn254/fr/pedersen/pedersen.go
@@ -125,6 +125,8 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
if len(pk) == 1 { // no need to fold
return pk[0].ProveKnowledge(values[0])
+ } else if len(pk) == 0 { // nothing to do at all
+ return
}
offset := 0
@@ -177,6 +179,8 @@ func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (c
if len(commitments) == 1 { // no need to fold
commitment = commitments[0]
return
+ } else if len(commitments) == 0 { // nothing to do at all
+ return
}
r := make([]fr.Element, len(commitments))
diff --git a/ecc/bn254/fr/pedersen/pedersen_test.go b/ecc/bn254/fr/pedersen/pedersen_test.go
index 752064fa7..657ebc920 100644
--- a/ecc/bn254/fr/pedersen/pedersen_test.go
+++ b/ecc/bn254/fr/pedersen/pedersen_test.go
@@ -121,6 +121,16 @@ func TestFoldProofs(t *testing.T) {
assert.Equal(t, pok, pokFolded)
})
+ t.Run("run empty", func(t *testing.T) {
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve([]ProvingKey{}, [][]fr.Element{}, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments([]curve.G1Affine{}, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
diff --git a/ecc/bw6-633/fr/pedersen/pedersen.go b/ecc/bw6-633/fr/pedersen/pedersen.go
index e8dd2f469..e87fce823 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen.go
@@ -125,6 +125,8 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
if len(pk) == 1 { // no need to fold
return pk[0].ProveKnowledge(values[0])
+ } else if len(pk) == 0 { // nothing to do at all
+ return
}
offset := 0
@@ -177,6 +179,8 @@ func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (c
if len(commitments) == 1 { // no need to fold
commitment = commitments[0]
return
+ } else if len(commitments) == 0 { // nothing to do at all
+ return
}
r := make([]fr.Element, len(commitments))
diff --git a/ecc/bw6-633/fr/pedersen/pedersen_test.go b/ecc/bw6-633/fr/pedersen/pedersen_test.go
index df5ba283c..8be81f154 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen_test.go
@@ -121,6 +121,16 @@ func TestFoldProofs(t *testing.T) {
assert.Equal(t, pok, pokFolded)
})
+ t.Run("run empty", func(t *testing.T) {
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve([]ProvingKey{}, [][]fr.Element{}, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments([]curve.G1Affine{}, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
diff --git a/ecc/bw6-756/fr/pedersen/pedersen.go b/ecc/bw6-756/fr/pedersen/pedersen.go
index ffe10d4d7..b625db016 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen.go
@@ -125,6 +125,8 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
if len(pk) == 1 { // no need to fold
return pk[0].ProveKnowledge(values[0])
+ } else if len(pk) == 0 { // nothing to do at all
+ return
}
offset := 0
@@ -177,6 +179,8 @@ func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (c
if len(commitments) == 1 { // no need to fold
commitment = commitments[0]
return
+ } else if len(commitments) == 0 { // nothing to do at all
+ return
}
r := make([]fr.Element, len(commitments))
diff --git a/ecc/bw6-756/fr/pedersen/pedersen_test.go b/ecc/bw6-756/fr/pedersen/pedersen_test.go
index cf82258e5..33e8d5843 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen_test.go
@@ -121,6 +121,16 @@ func TestFoldProofs(t *testing.T) {
assert.Equal(t, pok, pokFolded)
})
+ t.Run("run empty", func(t *testing.T) {
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve([]ProvingKey{}, [][]fr.Element{}, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments([]curve.G1Affine{}, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
diff --git a/ecc/bw6-761/fr/pedersen/pedersen.go b/ecc/bw6-761/fr/pedersen/pedersen.go
index 69cf4333c..6d36f11c3 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen.go
@@ -125,6 +125,8 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
if len(pk) == 1 { // no need to fold
return pk[0].ProveKnowledge(values[0])
+ } else if len(pk) == 0 { // nothing to do at all
+ return
}
offset := 0
@@ -177,6 +179,8 @@ func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (c
if len(commitments) == 1 { // no need to fold
commitment = commitments[0]
return
+ } else if len(commitments) == 0 { // nothing to do at all
+ return
}
r := make([]fr.Element, len(commitments))
diff --git a/ecc/bw6-761/fr/pedersen/pedersen_test.go b/ecc/bw6-761/fr/pedersen/pedersen_test.go
index ad42e818f..2801a5850 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen_test.go
@@ -121,6 +121,16 @@ func TestFoldProofs(t *testing.T) {
assert.Equal(t, pok, pokFolded)
})
+ t.Run("run empty", func(t *testing.T) {
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve([]ProvingKey{}, [][]fr.Element{}, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments([]curve.G1Affine{}, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
diff --git a/internal/generator/pedersen/template/pedersen.go.tmpl b/internal/generator/pedersen/template/pedersen.go.tmpl
index a6a8357e1..697bdd90c 100644
--- a/internal/generator/pedersen/template/pedersen.go.tmpl
+++ b/internal/generator/pedersen/template/pedersen.go.tmpl
@@ -107,6 +107,8 @@ func BatchProve(pk []ProvingKey, values [][]fr.Element, fiatshamirSeeds ...[]byt
if len(pk) == 1 { // no need to fold
return pk[0].ProveKnowledge(values[0])
+ } else if len(pk) == 0 { // nothing to do at all
+ return
}
offset := 0
@@ -159,7 +161,9 @@ func FoldCommitments(commitments []curve.G1Affine, fiatshamirSeeds ...[]byte) (c
if len(commitments) == 1 { // no need to fold
commitment = commitments[0]
return
- }
+ } else if len(commitments) == 0 { // nothing to do at all
+ return
+ }
r := make([]fr.Element, len(commitments))
r[0].SetOne()
diff --git a/internal/generator/pedersen/template/pedersen.test.go.tmpl b/internal/generator/pedersen/template/pedersen.test.go.tmpl
index cff21ff41..33b23e449 100644
--- a/internal/generator/pedersen/template/pedersen.test.go.tmpl
+++ b/internal/generator/pedersen/template/pedersen.test.go.tmpl
@@ -103,6 +103,16 @@ func TestFoldProofs(t *testing.T) {
assert.Equal(t, pok, pokFolded)
})
+ t.Run("run empty", func (t *testing.T) {
+ var foldedCommitment curve.G1Affine
+ pok, err := BatchProve([]ProvingKey{}, [][]fr.Element{}, []byte("test"))
+ assert.NoError(t, err)
+
+ foldedCommitment, err = FoldCommitments([]curve.G1Affine{}, []byte("test"))
+ assert.NoError(t, err)
+ assert.NoError(t, vk.Verify(foldedCommitment, pok))
+ })
+
run := func(values [][]fr.Element) func(t *testing.T) {
return func(t *testing.T) {
From 4fe667ae658cec49569fb7694eab4b288b5fe443 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Thu, 25 May 2023 14:30:07 -0500
Subject: [PATCH 20/51] docs: ConsenSys -> Consensys (#406)
---
ecc/bls12-377/ecdsa/doc.go | 2 +-
ecc/bls12-377/ecdsa/ecdsa.go | 2 +-
ecc/bls12-377/ecdsa/ecdsa_test.go | 2 +-
ecc/bls12-377/ecdsa/marshal.go | 2 +-
ecc/bls12-377/ecdsa/marshal_test.go | 2 +-
ecc/bls12-377/fr/fft/doc.go | 2 +-
ecc/bls12-377/fr/fft/domain.go | 2 +-
ecc/bls12-377/fr/fft/domain_test.go | 2 +-
ecc/bls12-377/fr/fft/fft.go | 2 +-
ecc/bls12-377/fr/fft/fft_test.go | 2 +-
ecc/bls12-377/fr/fft/options.go | 2 +-
ecc/bls12-377/fr/fri/doc.go | 2 +-
ecc/bls12-377/fr/fri/fri.go | 2 +-
ecc/bls12-377/fr/fri/fri_test.go | 2 +-
ecc/bls12-377/fr/gkr/gkr.go | 2 +-
ecc/bls12-377/fr/gkr/gkr_test.go | 2 +-
ecc/bls12-377/fr/iop/doc.go | 2 +-
ecc/bls12-377/fr/iop/expressions.go | 2 +-
ecc/bls12-377/fr/iop/expressions_test.go | 2 +-
ecc/bls12-377/fr/iop/polynomial.go | 2 +-
ecc/bls12-377/fr/iop/polynomial_test.go | 2 +-
ecc/bls12-377/fr/iop/quotient.go | 2 +-
ecc/bls12-377/fr/iop/quotient_test.go | 2 +-
ecc/bls12-377/fr/iop/ratios.go | 2 +-
ecc/bls12-377/fr/iop/ratios_test.go | 2 +-
ecc/bls12-377/fr/iop/utils.go | 2 +-
ecc/bls12-377/fr/kzg/doc.go | 2 +-
ecc/bls12-377/fr/kzg/kzg.go | 2 +-
ecc/bls12-377/fr/kzg/kzg_test.go | 2 +-
ecc/bls12-377/fr/kzg/marshal.go | 2 +-
ecc/bls12-377/fr/mimc/doc.go | 2 +-
ecc/bls12-377/fr/mimc/mimc.go | 2 +-
ecc/bls12-377/fr/pedersen/pedersen.go | 2 +-
ecc/bls12-377/fr/pedersen/pedersen_test.go | 2 +-
ecc/bls12-377/fr/permutation/doc.go | 2 +-
ecc/bls12-377/fr/permutation/permutation.go | 2 +-
ecc/bls12-377/fr/permutation/permutation_test.go | 2 +-
ecc/bls12-377/fr/plookup/doc.go | 2 +-
ecc/bls12-377/fr/plookup/plookup_test.go | 2 +-
ecc/bls12-377/fr/plookup/table.go | 2 +-
ecc/bls12-377/fr/plookup/vector.go | 2 +-
ecc/bls12-377/fr/polynomial/doc.go | 2 +-
ecc/bls12-377/fr/polynomial/multilin.go | 2 +-
ecc/bls12-377/fr/polynomial/multilin_test.go | 2 +-
ecc/bls12-377/fr/polynomial/polynomial.go | 2 +-
ecc/bls12-377/fr/polynomial/polynomial_test.go | 2 +-
ecc/bls12-377/fr/polynomial/pool.go | 2 +-
ecc/bls12-377/fr/sumcheck/sumcheck.go | 2 +-
ecc/bls12-377/fr/sumcheck/sumcheck_test.go | 2 +-
ecc/bls12-377/fr/test_vector_utils/test_vector_utils.go | 2 +-
ecc/bls12-377/g1.go | 2 +-
ecc/bls12-377/g1_test.go | 2 +-
ecc/bls12-377/g2.go | 2 +-
ecc/bls12-377/g2_test.go | 2 +-
ecc/bls12-377/hash_to_g1.go | 2 +-
ecc/bls12-377/hash_to_g1_test.go | 2 +-
ecc/bls12-377/hash_to_g2.go | 2 +-
ecc/bls12-377/hash_to_g2_test.go | 2 +-
ecc/bls12-377/internal/fptower/asm.go | 2 +-
ecc/bls12-377/internal/fptower/asm_noadx.go | 2 +-
ecc/bls12-377/internal/fptower/e12.go | 2 +-
ecc/bls12-377/internal/fptower/e12_test.go | 2 +-
ecc/bls12-377/internal/fptower/e2.go | 2 +-
ecc/bls12-377/internal/fptower/e2_amd64.go | 2 +-
ecc/bls12-377/internal/fptower/e2_fallback.go | 2 +-
ecc/bls12-377/internal/fptower/e2_test.go | 2 +-
ecc/bls12-377/internal/fptower/e6.go | 2 +-
ecc/bls12-377/internal/fptower/e6_test.go | 2 +-
ecc/bls12-377/marshal.go | 2 +-
ecc/bls12-377/marshal_test.go | 2 +-
ecc/bls12-377/multiexp.go | 2 +-
ecc/bls12-377/multiexp_affine.go | 2 +-
ecc/bls12-377/multiexp_jacobian.go | 2 +-
ecc/bls12-377/multiexp_test.go | 2 +-
ecc/bls12-377/pairing_test.go | 2 +-
ecc/bls12-377/twistededwards/curve.go | 2 +-
ecc/bls12-377/twistededwards/doc.go | 2 +-
ecc/bls12-377/twistededwards/eddsa/doc.go | 2 +-
ecc/bls12-377/twistededwards/eddsa/eddsa.go | 2 +-
ecc/bls12-377/twistededwards/eddsa/eddsa_test.go | 2 +-
ecc/bls12-377/twistededwards/eddsa/marshal.go | 2 +-
ecc/bls12-377/twistededwards/point.go | 2 +-
ecc/bls12-377/twistededwards/point_test.go | 2 +-
ecc/bls12-378/ecdsa/doc.go | 2 +-
ecc/bls12-378/ecdsa/ecdsa.go | 2 +-
ecc/bls12-378/ecdsa/ecdsa_test.go | 2 +-
ecc/bls12-378/ecdsa/marshal.go | 2 +-
ecc/bls12-378/ecdsa/marshal_test.go | 2 +-
ecc/bls12-378/fr/fft/doc.go | 2 +-
ecc/bls12-378/fr/fft/domain.go | 2 +-
ecc/bls12-378/fr/fft/domain_test.go | 2 +-
ecc/bls12-378/fr/fft/fft.go | 2 +-
ecc/bls12-378/fr/fft/fft_test.go | 2 +-
ecc/bls12-378/fr/fft/options.go | 2 +-
ecc/bls12-378/fr/fri/doc.go | 2 +-
ecc/bls12-378/fr/fri/fri.go | 2 +-
ecc/bls12-378/fr/fri/fri_test.go | 2 +-
ecc/bls12-378/fr/gkr/gkr.go | 2 +-
ecc/bls12-378/fr/gkr/gkr_test.go | 2 +-
ecc/bls12-378/fr/iop/doc.go | 2 +-
ecc/bls12-378/fr/iop/expressions.go | 2 +-
ecc/bls12-378/fr/iop/expressions_test.go | 2 +-
ecc/bls12-378/fr/iop/polynomial.go | 2 +-
ecc/bls12-378/fr/iop/polynomial_test.go | 2 +-
ecc/bls12-378/fr/iop/quotient.go | 2 +-
ecc/bls12-378/fr/iop/quotient_test.go | 2 +-
ecc/bls12-378/fr/iop/ratios.go | 2 +-
ecc/bls12-378/fr/iop/ratios_test.go | 2 +-
ecc/bls12-378/fr/iop/utils.go | 2 +-
ecc/bls12-378/fr/kzg/doc.go | 2 +-
ecc/bls12-378/fr/kzg/kzg.go | 2 +-
ecc/bls12-378/fr/kzg/kzg_test.go | 2 +-
ecc/bls12-378/fr/kzg/marshal.go | 2 +-
ecc/bls12-378/fr/mimc/doc.go | 2 +-
ecc/bls12-378/fr/mimc/mimc.go | 2 +-
ecc/bls12-378/fr/pedersen/pedersen.go | 2 +-
ecc/bls12-378/fr/pedersen/pedersen_test.go | 2 +-
ecc/bls12-378/fr/permutation/doc.go | 2 +-
ecc/bls12-378/fr/permutation/permutation.go | 2 +-
ecc/bls12-378/fr/permutation/permutation_test.go | 2 +-
ecc/bls12-378/fr/plookup/doc.go | 2 +-
ecc/bls12-378/fr/plookup/plookup_test.go | 2 +-
ecc/bls12-378/fr/plookup/table.go | 2 +-
ecc/bls12-378/fr/plookup/vector.go | 2 +-
ecc/bls12-378/fr/polynomial/doc.go | 2 +-
ecc/bls12-378/fr/polynomial/multilin.go | 2 +-
ecc/bls12-378/fr/polynomial/multilin_test.go | 2 +-
ecc/bls12-378/fr/polynomial/polynomial.go | 2 +-
ecc/bls12-378/fr/polynomial/polynomial_test.go | 2 +-
ecc/bls12-378/fr/polynomial/pool.go | 2 +-
ecc/bls12-378/fr/sumcheck/sumcheck.go | 2 +-
ecc/bls12-378/fr/sumcheck/sumcheck_test.go | 2 +-
ecc/bls12-378/fr/test_vector_utils/test_vector_utils.go | 2 +-
ecc/bls12-378/g1.go | 2 +-
ecc/bls12-378/g1_test.go | 2 +-
ecc/bls12-378/g2.go | 2 +-
ecc/bls12-378/g2_test.go | 2 +-
ecc/bls12-378/hash_to_g1.go | 2 +-
ecc/bls12-378/hash_to_g1_test.go | 2 +-
ecc/bls12-378/internal/fptower/asm.go | 2 +-
ecc/bls12-378/internal/fptower/asm_noadx.go | 2 +-
ecc/bls12-378/internal/fptower/e12.go | 2 +-
ecc/bls12-378/internal/fptower/e12_test.go | 2 +-
ecc/bls12-378/internal/fptower/e2.go | 2 +-
ecc/bls12-378/internal/fptower/e2_amd64.go | 2 +-
ecc/bls12-378/internal/fptower/e2_fallback.go | 2 +-
ecc/bls12-378/internal/fptower/e2_test.go | 2 +-
ecc/bls12-378/internal/fptower/e6.go | 2 +-
ecc/bls12-378/internal/fptower/e6_test.go | 2 +-
ecc/bls12-378/marshal.go | 2 +-
ecc/bls12-378/marshal_test.go | 2 +-
ecc/bls12-378/multiexp.go | 2 +-
ecc/bls12-378/multiexp_affine.go | 2 +-
ecc/bls12-378/multiexp_jacobian.go | 2 +-
ecc/bls12-378/multiexp_test.go | 2 +-
ecc/bls12-378/pairing_test.go | 2 +-
ecc/bls12-378/twistededwards/curve.go | 2 +-
ecc/bls12-378/twistededwards/doc.go | 2 +-
ecc/bls12-378/twistededwards/eddsa/doc.go | 2 +-
ecc/bls12-378/twistededwards/eddsa/eddsa.go | 2 +-
ecc/bls12-378/twistededwards/eddsa/eddsa_test.go | 2 +-
ecc/bls12-378/twistededwards/eddsa/marshal.go | 2 +-
ecc/bls12-378/twistededwards/point.go | 2 +-
ecc/bls12-378/twistededwards/point_test.go | 2 +-
ecc/bls12-381/bandersnatch/curve.go | 2 +-
ecc/bls12-381/bandersnatch/doc.go | 2 +-
ecc/bls12-381/bandersnatch/eddsa/doc.go | 2 +-
ecc/bls12-381/bandersnatch/eddsa/eddsa.go | 2 +-
ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go | 2 +-
ecc/bls12-381/bandersnatch/eddsa/marshal.go | 2 +-
ecc/bls12-381/bandersnatch/point.go | 2 +-
ecc/bls12-381/bandersnatch/point_test.go | 2 +-
ecc/bls12-381/ecdsa/doc.go | 2 +-
ecc/bls12-381/ecdsa/ecdsa.go | 2 +-
ecc/bls12-381/ecdsa/ecdsa_test.go | 2 +-
ecc/bls12-381/ecdsa/marshal.go | 2 +-
ecc/bls12-381/ecdsa/marshal_test.go | 2 +-
ecc/bls12-381/fr/fft/doc.go | 2 +-
ecc/bls12-381/fr/fft/domain.go | 2 +-
ecc/bls12-381/fr/fft/domain_test.go | 2 +-
ecc/bls12-381/fr/fft/fft.go | 2 +-
ecc/bls12-381/fr/fft/fft_test.go | 2 +-
ecc/bls12-381/fr/fft/options.go | 2 +-
ecc/bls12-381/fr/fri/doc.go | 2 +-
ecc/bls12-381/fr/fri/fri.go | 2 +-
ecc/bls12-381/fr/fri/fri_test.go | 2 +-
ecc/bls12-381/fr/gkr/gkr.go | 2 +-
ecc/bls12-381/fr/gkr/gkr_test.go | 2 +-
ecc/bls12-381/fr/iop/doc.go | 2 +-
ecc/bls12-381/fr/iop/expressions.go | 2 +-
ecc/bls12-381/fr/iop/expressions_test.go | 2 +-
ecc/bls12-381/fr/iop/polynomial.go | 2 +-
ecc/bls12-381/fr/iop/polynomial_test.go | 2 +-
ecc/bls12-381/fr/iop/quotient.go | 2 +-
ecc/bls12-381/fr/iop/quotient_test.go | 2 +-
ecc/bls12-381/fr/iop/ratios.go | 2 +-
ecc/bls12-381/fr/iop/ratios_test.go | 2 +-
ecc/bls12-381/fr/iop/utils.go | 2 +-
ecc/bls12-381/fr/kzg/doc.go | 2 +-
ecc/bls12-381/fr/kzg/kzg.go | 2 +-
ecc/bls12-381/fr/kzg/kzg_test.go | 2 +-
ecc/bls12-381/fr/kzg/marshal.go | 2 +-
ecc/bls12-381/fr/mimc/doc.go | 2 +-
ecc/bls12-381/fr/mimc/mimc.go | 2 +-
ecc/bls12-381/fr/pedersen/pedersen.go | 2 +-
ecc/bls12-381/fr/pedersen/pedersen_test.go | 2 +-
ecc/bls12-381/fr/permutation/doc.go | 2 +-
ecc/bls12-381/fr/permutation/permutation.go | 2 +-
ecc/bls12-381/fr/permutation/permutation_test.go | 2 +-
ecc/bls12-381/fr/plookup/doc.go | 2 +-
ecc/bls12-381/fr/plookup/plookup_test.go | 2 +-
ecc/bls12-381/fr/plookup/table.go | 2 +-
ecc/bls12-381/fr/plookup/vector.go | 2 +-
ecc/bls12-381/fr/polynomial/doc.go | 2 +-
ecc/bls12-381/fr/polynomial/multilin.go | 2 +-
ecc/bls12-381/fr/polynomial/multilin_test.go | 2 +-
ecc/bls12-381/fr/polynomial/polynomial.go | 2 +-
ecc/bls12-381/fr/polynomial/polynomial_test.go | 2 +-
ecc/bls12-381/fr/polynomial/pool.go | 2 +-
ecc/bls12-381/fr/sumcheck/sumcheck.go | 2 +-
ecc/bls12-381/fr/sumcheck/sumcheck_test.go | 2 +-
ecc/bls12-381/fr/test_vector_utils/test_vector_utils.go | 2 +-
ecc/bls12-381/g1.go | 2 +-
ecc/bls12-381/g1_test.go | 2 +-
ecc/bls12-381/g2.go | 2 +-
ecc/bls12-381/g2_test.go | 2 +-
ecc/bls12-381/hash_to_g1.go | 2 +-
ecc/bls12-381/hash_to_g1_test.go | 2 +-
ecc/bls12-381/hash_to_g2.go | 2 +-
ecc/bls12-381/hash_to_g2_test.go | 2 +-
ecc/bls12-381/internal/fptower/asm.go | 2 +-
ecc/bls12-381/internal/fptower/asm_noadx.go | 2 +-
ecc/bls12-381/internal/fptower/e12.go | 2 +-
ecc/bls12-381/internal/fptower/e12_test.go | 2 +-
ecc/bls12-381/internal/fptower/e2.go | 2 +-
ecc/bls12-381/internal/fptower/e2_amd64.go | 2 +-
ecc/bls12-381/internal/fptower/e2_fallback.go | 2 +-
ecc/bls12-381/internal/fptower/e2_test.go | 2 +-
ecc/bls12-381/internal/fptower/e6.go | 2 +-
ecc/bls12-381/internal/fptower/e6_test.go | 2 +-
ecc/bls12-381/marshal.go | 2 +-
ecc/bls12-381/marshal_test.go | 2 +-
ecc/bls12-381/multiexp.go | 2 +-
ecc/bls12-381/multiexp_affine.go | 2 +-
ecc/bls12-381/multiexp_jacobian.go | 2 +-
ecc/bls12-381/multiexp_test.go | 2 +-
ecc/bls12-381/pairing_test.go | 2 +-
ecc/bls12-381/twistededwards/curve.go | 2 +-
ecc/bls12-381/twistededwards/doc.go | 2 +-
ecc/bls12-381/twistededwards/eddsa/doc.go | 2 +-
ecc/bls12-381/twistededwards/eddsa/eddsa.go | 2 +-
ecc/bls12-381/twistededwards/eddsa/eddsa_test.go | 2 +-
ecc/bls12-381/twistededwards/eddsa/marshal.go | 2 +-
ecc/bls12-381/twistededwards/point.go | 2 +-
ecc/bls12-381/twistededwards/point_test.go | 2 +-
ecc/bls24-315/ecdsa/doc.go | 2 +-
ecc/bls24-315/ecdsa/ecdsa.go | 2 +-
ecc/bls24-315/ecdsa/ecdsa_test.go | 2 +-
ecc/bls24-315/ecdsa/marshal.go | 2 +-
ecc/bls24-315/ecdsa/marshal_test.go | 2 +-
ecc/bls24-315/fr/fft/doc.go | 2 +-
ecc/bls24-315/fr/fft/domain.go | 2 +-
ecc/bls24-315/fr/fft/domain_test.go | 2 +-
ecc/bls24-315/fr/fft/fft.go | 2 +-
ecc/bls24-315/fr/fft/fft_test.go | 2 +-
ecc/bls24-315/fr/fft/options.go | 2 +-
ecc/bls24-315/fr/fri/doc.go | 2 +-
ecc/bls24-315/fr/fri/fri.go | 2 +-
ecc/bls24-315/fr/fri/fri_test.go | 2 +-
ecc/bls24-315/fr/gkr/gkr.go | 2 +-
ecc/bls24-315/fr/gkr/gkr_test.go | 2 +-
ecc/bls24-315/fr/iop/doc.go | 2 +-
ecc/bls24-315/fr/iop/expressions.go | 2 +-
ecc/bls24-315/fr/iop/expressions_test.go | 2 +-
ecc/bls24-315/fr/iop/polynomial.go | 2 +-
ecc/bls24-315/fr/iop/polynomial_test.go | 2 +-
ecc/bls24-315/fr/iop/quotient.go | 2 +-
ecc/bls24-315/fr/iop/quotient_test.go | 2 +-
ecc/bls24-315/fr/iop/ratios.go | 2 +-
ecc/bls24-315/fr/iop/ratios_test.go | 2 +-
ecc/bls24-315/fr/iop/utils.go | 2 +-
ecc/bls24-315/fr/kzg/doc.go | 2 +-
ecc/bls24-315/fr/kzg/kzg.go | 2 +-
ecc/bls24-315/fr/kzg/kzg_test.go | 2 +-
ecc/bls24-315/fr/kzg/marshal.go | 2 +-
ecc/bls24-315/fr/mimc/doc.go | 2 +-
ecc/bls24-315/fr/mimc/mimc.go | 2 +-
ecc/bls24-315/fr/pedersen/pedersen.go | 2 +-
ecc/bls24-315/fr/pedersen/pedersen_test.go | 2 +-
ecc/bls24-315/fr/permutation/doc.go | 2 +-
ecc/bls24-315/fr/permutation/permutation.go | 2 +-
ecc/bls24-315/fr/permutation/permutation_test.go | 2 +-
ecc/bls24-315/fr/plookup/doc.go | 2 +-
ecc/bls24-315/fr/plookup/plookup_test.go | 2 +-
ecc/bls24-315/fr/plookup/table.go | 2 +-
ecc/bls24-315/fr/plookup/vector.go | 2 +-
ecc/bls24-315/fr/polynomial/doc.go | 2 +-
ecc/bls24-315/fr/polynomial/multilin.go | 2 +-
ecc/bls24-315/fr/polynomial/multilin_test.go | 2 +-
ecc/bls24-315/fr/polynomial/polynomial.go | 2 +-
ecc/bls24-315/fr/polynomial/polynomial_test.go | 2 +-
ecc/bls24-315/fr/polynomial/pool.go | 2 +-
ecc/bls24-315/fr/sumcheck/sumcheck.go | 2 +-
ecc/bls24-315/fr/sumcheck/sumcheck_test.go | 2 +-
ecc/bls24-315/fr/test_vector_utils/test_vector_utils.go | 2 +-
ecc/bls24-315/g1.go | 2 +-
ecc/bls24-315/g1_test.go | 2 +-
ecc/bls24-315/g2.go | 2 +-
ecc/bls24-315/g2_test.go | 2 +-
ecc/bls24-315/hash_to_g1.go | 2 +-
ecc/bls24-315/hash_to_g1_test.go | 2 +-
ecc/bls24-315/marshal.go | 2 +-
ecc/bls24-315/marshal_test.go | 2 +-
ecc/bls24-315/multiexp.go | 2 +-
ecc/bls24-315/multiexp_affine.go | 2 +-
ecc/bls24-315/multiexp_jacobian.go | 2 +-
ecc/bls24-315/multiexp_test.go | 2 +-
ecc/bls24-315/pairing_test.go | 2 +-
ecc/bls24-315/twistededwards/curve.go | 2 +-
ecc/bls24-315/twistededwards/doc.go | 2 +-
ecc/bls24-315/twistededwards/eddsa/doc.go | 2 +-
ecc/bls24-315/twistededwards/eddsa/eddsa.go | 2 +-
ecc/bls24-315/twistededwards/eddsa/eddsa_test.go | 2 +-
ecc/bls24-315/twistededwards/eddsa/marshal.go | 2 +-
ecc/bls24-315/twistededwards/point.go | 2 +-
ecc/bls24-315/twistededwards/point_test.go | 2 +-
ecc/bls24-317/ecdsa/doc.go | 2 +-
ecc/bls24-317/ecdsa/ecdsa.go | 2 +-
ecc/bls24-317/ecdsa/ecdsa_test.go | 2 +-
ecc/bls24-317/ecdsa/marshal.go | 2 +-
ecc/bls24-317/ecdsa/marshal_test.go | 2 +-
ecc/bls24-317/fr/fft/doc.go | 2 +-
ecc/bls24-317/fr/fft/domain.go | 2 +-
ecc/bls24-317/fr/fft/domain_test.go | 2 +-
ecc/bls24-317/fr/fft/fft.go | 2 +-
ecc/bls24-317/fr/fft/fft_test.go | 2 +-
ecc/bls24-317/fr/fft/options.go | 2 +-
ecc/bls24-317/fr/fri/doc.go | 2 +-
ecc/bls24-317/fr/fri/fri.go | 2 +-
ecc/bls24-317/fr/fri/fri_test.go | 2 +-
ecc/bls24-317/fr/gkr/gkr.go | 2 +-
ecc/bls24-317/fr/gkr/gkr_test.go | 2 +-
ecc/bls24-317/fr/iop/doc.go | 2 +-
ecc/bls24-317/fr/iop/expressions.go | 2 +-
ecc/bls24-317/fr/iop/expressions_test.go | 2 +-
ecc/bls24-317/fr/iop/polynomial.go | 2 +-
ecc/bls24-317/fr/iop/polynomial_test.go | 2 +-
ecc/bls24-317/fr/iop/quotient.go | 2 +-
ecc/bls24-317/fr/iop/quotient_test.go | 2 +-
ecc/bls24-317/fr/iop/ratios.go | 2 +-
ecc/bls24-317/fr/iop/ratios_test.go | 2 +-
ecc/bls24-317/fr/iop/utils.go | 2 +-
ecc/bls24-317/fr/kzg/doc.go | 2 +-
ecc/bls24-317/fr/kzg/kzg.go | 2 +-
ecc/bls24-317/fr/kzg/kzg_test.go | 2 +-
ecc/bls24-317/fr/kzg/marshal.go | 2 +-
ecc/bls24-317/fr/mimc/doc.go | 2 +-
ecc/bls24-317/fr/mimc/mimc.go | 2 +-
ecc/bls24-317/fr/pedersen/pedersen.go | 2 +-
ecc/bls24-317/fr/pedersen/pedersen_test.go | 2 +-
ecc/bls24-317/fr/permutation/doc.go | 2 +-
ecc/bls24-317/fr/permutation/permutation.go | 2 +-
ecc/bls24-317/fr/permutation/permutation_test.go | 2 +-
ecc/bls24-317/fr/plookup/doc.go | 2 +-
ecc/bls24-317/fr/plookup/plookup_test.go | 2 +-
ecc/bls24-317/fr/plookup/table.go | 2 +-
ecc/bls24-317/fr/plookup/vector.go | 2 +-
ecc/bls24-317/fr/polynomial/doc.go | 2 +-
ecc/bls24-317/fr/polynomial/multilin.go | 2 +-
ecc/bls24-317/fr/polynomial/multilin_test.go | 2 +-
ecc/bls24-317/fr/polynomial/polynomial.go | 2 +-
ecc/bls24-317/fr/polynomial/polynomial_test.go | 2 +-
ecc/bls24-317/fr/polynomial/pool.go | 2 +-
ecc/bls24-317/fr/sumcheck/sumcheck.go | 2 +-
ecc/bls24-317/fr/sumcheck/sumcheck_test.go | 2 +-
ecc/bls24-317/fr/test_vector_utils/test_vector_utils.go | 2 +-
ecc/bls24-317/g1.go | 2 +-
ecc/bls24-317/g1_test.go | 2 +-
ecc/bls24-317/g2.go | 2 +-
ecc/bls24-317/g2_test.go | 2 +-
ecc/bls24-317/hash_to_g1.go | 2 +-
ecc/bls24-317/hash_to_g1_test.go | 2 +-
ecc/bls24-317/marshal.go | 2 +-
ecc/bls24-317/marshal_test.go | 2 +-
ecc/bls24-317/multiexp.go | 2 +-
ecc/bls24-317/multiexp_affine.go | 2 +-
ecc/bls24-317/multiexp_jacobian.go | 2 +-
ecc/bls24-317/multiexp_test.go | 2 +-
ecc/bls24-317/pairing_test.go | 2 +-
ecc/bls24-317/twistededwards/curve.go | 2 +-
ecc/bls24-317/twistededwards/doc.go | 2 +-
ecc/bls24-317/twistededwards/eddsa/doc.go | 2 +-
ecc/bls24-317/twistededwards/eddsa/eddsa.go | 2 +-
ecc/bls24-317/twistededwards/eddsa/eddsa_test.go | 2 +-
ecc/bls24-317/twistededwards/eddsa/marshal.go | 2 +-
ecc/bls24-317/twistededwards/point.go | 2 +-
ecc/bls24-317/twistededwards/point_test.go | 2 +-
ecc/bn254/ecdsa/doc.go | 2 +-
ecc/bn254/ecdsa/ecdsa.go | 2 +-
ecc/bn254/ecdsa/ecdsa_test.go | 2 +-
ecc/bn254/ecdsa/marshal.go | 2 +-
ecc/bn254/ecdsa/marshal_test.go | 2 +-
ecc/bn254/fr/fft/doc.go | 2 +-
ecc/bn254/fr/fft/domain.go | 2 +-
ecc/bn254/fr/fft/domain_test.go | 2 +-
ecc/bn254/fr/fft/fft.go | 2 +-
ecc/bn254/fr/fft/fft_test.go | 2 +-
ecc/bn254/fr/fft/options.go | 2 +-
ecc/bn254/fr/fri/doc.go | 2 +-
ecc/bn254/fr/fri/fri.go | 2 +-
ecc/bn254/fr/fri/fri_test.go | 2 +-
ecc/bn254/fr/gkr/gkr.go | 2 +-
ecc/bn254/fr/gkr/gkr_test.go | 2 +-
ecc/bn254/fr/iop/doc.go | 2 +-
ecc/bn254/fr/iop/expressions.go | 2 +-
ecc/bn254/fr/iop/expressions_test.go | 2 +-
ecc/bn254/fr/iop/polynomial.go | 2 +-
ecc/bn254/fr/iop/polynomial_test.go | 2 +-
ecc/bn254/fr/iop/quotient.go | 2 +-
ecc/bn254/fr/iop/quotient_test.go | 2 +-
ecc/bn254/fr/iop/ratios.go | 2 +-
ecc/bn254/fr/iop/ratios_test.go | 2 +-
ecc/bn254/fr/iop/utils.go | 2 +-
ecc/bn254/fr/kzg/doc.go | 2 +-
ecc/bn254/fr/kzg/kzg.go | 2 +-
ecc/bn254/fr/kzg/kzg_test.go | 2 +-
ecc/bn254/fr/kzg/marshal.go | 2 +-
ecc/bn254/fr/mimc/doc.go | 2 +-
ecc/bn254/fr/mimc/mimc.go | 2 +-
ecc/bn254/fr/pedersen/pedersen.go | 2 +-
ecc/bn254/fr/pedersen/pedersen_test.go | 2 +-
ecc/bn254/fr/permutation/doc.go | 2 +-
ecc/bn254/fr/permutation/permutation.go | 2 +-
ecc/bn254/fr/permutation/permutation_test.go | 2 +-
ecc/bn254/fr/plookup/doc.go | 2 +-
ecc/bn254/fr/plookup/plookup_test.go | 2 +-
ecc/bn254/fr/plookup/table.go | 2 +-
ecc/bn254/fr/plookup/vector.go | 2 +-
ecc/bn254/fr/polynomial/doc.go | 2 +-
ecc/bn254/fr/polynomial/multilin.go | 2 +-
ecc/bn254/fr/polynomial/multilin_test.go | 2 +-
ecc/bn254/fr/polynomial/polynomial.go | 2 +-
ecc/bn254/fr/polynomial/polynomial_test.go | 2 +-
ecc/bn254/fr/polynomial/pool.go | 2 +-
ecc/bn254/fr/sumcheck/sumcheck.go | 2 +-
ecc/bn254/fr/sumcheck/sumcheck_test.go | 2 +-
ecc/bn254/fr/test_vector_utils/test_vector_utils.go | 2 +-
ecc/bn254/g1.go | 2 +-
ecc/bn254/g1_test.go | 2 +-
ecc/bn254/g2.go | 2 +-
ecc/bn254/g2_test.go | 2 +-
ecc/bn254/hash_to_g1.go | 2 +-
ecc/bn254/hash_to_g1_test.go | 2 +-
ecc/bn254/hash_to_g2.go | 2 +-
ecc/bn254/hash_to_g2_test.go | 2 +-
ecc/bn254/internal/fptower/asm.go | 2 +-
ecc/bn254/internal/fptower/asm_noadx.go | 2 +-
ecc/bn254/internal/fptower/e12.go | 2 +-
ecc/bn254/internal/fptower/e12_test.go | 2 +-
ecc/bn254/internal/fptower/e2.go | 2 +-
ecc/bn254/internal/fptower/e2_amd64.go | 2 +-
ecc/bn254/internal/fptower/e2_fallback.go | 2 +-
ecc/bn254/internal/fptower/e2_test.go | 2 +-
ecc/bn254/internal/fptower/e6.go | 2 +-
ecc/bn254/internal/fptower/e6_test.go | 2 +-
ecc/bn254/marshal.go | 2 +-
ecc/bn254/marshal_test.go | 2 +-
ecc/bn254/multiexp.go | 2 +-
ecc/bn254/multiexp_affine.go | 2 +-
ecc/bn254/multiexp_jacobian.go | 2 +-
ecc/bn254/multiexp_test.go | 2 +-
ecc/bn254/pairing_test.go | 2 +-
ecc/bn254/twistededwards/curve.go | 2 +-
ecc/bn254/twistededwards/doc.go | 2 +-
ecc/bn254/twistededwards/eddsa/doc.go | 2 +-
ecc/bn254/twistededwards/eddsa/eddsa.go | 2 +-
ecc/bn254/twistededwards/eddsa/eddsa_test.go | 2 +-
ecc/bn254/twistededwards/eddsa/marshal.go | 2 +-
ecc/bn254/twistededwards/point.go | 2 +-
ecc/bn254/twistededwards/point_test.go | 2 +-
ecc/bw6-633/ecdsa/doc.go | 2 +-
ecc/bw6-633/ecdsa/ecdsa.go | 2 +-
ecc/bw6-633/ecdsa/ecdsa_test.go | 2 +-
ecc/bw6-633/ecdsa/marshal.go | 2 +-
ecc/bw6-633/ecdsa/marshal_test.go | 2 +-
ecc/bw6-633/fr/fft/doc.go | 2 +-
ecc/bw6-633/fr/fft/domain.go | 2 +-
ecc/bw6-633/fr/fft/domain_test.go | 2 +-
ecc/bw6-633/fr/fft/fft.go | 2 +-
ecc/bw6-633/fr/fft/fft_test.go | 2 +-
ecc/bw6-633/fr/fft/options.go | 2 +-
ecc/bw6-633/fr/fri/doc.go | 2 +-
ecc/bw6-633/fr/fri/fri.go | 2 +-
ecc/bw6-633/fr/fri/fri_test.go | 2 +-
ecc/bw6-633/fr/gkr/gkr.go | 2 +-
ecc/bw6-633/fr/gkr/gkr_test.go | 2 +-
ecc/bw6-633/fr/iop/doc.go | 2 +-
ecc/bw6-633/fr/iop/expressions.go | 2 +-
ecc/bw6-633/fr/iop/expressions_test.go | 2 +-
ecc/bw6-633/fr/iop/polynomial.go | 2 +-
ecc/bw6-633/fr/iop/polynomial_test.go | 2 +-
ecc/bw6-633/fr/iop/quotient.go | 2 +-
ecc/bw6-633/fr/iop/quotient_test.go | 2 +-
ecc/bw6-633/fr/iop/ratios.go | 2 +-
ecc/bw6-633/fr/iop/ratios_test.go | 2 +-
ecc/bw6-633/fr/iop/utils.go | 2 +-
ecc/bw6-633/fr/kzg/doc.go | 2 +-
ecc/bw6-633/fr/kzg/kzg.go | 2 +-
ecc/bw6-633/fr/kzg/kzg_test.go | 2 +-
ecc/bw6-633/fr/kzg/marshal.go | 2 +-
ecc/bw6-633/fr/mimc/doc.go | 2 +-
ecc/bw6-633/fr/mimc/mimc.go | 2 +-
ecc/bw6-633/fr/pedersen/pedersen.go | 2 +-
ecc/bw6-633/fr/pedersen/pedersen_test.go | 2 +-
ecc/bw6-633/fr/permutation/doc.go | 2 +-
ecc/bw6-633/fr/permutation/permutation.go | 2 +-
ecc/bw6-633/fr/permutation/permutation_test.go | 2 +-
ecc/bw6-633/fr/plookup/doc.go | 2 +-
ecc/bw6-633/fr/plookup/plookup_test.go | 2 +-
ecc/bw6-633/fr/plookup/table.go | 2 +-
ecc/bw6-633/fr/plookup/vector.go | 2 +-
ecc/bw6-633/fr/polynomial/doc.go | 2 +-
ecc/bw6-633/fr/polynomial/multilin.go | 2 +-
ecc/bw6-633/fr/polynomial/multilin_test.go | 2 +-
ecc/bw6-633/fr/polynomial/polynomial.go | 2 +-
ecc/bw6-633/fr/polynomial/polynomial_test.go | 2 +-
ecc/bw6-633/fr/polynomial/pool.go | 2 +-
ecc/bw6-633/fr/sumcheck/sumcheck.go | 2 +-
ecc/bw6-633/fr/sumcheck/sumcheck_test.go | 2 +-
ecc/bw6-633/fr/test_vector_utils/test_vector_utils.go | 2 +-
ecc/bw6-633/g1.go | 2 +-
ecc/bw6-633/g1_test.go | 2 +-
ecc/bw6-633/g2.go | 2 +-
ecc/bw6-633/g2_test.go | 2 +-
ecc/bw6-633/hash_to_g1.go | 2 +-
ecc/bw6-633/hash_to_g1_test.go | 2 +-
ecc/bw6-633/hash_to_g2.go | 2 +-
ecc/bw6-633/hash_to_g2_test.go | 2 +-
ecc/bw6-633/marshal.go | 2 +-
ecc/bw6-633/marshal_test.go | 2 +-
ecc/bw6-633/multiexp.go | 2 +-
ecc/bw6-633/multiexp_affine.go | 2 +-
ecc/bw6-633/multiexp_jacobian.go | 2 +-
ecc/bw6-633/multiexp_test.go | 2 +-
ecc/bw6-633/pairing_test.go | 2 +-
ecc/bw6-633/twistededwards/curve.go | 2 +-
ecc/bw6-633/twistededwards/doc.go | 2 +-
ecc/bw6-633/twistededwards/eddsa/doc.go | 2 +-
ecc/bw6-633/twistededwards/eddsa/eddsa.go | 2 +-
ecc/bw6-633/twistededwards/eddsa/eddsa_test.go | 2 +-
ecc/bw6-633/twistededwards/eddsa/marshal.go | 2 +-
ecc/bw6-633/twistededwards/point.go | 2 +-
ecc/bw6-633/twistededwards/point_test.go | 2 +-
ecc/bw6-756/ecdsa/doc.go | 2 +-
ecc/bw6-756/ecdsa/ecdsa.go | 2 +-
ecc/bw6-756/ecdsa/ecdsa_test.go | 2 +-
ecc/bw6-756/ecdsa/marshal.go | 2 +-
ecc/bw6-756/ecdsa/marshal_test.go | 2 +-
ecc/bw6-756/fr/fft/doc.go | 2 +-
ecc/bw6-756/fr/fft/domain.go | 2 +-
ecc/bw6-756/fr/fft/domain_test.go | 2 +-
ecc/bw6-756/fr/fft/fft.go | 2 +-
ecc/bw6-756/fr/fft/fft_test.go | 2 +-
ecc/bw6-756/fr/fft/options.go | 2 +-
ecc/bw6-756/fr/fri/doc.go | 2 +-
ecc/bw6-756/fr/fri/fri.go | 2 +-
ecc/bw6-756/fr/fri/fri_test.go | 2 +-
ecc/bw6-756/fr/gkr/gkr.go | 2 +-
ecc/bw6-756/fr/gkr/gkr_test.go | 2 +-
ecc/bw6-756/fr/iop/doc.go | 2 +-
ecc/bw6-756/fr/iop/expressions.go | 2 +-
ecc/bw6-756/fr/iop/expressions_test.go | 2 +-
ecc/bw6-756/fr/iop/polynomial.go | 2 +-
ecc/bw6-756/fr/iop/polynomial_test.go | 2 +-
ecc/bw6-756/fr/iop/quotient.go | 2 +-
ecc/bw6-756/fr/iop/quotient_test.go | 2 +-
ecc/bw6-756/fr/iop/ratios.go | 2 +-
ecc/bw6-756/fr/iop/ratios_test.go | 2 +-
ecc/bw6-756/fr/iop/utils.go | 2 +-
ecc/bw6-756/fr/kzg/doc.go | 2 +-
ecc/bw6-756/fr/kzg/kzg.go | 2 +-
ecc/bw6-756/fr/kzg/kzg_test.go | 2 +-
ecc/bw6-756/fr/kzg/marshal.go | 2 +-
ecc/bw6-756/fr/mimc/doc.go | 2 +-
ecc/bw6-756/fr/mimc/mimc.go | 2 +-
ecc/bw6-756/fr/pedersen/pedersen.go | 2 +-
ecc/bw6-756/fr/pedersen/pedersen_test.go | 2 +-
ecc/bw6-756/fr/permutation/doc.go | 2 +-
ecc/bw6-756/fr/permutation/permutation.go | 2 +-
ecc/bw6-756/fr/permutation/permutation_test.go | 2 +-
ecc/bw6-756/fr/plookup/doc.go | 2 +-
ecc/bw6-756/fr/plookup/plookup_test.go | 2 +-
ecc/bw6-756/fr/plookup/table.go | 2 +-
ecc/bw6-756/fr/plookup/vector.go | 2 +-
ecc/bw6-756/fr/polynomial/doc.go | 2 +-
ecc/bw6-756/fr/polynomial/multilin.go | 2 +-
ecc/bw6-756/fr/polynomial/multilin_test.go | 2 +-
ecc/bw6-756/fr/polynomial/polynomial.go | 2 +-
ecc/bw6-756/fr/polynomial/polynomial_test.go | 2 +-
ecc/bw6-756/fr/polynomial/pool.go | 2 +-
ecc/bw6-756/fr/sumcheck/sumcheck.go | 2 +-
ecc/bw6-756/fr/sumcheck/sumcheck_test.go | 2 +-
ecc/bw6-756/fr/test_vector_utils/test_vector_utils.go | 2 +-
ecc/bw6-756/g1.go | 2 +-
ecc/bw6-756/g1_test.go | 2 +-
ecc/bw6-756/g2.go | 2 +-
ecc/bw6-756/g2_test.go | 2 +-
ecc/bw6-756/hash_to_g1.go | 2 +-
ecc/bw6-756/hash_to_g1_test.go | 2 +-
ecc/bw6-756/hash_to_g2.go | 2 +-
ecc/bw6-756/hash_to_g2_test.go | 2 +-
ecc/bw6-756/marshal.go | 2 +-
ecc/bw6-756/marshal_test.go | 2 +-
ecc/bw6-756/multiexp.go | 2 +-
ecc/bw6-756/multiexp_affine.go | 2 +-
ecc/bw6-756/multiexp_jacobian.go | 2 +-
ecc/bw6-756/multiexp_test.go | 2 +-
ecc/bw6-756/pairing_test.go | 2 +-
ecc/bw6-756/twistededwards/curve.go | 2 +-
ecc/bw6-756/twistededwards/doc.go | 2 +-
ecc/bw6-756/twistededwards/eddsa/doc.go | 2 +-
ecc/bw6-756/twistededwards/eddsa/eddsa.go | 2 +-
ecc/bw6-756/twistededwards/eddsa/eddsa_test.go | 2 +-
ecc/bw6-756/twistededwards/eddsa/marshal.go | 2 +-
ecc/bw6-756/twistededwards/point.go | 2 +-
ecc/bw6-756/twistededwards/point_test.go | 2 +-
ecc/bw6-761/ecdsa/doc.go | 2 +-
ecc/bw6-761/ecdsa/ecdsa.go | 2 +-
ecc/bw6-761/ecdsa/ecdsa_test.go | 2 +-
ecc/bw6-761/ecdsa/marshal.go | 2 +-
ecc/bw6-761/ecdsa/marshal_test.go | 2 +-
ecc/bw6-761/fr/fft/doc.go | 2 +-
ecc/bw6-761/fr/fft/domain.go | 2 +-
ecc/bw6-761/fr/fft/domain_test.go | 2 +-
ecc/bw6-761/fr/fft/fft.go | 2 +-
ecc/bw6-761/fr/fft/fft_test.go | 2 +-
ecc/bw6-761/fr/fft/options.go | 2 +-
ecc/bw6-761/fr/fri/doc.go | 2 +-
ecc/bw6-761/fr/fri/fri.go | 2 +-
ecc/bw6-761/fr/fri/fri_test.go | 2 +-
ecc/bw6-761/fr/gkr/gkr.go | 2 +-
ecc/bw6-761/fr/gkr/gkr_test.go | 2 +-
ecc/bw6-761/fr/iop/doc.go | 2 +-
ecc/bw6-761/fr/iop/expressions.go | 2 +-
ecc/bw6-761/fr/iop/expressions_test.go | 2 +-
ecc/bw6-761/fr/iop/polynomial.go | 2 +-
ecc/bw6-761/fr/iop/polynomial_test.go | 2 +-
ecc/bw6-761/fr/iop/quotient.go | 2 +-
ecc/bw6-761/fr/iop/quotient_test.go | 2 +-
ecc/bw6-761/fr/iop/ratios.go | 2 +-
ecc/bw6-761/fr/iop/ratios_test.go | 2 +-
ecc/bw6-761/fr/iop/utils.go | 2 +-
ecc/bw6-761/fr/kzg/doc.go | 2 +-
ecc/bw6-761/fr/kzg/kzg.go | 2 +-
ecc/bw6-761/fr/kzg/kzg_test.go | 2 +-
ecc/bw6-761/fr/kzg/marshal.go | 2 +-
ecc/bw6-761/fr/mimc/doc.go | 2 +-
ecc/bw6-761/fr/mimc/mimc.go | 2 +-
ecc/bw6-761/fr/pedersen/pedersen.go | 2 +-
ecc/bw6-761/fr/pedersen/pedersen_test.go | 2 +-
ecc/bw6-761/fr/permutation/doc.go | 2 +-
ecc/bw6-761/fr/permutation/permutation.go | 2 +-
ecc/bw6-761/fr/permutation/permutation_test.go | 2 +-
ecc/bw6-761/fr/plookup/doc.go | 2 +-
ecc/bw6-761/fr/plookup/plookup_test.go | 2 +-
ecc/bw6-761/fr/plookup/table.go | 2 +-
ecc/bw6-761/fr/plookup/vector.go | 2 +-
ecc/bw6-761/fr/polynomial/doc.go | 2 +-
ecc/bw6-761/fr/polynomial/multilin.go | 2 +-
ecc/bw6-761/fr/polynomial/multilin_test.go | 2 +-
ecc/bw6-761/fr/polynomial/polynomial.go | 2 +-
ecc/bw6-761/fr/polynomial/polynomial_test.go | 2 +-
ecc/bw6-761/fr/polynomial/pool.go | 2 +-
ecc/bw6-761/fr/sumcheck/sumcheck.go | 2 +-
ecc/bw6-761/fr/sumcheck/sumcheck_test.go | 2 +-
ecc/bw6-761/fr/test_vector_utils/test_vector_utils.go | 2 +-
ecc/bw6-761/g1.go | 2 +-
ecc/bw6-761/g1_test.go | 2 +-
ecc/bw6-761/g2.go | 2 +-
ecc/bw6-761/g2_test.go | 2 +-
ecc/bw6-761/hash_to_g1.go | 2 +-
ecc/bw6-761/hash_to_g1_test.go | 2 +-
ecc/bw6-761/hash_to_g2.go | 2 +-
ecc/bw6-761/hash_to_g2_test.go | 2 +-
ecc/bw6-761/marshal.go | 2 +-
ecc/bw6-761/marshal_test.go | 2 +-
ecc/bw6-761/multiexp.go | 2 +-
ecc/bw6-761/multiexp_affine.go | 2 +-
ecc/bw6-761/multiexp_jacobian.go | 2 +-
ecc/bw6-761/multiexp_test.go | 2 +-
ecc/bw6-761/pairing_test.go | 2 +-
ecc/bw6-761/twistededwards/curve.go | 2 +-
ecc/bw6-761/twistededwards/doc.go | 2 +-
ecc/bw6-761/twistededwards/eddsa/doc.go | 2 +-
ecc/bw6-761/twistededwards/eddsa/eddsa.go | 2 +-
ecc/bw6-761/twistededwards/eddsa/eddsa_test.go | 2 +-
ecc/bw6-761/twistededwards/eddsa/marshal.go | 2 +-
ecc/bw6-761/twistededwards/point.go | 2 +-
ecc/bw6-761/twistededwards/point_test.go | 2 +-
ecc/secp256k1/ecdsa/doc.go | 2 +-
ecc/secp256k1/ecdsa/ecdsa.go | 2 +-
ecc/secp256k1/ecdsa/ecdsa_test.go | 2 +-
ecc/secp256k1/ecdsa/marshal.go | 2 +-
ecc/secp256k1/ecdsa/marshal_test.go | 2 +-
ecc/secp256k1/g1.go | 2 +-
ecc/secp256k1/g1_test.go | 2 +-
ecc/secp256k1/hash_to_g1.go | 2 +-
ecc/secp256k1/hash_to_g1_test.go | 2 +-
ecc/secp256k1/multiexp.go | 2 +-
ecc/secp256k1/multiexp_affine.go | 2 +-
ecc/secp256k1/multiexp_jacobian.go | 2 +-
ecc/secp256k1/multiexp_test.go | 2 +-
ecc/stark-curve/ecdsa/doc.go | 2 +-
ecc/stark-curve/ecdsa/ecdsa.go | 2 +-
ecc/stark-curve/ecdsa/ecdsa_test.go | 2 +-
ecc/stark-curve/ecdsa/marshal.go | 2 +-
ecc/stark-curve/ecdsa/marshal_test.go | 2 +-
internal/generator/gkr/test_vectors/main.go | 2 +-
internal/generator/main.go | 2 +-
internal/generator/test_vector_utils/small_rational/gkr/gkr.go | 2 +-
.../test_vector_utils/small_rational/polynomial/doc.go | 2 +-
.../test_vector_utils/small_rational/polynomial/multilin.go | 2 +-
.../test_vector_utils/small_rational/polynomial/polynomial.go | 2 +-
.../test_vector_utils/small_rational/polynomial/pool.go | 2 +-
.../test_vector_utils/small_rational/sumcheck/sumcheck.go | 2 +-
.../test_vector_utils/small_rational/sumcheck/sumcheck_test.go | 2 +-
.../small_rational/test_vector_utils/test_vector_utils.go | 2 +-
727 files changed, 727 insertions(+), 727 deletions(-)
diff --git a/ecc/bls12-377/ecdsa/doc.go b/ecc/bls12-377/ecdsa/doc.go
index 6fdb39d25..085a3829d 100644
--- a/ecc/bls12-377/ecdsa/doc.go
+++ b/ecc/bls12-377/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/ecdsa/ecdsa.go b/ecc/bls12-377/ecdsa/ecdsa.go
index 89445e211..288a9735f 100644
--- a/ecc/bls12-377/ecdsa/ecdsa.go
+++ b/ecc/bls12-377/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/ecdsa/ecdsa_test.go b/ecc/bls12-377/ecdsa/ecdsa_test.go
index b8ccabd36..fb0657a65 100644
--- a/ecc/bls12-377/ecdsa/ecdsa_test.go
+++ b/ecc/bls12-377/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/ecdsa/marshal.go b/ecc/bls12-377/ecdsa/marshal.go
index 72d74c5cb..c0ee0643e 100644
--- a/ecc/bls12-377/ecdsa/marshal.go
+++ b/ecc/bls12-377/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/ecdsa/marshal_test.go b/ecc/bls12-377/ecdsa/marshal_test.go
index 4cbe081d4..7ad094fb9 100644
--- a/ecc/bls12-377/ecdsa/marshal_test.go
+++ b/ecc/bls12-377/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/fft/doc.go b/ecc/bls12-377/fr/fft/doc.go
index 3c35170e8..2391a9f63 100644
--- a/ecc/bls12-377/fr/fft/doc.go
+++ b/ecc/bls12-377/fr/fft/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/fft/domain.go b/ecc/bls12-377/fr/fft/domain.go
index 7f32c42b6..c5f20a4e2 100644
--- a/ecc/bls12-377/fr/fft/domain.go
+++ b/ecc/bls12-377/fr/fft/domain.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/fft/domain_test.go b/ecc/bls12-377/fr/fft/domain_test.go
index 14d23dd99..83186cb7c 100644
--- a/ecc/bls12-377/fr/fft/domain_test.go
+++ b/ecc/bls12-377/fr/fft/domain_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/fft/fft.go b/ecc/bls12-377/fr/fft/fft.go
index 792792599..c2a6c5e47 100644
--- a/ecc/bls12-377/fr/fft/fft.go
+++ b/ecc/bls12-377/fr/fft/fft.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/fft/fft_test.go b/ecc/bls12-377/fr/fft/fft_test.go
index 0a1c17d98..c548c40ed 100644
--- a/ecc/bls12-377/fr/fft/fft_test.go
+++ b/ecc/bls12-377/fr/fft/fft_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/fft/options.go b/ecc/bls12-377/fr/fft/options.go
index 603b76f29..02a6000e5 100644
--- a/ecc/bls12-377/fr/fft/options.go
+++ b/ecc/bls12-377/fr/fft/options.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/fri/doc.go b/ecc/bls12-377/fr/fri/doc.go
index 1a4cc68f3..3333ad41f 100644
--- a/ecc/bls12-377/fr/fri/doc.go
+++ b/ecc/bls12-377/fr/fri/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/fri/fri.go b/ecc/bls12-377/fr/fri/fri.go
index 491aa51aa..91cc031ee 100644
--- a/ecc/bls12-377/fr/fri/fri.go
+++ b/ecc/bls12-377/fr/fri/fri.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/fri/fri_test.go b/ecc/bls12-377/fr/fri/fri_test.go
index cc43b21c3..f5cc9e476 100644
--- a/ecc/bls12-377/fr/fri/fri_test.go
+++ b/ecc/bls12-377/fr/fri/fri_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/gkr/gkr.go b/ecc/bls12-377/fr/gkr/gkr.go
index 1a07e8505..0eac47c68 100644
--- a/ecc/bls12-377/fr/gkr/gkr.go
+++ b/ecc/bls12-377/fr/gkr/gkr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/gkr/gkr_test.go b/ecc/bls12-377/fr/gkr/gkr_test.go
index 5e0721ebf..43aaf1ef2 100644
--- a/ecc/bls12-377/fr/gkr/gkr_test.go
+++ b/ecc/bls12-377/fr/gkr/gkr_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/iop/doc.go b/ecc/bls12-377/fr/iop/doc.go
index cd87ef4d7..20f8b1a30 100644
--- a/ecc/bls12-377/fr/iop/doc.go
+++ b/ecc/bls12-377/fr/iop/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/iop/expressions.go b/ecc/bls12-377/fr/iop/expressions.go
index f9699e0af..fff56a126 100644
--- a/ecc/bls12-377/fr/iop/expressions.go
+++ b/ecc/bls12-377/fr/iop/expressions.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/iop/expressions_test.go b/ecc/bls12-377/fr/iop/expressions_test.go
index 738b8dc61..74c24414c 100644
--- a/ecc/bls12-377/fr/iop/expressions_test.go
+++ b/ecc/bls12-377/fr/iop/expressions_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/iop/polynomial.go b/ecc/bls12-377/fr/iop/polynomial.go
index 48115aba9..50ff7f611 100644
--- a/ecc/bls12-377/fr/iop/polynomial.go
+++ b/ecc/bls12-377/fr/iop/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/iop/polynomial_test.go b/ecc/bls12-377/fr/iop/polynomial_test.go
index 32e439748..b84c4be89 100644
--- a/ecc/bls12-377/fr/iop/polynomial_test.go
+++ b/ecc/bls12-377/fr/iop/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/iop/quotient.go b/ecc/bls12-377/fr/iop/quotient.go
index 4cbd39334..bda2144dd 100644
--- a/ecc/bls12-377/fr/iop/quotient.go
+++ b/ecc/bls12-377/fr/iop/quotient.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/iop/quotient_test.go b/ecc/bls12-377/fr/iop/quotient_test.go
index 835e8c0e2..2b979aa35 100644
--- a/ecc/bls12-377/fr/iop/quotient_test.go
+++ b/ecc/bls12-377/fr/iop/quotient_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/iop/ratios.go b/ecc/bls12-377/fr/iop/ratios.go
index 77ceb0e57..cb235b93a 100644
--- a/ecc/bls12-377/fr/iop/ratios.go
+++ b/ecc/bls12-377/fr/iop/ratios.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/iop/ratios_test.go b/ecc/bls12-377/fr/iop/ratios_test.go
index 145c0f6c9..21ae8391d 100644
--- a/ecc/bls12-377/fr/iop/ratios_test.go
+++ b/ecc/bls12-377/fr/iop/ratios_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/iop/utils.go b/ecc/bls12-377/fr/iop/utils.go
index 33824ece4..5ff7c582d 100644
--- a/ecc/bls12-377/fr/iop/utils.go
+++ b/ecc/bls12-377/fr/iop/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/kzg/doc.go b/ecc/bls12-377/fr/kzg/doc.go
index d8a77e8f6..d1045726f 100644
--- a/ecc/bls12-377/fr/kzg/doc.go
+++ b/ecc/bls12-377/fr/kzg/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/kzg/kzg.go b/ecc/bls12-377/fr/kzg/kzg.go
index 682fc6af7..13263864f 100644
--- a/ecc/bls12-377/fr/kzg/kzg.go
+++ b/ecc/bls12-377/fr/kzg/kzg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/kzg/kzg_test.go b/ecc/bls12-377/fr/kzg/kzg_test.go
index 58acf3feb..c14b55c68 100644
--- a/ecc/bls12-377/fr/kzg/kzg_test.go
+++ b/ecc/bls12-377/fr/kzg/kzg_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/kzg/marshal.go b/ecc/bls12-377/fr/kzg/marshal.go
index 404191685..5164dfd1f 100644
--- a/ecc/bls12-377/fr/kzg/marshal.go
+++ b/ecc/bls12-377/fr/kzg/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/mimc/doc.go b/ecc/bls12-377/fr/mimc/doc.go
index 497bd40a9..d527ead9e 100644
--- a/ecc/bls12-377/fr/mimc/doc.go
+++ b/ecc/bls12-377/fr/mimc/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/mimc/mimc.go b/ecc/bls12-377/fr/mimc/mimc.go
index b9bd68bdb..e5a1d8071 100644
--- a/ecc/bls12-377/fr/mimc/mimc.go
+++ b/ecc/bls12-377/fr/mimc/mimc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/pedersen/pedersen.go b/ecc/bls12-377/fr/pedersen/pedersen.go
index cee17840b..457be6a1e 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/pedersen/pedersen_test.go b/ecc/bls12-377/fr/pedersen/pedersen_test.go
index 939642488..62c2c0c0e 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/permutation/doc.go b/ecc/bls12-377/fr/permutation/doc.go
index bdf98e6ca..7ef21ffb9 100644
--- a/ecc/bls12-377/fr/permutation/doc.go
+++ b/ecc/bls12-377/fr/permutation/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/permutation/permutation.go b/ecc/bls12-377/fr/permutation/permutation.go
index b2168ce47..cd8f0f286 100644
--- a/ecc/bls12-377/fr/permutation/permutation.go
+++ b/ecc/bls12-377/fr/permutation/permutation.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/permutation/permutation_test.go b/ecc/bls12-377/fr/permutation/permutation_test.go
index 8d527af95..37584d7dc 100644
--- a/ecc/bls12-377/fr/permutation/permutation_test.go
+++ b/ecc/bls12-377/fr/permutation/permutation_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/plookup/doc.go b/ecc/bls12-377/fr/plookup/doc.go
index ec4b91287..b3af01968 100644
--- a/ecc/bls12-377/fr/plookup/doc.go
+++ b/ecc/bls12-377/fr/plookup/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/plookup/plookup_test.go b/ecc/bls12-377/fr/plookup/plookup_test.go
index 90e44b7e1..56cf6dda9 100644
--- a/ecc/bls12-377/fr/plookup/plookup_test.go
+++ b/ecc/bls12-377/fr/plookup/plookup_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/plookup/table.go b/ecc/bls12-377/fr/plookup/table.go
index b8bbbd6fc..35e45b845 100644
--- a/ecc/bls12-377/fr/plookup/table.go
+++ b/ecc/bls12-377/fr/plookup/table.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/plookup/vector.go b/ecc/bls12-377/fr/plookup/vector.go
index 8273c663d..e4ec2c932 100644
--- a/ecc/bls12-377/fr/plookup/vector.go
+++ b/ecc/bls12-377/fr/plookup/vector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/polynomial/doc.go b/ecc/bls12-377/fr/polynomial/doc.go
index 83479b058..747da41f2 100644
--- a/ecc/bls12-377/fr/polynomial/doc.go
+++ b/ecc/bls12-377/fr/polynomial/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/polynomial/multilin.go b/ecc/bls12-377/fr/polynomial/multilin.go
index bce5d27c8..99538e05a 100644
--- a/ecc/bls12-377/fr/polynomial/multilin.go
+++ b/ecc/bls12-377/fr/polynomial/multilin.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/polynomial/multilin_test.go b/ecc/bls12-377/fr/polynomial/multilin_test.go
index e7e0ce1e0..97d95251c 100644
--- a/ecc/bls12-377/fr/polynomial/multilin_test.go
+++ b/ecc/bls12-377/fr/polynomial/multilin_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/polynomial/polynomial.go b/ecc/bls12-377/fr/polynomial/polynomial.go
index 55869cb57..cedccbabf 100644
--- a/ecc/bls12-377/fr/polynomial/polynomial.go
+++ b/ecc/bls12-377/fr/polynomial/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/polynomial/polynomial_test.go b/ecc/bls12-377/fr/polynomial/polynomial_test.go
index 81843e7f3..7909a14b4 100644
--- a/ecc/bls12-377/fr/polynomial/polynomial_test.go
+++ b/ecc/bls12-377/fr/polynomial/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/polynomial/pool.go b/ecc/bls12-377/fr/polynomial/pool.go
index d46e198fb..3c7b83b56 100644
--- a/ecc/bls12-377/fr/polynomial/pool.go
+++ b/ecc/bls12-377/fr/polynomial/pool.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/sumcheck/sumcheck.go b/ecc/bls12-377/fr/sumcheck/sumcheck.go
index d4306b78c..09640b7bc 100644
--- a/ecc/bls12-377/fr/sumcheck/sumcheck.go
+++ b/ecc/bls12-377/fr/sumcheck/sumcheck.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/sumcheck/sumcheck_test.go b/ecc/bls12-377/fr/sumcheck/sumcheck_test.go
index dd741858e..c26db3571 100644
--- a/ecc/bls12-377/fr/sumcheck/sumcheck_test.go
+++ b/ecc/bls12-377/fr/sumcheck/sumcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/fr/test_vector_utils/test_vector_utils.go b/ecc/bls12-377/fr/test_vector_utils/test_vector_utils.go
index b189399a6..c4b9eea7f 100644
--- a/ecc/bls12-377/fr/test_vector_utils/test_vector_utils.go
+++ b/ecc/bls12-377/fr/test_vector_utils/test_vector_utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/g1.go b/ecc/bls12-377/g1.go
index 0cf4a7df2..cef48cffa 100644
--- a/ecc/bls12-377/g1.go
+++ b/ecc/bls12-377/g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/g1_test.go b/ecc/bls12-377/g1_test.go
index 26aa94d8c..e455a648d 100644
--- a/ecc/bls12-377/g1_test.go
+++ b/ecc/bls12-377/g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/g2.go b/ecc/bls12-377/g2.go
index a372a3ceb..08154fb92 100644
--- a/ecc/bls12-377/g2.go
+++ b/ecc/bls12-377/g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/g2_test.go b/ecc/bls12-377/g2_test.go
index 8e08ffe32..529dcc76a 100644
--- a/ecc/bls12-377/g2_test.go
+++ b/ecc/bls12-377/g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/hash_to_g1.go b/ecc/bls12-377/hash_to_g1.go
index 85a19e73b..20306ba87 100644
--- a/ecc/bls12-377/hash_to_g1.go
+++ b/ecc/bls12-377/hash_to_g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/hash_to_g1_test.go b/ecc/bls12-377/hash_to_g1_test.go
index 467aa1c55..3b7eee61d 100644
--- a/ecc/bls12-377/hash_to_g1_test.go
+++ b/ecc/bls12-377/hash_to_g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/hash_to_g2.go b/ecc/bls12-377/hash_to_g2.go
index 9ae6997be..66aae9fcc 100644
--- a/ecc/bls12-377/hash_to_g2.go
+++ b/ecc/bls12-377/hash_to_g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/hash_to_g2_test.go b/ecc/bls12-377/hash_to_g2_test.go
index 453480234..d0e2fd6d2 100644
--- a/ecc/bls12-377/hash_to_g2_test.go
+++ b/ecc/bls12-377/hash_to_g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/internal/fptower/asm.go b/ecc/bls12-377/internal/fptower/asm.go
index 0ec192019..49751a939 100644
--- a/ecc/bls12-377/internal/fptower/asm.go
+++ b/ecc/bls12-377/internal/fptower/asm.go
@@ -1,7 +1,7 @@
//go:build !noadx
// +build !noadx
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/internal/fptower/asm_noadx.go b/ecc/bls12-377/internal/fptower/asm_noadx.go
index 6a09c11c4..c6a97081f 100644
--- a/ecc/bls12-377/internal/fptower/asm_noadx.go
+++ b/ecc/bls12-377/internal/fptower/asm_noadx.go
@@ -1,7 +1,7 @@
//go:build noadx
// +build noadx
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/internal/fptower/e12.go b/ecc/bls12-377/internal/fptower/e12.go
index 956d6cace..d2de48d6b 100644
--- a/ecc/bls12-377/internal/fptower/e12.go
+++ b/ecc/bls12-377/internal/fptower/e12.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/internal/fptower/e12_test.go b/ecc/bls12-377/internal/fptower/e12_test.go
index ab7e3d514..ee84fb1c7 100644
--- a/ecc/bls12-377/internal/fptower/e12_test.go
+++ b/ecc/bls12-377/internal/fptower/e12_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/internal/fptower/e2.go b/ecc/bls12-377/internal/fptower/e2.go
index 227570dc5..874802d74 100644
--- a/ecc/bls12-377/internal/fptower/e2.go
+++ b/ecc/bls12-377/internal/fptower/e2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/internal/fptower/e2_amd64.go b/ecc/bls12-377/internal/fptower/e2_amd64.go
index 7145007fa..ac68ffa57 100644
--- a/ecc/bls12-377/internal/fptower/e2_amd64.go
+++ b/ecc/bls12-377/internal/fptower/e2_amd64.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/internal/fptower/e2_fallback.go b/ecc/bls12-377/internal/fptower/e2_fallback.go
index 0ce4d8333..6fe47c411 100644
--- a/ecc/bls12-377/internal/fptower/e2_fallback.go
+++ b/ecc/bls12-377/internal/fptower/e2_fallback.go
@@ -1,7 +1,7 @@
//go:build !amd64
// +build !amd64
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/internal/fptower/e2_test.go b/ecc/bls12-377/internal/fptower/e2_test.go
index 3818ab929..054635725 100644
--- a/ecc/bls12-377/internal/fptower/e2_test.go
+++ b/ecc/bls12-377/internal/fptower/e2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/internal/fptower/e6.go b/ecc/bls12-377/internal/fptower/e6.go
index 90aba83b2..128007df2 100644
--- a/ecc/bls12-377/internal/fptower/e6.go
+++ b/ecc/bls12-377/internal/fptower/e6.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/internal/fptower/e6_test.go b/ecc/bls12-377/internal/fptower/e6_test.go
index 4b896c62a..b77369e34 100644
--- a/ecc/bls12-377/internal/fptower/e6_test.go
+++ b/ecc/bls12-377/internal/fptower/e6_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/marshal.go b/ecc/bls12-377/marshal.go
index 48450677d..070aa561e 100644
--- a/ecc/bls12-377/marshal.go
+++ b/ecc/bls12-377/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/marshal_test.go b/ecc/bls12-377/marshal_test.go
index 72e4a000d..fb76807a7 100644
--- a/ecc/bls12-377/marshal_test.go
+++ b/ecc/bls12-377/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/multiexp.go b/ecc/bls12-377/multiexp.go
index cb727fa24..10699d84a 100644
--- a/ecc/bls12-377/multiexp.go
+++ b/ecc/bls12-377/multiexp.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/multiexp_affine.go b/ecc/bls12-377/multiexp_affine.go
index 31fb86384..c6c022df4 100644
--- a/ecc/bls12-377/multiexp_affine.go
+++ b/ecc/bls12-377/multiexp_affine.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/multiexp_jacobian.go b/ecc/bls12-377/multiexp_jacobian.go
index 1a24aa25b..8226a8d91 100644
--- a/ecc/bls12-377/multiexp_jacobian.go
+++ b/ecc/bls12-377/multiexp_jacobian.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/multiexp_test.go b/ecc/bls12-377/multiexp_test.go
index 16c498e01..1166d52a2 100644
--- a/ecc/bls12-377/multiexp_test.go
+++ b/ecc/bls12-377/multiexp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/pairing_test.go b/ecc/bls12-377/pairing_test.go
index 75d277447..cd9a00d5f 100644
--- a/ecc/bls12-377/pairing_test.go
+++ b/ecc/bls12-377/pairing_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/twistededwards/curve.go b/ecc/bls12-377/twistededwards/curve.go
index acacf5af3..dda19edc9 100644
--- a/ecc/bls12-377/twistededwards/curve.go
+++ b/ecc/bls12-377/twistededwards/curve.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/twistededwards/doc.go b/ecc/bls12-377/twistededwards/doc.go
index ed25f6a63..d5f67e943 100644
--- a/ecc/bls12-377/twistededwards/doc.go
+++ b/ecc/bls12-377/twistededwards/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/twistededwards/eddsa/doc.go b/ecc/bls12-377/twistededwards/eddsa/doc.go
index af7da2990..9aa1570fe 100644
--- a/ecc/bls12-377/twistededwards/eddsa/doc.go
+++ b/ecc/bls12-377/twistededwards/eddsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/twistededwards/eddsa/eddsa.go b/ecc/bls12-377/twistededwards/eddsa/eddsa.go
index 10936f8f0..0c33c4baf 100644
--- a/ecc/bls12-377/twistededwards/eddsa/eddsa.go
+++ b/ecc/bls12-377/twistededwards/eddsa/eddsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go b/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go
index f8681709b..2b6aa3805 100644
--- a/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls12-377/twistededwards/eddsa/eddsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/twistededwards/eddsa/marshal.go b/ecc/bls12-377/twistededwards/eddsa/marshal.go
index acf3c4173..89e0a8404 100644
--- a/ecc/bls12-377/twistededwards/eddsa/marshal.go
+++ b/ecc/bls12-377/twistededwards/eddsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/twistededwards/point.go b/ecc/bls12-377/twistededwards/point.go
index 9ec9e0741..7f899d407 100644
--- a/ecc/bls12-377/twistededwards/point.go
+++ b/ecc/bls12-377/twistededwards/point.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-377/twistededwards/point_test.go b/ecc/bls12-377/twistededwards/point_test.go
index e4b5c5c0b..9a075e6ed 100644
--- a/ecc/bls12-377/twistededwards/point_test.go
+++ b/ecc/bls12-377/twistededwards/point_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/ecdsa/doc.go b/ecc/bls12-378/ecdsa/doc.go
index 7172ada5c..d47fad552 100644
--- a/ecc/bls12-378/ecdsa/doc.go
+++ b/ecc/bls12-378/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/ecdsa/ecdsa.go b/ecc/bls12-378/ecdsa/ecdsa.go
index f1766e159..22ce08e79 100644
--- a/ecc/bls12-378/ecdsa/ecdsa.go
+++ b/ecc/bls12-378/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/ecdsa/ecdsa_test.go b/ecc/bls12-378/ecdsa/ecdsa_test.go
index d7dff1075..078835d0c 100644
--- a/ecc/bls12-378/ecdsa/ecdsa_test.go
+++ b/ecc/bls12-378/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/ecdsa/marshal.go b/ecc/bls12-378/ecdsa/marshal.go
index 72d74c5cb..c0ee0643e 100644
--- a/ecc/bls12-378/ecdsa/marshal.go
+++ b/ecc/bls12-378/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/ecdsa/marshal_test.go b/ecc/bls12-378/ecdsa/marshal_test.go
index 5d41f7401..af81dc44e 100644
--- a/ecc/bls12-378/ecdsa/marshal_test.go
+++ b/ecc/bls12-378/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/fft/doc.go b/ecc/bls12-378/fr/fft/doc.go
index 3c35170e8..2391a9f63 100644
--- a/ecc/bls12-378/fr/fft/doc.go
+++ b/ecc/bls12-378/fr/fft/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/fft/domain.go b/ecc/bls12-378/fr/fft/domain.go
index 3a55852f7..78679e209 100644
--- a/ecc/bls12-378/fr/fft/domain.go
+++ b/ecc/bls12-378/fr/fft/domain.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/fft/domain_test.go b/ecc/bls12-378/fr/fft/domain_test.go
index 14d23dd99..83186cb7c 100644
--- a/ecc/bls12-378/fr/fft/domain_test.go
+++ b/ecc/bls12-378/fr/fft/domain_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/fft/fft.go b/ecc/bls12-378/fr/fft/fft.go
index 88e88503f..51c3c9274 100644
--- a/ecc/bls12-378/fr/fft/fft.go
+++ b/ecc/bls12-378/fr/fft/fft.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/fft/fft_test.go b/ecc/bls12-378/fr/fft/fft_test.go
index 1c0f64ac0..caa190aa8 100644
--- a/ecc/bls12-378/fr/fft/fft_test.go
+++ b/ecc/bls12-378/fr/fft/fft_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/fft/options.go b/ecc/bls12-378/fr/fft/options.go
index 603b76f29..02a6000e5 100644
--- a/ecc/bls12-378/fr/fft/options.go
+++ b/ecc/bls12-378/fr/fft/options.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/fri/doc.go b/ecc/bls12-378/fr/fri/doc.go
index 1a4cc68f3..3333ad41f 100644
--- a/ecc/bls12-378/fr/fri/doc.go
+++ b/ecc/bls12-378/fr/fri/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/fri/fri.go b/ecc/bls12-378/fr/fri/fri.go
index 837b08862..145e2defd 100644
--- a/ecc/bls12-378/fr/fri/fri.go
+++ b/ecc/bls12-378/fr/fri/fri.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/fri/fri_test.go b/ecc/bls12-378/fr/fri/fri_test.go
index 2f2b218a7..60988ffa1 100644
--- a/ecc/bls12-378/fr/fri/fri_test.go
+++ b/ecc/bls12-378/fr/fri/fri_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/gkr/gkr.go b/ecc/bls12-378/fr/gkr/gkr.go
index 100458f7c..92ab61c7f 100644
--- a/ecc/bls12-378/fr/gkr/gkr.go
+++ b/ecc/bls12-378/fr/gkr/gkr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/gkr/gkr_test.go b/ecc/bls12-378/fr/gkr/gkr_test.go
index 278a8f92f..aaf03a0e4 100644
--- a/ecc/bls12-378/fr/gkr/gkr_test.go
+++ b/ecc/bls12-378/fr/gkr/gkr_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/iop/doc.go b/ecc/bls12-378/fr/iop/doc.go
index cd87ef4d7..20f8b1a30 100644
--- a/ecc/bls12-378/fr/iop/doc.go
+++ b/ecc/bls12-378/fr/iop/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/iop/expressions.go b/ecc/bls12-378/fr/iop/expressions.go
index 584e678e5..d13e1622b 100644
--- a/ecc/bls12-378/fr/iop/expressions.go
+++ b/ecc/bls12-378/fr/iop/expressions.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/iop/expressions_test.go b/ecc/bls12-378/fr/iop/expressions_test.go
index 4bb30c062..16f767888 100644
--- a/ecc/bls12-378/fr/iop/expressions_test.go
+++ b/ecc/bls12-378/fr/iop/expressions_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/iop/polynomial.go b/ecc/bls12-378/fr/iop/polynomial.go
index d6fb4729c..3dd54e700 100644
--- a/ecc/bls12-378/fr/iop/polynomial.go
+++ b/ecc/bls12-378/fr/iop/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/iop/polynomial_test.go b/ecc/bls12-378/fr/iop/polynomial_test.go
index 301af41bf..5421cb781 100644
--- a/ecc/bls12-378/fr/iop/polynomial_test.go
+++ b/ecc/bls12-378/fr/iop/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/iop/quotient.go b/ecc/bls12-378/fr/iop/quotient.go
index 11df5a974..49583f4f1 100644
--- a/ecc/bls12-378/fr/iop/quotient.go
+++ b/ecc/bls12-378/fr/iop/quotient.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/iop/quotient_test.go b/ecc/bls12-378/fr/iop/quotient_test.go
index 2faf0a124..ff3c33517 100644
--- a/ecc/bls12-378/fr/iop/quotient_test.go
+++ b/ecc/bls12-378/fr/iop/quotient_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/iop/ratios.go b/ecc/bls12-378/fr/iop/ratios.go
index 81ff7af5e..e39076077 100644
--- a/ecc/bls12-378/fr/iop/ratios.go
+++ b/ecc/bls12-378/fr/iop/ratios.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/iop/ratios_test.go b/ecc/bls12-378/fr/iop/ratios_test.go
index c66fc2064..5c4694841 100644
--- a/ecc/bls12-378/fr/iop/ratios_test.go
+++ b/ecc/bls12-378/fr/iop/ratios_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/iop/utils.go b/ecc/bls12-378/fr/iop/utils.go
index a2f2f4321..b3dce97a0 100644
--- a/ecc/bls12-378/fr/iop/utils.go
+++ b/ecc/bls12-378/fr/iop/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/kzg/doc.go b/ecc/bls12-378/fr/kzg/doc.go
index d8a77e8f6..d1045726f 100644
--- a/ecc/bls12-378/fr/kzg/doc.go
+++ b/ecc/bls12-378/fr/kzg/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/kzg/kzg.go b/ecc/bls12-378/fr/kzg/kzg.go
index 889424f61..587750081 100644
--- a/ecc/bls12-378/fr/kzg/kzg.go
+++ b/ecc/bls12-378/fr/kzg/kzg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/kzg/kzg_test.go b/ecc/bls12-378/fr/kzg/kzg_test.go
index e92e5ffd3..e5a7e4a4a 100644
--- a/ecc/bls12-378/fr/kzg/kzg_test.go
+++ b/ecc/bls12-378/fr/kzg/kzg_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/kzg/marshal.go b/ecc/bls12-378/fr/kzg/marshal.go
index ff56c7b9e..da4fb6d1b 100644
--- a/ecc/bls12-378/fr/kzg/marshal.go
+++ b/ecc/bls12-378/fr/kzg/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/mimc/doc.go b/ecc/bls12-378/fr/mimc/doc.go
index 497bd40a9..d527ead9e 100644
--- a/ecc/bls12-378/fr/mimc/doc.go
+++ b/ecc/bls12-378/fr/mimc/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/mimc/mimc.go b/ecc/bls12-378/fr/mimc/mimc.go
index f61b46403..d6d6557ec 100644
--- a/ecc/bls12-378/fr/mimc/mimc.go
+++ b/ecc/bls12-378/fr/mimc/mimc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/pedersen/pedersen.go b/ecc/bls12-378/fr/pedersen/pedersen.go
index a526dd71c..65b1cca36 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/pedersen/pedersen_test.go b/ecc/bls12-378/fr/pedersen/pedersen_test.go
index b2119020d..5a873d59a 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/permutation/doc.go b/ecc/bls12-378/fr/permutation/doc.go
index bdf98e6ca..7ef21ffb9 100644
--- a/ecc/bls12-378/fr/permutation/doc.go
+++ b/ecc/bls12-378/fr/permutation/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/permutation/permutation.go b/ecc/bls12-378/fr/permutation/permutation.go
index e10836ec0..53e9676d2 100644
--- a/ecc/bls12-378/fr/permutation/permutation.go
+++ b/ecc/bls12-378/fr/permutation/permutation.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/permutation/permutation_test.go b/ecc/bls12-378/fr/permutation/permutation_test.go
index 8e67b6850..f9aaeac7d 100644
--- a/ecc/bls12-378/fr/permutation/permutation_test.go
+++ b/ecc/bls12-378/fr/permutation/permutation_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/plookup/doc.go b/ecc/bls12-378/fr/plookup/doc.go
index ec4b91287..b3af01968 100644
--- a/ecc/bls12-378/fr/plookup/doc.go
+++ b/ecc/bls12-378/fr/plookup/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/plookup/plookup_test.go b/ecc/bls12-378/fr/plookup/plookup_test.go
index e9cb4eee4..d4e0b25d4 100644
--- a/ecc/bls12-378/fr/plookup/plookup_test.go
+++ b/ecc/bls12-378/fr/plookup/plookup_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/plookup/table.go b/ecc/bls12-378/fr/plookup/table.go
index 7e1d67413..536cfb82e 100644
--- a/ecc/bls12-378/fr/plookup/table.go
+++ b/ecc/bls12-378/fr/plookup/table.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/plookup/vector.go b/ecc/bls12-378/fr/plookup/vector.go
index edc0adfee..478ef56d1 100644
--- a/ecc/bls12-378/fr/plookup/vector.go
+++ b/ecc/bls12-378/fr/plookup/vector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/polynomial/doc.go b/ecc/bls12-378/fr/polynomial/doc.go
index 83479b058..747da41f2 100644
--- a/ecc/bls12-378/fr/polynomial/doc.go
+++ b/ecc/bls12-378/fr/polynomial/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/polynomial/multilin.go b/ecc/bls12-378/fr/polynomial/multilin.go
index 2408407b6..2f916dc2c 100644
--- a/ecc/bls12-378/fr/polynomial/multilin.go
+++ b/ecc/bls12-378/fr/polynomial/multilin.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/polynomial/multilin_test.go b/ecc/bls12-378/fr/polynomial/multilin_test.go
index f5efeb0df..cbc46a4bc 100644
--- a/ecc/bls12-378/fr/polynomial/multilin_test.go
+++ b/ecc/bls12-378/fr/polynomial/multilin_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/polynomial/polynomial.go b/ecc/bls12-378/fr/polynomial/polynomial.go
index b276bdb5e..280896333 100644
--- a/ecc/bls12-378/fr/polynomial/polynomial.go
+++ b/ecc/bls12-378/fr/polynomial/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/polynomial/polynomial_test.go b/ecc/bls12-378/fr/polynomial/polynomial_test.go
index effa4af1b..3a1010960 100644
--- a/ecc/bls12-378/fr/polynomial/polynomial_test.go
+++ b/ecc/bls12-378/fr/polynomial/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/polynomial/pool.go b/ecc/bls12-378/fr/polynomial/pool.go
index 0eeb4d6ef..29f050d88 100644
--- a/ecc/bls12-378/fr/polynomial/pool.go
+++ b/ecc/bls12-378/fr/polynomial/pool.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/sumcheck/sumcheck.go b/ecc/bls12-378/fr/sumcheck/sumcheck.go
index 5638cda10..2ae2f56aa 100644
--- a/ecc/bls12-378/fr/sumcheck/sumcheck.go
+++ b/ecc/bls12-378/fr/sumcheck/sumcheck.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/sumcheck/sumcheck_test.go b/ecc/bls12-378/fr/sumcheck/sumcheck_test.go
index 6867729eb..d03043535 100644
--- a/ecc/bls12-378/fr/sumcheck/sumcheck_test.go
+++ b/ecc/bls12-378/fr/sumcheck/sumcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/fr/test_vector_utils/test_vector_utils.go b/ecc/bls12-378/fr/test_vector_utils/test_vector_utils.go
index 1ab9dbf18..ae3c96c75 100644
--- a/ecc/bls12-378/fr/test_vector_utils/test_vector_utils.go
+++ b/ecc/bls12-378/fr/test_vector_utils/test_vector_utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/g1.go b/ecc/bls12-378/g1.go
index 9c47102f0..19365a3f4 100644
--- a/ecc/bls12-378/g1.go
+++ b/ecc/bls12-378/g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/g1_test.go b/ecc/bls12-378/g1_test.go
index 79308b3c0..672b3f9fa 100644
--- a/ecc/bls12-378/g1_test.go
+++ b/ecc/bls12-378/g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/g2.go b/ecc/bls12-378/g2.go
index 53f44e24e..d9332655b 100644
--- a/ecc/bls12-378/g2.go
+++ b/ecc/bls12-378/g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/g2_test.go b/ecc/bls12-378/g2_test.go
index 2aca6ece1..2d360a2d8 100644
--- a/ecc/bls12-378/g2_test.go
+++ b/ecc/bls12-378/g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/hash_to_g1.go b/ecc/bls12-378/hash_to_g1.go
index 7a2b8bf9a..692e1506e 100644
--- a/ecc/bls12-378/hash_to_g1.go
+++ b/ecc/bls12-378/hash_to_g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/hash_to_g1_test.go b/ecc/bls12-378/hash_to_g1_test.go
index bb5795baf..3a3187f04 100644
--- a/ecc/bls12-378/hash_to_g1_test.go
+++ b/ecc/bls12-378/hash_to_g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/internal/fptower/asm.go b/ecc/bls12-378/internal/fptower/asm.go
index 0ec192019..49751a939 100644
--- a/ecc/bls12-378/internal/fptower/asm.go
+++ b/ecc/bls12-378/internal/fptower/asm.go
@@ -1,7 +1,7 @@
//go:build !noadx
// +build !noadx
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/internal/fptower/asm_noadx.go b/ecc/bls12-378/internal/fptower/asm_noadx.go
index 6a09c11c4..c6a97081f 100644
--- a/ecc/bls12-378/internal/fptower/asm_noadx.go
+++ b/ecc/bls12-378/internal/fptower/asm_noadx.go
@@ -1,7 +1,7 @@
//go:build noadx
// +build noadx
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/internal/fptower/e12.go b/ecc/bls12-378/internal/fptower/e12.go
index 91a5d375d..536837999 100644
--- a/ecc/bls12-378/internal/fptower/e12.go
+++ b/ecc/bls12-378/internal/fptower/e12.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/internal/fptower/e12_test.go b/ecc/bls12-378/internal/fptower/e12_test.go
index c34e1342a..3a8e26766 100644
--- a/ecc/bls12-378/internal/fptower/e12_test.go
+++ b/ecc/bls12-378/internal/fptower/e12_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/internal/fptower/e2.go b/ecc/bls12-378/internal/fptower/e2.go
index e94708585..ff031c8d8 100644
--- a/ecc/bls12-378/internal/fptower/e2.go
+++ b/ecc/bls12-378/internal/fptower/e2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/internal/fptower/e2_amd64.go b/ecc/bls12-378/internal/fptower/e2_amd64.go
index 7145007fa..ac68ffa57 100644
--- a/ecc/bls12-378/internal/fptower/e2_amd64.go
+++ b/ecc/bls12-378/internal/fptower/e2_amd64.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/internal/fptower/e2_fallback.go b/ecc/bls12-378/internal/fptower/e2_fallback.go
index 0ce4d8333..6fe47c411 100644
--- a/ecc/bls12-378/internal/fptower/e2_fallback.go
+++ b/ecc/bls12-378/internal/fptower/e2_fallback.go
@@ -1,7 +1,7 @@
//go:build !amd64
// +build !amd64
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/internal/fptower/e2_test.go b/ecc/bls12-378/internal/fptower/e2_test.go
index edf4c7425..b3ad2558c 100644
--- a/ecc/bls12-378/internal/fptower/e2_test.go
+++ b/ecc/bls12-378/internal/fptower/e2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/internal/fptower/e6.go b/ecc/bls12-378/internal/fptower/e6.go
index 90aba83b2..128007df2 100644
--- a/ecc/bls12-378/internal/fptower/e6.go
+++ b/ecc/bls12-378/internal/fptower/e6.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/internal/fptower/e6_test.go b/ecc/bls12-378/internal/fptower/e6_test.go
index a21bb5ad9..d964c0787 100644
--- a/ecc/bls12-378/internal/fptower/e6_test.go
+++ b/ecc/bls12-378/internal/fptower/e6_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/marshal.go b/ecc/bls12-378/marshal.go
index a69a7b3d0..0e59fd833 100644
--- a/ecc/bls12-378/marshal.go
+++ b/ecc/bls12-378/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/marshal_test.go b/ecc/bls12-378/marshal_test.go
index 4e4b08e3d..dc6263505 100644
--- a/ecc/bls12-378/marshal_test.go
+++ b/ecc/bls12-378/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/multiexp.go b/ecc/bls12-378/multiexp.go
index 30594aeb2..926c013cc 100644
--- a/ecc/bls12-378/multiexp.go
+++ b/ecc/bls12-378/multiexp.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/multiexp_affine.go b/ecc/bls12-378/multiexp_affine.go
index fe7f2d628..22a42a7ef 100644
--- a/ecc/bls12-378/multiexp_affine.go
+++ b/ecc/bls12-378/multiexp_affine.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/multiexp_jacobian.go b/ecc/bls12-378/multiexp_jacobian.go
index 7ebc06921..fe3cd412a 100644
--- a/ecc/bls12-378/multiexp_jacobian.go
+++ b/ecc/bls12-378/multiexp_jacobian.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/multiexp_test.go b/ecc/bls12-378/multiexp_test.go
index f84127642..25a035e5f 100644
--- a/ecc/bls12-378/multiexp_test.go
+++ b/ecc/bls12-378/multiexp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/pairing_test.go b/ecc/bls12-378/pairing_test.go
index 4a3ad4889..c25370465 100644
--- a/ecc/bls12-378/pairing_test.go
+++ b/ecc/bls12-378/pairing_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/twistededwards/curve.go b/ecc/bls12-378/twistededwards/curve.go
index 260f7f74b..dcb550bad 100644
--- a/ecc/bls12-378/twistededwards/curve.go
+++ b/ecc/bls12-378/twistededwards/curve.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/twistededwards/doc.go b/ecc/bls12-378/twistededwards/doc.go
index 584dc49da..4d6f9d5f8 100644
--- a/ecc/bls12-378/twistededwards/doc.go
+++ b/ecc/bls12-378/twistededwards/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/twistededwards/eddsa/doc.go b/ecc/bls12-378/twistededwards/eddsa/doc.go
index af8a37a6c..f05b8ecb1 100644
--- a/ecc/bls12-378/twistededwards/eddsa/doc.go
+++ b/ecc/bls12-378/twistededwards/eddsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/twistededwards/eddsa/eddsa.go b/ecc/bls12-378/twistededwards/eddsa/eddsa.go
index 93507b1bd..6443a7d98 100644
--- a/ecc/bls12-378/twistededwards/eddsa/eddsa.go
+++ b/ecc/bls12-378/twistededwards/eddsa/eddsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go b/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go
index cd91303d3..f01d323de 100644
--- a/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls12-378/twistededwards/eddsa/eddsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/twistededwards/eddsa/marshal.go b/ecc/bls12-378/twistededwards/eddsa/marshal.go
index acf3c4173..89e0a8404 100644
--- a/ecc/bls12-378/twistededwards/eddsa/marshal.go
+++ b/ecc/bls12-378/twistededwards/eddsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/twistededwards/point.go b/ecc/bls12-378/twistededwards/point.go
index 7db08b4cb..70163d676 100644
--- a/ecc/bls12-378/twistededwards/point.go
+++ b/ecc/bls12-378/twistededwards/point.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-378/twistededwards/point_test.go b/ecc/bls12-378/twistededwards/point_test.go
index f5ae6f170..2c50ba610 100644
--- a/ecc/bls12-378/twistededwards/point_test.go
+++ b/ecc/bls12-378/twistededwards/point_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/bandersnatch/curve.go b/ecc/bls12-381/bandersnatch/curve.go
index b6e088bed..e146c9c33 100644
--- a/ecc/bls12-381/bandersnatch/curve.go
+++ b/ecc/bls12-381/bandersnatch/curve.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/bandersnatch/doc.go b/ecc/bls12-381/bandersnatch/doc.go
index 2f219c1fa..39d67510d 100644
--- a/ecc/bls12-381/bandersnatch/doc.go
+++ b/ecc/bls12-381/bandersnatch/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/bandersnatch/eddsa/doc.go b/ecc/bls12-381/bandersnatch/eddsa/doc.go
index af3fe1f93..acd950c59 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/doc.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/bandersnatch/eddsa/eddsa.go b/ecc/bls12-381/bandersnatch/eddsa/eddsa.go
index cf54a5e30..f68b7ce7d 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/eddsa.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/eddsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go b/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
index 7541836fa..a2e08881e 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/eddsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/bandersnatch/eddsa/marshal.go b/ecc/bls12-381/bandersnatch/eddsa/marshal.go
index acf3c4173..89e0a8404 100644
--- a/ecc/bls12-381/bandersnatch/eddsa/marshal.go
+++ b/ecc/bls12-381/bandersnatch/eddsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/bandersnatch/point.go b/ecc/bls12-381/bandersnatch/point.go
index 3c2db7816..6f7bccb08 100644
--- a/ecc/bls12-381/bandersnatch/point.go
+++ b/ecc/bls12-381/bandersnatch/point.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/bandersnatch/point_test.go b/ecc/bls12-381/bandersnatch/point_test.go
index 95cc832be..5365020c3 100644
--- a/ecc/bls12-381/bandersnatch/point_test.go
+++ b/ecc/bls12-381/bandersnatch/point_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/ecdsa/doc.go b/ecc/bls12-381/ecdsa/doc.go
index 860389a54..d8d1f366e 100644
--- a/ecc/bls12-381/ecdsa/doc.go
+++ b/ecc/bls12-381/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/ecdsa/ecdsa.go b/ecc/bls12-381/ecdsa/ecdsa.go
index db5626789..4aea1575c 100644
--- a/ecc/bls12-381/ecdsa/ecdsa.go
+++ b/ecc/bls12-381/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/ecdsa/ecdsa_test.go b/ecc/bls12-381/ecdsa/ecdsa_test.go
index 5f5900232..4a778ae98 100644
--- a/ecc/bls12-381/ecdsa/ecdsa_test.go
+++ b/ecc/bls12-381/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/ecdsa/marshal.go b/ecc/bls12-381/ecdsa/marshal.go
index 72d74c5cb..c0ee0643e 100644
--- a/ecc/bls12-381/ecdsa/marshal.go
+++ b/ecc/bls12-381/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/ecdsa/marshal_test.go b/ecc/bls12-381/ecdsa/marshal_test.go
index 1cf4318ed..1b61b0714 100644
--- a/ecc/bls12-381/ecdsa/marshal_test.go
+++ b/ecc/bls12-381/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/fft/doc.go b/ecc/bls12-381/fr/fft/doc.go
index 3c35170e8..2391a9f63 100644
--- a/ecc/bls12-381/fr/fft/doc.go
+++ b/ecc/bls12-381/fr/fft/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/fft/domain.go b/ecc/bls12-381/fr/fft/domain.go
index 7c5d6bd11..d68cbd5de 100644
--- a/ecc/bls12-381/fr/fft/domain.go
+++ b/ecc/bls12-381/fr/fft/domain.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/fft/domain_test.go b/ecc/bls12-381/fr/fft/domain_test.go
index 14d23dd99..83186cb7c 100644
--- a/ecc/bls12-381/fr/fft/domain_test.go
+++ b/ecc/bls12-381/fr/fft/domain_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/fft/fft.go b/ecc/bls12-381/fr/fft/fft.go
index cd0c2d274..5694deec1 100644
--- a/ecc/bls12-381/fr/fft/fft.go
+++ b/ecc/bls12-381/fr/fft/fft.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/fft/fft_test.go b/ecc/bls12-381/fr/fft/fft_test.go
index ad7139e6e..58ea21799 100644
--- a/ecc/bls12-381/fr/fft/fft_test.go
+++ b/ecc/bls12-381/fr/fft/fft_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/fft/options.go b/ecc/bls12-381/fr/fft/options.go
index 603b76f29..02a6000e5 100644
--- a/ecc/bls12-381/fr/fft/options.go
+++ b/ecc/bls12-381/fr/fft/options.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/fri/doc.go b/ecc/bls12-381/fr/fri/doc.go
index 1a4cc68f3..3333ad41f 100644
--- a/ecc/bls12-381/fr/fri/doc.go
+++ b/ecc/bls12-381/fr/fri/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/fri/fri.go b/ecc/bls12-381/fr/fri/fri.go
index b526bcf38..52bf2091e 100644
--- a/ecc/bls12-381/fr/fri/fri.go
+++ b/ecc/bls12-381/fr/fri/fri.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/fri/fri_test.go b/ecc/bls12-381/fr/fri/fri_test.go
index 084508db0..5e424c0e8 100644
--- a/ecc/bls12-381/fr/fri/fri_test.go
+++ b/ecc/bls12-381/fr/fri/fri_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/gkr/gkr.go b/ecc/bls12-381/fr/gkr/gkr.go
index 2ec5cc7c6..2ad43658a 100644
--- a/ecc/bls12-381/fr/gkr/gkr.go
+++ b/ecc/bls12-381/fr/gkr/gkr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/gkr/gkr_test.go b/ecc/bls12-381/fr/gkr/gkr_test.go
index 091293b58..97851daef 100644
--- a/ecc/bls12-381/fr/gkr/gkr_test.go
+++ b/ecc/bls12-381/fr/gkr/gkr_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/iop/doc.go b/ecc/bls12-381/fr/iop/doc.go
index cd87ef4d7..20f8b1a30 100644
--- a/ecc/bls12-381/fr/iop/doc.go
+++ b/ecc/bls12-381/fr/iop/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/iop/expressions.go b/ecc/bls12-381/fr/iop/expressions.go
index 22c7f4652..b5d7028f8 100644
--- a/ecc/bls12-381/fr/iop/expressions.go
+++ b/ecc/bls12-381/fr/iop/expressions.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/iop/expressions_test.go b/ecc/bls12-381/fr/iop/expressions_test.go
index 7808f8e7e..4174b53ab 100644
--- a/ecc/bls12-381/fr/iop/expressions_test.go
+++ b/ecc/bls12-381/fr/iop/expressions_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/iop/polynomial.go b/ecc/bls12-381/fr/iop/polynomial.go
index 3d8daacdf..7d0694b00 100644
--- a/ecc/bls12-381/fr/iop/polynomial.go
+++ b/ecc/bls12-381/fr/iop/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/iop/polynomial_test.go b/ecc/bls12-381/fr/iop/polynomial_test.go
index de1d26b74..9d4455ead 100644
--- a/ecc/bls12-381/fr/iop/polynomial_test.go
+++ b/ecc/bls12-381/fr/iop/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/iop/quotient.go b/ecc/bls12-381/fr/iop/quotient.go
index 5bd999bc9..84cb272af 100644
--- a/ecc/bls12-381/fr/iop/quotient.go
+++ b/ecc/bls12-381/fr/iop/quotient.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/iop/quotient_test.go b/ecc/bls12-381/fr/iop/quotient_test.go
index 536110a39..c48051e24 100644
--- a/ecc/bls12-381/fr/iop/quotient_test.go
+++ b/ecc/bls12-381/fr/iop/quotient_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/iop/ratios.go b/ecc/bls12-381/fr/iop/ratios.go
index 273096b13..fd66411e9 100644
--- a/ecc/bls12-381/fr/iop/ratios.go
+++ b/ecc/bls12-381/fr/iop/ratios.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/iop/ratios_test.go b/ecc/bls12-381/fr/iop/ratios_test.go
index 07181a539..0c80a1958 100644
--- a/ecc/bls12-381/fr/iop/ratios_test.go
+++ b/ecc/bls12-381/fr/iop/ratios_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/iop/utils.go b/ecc/bls12-381/fr/iop/utils.go
index b1c51bffa..53de1e2be 100644
--- a/ecc/bls12-381/fr/iop/utils.go
+++ b/ecc/bls12-381/fr/iop/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/kzg/doc.go b/ecc/bls12-381/fr/kzg/doc.go
index d8a77e8f6..d1045726f 100644
--- a/ecc/bls12-381/fr/kzg/doc.go
+++ b/ecc/bls12-381/fr/kzg/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/kzg/kzg.go b/ecc/bls12-381/fr/kzg/kzg.go
index 8ca6277e5..63920a1e0 100644
--- a/ecc/bls12-381/fr/kzg/kzg.go
+++ b/ecc/bls12-381/fr/kzg/kzg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/kzg/kzg_test.go b/ecc/bls12-381/fr/kzg/kzg_test.go
index 8e0723bbc..866012f09 100644
--- a/ecc/bls12-381/fr/kzg/kzg_test.go
+++ b/ecc/bls12-381/fr/kzg/kzg_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/kzg/marshal.go b/ecc/bls12-381/fr/kzg/marshal.go
index 52a2e7102..d1f3c725a 100644
--- a/ecc/bls12-381/fr/kzg/marshal.go
+++ b/ecc/bls12-381/fr/kzg/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/mimc/doc.go b/ecc/bls12-381/fr/mimc/doc.go
index 497bd40a9..d527ead9e 100644
--- a/ecc/bls12-381/fr/mimc/doc.go
+++ b/ecc/bls12-381/fr/mimc/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/mimc/mimc.go b/ecc/bls12-381/fr/mimc/mimc.go
index 02221ae18..a004b8b96 100644
--- a/ecc/bls12-381/fr/mimc/mimc.go
+++ b/ecc/bls12-381/fr/mimc/mimc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/pedersen/pedersen.go b/ecc/bls12-381/fr/pedersen/pedersen.go
index e9efb6008..e888e0c25 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/pedersen/pedersen_test.go b/ecc/bls12-381/fr/pedersen/pedersen_test.go
index 78e04273e..653d015e2 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/permutation/doc.go b/ecc/bls12-381/fr/permutation/doc.go
index bdf98e6ca..7ef21ffb9 100644
--- a/ecc/bls12-381/fr/permutation/doc.go
+++ b/ecc/bls12-381/fr/permutation/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/permutation/permutation.go b/ecc/bls12-381/fr/permutation/permutation.go
index 79ac12e44..d1e808a97 100644
--- a/ecc/bls12-381/fr/permutation/permutation.go
+++ b/ecc/bls12-381/fr/permutation/permutation.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/permutation/permutation_test.go b/ecc/bls12-381/fr/permutation/permutation_test.go
index 968772c83..73b1b24fa 100644
--- a/ecc/bls12-381/fr/permutation/permutation_test.go
+++ b/ecc/bls12-381/fr/permutation/permutation_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/plookup/doc.go b/ecc/bls12-381/fr/plookup/doc.go
index ec4b91287..b3af01968 100644
--- a/ecc/bls12-381/fr/plookup/doc.go
+++ b/ecc/bls12-381/fr/plookup/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/plookup/plookup_test.go b/ecc/bls12-381/fr/plookup/plookup_test.go
index 27627c623..c2d27f7e9 100644
--- a/ecc/bls12-381/fr/plookup/plookup_test.go
+++ b/ecc/bls12-381/fr/plookup/plookup_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/plookup/table.go b/ecc/bls12-381/fr/plookup/table.go
index 3b1190776..f8f8cf6c5 100644
--- a/ecc/bls12-381/fr/plookup/table.go
+++ b/ecc/bls12-381/fr/plookup/table.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/plookup/vector.go b/ecc/bls12-381/fr/plookup/vector.go
index 7d2e6251b..f7ab44b4c 100644
--- a/ecc/bls12-381/fr/plookup/vector.go
+++ b/ecc/bls12-381/fr/plookup/vector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/polynomial/doc.go b/ecc/bls12-381/fr/polynomial/doc.go
index 83479b058..747da41f2 100644
--- a/ecc/bls12-381/fr/polynomial/doc.go
+++ b/ecc/bls12-381/fr/polynomial/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/polynomial/multilin.go b/ecc/bls12-381/fr/polynomial/multilin.go
index 03f9598cd..91d205e8e 100644
--- a/ecc/bls12-381/fr/polynomial/multilin.go
+++ b/ecc/bls12-381/fr/polynomial/multilin.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/polynomial/multilin_test.go b/ecc/bls12-381/fr/polynomial/multilin_test.go
index b2bf0378f..70cf0daf6 100644
--- a/ecc/bls12-381/fr/polynomial/multilin_test.go
+++ b/ecc/bls12-381/fr/polynomial/multilin_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/polynomial/polynomial.go b/ecc/bls12-381/fr/polynomial/polynomial.go
index bda60c788..ca0956eb8 100644
--- a/ecc/bls12-381/fr/polynomial/polynomial.go
+++ b/ecc/bls12-381/fr/polynomial/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/polynomial/polynomial_test.go b/ecc/bls12-381/fr/polynomial/polynomial_test.go
index 27f4a2f04..bdd50748c 100644
--- a/ecc/bls12-381/fr/polynomial/polynomial_test.go
+++ b/ecc/bls12-381/fr/polynomial/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/polynomial/pool.go b/ecc/bls12-381/fr/polynomial/pool.go
index 41801037e..5738925ca 100644
--- a/ecc/bls12-381/fr/polynomial/pool.go
+++ b/ecc/bls12-381/fr/polynomial/pool.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/sumcheck/sumcheck.go b/ecc/bls12-381/fr/sumcheck/sumcheck.go
index a39dc48aa..ee3675773 100644
--- a/ecc/bls12-381/fr/sumcheck/sumcheck.go
+++ b/ecc/bls12-381/fr/sumcheck/sumcheck.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/sumcheck/sumcheck_test.go b/ecc/bls12-381/fr/sumcheck/sumcheck_test.go
index b62b8a915..778b9ca8d 100644
--- a/ecc/bls12-381/fr/sumcheck/sumcheck_test.go
+++ b/ecc/bls12-381/fr/sumcheck/sumcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/fr/test_vector_utils/test_vector_utils.go b/ecc/bls12-381/fr/test_vector_utils/test_vector_utils.go
index 5565a78d3..f18151f6b 100644
--- a/ecc/bls12-381/fr/test_vector_utils/test_vector_utils.go
+++ b/ecc/bls12-381/fr/test_vector_utils/test_vector_utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/g1.go b/ecc/bls12-381/g1.go
index 33538de79..19e24ce9d 100644
--- a/ecc/bls12-381/g1.go
+++ b/ecc/bls12-381/g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/g1_test.go b/ecc/bls12-381/g1_test.go
index 61ef267da..586d9d683 100644
--- a/ecc/bls12-381/g1_test.go
+++ b/ecc/bls12-381/g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/g2.go b/ecc/bls12-381/g2.go
index 7cb3b0926..563339274 100644
--- a/ecc/bls12-381/g2.go
+++ b/ecc/bls12-381/g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/g2_test.go b/ecc/bls12-381/g2_test.go
index 3882c86fc..4905c7b91 100644
--- a/ecc/bls12-381/g2_test.go
+++ b/ecc/bls12-381/g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/hash_to_g1.go b/ecc/bls12-381/hash_to_g1.go
index d47d1f7ec..715278283 100644
--- a/ecc/bls12-381/hash_to_g1.go
+++ b/ecc/bls12-381/hash_to_g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/hash_to_g1_test.go b/ecc/bls12-381/hash_to_g1_test.go
index 6253f705c..bb9dd5443 100644
--- a/ecc/bls12-381/hash_to_g1_test.go
+++ b/ecc/bls12-381/hash_to_g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/hash_to_g2.go b/ecc/bls12-381/hash_to_g2.go
index 0deb5eb7e..4feafbfb1 100644
--- a/ecc/bls12-381/hash_to_g2.go
+++ b/ecc/bls12-381/hash_to_g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/hash_to_g2_test.go b/ecc/bls12-381/hash_to_g2_test.go
index ee12cf792..cb4fb085e 100644
--- a/ecc/bls12-381/hash_to_g2_test.go
+++ b/ecc/bls12-381/hash_to_g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/internal/fptower/asm.go b/ecc/bls12-381/internal/fptower/asm.go
index 0ec192019..49751a939 100644
--- a/ecc/bls12-381/internal/fptower/asm.go
+++ b/ecc/bls12-381/internal/fptower/asm.go
@@ -1,7 +1,7 @@
//go:build !noadx
// +build !noadx
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/internal/fptower/asm_noadx.go b/ecc/bls12-381/internal/fptower/asm_noadx.go
index 6a09c11c4..c6a97081f 100644
--- a/ecc/bls12-381/internal/fptower/asm_noadx.go
+++ b/ecc/bls12-381/internal/fptower/asm_noadx.go
@@ -1,7 +1,7 @@
//go:build noadx
// +build noadx
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/internal/fptower/e12.go b/ecc/bls12-381/internal/fptower/e12.go
index b9f93b6b0..1ccfa6c70 100644
--- a/ecc/bls12-381/internal/fptower/e12.go
+++ b/ecc/bls12-381/internal/fptower/e12.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/internal/fptower/e12_test.go b/ecc/bls12-381/internal/fptower/e12_test.go
index 715223f84..4552be864 100644
--- a/ecc/bls12-381/internal/fptower/e12_test.go
+++ b/ecc/bls12-381/internal/fptower/e12_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/internal/fptower/e2.go b/ecc/bls12-381/internal/fptower/e2.go
index 6c873ce36..0390e7e4b 100644
--- a/ecc/bls12-381/internal/fptower/e2.go
+++ b/ecc/bls12-381/internal/fptower/e2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/internal/fptower/e2_amd64.go b/ecc/bls12-381/internal/fptower/e2_amd64.go
index 471a47bd6..5121f7cca 100644
--- a/ecc/bls12-381/internal/fptower/e2_amd64.go
+++ b/ecc/bls12-381/internal/fptower/e2_amd64.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/internal/fptower/e2_fallback.go b/ecc/bls12-381/internal/fptower/e2_fallback.go
index 0ce4d8333..6fe47c411 100644
--- a/ecc/bls12-381/internal/fptower/e2_fallback.go
+++ b/ecc/bls12-381/internal/fptower/e2_fallback.go
@@ -1,7 +1,7 @@
//go:build !amd64
// +build !amd64
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/internal/fptower/e2_test.go b/ecc/bls12-381/internal/fptower/e2_test.go
index 4d8d88291..6938e67b0 100644
--- a/ecc/bls12-381/internal/fptower/e2_test.go
+++ b/ecc/bls12-381/internal/fptower/e2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/internal/fptower/e6.go b/ecc/bls12-381/internal/fptower/e6.go
index 90aba83b2..128007df2 100644
--- a/ecc/bls12-381/internal/fptower/e6.go
+++ b/ecc/bls12-381/internal/fptower/e6.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/internal/fptower/e6_test.go b/ecc/bls12-381/internal/fptower/e6_test.go
index 4b6d1e7e7..fda2f2283 100644
--- a/ecc/bls12-381/internal/fptower/e6_test.go
+++ b/ecc/bls12-381/internal/fptower/e6_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/marshal.go b/ecc/bls12-381/marshal.go
index dc1e76eec..099f884b4 100644
--- a/ecc/bls12-381/marshal.go
+++ b/ecc/bls12-381/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/marshal_test.go b/ecc/bls12-381/marshal_test.go
index 3c0d03376..6588b6a9b 100644
--- a/ecc/bls12-381/marshal_test.go
+++ b/ecc/bls12-381/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/multiexp.go b/ecc/bls12-381/multiexp.go
index 8462d8abe..cdc96a2b6 100644
--- a/ecc/bls12-381/multiexp.go
+++ b/ecc/bls12-381/multiexp.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/multiexp_affine.go b/ecc/bls12-381/multiexp_affine.go
index 799457d18..285da7284 100644
--- a/ecc/bls12-381/multiexp_affine.go
+++ b/ecc/bls12-381/multiexp_affine.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/multiexp_jacobian.go b/ecc/bls12-381/multiexp_jacobian.go
index 169f32034..9abe78b33 100644
--- a/ecc/bls12-381/multiexp_jacobian.go
+++ b/ecc/bls12-381/multiexp_jacobian.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/multiexp_test.go b/ecc/bls12-381/multiexp_test.go
index cf4676b2e..8cd076b09 100644
--- a/ecc/bls12-381/multiexp_test.go
+++ b/ecc/bls12-381/multiexp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/pairing_test.go b/ecc/bls12-381/pairing_test.go
index f57e4572c..b864d1c79 100644
--- a/ecc/bls12-381/pairing_test.go
+++ b/ecc/bls12-381/pairing_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/twistededwards/curve.go b/ecc/bls12-381/twistededwards/curve.go
index 652deca0a..7de87ac42 100644
--- a/ecc/bls12-381/twistededwards/curve.go
+++ b/ecc/bls12-381/twistededwards/curve.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/twistededwards/doc.go b/ecc/bls12-381/twistededwards/doc.go
index a6afbcbb7..4ec54375c 100644
--- a/ecc/bls12-381/twistededwards/doc.go
+++ b/ecc/bls12-381/twistededwards/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/twistededwards/eddsa/doc.go b/ecc/bls12-381/twistededwards/eddsa/doc.go
index af3fe1f93..acd950c59 100644
--- a/ecc/bls12-381/twistededwards/eddsa/doc.go
+++ b/ecc/bls12-381/twistededwards/eddsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/twistededwards/eddsa/eddsa.go b/ecc/bls12-381/twistededwards/eddsa/eddsa.go
index cf54a5e30..f68b7ce7d 100644
--- a/ecc/bls12-381/twistededwards/eddsa/eddsa.go
+++ b/ecc/bls12-381/twistededwards/eddsa/eddsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go b/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go
index 7541836fa..a2e08881e 100644
--- a/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls12-381/twistededwards/eddsa/eddsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/twistededwards/eddsa/marshal.go b/ecc/bls12-381/twistededwards/eddsa/marshal.go
index acf3c4173..89e0a8404 100644
--- a/ecc/bls12-381/twistededwards/eddsa/marshal.go
+++ b/ecc/bls12-381/twistededwards/eddsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/twistededwards/point.go b/ecc/bls12-381/twistededwards/point.go
index ec42a001a..a47c4b833 100644
--- a/ecc/bls12-381/twistededwards/point.go
+++ b/ecc/bls12-381/twistededwards/point.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls12-381/twistededwards/point_test.go b/ecc/bls12-381/twistededwards/point_test.go
index b3af05cc5..a024ad41c 100644
--- a/ecc/bls12-381/twistededwards/point_test.go
+++ b/ecc/bls12-381/twistededwards/point_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/ecdsa/doc.go b/ecc/bls24-315/ecdsa/doc.go
index f06ac91fc..52ee2d220 100644
--- a/ecc/bls24-315/ecdsa/doc.go
+++ b/ecc/bls24-315/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/ecdsa/ecdsa.go b/ecc/bls24-315/ecdsa/ecdsa.go
index ce29aaaef..d9b7362d0 100644
--- a/ecc/bls24-315/ecdsa/ecdsa.go
+++ b/ecc/bls24-315/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/ecdsa/ecdsa_test.go b/ecc/bls24-315/ecdsa/ecdsa_test.go
index 901b5c16d..4af85de2d 100644
--- a/ecc/bls24-315/ecdsa/ecdsa_test.go
+++ b/ecc/bls24-315/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/ecdsa/marshal.go b/ecc/bls24-315/ecdsa/marshal.go
index 72d74c5cb..c0ee0643e 100644
--- a/ecc/bls24-315/ecdsa/marshal.go
+++ b/ecc/bls24-315/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/ecdsa/marshal_test.go b/ecc/bls24-315/ecdsa/marshal_test.go
index c8e427470..fb5f453b4 100644
--- a/ecc/bls24-315/ecdsa/marshal_test.go
+++ b/ecc/bls24-315/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/fft/doc.go b/ecc/bls24-315/fr/fft/doc.go
index 3c35170e8..2391a9f63 100644
--- a/ecc/bls24-315/fr/fft/doc.go
+++ b/ecc/bls24-315/fr/fft/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/fft/domain.go b/ecc/bls24-315/fr/fft/domain.go
index 39f447b33..bf536848c 100644
--- a/ecc/bls24-315/fr/fft/domain.go
+++ b/ecc/bls24-315/fr/fft/domain.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/fft/domain_test.go b/ecc/bls24-315/fr/fft/domain_test.go
index 14d23dd99..83186cb7c 100644
--- a/ecc/bls24-315/fr/fft/domain_test.go
+++ b/ecc/bls24-315/fr/fft/domain_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/fft/fft.go b/ecc/bls24-315/fr/fft/fft.go
index 529095fc7..60277eeae 100644
--- a/ecc/bls24-315/fr/fft/fft.go
+++ b/ecc/bls24-315/fr/fft/fft.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/fft/fft_test.go b/ecc/bls24-315/fr/fft/fft_test.go
index 933db53f0..7b94824f0 100644
--- a/ecc/bls24-315/fr/fft/fft_test.go
+++ b/ecc/bls24-315/fr/fft/fft_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/fft/options.go b/ecc/bls24-315/fr/fft/options.go
index 603b76f29..02a6000e5 100644
--- a/ecc/bls24-315/fr/fft/options.go
+++ b/ecc/bls24-315/fr/fft/options.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/fri/doc.go b/ecc/bls24-315/fr/fri/doc.go
index 1a4cc68f3..3333ad41f 100644
--- a/ecc/bls24-315/fr/fri/doc.go
+++ b/ecc/bls24-315/fr/fri/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/fri/fri.go b/ecc/bls24-315/fr/fri/fri.go
index 7db8229f1..b117c0235 100644
--- a/ecc/bls24-315/fr/fri/fri.go
+++ b/ecc/bls24-315/fr/fri/fri.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/fri/fri_test.go b/ecc/bls24-315/fr/fri/fri_test.go
index eb063bca2..7bdb3538b 100644
--- a/ecc/bls24-315/fr/fri/fri_test.go
+++ b/ecc/bls24-315/fr/fri/fri_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/gkr/gkr.go b/ecc/bls24-315/fr/gkr/gkr.go
index 58e34cc15..97eb4f0f7 100644
--- a/ecc/bls24-315/fr/gkr/gkr.go
+++ b/ecc/bls24-315/fr/gkr/gkr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/gkr/gkr_test.go b/ecc/bls24-315/fr/gkr/gkr_test.go
index 32fe10261..5351e5157 100644
--- a/ecc/bls24-315/fr/gkr/gkr_test.go
+++ b/ecc/bls24-315/fr/gkr/gkr_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/iop/doc.go b/ecc/bls24-315/fr/iop/doc.go
index cd87ef4d7..20f8b1a30 100644
--- a/ecc/bls24-315/fr/iop/doc.go
+++ b/ecc/bls24-315/fr/iop/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/iop/expressions.go b/ecc/bls24-315/fr/iop/expressions.go
index 32966a197..f027a25f1 100644
--- a/ecc/bls24-315/fr/iop/expressions.go
+++ b/ecc/bls24-315/fr/iop/expressions.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/iop/expressions_test.go b/ecc/bls24-315/fr/iop/expressions_test.go
index 9b15f749d..2bac441fd 100644
--- a/ecc/bls24-315/fr/iop/expressions_test.go
+++ b/ecc/bls24-315/fr/iop/expressions_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/iop/polynomial.go b/ecc/bls24-315/fr/iop/polynomial.go
index ec6fd8d5e..8508b0783 100644
--- a/ecc/bls24-315/fr/iop/polynomial.go
+++ b/ecc/bls24-315/fr/iop/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/iop/polynomial_test.go b/ecc/bls24-315/fr/iop/polynomial_test.go
index 06ab8ed36..ca52163f3 100644
--- a/ecc/bls24-315/fr/iop/polynomial_test.go
+++ b/ecc/bls24-315/fr/iop/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/iop/quotient.go b/ecc/bls24-315/fr/iop/quotient.go
index 7e8cbb353..b86dd3487 100644
--- a/ecc/bls24-315/fr/iop/quotient.go
+++ b/ecc/bls24-315/fr/iop/quotient.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/iop/quotient_test.go b/ecc/bls24-315/fr/iop/quotient_test.go
index 1e064d552..6514a6875 100644
--- a/ecc/bls24-315/fr/iop/quotient_test.go
+++ b/ecc/bls24-315/fr/iop/quotient_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/iop/ratios.go b/ecc/bls24-315/fr/iop/ratios.go
index e4249d012..3a5546ee0 100644
--- a/ecc/bls24-315/fr/iop/ratios.go
+++ b/ecc/bls24-315/fr/iop/ratios.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/iop/ratios_test.go b/ecc/bls24-315/fr/iop/ratios_test.go
index e36f9ba03..affc88f47 100644
--- a/ecc/bls24-315/fr/iop/ratios_test.go
+++ b/ecc/bls24-315/fr/iop/ratios_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/iop/utils.go b/ecc/bls24-315/fr/iop/utils.go
index ee23b9feb..cc44e91d0 100644
--- a/ecc/bls24-315/fr/iop/utils.go
+++ b/ecc/bls24-315/fr/iop/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/kzg/doc.go b/ecc/bls24-315/fr/kzg/doc.go
index d8a77e8f6..d1045726f 100644
--- a/ecc/bls24-315/fr/kzg/doc.go
+++ b/ecc/bls24-315/fr/kzg/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/kzg/kzg.go b/ecc/bls24-315/fr/kzg/kzg.go
index a948f9007..35a6a31f6 100644
--- a/ecc/bls24-315/fr/kzg/kzg.go
+++ b/ecc/bls24-315/fr/kzg/kzg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/kzg/kzg_test.go b/ecc/bls24-315/fr/kzg/kzg_test.go
index 5eb15fef1..ceece8acc 100644
--- a/ecc/bls24-315/fr/kzg/kzg_test.go
+++ b/ecc/bls24-315/fr/kzg/kzg_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/kzg/marshal.go b/ecc/bls24-315/fr/kzg/marshal.go
index d6785b1d7..4160a719f 100644
--- a/ecc/bls24-315/fr/kzg/marshal.go
+++ b/ecc/bls24-315/fr/kzg/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/mimc/doc.go b/ecc/bls24-315/fr/mimc/doc.go
index 497bd40a9..d527ead9e 100644
--- a/ecc/bls24-315/fr/mimc/doc.go
+++ b/ecc/bls24-315/fr/mimc/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/mimc/mimc.go b/ecc/bls24-315/fr/mimc/mimc.go
index acb69e3e6..345c8b8eb 100644
--- a/ecc/bls24-315/fr/mimc/mimc.go
+++ b/ecc/bls24-315/fr/mimc/mimc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/pedersen/pedersen.go b/ecc/bls24-315/fr/pedersen/pedersen.go
index 0580e8449..e4a2f4adb 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/pedersen/pedersen_test.go b/ecc/bls24-315/fr/pedersen/pedersen_test.go
index 475026061..18cc0b853 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen_test.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/permutation/doc.go b/ecc/bls24-315/fr/permutation/doc.go
index bdf98e6ca..7ef21ffb9 100644
--- a/ecc/bls24-315/fr/permutation/doc.go
+++ b/ecc/bls24-315/fr/permutation/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/permutation/permutation.go b/ecc/bls24-315/fr/permutation/permutation.go
index 15ba2ecc3..5d077731f 100644
--- a/ecc/bls24-315/fr/permutation/permutation.go
+++ b/ecc/bls24-315/fr/permutation/permutation.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/permutation/permutation_test.go b/ecc/bls24-315/fr/permutation/permutation_test.go
index 73de6a0c5..baff953c8 100644
--- a/ecc/bls24-315/fr/permutation/permutation_test.go
+++ b/ecc/bls24-315/fr/permutation/permutation_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/plookup/doc.go b/ecc/bls24-315/fr/plookup/doc.go
index ec4b91287..b3af01968 100644
--- a/ecc/bls24-315/fr/plookup/doc.go
+++ b/ecc/bls24-315/fr/plookup/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/plookup/plookup_test.go b/ecc/bls24-315/fr/plookup/plookup_test.go
index d7b70587c..aa3c14dbb 100644
--- a/ecc/bls24-315/fr/plookup/plookup_test.go
+++ b/ecc/bls24-315/fr/plookup/plookup_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/plookup/table.go b/ecc/bls24-315/fr/plookup/table.go
index cf2cced57..534cd1c61 100644
--- a/ecc/bls24-315/fr/plookup/table.go
+++ b/ecc/bls24-315/fr/plookup/table.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/plookup/vector.go b/ecc/bls24-315/fr/plookup/vector.go
index 7fda13b9c..cdf1fa9e4 100644
--- a/ecc/bls24-315/fr/plookup/vector.go
+++ b/ecc/bls24-315/fr/plookup/vector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/polynomial/doc.go b/ecc/bls24-315/fr/polynomial/doc.go
index 83479b058..747da41f2 100644
--- a/ecc/bls24-315/fr/polynomial/doc.go
+++ b/ecc/bls24-315/fr/polynomial/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/polynomial/multilin.go b/ecc/bls24-315/fr/polynomial/multilin.go
index 504fc69d1..8cc02bb75 100644
--- a/ecc/bls24-315/fr/polynomial/multilin.go
+++ b/ecc/bls24-315/fr/polynomial/multilin.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/polynomial/multilin_test.go b/ecc/bls24-315/fr/polynomial/multilin_test.go
index 9d3dcf0f7..196534466 100644
--- a/ecc/bls24-315/fr/polynomial/multilin_test.go
+++ b/ecc/bls24-315/fr/polynomial/multilin_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/polynomial/polynomial.go b/ecc/bls24-315/fr/polynomial/polynomial.go
index b54fa5a60..81064b814 100644
--- a/ecc/bls24-315/fr/polynomial/polynomial.go
+++ b/ecc/bls24-315/fr/polynomial/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/polynomial/polynomial_test.go b/ecc/bls24-315/fr/polynomial/polynomial_test.go
index b71f20093..37143c936 100644
--- a/ecc/bls24-315/fr/polynomial/polynomial_test.go
+++ b/ecc/bls24-315/fr/polynomial/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/polynomial/pool.go b/ecc/bls24-315/fr/polynomial/pool.go
index f260426e0..fee1279a9 100644
--- a/ecc/bls24-315/fr/polynomial/pool.go
+++ b/ecc/bls24-315/fr/polynomial/pool.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/sumcheck/sumcheck.go b/ecc/bls24-315/fr/sumcheck/sumcheck.go
index 54b1dd785..ba4f2c1eb 100644
--- a/ecc/bls24-315/fr/sumcheck/sumcheck.go
+++ b/ecc/bls24-315/fr/sumcheck/sumcheck.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/sumcheck/sumcheck_test.go b/ecc/bls24-315/fr/sumcheck/sumcheck_test.go
index cfcaee5e9..f6fda9167 100644
--- a/ecc/bls24-315/fr/sumcheck/sumcheck_test.go
+++ b/ecc/bls24-315/fr/sumcheck/sumcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/fr/test_vector_utils/test_vector_utils.go b/ecc/bls24-315/fr/test_vector_utils/test_vector_utils.go
index a6be6d45e..aba26e80d 100644
--- a/ecc/bls24-315/fr/test_vector_utils/test_vector_utils.go
+++ b/ecc/bls24-315/fr/test_vector_utils/test_vector_utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/g1.go b/ecc/bls24-315/g1.go
index 83426d4e9..0195f4d09 100644
--- a/ecc/bls24-315/g1.go
+++ b/ecc/bls24-315/g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/g1_test.go b/ecc/bls24-315/g1_test.go
index 080fdd33c..7251a9e2e 100644
--- a/ecc/bls24-315/g1_test.go
+++ b/ecc/bls24-315/g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/g2.go b/ecc/bls24-315/g2.go
index d73145d73..99937f729 100644
--- a/ecc/bls24-315/g2.go
+++ b/ecc/bls24-315/g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/g2_test.go b/ecc/bls24-315/g2_test.go
index 785606e1f..6a98aa51e 100644
--- a/ecc/bls24-315/g2_test.go
+++ b/ecc/bls24-315/g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/hash_to_g1.go b/ecc/bls24-315/hash_to_g1.go
index 5b507ea88..396678cc5 100644
--- a/ecc/bls24-315/hash_to_g1.go
+++ b/ecc/bls24-315/hash_to_g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/hash_to_g1_test.go b/ecc/bls24-315/hash_to_g1_test.go
index af66a2c63..f7349347a 100644
--- a/ecc/bls24-315/hash_to_g1_test.go
+++ b/ecc/bls24-315/hash_to_g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/marshal.go b/ecc/bls24-315/marshal.go
index 0b22441ef..c97c8d23a 100644
--- a/ecc/bls24-315/marshal.go
+++ b/ecc/bls24-315/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/marshal_test.go b/ecc/bls24-315/marshal_test.go
index e5c665fa0..92556b7b7 100644
--- a/ecc/bls24-315/marshal_test.go
+++ b/ecc/bls24-315/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/multiexp.go b/ecc/bls24-315/multiexp.go
index a705a1e10..7c708411f 100644
--- a/ecc/bls24-315/multiexp.go
+++ b/ecc/bls24-315/multiexp.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/multiexp_affine.go b/ecc/bls24-315/multiexp_affine.go
index 7bfb33351..c80499109 100644
--- a/ecc/bls24-315/multiexp_affine.go
+++ b/ecc/bls24-315/multiexp_affine.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/multiexp_jacobian.go b/ecc/bls24-315/multiexp_jacobian.go
index e7636a28d..eeeb19680 100644
--- a/ecc/bls24-315/multiexp_jacobian.go
+++ b/ecc/bls24-315/multiexp_jacobian.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/multiexp_test.go b/ecc/bls24-315/multiexp_test.go
index 7a6a2e75e..0492475b3 100644
--- a/ecc/bls24-315/multiexp_test.go
+++ b/ecc/bls24-315/multiexp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/pairing_test.go b/ecc/bls24-315/pairing_test.go
index 0d5611404..a197a7490 100644
--- a/ecc/bls24-315/pairing_test.go
+++ b/ecc/bls24-315/pairing_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/twistededwards/curve.go b/ecc/bls24-315/twistededwards/curve.go
index 63402b557..4dd14ca17 100644
--- a/ecc/bls24-315/twistededwards/curve.go
+++ b/ecc/bls24-315/twistededwards/curve.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/twistededwards/doc.go b/ecc/bls24-315/twistededwards/doc.go
index 7f1584701..21a3ed50b 100644
--- a/ecc/bls24-315/twistededwards/doc.go
+++ b/ecc/bls24-315/twistededwards/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/twistededwards/eddsa/doc.go b/ecc/bls24-315/twistededwards/eddsa/doc.go
index 1c5a95464..f74978718 100644
--- a/ecc/bls24-315/twistededwards/eddsa/doc.go
+++ b/ecc/bls24-315/twistededwards/eddsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/twistededwards/eddsa/eddsa.go b/ecc/bls24-315/twistededwards/eddsa/eddsa.go
index 2370508c7..5f831c2fc 100644
--- a/ecc/bls24-315/twistededwards/eddsa/eddsa.go
+++ b/ecc/bls24-315/twistededwards/eddsa/eddsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go b/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go
index a0cc2a163..521c0e802 100644
--- a/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls24-315/twistededwards/eddsa/eddsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/twistededwards/eddsa/marshal.go b/ecc/bls24-315/twistededwards/eddsa/marshal.go
index acf3c4173..89e0a8404 100644
--- a/ecc/bls24-315/twistededwards/eddsa/marshal.go
+++ b/ecc/bls24-315/twistededwards/eddsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/twistededwards/point.go b/ecc/bls24-315/twistededwards/point.go
index a460738f3..da16d7f27 100644
--- a/ecc/bls24-315/twistededwards/point.go
+++ b/ecc/bls24-315/twistededwards/point.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-315/twistededwards/point_test.go b/ecc/bls24-315/twistededwards/point_test.go
index 3f0a43244..27e9c2c8a 100644
--- a/ecc/bls24-315/twistededwards/point_test.go
+++ b/ecc/bls24-315/twistededwards/point_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/ecdsa/doc.go b/ecc/bls24-317/ecdsa/doc.go
index 52471c4cb..71b137748 100644
--- a/ecc/bls24-317/ecdsa/doc.go
+++ b/ecc/bls24-317/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/ecdsa/ecdsa.go b/ecc/bls24-317/ecdsa/ecdsa.go
index 19560eec4..add547cb2 100644
--- a/ecc/bls24-317/ecdsa/ecdsa.go
+++ b/ecc/bls24-317/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/ecdsa/ecdsa_test.go b/ecc/bls24-317/ecdsa/ecdsa_test.go
index 6a4561895..f29b60295 100644
--- a/ecc/bls24-317/ecdsa/ecdsa_test.go
+++ b/ecc/bls24-317/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/ecdsa/marshal.go b/ecc/bls24-317/ecdsa/marshal.go
index 72d74c5cb..c0ee0643e 100644
--- a/ecc/bls24-317/ecdsa/marshal.go
+++ b/ecc/bls24-317/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/ecdsa/marshal_test.go b/ecc/bls24-317/ecdsa/marshal_test.go
index 1d04d711d..88e52beb1 100644
--- a/ecc/bls24-317/ecdsa/marshal_test.go
+++ b/ecc/bls24-317/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/fft/doc.go b/ecc/bls24-317/fr/fft/doc.go
index 3c35170e8..2391a9f63 100644
--- a/ecc/bls24-317/fr/fft/doc.go
+++ b/ecc/bls24-317/fr/fft/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/fft/domain.go b/ecc/bls24-317/fr/fft/domain.go
index 11a7bcab9..0cac5339f 100644
--- a/ecc/bls24-317/fr/fft/domain.go
+++ b/ecc/bls24-317/fr/fft/domain.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/fft/domain_test.go b/ecc/bls24-317/fr/fft/domain_test.go
index 14d23dd99..83186cb7c 100644
--- a/ecc/bls24-317/fr/fft/domain_test.go
+++ b/ecc/bls24-317/fr/fft/domain_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/fft/fft.go b/ecc/bls24-317/fr/fft/fft.go
index f0dfe7647..44273967c 100644
--- a/ecc/bls24-317/fr/fft/fft.go
+++ b/ecc/bls24-317/fr/fft/fft.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/fft/fft_test.go b/ecc/bls24-317/fr/fft/fft_test.go
index 9c98d3e08..d8b62eaa8 100644
--- a/ecc/bls24-317/fr/fft/fft_test.go
+++ b/ecc/bls24-317/fr/fft/fft_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/fft/options.go b/ecc/bls24-317/fr/fft/options.go
index 603b76f29..02a6000e5 100644
--- a/ecc/bls24-317/fr/fft/options.go
+++ b/ecc/bls24-317/fr/fft/options.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/fri/doc.go b/ecc/bls24-317/fr/fri/doc.go
index 1a4cc68f3..3333ad41f 100644
--- a/ecc/bls24-317/fr/fri/doc.go
+++ b/ecc/bls24-317/fr/fri/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/fri/fri.go b/ecc/bls24-317/fr/fri/fri.go
index 0ea7a0d9d..135cfb127 100644
--- a/ecc/bls24-317/fr/fri/fri.go
+++ b/ecc/bls24-317/fr/fri/fri.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/fri/fri_test.go b/ecc/bls24-317/fr/fri/fri_test.go
index b08c37c7a..959d801c6 100644
--- a/ecc/bls24-317/fr/fri/fri_test.go
+++ b/ecc/bls24-317/fr/fri/fri_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/gkr/gkr.go b/ecc/bls24-317/fr/gkr/gkr.go
index 3e692ec34..43e0fe5ca 100644
--- a/ecc/bls24-317/fr/gkr/gkr.go
+++ b/ecc/bls24-317/fr/gkr/gkr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/gkr/gkr_test.go b/ecc/bls24-317/fr/gkr/gkr_test.go
index de72508f9..6e8f7e51d 100644
--- a/ecc/bls24-317/fr/gkr/gkr_test.go
+++ b/ecc/bls24-317/fr/gkr/gkr_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/iop/doc.go b/ecc/bls24-317/fr/iop/doc.go
index cd87ef4d7..20f8b1a30 100644
--- a/ecc/bls24-317/fr/iop/doc.go
+++ b/ecc/bls24-317/fr/iop/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/iop/expressions.go b/ecc/bls24-317/fr/iop/expressions.go
index aac3e2e54..706d5d3c5 100644
--- a/ecc/bls24-317/fr/iop/expressions.go
+++ b/ecc/bls24-317/fr/iop/expressions.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/iop/expressions_test.go b/ecc/bls24-317/fr/iop/expressions_test.go
index cb042fa7c..b8930d68d 100644
--- a/ecc/bls24-317/fr/iop/expressions_test.go
+++ b/ecc/bls24-317/fr/iop/expressions_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/iop/polynomial.go b/ecc/bls24-317/fr/iop/polynomial.go
index 43732836d..9868bad32 100644
--- a/ecc/bls24-317/fr/iop/polynomial.go
+++ b/ecc/bls24-317/fr/iop/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/iop/polynomial_test.go b/ecc/bls24-317/fr/iop/polynomial_test.go
index dda6d39d8..9e3524f07 100644
--- a/ecc/bls24-317/fr/iop/polynomial_test.go
+++ b/ecc/bls24-317/fr/iop/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/iop/quotient.go b/ecc/bls24-317/fr/iop/quotient.go
index d28e4ae9e..0ad638ccc 100644
--- a/ecc/bls24-317/fr/iop/quotient.go
+++ b/ecc/bls24-317/fr/iop/quotient.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/iop/quotient_test.go b/ecc/bls24-317/fr/iop/quotient_test.go
index ed5626204..e8442f1bf 100644
--- a/ecc/bls24-317/fr/iop/quotient_test.go
+++ b/ecc/bls24-317/fr/iop/quotient_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/iop/ratios.go b/ecc/bls24-317/fr/iop/ratios.go
index beb4c94ba..a7503bd8a 100644
--- a/ecc/bls24-317/fr/iop/ratios.go
+++ b/ecc/bls24-317/fr/iop/ratios.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/iop/ratios_test.go b/ecc/bls24-317/fr/iop/ratios_test.go
index 2ec550c13..bb70bc686 100644
--- a/ecc/bls24-317/fr/iop/ratios_test.go
+++ b/ecc/bls24-317/fr/iop/ratios_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/iop/utils.go b/ecc/bls24-317/fr/iop/utils.go
index 10285427d..edbffb465 100644
--- a/ecc/bls24-317/fr/iop/utils.go
+++ b/ecc/bls24-317/fr/iop/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/kzg/doc.go b/ecc/bls24-317/fr/kzg/doc.go
index d8a77e8f6..d1045726f 100644
--- a/ecc/bls24-317/fr/kzg/doc.go
+++ b/ecc/bls24-317/fr/kzg/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/kzg/kzg.go b/ecc/bls24-317/fr/kzg/kzg.go
index 9f5e723ee..dd32da719 100644
--- a/ecc/bls24-317/fr/kzg/kzg.go
+++ b/ecc/bls24-317/fr/kzg/kzg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/kzg/kzg_test.go b/ecc/bls24-317/fr/kzg/kzg_test.go
index 3aaf3d558..2abb1de29 100644
--- a/ecc/bls24-317/fr/kzg/kzg_test.go
+++ b/ecc/bls24-317/fr/kzg/kzg_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/kzg/marshal.go b/ecc/bls24-317/fr/kzg/marshal.go
index 54b6954de..0c0e4b988 100644
--- a/ecc/bls24-317/fr/kzg/marshal.go
+++ b/ecc/bls24-317/fr/kzg/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/mimc/doc.go b/ecc/bls24-317/fr/mimc/doc.go
index 497bd40a9..d527ead9e 100644
--- a/ecc/bls24-317/fr/mimc/doc.go
+++ b/ecc/bls24-317/fr/mimc/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/mimc/mimc.go b/ecc/bls24-317/fr/mimc/mimc.go
index 2dd13db92..65dd075f7 100644
--- a/ecc/bls24-317/fr/mimc/mimc.go
+++ b/ecc/bls24-317/fr/mimc/mimc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/pedersen/pedersen.go b/ecc/bls24-317/fr/pedersen/pedersen.go
index 3b8fc2509..840fe6f3a 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/pedersen/pedersen_test.go b/ecc/bls24-317/fr/pedersen/pedersen_test.go
index ee64c9aa3..368681545 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen_test.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/permutation/doc.go b/ecc/bls24-317/fr/permutation/doc.go
index bdf98e6ca..7ef21ffb9 100644
--- a/ecc/bls24-317/fr/permutation/doc.go
+++ b/ecc/bls24-317/fr/permutation/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/permutation/permutation.go b/ecc/bls24-317/fr/permutation/permutation.go
index bf5254c91..486048672 100644
--- a/ecc/bls24-317/fr/permutation/permutation.go
+++ b/ecc/bls24-317/fr/permutation/permutation.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/permutation/permutation_test.go b/ecc/bls24-317/fr/permutation/permutation_test.go
index 575d5215a..de8ad6338 100644
--- a/ecc/bls24-317/fr/permutation/permutation_test.go
+++ b/ecc/bls24-317/fr/permutation/permutation_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/plookup/doc.go b/ecc/bls24-317/fr/plookup/doc.go
index ec4b91287..b3af01968 100644
--- a/ecc/bls24-317/fr/plookup/doc.go
+++ b/ecc/bls24-317/fr/plookup/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/plookup/plookup_test.go b/ecc/bls24-317/fr/plookup/plookup_test.go
index 9a98faf8b..1e2b82166 100644
--- a/ecc/bls24-317/fr/plookup/plookup_test.go
+++ b/ecc/bls24-317/fr/plookup/plookup_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/plookup/table.go b/ecc/bls24-317/fr/plookup/table.go
index 4db32c5ef..b73cff622 100644
--- a/ecc/bls24-317/fr/plookup/table.go
+++ b/ecc/bls24-317/fr/plookup/table.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/plookup/vector.go b/ecc/bls24-317/fr/plookup/vector.go
index 169ee7ccd..d99921861 100644
--- a/ecc/bls24-317/fr/plookup/vector.go
+++ b/ecc/bls24-317/fr/plookup/vector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/polynomial/doc.go b/ecc/bls24-317/fr/polynomial/doc.go
index 83479b058..747da41f2 100644
--- a/ecc/bls24-317/fr/polynomial/doc.go
+++ b/ecc/bls24-317/fr/polynomial/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/polynomial/multilin.go b/ecc/bls24-317/fr/polynomial/multilin.go
index a4ab44796..1b06f8461 100644
--- a/ecc/bls24-317/fr/polynomial/multilin.go
+++ b/ecc/bls24-317/fr/polynomial/multilin.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/polynomial/multilin_test.go b/ecc/bls24-317/fr/polynomial/multilin_test.go
index 9ecb31606..0faff7a22 100644
--- a/ecc/bls24-317/fr/polynomial/multilin_test.go
+++ b/ecc/bls24-317/fr/polynomial/multilin_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/polynomial/polynomial.go b/ecc/bls24-317/fr/polynomial/polynomial.go
index d4b750432..e2e619239 100644
--- a/ecc/bls24-317/fr/polynomial/polynomial.go
+++ b/ecc/bls24-317/fr/polynomial/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/polynomial/polynomial_test.go b/ecc/bls24-317/fr/polynomial/polynomial_test.go
index 024f71a3f..89d8599ce 100644
--- a/ecc/bls24-317/fr/polynomial/polynomial_test.go
+++ b/ecc/bls24-317/fr/polynomial/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/polynomial/pool.go b/ecc/bls24-317/fr/polynomial/pool.go
index 3179ae51f..de3ce2f8b 100644
--- a/ecc/bls24-317/fr/polynomial/pool.go
+++ b/ecc/bls24-317/fr/polynomial/pool.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/sumcheck/sumcheck.go b/ecc/bls24-317/fr/sumcheck/sumcheck.go
index 81ff55743..5d294c205 100644
--- a/ecc/bls24-317/fr/sumcheck/sumcheck.go
+++ b/ecc/bls24-317/fr/sumcheck/sumcheck.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/sumcheck/sumcheck_test.go b/ecc/bls24-317/fr/sumcheck/sumcheck_test.go
index f1f458056..3ff045288 100644
--- a/ecc/bls24-317/fr/sumcheck/sumcheck_test.go
+++ b/ecc/bls24-317/fr/sumcheck/sumcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/fr/test_vector_utils/test_vector_utils.go b/ecc/bls24-317/fr/test_vector_utils/test_vector_utils.go
index 2981462aa..7022421f3 100644
--- a/ecc/bls24-317/fr/test_vector_utils/test_vector_utils.go
+++ b/ecc/bls24-317/fr/test_vector_utils/test_vector_utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/g1.go b/ecc/bls24-317/g1.go
index 36bb6c6ad..3a979d3b6 100644
--- a/ecc/bls24-317/g1.go
+++ b/ecc/bls24-317/g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/g1_test.go b/ecc/bls24-317/g1_test.go
index 045907075..8f62e1fb8 100644
--- a/ecc/bls24-317/g1_test.go
+++ b/ecc/bls24-317/g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/g2.go b/ecc/bls24-317/g2.go
index ef831f154..fb5fca970 100644
--- a/ecc/bls24-317/g2.go
+++ b/ecc/bls24-317/g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/g2_test.go b/ecc/bls24-317/g2_test.go
index 8736bde8d..94026ccfc 100644
--- a/ecc/bls24-317/g2_test.go
+++ b/ecc/bls24-317/g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/hash_to_g1.go b/ecc/bls24-317/hash_to_g1.go
index 4040b00be..c2aa1c0da 100644
--- a/ecc/bls24-317/hash_to_g1.go
+++ b/ecc/bls24-317/hash_to_g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/hash_to_g1_test.go b/ecc/bls24-317/hash_to_g1_test.go
index c74036999..85749898c 100644
--- a/ecc/bls24-317/hash_to_g1_test.go
+++ b/ecc/bls24-317/hash_to_g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/marshal.go b/ecc/bls24-317/marshal.go
index 89e7bcf5c..39d8dd677 100644
--- a/ecc/bls24-317/marshal.go
+++ b/ecc/bls24-317/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/marshal_test.go b/ecc/bls24-317/marshal_test.go
index 23f3b8a10..4c7a1cf3d 100644
--- a/ecc/bls24-317/marshal_test.go
+++ b/ecc/bls24-317/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/multiexp.go b/ecc/bls24-317/multiexp.go
index db30c174d..e4909fa9e 100644
--- a/ecc/bls24-317/multiexp.go
+++ b/ecc/bls24-317/multiexp.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/multiexp_affine.go b/ecc/bls24-317/multiexp_affine.go
index afe3e43ab..ba8135b40 100644
--- a/ecc/bls24-317/multiexp_affine.go
+++ b/ecc/bls24-317/multiexp_affine.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/multiexp_jacobian.go b/ecc/bls24-317/multiexp_jacobian.go
index eb284f3bc..a07c9e874 100644
--- a/ecc/bls24-317/multiexp_jacobian.go
+++ b/ecc/bls24-317/multiexp_jacobian.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/multiexp_test.go b/ecc/bls24-317/multiexp_test.go
index 638c59255..e48db59fd 100644
--- a/ecc/bls24-317/multiexp_test.go
+++ b/ecc/bls24-317/multiexp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/pairing_test.go b/ecc/bls24-317/pairing_test.go
index 780bc5092..8d98e93ca 100644
--- a/ecc/bls24-317/pairing_test.go
+++ b/ecc/bls24-317/pairing_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/twistededwards/curve.go b/ecc/bls24-317/twistededwards/curve.go
index d12197a8f..5c122cb3c 100644
--- a/ecc/bls24-317/twistededwards/curve.go
+++ b/ecc/bls24-317/twistededwards/curve.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/twistededwards/doc.go b/ecc/bls24-317/twistededwards/doc.go
index 44bdd71f3..15c802b59 100644
--- a/ecc/bls24-317/twistededwards/doc.go
+++ b/ecc/bls24-317/twistededwards/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/twistededwards/eddsa/doc.go b/ecc/bls24-317/twistededwards/eddsa/doc.go
index a7ab6fcd7..10253fce8 100644
--- a/ecc/bls24-317/twistededwards/eddsa/doc.go
+++ b/ecc/bls24-317/twistededwards/eddsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/twistededwards/eddsa/eddsa.go b/ecc/bls24-317/twistededwards/eddsa/eddsa.go
index 0968378a4..7f12426e2 100644
--- a/ecc/bls24-317/twistededwards/eddsa/eddsa.go
+++ b/ecc/bls24-317/twistededwards/eddsa/eddsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go b/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go
index 6f12c390a..09c0a87d6 100644
--- a/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bls24-317/twistededwards/eddsa/eddsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/twistededwards/eddsa/marshal.go b/ecc/bls24-317/twistededwards/eddsa/marshal.go
index acf3c4173..89e0a8404 100644
--- a/ecc/bls24-317/twistededwards/eddsa/marshal.go
+++ b/ecc/bls24-317/twistededwards/eddsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/twistededwards/point.go b/ecc/bls24-317/twistededwards/point.go
index 0193e627b..fd10fdbe1 100644
--- a/ecc/bls24-317/twistededwards/point.go
+++ b/ecc/bls24-317/twistededwards/point.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bls24-317/twistededwards/point_test.go b/ecc/bls24-317/twistededwards/point_test.go
index 8a8def1c8..d9a610670 100644
--- a/ecc/bls24-317/twistededwards/point_test.go
+++ b/ecc/bls24-317/twistededwards/point_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/ecdsa/doc.go b/ecc/bn254/ecdsa/doc.go
index 69dbd4c98..ca7ca8f8a 100644
--- a/ecc/bn254/ecdsa/doc.go
+++ b/ecc/bn254/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/ecdsa/ecdsa.go b/ecc/bn254/ecdsa/ecdsa.go
index 9ea97fe71..c860e7b94 100644
--- a/ecc/bn254/ecdsa/ecdsa.go
+++ b/ecc/bn254/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/ecdsa/ecdsa_test.go b/ecc/bn254/ecdsa/ecdsa_test.go
index 53a5d9d76..e8275b4e7 100644
--- a/ecc/bn254/ecdsa/ecdsa_test.go
+++ b/ecc/bn254/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/ecdsa/marshal.go b/ecc/bn254/ecdsa/marshal.go
index 1aecbaaa9..527b31630 100644
--- a/ecc/bn254/ecdsa/marshal.go
+++ b/ecc/bn254/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/ecdsa/marshal_test.go b/ecc/bn254/ecdsa/marshal_test.go
index 5697c241d..629107488 100644
--- a/ecc/bn254/ecdsa/marshal_test.go
+++ b/ecc/bn254/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/fft/doc.go b/ecc/bn254/fr/fft/doc.go
index 3c35170e8..2391a9f63 100644
--- a/ecc/bn254/fr/fft/doc.go
+++ b/ecc/bn254/fr/fft/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/fft/domain.go b/ecc/bn254/fr/fft/domain.go
index c9d0a63dd..428acb203 100644
--- a/ecc/bn254/fr/fft/domain.go
+++ b/ecc/bn254/fr/fft/domain.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/fft/domain_test.go b/ecc/bn254/fr/fft/domain_test.go
index 14d23dd99..83186cb7c 100644
--- a/ecc/bn254/fr/fft/domain_test.go
+++ b/ecc/bn254/fr/fft/domain_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/fft/fft.go b/ecc/bn254/fr/fft/fft.go
index 0c87fe37e..7a1e03604 100644
--- a/ecc/bn254/fr/fft/fft.go
+++ b/ecc/bn254/fr/fft/fft.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/fft/fft_test.go b/ecc/bn254/fr/fft/fft_test.go
index 668f361f6..b2c1e8999 100644
--- a/ecc/bn254/fr/fft/fft_test.go
+++ b/ecc/bn254/fr/fft/fft_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/fft/options.go b/ecc/bn254/fr/fft/options.go
index 603b76f29..02a6000e5 100644
--- a/ecc/bn254/fr/fft/options.go
+++ b/ecc/bn254/fr/fft/options.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/fri/doc.go b/ecc/bn254/fr/fri/doc.go
index 1a4cc68f3..3333ad41f 100644
--- a/ecc/bn254/fr/fri/doc.go
+++ b/ecc/bn254/fr/fri/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/fri/fri.go b/ecc/bn254/fr/fri/fri.go
index 664f87bba..6559829ec 100644
--- a/ecc/bn254/fr/fri/fri.go
+++ b/ecc/bn254/fr/fri/fri.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/fri/fri_test.go b/ecc/bn254/fr/fri/fri_test.go
index 084a44800..4d12409c5 100644
--- a/ecc/bn254/fr/fri/fri_test.go
+++ b/ecc/bn254/fr/fri/fri_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/gkr/gkr.go b/ecc/bn254/fr/gkr/gkr.go
index 6ab745666..6b04429ad 100644
--- a/ecc/bn254/fr/gkr/gkr.go
+++ b/ecc/bn254/fr/gkr/gkr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/gkr/gkr_test.go b/ecc/bn254/fr/gkr/gkr_test.go
index 6be5844fe..dced39437 100644
--- a/ecc/bn254/fr/gkr/gkr_test.go
+++ b/ecc/bn254/fr/gkr/gkr_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/iop/doc.go b/ecc/bn254/fr/iop/doc.go
index cd87ef4d7..20f8b1a30 100644
--- a/ecc/bn254/fr/iop/doc.go
+++ b/ecc/bn254/fr/iop/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/iop/expressions.go b/ecc/bn254/fr/iop/expressions.go
index 29b538ae7..b01e0cd08 100644
--- a/ecc/bn254/fr/iop/expressions.go
+++ b/ecc/bn254/fr/iop/expressions.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/iop/expressions_test.go b/ecc/bn254/fr/iop/expressions_test.go
index 8344dcd68..f670dc8fb 100644
--- a/ecc/bn254/fr/iop/expressions_test.go
+++ b/ecc/bn254/fr/iop/expressions_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/iop/polynomial.go b/ecc/bn254/fr/iop/polynomial.go
index e00471a49..87557cfec 100644
--- a/ecc/bn254/fr/iop/polynomial.go
+++ b/ecc/bn254/fr/iop/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/iop/polynomial_test.go b/ecc/bn254/fr/iop/polynomial_test.go
index afc59102e..1d0588dea 100644
--- a/ecc/bn254/fr/iop/polynomial_test.go
+++ b/ecc/bn254/fr/iop/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/iop/quotient.go b/ecc/bn254/fr/iop/quotient.go
index b862a8aae..59142c579 100644
--- a/ecc/bn254/fr/iop/quotient.go
+++ b/ecc/bn254/fr/iop/quotient.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/iop/quotient_test.go b/ecc/bn254/fr/iop/quotient_test.go
index 7c3086aea..5754d227e 100644
--- a/ecc/bn254/fr/iop/quotient_test.go
+++ b/ecc/bn254/fr/iop/quotient_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/iop/ratios.go b/ecc/bn254/fr/iop/ratios.go
index e2be872fb..5b9a00034 100644
--- a/ecc/bn254/fr/iop/ratios.go
+++ b/ecc/bn254/fr/iop/ratios.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/iop/ratios_test.go b/ecc/bn254/fr/iop/ratios_test.go
index 73ce0814d..588eb4335 100644
--- a/ecc/bn254/fr/iop/ratios_test.go
+++ b/ecc/bn254/fr/iop/ratios_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/iop/utils.go b/ecc/bn254/fr/iop/utils.go
index c859eafc5..d8eb7fea4 100644
--- a/ecc/bn254/fr/iop/utils.go
+++ b/ecc/bn254/fr/iop/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/kzg/doc.go b/ecc/bn254/fr/kzg/doc.go
index d8a77e8f6..d1045726f 100644
--- a/ecc/bn254/fr/kzg/doc.go
+++ b/ecc/bn254/fr/kzg/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/kzg/kzg.go b/ecc/bn254/fr/kzg/kzg.go
index ab492b53b..970c6a03e 100644
--- a/ecc/bn254/fr/kzg/kzg.go
+++ b/ecc/bn254/fr/kzg/kzg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/kzg/kzg_test.go b/ecc/bn254/fr/kzg/kzg_test.go
index ca35c1160..23af4158a 100644
--- a/ecc/bn254/fr/kzg/kzg_test.go
+++ b/ecc/bn254/fr/kzg/kzg_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/kzg/marshal.go b/ecc/bn254/fr/kzg/marshal.go
index 5dc2f317b..87981fbd0 100644
--- a/ecc/bn254/fr/kzg/marshal.go
+++ b/ecc/bn254/fr/kzg/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/mimc/doc.go b/ecc/bn254/fr/mimc/doc.go
index 497bd40a9..d527ead9e 100644
--- a/ecc/bn254/fr/mimc/doc.go
+++ b/ecc/bn254/fr/mimc/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/mimc/mimc.go b/ecc/bn254/fr/mimc/mimc.go
index fcd3cc949..a118f70cf 100644
--- a/ecc/bn254/fr/mimc/mimc.go
+++ b/ecc/bn254/fr/mimc/mimc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go
index b7f60bf2e..04ed48b10 100644
--- a/ecc/bn254/fr/pedersen/pedersen.go
+++ b/ecc/bn254/fr/pedersen/pedersen.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/pedersen/pedersen_test.go b/ecc/bn254/fr/pedersen/pedersen_test.go
index 14fa00d83..38030e4ec 100644
--- a/ecc/bn254/fr/pedersen/pedersen_test.go
+++ b/ecc/bn254/fr/pedersen/pedersen_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/permutation/doc.go b/ecc/bn254/fr/permutation/doc.go
index bdf98e6ca..7ef21ffb9 100644
--- a/ecc/bn254/fr/permutation/doc.go
+++ b/ecc/bn254/fr/permutation/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/permutation/permutation.go b/ecc/bn254/fr/permutation/permutation.go
index 37a42f524..e57a44432 100644
--- a/ecc/bn254/fr/permutation/permutation.go
+++ b/ecc/bn254/fr/permutation/permutation.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/permutation/permutation_test.go b/ecc/bn254/fr/permutation/permutation_test.go
index d8615cd51..a6ca508ce 100644
--- a/ecc/bn254/fr/permutation/permutation_test.go
+++ b/ecc/bn254/fr/permutation/permutation_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/plookup/doc.go b/ecc/bn254/fr/plookup/doc.go
index ec4b91287..b3af01968 100644
--- a/ecc/bn254/fr/plookup/doc.go
+++ b/ecc/bn254/fr/plookup/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/plookup/plookup_test.go b/ecc/bn254/fr/plookup/plookup_test.go
index 918a0d8b2..3e0db7ebf 100644
--- a/ecc/bn254/fr/plookup/plookup_test.go
+++ b/ecc/bn254/fr/plookup/plookup_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/plookup/table.go b/ecc/bn254/fr/plookup/table.go
index 4f110699a..18d0a29ec 100644
--- a/ecc/bn254/fr/plookup/table.go
+++ b/ecc/bn254/fr/plookup/table.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/plookup/vector.go b/ecc/bn254/fr/plookup/vector.go
index 8094072c7..6c0665633 100644
--- a/ecc/bn254/fr/plookup/vector.go
+++ b/ecc/bn254/fr/plookup/vector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/polynomial/doc.go b/ecc/bn254/fr/polynomial/doc.go
index 83479b058..747da41f2 100644
--- a/ecc/bn254/fr/polynomial/doc.go
+++ b/ecc/bn254/fr/polynomial/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/polynomial/multilin.go b/ecc/bn254/fr/polynomial/multilin.go
index 7712a0359..a78479b4d 100644
--- a/ecc/bn254/fr/polynomial/multilin.go
+++ b/ecc/bn254/fr/polynomial/multilin.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/polynomial/multilin_test.go b/ecc/bn254/fr/polynomial/multilin_test.go
index e7fcc3e7b..271d28241 100644
--- a/ecc/bn254/fr/polynomial/multilin_test.go
+++ b/ecc/bn254/fr/polynomial/multilin_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/polynomial/polynomial.go b/ecc/bn254/fr/polynomial/polynomial.go
index 43aebfa07..0da76e377 100644
--- a/ecc/bn254/fr/polynomial/polynomial.go
+++ b/ecc/bn254/fr/polynomial/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/polynomial/polynomial_test.go b/ecc/bn254/fr/polynomial/polynomial_test.go
index 173af697c..778c88a23 100644
--- a/ecc/bn254/fr/polynomial/polynomial_test.go
+++ b/ecc/bn254/fr/polynomial/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/polynomial/pool.go b/ecc/bn254/fr/polynomial/pool.go
index 8826313e6..736365248 100644
--- a/ecc/bn254/fr/polynomial/pool.go
+++ b/ecc/bn254/fr/polynomial/pool.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/sumcheck/sumcheck.go b/ecc/bn254/fr/sumcheck/sumcheck.go
index c7de59c15..104a52e7e 100644
--- a/ecc/bn254/fr/sumcheck/sumcheck.go
+++ b/ecc/bn254/fr/sumcheck/sumcheck.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/sumcheck/sumcheck_test.go b/ecc/bn254/fr/sumcheck/sumcheck_test.go
index d5d86b17b..a4b11424c 100644
--- a/ecc/bn254/fr/sumcheck/sumcheck_test.go
+++ b/ecc/bn254/fr/sumcheck/sumcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/fr/test_vector_utils/test_vector_utils.go b/ecc/bn254/fr/test_vector_utils/test_vector_utils.go
index 073fe7a0e..889a2a335 100644
--- a/ecc/bn254/fr/test_vector_utils/test_vector_utils.go
+++ b/ecc/bn254/fr/test_vector_utils/test_vector_utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/g1.go b/ecc/bn254/g1.go
index af6ce43d9..18470a5a4 100644
--- a/ecc/bn254/g1.go
+++ b/ecc/bn254/g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/g1_test.go b/ecc/bn254/g1_test.go
index bd4139a35..b7a17b61d 100644
--- a/ecc/bn254/g1_test.go
+++ b/ecc/bn254/g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/g2.go b/ecc/bn254/g2.go
index e87a8aef4..553192394 100644
--- a/ecc/bn254/g2.go
+++ b/ecc/bn254/g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/g2_test.go b/ecc/bn254/g2_test.go
index 469a39cb4..0690bf900 100644
--- a/ecc/bn254/g2_test.go
+++ b/ecc/bn254/g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/hash_to_g1.go b/ecc/bn254/hash_to_g1.go
index 5a2d63f23..6be3be8e1 100644
--- a/ecc/bn254/hash_to_g1.go
+++ b/ecc/bn254/hash_to_g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/hash_to_g1_test.go b/ecc/bn254/hash_to_g1_test.go
index 98ee9b89b..9278aa85a 100644
--- a/ecc/bn254/hash_to_g1_test.go
+++ b/ecc/bn254/hash_to_g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/hash_to_g2.go b/ecc/bn254/hash_to_g2.go
index 5c7dec4d4..fa81853d0 100644
--- a/ecc/bn254/hash_to_g2.go
+++ b/ecc/bn254/hash_to_g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/hash_to_g2_test.go b/ecc/bn254/hash_to_g2_test.go
index de7f103cb..1800838a7 100644
--- a/ecc/bn254/hash_to_g2_test.go
+++ b/ecc/bn254/hash_to_g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/internal/fptower/asm.go b/ecc/bn254/internal/fptower/asm.go
index 0ec192019..49751a939 100644
--- a/ecc/bn254/internal/fptower/asm.go
+++ b/ecc/bn254/internal/fptower/asm.go
@@ -1,7 +1,7 @@
//go:build !noadx
// +build !noadx
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/internal/fptower/asm_noadx.go b/ecc/bn254/internal/fptower/asm_noadx.go
index 6a09c11c4..c6a97081f 100644
--- a/ecc/bn254/internal/fptower/asm_noadx.go
+++ b/ecc/bn254/internal/fptower/asm_noadx.go
@@ -1,7 +1,7 @@
//go:build noadx
// +build noadx
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/internal/fptower/e12.go b/ecc/bn254/internal/fptower/e12.go
index 6830ee105..29093174b 100644
--- a/ecc/bn254/internal/fptower/e12.go
+++ b/ecc/bn254/internal/fptower/e12.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/internal/fptower/e12_test.go b/ecc/bn254/internal/fptower/e12_test.go
index d7e1f7261..54ab6e185 100644
--- a/ecc/bn254/internal/fptower/e12_test.go
+++ b/ecc/bn254/internal/fptower/e12_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/internal/fptower/e2.go b/ecc/bn254/internal/fptower/e2.go
index 1a954aa38..8c16efc93 100644
--- a/ecc/bn254/internal/fptower/e2.go
+++ b/ecc/bn254/internal/fptower/e2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/internal/fptower/e2_amd64.go b/ecc/bn254/internal/fptower/e2_amd64.go
index dab250684..259609bd8 100644
--- a/ecc/bn254/internal/fptower/e2_amd64.go
+++ b/ecc/bn254/internal/fptower/e2_amd64.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/internal/fptower/e2_fallback.go b/ecc/bn254/internal/fptower/e2_fallback.go
index 0ce4d8333..6fe47c411 100644
--- a/ecc/bn254/internal/fptower/e2_fallback.go
+++ b/ecc/bn254/internal/fptower/e2_fallback.go
@@ -1,7 +1,7 @@
//go:build !amd64
// +build !amd64
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/internal/fptower/e2_test.go b/ecc/bn254/internal/fptower/e2_test.go
index 08670985a..09e0ede17 100644
--- a/ecc/bn254/internal/fptower/e2_test.go
+++ b/ecc/bn254/internal/fptower/e2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/internal/fptower/e6.go b/ecc/bn254/internal/fptower/e6.go
index 90aba83b2..128007df2 100644
--- a/ecc/bn254/internal/fptower/e6.go
+++ b/ecc/bn254/internal/fptower/e6.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/internal/fptower/e6_test.go b/ecc/bn254/internal/fptower/e6_test.go
index b47c9ac1d..b374b9b1f 100644
--- a/ecc/bn254/internal/fptower/e6_test.go
+++ b/ecc/bn254/internal/fptower/e6_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/marshal.go b/ecc/bn254/marshal.go
index 3ef63696d..d1ffbe2d8 100644
--- a/ecc/bn254/marshal.go
+++ b/ecc/bn254/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/marshal_test.go b/ecc/bn254/marshal_test.go
index ddc699b9c..299ae6d69 100644
--- a/ecc/bn254/marshal_test.go
+++ b/ecc/bn254/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/multiexp.go b/ecc/bn254/multiexp.go
index bca697954..3650ae1e8 100644
--- a/ecc/bn254/multiexp.go
+++ b/ecc/bn254/multiexp.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/multiexp_affine.go b/ecc/bn254/multiexp_affine.go
index b761c3bf4..81078a143 100644
--- a/ecc/bn254/multiexp_affine.go
+++ b/ecc/bn254/multiexp_affine.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/multiexp_jacobian.go b/ecc/bn254/multiexp_jacobian.go
index 2a9c92a8d..53490b9cc 100644
--- a/ecc/bn254/multiexp_jacobian.go
+++ b/ecc/bn254/multiexp_jacobian.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/multiexp_test.go b/ecc/bn254/multiexp_test.go
index a6ce9fe66..17989d368 100644
--- a/ecc/bn254/multiexp_test.go
+++ b/ecc/bn254/multiexp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/pairing_test.go b/ecc/bn254/pairing_test.go
index d2fe42518..050e4e50b 100644
--- a/ecc/bn254/pairing_test.go
+++ b/ecc/bn254/pairing_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/twistededwards/curve.go b/ecc/bn254/twistededwards/curve.go
index c39176de2..beeddab76 100644
--- a/ecc/bn254/twistededwards/curve.go
+++ b/ecc/bn254/twistededwards/curve.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/twistededwards/doc.go b/ecc/bn254/twistededwards/doc.go
index eced0ef56..970cc2409 100644
--- a/ecc/bn254/twistededwards/doc.go
+++ b/ecc/bn254/twistededwards/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/twistededwards/eddsa/doc.go b/ecc/bn254/twistededwards/eddsa/doc.go
index 27ff44aca..ee1c7ba2a 100644
--- a/ecc/bn254/twistededwards/eddsa/doc.go
+++ b/ecc/bn254/twistededwards/eddsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/twistededwards/eddsa/eddsa.go b/ecc/bn254/twistededwards/eddsa/eddsa.go
index dbe9d655f..91b520e2e 100644
--- a/ecc/bn254/twistededwards/eddsa/eddsa.go
+++ b/ecc/bn254/twistededwards/eddsa/eddsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/twistededwards/eddsa/eddsa_test.go b/ecc/bn254/twistededwards/eddsa/eddsa_test.go
index 78a2efb88..223cb04c0 100644
--- a/ecc/bn254/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bn254/twistededwards/eddsa/eddsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/twistededwards/eddsa/marshal.go b/ecc/bn254/twistededwards/eddsa/marshal.go
index acf3c4173..89e0a8404 100644
--- a/ecc/bn254/twistededwards/eddsa/marshal.go
+++ b/ecc/bn254/twistededwards/eddsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/twistededwards/point.go b/ecc/bn254/twistededwards/point.go
index 09303663c..ff0841890 100644
--- a/ecc/bn254/twistededwards/point.go
+++ b/ecc/bn254/twistededwards/point.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bn254/twistededwards/point_test.go b/ecc/bn254/twistededwards/point_test.go
index d070082b9..a55733270 100644
--- a/ecc/bn254/twistededwards/point_test.go
+++ b/ecc/bn254/twistededwards/point_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/ecdsa/doc.go b/ecc/bw6-633/ecdsa/doc.go
index 8be83117e..156e20b9f 100644
--- a/ecc/bw6-633/ecdsa/doc.go
+++ b/ecc/bw6-633/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/ecdsa/ecdsa.go b/ecc/bw6-633/ecdsa/ecdsa.go
index c629b66fa..e744f91d4 100644
--- a/ecc/bw6-633/ecdsa/ecdsa.go
+++ b/ecc/bw6-633/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/ecdsa/ecdsa_test.go b/ecc/bw6-633/ecdsa/ecdsa_test.go
index e993f73c8..824e3f6da 100644
--- a/ecc/bw6-633/ecdsa/ecdsa_test.go
+++ b/ecc/bw6-633/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/ecdsa/marshal.go b/ecc/bw6-633/ecdsa/marshal.go
index 72d74c5cb..c0ee0643e 100644
--- a/ecc/bw6-633/ecdsa/marshal.go
+++ b/ecc/bw6-633/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/ecdsa/marshal_test.go b/ecc/bw6-633/ecdsa/marshal_test.go
index 5fc8c2133..181d40637 100644
--- a/ecc/bw6-633/ecdsa/marshal_test.go
+++ b/ecc/bw6-633/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/fft/doc.go b/ecc/bw6-633/fr/fft/doc.go
index 3c35170e8..2391a9f63 100644
--- a/ecc/bw6-633/fr/fft/doc.go
+++ b/ecc/bw6-633/fr/fft/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/fft/domain.go b/ecc/bw6-633/fr/fft/domain.go
index ecb87f941..acc82017a 100644
--- a/ecc/bw6-633/fr/fft/domain.go
+++ b/ecc/bw6-633/fr/fft/domain.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/fft/domain_test.go b/ecc/bw6-633/fr/fft/domain_test.go
index 14d23dd99..83186cb7c 100644
--- a/ecc/bw6-633/fr/fft/domain_test.go
+++ b/ecc/bw6-633/fr/fft/domain_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/fft/fft.go b/ecc/bw6-633/fr/fft/fft.go
index 97a1a00d8..dc0b9f01b 100644
--- a/ecc/bw6-633/fr/fft/fft.go
+++ b/ecc/bw6-633/fr/fft/fft.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/fft/fft_test.go b/ecc/bw6-633/fr/fft/fft_test.go
index b4f8ecd4a..e14364680 100644
--- a/ecc/bw6-633/fr/fft/fft_test.go
+++ b/ecc/bw6-633/fr/fft/fft_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/fft/options.go b/ecc/bw6-633/fr/fft/options.go
index 603b76f29..02a6000e5 100644
--- a/ecc/bw6-633/fr/fft/options.go
+++ b/ecc/bw6-633/fr/fft/options.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/fri/doc.go b/ecc/bw6-633/fr/fri/doc.go
index 1a4cc68f3..3333ad41f 100644
--- a/ecc/bw6-633/fr/fri/doc.go
+++ b/ecc/bw6-633/fr/fri/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/fri/fri.go b/ecc/bw6-633/fr/fri/fri.go
index 5da24b37e..70e927600 100644
--- a/ecc/bw6-633/fr/fri/fri.go
+++ b/ecc/bw6-633/fr/fri/fri.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/fri/fri_test.go b/ecc/bw6-633/fr/fri/fri_test.go
index 3eaa66fbf..d0ff389db 100644
--- a/ecc/bw6-633/fr/fri/fri_test.go
+++ b/ecc/bw6-633/fr/fri/fri_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/gkr/gkr.go b/ecc/bw6-633/fr/gkr/gkr.go
index 8ec1f3672..0a9173884 100644
--- a/ecc/bw6-633/fr/gkr/gkr.go
+++ b/ecc/bw6-633/fr/gkr/gkr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/gkr/gkr_test.go b/ecc/bw6-633/fr/gkr/gkr_test.go
index 3271cdc07..d16068094 100644
--- a/ecc/bw6-633/fr/gkr/gkr_test.go
+++ b/ecc/bw6-633/fr/gkr/gkr_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/iop/doc.go b/ecc/bw6-633/fr/iop/doc.go
index cd87ef4d7..20f8b1a30 100644
--- a/ecc/bw6-633/fr/iop/doc.go
+++ b/ecc/bw6-633/fr/iop/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/iop/expressions.go b/ecc/bw6-633/fr/iop/expressions.go
index 390c57c18..6c601bcec 100644
--- a/ecc/bw6-633/fr/iop/expressions.go
+++ b/ecc/bw6-633/fr/iop/expressions.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/iop/expressions_test.go b/ecc/bw6-633/fr/iop/expressions_test.go
index 269c95c27..bf0f3fc0e 100644
--- a/ecc/bw6-633/fr/iop/expressions_test.go
+++ b/ecc/bw6-633/fr/iop/expressions_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/iop/polynomial.go b/ecc/bw6-633/fr/iop/polynomial.go
index 3c3a4d509..e4d8f6eb8 100644
--- a/ecc/bw6-633/fr/iop/polynomial.go
+++ b/ecc/bw6-633/fr/iop/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/iop/polynomial_test.go b/ecc/bw6-633/fr/iop/polynomial_test.go
index 08c15ac6b..72d8dade5 100644
--- a/ecc/bw6-633/fr/iop/polynomial_test.go
+++ b/ecc/bw6-633/fr/iop/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/iop/quotient.go b/ecc/bw6-633/fr/iop/quotient.go
index dff99713c..41a8ba011 100644
--- a/ecc/bw6-633/fr/iop/quotient.go
+++ b/ecc/bw6-633/fr/iop/quotient.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/iop/quotient_test.go b/ecc/bw6-633/fr/iop/quotient_test.go
index b85eaa24e..c1db943b4 100644
--- a/ecc/bw6-633/fr/iop/quotient_test.go
+++ b/ecc/bw6-633/fr/iop/quotient_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/iop/ratios.go b/ecc/bw6-633/fr/iop/ratios.go
index bd718f08b..1739f1d9e 100644
--- a/ecc/bw6-633/fr/iop/ratios.go
+++ b/ecc/bw6-633/fr/iop/ratios.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/iop/ratios_test.go b/ecc/bw6-633/fr/iop/ratios_test.go
index bd19cc647..6c9ed5862 100644
--- a/ecc/bw6-633/fr/iop/ratios_test.go
+++ b/ecc/bw6-633/fr/iop/ratios_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/iop/utils.go b/ecc/bw6-633/fr/iop/utils.go
index 92ba3b28d..faf1c2137 100644
--- a/ecc/bw6-633/fr/iop/utils.go
+++ b/ecc/bw6-633/fr/iop/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/kzg/doc.go b/ecc/bw6-633/fr/kzg/doc.go
index d8a77e8f6..d1045726f 100644
--- a/ecc/bw6-633/fr/kzg/doc.go
+++ b/ecc/bw6-633/fr/kzg/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/kzg/kzg.go b/ecc/bw6-633/fr/kzg/kzg.go
index ec5fd06da..d6fe817bf 100644
--- a/ecc/bw6-633/fr/kzg/kzg.go
+++ b/ecc/bw6-633/fr/kzg/kzg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/kzg/kzg_test.go b/ecc/bw6-633/fr/kzg/kzg_test.go
index b17c0523a..09e585343 100644
--- a/ecc/bw6-633/fr/kzg/kzg_test.go
+++ b/ecc/bw6-633/fr/kzg/kzg_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/kzg/marshal.go b/ecc/bw6-633/fr/kzg/marshal.go
index 4ef19b91a..f8ad44c90 100644
--- a/ecc/bw6-633/fr/kzg/marshal.go
+++ b/ecc/bw6-633/fr/kzg/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/mimc/doc.go b/ecc/bw6-633/fr/mimc/doc.go
index 497bd40a9..d527ead9e 100644
--- a/ecc/bw6-633/fr/mimc/doc.go
+++ b/ecc/bw6-633/fr/mimc/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/mimc/mimc.go b/ecc/bw6-633/fr/mimc/mimc.go
index 9f0546f71..7e00a32d3 100644
--- a/ecc/bw6-633/fr/mimc/mimc.go
+++ b/ecc/bw6-633/fr/mimc/mimc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/pedersen/pedersen.go b/ecc/bw6-633/fr/pedersen/pedersen.go
index a680a17c6..bc3aa9e32 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/pedersen/pedersen_test.go b/ecc/bw6-633/fr/pedersen/pedersen_test.go
index f2b9bb6e4..438330509 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/permutation/doc.go b/ecc/bw6-633/fr/permutation/doc.go
index bdf98e6ca..7ef21ffb9 100644
--- a/ecc/bw6-633/fr/permutation/doc.go
+++ b/ecc/bw6-633/fr/permutation/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/permutation/permutation.go b/ecc/bw6-633/fr/permutation/permutation.go
index 5dcde6250..2ae604366 100644
--- a/ecc/bw6-633/fr/permutation/permutation.go
+++ b/ecc/bw6-633/fr/permutation/permutation.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/permutation/permutation_test.go b/ecc/bw6-633/fr/permutation/permutation_test.go
index 80b4ddd5f..879d64d1d 100644
--- a/ecc/bw6-633/fr/permutation/permutation_test.go
+++ b/ecc/bw6-633/fr/permutation/permutation_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/plookup/doc.go b/ecc/bw6-633/fr/plookup/doc.go
index ec4b91287..b3af01968 100644
--- a/ecc/bw6-633/fr/plookup/doc.go
+++ b/ecc/bw6-633/fr/plookup/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/plookup/plookup_test.go b/ecc/bw6-633/fr/plookup/plookup_test.go
index a1672a2d4..ca21d8459 100644
--- a/ecc/bw6-633/fr/plookup/plookup_test.go
+++ b/ecc/bw6-633/fr/plookup/plookup_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/plookup/table.go b/ecc/bw6-633/fr/plookup/table.go
index 737cf3d44..399956eba 100644
--- a/ecc/bw6-633/fr/plookup/table.go
+++ b/ecc/bw6-633/fr/plookup/table.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/plookup/vector.go b/ecc/bw6-633/fr/plookup/vector.go
index 588f51bfc..1491a83cd 100644
--- a/ecc/bw6-633/fr/plookup/vector.go
+++ b/ecc/bw6-633/fr/plookup/vector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/polynomial/doc.go b/ecc/bw6-633/fr/polynomial/doc.go
index 83479b058..747da41f2 100644
--- a/ecc/bw6-633/fr/polynomial/doc.go
+++ b/ecc/bw6-633/fr/polynomial/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/polynomial/multilin.go b/ecc/bw6-633/fr/polynomial/multilin.go
index 0f23d4fad..743331f10 100644
--- a/ecc/bw6-633/fr/polynomial/multilin.go
+++ b/ecc/bw6-633/fr/polynomial/multilin.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/polynomial/multilin_test.go b/ecc/bw6-633/fr/polynomial/multilin_test.go
index ba7cf628b..b141532ff 100644
--- a/ecc/bw6-633/fr/polynomial/multilin_test.go
+++ b/ecc/bw6-633/fr/polynomial/multilin_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/polynomial/polynomial.go b/ecc/bw6-633/fr/polynomial/polynomial.go
index 700c12374..1edc739be 100644
--- a/ecc/bw6-633/fr/polynomial/polynomial.go
+++ b/ecc/bw6-633/fr/polynomial/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/polynomial/polynomial_test.go b/ecc/bw6-633/fr/polynomial/polynomial_test.go
index f2316234d..dd0e94f42 100644
--- a/ecc/bw6-633/fr/polynomial/polynomial_test.go
+++ b/ecc/bw6-633/fr/polynomial/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/polynomial/pool.go b/ecc/bw6-633/fr/polynomial/pool.go
index 8b676e50a..5fc5acd14 100644
--- a/ecc/bw6-633/fr/polynomial/pool.go
+++ b/ecc/bw6-633/fr/polynomial/pool.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/sumcheck/sumcheck.go b/ecc/bw6-633/fr/sumcheck/sumcheck.go
index 40be96534..3e401b771 100644
--- a/ecc/bw6-633/fr/sumcheck/sumcheck.go
+++ b/ecc/bw6-633/fr/sumcheck/sumcheck.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/sumcheck/sumcheck_test.go b/ecc/bw6-633/fr/sumcheck/sumcheck_test.go
index 1ae0784c7..5086d2d35 100644
--- a/ecc/bw6-633/fr/sumcheck/sumcheck_test.go
+++ b/ecc/bw6-633/fr/sumcheck/sumcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/fr/test_vector_utils/test_vector_utils.go b/ecc/bw6-633/fr/test_vector_utils/test_vector_utils.go
index bdf2b832f..711fffb39 100644
--- a/ecc/bw6-633/fr/test_vector_utils/test_vector_utils.go
+++ b/ecc/bw6-633/fr/test_vector_utils/test_vector_utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/g1.go b/ecc/bw6-633/g1.go
index 2458b7430..aad92593b 100644
--- a/ecc/bw6-633/g1.go
+++ b/ecc/bw6-633/g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/g1_test.go b/ecc/bw6-633/g1_test.go
index cbe043ae1..7bdf11483 100644
--- a/ecc/bw6-633/g1_test.go
+++ b/ecc/bw6-633/g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/g2.go b/ecc/bw6-633/g2.go
index 6a44da4a0..d42d80665 100644
--- a/ecc/bw6-633/g2.go
+++ b/ecc/bw6-633/g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/g2_test.go b/ecc/bw6-633/g2_test.go
index 2a04a341d..5b5b9a59a 100644
--- a/ecc/bw6-633/g2_test.go
+++ b/ecc/bw6-633/g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/hash_to_g1.go b/ecc/bw6-633/hash_to_g1.go
index 2c6710c48..ede1bd9da 100644
--- a/ecc/bw6-633/hash_to_g1.go
+++ b/ecc/bw6-633/hash_to_g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/hash_to_g1_test.go b/ecc/bw6-633/hash_to_g1_test.go
index 986a4d7d0..72bb795e7 100644
--- a/ecc/bw6-633/hash_to_g1_test.go
+++ b/ecc/bw6-633/hash_to_g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/hash_to_g2.go b/ecc/bw6-633/hash_to_g2.go
index 46a756e02..a6244504c 100644
--- a/ecc/bw6-633/hash_to_g2.go
+++ b/ecc/bw6-633/hash_to_g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/hash_to_g2_test.go b/ecc/bw6-633/hash_to_g2_test.go
index 75daa9960..85db98ee0 100644
--- a/ecc/bw6-633/hash_to_g2_test.go
+++ b/ecc/bw6-633/hash_to_g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/marshal.go b/ecc/bw6-633/marshal.go
index 49f29735e..67e4a8bb3 100644
--- a/ecc/bw6-633/marshal.go
+++ b/ecc/bw6-633/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/marshal_test.go b/ecc/bw6-633/marshal_test.go
index 5e6cab476..8ae00faea 100644
--- a/ecc/bw6-633/marshal_test.go
+++ b/ecc/bw6-633/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/multiexp.go b/ecc/bw6-633/multiexp.go
index e5bdcbb41..cbab47917 100644
--- a/ecc/bw6-633/multiexp.go
+++ b/ecc/bw6-633/multiexp.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/multiexp_affine.go b/ecc/bw6-633/multiexp_affine.go
index 7272cadee..2c9eaa8ac 100644
--- a/ecc/bw6-633/multiexp_affine.go
+++ b/ecc/bw6-633/multiexp_affine.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/multiexp_jacobian.go b/ecc/bw6-633/multiexp_jacobian.go
index 96efd1f61..a79e63260 100644
--- a/ecc/bw6-633/multiexp_jacobian.go
+++ b/ecc/bw6-633/multiexp_jacobian.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/multiexp_test.go b/ecc/bw6-633/multiexp_test.go
index b36d3db65..74f2ef86e 100644
--- a/ecc/bw6-633/multiexp_test.go
+++ b/ecc/bw6-633/multiexp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/pairing_test.go b/ecc/bw6-633/pairing_test.go
index 0a78e5d00..d4809517f 100644
--- a/ecc/bw6-633/pairing_test.go
+++ b/ecc/bw6-633/pairing_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/twistededwards/curve.go b/ecc/bw6-633/twistededwards/curve.go
index cdb464b04..ec256ef52 100644
--- a/ecc/bw6-633/twistededwards/curve.go
+++ b/ecc/bw6-633/twistededwards/curve.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/twistededwards/doc.go b/ecc/bw6-633/twistededwards/doc.go
index adc16c478..9137c46a8 100644
--- a/ecc/bw6-633/twistededwards/doc.go
+++ b/ecc/bw6-633/twistededwards/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/twistededwards/eddsa/doc.go b/ecc/bw6-633/twistededwards/eddsa/doc.go
index 4e8b44bcd..37913c358 100644
--- a/ecc/bw6-633/twistededwards/eddsa/doc.go
+++ b/ecc/bw6-633/twistededwards/eddsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/twistededwards/eddsa/eddsa.go b/ecc/bw6-633/twistededwards/eddsa/eddsa.go
index 554aeacee..20099f837 100644
--- a/ecc/bw6-633/twistededwards/eddsa/eddsa.go
+++ b/ecc/bw6-633/twistededwards/eddsa/eddsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go b/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go
index 0ed2470d4..a09242f16 100644
--- a/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bw6-633/twistededwards/eddsa/eddsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/twistededwards/eddsa/marshal.go b/ecc/bw6-633/twistededwards/eddsa/marshal.go
index acf3c4173..89e0a8404 100644
--- a/ecc/bw6-633/twistededwards/eddsa/marshal.go
+++ b/ecc/bw6-633/twistededwards/eddsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/twistededwards/point.go b/ecc/bw6-633/twistededwards/point.go
index 45c401d15..69f33db81 100644
--- a/ecc/bw6-633/twistededwards/point.go
+++ b/ecc/bw6-633/twistededwards/point.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-633/twistededwards/point_test.go b/ecc/bw6-633/twistededwards/point_test.go
index e9fcb4347..d4b966ddc 100644
--- a/ecc/bw6-633/twistededwards/point_test.go
+++ b/ecc/bw6-633/twistededwards/point_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/ecdsa/doc.go b/ecc/bw6-756/ecdsa/doc.go
index 29c1b18ef..b8c0f5fcf 100644
--- a/ecc/bw6-756/ecdsa/doc.go
+++ b/ecc/bw6-756/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/ecdsa/ecdsa.go b/ecc/bw6-756/ecdsa/ecdsa.go
index 07b997a40..e3914a732 100644
--- a/ecc/bw6-756/ecdsa/ecdsa.go
+++ b/ecc/bw6-756/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/ecdsa/ecdsa_test.go b/ecc/bw6-756/ecdsa/ecdsa_test.go
index 5af9fcbe3..1f90d440f 100644
--- a/ecc/bw6-756/ecdsa/ecdsa_test.go
+++ b/ecc/bw6-756/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/ecdsa/marshal.go b/ecc/bw6-756/ecdsa/marshal.go
index 72d74c5cb..c0ee0643e 100644
--- a/ecc/bw6-756/ecdsa/marshal.go
+++ b/ecc/bw6-756/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/ecdsa/marshal_test.go b/ecc/bw6-756/ecdsa/marshal_test.go
index 48fd0f03c..5a73204ca 100644
--- a/ecc/bw6-756/ecdsa/marshal_test.go
+++ b/ecc/bw6-756/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/fft/doc.go b/ecc/bw6-756/fr/fft/doc.go
index 3c35170e8..2391a9f63 100644
--- a/ecc/bw6-756/fr/fft/doc.go
+++ b/ecc/bw6-756/fr/fft/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/fft/domain.go b/ecc/bw6-756/fr/fft/domain.go
index 015c1465e..1744bef43 100644
--- a/ecc/bw6-756/fr/fft/domain.go
+++ b/ecc/bw6-756/fr/fft/domain.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/fft/domain_test.go b/ecc/bw6-756/fr/fft/domain_test.go
index 14d23dd99..83186cb7c 100644
--- a/ecc/bw6-756/fr/fft/domain_test.go
+++ b/ecc/bw6-756/fr/fft/domain_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/fft/fft.go b/ecc/bw6-756/fr/fft/fft.go
index 8ec51723a..482afa301 100644
--- a/ecc/bw6-756/fr/fft/fft.go
+++ b/ecc/bw6-756/fr/fft/fft.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/fft/fft_test.go b/ecc/bw6-756/fr/fft/fft_test.go
index 45eb27a9b..bb2bca8dc 100644
--- a/ecc/bw6-756/fr/fft/fft_test.go
+++ b/ecc/bw6-756/fr/fft/fft_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/fft/options.go b/ecc/bw6-756/fr/fft/options.go
index 603b76f29..02a6000e5 100644
--- a/ecc/bw6-756/fr/fft/options.go
+++ b/ecc/bw6-756/fr/fft/options.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/fri/doc.go b/ecc/bw6-756/fr/fri/doc.go
index 1a4cc68f3..3333ad41f 100644
--- a/ecc/bw6-756/fr/fri/doc.go
+++ b/ecc/bw6-756/fr/fri/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/fri/fri.go b/ecc/bw6-756/fr/fri/fri.go
index a349ec816..29d74e962 100644
--- a/ecc/bw6-756/fr/fri/fri.go
+++ b/ecc/bw6-756/fr/fri/fri.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/fri/fri_test.go b/ecc/bw6-756/fr/fri/fri_test.go
index 3c1ba2939..a44cdc986 100644
--- a/ecc/bw6-756/fr/fri/fri_test.go
+++ b/ecc/bw6-756/fr/fri/fri_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/gkr/gkr.go b/ecc/bw6-756/fr/gkr/gkr.go
index dacbfeffa..2f40acff9 100644
--- a/ecc/bw6-756/fr/gkr/gkr.go
+++ b/ecc/bw6-756/fr/gkr/gkr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/gkr/gkr_test.go b/ecc/bw6-756/fr/gkr/gkr_test.go
index b11a3e48d..ae342286f 100644
--- a/ecc/bw6-756/fr/gkr/gkr_test.go
+++ b/ecc/bw6-756/fr/gkr/gkr_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/iop/doc.go b/ecc/bw6-756/fr/iop/doc.go
index cd87ef4d7..20f8b1a30 100644
--- a/ecc/bw6-756/fr/iop/doc.go
+++ b/ecc/bw6-756/fr/iop/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/iop/expressions.go b/ecc/bw6-756/fr/iop/expressions.go
index 4041cf083..37ee5685a 100644
--- a/ecc/bw6-756/fr/iop/expressions.go
+++ b/ecc/bw6-756/fr/iop/expressions.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/iop/expressions_test.go b/ecc/bw6-756/fr/iop/expressions_test.go
index a303adf5a..11808ed25 100644
--- a/ecc/bw6-756/fr/iop/expressions_test.go
+++ b/ecc/bw6-756/fr/iop/expressions_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/iop/polynomial.go b/ecc/bw6-756/fr/iop/polynomial.go
index de4d0b86f..74cdb8988 100644
--- a/ecc/bw6-756/fr/iop/polynomial.go
+++ b/ecc/bw6-756/fr/iop/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/iop/polynomial_test.go b/ecc/bw6-756/fr/iop/polynomial_test.go
index 137bcc963..d7b42777b 100644
--- a/ecc/bw6-756/fr/iop/polynomial_test.go
+++ b/ecc/bw6-756/fr/iop/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/iop/quotient.go b/ecc/bw6-756/fr/iop/quotient.go
index 711ede84f..3fe178cde 100644
--- a/ecc/bw6-756/fr/iop/quotient.go
+++ b/ecc/bw6-756/fr/iop/quotient.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/iop/quotient_test.go b/ecc/bw6-756/fr/iop/quotient_test.go
index ac8e1d86a..a7c3cff75 100644
--- a/ecc/bw6-756/fr/iop/quotient_test.go
+++ b/ecc/bw6-756/fr/iop/quotient_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/iop/ratios.go b/ecc/bw6-756/fr/iop/ratios.go
index 98aa2bf91..3255350ce 100644
--- a/ecc/bw6-756/fr/iop/ratios.go
+++ b/ecc/bw6-756/fr/iop/ratios.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/iop/ratios_test.go b/ecc/bw6-756/fr/iop/ratios_test.go
index aceed099d..4b27c5f6b 100644
--- a/ecc/bw6-756/fr/iop/ratios_test.go
+++ b/ecc/bw6-756/fr/iop/ratios_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/iop/utils.go b/ecc/bw6-756/fr/iop/utils.go
index 953032e01..068cc65b7 100644
--- a/ecc/bw6-756/fr/iop/utils.go
+++ b/ecc/bw6-756/fr/iop/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/kzg/doc.go b/ecc/bw6-756/fr/kzg/doc.go
index d8a77e8f6..d1045726f 100644
--- a/ecc/bw6-756/fr/kzg/doc.go
+++ b/ecc/bw6-756/fr/kzg/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/kzg/kzg.go b/ecc/bw6-756/fr/kzg/kzg.go
index ccce3971e..e33ac6fd2 100644
--- a/ecc/bw6-756/fr/kzg/kzg.go
+++ b/ecc/bw6-756/fr/kzg/kzg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/kzg/kzg_test.go b/ecc/bw6-756/fr/kzg/kzg_test.go
index df248ff66..c58c206fa 100644
--- a/ecc/bw6-756/fr/kzg/kzg_test.go
+++ b/ecc/bw6-756/fr/kzg/kzg_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/kzg/marshal.go b/ecc/bw6-756/fr/kzg/marshal.go
index 2c91e15e2..1cb5ad69a 100644
--- a/ecc/bw6-756/fr/kzg/marshal.go
+++ b/ecc/bw6-756/fr/kzg/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/mimc/doc.go b/ecc/bw6-756/fr/mimc/doc.go
index 497bd40a9..d527ead9e 100644
--- a/ecc/bw6-756/fr/mimc/doc.go
+++ b/ecc/bw6-756/fr/mimc/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/mimc/mimc.go b/ecc/bw6-756/fr/mimc/mimc.go
index eeaea42cc..09adc1b68 100644
--- a/ecc/bw6-756/fr/mimc/mimc.go
+++ b/ecc/bw6-756/fr/mimc/mimc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/pedersen/pedersen.go b/ecc/bw6-756/fr/pedersen/pedersen.go
index e6377e136..4a7598873 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/pedersen/pedersen_test.go b/ecc/bw6-756/fr/pedersen/pedersen_test.go
index 62319db8a..c28c23c82 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/permutation/doc.go b/ecc/bw6-756/fr/permutation/doc.go
index bdf98e6ca..7ef21ffb9 100644
--- a/ecc/bw6-756/fr/permutation/doc.go
+++ b/ecc/bw6-756/fr/permutation/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/permutation/permutation.go b/ecc/bw6-756/fr/permutation/permutation.go
index c30462fc9..5d6863ed1 100644
--- a/ecc/bw6-756/fr/permutation/permutation.go
+++ b/ecc/bw6-756/fr/permutation/permutation.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/permutation/permutation_test.go b/ecc/bw6-756/fr/permutation/permutation_test.go
index 9dbf17890..a407ac010 100644
--- a/ecc/bw6-756/fr/permutation/permutation_test.go
+++ b/ecc/bw6-756/fr/permutation/permutation_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/plookup/doc.go b/ecc/bw6-756/fr/plookup/doc.go
index ec4b91287..b3af01968 100644
--- a/ecc/bw6-756/fr/plookup/doc.go
+++ b/ecc/bw6-756/fr/plookup/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/plookup/plookup_test.go b/ecc/bw6-756/fr/plookup/plookup_test.go
index 8c4acdb07..6beff9387 100644
--- a/ecc/bw6-756/fr/plookup/plookup_test.go
+++ b/ecc/bw6-756/fr/plookup/plookup_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/plookup/table.go b/ecc/bw6-756/fr/plookup/table.go
index 68abe9104..e7c829470 100644
--- a/ecc/bw6-756/fr/plookup/table.go
+++ b/ecc/bw6-756/fr/plookup/table.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/plookup/vector.go b/ecc/bw6-756/fr/plookup/vector.go
index 63834a44f..4379b7234 100644
--- a/ecc/bw6-756/fr/plookup/vector.go
+++ b/ecc/bw6-756/fr/plookup/vector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/polynomial/doc.go b/ecc/bw6-756/fr/polynomial/doc.go
index 83479b058..747da41f2 100644
--- a/ecc/bw6-756/fr/polynomial/doc.go
+++ b/ecc/bw6-756/fr/polynomial/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/polynomial/multilin.go b/ecc/bw6-756/fr/polynomial/multilin.go
index 3361d7237..7c85cb5d9 100644
--- a/ecc/bw6-756/fr/polynomial/multilin.go
+++ b/ecc/bw6-756/fr/polynomial/multilin.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/polynomial/multilin_test.go b/ecc/bw6-756/fr/polynomial/multilin_test.go
index 74e716ac1..145d7c8f0 100644
--- a/ecc/bw6-756/fr/polynomial/multilin_test.go
+++ b/ecc/bw6-756/fr/polynomial/multilin_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/polynomial/polynomial.go b/ecc/bw6-756/fr/polynomial/polynomial.go
index a4f78112b..18b4bb46e 100644
--- a/ecc/bw6-756/fr/polynomial/polynomial.go
+++ b/ecc/bw6-756/fr/polynomial/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/polynomial/polynomial_test.go b/ecc/bw6-756/fr/polynomial/polynomial_test.go
index 34e8749c7..3ae83afcc 100644
--- a/ecc/bw6-756/fr/polynomial/polynomial_test.go
+++ b/ecc/bw6-756/fr/polynomial/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/polynomial/pool.go b/ecc/bw6-756/fr/polynomial/pool.go
index b7281d6b4..5ab101931 100644
--- a/ecc/bw6-756/fr/polynomial/pool.go
+++ b/ecc/bw6-756/fr/polynomial/pool.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/sumcheck/sumcheck.go b/ecc/bw6-756/fr/sumcheck/sumcheck.go
index c27e7da8a..0cbce7fa7 100644
--- a/ecc/bw6-756/fr/sumcheck/sumcheck.go
+++ b/ecc/bw6-756/fr/sumcheck/sumcheck.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/sumcheck/sumcheck_test.go b/ecc/bw6-756/fr/sumcheck/sumcheck_test.go
index 99801b312..8daf3dec4 100644
--- a/ecc/bw6-756/fr/sumcheck/sumcheck_test.go
+++ b/ecc/bw6-756/fr/sumcheck/sumcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/fr/test_vector_utils/test_vector_utils.go b/ecc/bw6-756/fr/test_vector_utils/test_vector_utils.go
index 1ff699ea5..afb8b4e2b 100644
--- a/ecc/bw6-756/fr/test_vector_utils/test_vector_utils.go
+++ b/ecc/bw6-756/fr/test_vector_utils/test_vector_utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/g1.go b/ecc/bw6-756/g1.go
index eca93a406..736c797d7 100644
--- a/ecc/bw6-756/g1.go
+++ b/ecc/bw6-756/g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/g1_test.go b/ecc/bw6-756/g1_test.go
index 5b71da8d2..b8e6964a8 100644
--- a/ecc/bw6-756/g1_test.go
+++ b/ecc/bw6-756/g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/g2.go b/ecc/bw6-756/g2.go
index f0ba94d23..b20c5173f 100644
--- a/ecc/bw6-756/g2.go
+++ b/ecc/bw6-756/g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/g2_test.go b/ecc/bw6-756/g2_test.go
index 29a83a3c1..0c5699b79 100644
--- a/ecc/bw6-756/g2_test.go
+++ b/ecc/bw6-756/g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/hash_to_g1.go b/ecc/bw6-756/hash_to_g1.go
index c7b678b2f..60516a93d 100644
--- a/ecc/bw6-756/hash_to_g1.go
+++ b/ecc/bw6-756/hash_to_g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/hash_to_g1_test.go b/ecc/bw6-756/hash_to_g1_test.go
index ffa80a08f..52fffa4a0 100644
--- a/ecc/bw6-756/hash_to_g1_test.go
+++ b/ecc/bw6-756/hash_to_g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/hash_to_g2.go b/ecc/bw6-756/hash_to_g2.go
index d314f0cfa..6b172aa82 100644
--- a/ecc/bw6-756/hash_to_g2.go
+++ b/ecc/bw6-756/hash_to_g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/hash_to_g2_test.go b/ecc/bw6-756/hash_to_g2_test.go
index f444e2a1d..0dca72afd 100644
--- a/ecc/bw6-756/hash_to_g2_test.go
+++ b/ecc/bw6-756/hash_to_g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/marshal.go b/ecc/bw6-756/marshal.go
index b62d30e48..156914b01 100644
--- a/ecc/bw6-756/marshal.go
+++ b/ecc/bw6-756/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/marshal_test.go b/ecc/bw6-756/marshal_test.go
index fa06db299..8f45b5c75 100644
--- a/ecc/bw6-756/marshal_test.go
+++ b/ecc/bw6-756/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/multiexp.go b/ecc/bw6-756/multiexp.go
index c20a86f56..3e691db6c 100644
--- a/ecc/bw6-756/multiexp.go
+++ b/ecc/bw6-756/multiexp.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/multiexp_affine.go b/ecc/bw6-756/multiexp_affine.go
index ce9b48dae..4a5df9652 100644
--- a/ecc/bw6-756/multiexp_affine.go
+++ b/ecc/bw6-756/multiexp_affine.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/multiexp_jacobian.go b/ecc/bw6-756/multiexp_jacobian.go
index 2f8d9904e..9251324d1 100644
--- a/ecc/bw6-756/multiexp_jacobian.go
+++ b/ecc/bw6-756/multiexp_jacobian.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/multiexp_test.go b/ecc/bw6-756/multiexp_test.go
index a944459b7..d454ef78d 100644
--- a/ecc/bw6-756/multiexp_test.go
+++ b/ecc/bw6-756/multiexp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/pairing_test.go b/ecc/bw6-756/pairing_test.go
index 61b47f4fd..0ea87f0de 100644
--- a/ecc/bw6-756/pairing_test.go
+++ b/ecc/bw6-756/pairing_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/twistededwards/curve.go b/ecc/bw6-756/twistededwards/curve.go
index 9c95c4f21..a18dbd35c 100644
--- a/ecc/bw6-756/twistededwards/curve.go
+++ b/ecc/bw6-756/twistededwards/curve.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/twistededwards/doc.go b/ecc/bw6-756/twistededwards/doc.go
index 771de3887..f9f92b78d 100644
--- a/ecc/bw6-756/twistededwards/doc.go
+++ b/ecc/bw6-756/twistededwards/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/twistededwards/eddsa/doc.go b/ecc/bw6-756/twistededwards/eddsa/doc.go
index 2e2d4c888..70657706d 100644
--- a/ecc/bw6-756/twistededwards/eddsa/doc.go
+++ b/ecc/bw6-756/twistededwards/eddsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/twistededwards/eddsa/eddsa.go b/ecc/bw6-756/twistededwards/eddsa/eddsa.go
index 13f4e4512..d639a9506 100644
--- a/ecc/bw6-756/twistededwards/eddsa/eddsa.go
+++ b/ecc/bw6-756/twistededwards/eddsa/eddsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go b/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go
index a0258d121..ae71d7c01 100644
--- a/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bw6-756/twistededwards/eddsa/eddsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/twistededwards/eddsa/marshal.go b/ecc/bw6-756/twistededwards/eddsa/marshal.go
index acf3c4173..89e0a8404 100644
--- a/ecc/bw6-756/twistededwards/eddsa/marshal.go
+++ b/ecc/bw6-756/twistededwards/eddsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/twistededwards/point.go b/ecc/bw6-756/twistededwards/point.go
index a0454e8b9..384db16ef 100644
--- a/ecc/bw6-756/twistededwards/point.go
+++ b/ecc/bw6-756/twistededwards/point.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-756/twistededwards/point_test.go b/ecc/bw6-756/twistededwards/point_test.go
index 9b28026a6..117bb6cf5 100644
--- a/ecc/bw6-756/twistededwards/point_test.go
+++ b/ecc/bw6-756/twistededwards/point_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/ecdsa/doc.go b/ecc/bw6-761/ecdsa/doc.go
index ea1c78355..855e796eb 100644
--- a/ecc/bw6-761/ecdsa/doc.go
+++ b/ecc/bw6-761/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/ecdsa/ecdsa.go b/ecc/bw6-761/ecdsa/ecdsa.go
index 033cd8f9d..4665a1f17 100644
--- a/ecc/bw6-761/ecdsa/ecdsa.go
+++ b/ecc/bw6-761/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/ecdsa/ecdsa_test.go b/ecc/bw6-761/ecdsa/ecdsa_test.go
index 5cf1276d6..54f06e68f 100644
--- a/ecc/bw6-761/ecdsa/ecdsa_test.go
+++ b/ecc/bw6-761/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/ecdsa/marshal.go b/ecc/bw6-761/ecdsa/marshal.go
index 72d74c5cb..c0ee0643e 100644
--- a/ecc/bw6-761/ecdsa/marshal.go
+++ b/ecc/bw6-761/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/ecdsa/marshal_test.go b/ecc/bw6-761/ecdsa/marshal_test.go
index 3c41062a2..c627ffa3e 100644
--- a/ecc/bw6-761/ecdsa/marshal_test.go
+++ b/ecc/bw6-761/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/fft/doc.go b/ecc/bw6-761/fr/fft/doc.go
index 3c35170e8..2391a9f63 100644
--- a/ecc/bw6-761/fr/fft/doc.go
+++ b/ecc/bw6-761/fr/fft/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/fft/domain.go b/ecc/bw6-761/fr/fft/domain.go
index 6b2b96e46..57aba819e 100644
--- a/ecc/bw6-761/fr/fft/domain.go
+++ b/ecc/bw6-761/fr/fft/domain.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/fft/domain_test.go b/ecc/bw6-761/fr/fft/domain_test.go
index 14d23dd99..83186cb7c 100644
--- a/ecc/bw6-761/fr/fft/domain_test.go
+++ b/ecc/bw6-761/fr/fft/domain_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/fft/fft.go b/ecc/bw6-761/fr/fft/fft.go
index 404eb0fd1..2e9dddd6e 100644
--- a/ecc/bw6-761/fr/fft/fft.go
+++ b/ecc/bw6-761/fr/fft/fft.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/fft/fft_test.go b/ecc/bw6-761/fr/fft/fft_test.go
index a4166b63e..4e8bc8953 100644
--- a/ecc/bw6-761/fr/fft/fft_test.go
+++ b/ecc/bw6-761/fr/fft/fft_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/fft/options.go b/ecc/bw6-761/fr/fft/options.go
index 603b76f29..02a6000e5 100644
--- a/ecc/bw6-761/fr/fft/options.go
+++ b/ecc/bw6-761/fr/fft/options.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/fri/doc.go b/ecc/bw6-761/fr/fri/doc.go
index 1a4cc68f3..3333ad41f 100644
--- a/ecc/bw6-761/fr/fri/doc.go
+++ b/ecc/bw6-761/fr/fri/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/fri/fri.go b/ecc/bw6-761/fr/fri/fri.go
index 590ecde99..6c8cb0bce 100644
--- a/ecc/bw6-761/fr/fri/fri.go
+++ b/ecc/bw6-761/fr/fri/fri.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/fri/fri_test.go b/ecc/bw6-761/fr/fri/fri_test.go
index feab95a15..838e21d2c 100644
--- a/ecc/bw6-761/fr/fri/fri_test.go
+++ b/ecc/bw6-761/fr/fri/fri_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/gkr/gkr.go b/ecc/bw6-761/fr/gkr/gkr.go
index 931ee3249..df782c49e 100644
--- a/ecc/bw6-761/fr/gkr/gkr.go
+++ b/ecc/bw6-761/fr/gkr/gkr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/gkr/gkr_test.go b/ecc/bw6-761/fr/gkr/gkr_test.go
index 5477887c2..b35ac78df 100644
--- a/ecc/bw6-761/fr/gkr/gkr_test.go
+++ b/ecc/bw6-761/fr/gkr/gkr_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/iop/doc.go b/ecc/bw6-761/fr/iop/doc.go
index cd87ef4d7..20f8b1a30 100644
--- a/ecc/bw6-761/fr/iop/doc.go
+++ b/ecc/bw6-761/fr/iop/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/iop/expressions.go b/ecc/bw6-761/fr/iop/expressions.go
index 1752c0fe3..995393da0 100644
--- a/ecc/bw6-761/fr/iop/expressions.go
+++ b/ecc/bw6-761/fr/iop/expressions.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/iop/expressions_test.go b/ecc/bw6-761/fr/iop/expressions_test.go
index d8998b727..5616c82d4 100644
--- a/ecc/bw6-761/fr/iop/expressions_test.go
+++ b/ecc/bw6-761/fr/iop/expressions_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/iop/polynomial.go b/ecc/bw6-761/fr/iop/polynomial.go
index c5066b18b..a17cc9ab3 100644
--- a/ecc/bw6-761/fr/iop/polynomial.go
+++ b/ecc/bw6-761/fr/iop/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/iop/polynomial_test.go b/ecc/bw6-761/fr/iop/polynomial_test.go
index 6d253dd5d..15f3040fe 100644
--- a/ecc/bw6-761/fr/iop/polynomial_test.go
+++ b/ecc/bw6-761/fr/iop/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/iop/quotient.go b/ecc/bw6-761/fr/iop/quotient.go
index 0a081b4fc..1267bc4b6 100644
--- a/ecc/bw6-761/fr/iop/quotient.go
+++ b/ecc/bw6-761/fr/iop/quotient.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/iop/quotient_test.go b/ecc/bw6-761/fr/iop/quotient_test.go
index 3267e542e..509394c37 100644
--- a/ecc/bw6-761/fr/iop/quotient_test.go
+++ b/ecc/bw6-761/fr/iop/quotient_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/iop/ratios.go b/ecc/bw6-761/fr/iop/ratios.go
index 7d7bec6fd..3a23bde13 100644
--- a/ecc/bw6-761/fr/iop/ratios.go
+++ b/ecc/bw6-761/fr/iop/ratios.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/iop/ratios_test.go b/ecc/bw6-761/fr/iop/ratios_test.go
index b2ca066c4..b42149d4f 100644
--- a/ecc/bw6-761/fr/iop/ratios_test.go
+++ b/ecc/bw6-761/fr/iop/ratios_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/iop/utils.go b/ecc/bw6-761/fr/iop/utils.go
index 35f25ae6c..f5330ba03 100644
--- a/ecc/bw6-761/fr/iop/utils.go
+++ b/ecc/bw6-761/fr/iop/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/kzg/doc.go b/ecc/bw6-761/fr/kzg/doc.go
index d8a77e8f6..d1045726f 100644
--- a/ecc/bw6-761/fr/kzg/doc.go
+++ b/ecc/bw6-761/fr/kzg/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/kzg/kzg.go b/ecc/bw6-761/fr/kzg/kzg.go
index 9dfe56592..24a74dd11 100644
--- a/ecc/bw6-761/fr/kzg/kzg.go
+++ b/ecc/bw6-761/fr/kzg/kzg.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/kzg/kzg_test.go b/ecc/bw6-761/fr/kzg/kzg_test.go
index 281bc2a89..bbdc52597 100644
--- a/ecc/bw6-761/fr/kzg/kzg_test.go
+++ b/ecc/bw6-761/fr/kzg/kzg_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/kzg/marshal.go b/ecc/bw6-761/fr/kzg/marshal.go
index 2215fc6c5..b5a87b3bf 100644
--- a/ecc/bw6-761/fr/kzg/marshal.go
+++ b/ecc/bw6-761/fr/kzg/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/mimc/doc.go b/ecc/bw6-761/fr/mimc/doc.go
index 497bd40a9..d527ead9e 100644
--- a/ecc/bw6-761/fr/mimc/doc.go
+++ b/ecc/bw6-761/fr/mimc/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/mimc/mimc.go b/ecc/bw6-761/fr/mimc/mimc.go
index 26d27cc98..d628e7791 100644
--- a/ecc/bw6-761/fr/mimc/mimc.go
+++ b/ecc/bw6-761/fr/mimc/mimc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/pedersen/pedersen.go b/ecc/bw6-761/fr/pedersen/pedersen.go
index f22b49970..a949a3c2c 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/pedersen/pedersen_test.go b/ecc/bw6-761/fr/pedersen/pedersen_test.go
index 646cf0e9b..bb711c93b 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/permutation/doc.go b/ecc/bw6-761/fr/permutation/doc.go
index bdf98e6ca..7ef21ffb9 100644
--- a/ecc/bw6-761/fr/permutation/doc.go
+++ b/ecc/bw6-761/fr/permutation/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/permutation/permutation.go b/ecc/bw6-761/fr/permutation/permutation.go
index 31e851656..a45441e1f 100644
--- a/ecc/bw6-761/fr/permutation/permutation.go
+++ b/ecc/bw6-761/fr/permutation/permutation.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/permutation/permutation_test.go b/ecc/bw6-761/fr/permutation/permutation_test.go
index 4cdb905ce..62d42dfa0 100644
--- a/ecc/bw6-761/fr/permutation/permutation_test.go
+++ b/ecc/bw6-761/fr/permutation/permutation_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/plookup/doc.go b/ecc/bw6-761/fr/plookup/doc.go
index ec4b91287..b3af01968 100644
--- a/ecc/bw6-761/fr/plookup/doc.go
+++ b/ecc/bw6-761/fr/plookup/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/plookup/plookup_test.go b/ecc/bw6-761/fr/plookup/plookup_test.go
index a9224f6a4..1350ec7c0 100644
--- a/ecc/bw6-761/fr/plookup/plookup_test.go
+++ b/ecc/bw6-761/fr/plookup/plookup_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/plookup/table.go b/ecc/bw6-761/fr/plookup/table.go
index 203e3eb3b..c8d706be0 100644
--- a/ecc/bw6-761/fr/plookup/table.go
+++ b/ecc/bw6-761/fr/plookup/table.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/plookup/vector.go b/ecc/bw6-761/fr/plookup/vector.go
index 9b8630890..2bb1a2632 100644
--- a/ecc/bw6-761/fr/plookup/vector.go
+++ b/ecc/bw6-761/fr/plookup/vector.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/polynomial/doc.go b/ecc/bw6-761/fr/polynomial/doc.go
index 83479b058..747da41f2 100644
--- a/ecc/bw6-761/fr/polynomial/doc.go
+++ b/ecc/bw6-761/fr/polynomial/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/polynomial/multilin.go b/ecc/bw6-761/fr/polynomial/multilin.go
index 89c27b9f7..916c96660 100644
--- a/ecc/bw6-761/fr/polynomial/multilin.go
+++ b/ecc/bw6-761/fr/polynomial/multilin.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/polynomial/multilin_test.go b/ecc/bw6-761/fr/polynomial/multilin_test.go
index 6ff315ea5..4c574976b 100644
--- a/ecc/bw6-761/fr/polynomial/multilin_test.go
+++ b/ecc/bw6-761/fr/polynomial/multilin_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/polynomial/polynomial.go b/ecc/bw6-761/fr/polynomial/polynomial.go
index d5f029e27..c0ec2235b 100644
--- a/ecc/bw6-761/fr/polynomial/polynomial.go
+++ b/ecc/bw6-761/fr/polynomial/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/polynomial/polynomial_test.go b/ecc/bw6-761/fr/polynomial/polynomial_test.go
index cb0857b51..487bfe630 100644
--- a/ecc/bw6-761/fr/polynomial/polynomial_test.go
+++ b/ecc/bw6-761/fr/polynomial/polynomial_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/polynomial/pool.go b/ecc/bw6-761/fr/polynomial/pool.go
index d6ca5b806..f122d117e 100644
--- a/ecc/bw6-761/fr/polynomial/pool.go
+++ b/ecc/bw6-761/fr/polynomial/pool.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/sumcheck/sumcheck.go b/ecc/bw6-761/fr/sumcheck/sumcheck.go
index 7c0aa092e..1c6afa936 100644
--- a/ecc/bw6-761/fr/sumcheck/sumcheck.go
+++ b/ecc/bw6-761/fr/sumcheck/sumcheck.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/sumcheck/sumcheck_test.go b/ecc/bw6-761/fr/sumcheck/sumcheck_test.go
index 17152970e..f7502c70a 100644
--- a/ecc/bw6-761/fr/sumcheck/sumcheck_test.go
+++ b/ecc/bw6-761/fr/sumcheck/sumcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/fr/test_vector_utils/test_vector_utils.go b/ecc/bw6-761/fr/test_vector_utils/test_vector_utils.go
index 7405907e5..8503b5170 100644
--- a/ecc/bw6-761/fr/test_vector_utils/test_vector_utils.go
+++ b/ecc/bw6-761/fr/test_vector_utils/test_vector_utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/g1.go b/ecc/bw6-761/g1.go
index 827dbf89f..da59bd522 100644
--- a/ecc/bw6-761/g1.go
+++ b/ecc/bw6-761/g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/g1_test.go b/ecc/bw6-761/g1_test.go
index e128bb8d5..6f342aa51 100644
--- a/ecc/bw6-761/g1_test.go
+++ b/ecc/bw6-761/g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/g2.go b/ecc/bw6-761/g2.go
index 7b6854631..00847857d 100644
--- a/ecc/bw6-761/g2.go
+++ b/ecc/bw6-761/g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/g2_test.go b/ecc/bw6-761/g2_test.go
index 54a13948d..55f053a3d 100644
--- a/ecc/bw6-761/g2_test.go
+++ b/ecc/bw6-761/g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/hash_to_g1.go b/ecc/bw6-761/hash_to_g1.go
index 2dd3fd0d0..19d7008a5 100644
--- a/ecc/bw6-761/hash_to_g1.go
+++ b/ecc/bw6-761/hash_to_g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/hash_to_g1_test.go b/ecc/bw6-761/hash_to_g1_test.go
index db33614c6..3e111436d 100644
--- a/ecc/bw6-761/hash_to_g1_test.go
+++ b/ecc/bw6-761/hash_to_g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/hash_to_g2.go b/ecc/bw6-761/hash_to_g2.go
index 4b2080736..04deda08f 100644
--- a/ecc/bw6-761/hash_to_g2.go
+++ b/ecc/bw6-761/hash_to_g2.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/hash_to_g2_test.go b/ecc/bw6-761/hash_to_g2_test.go
index e669c88c5..14d7bb5af 100644
--- a/ecc/bw6-761/hash_to_g2_test.go
+++ b/ecc/bw6-761/hash_to_g2_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/marshal.go b/ecc/bw6-761/marshal.go
index 1c5cc799b..423dadcf6 100644
--- a/ecc/bw6-761/marshal.go
+++ b/ecc/bw6-761/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/marshal_test.go b/ecc/bw6-761/marshal_test.go
index 99b6bcfa2..fae4f2212 100644
--- a/ecc/bw6-761/marshal_test.go
+++ b/ecc/bw6-761/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/multiexp.go b/ecc/bw6-761/multiexp.go
index 71fff74f7..47aa334cc 100644
--- a/ecc/bw6-761/multiexp.go
+++ b/ecc/bw6-761/multiexp.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/multiexp_affine.go b/ecc/bw6-761/multiexp_affine.go
index 5cbc271e3..1e6737077 100644
--- a/ecc/bw6-761/multiexp_affine.go
+++ b/ecc/bw6-761/multiexp_affine.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/multiexp_jacobian.go b/ecc/bw6-761/multiexp_jacobian.go
index b300811d9..16d7e6c8d 100644
--- a/ecc/bw6-761/multiexp_jacobian.go
+++ b/ecc/bw6-761/multiexp_jacobian.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/multiexp_test.go b/ecc/bw6-761/multiexp_test.go
index 13e025fa2..66e6e1724 100644
--- a/ecc/bw6-761/multiexp_test.go
+++ b/ecc/bw6-761/multiexp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/pairing_test.go b/ecc/bw6-761/pairing_test.go
index d77080644..c1fb3ee88 100644
--- a/ecc/bw6-761/pairing_test.go
+++ b/ecc/bw6-761/pairing_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/twistededwards/curve.go b/ecc/bw6-761/twistededwards/curve.go
index 5dcc43f2a..3050d84b8 100644
--- a/ecc/bw6-761/twistededwards/curve.go
+++ b/ecc/bw6-761/twistededwards/curve.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/twistededwards/doc.go b/ecc/bw6-761/twistededwards/doc.go
index c615898fb..bcfe56cd4 100644
--- a/ecc/bw6-761/twistededwards/doc.go
+++ b/ecc/bw6-761/twistededwards/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/twistededwards/eddsa/doc.go b/ecc/bw6-761/twistededwards/eddsa/doc.go
index fe9aab1d4..20bd6b502 100644
--- a/ecc/bw6-761/twistededwards/eddsa/doc.go
+++ b/ecc/bw6-761/twistededwards/eddsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/twistededwards/eddsa/eddsa.go b/ecc/bw6-761/twistededwards/eddsa/eddsa.go
index fb00ae284..0211368c9 100644
--- a/ecc/bw6-761/twistededwards/eddsa/eddsa.go
+++ b/ecc/bw6-761/twistededwards/eddsa/eddsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go b/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go
index a5654456a..e24099212 100644
--- a/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go
+++ b/ecc/bw6-761/twistededwards/eddsa/eddsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/twistededwards/eddsa/marshal.go b/ecc/bw6-761/twistededwards/eddsa/marshal.go
index acf3c4173..89e0a8404 100644
--- a/ecc/bw6-761/twistededwards/eddsa/marshal.go
+++ b/ecc/bw6-761/twistededwards/eddsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/twistededwards/point.go b/ecc/bw6-761/twistededwards/point.go
index 5a494f828..b44a0c024 100644
--- a/ecc/bw6-761/twistededwards/point.go
+++ b/ecc/bw6-761/twistededwards/point.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/bw6-761/twistededwards/point_test.go b/ecc/bw6-761/twistededwards/point_test.go
index eae940691..9e97f2a15 100644
--- a/ecc/bw6-761/twistededwards/point_test.go
+++ b/ecc/bw6-761/twistededwards/point_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/ecdsa/doc.go b/ecc/secp256k1/ecdsa/doc.go
index ac59fef6f..cca66227a 100644
--- a/ecc/secp256k1/ecdsa/doc.go
+++ b/ecc/secp256k1/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/ecdsa/ecdsa.go b/ecc/secp256k1/ecdsa/ecdsa.go
index 742add4b9..f1489bd65 100644
--- a/ecc/secp256k1/ecdsa/ecdsa.go
+++ b/ecc/secp256k1/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/ecdsa/ecdsa_test.go b/ecc/secp256k1/ecdsa/ecdsa_test.go
index 197b8e76d..b5745d505 100644
--- a/ecc/secp256k1/ecdsa/ecdsa_test.go
+++ b/ecc/secp256k1/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/ecdsa/marshal.go b/ecc/secp256k1/ecdsa/marshal.go
index 9eb91dc9e..1c6184353 100644
--- a/ecc/secp256k1/ecdsa/marshal.go
+++ b/ecc/secp256k1/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/ecdsa/marshal_test.go b/ecc/secp256k1/ecdsa/marshal_test.go
index b5a7f1af1..a880e6301 100644
--- a/ecc/secp256k1/ecdsa/marshal_test.go
+++ b/ecc/secp256k1/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/g1.go b/ecc/secp256k1/g1.go
index b5f98a028..eb294f23e 100644
--- a/ecc/secp256k1/g1.go
+++ b/ecc/secp256k1/g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/g1_test.go b/ecc/secp256k1/g1_test.go
index 2dae2547f..252e46aef 100644
--- a/ecc/secp256k1/g1_test.go
+++ b/ecc/secp256k1/g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/hash_to_g1.go b/ecc/secp256k1/hash_to_g1.go
index 21c2c13a1..41bec83c0 100644
--- a/ecc/secp256k1/hash_to_g1.go
+++ b/ecc/secp256k1/hash_to_g1.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/hash_to_g1_test.go b/ecc/secp256k1/hash_to_g1_test.go
index fe00906fc..8dcbc249d 100644
--- a/ecc/secp256k1/hash_to_g1_test.go
+++ b/ecc/secp256k1/hash_to_g1_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/multiexp.go b/ecc/secp256k1/multiexp.go
index 319f27b80..02febdfef 100644
--- a/ecc/secp256k1/multiexp.go
+++ b/ecc/secp256k1/multiexp.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/multiexp_affine.go b/ecc/secp256k1/multiexp_affine.go
index a6c0abef8..a7a6c0c16 100644
--- a/ecc/secp256k1/multiexp_affine.go
+++ b/ecc/secp256k1/multiexp_affine.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/multiexp_jacobian.go b/ecc/secp256k1/multiexp_jacobian.go
index eaa737d3b..788e64661 100644
--- a/ecc/secp256k1/multiexp_jacobian.go
+++ b/ecc/secp256k1/multiexp_jacobian.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/secp256k1/multiexp_test.go b/ecc/secp256k1/multiexp_test.go
index 08996728a..e0ad2cf8d 100644
--- a/ecc/secp256k1/multiexp_test.go
+++ b/ecc/secp256k1/multiexp_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/stark-curve/ecdsa/doc.go b/ecc/stark-curve/ecdsa/doc.go
index f704026f7..9adee1566 100644
--- a/ecc/stark-curve/ecdsa/doc.go
+++ b/ecc/stark-curve/ecdsa/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/stark-curve/ecdsa/ecdsa.go b/ecc/stark-curve/ecdsa/ecdsa.go
index 9746d29ad..0523fa1e2 100644
--- a/ecc/stark-curve/ecdsa/ecdsa.go
+++ b/ecc/stark-curve/ecdsa/ecdsa.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/stark-curve/ecdsa/ecdsa_test.go b/ecc/stark-curve/ecdsa/ecdsa_test.go
index 5884ab5f4..eb6de4ba2 100644
--- a/ecc/stark-curve/ecdsa/ecdsa_test.go
+++ b/ecc/stark-curve/ecdsa/ecdsa_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/stark-curve/ecdsa/marshal.go b/ecc/stark-curve/ecdsa/marshal.go
index 8cf682d31..932fd5c0e 100644
--- a/ecc/stark-curve/ecdsa/marshal.go
+++ b/ecc/stark-curve/ecdsa/marshal.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/ecc/stark-curve/ecdsa/marshal_test.go b/ecc/stark-curve/ecdsa/marshal_test.go
index da2130c6d..f20fb8167 100644
--- a/ecc/stark-curve/ecdsa/marshal_test.go
+++ b/ecc/stark-curve/ecdsa/marshal_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/internal/generator/gkr/test_vectors/main.go b/internal/generator/gkr/test_vectors/main.go
index 3822aa3de..9e5246472 100644
--- a/internal/generator/gkr/test_vectors/main.go
+++ b/internal/generator/gkr/test_vectors/main.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/internal/generator/main.go b/internal/generator/main.go
index 4fa807b1d..e3617066f 100644
--- a/internal/generator/main.go
+++ b/internal/generator/main.go
@@ -32,7 +32,7 @@ import (
)
const (
- copyrightHolder = "ConsenSys Software Inc."
+ copyrightHolder = "Consensys Software Inc."
copyrightYear = 2020
baseDir = "../../"
)
diff --git a/internal/generator/test_vector_utils/small_rational/gkr/gkr.go b/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
index 800a1d692..8ad606227 100644
--- a/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
+++ b/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/internal/generator/test_vector_utils/small_rational/polynomial/doc.go b/internal/generator/test_vector_utils/small_rational/polynomial/doc.go
index 83479b058..747da41f2 100644
--- a/internal/generator/test_vector_utils/small_rational/polynomial/doc.go
+++ b/internal/generator/test_vector_utils/small_rational/polynomial/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/internal/generator/test_vector_utils/small_rational/polynomial/multilin.go b/internal/generator/test_vector_utils/small_rational/polynomial/multilin.go
index 3ff25f94a..5f4217ad2 100644
--- a/internal/generator/test_vector_utils/small_rational/polynomial/multilin.go
+++ b/internal/generator/test_vector_utils/small_rational/polynomial/multilin.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/internal/generator/test_vector_utils/small_rational/polynomial/polynomial.go b/internal/generator/test_vector_utils/small_rational/polynomial/polynomial.go
index dc99b9eef..610e1c9c6 100644
--- a/internal/generator/test_vector_utils/small_rational/polynomial/polynomial.go
+++ b/internal/generator/test_vector_utils/small_rational/polynomial/polynomial.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/internal/generator/test_vector_utils/small_rational/polynomial/pool.go b/internal/generator/test_vector_utils/small_rational/polynomial/pool.go
index 737f4f404..15d4f871d 100644
--- a/internal/generator/test_vector_utils/small_rational/polynomial/pool.go
+++ b/internal/generator/test_vector_utils/small_rational/polynomial/pool.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/internal/generator/test_vector_utils/small_rational/sumcheck/sumcheck.go b/internal/generator/test_vector_utils/small_rational/sumcheck/sumcheck.go
index 940a8a27c..4f33c8017 100644
--- a/internal/generator/test_vector_utils/small_rational/sumcheck/sumcheck.go
+++ b/internal/generator/test_vector_utils/small_rational/sumcheck/sumcheck.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/internal/generator/test_vector_utils/small_rational/sumcheck/sumcheck_test.go b/internal/generator/test_vector_utils/small_rational/sumcheck/sumcheck_test.go
index e30e37b4d..0c816fe43 100644
--- a/internal/generator/test_vector_utils/small_rational/sumcheck/sumcheck_test.go
+++ b/internal/generator/test_vector_utils/small_rational/sumcheck/sumcheck_test.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/internal/generator/test_vector_utils/small_rational/test_vector_utils/test_vector_utils.go b/internal/generator/test_vector_utils/small_rational/test_vector_utils/test_vector_utils.go
index e93d43b66..422bfda28 100644
--- a/internal/generator/test_vector_utils/small_rational/test_vector_utils/test_vector_utils.go
+++ b/internal/generator/test_vector_utils/small_rational/test_vector_utils/test_vector_utils.go
@@ -1,4 +1,4 @@
-// Copyright 2020 ConsenSys Software Inc.
+// Copyright 2020 Consensys Software Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
From 0901a2430d0bf629a2145385702665421a0b63be Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Fri, 2 Jun 2023 12:25:26 -0500
Subject: [PATCH 21/51] feat: pedersen(bn254).WriteRawTo
---
ecc/bn254/fr/pedersen/pedersen.go | 21 +++++++++++++++++----
ecc/bn254/fr/pedersen/pedersen_test.go | 2 ++
utils/testing.go | 21 +++++++++++++++++++++
3 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go
index d629a4d36..4c8f5a52d 100644
--- a/ecc/bn254/fr/pedersen/pedersen.go
+++ b/ecc/bn254/fr/pedersen/pedersen.go
@@ -244,9 +244,7 @@ func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
// Marshal
-func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
-
+func (pk *ProvingKey) writeTo(enc *curve.Encoder) (int64, error) {
if err := enc.Encode(pk.basis); err != nil {
return enc.BytesWritten(), err
}
@@ -256,6 +254,14 @@ func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
return enc.BytesWritten(), err
}
+func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w))
+}
+
+func (pk *ProvingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
dec := curve.NewDecoder(r)
@@ -274,7 +280,14 @@ func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
}
func (vk *VerifyingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
+ return vk.writeTo(curve.NewEncoder(w))
+}
+
+func (vk *VerifyingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return vk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
+func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
var err error
if err = enc.Encode(&vk.g); err != nil {
diff --git a/ecc/bn254/fr/pedersen/pedersen_test.go b/ecc/bn254/fr/pedersen/pedersen_test.go
index 657ebc920..06e8de5c8 100644
--- a/ecc/bn254/fr/pedersen/pedersen_test.go
+++ b/ecc/bn254/fr/pedersen/pedersen_test.go
@@ -179,5 +179,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
+ t.Run("ProvingKey (raw) -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
+ t.Run("VerifyingKey (raw) -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
diff --git a/utils/testing.go b/utils/testing.go
index af2d37c20..247ec63d5 100644
--- a/utils/testing.go
+++ b/utils/testing.go
@@ -13,6 +13,10 @@ type Serializable interface {
io.WriterTo
}
+type RawSerializable interface {
+ WriteRawTo(io.Writer) (int64, error)
+}
+
func SerializationRoundTrip(o Serializable) func(*testing.T) {
return func(t *testing.T) {
// serialize it...
@@ -29,3 +33,20 @@ func SerializationRoundTrip(o Serializable) func(*testing.T) {
assert.Equal(t, o, _o)
}
}
+
+func SerializationRoundTripRaw(o RawSerializable) func(*testing.T) {
+ return func(t *testing.T) {
+ // serialize it...
+ var buf bytes.Buffer
+ _, err := o.WriteRawTo(&buf)
+ assert.NoError(t, err)
+
+ // reconstruct the object
+ _o := reflect.New(reflect.TypeOf(o).Elem()).Interface().(Serializable)
+ _, err = _o.ReadFrom(&buf)
+ assert.NoError(t, err)
+
+ // compare
+ assert.Equal(t, o, _o)
+ }
+}
From 1b0cf800bb36c67d4913536d303bc793c25e8680 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Fri, 2 Jun 2023 12:37:24 -0500
Subject: [PATCH 22/51] build: generify
---
ecc/bls12-377/fr/pedersen/pedersen.go | 21 +++++++++++++++----
ecc/bls12-377/fr/pedersen/pedersen_test.go | 2 ++
ecc/bls12-378/fr/pedersen/pedersen.go | 21 +++++++++++++++----
ecc/bls12-378/fr/pedersen/pedersen_test.go | 2 ++
ecc/bls12-381/fr/pedersen/pedersen.go | 21 +++++++++++++++----
ecc/bls12-381/fr/pedersen/pedersen_test.go | 2 ++
ecc/bls24-315/fr/pedersen/pedersen.go | 21 +++++++++++++++----
ecc/bls24-315/fr/pedersen/pedersen_test.go | 2 ++
ecc/bls24-317/fr/pedersen/pedersen.go | 21 +++++++++++++++----
ecc/bls24-317/fr/pedersen/pedersen_test.go | 2 ++
ecc/bn254/fr/pedersen/pedersen_test.go | 4 ++--
ecc/bw6-633/fr/pedersen/pedersen.go | 21 +++++++++++++++----
ecc/bw6-633/fr/pedersen/pedersen_test.go | 2 ++
ecc/bw6-756/fr/pedersen/pedersen.go | 21 +++++++++++++++----
ecc/bw6-756/fr/pedersen/pedersen_test.go | 2 ++
ecc/bw6-761/fr/pedersen/pedersen.go | 21 +++++++++++++++----
ecc/bw6-761/fr/pedersen/pedersen_test.go | 2 ++
.../pedersen/template/pedersen.go.tmpl | 21 +++++++++++++++----
.../pedersen/template/pedersen.test.go.tmpl | 2 ++
19 files changed, 173 insertions(+), 38 deletions(-)
diff --git a/ecc/bls12-377/fr/pedersen/pedersen.go b/ecc/bls12-377/fr/pedersen/pedersen.go
index e61939299..cae70c625 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen.go
@@ -244,9 +244,7 @@ func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
// Marshal
-func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
-
+func (pk *ProvingKey) writeTo(enc *curve.Encoder) (int64, error) {
if err := enc.Encode(pk.basis); err != nil {
return enc.BytesWritten(), err
}
@@ -256,6 +254,14 @@ func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
return enc.BytesWritten(), err
}
+func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w))
+}
+
+func (pk *ProvingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
dec := curve.NewDecoder(r)
@@ -274,7 +280,14 @@ func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
}
func (vk *VerifyingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
+ return vk.writeTo(curve.NewEncoder(w))
+}
+
+func (vk *VerifyingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return vk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
+func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
var err error
if err = enc.Encode(&vk.g); err != nil {
diff --git a/ecc/bls12-377/fr/pedersen/pedersen_test.go b/ecc/bls12-377/fr/pedersen/pedersen_test.go
index d01b39e5e..b7fdeeaa0 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen_test.go
@@ -179,5 +179,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
+ t.Run("ProvingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
+ t.Run("VerifyingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
diff --git a/ecc/bls12-378/fr/pedersen/pedersen.go b/ecc/bls12-378/fr/pedersen/pedersen.go
index ba787bece..814c8c5db 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen.go
@@ -244,9 +244,7 @@ func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
// Marshal
-func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
-
+func (pk *ProvingKey) writeTo(enc *curve.Encoder) (int64, error) {
if err := enc.Encode(pk.basis); err != nil {
return enc.BytesWritten(), err
}
@@ -256,6 +254,14 @@ func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
return enc.BytesWritten(), err
}
+func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w))
+}
+
+func (pk *ProvingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
dec := curve.NewDecoder(r)
@@ -274,7 +280,14 @@ func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
}
func (vk *VerifyingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
+ return vk.writeTo(curve.NewEncoder(w))
+}
+
+func (vk *VerifyingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return vk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
+func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
var err error
if err = enc.Encode(&vk.g); err != nil {
diff --git a/ecc/bls12-378/fr/pedersen/pedersen_test.go b/ecc/bls12-378/fr/pedersen/pedersen_test.go
index 1b925b93d..f6d85ec2d 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen_test.go
@@ -179,5 +179,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
+ t.Run("ProvingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
+ t.Run("VerifyingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
diff --git a/ecc/bls12-381/fr/pedersen/pedersen.go b/ecc/bls12-381/fr/pedersen/pedersen.go
index 1cabe8655..17be46bc3 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen.go
@@ -244,9 +244,7 @@ func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
// Marshal
-func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
-
+func (pk *ProvingKey) writeTo(enc *curve.Encoder) (int64, error) {
if err := enc.Encode(pk.basis); err != nil {
return enc.BytesWritten(), err
}
@@ -256,6 +254,14 @@ func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
return enc.BytesWritten(), err
}
+func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w))
+}
+
+func (pk *ProvingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
dec := curve.NewDecoder(r)
@@ -274,7 +280,14 @@ func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
}
func (vk *VerifyingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
+ return vk.writeTo(curve.NewEncoder(w))
+}
+
+func (vk *VerifyingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return vk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
+func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
var err error
if err = enc.Encode(&vk.g); err != nil {
diff --git a/ecc/bls12-381/fr/pedersen/pedersen_test.go b/ecc/bls12-381/fr/pedersen/pedersen_test.go
index d03a79cc5..5f499c29e 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen_test.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen_test.go
@@ -179,5 +179,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
+ t.Run("ProvingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
+ t.Run("VerifyingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
diff --git a/ecc/bls24-315/fr/pedersen/pedersen.go b/ecc/bls24-315/fr/pedersen/pedersen.go
index ec9797ad6..4ce9d9d1e 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen.go
@@ -244,9 +244,7 @@ func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
// Marshal
-func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
-
+func (pk *ProvingKey) writeTo(enc *curve.Encoder) (int64, error) {
if err := enc.Encode(pk.basis); err != nil {
return enc.BytesWritten(), err
}
@@ -256,6 +254,14 @@ func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
return enc.BytesWritten(), err
}
+func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w))
+}
+
+func (pk *ProvingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
dec := curve.NewDecoder(r)
@@ -274,7 +280,14 @@ func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
}
func (vk *VerifyingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
+ return vk.writeTo(curve.NewEncoder(w))
+}
+
+func (vk *VerifyingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return vk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
+func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
var err error
if err = enc.Encode(&vk.g); err != nil {
diff --git a/ecc/bls24-315/fr/pedersen/pedersen_test.go b/ecc/bls24-315/fr/pedersen/pedersen_test.go
index 377a5de3f..cec9770c1 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen_test.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen_test.go
@@ -179,5 +179,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
+ t.Run("ProvingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
+ t.Run("VerifyingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
diff --git a/ecc/bls24-317/fr/pedersen/pedersen.go b/ecc/bls24-317/fr/pedersen/pedersen.go
index 180d9299a..c4a7e40eb 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen.go
@@ -244,9 +244,7 @@ func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
// Marshal
-func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
-
+func (pk *ProvingKey) writeTo(enc *curve.Encoder) (int64, error) {
if err := enc.Encode(pk.basis); err != nil {
return enc.BytesWritten(), err
}
@@ -256,6 +254,14 @@ func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
return enc.BytesWritten(), err
}
+func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w))
+}
+
+func (pk *ProvingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
dec := curve.NewDecoder(r)
@@ -274,7 +280,14 @@ func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
}
func (vk *VerifyingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
+ return vk.writeTo(curve.NewEncoder(w))
+}
+
+func (vk *VerifyingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return vk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
+func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
var err error
if err = enc.Encode(&vk.g); err != nil {
diff --git a/ecc/bls24-317/fr/pedersen/pedersen_test.go b/ecc/bls24-317/fr/pedersen/pedersen_test.go
index 3cfe6e368..f299af085 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen_test.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen_test.go
@@ -179,5 +179,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
+ t.Run("ProvingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
+ t.Run("VerifyingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
diff --git a/ecc/bn254/fr/pedersen/pedersen_test.go b/ecc/bn254/fr/pedersen/pedersen_test.go
index 06e8de5c8..1939b3bf9 100644
--- a/ecc/bn254/fr/pedersen/pedersen_test.go
+++ b/ecc/bn254/fr/pedersen/pedersen_test.go
@@ -179,7 +179,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
- t.Run("ProvingKey (raw) -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
+ t.Run("ProvingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
- t.Run("VerifyingKey (raw) -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
+ t.Run("VerifyingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
diff --git a/ecc/bw6-633/fr/pedersen/pedersen.go b/ecc/bw6-633/fr/pedersen/pedersen.go
index e87fce823..4e154a64e 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen.go
@@ -244,9 +244,7 @@ func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
// Marshal
-func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
-
+func (pk *ProvingKey) writeTo(enc *curve.Encoder) (int64, error) {
if err := enc.Encode(pk.basis); err != nil {
return enc.BytesWritten(), err
}
@@ -256,6 +254,14 @@ func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
return enc.BytesWritten(), err
}
+func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w))
+}
+
+func (pk *ProvingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
dec := curve.NewDecoder(r)
@@ -274,7 +280,14 @@ func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
}
func (vk *VerifyingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
+ return vk.writeTo(curve.NewEncoder(w))
+}
+
+func (vk *VerifyingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return vk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
+func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
var err error
if err = enc.Encode(&vk.g); err != nil {
diff --git a/ecc/bw6-633/fr/pedersen/pedersen_test.go b/ecc/bw6-633/fr/pedersen/pedersen_test.go
index 8be81f154..df519d9ff 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen_test.go
@@ -179,5 +179,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
+ t.Run("ProvingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
+ t.Run("VerifyingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
diff --git a/ecc/bw6-756/fr/pedersen/pedersen.go b/ecc/bw6-756/fr/pedersen/pedersen.go
index b625db016..3041dd642 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen.go
@@ -244,9 +244,7 @@ func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
// Marshal
-func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
-
+func (pk *ProvingKey) writeTo(enc *curve.Encoder) (int64, error) {
if err := enc.Encode(pk.basis); err != nil {
return enc.BytesWritten(), err
}
@@ -256,6 +254,14 @@ func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
return enc.BytesWritten(), err
}
+func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w))
+}
+
+func (pk *ProvingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
dec := curve.NewDecoder(r)
@@ -274,7 +280,14 @@ func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
}
func (vk *VerifyingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
+ return vk.writeTo(curve.NewEncoder(w))
+}
+
+func (vk *VerifyingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return vk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
+func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
var err error
if err = enc.Encode(&vk.g); err != nil {
diff --git a/ecc/bw6-756/fr/pedersen/pedersen_test.go b/ecc/bw6-756/fr/pedersen/pedersen_test.go
index 33e8d5843..06cf64470 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen_test.go
@@ -179,5 +179,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
+ t.Run("ProvingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
+ t.Run("VerifyingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
diff --git a/ecc/bw6-761/fr/pedersen/pedersen.go b/ecc/bw6-761/fr/pedersen/pedersen.go
index 6d36f11c3..51c8fa083 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen.go
@@ -244,9 +244,7 @@ func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
// Marshal
-func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
-
+func (pk *ProvingKey) writeTo(enc *curve.Encoder) (int64, error) {
if err := enc.Encode(pk.basis); err != nil {
return enc.BytesWritten(), err
}
@@ -256,6 +254,14 @@ func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
return enc.BytesWritten(), err
}
+func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w))
+}
+
+func (pk *ProvingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
dec := curve.NewDecoder(r)
@@ -274,7 +280,14 @@ func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
}
func (vk *VerifyingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
+ return vk.writeTo(curve.NewEncoder(w))
+}
+
+func (vk *VerifyingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return vk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
+func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
var err error
if err = enc.Encode(&vk.g); err != nil {
diff --git a/ecc/bw6-761/fr/pedersen/pedersen_test.go b/ecc/bw6-761/fr/pedersen/pedersen_test.go
index 2801a5850..aacb677c3 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen_test.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen_test.go
@@ -179,5 +179,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
+ t.Run("ProvingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
+ t.Run("VerifyingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
diff --git a/internal/generator/pedersen/template/pedersen.go.tmpl b/internal/generator/pedersen/template/pedersen.go.tmpl
index 697bdd90c..d9db523db 100644
--- a/internal/generator/pedersen/template/pedersen.go.tmpl
+++ b/internal/generator/pedersen/template/pedersen.go.tmpl
@@ -226,9 +226,7 @@ func getChallenge(fiatshamirSeeds [][]byte) (r fr.Element, err error) {
// Marshal
-func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
-
+func (pk *ProvingKey) writeTo(enc *curve.Encoder) (int64, error) {
if err := enc.Encode(pk.basis); err != nil {
return enc.BytesWritten(), err
}
@@ -238,6 +236,14 @@ func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
return enc.BytesWritten(), err
}
+func (pk *ProvingKey) WriteTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w))
+}
+
+func (pk *ProvingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return pk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
dec := curve.NewDecoder(r)
@@ -256,7 +262,14 @@ func (pk *ProvingKey) ReadFrom(r io.Reader) (int64, error) {
}
func (vk *VerifyingKey) WriteTo(w io.Writer) (int64, error) {
- enc := curve.NewEncoder(w)
+ return vk.writeTo(curve.NewEncoder(w))
+}
+
+func (vk *VerifyingKey) WriteRawTo(w io.Writer) (int64, error) {
+ return vk.writeTo(curve.NewEncoder(w, curve.RawEncoding()))
+}
+
+func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
var err error
if err = enc.Encode(&vk.g); err != nil {
diff --git a/internal/generator/pedersen/template/pedersen.test.go.tmpl b/internal/generator/pedersen/template/pedersen.test.go.tmpl
index 33b23e449..73ec97873 100644
--- a/internal/generator/pedersen/template/pedersen.test.go.tmpl
+++ b/internal/generator/pedersen/template/pedersen.test.go.tmpl
@@ -161,5 +161,7 @@ func TestMarshal(t *testing.T) {
assert.NoError(t, err)
t.Run("ProvingKey -> Bytes -> ProvingKey must remain identical.", utils.SerializationRoundTrip(&pk))
+ t.Run("ProvingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&pk))
t.Run("VerifyingKey -> Bytes -> VerifyingKey must remain identical.", utils.SerializationRoundTrip(&vk))
+ t.Run("VerifyingKey -> Bytes (raw) -> ProvingKey must remain identical.", utils.SerializationRoundTripRaw(&vk))
}
\ No newline at end of file
From 92069048a1dad4d73d1dfac9cfb30cafa4c0e568 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Fri, 2 Jun 2023 13:01:14 -0500
Subject: [PATCH 23/51] feat: marshal [][]uint64 for bn254
---
ecc/bn254/marshal.go | 51 +++++++++++++++++++++++++++++++-------------
1 file changed, 36 insertions(+), 15 deletions(-)
diff --git a/ecc/bn254/marshal.go b/ecc/bn254/marshal.go
index 3ef63696d..b1df4c0a6 100644
--- a/ecc/bn254/marshal.go
+++ b/ecc/bn254/marshal.go
@@ -98,24 +98,36 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
var buf [SizeOfG2AffineUncompressed]byte
var read int
+ var sliceLen uint32
switch t := v.(type) {
+ case *[][]uint64:
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ *t = make([][]uint64, sliceLen)
+
+ for i := range *t {
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ (*t)[i] = make([]uint64, sliceLen)
+ for j := range (*t)[i] {
+ if (*t)[i][j], err = dec.readUint64(); err != nil {
+ return
+ }
+ }
+ }
+ return
case *[]uint64:
- buf64 := buf[:64/8]
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if sliceLen, err = dec.readUint32(); err != nil {
return
}
- length := binary.BigEndian.Uint64(buf64)
- *t = make([]uint64, length)
+ *t = make([]uint64, sliceLen)
for i := range *t {
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if (*t)[i], err = dec.readUint64(); err != nil {
return
}
- (*t)[i] = binary.BigEndian.Uint64(buf64)
}
return
case *fr.Element:
@@ -143,7 +155,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
dec.n += read64
return
case *[][]fr.Element:
- var sliceLen uint32
if sliceLen, err = dec.readUint32(); err != nil {
return
}
@@ -198,7 +209,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
_, err = t.setBytes(buf[:nbBytes], dec.subGroupCheck)
return
case *[]G1Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -232,7 +242,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -258,7 +268,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
return nil
case *[]G2Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -292,7 +301,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -347,6 +356,18 @@ func (dec *Decoder) readUint32() (r uint32, err error) {
return
}
+func (dec *Decoder) readUint64() (r uint64, err error) {
+ var read int
+ var buf [8]byte
+ read, err = io.ReadFull(dec.r, buf[:])
+ dec.n += int64(read)
+ if err != nil {
+ return
+ }
+ r = binary.BigEndian.Uint64(buf[:])
+ return
+}
+
func isCompressed(msb byte) bool {
mData := msb & mMask
return !(mData == mUncompressed)
From faadb38385db964282a9afe286252fa70191c23b Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Fri, 2 Jun 2023 13:05:58 -0500
Subject: [PATCH 24/51] build: generify marshal changes
---
ecc/bls12-377/marshal.go | 51 +++++++++++++------
ecc/bls12-378/marshal.go | 51 +++++++++++++------
ecc/bls12-381/marshal.go | 51 +++++++++++++------
ecc/bls24-315/marshal.go | 51 +++++++++++++------
ecc/bls24-317/marshal.go | 51 +++++++++++++------
ecc/bw6-633/marshal.go | 51 +++++++++++++------
ecc/bw6-756/marshal.go | 51 +++++++++++++------
ecc/bw6-761/marshal.go | 51 +++++++++++++------
.../generator/ecc/template/marshal.go.tmpl | 51 +++++++++++++------
9 files changed, 324 insertions(+), 135 deletions(-)
diff --git a/ecc/bls12-377/marshal.go b/ecc/bls12-377/marshal.go
index 48450677d..693d39382 100644
--- a/ecc/bls12-377/marshal.go
+++ b/ecc/bls12-377/marshal.go
@@ -103,24 +103,36 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
var buf [SizeOfG2AffineUncompressed]byte
var read int
+ var sliceLen uint32
switch t := v.(type) {
+ case *[][]uint64:
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ *t = make([][]uint64, sliceLen)
+
+ for i := range *t {
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ (*t)[i] = make([]uint64, sliceLen)
+ for j := range (*t)[i] {
+ if (*t)[i][j], err = dec.readUint64(); err != nil {
+ return
+ }
+ }
+ }
+ return
case *[]uint64:
- buf64 := buf[:64/8]
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if sliceLen, err = dec.readUint32(); err != nil {
return
}
- length := binary.BigEndian.Uint64(buf64)
- *t = make([]uint64, length)
+ *t = make([]uint64, sliceLen)
for i := range *t {
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if (*t)[i], err = dec.readUint64(); err != nil {
return
}
- (*t)[i] = binary.BigEndian.Uint64(buf64)
}
return
case *fr.Element:
@@ -148,7 +160,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
dec.n += read64
return
case *[][]fr.Element:
- var sliceLen uint32
if sliceLen, err = dec.readUint32(); err != nil {
return
}
@@ -215,7 +226,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
_, err = t.setBytes(buf[:nbBytes], dec.subGroupCheck)
return
case *[]G1Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -255,7 +265,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -281,7 +291,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
return nil
case *[]G2Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -321,7 +330,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -376,6 +385,18 @@ func (dec *Decoder) readUint32() (r uint32, err error) {
return
}
+func (dec *Decoder) readUint64() (r uint64, err error) {
+ var read int
+ var buf [8]byte
+ read, err = io.ReadFull(dec.r, buf[:])
+ dec.n += int64(read)
+ if err != nil {
+ return
+ }
+ r = binary.BigEndian.Uint64(buf[:])
+ return
+}
+
// isMaskInvalid returns true if the mask is invalid
func isMaskInvalid(msb byte) bool {
mData := msb & mMask
diff --git a/ecc/bls12-378/marshal.go b/ecc/bls12-378/marshal.go
index a69a7b3d0..0fc541450 100644
--- a/ecc/bls12-378/marshal.go
+++ b/ecc/bls12-378/marshal.go
@@ -103,24 +103,36 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
var buf [SizeOfG2AffineUncompressed]byte
var read int
+ var sliceLen uint32
switch t := v.(type) {
+ case *[][]uint64:
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ *t = make([][]uint64, sliceLen)
+
+ for i := range *t {
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ (*t)[i] = make([]uint64, sliceLen)
+ for j := range (*t)[i] {
+ if (*t)[i][j], err = dec.readUint64(); err != nil {
+ return
+ }
+ }
+ }
+ return
case *[]uint64:
- buf64 := buf[:64/8]
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if sliceLen, err = dec.readUint32(); err != nil {
return
}
- length := binary.BigEndian.Uint64(buf64)
- *t = make([]uint64, length)
+ *t = make([]uint64, sliceLen)
for i := range *t {
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if (*t)[i], err = dec.readUint64(); err != nil {
return
}
- (*t)[i] = binary.BigEndian.Uint64(buf64)
}
return
case *fr.Element:
@@ -148,7 +160,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
dec.n += read64
return
case *[][]fr.Element:
- var sliceLen uint32
if sliceLen, err = dec.readUint32(); err != nil {
return
}
@@ -215,7 +226,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
_, err = t.setBytes(buf[:nbBytes], dec.subGroupCheck)
return
case *[]G1Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -255,7 +265,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -281,7 +291,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
return nil
case *[]G2Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -321,7 +330,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -376,6 +385,18 @@ func (dec *Decoder) readUint32() (r uint32, err error) {
return
}
+func (dec *Decoder) readUint64() (r uint64, err error) {
+ var read int
+ var buf [8]byte
+ read, err = io.ReadFull(dec.r, buf[:])
+ dec.n += int64(read)
+ if err != nil {
+ return
+ }
+ r = binary.BigEndian.Uint64(buf[:])
+ return
+}
+
// isMaskInvalid returns true if the mask is invalid
func isMaskInvalid(msb byte) bool {
mData := msb & mMask
diff --git a/ecc/bls12-381/marshal.go b/ecc/bls12-381/marshal.go
index dc1e76eec..c01c434fa 100644
--- a/ecc/bls12-381/marshal.go
+++ b/ecc/bls12-381/marshal.go
@@ -103,24 +103,36 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
var buf [SizeOfG2AffineUncompressed]byte
var read int
+ var sliceLen uint32
switch t := v.(type) {
+ case *[][]uint64:
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ *t = make([][]uint64, sliceLen)
+
+ for i := range *t {
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ (*t)[i] = make([]uint64, sliceLen)
+ for j := range (*t)[i] {
+ if (*t)[i][j], err = dec.readUint64(); err != nil {
+ return
+ }
+ }
+ }
+ return
case *[]uint64:
- buf64 := buf[:64/8]
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if sliceLen, err = dec.readUint32(); err != nil {
return
}
- length := binary.BigEndian.Uint64(buf64)
- *t = make([]uint64, length)
+ *t = make([]uint64, sliceLen)
for i := range *t {
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if (*t)[i], err = dec.readUint64(); err != nil {
return
}
- (*t)[i] = binary.BigEndian.Uint64(buf64)
}
return
case *fr.Element:
@@ -148,7 +160,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
dec.n += read64
return
case *[][]fr.Element:
- var sliceLen uint32
if sliceLen, err = dec.readUint32(); err != nil {
return
}
@@ -215,7 +226,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
_, err = t.setBytes(buf[:nbBytes], dec.subGroupCheck)
return
case *[]G1Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -255,7 +265,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -281,7 +291,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
return nil
case *[]G2Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -321,7 +330,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -376,6 +385,18 @@ func (dec *Decoder) readUint32() (r uint32, err error) {
return
}
+func (dec *Decoder) readUint64() (r uint64, err error) {
+ var read int
+ var buf [8]byte
+ read, err = io.ReadFull(dec.r, buf[:])
+ dec.n += int64(read)
+ if err != nil {
+ return
+ }
+ r = binary.BigEndian.Uint64(buf[:])
+ return
+}
+
// isMaskInvalid returns true if the mask is invalid
func isMaskInvalid(msb byte) bool {
mData := msb & mMask
diff --git a/ecc/bls24-315/marshal.go b/ecc/bls24-315/marshal.go
index 0b22441ef..d4d3d8986 100644
--- a/ecc/bls24-315/marshal.go
+++ b/ecc/bls24-315/marshal.go
@@ -103,24 +103,36 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
var buf [SizeOfG2AffineUncompressed]byte
var read int
+ var sliceLen uint32
switch t := v.(type) {
+ case *[][]uint64:
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ *t = make([][]uint64, sliceLen)
+
+ for i := range *t {
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ (*t)[i] = make([]uint64, sliceLen)
+ for j := range (*t)[i] {
+ if (*t)[i][j], err = dec.readUint64(); err != nil {
+ return
+ }
+ }
+ }
+ return
case *[]uint64:
- buf64 := buf[:64/8]
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if sliceLen, err = dec.readUint32(); err != nil {
return
}
- length := binary.BigEndian.Uint64(buf64)
- *t = make([]uint64, length)
+ *t = make([]uint64, sliceLen)
for i := range *t {
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if (*t)[i], err = dec.readUint64(); err != nil {
return
}
- (*t)[i] = binary.BigEndian.Uint64(buf64)
}
return
case *fr.Element:
@@ -148,7 +160,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
dec.n += read64
return
case *[][]fr.Element:
- var sliceLen uint32
if sliceLen, err = dec.readUint32(); err != nil {
return
}
@@ -215,7 +226,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
_, err = t.setBytes(buf[:nbBytes], dec.subGroupCheck)
return
case *[]G1Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -255,7 +265,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -281,7 +291,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
return nil
case *[]G2Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -321,7 +330,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -376,6 +385,18 @@ func (dec *Decoder) readUint32() (r uint32, err error) {
return
}
+func (dec *Decoder) readUint64() (r uint64, err error) {
+ var read int
+ var buf [8]byte
+ read, err = io.ReadFull(dec.r, buf[:])
+ dec.n += int64(read)
+ if err != nil {
+ return
+ }
+ r = binary.BigEndian.Uint64(buf[:])
+ return
+}
+
// isMaskInvalid returns true if the mask is invalid
func isMaskInvalid(msb byte) bool {
mData := msb & mMask
diff --git a/ecc/bls24-317/marshal.go b/ecc/bls24-317/marshal.go
index 89e7bcf5c..15ff58495 100644
--- a/ecc/bls24-317/marshal.go
+++ b/ecc/bls24-317/marshal.go
@@ -103,24 +103,36 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
var buf [SizeOfG2AffineUncompressed]byte
var read int
+ var sliceLen uint32
switch t := v.(type) {
+ case *[][]uint64:
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ *t = make([][]uint64, sliceLen)
+
+ for i := range *t {
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ (*t)[i] = make([]uint64, sliceLen)
+ for j := range (*t)[i] {
+ if (*t)[i][j], err = dec.readUint64(); err != nil {
+ return
+ }
+ }
+ }
+ return
case *[]uint64:
- buf64 := buf[:64/8]
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if sliceLen, err = dec.readUint32(); err != nil {
return
}
- length := binary.BigEndian.Uint64(buf64)
- *t = make([]uint64, length)
+ *t = make([]uint64, sliceLen)
for i := range *t {
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if (*t)[i], err = dec.readUint64(); err != nil {
return
}
- (*t)[i] = binary.BigEndian.Uint64(buf64)
}
return
case *fr.Element:
@@ -148,7 +160,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
dec.n += read64
return
case *[][]fr.Element:
- var sliceLen uint32
if sliceLen, err = dec.readUint32(); err != nil {
return
}
@@ -215,7 +226,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
_, err = t.setBytes(buf[:nbBytes], dec.subGroupCheck)
return
case *[]G1Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -255,7 +265,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -281,7 +291,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
return nil
case *[]G2Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -321,7 +330,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -376,6 +385,18 @@ func (dec *Decoder) readUint32() (r uint32, err error) {
return
}
+func (dec *Decoder) readUint64() (r uint64, err error) {
+ var read int
+ var buf [8]byte
+ read, err = io.ReadFull(dec.r, buf[:])
+ dec.n += int64(read)
+ if err != nil {
+ return
+ }
+ r = binary.BigEndian.Uint64(buf[:])
+ return
+}
+
// isMaskInvalid returns true if the mask is invalid
func isMaskInvalid(msb byte) bool {
mData := msb & mMask
diff --git a/ecc/bw6-633/marshal.go b/ecc/bw6-633/marshal.go
index 49f29735e..4f1328c96 100644
--- a/ecc/bw6-633/marshal.go
+++ b/ecc/bw6-633/marshal.go
@@ -103,24 +103,36 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
var buf [SizeOfG2AffineUncompressed]byte
var read int
+ var sliceLen uint32
switch t := v.(type) {
+ case *[][]uint64:
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ *t = make([][]uint64, sliceLen)
+
+ for i := range *t {
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ (*t)[i] = make([]uint64, sliceLen)
+ for j := range (*t)[i] {
+ if (*t)[i][j], err = dec.readUint64(); err != nil {
+ return
+ }
+ }
+ }
+ return
case *[]uint64:
- buf64 := buf[:64/8]
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if sliceLen, err = dec.readUint32(); err != nil {
return
}
- length := binary.BigEndian.Uint64(buf64)
- *t = make([]uint64, length)
+ *t = make([]uint64, sliceLen)
for i := range *t {
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if (*t)[i], err = dec.readUint64(); err != nil {
return
}
- (*t)[i] = binary.BigEndian.Uint64(buf64)
}
return
case *fr.Element:
@@ -148,7 +160,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
dec.n += read64
return
case *[][]fr.Element:
- var sliceLen uint32
if sliceLen, err = dec.readUint32(); err != nil {
return
}
@@ -215,7 +226,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
_, err = t.setBytes(buf[:nbBytes], dec.subGroupCheck)
return
case *[]G1Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -255,7 +265,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -281,7 +291,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
return nil
case *[]G2Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -321,7 +330,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -376,6 +385,18 @@ func (dec *Decoder) readUint32() (r uint32, err error) {
return
}
+func (dec *Decoder) readUint64() (r uint64, err error) {
+ var read int
+ var buf [8]byte
+ read, err = io.ReadFull(dec.r, buf[:])
+ dec.n += int64(read)
+ if err != nil {
+ return
+ }
+ r = binary.BigEndian.Uint64(buf[:])
+ return
+}
+
// isMaskInvalid returns true if the mask is invalid
func isMaskInvalid(msb byte) bool {
mData := msb & mMask
diff --git a/ecc/bw6-756/marshal.go b/ecc/bw6-756/marshal.go
index b62d30e48..c347ec194 100644
--- a/ecc/bw6-756/marshal.go
+++ b/ecc/bw6-756/marshal.go
@@ -103,24 +103,36 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
var buf [SizeOfG2AffineUncompressed]byte
var read int
+ var sliceLen uint32
switch t := v.(type) {
+ case *[][]uint64:
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ *t = make([][]uint64, sliceLen)
+
+ for i := range *t {
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ (*t)[i] = make([]uint64, sliceLen)
+ for j := range (*t)[i] {
+ if (*t)[i][j], err = dec.readUint64(); err != nil {
+ return
+ }
+ }
+ }
+ return
case *[]uint64:
- buf64 := buf[:64/8]
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if sliceLen, err = dec.readUint32(); err != nil {
return
}
- length := binary.BigEndian.Uint64(buf64)
- *t = make([]uint64, length)
+ *t = make([]uint64, sliceLen)
for i := range *t {
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if (*t)[i], err = dec.readUint64(); err != nil {
return
}
- (*t)[i] = binary.BigEndian.Uint64(buf64)
}
return
case *fr.Element:
@@ -148,7 +160,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
dec.n += read64
return
case *[][]fr.Element:
- var sliceLen uint32
if sliceLen, err = dec.readUint32(); err != nil {
return
}
@@ -215,7 +226,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
_, err = t.setBytes(buf[:nbBytes], dec.subGroupCheck)
return
case *[]G1Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -255,7 +265,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -281,7 +291,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
return nil
case *[]G2Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -321,7 +330,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -376,6 +385,18 @@ func (dec *Decoder) readUint32() (r uint32, err error) {
return
}
+func (dec *Decoder) readUint64() (r uint64, err error) {
+ var read int
+ var buf [8]byte
+ read, err = io.ReadFull(dec.r, buf[:])
+ dec.n += int64(read)
+ if err != nil {
+ return
+ }
+ r = binary.BigEndian.Uint64(buf[:])
+ return
+}
+
// isMaskInvalid returns true if the mask is invalid
func isMaskInvalid(msb byte) bool {
mData := msb & mMask
diff --git a/ecc/bw6-761/marshal.go b/ecc/bw6-761/marshal.go
index 1c5cc799b..f42d51032 100644
--- a/ecc/bw6-761/marshal.go
+++ b/ecc/bw6-761/marshal.go
@@ -103,24 +103,36 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
var buf [SizeOfG2AffineUncompressed]byte
var read int
+ var sliceLen uint32
switch t := v.(type) {
+ case *[][]uint64:
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ *t = make([][]uint64, sliceLen)
+
+ for i := range *t {
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ (*t)[i] = make([]uint64, sliceLen)
+ for j := range (*t)[i] {
+ if (*t)[i][j], err = dec.readUint64(); err != nil {
+ return
+ }
+ }
+ }
+ return
case *[]uint64:
- buf64 := buf[:64/8]
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if sliceLen, err = dec.readUint32(); err != nil {
return
}
- length := binary.BigEndian.Uint64(buf64)
- *t = make([]uint64, length)
+ *t = make([]uint64, sliceLen)
for i := range *t {
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if (*t)[i], err = dec.readUint64(); err != nil {
return
}
- (*t)[i] = binary.BigEndian.Uint64(buf64)
}
return
case *fr.Element:
@@ -148,7 +160,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
dec.n += read64
return
case *[][]fr.Element:
- var sliceLen uint32
if sliceLen, err = dec.readUint32(); err != nil {
return
}
@@ -215,7 +226,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
_, err = t.setBytes(buf[:nbBytes], dec.subGroupCheck)
return
case *[]G1Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -255,7 +265,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -281,7 +291,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
return nil
case *[]G2Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -321,7 +330,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -376,6 +385,18 @@ func (dec *Decoder) readUint32() (r uint32, err error) {
return
}
+func (dec *Decoder) readUint64() (r uint64, err error) {
+ var read int
+ var buf [8]byte
+ read, err = io.ReadFull(dec.r, buf[:])
+ dec.n += int64(read)
+ if err != nil {
+ return
+ }
+ r = binary.BigEndian.Uint64(buf[:])
+ return
+}
+
// isMaskInvalid returns true if the mask is invalid
func isMaskInvalid(msb byte) bool {
mData := msb & mMask
diff --git a/internal/generator/ecc/template/marshal.go.tmpl b/internal/generator/ecc/template/marshal.go.tmpl
index 795cb13ec..240559639 100644
--- a/internal/generator/ecc/template/marshal.go.tmpl
+++ b/internal/generator/ecc/template/marshal.go.tmpl
@@ -108,24 +108,36 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
var buf [SizeOfG2AffineUncompressed]byte
var read int
+ var sliceLen uint32
switch t := v.(type) {
+ case *[][]uint64:
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ *t = make([][]uint64, sliceLen)
+
+ for i := range *t {
+ if sliceLen, err = dec.readUint32(); err != nil {
+ return
+ }
+ (*t)[i] = make([]uint64, sliceLen)
+ for j := range (*t)[i] {
+ if (*t)[i][j], err = dec.readUint64(); err != nil {
+ return
+ }
+ }
+ }
+ return
case *[]uint64:
- buf64 := buf[:64/8]
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if sliceLen, err = dec.readUint32(); err != nil {
return
}
- length := binary.BigEndian.Uint64(buf64)
- *t = make([]uint64, length)
+ *t = make([]uint64, sliceLen)
for i := range *t {
- read, err = io.ReadFull(dec.r, buf64)
- dec.n += int64(read)
- if err != nil {
+ if (*t)[i], err = dec.readUint64(); err != nil {
return
}
- (*t)[i] = binary.BigEndian.Uint64(buf64)
}
return
case *fr.Element:
@@ -153,7 +165,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
dec.n+=read64
return
case *[][]fr.Element:
- var sliceLen uint32
if sliceLen, err = dec.readUint32(); err != nil {
return
}
@@ -224,7 +235,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
_, err = t.setBytes(buf[:nbBytes], dec.subGroupCheck)
return
case *[]G1Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -266,7 +276,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -292,7 +302,6 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
return nil
case *[]G2Affine:
- var sliceLen uint32
sliceLen, err = dec.readUint32()
if err != nil {
return
@@ -335,7 +344,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
}
} else {
var r bool
- if r, err = ((*t)[i].unsafeSetCompressedBytes(buf[:nbBytes])); err != nil {
+ if r, err = (*t)[i].unsafeSetCompressedBytes(buf[:nbBytes]); err != nil {
return
}
compressed[i] = !r
@@ -390,6 +399,18 @@ func (dec *Decoder) readUint32() (r uint32, err error) {
return
}
+func (dec *Decoder) readUint64() (r uint64, err error) {
+ var read int
+ var buf [8]byte
+ read, err = io.ReadFull(dec.r, buf[:])
+ dec.n += int64(read)
+ if err != nil {
+ return
+ }
+ r = binary.BigEndian.Uint64(buf[:])
+ return
+}
+
{{ if ge .FpUnusedBits 3}}
// isMaskInvalid returns true if the mask is invalid
func isMaskInvalid(msb byte) bool {
From 76fcbb52a9394e5d542de3dfb724dee5a1b2f888 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Fri, 2 Jun 2023 13:22:22 -0500
Subject: [PATCH 25/51] feat: write [][]uint64
---
ecc/bn254/marshal.go | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/ecc/bn254/marshal.go b/ecc/bn254/marshal.go
index b1df4c0a6..9acb9f519 100644
--- a/ecc/bn254/marshal.go
+++ b/ecc/bn254/marshal.go
@@ -453,6 +453,8 @@ func (enc *Encoder) encode(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -569,6 +571,8 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -667,7 +671,7 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
func (enc *Encoder) writeUint64Slice(t []uint64) error {
buff := make([]byte, 64/8)
- binary.BigEndian.PutUint64(buff, uint64(len(t)))
+ binary.BigEndian.PutUint32(buff, uint32(len(t)))
written, err := enc.w.Write(buff)
enc.n += int64(written)
if err != nil {
@@ -684,6 +688,39 @@ func (enc *Encoder) writeUint64Slice(t []uint64) error {
return nil
}
+func (enc *Encoder) writeUint64SliceSlice(t [][]uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
+ }
+ for i := range t {
+ if err = enc.writeUint32(uint32(len(t[i]))); err != nil {
+ return
+ }
+ for j := range t[i] {
+ if err = enc.writeUint64(t[i][j]); err != nil {
+ return
+ }
+ }
+ }
+ return nil
+}
+
+func (enc *Encoder) writeUint64(a uint64) error {
+ var buff [64 / 8]byte
+ binary.BigEndian.PutUint64(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
+func (enc *Encoder) writeUint32(a uint32) error {
+ var buff [32 / 8]byte
+ binary.BigEndian.PutUint32(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
// SizeOfG1AffineCompressed represents the size in bytes that a G1Affine need in binary form, compressed
const SizeOfG1AffineCompressed = 32
From b930c1101cdca4df50d23d655d065bcfd936fccc Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Fri, 2 Jun 2023 13:28:40 -0500
Subject: [PATCH 26/51] build: generify enc.WriteUint64SliceSlice
---
ecc/bls12-377/marshal.go | 54 ++++++++++++++-----
ecc/bls12-378/marshal.go | 54 ++++++++++++++-----
ecc/bls12-381/marshal.go | 54 ++++++++++++++-----
ecc/bls24-315/marshal.go | 54 ++++++++++++++-----
ecc/bls24-317/marshal.go | 54 ++++++++++++++-----
ecc/bn254/marshal.go | 17 ++----
ecc/bw6-633/marshal.go | 54 ++++++++++++++-----
ecc/bw6-756/marshal.go | 54 ++++++++++++++-----
ecc/bw6-761/marshal.go | 54 ++++++++++++++-----
.../generator/ecc/template/marshal.go.tmpl | 52 +++++++++++++-----
10 files changed, 381 insertions(+), 120 deletions(-)
diff --git a/ecc/bls12-377/marshal.go b/ecc/bls12-377/marshal.go
index 693d39382..1071fe912 100644
--- a/ecc/bls12-377/marshal.go
+++ b/ecc/bls12-377/marshal.go
@@ -488,6 +488,8 @@ func (enc *Encoder) encode(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -604,6 +606,8 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -700,25 +704,51 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
}
}
-func (enc *Encoder) writeUint64Slice(t []uint64) error {
- buff := make([]byte, 64/8)
- binary.BigEndian.PutUint64(buff, uint64(len(t)))
- written, err := enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+func (enc *Encoder) writeUint64Slice(t []uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
}
for i := range t {
- binary.BigEndian.PutUint64(buff, t[i])
- written, err = enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+ if err = enc.writeUint64(t[i]); err != nil {
+ return
+ }
+ }
+ return nil
+}
+
+func (enc *Encoder) writeUint64SliceSlice(t [][]uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
+ }
+ for i := range t {
+ if err = enc.writeUint32(uint32(len(t[i]))); err != nil {
+ return
+ }
+ for j := range t[i] {
+ if err = enc.writeUint64(t[i][j]); err != nil {
+ return
+ }
}
}
return nil
}
+func (enc *Encoder) writeUint64(a uint64) error {
+ var buff [64 / 8]byte
+ binary.BigEndian.PutUint64(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
+func (enc *Encoder) writeUint32(a uint32) error {
+ var buff [32 / 8]byte
+ binary.BigEndian.PutUint32(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
// SizeOfG1AffineCompressed represents the size in bytes that a G1Affine need in binary form, compressed
const SizeOfG1AffineCompressed = 48
diff --git a/ecc/bls12-378/marshal.go b/ecc/bls12-378/marshal.go
index 0fc541450..c033fdaf4 100644
--- a/ecc/bls12-378/marshal.go
+++ b/ecc/bls12-378/marshal.go
@@ -488,6 +488,8 @@ func (enc *Encoder) encode(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -604,6 +606,8 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -700,25 +704,51 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
}
}
-func (enc *Encoder) writeUint64Slice(t []uint64) error {
- buff := make([]byte, 64/8)
- binary.BigEndian.PutUint64(buff, uint64(len(t)))
- written, err := enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+func (enc *Encoder) writeUint64Slice(t []uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
}
for i := range t {
- binary.BigEndian.PutUint64(buff, t[i])
- written, err = enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+ if err = enc.writeUint64(t[i]); err != nil {
+ return
+ }
+ }
+ return nil
+}
+
+func (enc *Encoder) writeUint64SliceSlice(t [][]uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
+ }
+ for i := range t {
+ if err = enc.writeUint32(uint32(len(t[i]))); err != nil {
+ return
+ }
+ for j := range t[i] {
+ if err = enc.writeUint64(t[i][j]); err != nil {
+ return
+ }
}
}
return nil
}
+func (enc *Encoder) writeUint64(a uint64) error {
+ var buff [64 / 8]byte
+ binary.BigEndian.PutUint64(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
+func (enc *Encoder) writeUint32(a uint32) error {
+ var buff [32 / 8]byte
+ binary.BigEndian.PutUint32(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
// SizeOfG1AffineCompressed represents the size in bytes that a G1Affine need in binary form, compressed
const SizeOfG1AffineCompressed = 48
diff --git a/ecc/bls12-381/marshal.go b/ecc/bls12-381/marshal.go
index c01c434fa..324950e09 100644
--- a/ecc/bls12-381/marshal.go
+++ b/ecc/bls12-381/marshal.go
@@ -488,6 +488,8 @@ func (enc *Encoder) encode(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -604,6 +606,8 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -700,25 +704,51 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
}
}
-func (enc *Encoder) writeUint64Slice(t []uint64) error {
- buff := make([]byte, 64/8)
- binary.BigEndian.PutUint64(buff, uint64(len(t)))
- written, err := enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+func (enc *Encoder) writeUint64Slice(t []uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
}
for i := range t {
- binary.BigEndian.PutUint64(buff, t[i])
- written, err = enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+ if err = enc.writeUint64(t[i]); err != nil {
+ return
+ }
+ }
+ return nil
+}
+
+func (enc *Encoder) writeUint64SliceSlice(t [][]uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
+ }
+ for i := range t {
+ if err = enc.writeUint32(uint32(len(t[i]))); err != nil {
+ return
+ }
+ for j := range t[i] {
+ if err = enc.writeUint64(t[i][j]); err != nil {
+ return
+ }
}
}
return nil
}
+func (enc *Encoder) writeUint64(a uint64) error {
+ var buff [64 / 8]byte
+ binary.BigEndian.PutUint64(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
+func (enc *Encoder) writeUint32(a uint32) error {
+ var buff [32 / 8]byte
+ binary.BigEndian.PutUint32(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
// SizeOfG1AffineCompressed represents the size in bytes that a G1Affine need in binary form, compressed
const SizeOfG1AffineCompressed = 48
diff --git a/ecc/bls24-315/marshal.go b/ecc/bls24-315/marshal.go
index d4d3d8986..97dab9a10 100644
--- a/ecc/bls24-315/marshal.go
+++ b/ecc/bls24-315/marshal.go
@@ -488,6 +488,8 @@ func (enc *Encoder) encode(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -604,6 +606,8 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -700,25 +704,51 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
}
}
-func (enc *Encoder) writeUint64Slice(t []uint64) error {
- buff := make([]byte, 64/8)
- binary.BigEndian.PutUint64(buff, uint64(len(t)))
- written, err := enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+func (enc *Encoder) writeUint64Slice(t []uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
}
for i := range t {
- binary.BigEndian.PutUint64(buff, t[i])
- written, err = enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+ if err = enc.writeUint64(t[i]); err != nil {
+ return
+ }
+ }
+ return nil
+}
+
+func (enc *Encoder) writeUint64SliceSlice(t [][]uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
+ }
+ for i := range t {
+ if err = enc.writeUint32(uint32(len(t[i]))); err != nil {
+ return
+ }
+ for j := range t[i] {
+ if err = enc.writeUint64(t[i][j]); err != nil {
+ return
+ }
}
}
return nil
}
+func (enc *Encoder) writeUint64(a uint64) error {
+ var buff [64 / 8]byte
+ binary.BigEndian.PutUint64(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
+func (enc *Encoder) writeUint32(a uint32) error {
+ var buff [32 / 8]byte
+ binary.BigEndian.PutUint32(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
// SizeOfG1AffineCompressed represents the size in bytes that a G1Affine need in binary form, compressed
const SizeOfG1AffineCompressed = 40
diff --git a/ecc/bls24-317/marshal.go b/ecc/bls24-317/marshal.go
index 15ff58495..e68738af3 100644
--- a/ecc/bls24-317/marshal.go
+++ b/ecc/bls24-317/marshal.go
@@ -488,6 +488,8 @@ func (enc *Encoder) encode(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -604,6 +606,8 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -700,25 +704,51 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
}
}
-func (enc *Encoder) writeUint64Slice(t []uint64) error {
- buff := make([]byte, 64/8)
- binary.BigEndian.PutUint64(buff, uint64(len(t)))
- written, err := enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+func (enc *Encoder) writeUint64Slice(t []uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
}
for i := range t {
- binary.BigEndian.PutUint64(buff, t[i])
- written, err = enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+ if err = enc.writeUint64(t[i]); err != nil {
+ return
+ }
+ }
+ return nil
+}
+
+func (enc *Encoder) writeUint64SliceSlice(t [][]uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
+ }
+ for i := range t {
+ if err = enc.writeUint32(uint32(len(t[i]))); err != nil {
+ return
+ }
+ for j := range t[i] {
+ if err = enc.writeUint64(t[i][j]); err != nil {
+ return
+ }
}
}
return nil
}
+func (enc *Encoder) writeUint64(a uint64) error {
+ var buff [64 / 8]byte
+ binary.BigEndian.PutUint64(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
+func (enc *Encoder) writeUint32(a uint32) error {
+ var buff [32 / 8]byte
+ binary.BigEndian.PutUint32(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
// SizeOfG1AffineCompressed represents the size in bytes that a G1Affine need in binary form, compressed
const SizeOfG1AffineCompressed = 40
diff --git a/ecc/bn254/marshal.go b/ecc/bn254/marshal.go
index 9acb9f519..2350345f2 100644
--- a/ecc/bn254/marshal.go
+++ b/ecc/bn254/marshal.go
@@ -669,20 +669,13 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
}
}
-func (enc *Encoder) writeUint64Slice(t []uint64) error {
- buff := make([]byte, 64/8)
- binary.BigEndian.PutUint32(buff, uint32(len(t)))
- written, err := enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+func (enc *Encoder) writeUint64Slice(t []uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
}
for i := range t {
- binary.BigEndian.PutUint64(buff, t[i])
- written, err = enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+ if err = enc.writeUint64(t[i]); err != nil {
+ return
}
}
return nil
diff --git a/ecc/bw6-633/marshal.go b/ecc/bw6-633/marshal.go
index 4f1328c96..107b62155 100644
--- a/ecc/bw6-633/marshal.go
+++ b/ecc/bw6-633/marshal.go
@@ -488,6 +488,8 @@ func (enc *Encoder) encode(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -604,6 +606,8 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -700,25 +704,51 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
}
}
-func (enc *Encoder) writeUint64Slice(t []uint64) error {
- buff := make([]byte, 64/8)
- binary.BigEndian.PutUint64(buff, uint64(len(t)))
- written, err := enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+func (enc *Encoder) writeUint64Slice(t []uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
}
for i := range t {
- binary.BigEndian.PutUint64(buff, t[i])
- written, err = enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+ if err = enc.writeUint64(t[i]); err != nil {
+ return
+ }
+ }
+ return nil
+}
+
+func (enc *Encoder) writeUint64SliceSlice(t [][]uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
+ }
+ for i := range t {
+ if err = enc.writeUint32(uint32(len(t[i]))); err != nil {
+ return
+ }
+ for j := range t[i] {
+ if err = enc.writeUint64(t[i][j]); err != nil {
+ return
+ }
}
}
return nil
}
+func (enc *Encoder) writeUint64(a uint64) error {
+ var buff [64 / 8]byte
+ binary.BigEndian.PutUint64(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
+func (enc *Encoder) writeUint32(a uint32) error {
+ var buff [32 / 8]byte
+ binary.BigEndian.PutUint32(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
// SizeOfG1AffineCompressed represents the size in bytes that a G1Affine need in binary form, compressed
const SizeOfG1AffineCompressed = 80
diff --git a/ecc/bw6-756/marshal.go b/ecc/bw6-756/marshal.go
index c347ec194..b99e2f0fa 100644
--- a/ecc/bw6-756/marshal.go
+++ b/ecc/bw6-756/marshal.go
@@ -488,6 +488,8 @@ func (enc *Encoder) encode(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -604,6 +606,8 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -700,25 +704,51 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
}
}
-func (enc *Encoder) writeUint64Slice(t []uint64) error {
- buff := make([]byte, 64/8)
- binary.BigEndian.PutUint64(buff, uint64(len(t)))
- written, err := enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+func (enc *Encoder) writeUint64Slice(t []uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
}
for i := range t {
- binary.BigEndian.PutUint64(buff, t[i])
- written, err = enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+ if err = enc.writeUint64(t[i]); err != nil {
+ return
+ }
+ }
+ return nil
+}
+
+func (enc *Encoder) writeUint64SliceSlice(t [][]uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
+ }
+ for i := range t {
+ if err = enc.writeUint32(uint32(len(t[i]))); err != nil {
+ return
+ }
+ for j := range t[i] {
+ if err = enc.writeUint64(t[i][j]); err != nil {
+ return
+ }
}
}
return nil
}
+func (enc *Encoder) writeUint64(a uint64) error {
+ var buff [64 / 8]byte
+ binary.BigEndian.PutUint64(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
+func (enc *Encoder) writeUint32(a uint32) error {
+ var buff [32 / 8]byte
+ binary.BigEndian.PutUint32(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
// SizeOfG1AffineCompressed represents the size in bytes that a G1Affine need in binary form, compressed
const SizeOfG1AffineCompressed = 96
diff --git a/ecc/bw6-761/marshal.go b/ecc/bw6-761/marshal.go
index f42d51032..5a6ae02e2 100644
--- a/ecc/bw6-761/marshal.go
+++ b/ecc/bw6-761/marshal.go
@@ -488,6 +488,8 @@ func (enc *Encoder) encode(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -604,6 +606,8 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
@@ -700,25 +704,51 @@ func (enc *Encoder) encodeRaw(v interface{}) (err error) {
}
}
-func (enc *Encoder) writeUint64Slice(t []uint64) error {
- buff := make([]byte, 64/8)
- binary.BigEndian.PutUint64(buff, uint64(len(t)))
- written, err := enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+func (enc *Encoder) writeUint64Slice(t []uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
}
for i := range t {
- binary.BigEndian.PutUint64(buff, t[i])
- written, err = enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+ if err = enc.writeUint64(t[i]); err != nil {
+ return
+ }
+ }
+ return nil
+}
+
+func (enc *Encoder) writeUint64SliceSlice(t [][]uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
+ }
+ for i := range t {
+ if err = enc.writeUint32(uint32(len(t[i]))); err != nil {
+ return
+ }
+ for j := range t[i] {
+ if err = enc.writeUint64(t[i][j]); err != nil {
+ return
+ }
}
}
return nil
}
+func (enc *Encoder) writeUint64(a uint64) error {
+ var buff [64 / 8]byte
+ binary.BigEndian.PutUint64(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
+func (enc *Encoder) writeUint32(a uint32) error {
+ var buff [32 / 8]byte
+ binary.BigEndian.PutUint32(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
// SizeOfG1AffineCompressed represents the size in bytes that a G1Affine need in binary form, compressed
const SizeOfG1AffineCompressed = 96
diff --git a/internal/generator/ecc/template/marshal.go.tmpl b/internal/generator/ecc/template/marshal.go.tmpl
index 240559639..95a26f42d 100644
--- a/internal/generator/ecc/template/marshal.go.tmpl
+++ b/internal/generator/ecc/template/marshal.go.tmpl
@@ -490,25 +490,51 @@ func isZeroed(firstByte byte, buf []byte) bool {
{{template "encode" dict "Raw" ""}}
{{template "encode" dict "Raw" "Raw"}}
-func (enc *Encoder) writeUint64Slice(t []uint64) error {
- buff := make([]byte, 64/8)
- binary.BigEndian.PutUint64(buff, uint64(len(t)))
- written, err := enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+func (enc *Encoder) writeUint64Slice(t []uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
}
for i := range t {
- binary.BigEndian.PutUint64(buff, t[i])
- written, err = enc.w.Write(buff)
- enc.n += int64(written)
- if err != nil {
- return err
+ if err = enc.writeUint64(t[i]); err != nil {
+ return
+ }
+ }
+ return nil
+}
+
+func (enc *Encoder) writeUint64SliceSlice(t [][]uint64) (err error) {
+ if err = enc.writeUint32(uint32(len(t))); err != nil {
+ return
+ }
+ for i := range t {
+ if err = enc.writeUint32(uint32(len(t[i]))); err != nil {
+ return
+ }
+ for j := range t[i] {
+ if err = enc.writeUint64(t[i][j]); err != nil {
+ return
+ }
}
}
return nil
}
+func (enc *Encoder) writeUint64(a uint64) error {
+ var buff [64 / 8]byte
+ binary.BigEndian.PutUint64(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
+func (enc *Encoder) writeUint32(a uint32) error {
+ var buff [32 / 8]byte
+ binary.BigEndian.PutUint32(buff[:], a)
+ written, err := enc.w.Write(buff[:])
+ enc.n += int64(written)
+ return err
+}
+
{{ define "encode"}}
func (enc *Encoder) encode{{- $.Raw}}(v interface{}) (err error) {
@@ -531,6 +557,8 @@ func (enc *Encoder) encode{{- $.Raw}}(v interface{}) (err error) {
switch t := v.(type) {
case []uint64:
return enc.writeUint64Slice(t)
+ case [][]uint64:
+ return enc.writeUint64SliceSlice(t)
case *fr.Element:
buf := t.Bytes()
written, err = enc.w.Write(buf[:])
From 36b8b950059a0aa5bda24098ecff7c3c51238b44 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Fri, 2 Jun 2023 13:48:15 -0500
Subject: [PATCH 27/51] feat: pedersen.Vk[Bn254].UnsafeReadFrom
---
ecc/bn254/fr/pedersen/pedersen.go | 10 +++++++++-
ecc/bn254/marshal_test.go | 10 ++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ecc/bn254/fr/pedersen/pedersen.go b/ecc/bn254/fr/pedersen/pedersen.go
index 4c8f5a52d..aa19032cd 100644
--- a/ecc/bn254/fr/pedersen/pedersen.go
+++ b/ecc/bn254/fr/pedersen/pedersen.go
@@ -298,7 +298,15 @@ func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
}
func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
- dec := curve.NewDecoder(r)
+ return vk.readFrom(r)
+}
+
+func (vk *VerifyingKey) UnsafeReadFrom(r io.Reader) (int64, error) {
+ return vk.readFrom(r, curve.NoSubgroupChecks())
+}
+
+func (vk *VerifyingKey) readFrom(r io.Reader, decOptions ...func(*curve.Decoder)) (int64, error) {
+ dec := curve.NewDecoder(r, decOptions...)
var err error
if err = dec.Decode(&vk.g); err != nil {
diff --git a/ecc/bn254/marshal_test.go b/ecc/bn254/marshal_test.go
index ddc699b9c..b6d51546a 100644
--- a/ecc/bn254/marshal_test.go
+++ b/ecc/bn254/marshal_test.go
@@ -53,6 +53,7 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
var inK fr.Vector
var inL [][]fr.Element
+ var inM [][]uint64
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -70,12 +71,13 @@ func TestEncoder(t *testing.T) {
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
inL = [][]fr.Element{inJ, inK}
+ inM = [][]uint64{{1, 2}, {4}, {}}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL, inM}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -101,8 +103,9 @@ func TestEncoder(t *testing.T) {
var outJ []fr.Element
var outK fr.Vector
var outL [][]fr.Element
+ var outM [][]uint64
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL, &outM}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -145,6 +148,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inL, outL) {
t.Fatal("decode(encode(slice²(elements))) failed")
}
+ if !reflect.DeepEqual(inM, outM) {
+ t.Fatal("decode(encode(slice²(uint64))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
From ff9bcec080c78dac116115e7e5557edd641ac902 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Fri, 2 Jun 2023 13:56:55 -0500
Subject: [PATCH 28/51] build: generify unsafeReadFrom
---
ecc/bls12-377/fr/pedersen/pedersen.go | 10 +++++++++-
ecc/bls12-377/marshal_test.go | 10 ++++++++--
ecc/bls12-378/fr/pedersen/pedersen.go | 10 +++++++++-
ecc/bls12-378/marshal_test.go | 10 ++++++++--
ecc/bls12-381/fr/pedersen/pedersen.go | 10 +++++++++-
ecc/bls12-381/marshal_test.go | 10 ++++++++--
ecc/bls24-315/fr/pedersen/pedersen.go | 10 +++++++++-
ecc/bls24-315/marshal_test.go | 10 ++++++++--
ecc/bls24-317/fr/pedersen/pedersen.go | 10 +++++++++-
ecc/bls24-317/marshal_test.go | 10 ++++++++--
ecc/bw6-633/fr/pedersen/pedersen.go | 10 +++++++++-
ecc/bw6-633/marshal_test.go | 10 ++++++++--
ecc/bw6-756/fr/pedersen/pedersen.go | 10 +++++++++-
ecc/bw6-756/marshal_test.go | 10 ++++++++--
ecc/bw6-761/fr/pedersen/pedersen.go | 10 +++++++++-
ecc/bw6-761/marshal_test.go | 10 ++++++++--
.../generator/ecc/template/tests/marshal.go.tmpl | 13 +++++++++----
.../generator/pedersen/template/pedersen.go.tmpl | 10 +++++++++-
18 files changed, 154 insertions(+), 29 deletions(-)
diff --git a/ecc/bls12-377/fr/pedersen/pedersen.go b/ecc/bls12-377/fr/pedersen/pedersen.go
index cae70c625..26c7842bb 100644
--- a/ecc/bls12-377/fr/pedersen/pedersen.go
+++ b/ecc/bls12-377/fr/pedersen/pedersen.go
@@ -298,7 +298,15 @@ func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
}
func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
- dec := curve.NewDecoder(r)
+ return vk.readFrom(r)
+}
+
+func (vk *VerifyingKey) UnsafeReadFrom(r io.Reader) (int64, error) {
+ return vk.readFrom(r, curve.NoSubgroupChecks())
+}
+
+func (vk *VerifyingKey) readFrom(r io.Reader, decOptions ...func(*curve.Decoder)) (int64, error) {
+ dec := curve.NewDecoder(r, decOptions...)
var err error
if err = dec.Decode(&vk.g); err != nil {
diff --git a/ecc/bls12-377/marshal_test.go b/ecc/bls12-377/marshal_test.go
index 72e4a000d..3bd60d610 100644
--- a/ecc/bls12-377/marshal_test.go
+++ b/ecc/bls12-377/marshal_test.go
@@ -53,6 +53,7 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
var inK fr.Vector
var inL [][]fr.Element
+ var inM [][]uint64
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -70,12 +71,13 @@ func TestEncoder(t *testing.T) {
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
inL = [][]fr.Element{inJ, inK}
+ inM = [][]uint64{{1, 2}, {4}, {}}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL, inM}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -101,8 +103,9 @@ func TestEncoder(t *testing.T) {
var outJ []fr.Element
var outK fr.Vector
var outL [][]fr.Element
+ var outM [][]uint64
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL, &outM}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -145,6 +148,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inL, outL) {
t.Fatal("decode(encode(slice²(elements))) failed")
}
+ if !reflect.DeepEqual(inM, outM) {
+ t.Fatal("decode(encode(slice²(uint64))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bls12-378/fr/pedersen/pedersen.go b/ecc/bls12-378/fr/pedersen/pedersen.go
index 814c8c5db..e9720a649 100644
--- a/ecc/bls12-378/fr/pedersen/pedersen.go
+++ b/ecc/bls12-378/fr/pedersen/pedersen.go
@@ -298,7 +298,15 @@ func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
}
func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
- dec := curve.NewDecoder(r)
+ return vk.readFrom(r)
+}
+
+func (vk *VerifyingKey) UnsafeReadFrom(r io.Reader) (int64, error) {
+ return vk.readFrom(r, curve.NoSubgroupChecks())
+}
+
+func (vk *VerifyingKey) readFrom(r io.Reader, decOptions ...func(*curve.Decoder)) (int64, error) {
+ dec := curve.NewDecoder(r, decOptions...)
var err error
if err = dec.Decode(&vk.g); err != nil {
diff --git a/ecc/bls12-378/marshal_test.go b/ecc/bls12-378/marshal_test.go
index 4e4b08e3d..8a4d7c04a 100644
--- a/ecc/bls12-378/marshal_test.go
+++ b/ecc/bls12-378/marshal_test.go
@@ -53,6 +53,7 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
var inK fr.Vector
var inL [][]fr.Element
+ var inM [][]uint64
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -70,12 +71,13 @@ func TestEncoder(t *testing.T) {
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
inL = [][]fr.Element{inJ, inK}
+ inM = [][]uint64{{1, 2}, {4}, {}}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL, inM}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -101,8 +103,9 @@ func TestEncoder(t *testing.T) {
var outJ []fr.Element
var outK fr.Vector
var outL [][]fr.Element
+ var outM [][]uint64
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL, &outM}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -145,6 +148,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inL, outL) {
t.Fatal("decode(encode(slice²(elements))) failed")
}
+ if !reflect.DeepEqual(inM, outM) {
+ t.Fatal("decode(encode(slice²(uint64))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bls12-381/fr/pedersen/pedersen.go b/ecc/bls12-381/fr/pedersen/pedersen.go
index 17be46bc3..1ff86fc10 100644
--- a/ecc/bls12-381/fr/pedersen/pedersen.go
+++ b/ecc/bls12-381/fr/pedersen/pedersen.go
@@ -298,7 +298,15 @@ func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
}
func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
- dec := curve.NewDecoder(r)
+ return vk.readFrom(r)
+}
+
+func (vk *VerifyingKey) UnsafeReadFrom(r io.Reader) (int64, error) {
+ return vk.readFrom(r, curve.NoSubgroupChecks())
+}
+
+func (vk *VerifyingKey) readFrom(r io.Reader, decOptions ...func(*curve.Decoder)) (int64, error) {
+ dec := curve.NewDecoder(r, decOptions...)
var err error
if err = dec.Decode(&vk.g); err != nil {
diff --git a/ecc/bls12-381/marshal_test.go b/ecc/bls12-381/marshal_test.go
index 3c0d03376..6836ab92f 100644
--- a/ecc/bls12-381/marshal_test.go
+++ b/ecc/bls12-381/marshal_test.go
@@ -53,6 +53,7 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
var inK fr.Vector
var inL [][]fr.Element
+ var inM [][]uint64
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -70,12 +71,13 @@ func TestEncoder(t *testing.T) {
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
inL = [][]fr.Element{inJ, inK}
+ inM = [][]uint64{{1, 2}, {4}, {}}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL, inM}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -101,8 +103,9 @@ func TestEncoder(t *testing.T) {
var outJ []fr.Element
var outK fr.Vector
var outL [][]fr.Element
+ var outM [][]uint64
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL, &outM}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -145,6 +148,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inL, outL) {
t.Fatal("decode(encode(slice²(elements))) failed")
}
+ if !reflect.DeepEqual(inM, outM) {
+ t.Fatal("decode(encode(slice²(uint64))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bls24-315/fr/pedersen/pedersen.go b/ecc/bls24-315/fr/pedersen/pedersen.go
index 4ce9d9d1e..661351926 100644
--- a/ecc/bls24-315/fr/pedersen/pedersen.go
+++ b/ecc/bls24-315/fr/pedersen/pedersen.go
@@ -298,7 +298,15 @@ func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
}
func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
- dec := curve.NewDecoder(r)
+ return vk.readFrom(r)
+}
+
+func (vk *VerifyingKey) UnsafeReadFrom(r io.Reader) (int64, error) {
+ return vk.readFrom(r, curve.NoSubgroupChecks())
+}
+
+func (vk *VerifyingKey) readFrom(r io.Reader, decOptions ...func(*curve.Decoder)) (int64, error) {
+ dec := curve.NewDecoder(r, decOptions...)
var err error
if err = dec.Decode(&vk.g); err != nil {
diff --git a/ecc/bls24-315/marshal_test.go b/ecc/bls24-315/marshal_test.go
index e5c665fa0..db14955a3 100644
--- a/ecc/bls24-315/marshal_test.go
+++ b/ecc/bls24-315/marshal_test.go
@@ -53,6 +53,7 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
var inK fr.Vector
var inL [][]fr.Element
+ var inM [][]uint64
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -70,12 +71,13 @@ func TestEncoder(t *testing.T) {
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
inL = [][]fr.Element{inJ, inK}
+ inM = [][]uint64{{1, 2}, {4}, {}}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL, inM}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -101,8 +103,9 @@ func TestEncoder(t *testing.T) {
var outJ []fr.Element
var outK fr.Vector
var outL [][]fr.Element
+ var outM [][]uint64
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL, &outM}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -145,6 +148,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inL, outL) {
t.Fatal("decode(encode(slice²(elements))) failed")
}
+ if !reflect.DeepEqual(inM, outM) {
+ t.Fatal("decode(encode(slice²(uint64))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bls24-317/fr/pedersen/pedersen.go b/ecc/bls24-317/fr/pedersen/pedersen.go
index c4a7e40eb..0e06ebcc9 100644
--- a/ecc/bls24-317/fr/pedersen/pedersen.go
+++ b/ecc/bls24-317/fr/pedersen/pedersen.go
@@ -298,7 +298,15 @@ func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
}
func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
- dec := curve.NewDecoder(r)
+ return vk.readFrom(r)
+}
+
+func (vk *VerifyingKey) UnsafeReadFrom(r io.Reader) (int64, error) {
+ return vk.readFrom(r, curve.NoSubgroupChecks())
+}
+
+func (vk *VerifyingKey) readFrom(r io.Reader, decOptions ...func(*curve.Decoder)) (int64, error) {
+ dec := curve.NewDecoder(r, decOptions...)
var err error
if err = dec.Decode(&vk.g); err != nil {
diff --git a/ecc/bls24-317/marshal_test.go b/ecc/bls24-317/marshal_test.go
index 23f3b8a10..d922c7c12 100644
--- a/ecc/bls24-317/marshal_test.go
+++ b/ecc/bls24-317/marshal_test.go
@@ -53,6 +53,7 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
var inK fr.Vector
var inL [][]fr.Element
+ var inM [][]uint64
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -70,12 +71,13 @@ func TestEncoder(t *testing.T) {
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
inL = [][]fr.Element{inJ, inK}
+ inM = [][]uint64{{1, 2}, {4}, {}}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL, inM}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -101,8 +103,9 @@ func TestEncoder(t *testing.T) {
var outJ []fr.Element
var outK fr.Vector
var outL [][]fr.Element
+ var outM [][]uint64
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL, &outM}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -145,6 +148,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inL, outL) {
t.Fatal("decode(encode(slice²(elements))) failed")
}
+ if !reflect.DeepEqual(inM, outM) {
+ t.Fatal("decode(encode(slice²(uint64))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bw6-633/fr/pedersen/pedersen.go b/ecc/bw6-633/fr/pedersen/pedersen.go
index 4e154a64e..8068986bf 100644
--- a/ecc/bw6-633/fr/pedersen/pedersen.go
+++ b/ecc/bw6-633/fr/pedersen/pedersen.go
@@ -298,7 +298,15 @@ func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
}
func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
- dec := curve.NewDecoder(r)
+ return vk.readFrom(r)
+}
+
+func (vk *VerifyingKey) UnsafeReadFrom(r io.Reader) (int64, error) {
+ return vk.readFrom(r, curve.NoSubgroupChecks())
+}
+
+func (vk *VerifyingKey) readFrom(r io.Reader, decOptions ...func(*curve.Decoder)) (int64, error) {
+ dec := curve.NewDecoder(r, decOptions...)
var err error
if err = dec.Decode(&vk.g); err != nil {
diff --git a/ecc/bw6-633/marshal_test.go b/ecc/bw6-633/marshal_test.go
index 5e6cab476..c72e93ec8 100644
--- a/ecc/bw6-633/marshal_test.go
+++ b/ecc/bw6-633/marshal_test.go
@@ -53,6 +53,7 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
var inK fr.Vector
var inL [][]fr.Element
+ var inM [][]uint64
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -70,12 +71,13 @@ func TestEncoder(t *testing.T) {
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
inL = [][]fr.Element{inJ, inK}
+ inM = [][]uint64{{1, 2}, {4}, {}}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL, inM}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -101,8 +103,9 @@ func TestEncoder(t *testing.T) {
var outJ []fr.Element
var outK fr.Vector
var outL [][]fr.Element
+ var outM [][]uint64
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL, &outM}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -145,6 +148,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inL, outL) {
t.Fatal("decode(encode(slice²(elements))) failed")
}
+ if !reflect.DeepEqual(inM, outM) {
+ t.Fatal("decode(encode(slice²(uint64))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bw6-756/fr/pedersen/pedersen.go b/ecc/bw6-756/fr/pedersen/pedersen.go
index 3041dd642..d5871890f 100644
--- a/ecc/bw6-756/fr/pedersen/pedersen.go
+++ b/ecc/bw6-756/fr/pedersen/pedersen.go
@@ -298,7 +298,15 @@ func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
}
func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
- dec := curve.NewDecoder(r)
+ return vk.readFrom(r)
+}
+
+func (vk *VerifyingKey) UnsafeReadFrom(r io.Reader) (int64, error) {
+ return vk.readFrom(r, curve.NoSubgroupChecks())
+}
+
+func (vk *VerifyingKey) readFrom(r io.Reader, decOptions ...func(*curve.Decoder)) (int64, error) {
+ dec := curve.NewDecoder(r, decOptions...)
var err error
if err = dec.Decode(&vk.g); err != nil {
diff --git a/ecc/bw6-756/marshal_test.go b/ecc/bw6-756/marshal_test.go
index fa06db299..422abc90e 100644
--- a/ecc/bw6-756/marshal_test.go
+++ b/ecc/bw6-756/marshal_test.go
@@ -53,6 +53,7 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
var inK fr.Vector
var inL [][]fr.Element
+ var inM [][]uint64
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -70,12 +71,13 @@ func TestEncoder(t *testing.T) {
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
inL = [][]fr.Element{inJ, inK}
+ inM = [][]uint64{{1, 2}, {4}, {}}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL, inM}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -101,8 +103,9 @@ func TestEncoder(t *testing.T) {
var outJ []fr.Element
var outK fr.Vector
var outL [][]fr.Element
+ var outM [][]uint64
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL, &outM}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -145,6 +148,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inL, outL) {
t.Fatal("decode(encode(slice²(elements))) failed")
}
+ if !reflect.DeepEqual(inM, outM) {
+ t.Fatal("decode(encode(slice²(uint64))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/ecc/bw6-761/fr/pedersen/pedersen.go b/ecc/bw6-761/fr/pedersen/pedersen.go
index 51c8fa083..30f14a529 100644
--- a/ecc/bw6-761/fr/pedersen/pedersen.go
+++ b/ecc/bw6-761/fr/pedersen/pedersen.go
@@ -298,7 +298,15 @@ func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
}
func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
- dec := curve.NewDecoder(r)
+ return vk.readFrom(r)
+}
+
+func (vk *VerifyingKey) UnsafeReadFrom(r io.Reader) (int64, error) {
+ return vk.readFrom(r, curve.NoSubgroupChecks())
+}
+
+func (vk *VerifyingKey) readFrom(r io.Reader, decOptions ...func(*curve.Decoder)) (int64, error) {
+ dec := curve.NewDecoder(r, decOptions...)
var err error
if err = dec.Decode(&vk.g); err != nil {
diff --git a/ecc/bw6-761/marshal_test.go b/ecc/bw6-761/marshal_test.go
index 99b6bcfa2..185be8007 100644
--- a/ecc/bw6-761/marshal_test.go
+++ b/ecc/bw6-761/marshal_test.go
@@ -53,6 +53,7 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
var inK fr.Vector
var inL [][]fr.Element
+ var inM [][]uint64
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -70,12 +71,13 @@ func TestEncoder(t *testing.T) {
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
inL = [][]fr.Element{inJ, inK}
+ inM = [][]uint64{{1, 2}, {4}, {}}
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL, inM}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -101,8 +103,9 @@ func TestEncoder(t *testing.T) {
var outJ []fr.Element
var outK fr.Vector
var outL [][]fr.Element
+ var outM [][]uint64
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL, &outM}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -145,6 +148,9 @@ func TestEncoder(t *testing.T) {
if !reflect.DeepEqual(inL, outL) {
t.Fatal("decode(encode(slice²(elements))) failed")
}
+ if !reflect.DeepEqual(inM, outM) {
+ t.Fatal("decode(encode(slice²(uint64))) failed")
+ }
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
}
diff --git a/internal/generator/ecc/template/tests/marshal.go.tmpl b/internal/generator/ecc/template/tests/marshal.go.tmpl
index 88e4269ee..9860884e9 100644
--- a/internal/generator/ecc/template/tests/marshal.go.tmpl
+++ b/internal/generator/ecc/template/tests/marshal.go.tmpl
@@ -43,6 +43,7 @@ func TestEncoder(t *testing.T) {
var inJ []fr.Element
var inK fr.Vector
var inL [][]fr.Element
+ var inM [][]uint64
// set values of inputs
inA = rand.Uint64() //#nosec G404 weak rng is fine here
@@ -60,13 +61,13 @@ func TestEncoder(t *testing.T) {
inK = make(fr.Vector, 42)
inK[41].SetUint64(42)
inL =[][]fr.Element {inJ, inK}
-
+ inM = [][]uint64{ {1, 2}, {4}, {} }
// encode them, compressed and raw
var buf, bufRaw bytes.Buffer
enc := NewEncoder(&buf)
encRaw := NewEncoder(&bufRaw, RawEncoding())
- toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL}
+ toEncode := []interface{}{inA, &inB, &inC, &inD, &inE, &inF, inG, inH, inI, inJ, inK, inL, inM}
for _, v := range toEncode {
if err := enc.Encode(v); err != nil {
t.Fatal(err)
@@ -93,8 +94,9 @@ func TestEncoder(t *testing.T) {
var outJ []fr.Element
var outK fr.Vector
var outL [][]fr.Element
+ var outM [][]uint64
- toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL}
+ toDecode := []interface{}{&outA, &outB, &outC, &outD, &outE, &outF, &outG, &outH, &outI, &outJ, &outK, &outL, &outM}
for _, v := range toDecode {
if err := dec.Decode(v); err != nil {
t.Fatal(err)
@@ -135,7 +137,10 @@ func TestEncoder(t *testing.T) {
t.Fatal("decode(encode(vector)) failed")
}
if !reflect.DeepEqual(inL, outL) {
- t.Fatal("decode(encode(slice²(elements))) failed")
+ t.Fatal("decode(encode(slice²(elements))) failed")
+ }
+ if !reflect.DeepEqual(inM, outM) {
+ t.Fatal("decode(encode(slice²(uint64))) failed")
}
if n != dec.BytesRead() {
t.Fatal("bytes read don't match bytes written")
diff --git a/internal/generator/pedersen/template/pedersen.go.tmpl b/internal/generator/pedersen/template/pedersen.go.tmpl
index d9db523db..c84d17559 100644
--- a/internal/generator/pedersen/template/pedersen.go.tmpl
+++ b/internal/generator/pedersen/template/pedersen.go.tmpl
@@ -280,7 +280,15 @@ func (vk *VerifyingKey) writeTo(enc *curve.Encoder) (int64, error) {
}
func (vk *VerifyingKey) ReadFrom(r io.Reader) (int64, error) {
- dec := curve.NewDecoder(r)
+ return vk.readFrom(r)
+}
+
+func (vk *VerifyingKey) UnsafeReadFrom(r io.Reader) (int64, error) {
+ return vk.readFrom(r, curve.NoSubgroupChecks())
+}
+
+func (vk *VerifyingKey) readFrom(r io.Reader, decOptions ...func(*curve.Decoder)) (int64, error) {
+ dec := curve.NewDecoder(r, decOptions...)
var err error
if err = dec.Decode(&vk.g); err != nil {
From 1f40d7cc5f019cb98efc3fae897ee2297291197b Mon Sep 17 00:00:00 2001
From: Gautam Botrel
Date: Tue, 6 Jun 2023 10:35:01 -0500
Subject: [PATCH 29/51] msm: semaphore to limit CPUs + better split strategy
(up to 25% perf boost on 96cores) (#403)
* feat: add semaphore in msm and better split strategy
* fix: close the chan semaphore
* perf: reduced default value of nbTasks
---
ecc/bls12-377/multiexp.go | 185 +++++++++++++-----
ecc/bls12-377/multiexp_affine.go | 28 ++-
ecc/bls12-377/multiexp_jacobian.go | 28 ++-
ecc/bls12-377/multiexp_test.go | 4 +-
ecc/bls12-378/multiexp.go | 185 +++++++++++++-----
ecc/bls12-378/multiexp_affine.go | 28 ++-
ecc/bls12-378/multiexp_jacobian.go | 28 ++-
ecc/bls12-378/multiexp_test.go | 4 +-
ecc/bls12-381/multiexp.go | 185 +++++++++++++-----
ecc/bls12-381/multiexp_affine.go | 28 ++-
ecc/bls12-381/multiexp_jacobian.go | 28 ++-
ecc/bls12-381/multiexp_test.go | 4 +-
ecc/bls24-315/multiexp.go | 185 +++++++++++++-----
ecc/bls24-315/multiexp_affine.go | 28 ++-
ecc/bls24-315/multiexp_jacobian.go | 28 ++-
ecc/bls24-315/multiexp_test.go | 4 +-
ecc/bls24-317/multiexp.go | 185 +++++++++++++-----
ecc/bls24-317/multiexp_affine.go | 28 ++-
ecc/bls24-317/multiexp_jacobian.go | 28 ++-
ecc/bls24-317/multiexp_test.go | 4 +-
ecc/bn254/multiexp.go | 185 +++++++++++++-----
ecc/bn254/multiexp_affine.go | 28 ++-
ecc/bn254/multiexp_jacobian.go | 28 ++-
ecc/bn254/multiexp_test.go | 4 +-
ecc/bw6-633/multiexp.go | 185 +++++++++++++-----
ecc/bw6-633/multiexp_affine.go | 28 ++-
ecc/bw6-633/multiexp_jacobian.go | 28 ++-
ecc/bw6-633/multiexp_test.go | 4 +-
ecc/bw6-756/multiexp.go | 185 +++++++++++++-----
ecc/bw6-756/multiexp_affine.go | 28 ++-
ecc/bw6-756/multiexp_jacobian.go | 28 ++-
ecc/bw6-756/multiexp_test.go | 4 +-
ecc/bw6-761/multiexp.go | 185 +++++++++++++-----
ecc/bw6-761/multiexp_affine.go | 28 ++-
ecc/bw6-761/multiexp_jacobian.go | 28 ++-
ecc/bw6-761/multiexp_test.go | 4 +-
ecc/secp256k1/multiexp.go | 95 ++++++---
ecc/secp256k1/multiexp_affine.go | 14 +-
ecc/secp256k1/multiexp_jacobian.go | 14 +-
ecc/secp256k1/multiexp_test.go | 2 +-
.../generator/ecc/template/multiexp.go.tmpl | 95 ++++++---
.../ecc/template/multiexp_affine.go.tmpl | 15 +-
.../ecc/template/multiexp_jacobian.go.tmpl | 14 +-
.../ecc/template/tests/multiexp.go.tmpl | 2 +-
44 files changed, 1895 insertions(+), 561 deletions(-)
diff --git a/ecc/bls12-377/multiexp.go b/ecc/bls12-377/multiexp.go
index 10699d84a..52fdc682c 100644
--- a/ecc/bls12-377/multiexp.go
+++ b/ecc/bls12-377/multiexp.go
@@ -41,6 +41,7 @@ func (p *G1Affine) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G1Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -75,7 +76,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -105,29 +106,51 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G1Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
}
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G1Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
+ }
+
+ // if we don't split, we use the best C we found
_innerMsmG1(p, C, points, scalars, config)
return p, nil
@@ -149,6 +172,19 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
chChunks[i] = make(chan g1JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -161,8 +197,12 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g1JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -172,7 +212,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG1Affine(p, int(c), chChunks[:])
@@ -180,7 +220,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// getChunkProcessorG1 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16) {
+func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -298,6 +338,7 @@ func (p *G2Affine) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G2Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -332,7 +373,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -362,29 +403,51 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G2Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
+ }
+
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G2Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
}
+ // if we don't split, we use the best C we found
_innerMsmG2(p, C, points, scalars, config)
return p, nil
@@ -406,6 +469,19 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
chChunks[i] = make(chan g2JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -418,8 +494,12 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g2JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -429,7 +509,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG2Affine(p, int(c), chChunks[:])
@@ -437,7 +517,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// getChunkProcessorG2 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16) {
+func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -582,6 +662,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
diff --git a/ecc/bls12-377/multiexp_affine.go b/ecc/bls12-377/multiexp_affine.go
index c6c022df4..d8ed9f8c4 100644
--- a/ecc/bls12-377/multiexp_affine.go
+++ b/ecc/bls12-377/multiexp_affine.go
@@ -37,7 +37,13 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -226,6 +232,12 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -353,7 +365,13 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -542,6 +560,12 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bls12-377/multiexp_jacobian.go b/ecc/bls12-377/multiexp_jacobian.go
index 8226a8d91..f766d8adb 100644
--- a/ecc/bls12-377/multiexp_jacobian.go
+++ b/ecc/bls12-377/multiexp_jacobian.go
@@ -20,7 +20,13 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -56,6 +62,12 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -97,7 +109,13 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -133,6 +151,12 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bls12-377/multiexp_test.go b/ecc/bls12-377/multiexp_test.go
index 1166d52a2..712b8f7d3 100644
--- a/ecc/bls12-377/multiexp_test.go
+++ b/ecc/bls12-377/multiexp_test.go
@@ -306,7 +306,7 @@ func _innerMsmG1Reference(p *G1Jac, points []G1Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG1Jacobian[bucketg1JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG1Affine(p, int(16), chChunks[:])
@@ -718,7 +718,7 @@ func _innerMsmG2Reference(p *G2Jac, points []G2Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG2Jacobian[bucketg2JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG2Affine(p, int(16), chChunks[:])
diff --git a/ecc/bls12-378/multiexp.go b/ecc/bls12-378/multiexp.go
index 926c013cc..494177fb5 100644
--- a/ecc/bls12-378/multiexp.go
+++ b/ecc/bls12-378/multiexp.go
@@ -41,6 +41,7 @@ func (p *G1Affine) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G1Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -75,7 +76,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -105,29 +106,51 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G1Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
}
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G1Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
+ }
+
+ // if we don't split, we use the best C we found
_innerMsmG1(p, C, points, scalars, config)
return p, nil
@@ -149,6 +172,19 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
chChunks[i] = make(chan g1JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -161,8 +197,12 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g1JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -172,7 +212,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG1Affine(p, int(c), chChunks[:])
@@ -180,7 +220,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// getChunkProcessorG1 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16) {
+func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -300,6 +340,7 @@ func (p *G2Affine) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G2Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -334,7 +375,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -364,29 +405,51 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G2Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
+ }
+
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G2Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
}
+ // if we don't split, we use the best C we found
_innerMsmG2(p, C, points, scalars, config)
return p, nil
@@ -408,6 +471,19 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
chChunks[i] = make(chan g2JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -420,8 +496,12 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g2JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -431,7 +511,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG2Affine(p, int(c), chChunks[:])
@@ -439,7 +519,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// getChunkProcessorG2 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16) {
+func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -586,6 +666,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
diff --git a/ecc/bls12-378/multiexp_affine.go b/ecc/bls12-378/multiexp_affine.go
index 22a42a7ef..6fe167218 100644
--- a/ecc/bls12-378/multiexp_affine.go
+++ b/ecc/bls12-378/multiexp_affine.go
@@ -37,7 +37,13 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -226,6 +232,12 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -353,7 +365,13 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -542,6 +560,12 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bls12-378/multiexp_jacobian.go b/ecc/bls12-378/multiexp_jacobian.go
index fe3cd412a..86b7dbc9a 100644
--- a/ecc/bls12-378/multiexp_jacobian.go
+++ b/ecc/bls12-378/multiexp_jacobian.go
@@ -20,7 +20,13 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -56,6 +62,12 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -99,7 +111,13 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -135,6 +153,12 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bls12-378/multiexp_test.go b/ecc/bls12-378/multiexp_test.go
index 25a035e5f..ad7d9474d 100644
--- a/ecc/bls12-378/multiexp_test.go
+++ b/ecc/bls12-378/multiexp_test.go
@@ -306,7 +306,7 @@ func _innerMsmG1Reference(p *G1Jac, points []G1Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG1Jacobian[bucketg1JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG1Affine(p, int(16), chChunks[:])
@@ -718,7 +718,7 @@ func _innerMsmG2Reference(p *G2Jac, points []G2Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG2Jacobian[bucketg2JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG2Affine(p, int(16), chChunks[:])
diff --git a/ecc/bls12-381/multiexp.go b/ecc/bls12-381/multiexp.go
index cdc96a2b6..df673c4c0 100644
--- a/ecc/bls12-381/multiexp.go
+++ b/ecc/bls12-381/multiexp.go
@@ -41,6 +41,7 @@ func (p *G1Affine) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G1Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -75,7 +76,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -105,29 +106,51 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G1Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
}
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G1Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
+ }
+
+ // if we don't split, we use the best C we found
_innerMsmG1(p, C, points, scalars, config)
return p, nil
@@ -149,6 +172,19 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
chChunks[i] = make(chan g1JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -161,8 +197,12 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g1JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -172,7 +212,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG1Affine(p, int(c), chChunks[:])
@@ -180,7 +220,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// getChunkProcessorG1 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16) {
+func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16, sem chan struct{}) {
switch c {
case 3:
@@ -298,6 +338,7 @@ func (p *G2Affine) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G2Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -332,7 +373,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -362,29 +403,51 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G2Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
+ }
+
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G2Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
}
+ // if we don't split, we use the best C we found
_innerMsmG2(p, C, points, scalars, config)
return p, nil
@@ -406,6 +469,19 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
chChunks[i] = make(chan g2JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -418,8 +494,12 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g2JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -429,7 +509,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG2Affine(p, int(c), chChunks[:])
@@ -437,7 +517,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// getChunkProcessorG2 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16) {
+func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16, sem chan struct{}) {
switch c {
case 3:
@@ -582,6 +662,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
diff --git a/ecc/bls12-381/multiexp_affine.go b/ecc/bls12-381/multiexp_affine.go
index 285da7284..14a1dc29d 100644
--- a/ecc/bls12-381/multiexp_affine.go
+++ b/ecc/bls12-381/multiexp_affine.go
@@ -37,7 +37,13 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -226,6 +232,12 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -353,7 +365,13 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -542,6 +560,12 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bls12-381/multiexp_jacobian.go b/ecc/bls12-381/multiexp_jacobian.go
index 9abe78b33..b5af1128a 100644
--- a/ecc/bls12-381/multiexp_jacobian.go
+++ b/ecc/bls12-381/multiexp_jacobian.go
@@ -20,7 +20,13 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -56,6 +62,12 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -97,7 +109,13 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -133,6 +151,12 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bls12-381/multiexp_test.go b/ecc/bls12-381/multiexp_test.go
index 8cd076b09..92dd4c7eb 100644
--- a/ecc/bls12-381/multiexp_test.go
+++ b/ecc/bls12-381/multiexp_test.go
@@ -306,7 +306,7 @@ func _innerMsmG1Reference(p *G1Jac, points []G1Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG1Jacobian[bucketg1JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG1Affine(p, int(16), chChunks[:])
@@ -718,7 +718,7 @@ func _innerMsmG2Reference(p *G2Jac, points []G2Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG2Jacobian[bucketg2JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG2Affine(p, int(16), chChunks[:])
diff --git a/ecc/bls24-315/multiexp.go b/ecc/bls24-315/multiexp.go
index 7c708411f..4619bee3f 100644
--- a/ecc/bls24-315/multiexp.go
+++ b/ecc/bls24-315/multiexp.go
@@ -41,6 +41,7 @@ func (p *G1Affine) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G1Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -75,7 +76,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -105,29 +106,51 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G1Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
}
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G1Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
+ }
+
+ // if we don't split, we use the best C we found
_innerMsmG1(p, C, points, scalars, config)
return p, nil
@@ -149,6 +172,19 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
chChunks[i] = make(chan g1JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -161,8 +197,12 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g1JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -172,7 +212,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG1Affine(p, int(c), chChunks[:])
@@ -180,7 +220,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// getChunkProcessorG1 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16) {
+func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -298,6 +338,7 @@ func (p *G2Affine) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G2Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -332,7 +373,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -362,29 +403,51 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G2Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
+ }
+
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G2Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
}
+ // if we don't split, we use the best C we found
_innerMsmG2(p, C, points, scalars, config)
return p, nil
@@ -406,6 +469,19 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
chChunks[i] = make(chan g2JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -418,8 +494,12 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g2JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -429,7 +509,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG2Affine(p, int(c), chChunks[:])
@@ -437,7 +517,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// getChunkProcessorG2 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16) {
+func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -582,6 +662,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
diff --git a/ecc/bls24-315/multiexp_affine.go b/ecc/bls24-315/multiexp_affine.go
index c80499109..7d27c125c 100644
--- a/ecc/bls24-315/multiexp_affine.go
+++ b/ecc/bls24-315/multiexp_affine.go
@@ -37,7 +37,13 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -226,6 +232,12 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -353,7 +365,13 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -542,6 +560,12 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bls24-315/multiexp_jacobian.go b/ecc/bls24-315/multiexp_jacobian.go
index eeeb19680..c6f10cc79 100644
--- a/ecc/bls24-315/multiexp_jacobian.go
+++ b/ecc/bls24-315/multiexp_jacobian.go
@@ -20,7 +20,13 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -56,6 +62,12 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -97,7 +109,13 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -133,6 +151,12 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bls24-315/multiexp_test.go b/ecc/bls24-315/multiexp_test.go
index 0492475b3..7961763cf 100644
--- a/ecc/bls24-315/multiexp_test.go
+++ b/ecc/bls24-315/multiexp_test.go
@@ -306,7 +306,7 @@ func _innerMsmG1Reference(p *G1Jac, points []G1Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG1Jacobian[bucketg1JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG1Affine(p, int(16), chChunks[:])
@@ -718,7 +718,7 @@ func _innerMsmG2Reference(p *G2Jac, points []G2Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG2Jacobian[bucketg2JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG2Affine(p, int(16), chChunks[:])
diff --git a/ecc/bls24-317/multiexp.go b/ecc/bls24-317/multiexp.go
index e4909fa9e..b3c1f10e3 100644
--- a/ecc/bls24-317/multiexp.go
+++ b/ecc/bls24-317/multiexp.go
@@ -41,6 +41,7 @@ func (p *G1Affine) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G1Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -75,7 +76,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -105,29 +106,51 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G1Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
}
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G1Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
+ }
+
+ // if we don't split, we use the best C we found
_innerMsmG1(p, C, points, scalars, config)
return p, nil
@@ -149,6 +172,19 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
chChunks[i] = make(chan g1JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -161,8 +197,12 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g1JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -172,7 +212,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG1Affine(p, int(c), chChunks[:])
@@ -180,7 +220,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// getChunkProcessorG1 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16) {
+func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16, sem chan struct{}) {
switch c {
case 3:
@@ -298,6 +338,7 @@ func (p *G2Affine) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G2Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -332,7 +373,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -362,29 +403,51 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G2Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
+ }
+
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G2Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
}
+ // if we don't split, we use the best C we found
_innerMsmG2(p, C, points, scalars, config)
return p, nil
@@ -406,6 +469,19 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
chChunks[i] = make(chan g2JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -418,8 +494,12 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g2JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -429,7 +509,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG2Affine(p, int(c), chChunks[:])
@@ -437,7 +517,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// getChunkProcessorG2 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16) {
+func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16, sem chan struct{}) {
switch c {
case 3:
@@ -582,6 +662,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
diff --git a/ecc/bls24-317/multiexp_affine.go b/ecc/bls24-317/multiexp_affine.go
index ba8135b40..cbbb29700 100644
--- a/ecc/bls24-317/multiexp_affine.go
+++ b/ecc/bls24-317/multiexp_affine.go
@@ -37,7 +37,13 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -226,6 +232,12 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -353,7 +365,13 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -542,6 +560,12 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bls24-317/multiexp_jacobian.go b/ecc/bls24-317/multiexp_jacobian.go
index a07c9e874..a1eb686cb 100644
--- a/ecc/bls24-317/multiexp_jacobian.go
+++ b/ecc/bls24-317/multiexp_jacobian.go
@@ -20,7 +20,13 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -56,6 +62,12 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -97,7 +109,13 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -133,6 +151,12 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bls24-317/multiexp_test.go b/ecc/bls24-317/multiexp_test.go
index e48db59fd..efd3fb370 100644
--- a/ecc/bls24-317/multiexp_test.go
+++ b/ecc/bls24-317/multiexp_test.go
@@ -306,7 +306,7 @@ func _innerMsmG1Reference(p *G1Jac, points []G1Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG1Jacobian[bucketg1JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG1Affine(p, int(16), chChunks[:])
@@ -718,7 +718,7 @@ func _innerMsmG2Reference(p *G2Jac, points []G2Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG2Jacobian[bucketg2JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG2Affine(p, int(16), chChunks[:])
diff --git a/ecc/bn254/multiexp.go b/ecc/bn254/multiexp.go
index 3650ae1e8..9204858ae 100644
--- a/ecc/bn254/multiexp.go
+++ b/ecc/bn254/multiexp.go
@@ -41,6 +41,7 @@ func (p *G1Affine) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G1Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -75,7 +76,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -105,29 +106,51 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G1Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
}
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G1Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
+ }
+
+ // if we don't split, we use the best C we found
_innerMsmG1(p, C, points, scalars, config)
return p, nil
@@ -149,6 +172,19 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
chChunks[i] = make(chan g1JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -161,8 +197,12 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g1JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -172,7 +212,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG1Affine(p, int(c), chChunks[:])
@@ -180,7 +220,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// getChunkProcessorG1 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16) {
+func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -300,6 +340,7 @@ func (p *G2Affine) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G2Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -334,7 +375,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -364,29 +405,51 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G2Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
+ }
+
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G2Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
}
+ // if we don't split, we use the best C we found
_innerMsmG2(p, C, points, scalars, config)
return p, nil
@@ -408,6 +471,19 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
chChunks[i] = make(chan g2JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -420,8 +496,12 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g2JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -431,7 +511,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG2Affine(p, int(c), chChunks[:])
@@ -439,7 +519,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// getChunkProcessorG2 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16) {
+func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -586,6 +666,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
diff --git a/ecc/bn254/multiexp_affine.go b/ecc/bn254/multiexp_affine.go
index 81078a143..e4b3bfced 100644
--- a/ecc/bn254/multiexp_affine.go
+++ b/ecc/bn254/multiexp_affine.go
@@ -37,7 +37,13 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -226,6 +232,12 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -353,7 +365,13 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -542,6 +560,12 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bn254/multiexp_jacobian.go b/ecc/bn254/multiexp_jacobian.go
index 53490b9cc..f9b8a901b 100644
--- a/ecc/bn254/multiexp_jacobian.go
+++ b/ecc/bn254/multiexp_jacobian.go
@@ -20,7 +20,13 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -56,6 +62,12 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -99,7 +111,13 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -135,6 +153,12 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bn254/multiexp_test.go b/ecc/bn254/multiexp_test.go
index 17989d368..e1f848e9f 100644
--- a/ecc/bn254/multiexp_test.go
+++ b/ecc/bn254/multiexp_test.go
@@ -306,7 +306,7 @@ func _innerMsmG1Reference(p *G1Jac, points []G1Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG1Jacobian[bucketg1JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG1Affine(p, int(16), chChunks[:])
@@ -718,7 +718,7 @@ func _innerMsmG2Reference(p *G2Jac, points []G2Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG2Jacobian[bucketg2JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG2Affine(p, int(16), chChunks[:])
diff --git a/ecc/bw6-633/multiexp.go b/ecc/bw6-633/multiexp.go
index cbab47917..3e0ad3498 100644
--- a/ecc/bw6-633/multiexp.go
+++ b/ecc/bw6-633/multiexp.go
@@ -41,6 +41,7 @@ func (p *G1Affine) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G1Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -75,7 +76,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -105,29 +106,51 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G1Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
}
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G1Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
+ }
+
+ // if we don't split, we use the best C we found
_innerMsmG1(p, C, points, scalars, config)
return p, nil
@@ -149,6 +172,19 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
chChunks[i] = make(chan g1JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -161,8 +197,12 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g1JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -172,7 +212,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG1Affine(p, int(c), chChunks[:])
@@ -180,7 +220,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// getChunkProcessorG1 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16) {
+func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16, sem chan struct{}) {
switch c {
case 4:
@@ -247,6 +287,7 @@ func (p *G2Affine) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G2Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -281,7 +322,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -311,29 +352,51 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G2Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
+ }
+
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G2Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
}
+ // if we don't split, we use the best C we found
_innerMsmG2(p, C, points, scalars, config)
return p, nil
@@ -355,6 +418,19 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
chChunks[i] = make(chan g2JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -367,8 +443,12 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g2JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -378,7 +458,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG2Affine(p, int(c), chChunks[:])
@@ -386,7 +466,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// getChunkProcessorG2 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16) {
+func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16, sem chan struct{}) {
switch c {
case 4:
@@ -480,6 +560,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
diff --git a/ecc/bw6-633/multiexp_affine.go b/ecc/bw6-633/multiexp_affine.go
index 2c9eaa8ac..afa4a2bf3 100644
--- a/ecc/bw6-633/multiexp_affine.go
+++ b/ecc/bw6-633/multiexp_affine.go
@@ -36,7 +36,13 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -225,6 +231,12 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -292,7 +304,13 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -481,6 +499,12 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bw6-633/multiexp_jacobian.go b/ecc/bw6-633/multiexp_jacobian.go
index a79e63260..e8d707ec0 100644
--- a/ecc/bw6-633/multiexp_jacobian.go
+++ b/ecc/bw6-633/multiexp_jacobian.go
@@ -20,7 +20,13 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -56,6 +62,12 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -81,7 +93,13 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -117,6 +135,12 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bw6-633/multiexp_test.go b/ecc/bw6-633/multiexp_test.go
index 74f2ef86e..1e45861b7 100644
--- a/ecc/bw6-633/multiexp_test.go
+++ b/ecc/bw6-633/multiexp_test.go
@@ -306,7 +306,7 @@ func _innerMsmG1Reference(p *G1Jac, points []G1Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG1Jacobian[bucketg1JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG1Affine(p, int(16), chChunks[:])
@@ -718,7 +718,7 @@ func _innerMsmG2Reference(p *G2Jac, points []G2Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG2Jacobian[bucketg2JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG2Affine(p, int(16), chChunks[:])
diff --git a/ecc/bw6-756/multiexp.go b/ecc/bw6-756/multiexp.go
index 3e691db6c..912970145 100644
--- a/ecc/bw6-756/multiexp.go
+++ b/ecc/bw6-756/multiexp.go
@@ -41,6 +41,7 @@ func (p *G1Affine) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G1Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -75,7 +76,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -105,29 +106,51 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G1Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
}
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G1Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
+ }
+
+ // if we don't split, we use the best C we found
_innerMsmG1(p, C, points, scalars, config)
return p, nil
@@ -149,6 +172,19 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
chChunks[i] = make(chan g1JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -161,8 +197,12 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g1JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -172,7 +212,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG1Affine(p, int(c), chChunks[:])
@@ -180,7 +220,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// getChunkProcessorG1 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16) {
+func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16, sem chan struct{}) {
switch c {
case 3:
@@ -247,6 +287,7 @@ func (p *G2Affine) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G2Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -281,7 +322,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -311,29 +352,51 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G2Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
+ }
+
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G2Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
}
+ // if we don't split, we use the best C we found
_innerMsmG2(p, C, points, scalars, config)
return p, nil
@@ -355,6 +418,19 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
chChunks[i] = make(chan g2JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -367,8 +443,12 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g2JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -378,7 +458,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG2Affine(p, int(c), chChunks[:])
@@ -386,7 +466,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// getChunkProcessorG2 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16) {
+func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16, sem chan struct{}) {
switch c {
case 3:
@@ -480,6 +560,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
diff --git a/ecc/bw6-756/multiexp_affine.go b/ecc/bw6-756/multiexp_affine.go
index 4a5df9652..edcf8f1b8 100644
--- a/ecc/bw6-756/multiexp_affine.go
+++ b/ecc/bw6-756/multiexp_affine.go
@@ -36,7 +36,13 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -225,6 +231,12 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -292,7 +304,13 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -481,6 +499,12 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bw6-756/multiexp_jacobian.go b/ecc/bw6-756/multiexp_jacobian.go
index 9251324d1..503e51b34 100644
--- a/ecc/bw6-756/multiexp_jacobian.go
+++ b/ecc/bw6-756/multiexp_jacobian.go
@@ -20,7 +20,13 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -56,6 +62,12 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -81,7 +93,13 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -117,6 +135,12 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bw6-756/multiexp_test.go b/ecc/bw6-756/multiexp_test.go
index d454ef78d..64b515445 100644
--- a/ecc/bw6-756/multiexp_test.go
+++ b/ecc/bw6-756/multiexp_test.go
@@ -306,7 +306,7 @@ func _innerMsmG1Reference(p *G1Jac, points []G1Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG1Jacobian[bucketg1JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG1Affine(p, int(16), chChunks[:])
@@ -718,7 +718,7 @@ func _innerMsmG2Reference(p *G2Jac, points []G2Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG2Jacobian[bucketg2JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG2Affine(p, int(16), chChunks[:])
diff --git a/ecc/bw6-761/multiexp.go b/ecc/bw6-761/multiexp.go
index 47aa334cc..161132e0b 100644
--- a/ecc/bw6-761/multiexp.go
+++ b/ecc/bw6-761/multiexp.go
@@ -41,6 +41,7 @@ func (p *G1Affine) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G1Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -75,7 +76,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -105,29 +106,51 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G1Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
}
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G1Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
+ }
+
+ // if we don't split, we use the best C we found
_innerMsmG1(p, C, points, scalars, config)
return p, nil
@@ -149,6 +172,19 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
chChunks[i] = make(chan g1JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -161,8 +197,12 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g1JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -172,7 +212,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG1Affine(p, int(c), chChunks[:])
@@ -180,7 +220,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// getChunkProcessorG1 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16) {
+func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -249,6 +289,7 @@ func (p *G2Affine) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G2Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -283,7 +324,7 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -313,29 +354,51 @@ func (p *G2Jac) MultiExp(points []G2Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G2Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
+ }
+
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G2Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
}
+ // if we don't split, we use the best C we found
_innerMsmG2(p, C, points, scalars, config)
return p, nil
@@ -357,6 +420,19 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
chChunks[i] = make(chan g2JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -369,8 +445,12 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g2JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -380,7 +460,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG2Affine(p, int(c), chChunks[:])
@@ -388,7 +468,7 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// getChunkProcessorG2 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16) {
+func getChunkProcessorG2(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g2JacExtended, c uint64, points []G2Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -484,6 +564,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
diff --git a/ecc/bw6-761/multiexp_affine.go b/ecc/bw6-761/multiexp_affine.go
index 1e6737077..38f11c5b0 100644
--- a/ecc/bw6-761/multiexp_affine.go
+++ b/ecc/bw6-761/multiexp_affine.go
@@ -36,7 +36,13 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -225,6 +231,12 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -292,7 +304,13 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -481,6 +499,12 @@ func processChunkG2BatchAffine[BJE ibg2JacExtended, B ibG2Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bw6-761/multiexp_jacobian.go b/ecc/bw6-761/multiexp_jacobian.go
index 16d7e6c8d..2401259a3 100644
--- a/ecc/bw6-761/multiexp_jacobian.go
+++ b/ecc/bw6-761/multiexp_jacobian.go
@@ -20,7 +20,13 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -56,6 +62,12 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
@@ -83,7 +95,13 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
chRes chan<- g2JacExtended,
c uint64,
points []G2Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -119,6 +137,12 @@ func processChunkG2Jacobian[B ibg2JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/bw6-761/multiexp_test.go b/ecc/bw6-761/multiexp_test.go
index 66e6e1724..d98bd688b 100644
--- a/ecc/bw6-761/multiexp_test.go
+++ b/ecc/bw6-761/multiexp_test.go
@@ -306,7 +306,7 @@ func _innerMsmG1Reference(p *G1Jac, points []G1Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG1Jacobian[bucketg1JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG1Affine(p, int(16), chChunks[:])
@@ -718,7 +718,7 @@ func _innerMsmG2Reference(p *G2Jac, points []G2Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG2Jacobian[bucketg2JacExtendedC16]
- go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 16, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG2Affine(p, int(16), chChunks[:])
diff --git a/ecc/secp256k1/multiexp.go b/ecc/secp256k1/multiexp.go
index 02febdfef..9977c2b34 100644
--- a/ecc/secp256k1/multiexp.go
+++ b/ecc/secp256k1/multiexp.go
@@ -41,6 +41,7 @@ func (p *G1Affine) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.MultiExpConfig) (*G1Jac, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -75,7 +76,7 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -105,29 +106,51 @@ func (p *G1Jac) MultiExp(points []G1Affine, scalars []fr.Element, config ecc.Mul
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints / 2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit * 2
- if (nbTasksPostSplit <= config.NbTasks/2) || (nbTasksPostSplit-config.NbTasks/2) <= (config.NbTasks-nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p G1Jac
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
}
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int { return (nbPoints + int((1 << c))) }
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints / 2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit*2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p G1Jac
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
+ }
+
+ // if we don't split, we use the best C we found
_innerMsmG1(p, C, points, scalars, config)
return p, nil
@@ -149,6 +172,19 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
chChunks[i] = make(chan g1JacExtended, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ for i := 0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -161,8 +197,12 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan g1JacExtended, 2)
split := n / 2
- go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j), chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j), chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -172,7 +212,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunkG1Affine(p, int(c), chChunks[:])
@@ -180,7 +220,7 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// getChunkProcessorG1 decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16) {
+func getChunkProcessorG1(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- g1JacExtended, c uint64, points []G1Affine, digits []uint16, sem chan struct{}) {
switch c {
case 2:
@@ -318,6 +358,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
diff --git a/ecc/secp256k1/multiexp_affine.go b/ecc/secp256k1/multiexp_affine.go
index a7a6c0c16..9cb8e2e16 100644
--- a/ecc/secp256k1/multiexp_affine.go
+++ b/ecc/secp256k1/multiexp_affine.go
@@ -36,7 +36,13 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -225,6 +231,12 @@ func processChunkG1BatchAffine[BJE ibg1JacExtended, B ibG1Affine, BS bitSet, TP
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/secp256k1/multiexp_jacobian.go b/ecc/secp256k1/multiexp_jacobian.go
index 788e64661..40a34f8fa 100644
--- a/ecc/secp256k1/multiexp_jacobian.go
+++ b/ecc/secp256k1/multiexp_jacobian.go
@@ -20,7 +20,13 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
chRes chan<- g1JacExtended,
c uint64,
points []G1Affine,
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0; i < len(buckets); i++ {
@@ -56,6 +62,12 @@ func processChunkG1Jacobian[B ibg1JacExtended](chunk uint64,
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/ecc/secp256k1/multiexp_test.go b/ecc/secp256k1/multiexp_test.go
index e0ad2cf8d..87cbd1575 100644
--- a/ecc/secp256k1/multiexp_test.go
+++ b/ecc/secp256k1/multiexp_test.go
@@ -306,7 +306,7 @@ func _innerMsmG1Reference(p *G1Jac, points []G1Affine, scalars []fr.Element, con
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunkG1Jacobian[bucketg1JacExtendedC15]
- go processChunk(uint64(j), chChunks[j], 15, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], 15, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunkG1Affine(p, int(15), chChunks[:])
diff --git a/internal/generator/ecc/template/multiexp.go.tmpl b/internal/generator/ecc/template/multiexp.go.tmpl
index b79994d7f..109643927 100644
--- a/internal/generator/ecc/template/multiexp.go.tmpl
+++ b/internal/generator/ecc/template/multiexp.go.tmpl
@@ -69,6 +69,11 @@ type chunkStat struct {
// negative digits can be processed in a later step as adding -G into the bucket instead of G
// (computing -G is cheap, and this saves us half of the buckets in the MultiExp or BatchScalarMultiplication)
func partitionScalars(scalars []fr.Element, c uint64, nbTasks int) ([]uint16, []chunkStat) {
+ // no benefit here to have more tasks than CPUs
+ if nbTasks > runtime.NumCPU() {
+ nbTasks = runtime.NumCPU()
+ }
+
// number of c-bit radixes in a scalar
nbChunks := computeNbChunks(c)
@@ -240,6 +245,7 @@ func (p *{{ $.TAffine }}) MultiExp(points []{{ $.TAffine }}, scalars []fr.Elemen
//
// This call return an error if len(scalars) != len(points) or if provided config is invalid.
func (p *{{ $.TJacobian }}) MultiExp(points []{{ $.TAffine }}, scalars []fr.Element, config ecc.MultiExpConfig) (*{{ $.TJacobian }}, error) {
+ // TODO @gbotrel replace the ecc.MultiExpConfig by a Option pattern for maintainability.
// note:
// each of the msmCX method is the same, except for the c constant it declares
// duplicating (through template generation) these methods allows to declare the buckets on the stack
@@ -274,7 +280,7 @@ func (p *{{ $.TJacobian }}) MultiExp(points []{{ $.TAffine }}, scalars []fr.Elem
// if nbTasks is not set, use all available CPUs
if config.NbTasks <= 0 {
- config.NbTasks = runtime.NumCPU()
+ config.NbTasks = runtime.NumCPU() * 2
} else if config.NbTasks > 1024 {
return nil, errors.New("invalid config: config.NbTasks > 1024")
}
@@ -306,29 +312,51 @@ func (p *{{ $.TJacobian }}) MultiExp(points []{{ $.TAffine }}, scalars []fr.Elem
C := bestC(nbPoints)
nbChunks := int(computeNbChunks(C))
- // if we don't utilise all the tasks (CPU in the default case) that we could, let's see if it's worth it to split
- if config.NbTasks > 1 && nbChunks < config.NbTasks {
- // before splitting, let's see if we end up with more tasks than thread;
- cSplit := bestC(nbPoints/2)
- nbChunksPostSplit := int(computeNbChunks(cSplit))
- nbTasksPostSplit := nbChunksPostSplit*2
- if (nbTasksPostSplit <= config.NbTasks /2 ) || ( nbTasksPostSplit - config.NbTasks/2 ) <= ( config.NbTasks - nbChunks) {
- // if postSplit we still have less tasks than available CPU
- // or if we have more tasks BUT the difference of CPU usage is in our favor, we split.
- config.NbTasks /= 2
- var _p {{ $.TJacobian }}
- chDone := make(chan struct{}, 1)
- go func() {
- _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
- close(chDone)
- }()
- p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
- <-chDone
- p.AddAssign(&_p)
- return p, nil
+ // should we recursively split the msm in half? (see below)
+ // we want to minimize the execution time of the algorithm;
+ // splitting the msm will **add** operations, but if it allows to use more CPU, it might be worth it.
+
+ // costFunction returns a metric that represent the "wall time" of the algorithm
+ costFunction := func(nbTasks, nbCpus, costPerTask int) int {
+ // cost for the reduction of all tasks (msmReduceChunk)
+ totalCost := nbTasks
+
+ // cost for the computation of each task (msmProcessChunk)
+ for nbTasks >= nbCpus {
+ nbTasks -= nbCpus
+ totalCost += costPerTask
+ }
+ if nbTasks > 0 {
+ totalCost += costPerTask
}
+ return totalCost
+ }
+
+ // costPerTask is the approximate number of group ops per task
+ costPerTask := func(c uint64, nbPoints int) int {return (nbPoints + int((1 << c)))}
+
+ costPreSplit := costFunction(nbChunks, config.NbTasks, costPerTask(C, nbPoints))
+
+ cPostSplit := bestC(nbPoints/2)
+ nbChunksPostSplit := int(computeNbChunks(cPostSplit))
+ costPostSplit := costFunction(nbChunksPostSplit * 2, config.NbTasks, costPerTask(cPostSplit, nbPoints/2))
+
+ // if the cost of the split msm is lower than the cost of the non split msm, we split
+ if costPostSplit < costPreSplit {
+ config.NbTasks = int(math.Ceil(float64(config.NbTasks) / 2.0))
+ var _p {{ $.TJacobian }}
+ chDone := make(chan struct{}, 1)
+ go func() {
+ _p.MultiExp(points[:nbPoints/2], scalars[:nbPoints/2], config)
+ close(chDone)
+ }()
+ p.MultiExp(points[nbPoints/2:], scalars[nbPoints/2:], config)
+ <-chDone
+ p.AddAssign(&_p)
+ return p, nil
}
+ // if we don't split, we use the best C we found
_innerMsm{{ $.UPointName }}(p, C, points, scalars, config)
return p, nil
@@ -350,6 +378,19 @@ func _innerMsm{{ $.UPointName }}(p *{{ $.TJacobian }}, c uint64, points []{{ $.T
chChunks[i] = make(chan {{ $.TJacobianExtended }}, 1)
}
+ // we use a semaphore to limit the number of go routines running concurrently
+ // (only if nbTasks < nbCPU)
+ var sem chan struct{}
+ if config.NbTasks < runtime.NumCPU() {
+ sem = make(chan struct{}, config.NbTasks * 2) // *2 because if chunk is overweight we split it in two
+ for i:=0; i < config.NbTasks; i++ {
+ sem <- struct{}{}
+ }
+ defer func() {
+ close(sem)
+ }()
+ }
+
// the last chunk may be processed with a different method than the rest, as it could be smaller.
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
@@ -362,8 +403,12 @@ func _innerMsm{{ $.UPointName }}(p *{{ $.TJacobian }}, c uint64, points []{{ $.T
// else what would happen is this go routine would finish much later than the others.
chSplit := make(chan {{ $.TJacobianExtended }}, 2)
split := n / 2
- go processChunk(uint64(j),chSplit, c, points[:split], digits[j*n:(j*n)+split])
- go processChunk(uint64(j),chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n])
+
+ if sem != nil {
+ sem <- struct{}{} // add another token to the semaphore, since we split in two.
+ }
+ go processChunk(uint64(j),chSplit, c, points[:split], digits[j*n:(j*n)+split], sem)
+ go processChunk(uint64(j),chSplit, c, points[split:], digits[(j*n)+split:(j+1)*n], sem)
go func(chunkID int) {
s1 := <-chSplit
s2 := <-chSplit
@@ -373,7 +418,7 @@ func _innerMsm{{ $.UPointName }}(p *{{ $.TJacobian }}, c uint64, points []{{ $.T
}(j)
continue
}
- go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], c, points, digits[j*n:(j+1)*n], sem)
}
return msmReduceChunk{{ $.TAffine }}(p, int(c), chChunks[:])
@@ -382,7 +427,7 @@ func _innerMsm{{ $.UPointName }}(p *{{ $.TJacobian }}, c uint64, points []{{ $.T
// getChunkProcessor{{ $.UPointName }} decides, depending on c window size and statistics for the chunk
// to return the best algorithm to process the chunk.
-func getChunkProcessor{{ $.UPointName }}(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- {{ $.TJacobianExtended }}, c uint64, points []{{ $.TAffine }}, digits []uint16) {
+func getChunkProcessor{{ $.UPointName }}(c uint64, stat chunkStat) func(chunkID uint64, chRes chan<- {{ $.TJacobianExtended }}, c uint64, points []{{ $.TAffine }}, digits []uint16, sem chan struct{}) {
switch c {
{{- range $c := $.LastCRange}}
case {{$c}}:
diff --git a/internal/generator/ecc/template/multiexp_affine.go.tmpl b/internal/generator/ecc/template/multiexp_affine.go.tmpl
index 6c4672b3d..a1c4dd80a 100644
--- a/internal/generator/ecc/template/multiexp_affine.go.tmpl
+++ b/internal/generator/ecc/template/multiexp_affine.go.tmpl
@@ -38,7 +38,13 @@ func processChunk{{ $.UPointName }}BatchAffine[BJE ib{{ $.TJacobianExtended }},B
chRes chan<- {{ $.TJacobianExtended }},
c uint64,
points []{{ $.TAffine }},
- digits []uint16) {
+ digits []uint16,
+ sem chan struct{}) {
+
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
// the batch affine addition needs independent points; in other words, for a window of batchSize
// we want to hit independent bucketIDs when processing the digit. if there is a conflict (we're trying
@@ -230,6 +236,13 @@ func processChunk{{ $.UPointName }}BatchAffine[BJE ib{{ $.TJacobianExtended }},B
total.add(&runningSum)
}
+
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+ }
+
chRes <- total
}
diff --git a/internal/generator/ecc/template/multiexp_jacobian.go.tmpl b/internal/generator/ecc/template/multiexp_jacobian.go.tmpl
index 89b4fbe80..95dfcdeb3 100644
--- a/internal/generator/ecc/template/multiexp_jacobian.go.tmpl
+++ b/internal/generator/ecc/template/multiexp_jacobian.go.tmpl
@@ -21,9 +21,13 @@ func processChunk{{ $.UPointName }}Jacobian[B ib{{ $.TJacobianExtended }}](chunk
chRes chan<- {{ $.TJacobianExtended }},
c uint64,
points []{{ $.TAffine }},
- digits []uint16) {
-
+ digits []uint16,
+ sem chan struct{}) {
+ if sem != nil {
+ // if we are limited, wait for a token in the semaphore
+ <-sem
+ }
var buckets B
for i := 0 ; i < len(buckets); i++ {
@@ -60,6 +64,12 @@ func processChunk{{ $.UPointName }}Jacobian[B ib{{ $.TJacobianExtended }}](chunk
total.add(&runningSum)
}
+ if sem != nil {
+ // release a token to the semaphore
+ // before sending to chRes
+ sem <- struct{}{}
+}
+
chRes <- total
}
diff --git a/internal/generator/ecc/template/tests/multiexp.go.tmpl b/internal/generator/ecc/template/tests/multiexp.go.tmpl
index 0201ada49..3feb22ffe 100644
--- a/internal/generator/ecc/template/tests/multiexp.go.tmpl
+++ b/internal/generator/ecc/template/tests/multiexp.go.tmpl
@@ -333,7 +333,7 @@ func _innerMsm{{ $.UPointName }}Reference(p *{{ $.TJacobian }}, points []{{ $.TA
n := len(points)
for j := int(nbChunks - 1); j >= 0; j-- {
processChunk := processChunk{{ $.UPointName }}Jacobian[bucket{{ $.TJacobianExtended }}C{{$.cmax}}]
- go processChunk(uint64(j), chChunks[j], {{$.cmax}}, points, digits[j*n:(j+1)*n])
+ go processChunk(uint64(j), chChunks[j], {{$.cmax}}, points, digits[j*n:(j+1)*n], nil)
}
return msmReduceChunk{{ $.TAffine }}(p, int({{$.cmax}}), chChunks[:])
From 0ee617fa6d434d1713bbbfc8f2594f423e1305be Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Fri, 9 Jun 2023 12:55:12 -0500
Subject: [PATCH 30/51] fix: do not read empty slices as nil
---
ecc/bls12-377/marshal.go | 2 +-
ecc/bls12-378/marshal.go | 2 +-
ecc/bls12-381/marshal.go | 2 +-
ecc/bls24-315/marshal.go | 2 +-
ecc/bls24-317/marshal.go | 2 +-
ecc/bn254/marshal.go | 2 +-
ecc/bw6-633/marshal.go | 2 +-
ecc/bw6-756/marshal.go | 2 +-
ecc/bw6-761/marshal.go | 2 +-
internal/generator/ecc/template/marshal.go.tmpl | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ecc/bls12-377/marshal.go b/ecc/bls12-377/marshal.go
index d5027e66e..317f7c535 100644
--- a/ecc/bls12-377/marshal.go
+++ b/ecc/bls12-377/marshal.go
@@ -230,7 +230,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
if err != nil {
return
}
- if len(*t) != int(sliceLen) {
+ if len(*t) != int(sliceLen) || *t == nil {
*t = make([]G1Affine, sliceLen)
}
compressed := make([]bool, sliceLen)
diff --git a/ecc/bls12-378/marshal.go b/ecc/bls12-378/marshal.go
index a137d8013..5bfd945ad 100644
--- a/ecc/bls12-378/marshal.go
+++ b/ecc/bls12-378/marshal.go
@@ -230,7 +230,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
if err != nil {
return
}
- if len(*t) != int(sliceLen) {
+ if len(*t) != int(sliceLen) || *t == nil {
*t = make([]G1Affine, sliceLen)
}
compressed := make([]bool, sliceLen)
diff --git a/ecc/bls12-381/marshal.go b/ecc/bls12-381/marshal.go
index 310163f07..8779479b2 100644
--- a/ecc/bls12-381/marshal.go
+++ b/ecc/bls12-381/marshal.go
@@ -230,7 +230,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
if err != nil {
return
}
- if len(*t) != int(sliceLen) {
+ if len(*t) != int(sliceLen) || *t == nil {
*t = make([]G1Affine, sliceLen)
}
compressed := make([]bool, sliceLen)
diff --git a/ecc/bls24-315/marshal.go b/ecc/bls24-315/marshal.go
index 22866bb81..c7635caec 100644
--- a/ecc/bls24-315/marshal.go
+++ b/ecc/bls24-315/marshal.go
@@ -230,7 +230,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
if err != nil {
return
}
- if len(*t) != int(sliceLen) {
+ if len(*t) != int(sliceLen) || *t == nil {
*t = make([]G1Affine, sliceLen)
}
compressed := make([]bool, sliceLen)
diff --git a/ecc/bls24-317/marshal.go b/ecc/bls24-317/marshal.go
index 6eea4d8ef..5e9f32552 100644
--- a/ecc/bls24-317/marshal.go
+++ b/ecc/bls24-317/marshal.go
@@ -230,7 +230,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
if err != nil {
return
}
- if len(*t) != int(sliceLen) {
+ if len(*t) != int(sliceLen) || *t == nil {
*t = make([]G1Affine, sliceLen)
}
compressed := make([]bool, sliceLen)
diff --git a/ecc/bn254/marshal.go b/ecc/bn254/marshal.go
index ff9838c99..d4a6f6eea 100644
--- a/ecc/bn254/marshal.go
+++ b/ecc/bn254/marshal.go
@@ -213,7 +213,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
if err != nil {
return
}
- if len(*t) != int(sliceLen) {
+ if len(*t) != int(sliceLen) || *t == nil {
*t = make([]G1Affine, sliceLen)
}
compressed := make([]bool, sliceLen)
diff --git a/ecc/bw6-633/marshal.go b/ecc/bw6-633/marshal.go
index 562ea7d57..155be56fa 100644
--- a/ecc/bw6-633/marshal.go
+++ b/ecc/bw6-633/marshal.go
@@ -230,7 +230,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
if err != nil {
return
}
- if len(*t) != int(sliceLen) {
+ if len(*t) != int(sliceLen) || *t == nil {
*t = make([]G1Affine, sliceLen)
}
compressed := make([]bool, sliceLen)
diff --git a/ecc/bw6-756/marshal.go b/ecc/bw6-756/marshal.go
index 556c41d56..08083e42b 100644
--- a/ecc/bw6-756/marshal.go
+++ b/ecc/bw6-756/marshal.go
@@ -230,7 +230,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
if err != nil {
return
}
- if len(*t) != int(sliceLen) {
+ if len(*t) != int(sliceLen) || *t == nil {
*t = make([]G1Affine, sliceLen)
}
compressed := make([]bool, sliceLen)
diff --git a/ecc/bw6-761/marshal.go b/ecc/bw6-761/marshal.go
index 3be9f3e7e..c232a9ed7 100644
--- a/ecc/bw6-761/marshal.go
+++ b/ecc/bw6-761/marshal.go
@@ -230,7 +230,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
if err != nil {
return
}
- if len(*t) != int(sliceLen) {
+ if len(*t) != int(sliceLen) || *t == nil {
*t = make([]G1Affine, sliceLen)
}
compressed := make([]bool, sliceLen)
diff --git a/internal/generator/ecc/template/marshal.go.tmpl b/internal/generator/ecc/template/marshal.go.tmpl
index 95a26f42d..1483e0bd7 100644
--- a/internal/generator/ecc/template/marshal.go.tmpl
+++ b/internal/generator/ecc/template/marshal.go.tmpl
@@ -239,7 +239,7 @@ func (dec *Decoder) Decode(v interface{}) (err error) {
if err != nil {
return
}
- if len(*t) != int(sliceLen) {
+ if len(*t) != int(sliceLen) || *t == nil {
*t = make([]G1Affine, sliceLen)
}
compressed := make([]bool, sliceLen)
From a3b568a67d79fd95effa526ab6f8eb03cf7adadb Mon Sep 17 00:00:00 2001
From: Gautam Botrel
Date: Wed, 14 Jun 2023 20:57:19 -0500
Subject: [PATCH 31/51] fix: incorrect semaphore initialization (#411)
---
ecc/bls12-377/multiexp.go | 6 ++++--
ecc/bls12-378/multiexp.go | 6 ++++--
ecc/bls12-381/multiexp.go | 6 ++++--
ecc/bls24-315/multiexp.go | 6 ++++--
ecc/bls24-317/multiexp.go | 6 ++++--
ecc/bn254/multiexp.go | 6 ++++--
ecc/bw6-633/multiexp.go | 6 ++++--
ecc/bw6-756/multiexp.go | 6 ++++--
ecc/bw6-761/multiexp.go | 6 ++++--
ecc/secp256k1/multiexp.go | 3 ++-
internal/generator/ecc/template/multiexp.go.tmpl | 3 ++-
11 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/ecc/bls12-377/multiexp.go b/ecc/bls12-377/multiexp.go
index 52fdc682c..8ae82e0a3 100644
--- a/ecc/bls12-377/multiexp.go
+++ b/ecc/bls12-377/multiexp.go
@@ -176,7 +176,8 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
@@ -473,7 +474,8 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
diff --git a/ecc/bls12-378/multiexp.go b/ecc/bls12-378/multiexp.go
index 494177fb5..de348daa8 100644
--- a/ecc/bls12-378/multiexp.go
+++ b/ecc/bls12-378/multiexp.go
@@ -176,7 +176,8 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
@@ -475,7 +476,8 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
diff --git a/ecc/bls12-381/multiexp.go b/ecc/bls12-381/multiexp.go
index df673c4c0..19350818f 100644
--- a/ecc/bls12-381/multiexp.go
+++ b/ecc/bls12-381/multiexp.go
@@ -176,7 +176,8 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
@@ -473,7 +474,8 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
diff --git a/ecc/bls24-315/multiexp.go b/ecc/bls24-315/multiexp.go
index 4619bee3f..8b8707b55 100644
--- a/ecc/bls24-315/multiexp.go
+++ b/ecc/bls24-315/multiexp.go
@@ -176,7 +176,8 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
@@ -473,7 +474,8 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
diff --git a/ecc/bls24-317/multiexp.go b/ecc/bls24-317/multiexp.go
index b3c1f10e3..2bc3702ce 100644
--- a/ecc/bls24-317/multiexp.go
+++ b/ecc/bls24-317/multiexp.go
@@ -176,7 +176,8 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
@@ -473,7 +474,8 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
diff --git a/ecc/bn254/multiexp.go b/ecc/bn254/multiexp.go
index 9204858ae..9d1b71278 100644
--- a/ecc/bn254/multiexp.go
+++ b/ecc/bn254/multiexp.go
@@ -176,7 +176,8 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
@@ -475,7 +476,8 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
diff --git a/ecc/bw6-633/multiexp.go b/ecc/bw6-633/multiexp.go
index 3e0ad3498..04e776e1c 100644
--- a/ecc/bw6-633/multiexp.go
+++ b/ecc/bw6-633/multiexp.go
@@ -176,7 +176,8 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
@@ -422,7 +423,8 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
diff --git a/ecc/bw6-756/multiexp.go b/ecc/bw6-756/multiexp.go
index 912970145..5de55134c 100644
--- a/ecc/bw6-756/multiexp.go
+++ b/ecc/bw6-756/multiexp.go
@@ -176,7 +176,8 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
@@ -422,7 +423,8 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
diff --git a/ecc/bw6-761/multiexp.go b/ecc/bw6-761/multiexp.go
index 161132e0b..5b20c0788 100644
--- a/ecc/bw6-761/multiexp.go
+++ b/ecc/bw6-761/multiexp.go
@@ -176,7 +176,8 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
@@ -424,7 +425,8 @@ func _innerMsmG2(p *G2Jac, c uint64, points []G2Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
diff --git a/ecc/secp256k1/multiexp.go b/ecc/secp256k1/multiexp.go
index 9977c2b34..5ad9746bd 100644
--- a/ecc/secp256k1/multiexp.go
+++ b/ecc/secp256k1/multiexp.go
@@ -176,7 +176,8 @@ func _innerMsmG1(p *G1Jac, c uint64, points []G1Affine, scalars []fr.Element, co
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks*2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks+int(nbChunks))
for i := 0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
diff --git a/internal/generator/ecc/template/multiexp.go.tmpl b/internal/generator/ecc/template/multiexp.go.tmpl
index 109643927..4c23a8286 100644
--- a/internal/generator/ecc/template/multiexp.go.tmpl
+++ b/internal/generator/ecc/template/multiexp.go.tmpl
@@ -382,7 +382,8 @@ func _innerMsm{{ $.UPointName }}(p *{{ $.TJacobian }}, c uint64, points []{{ $.T
// (only if nbTasks < nbCPU)
var sem chan struct{}
if config.NbTasks < runtime.NumCPU() {
- sem = make(chan struct{}, config.NbTasks * 2) // *2 because if chunk is overweight we split it in two
+ // we add nbChunks because if chunk is overweight we split it in two
+ sem = make(chan struct{}, config.NbTasks + int(nbChunks))
for i:=0; i < config.NbTasks; i++ {
sem <- struct{}{}
}
From 0af6233314c4a9e669808853b35e4b7de25d06d9 Mon Sep 17 00:00:00 2001
From: Gautam Botrel
Date: Thu, 22 Jun 2023 10:13:24 -0500
Subject: [PATCH 32/51] feat: added element.Unmarshal closes #348
---
ecc/bls12-377/fp/element.go | 5 +++++
ecc/bls12-377/fr/element.go | 5 +++++
ecc/bls12-378/fp/element.go | 5 +++++
ecc/bls12-378/fr/element.go | 5 +++++
ecc/bls12-381/fp/element.go | 5 +++++
ecc/bls12-381/fr/element.go | 5 +++++
ecc/bls24-315/fp/element.go | 5 +++++
ecc/bls24-315/fr/element.go | 5 +++++
ecc/bls24-317/fp/element.go | 5 +++++
ecc/bls24-317/fr/element.go | 5 +++++
ecc/bn254/fp/element.go | 5 +++++
ecc/bn254/fr/element.go | 5 +++++
ecc/bw6-633/fp/element.go | 5 +++++
ecc/bw6-633/fr/element.go | 5 +++++
ecc/bw6-756/fp/element.go | 5 +++++
ecc/bw6-756/fr/element.go | 5 +++++
ecc/bw6-761/fp/element.go | 5 +++++
ecc/bw6-761/fr/element.go | 5 +++++
ecc/secp256k1/fp/element.go | 5 +++++
ecc/secp256k1/fr/element.go | 5 +++++
ecc/stark-curve/fp/element.go | 5 +++++
ecc/stark-curve/fr/element.go | 5 +++++
field/generator/internal/templates/element/conv.go | 5 +++++
field/goldilocks/element.go | 5 +++++
24 files changed, 120 insertions(+)
diff --git a/ecc/bls12-377/fp/element.go b/ecc/bls12-377/fp/element.go
index c0a01bd34..ca4f04d82 100644
--- a/ecc/bls12-377/fp/element.go
+++ b/ecc/bls12-377/fp/element.go
@@ -1064,6 +1064,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bls12-377/fr/element.go b/ecc/bls12-377/fr/element.go
index ebdb2cf0a..f5e5c0d87 100644
--- a/ecc/bls12-377/fr/element.go
+++ b/ecc/bls12-377/fr/element.go
@@ -902,6 +902,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bls12-378/fp/element.go b/ecc/bls12-378/fp/element.go
index cf7a8a852..d011b77fa 100644
--- a/ecc/bls12-378/fp/element.go
+++ b/ecc/bls12-378/fp/element.go
@@ -1064,6 +1064,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bls12-378/fr/element.go b/ecc/bls12-378/fr/element.go
index 5718a3be8..be47b0996 100644
--- a/ecc/bls12-378/fr/element.go
+++ b/ecc/bls12-378/fr/element.go
@@ -902,6 +902,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bls12-381/fp/element.go b/ecc/bls12-381/fp/element.go
index df66624b0..e55c94863 100644
--- a/ecc/bls12-381/fp/element.go
+++ b/ecc/bls12-381/fp/element.go
@@ -1064,6 +1064,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bls12-381/fr/element.go b/ecc/bls12-381/fr/element.go
index 1a9cfd43b..4a4c96ffd 100644
--- a/ecc/bls12-381/fr/element.go
+++ b/ecc/bls12-381/fr/element.go
@@ -902,6 +902,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bls24-315/fp/element.go b/ecc/bls24-315/fp/element.go
index 4bb276b66..ef63db2ea 100644
--- a/ecc/bls24-315/fp/element.go
+++ b/ecc/bls24-315/fp/element.go
@@ -980,6 +980,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bls24-315/fr/element.go b/ecc/bls24-315/fr/element.go
index c6b642dfa..917d64a99 100644
--- a/ecc/bls24-315/fr/element.go
+++ b/ecc/bls24-315/fr/element.go
@@ -902,6 +902,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bls24-317/fp/element.go b/ecc/bls24-317/fp/element.go
index 9e2d025db..a3cfef100 100644
--- a/ecc/bls24-317/fp/element.go
+++ b/ecc/bls24-317/fp/element.go
@@ -980,6 +980,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bls24-317/fr/element.go b/ecc/bls24-317/fr/element.go
index bf0935201..829462575 100644
--- a/ecc/bls24-317/fr/element.go
+++ b/ecc/bls24-317/fr/element.go
@@ -902,6 +902,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bn254/fp/element.go b/ecc/bn254/fp/element.go
index e601c0ffa..607b20d9f 100644
--- a/ecc/bn254/fp/element.go
+++ b/ecc/bn254/fp/element.go
@@ -902,6 +902,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bn254/fr/element.go b/ecc/bn254/fr/element.go
index 404dd8efa..ffca3fc1b 100644
--- a/ecc/bn254/fr/element.go
+++ b/ecc/bn254/fr/element.go
@@ -902,6 +902,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bw6-633/fp/element.go b/ecc/bw6-633/fp/element.go
index 31cd9222e..b45abc59c 100644
--- a/ecc/bw6-633/fp/element.go
+++ b/ecc/bw6-633/fp/element.go
@@ -1460,6 +1460,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bw6-633/fr/element.go b/ecc/bw6-633/fr/element.go
index f1fb1b795..093a265ac 100644
--- a/ecc/bw6-633/fr/element.go
+++ b/ecc/bw6-633/fr/element.go
@@ -980,6 +980,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bw6-756/fp/element.go b/ecc/bw6-756/fp/element.go
index 5f9fe192f..5bdd8d3bc 100644
--- a/ecc/bw6-756/fp/element.go
+++ b/ecc/bw6-756/fp/element.go
@@ -1694,6 +1694,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bw6-756/fr/element.go b/ecc/bw6-756/fr/element.go
index 6662bdb3d..3872daa6e 100644
--- a/ecc/bw6-756/fr/element.go
+++ b/ecc/bw6-756/fr/element.go
@@ -1064,6 +1064,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bw6-761/fp/element.go b/ecc/bw6-761/fp/element.go
index 93aa6d6c7..324aabd8a 100644
--- a/ecc/bw6-761/fp/element.go
+++ b/ecc/bw6-761/fp/element.go
@@ -1694,6 +1694,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/bw6-761/fr/element.go b/ecc/bw6-761/fr/element.go
index 002593494..99e843ae1 100644
--- a/ecc/bw6-761/fr/element.go
+++ b/ecc/bw6-761/fr/element.go
@@ -1064,6 +1064,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/secp256k1/fp/element.go b/ecc/secp256k1/fp/element.go
index dbd9d7370..ed1820c0f 100644
--- a/ecc/secp256k1/fp/element.go
+++ b/ecc/secp256k1/fp/element.go
@@ -930,6 +930,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/secp256k1/fr/element.go b/ecc/secp256k1/fr/element.go
index 0cd7986de..4d59a777d 100644
--- a/ecc/secp256k1/fr/element.go
+++ b/ecc/secp256k1/fr/element.go
@@ -930,6 +930,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/stark-curve/fp/element.go b/ecc/stark-curve/fp/element.go
index 073dc4081..074368b75 100644
--- a/ecc/stark-curve/fp/element.go
+++ b/ecc/stark-curve/fp/element.go
@@ -902,6 +902,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/ecc/stark-curve/fr/element.go b/ecc/stark-curve/fr/element.go
index 5c164149f..079961fc2 100644
--- a/ecc/stark-curve/fr/element.go
+++ b/ecc/stark-curve/fr/element.go
@@ -902,6 +902,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
diff --git a/field/generator/internal/templates/element/conv.go b/field/generator/internal/templates/element/conv.go
index 0d080986b..9c40ffec7 100644
--- a/field/generator/internal/templates/element/conv.go
+++ b/field/generator/internal/templates/element/conv.go
@@ -124,6 +124,11 @@ func (z *{{.ElementName}}) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *{{.ElementName}}) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *{{.ElementName}}) SetBytes(e []byte) *{{.ElementName}} {
diff --git a/field/goldilocks/element.go b/field/goldilocks/element.go
index 697df951c..3afe5c447 100644
--- a/field/goldilocks/element.go
+++ b/field/goldilocks/element.go
@@ -694,6 +694,11 @@ func (z *Element) Marshal() []byte {
return b[:]
}
+// Unmarshal is an alias for SetBytes, it sets z to the value of e.
+func (z *Element) Unmarshal(e []byte) {
+ z.SetBytes(e)
+}
+
// SetBytes interprets e as the bytes of a big-endian unsigned integer,
// sets z to that value, and returns z.
func (z *Element) SetBytes(e []byte) *Element {
From f5f856b08d9acc042a2bf728b3d2c847b0a5090b Mon Sep 17 00:00:00 2001
From: Ignacio Hagopian
Date: Sun, 25 Jun 2023 23:27:26 -0300
Subject: [PATCH 33/51] edwards: optimize point negation (#413)
* feat: add benchmarks for edwards point negation
Signed-off-by: Ignacio Hagopian
* generate: regenerate code
Signed-off-by: Ignacio Hagopian
* feat: avoid redundant coordination assignement in edwards point negations
Signed-off-by: Ignacio Hagopian
* generate: regenerate code
Signed-off-by: Ignacio Hagopian
---------
Signed-off-by: Ignacio Hagopian
---
ecc/bls12-377/twistededwards/point.go | 16 ++++----
ecc/bls12-377/twistededwards/point_test.go | 38 +++++++++++++++++++
ecc/bls12-378/twistededwards/point.go | 16 ++++----
ecc/bls12-378/twistededwards/point_test.go | 38 +++++++++++++++++++
ecc/bls12-381/bandersnatch/point.go | 16 ++++----
ecc/bls12-381/bandersnatch/point_test.go | 38 +++++++++++++++++++
ecc/bls12-381/twistededwards/point.go | 16 ++++----
ecc/bls12-381/twistededwards/point_test.go | 38 +++++++++++++++++++
ecc/bls24-315/twistededwards/point.go | 16 ++++----
ecc/bls24-315/twistededwards/point_test.go | 38 +++++++++++++++++++
ecc/bls24-317/twistededwards/point.go | 16 ++++----
ecc/bls24-317/twistededwards/point_test.go | 38 +++++++++++++++++++
ecc/bn254/twistededwards/point.go | 16 ++++----
ecc/bn254/twistededwards/point_test.go | 38 +++++++++++++++++++
ecc/bw6-633/twistededwards/point.go | 16 ++++----
ecc/bw6-633/twistededwards/point_test.go | 38 +++++++++++++++++++
ecc/bw6-756/twistededwards/point.go | 16 ++++----
ecc/bw6-756/twistededwards/point_test.go | 38 +++++++++++++++++++
ecc/bw6-761/twistededwards/point.go | 16 ++++----
ecc/bw6-761/twistededwards/point_test.go | 38 +++++++++++++++++++
.../generator/edwards/template/point.go.tmpl | 16 ++++----
.../edwards/template/tests/point.go.tmpl | 38 +++++++++++++++++++
22 files changed, 517 insertions(+), 77 deletions(-)
diff --git a/ecc/bls12-377/twistededwards/point.go b/ecc/bls12-377/twistededwards/point.go
index 7f899d407..225c89e0c 100644
--- a/ecc/bls12-377/twistededwards/point.go
+++ b/ecc/bls12-377/twistededwards/point.go
@@ -182,8 +182,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -313,8 +313,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -470,9 +471,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/ecc/bls12-377/twistededwards/point_test.go b/ecc/bls12-377/twistededwards/point_test.go
index 9a075e6ed..adf7fde3d 100644
--- a/ecc/bls12-377/twistededwards/point_test.go
+++ b/ecc/bls12-377/twistededwards/point_test.go
@@ -779,3 +779,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
diff --git a/ecc/bls12-378/twistededwards/point.go b/ecc/bls12-378/twistededwards/point.go
index 70163d676..93812b904 100644
--- a/ecc/bls12-378/twistededwards/point.go
+++ b/ecc/bls12-378/twistededwards/point.go
@@ -182,8 +182,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -313,8 +313,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -470,9 +471,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/ecc/bls12-378/twistededwards/point_test.go b/ecc/bls12-378/twistededwards/point_test.go
index 2c50ba610..3926b8715 100644
--- a/ecc/bls12-378/twistededwards/point_test.go
+++ b/ecc/bls12-378/twistededwards/point_test.go
@@ -779,3 +779,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
diff --git a/ecc/bls12-381/bandersnatch/point.go b/ecc/bls12-381/bandersnatch/point.go
index 6f7bccb08..28bae3e95 100644
--- a/ecc/bls12-381/bandersnatch/point.go
+++ b/ecc/bls12-381/bandersnatch/point.go
@@ -181,8 +181,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -312,8 +312,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -445,9 +446,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/ecc/bls12-381/bandersnatch/point_test.go b/ecc/bls12-381/bandersnatch/point_test.go
index 5365020c3..d5e6c7b53 100644
--- a/ecc/bls12-381/bandersnatch/point_test.go
+++ b/ecc/bls12-381/bandersnatch/point_test.go
@@ -779,3 +779,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
diff --git a/ecc/bls12-381/twistededwards/point.go b/ecc/bls12-381/twistededwards/point.go
index a47c4b833..f7800fc9e 100644
--- a/ecc/bls12-381/twistededwards/point.go
+++ b/ecc/bls12-381/twistededwards/point.go
@@ -182,8 +182,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -313,8 +313,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -470,9 +471,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/ecc/bls12-381/twistededwards/point_test.go b/ecc/bls12-381/twistededwards/point_test.go
index a024ad41c..25716347f 100644
--- a/ecc/bls12-381/twistededwards/point_test.go
+++ b/ecc/bls12-381/twistededwards/point_test.go
@@ -779,3 +779,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
diff --git a/ecc/bls24-315/twistededwards/point.go b/ecc/bls24-315/twistededwards/point.go
index da16d7f27..df1e23557 100644
--- a/ecc/bls24-315/twistededwards/point.go
+++ b/ecc/bls24-315/twistededwards/point.go
@@ -182,8 +182,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -313,8 +313,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -470,9 +471,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/ecc/bls24-315/twistededwards/point_test.go b/ecc/bls24-315/twistededwards/point_test.go
index 27e9c2c8a..e78428116 100644
--- a/ecc/bls24-315/twistededwards/point_test.go
+++ b/ecc/bls24-315/twistededwards/point_test.go
@@ -779,3 +779,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
diff --git a/ecc/bls24-317/twistededwards/point.go b/ecc/bls24-317/twistededwards/point.go
index fd10fdbe1..fb2ae82fe 100644
--- a/ecc/bls24-317/twistededwards/point.go
+++ b/ecc/bls24-317/twistededwards/point.go
@@ -182,8 +182,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -313,8 +313,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -470,9 +471,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/ecc/bls24-317/twistededwards/point_test.go b/ecc/bls24-317/twistededwards/point_test.go
index d9a610670..fe55b8e03 100644
--- a/ecc/bls24-317/twistededwards/point_test.go
+++ b/ecc/bls24-317/twistededwards/point_test.go
@@ -779,3 +779,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
diff --git a/ecc/bn254/twistededwards/point.go b/ecc/bn254/twistededwards/point.go
index ff0841890..c9fcc9364 100644
--- a/ecc/bn254/twistededwards/point.go
+++ b/ecc/bn254/twistededwards/point.go
@@ -182,8 +182,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -313,8 +313,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -470,9 +471,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/ecc/bn254/twistededwards/point_test.go b/ecc/bn254/twistededwards/point_test.go
index a55733270..8ee794316 100644
--- a/ecc/bn254/twistededwards/point_test.go
+++ b/ecc/bn254/twistededwards/point_test.go
@@ -779,3 +779,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
diff --git a/ecc/bw6-633/twistededwards/point.go b/ecc/bw6-633/twistededwards/point.go
index 69f33db81..59d01c0a8 100644
--- a/ecc/bw6-633/twistededwards/point.go
+++ b/ecc/bw6-633/twistededwards/point.go
@@ -182,8 +182,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -313,8 +313,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -470,9 +471,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/ecc/bw6-633/twistededwards/point_test.go b/ecc/bw6-633/twistededwards/point_test.go
index d4b966ddc..4da1e9b6d 100644
--- a/ecc/bw6-633/twistededwards/point_test.go
+++ b/ecc/bw6-633/twistededwards/point_test.go
@@ -779,3 +779,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
diff --git a/ecc/bw6-756/twistededwards/point.go b/ecc/bw6-756/twistededwards/point.go
index 384db16ef..8ad7af866 100644
--- a/ecc/bw6-756/twistededwards/point.go
+++ b/ecc/bw6-756/twistededwards/point.go
@@ -182,8 +182,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -313,8 +313,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -470,9 +471,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/ecc/bw6-756/twistededwards/point_test.go b/ecc/bw6-756/twistededwards/point_test.go
index 117bb6cf5..7d41f749b 100644
--- a/ecc/bw6-756/twistededwards/point_test.go
+++ b/ecc/bw6-756/twistededwards/point_test.go
@@ -779,3 +779,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
diff --git a/ecc/bw6-761/twistededwards/point.go b/ecc/bw6-761/twistededwards/point.go
index b44a0c024..10c91f5c0 100644
--- a/ecc/bw6-761/twistededwards/point.go
+++ b/ecc/bw6-761/twistededwards/point.go
@@ -182,8 +182,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -313,8 +313,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -470,9 +471,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/ecc/bw6-761/twistededwards/point_test.go b/ecc/bw6-761/twistededwards/point_test.go
index 9e97f2a15..4bbbbd257 100644
--- a/ecc/bw6-761/twistededwards/point_test.go
+++ b/ecc/bw6-761/twistededwards/point_test.go
@@ -779,3 +779,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
diff --git a/internal/generator/edwards/template/point.go.tmpl b/internal/generator/edwards/template/point.go.tmpl
index 7c2249d53..3eb72370b 100644
--- a/internal/generator/edwards/template/point.go.tmpl
+++ b/internal/generator/edwards/template/point.go.tmpl
@@ -166,8 +166,8 @@ func (p *PointAffine) IsOnCurve() bool {
// Neg sets p to -p1 and returns it
func (p *PointAffine) Neg(p1 *PointAffine) *PointAffine {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
return p
}
@@ -297,8 +297,9 @@ func (p *PointProj) IsZero() bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointProj) Neg(p1 *PointProj) *PointProj {
- p.Set(p1)
- p.X.Neg(&p.X)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
return p
}
@@ -458,9 +459,10 @@ func (p *PointExtended) Equal(p1 *PointExtended) bool {
// Neg negates point (x,y) on a twisted Edwards curve with parameters a, d
// modifies p
func (p *PointExtended) Neg(p1 *PointExtended) *PointExtended {
- p.Set(p1)
- p.X.Neg(&p.X)
- p.T.Neg(&p.T)
+ p.X.Neg(&p1.X)
+ p.Y = p1.Y
+ p.Z = p1.Z
+ p.T.Neg(&p1.T)
return p
}
diff --git a/internal/generator/edwards/template/tests/point.go.tmpl b/internal/generator/edwards/template/tests/point.go.tmpl
index e0bf457c8..ae31881b5 100644
--- a/internal/generator/edwards/template/tests/point.go.tmpl
+++ b/internal/generator/edwards/template/tests/point.go.tmpl
@@ -763,3 +763,41 @@ func BenchmarkScalarMulProjective(b *testing.B) {
doubleAndAdd.ScalarMultiplication(&a, &s)
}
}
+
+func BenchmarkNeg(b *testing.B) {
+ params := GetEdwardsCurve()
+ var s big.Int
+ s.SetString("52435875175126190479447705081859658376581184513", 10)
+
+ b.Run("Affine", func(b *testing.B) {
+ var point PointAffine
+ point.ScalarMultiplication(¶ms.Base, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Projective", func(b *testing.B) {
+ var baseProj PointProj
+ baseProj.FromAffine(¶ms.Base)
+ var point PointProj
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+ b.Run("Extended", func(b *testing.B) {
+ var baseProj PointExtended
+ baseProj.FromAffine(¶ms.Base)
+ var point PointExtended
+ point.ScalarMultiplication(&baseProj, &s)
+
+ b.ResetTimer()
+ for i := 0; i < b.N; i++ {
+ point.Neg(&point)
+ }
+ })
+}
\ No newline at end of file
From 3b8bd384a5726bef43d3db75241d6777f479ac25 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Thu, 29 Jun 2023 09:14:05 -0500
Subject: [PATCH 34/51] feat: Gates var for bn254
---
ecc/bls12-377/fr/gkr/gkr.go | 3 +
ecc/bls12-378/fr/gkr/gkr.go | 3 +
ecc/bls12-381/fr/gkr/gkr.go | 3 +
ecc/bls24-315/fr/gkr/gkr.go | 3 +
ecc/bls24-317/fr/gkr/gkr.go | 3 +
ecc/bn254/fr/gkr/gkr.go | 57 +++++++++++++++----
ecc/bn254/fr/gkr/gkr_test.go | 32 +++--------
ecc/bw6-633/fr/gkr/gkr.go | 3 +
ecc/bw6-756/fr/gkr/gkr.go | 3 +
ecc/bw6-761/fr/gkr/gkr.go | 3 +
internal/generator/gkr/template/gkr.go.tmpl | 3 +
.../small_rational/gkr/gkr.go | 3 +
12 files changed, 85 insertions(+), 34 deletions(-)
diff --git a/ecc/bls12-377/fr/gkr/gkr.go b/ecc/bls12-377/fr/gkr/gkr.go
index 0eac47c68..e7d15d3d1 100644
--- a/ecc/bls12-377/fr/gkr/gkr.go
+++ b/ecc/bls12-377/fr/gkr/gkr.go
@@ -871,3 +871,6 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
src[i].BigInt(dst[i])
}
}
+
+// CustomGates gates defined by name
+var CustomGates = make(map[string]Gate)
diff --git a/ecc/bls12-378/fr/gkr/gkr.go b/ecc/bls12-378/fr/gkr/gkr.go
index 92ab61c7f..b53761cdb 100644
--- a/ecc/bls12-378/fr/gkr/gkr.go
+++ b/ecc/bls12-378/fr/gkr/gkr.go
@@ -871,3 +871,6 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
src[i].BigInt(dst[i])
}
}
+
+// CustomGates gates defined by name
+var CustomGates = make(map[string]Gate)
diff --git a/ecc/bls12-381/fr/gkr/gkr.go b/ecc/bls12-381/fr/gkr/gkr.go
index 2ad43658a..31e9fa454 100644
--- a/ecc/bls12-381/fr/gkr/gkr.go
+++ b/ecc/bls12-381/fr/gkr/gkr.go
@@ -871,3 +871,6 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
src[i].BigInt(dst[i])
}
}
+
+// CustomGates gates defined by name
+var CustomGates = make(map[string]Gate)
diff --git a/ecc/bls24-315/fr/gkr/gkr.go b/ecc/bls24-315/fr/gkr/gkr.go
index 97eb4f0f7..22cc8ec55 100644
--- a/ecc/bls24-315/fr/gkr/gkr.go
+++ b/ecc/bls24-315/fr/gkr/gkr.go
@@ -871,3 +871,6 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
src[i].BigInt(dst[i])
}
}
+
+// CustomGates gates defined by name
+var CustomGates = make(map[string]Gate)
diff --git a/ecc/bls24-317/fr/gkr/gkr.go b/ecc/bls24-317/fr/gkr/gkr.go
index 43e0fe5ca..9b8160465 100644
--- a/ecc/bls24-317/fr/gkr/gkr.go
+++ b/ecc/bls24-317/fr/gkr/gkr.go
@@ -871,3 +871,6 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
src[i].BigInt(dst[i])
}
}
+
+// CustomGates gates defined by name
+var CustomGates = make(map[string]Gate)
diff --git a/ecc/bn254/fr/gkr/gkr.go b/ecc/bn254/fr/gkr/gkr.go
index 6b04429ad..bcdc11189 100644
--- a/ecc/bn254/fr/gkr/gkr.go
+++ b/ecc/bn254/fr/gkr/gkr.go
@@ -705,16 +705,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -871,3 +861,50 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
src[i].BigInt(dst[i])
}
}
+
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
diff --git a/ecc/bn254/fr/gkr/gkr_test.go b/ecc/bn254/fr/gkr/gkr_test.go
index dced39437..525975b87 100644
--- a/ecc/bn254/fr/gkr/gkr_test.go
+++ b/ecc/bn254/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
@@ -529,7 +529,7 @@ func getCircuit(path string) (Circuit, error) {
func (c CircuitInfo) toCircuit() (circuit Circuit) {
circuit = make(Circuit, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*Wire, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -539,14 +539,9 @@ func (c CircuitInfo) toCircuit() (circuit Circuit) {
return
}
-var gates map[string]Gate
-
func init() {
- gates = make(map[string]Gate)
- gates["identity"] = IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = selectGate(2)
}
type mimcCipherGate struct {
@@ -717,23 +712,12 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
-type _select int
+type selectGate int
-func (g _select) Evaluate(in ...fr.Element) fr.Element {
+func (g selectGate) Evaluate(in ...fr.Element) fr.Element {
return in[g]
}
-func (g _select) Degree() int {
+func (g selectGate) Degree() int {
return 1
}
diff --git a/ecc/bw6-633/fr/gkr/gkr.go b/ecc/bw6-633/fr/gkr/gkr.go
index 0a9173884..71aa3e1c9 100644
--- a/ecc/bw6-633/fr/gkr/gkr.go
+++ b/ecc/bw6-633/fr/gkr/gkr.go
@@ -871,3 +871,6 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
src[i].BigInt(dst[i])
}
}
+
+// CustomGates gates defined by name
+var CustomGates = make(map[string]Gate)
diff --git a/ecc/bw6-756/fr/gkr/gkr.go b/ecc/bw6-756/fr/gkr/gkr.go
index 2f40acff9..4b8735979 100644
--- a/ecc/bw6-756/fr/gkr/gkr.go
+++ b/ecc/bw6-756/fr/gkr/gkr.go
@@ -871,3 +871,6 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
src[i].BigInt(dst[i])
}
}
+
+// CustomGates gates defined by name
+var CustomGates = make(map[string]Gate)
diff --git a/ecc/bw6-761/fr/gkr/gkr.go b/ecc/bw6-761/fr/gkr/gkr.go
index df782c49e..3f4b4012a 100644
--- a/ecc/bw6-761/fr/gkr/gkr.go
+++ b/ecc/bw6-761/fr/gkr/gkr.go
@@ -871,3 +871,6 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
src[i].BigInt(dst[i])
}
}
+
+// CustomGates gates defined by name
+var CustomGates = make(map[string]Gate)
diff --git a/internal/generator/gkr/template/gkr.go.tmpl b/internal/generator/gkr/template/gkr.go.tmpl
index 32fd81158..e5e7e92c1 100644
--- a/internal/generator/gkr/template/gkr.go.tmpl
+++ b/internal/generator/gkr/template/gkr.go.tmpl
@@ -856,3 +856,6 @@ func frToBigInts(dst []*big.Int, src []{{.ElementType}}) {
src[i].BigInt(dst[i])
}
}
+
+// CustomGates gates defined by name
+var CustomGates = make(map[string]Gate)
diff --git a/internal/generator/test_vector_utils/small_rational/gkr/gkr.go b/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
index 8ad606227..8e443843c 100644
--- a/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
+++ b/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
@@ -871,3 +871,6 @@ func frToBigInts(dst []*big.Int, src []small_rational.SmallRational) {
src[i].BigInt(dst[i])
}
}
+
+// CustomGates gates defined by name
+var CustomGates = make(map[string]Gate)
From 34cd64d142f4ba0094dfefaef4e34237e69bc8c5 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Thu, 29 Jun 2023 09:39:46 -0500
Subject: [PATCH 35/51] build: generify gates var
---
ecc/bls12-377/fr/gkr/gkr.go | 58 +++++++++++++++----
ecc/bls12-377/fr/gkr/gkr_test.go | 15 ++---
ecc/bls12-378/fr/gkr/gkr.go | 58 +++++++++++++++----
ecc/bls12-378/fr/gkr/gkr_test.go | 15 ++---
ecc/bls12-381/fr/gkr/gkr.go | 58 +++++++++++++++----
ecc/bls12-381/fr/gkr/gkr_test.go | 15 ++---
ecc/bls24-315/fr/gkr/gkr.go | 58 +++++++++++++++----
ecc/bls24-315/fr/gkr/gkr_test.go | 15 ++---
ecc/bls24-317/fr/gkr/gkr.go | 58 +++++++++++++++----
ecc/bls24-317/fr/gkr/gkr_test.go | 15 ++---
ecc/bn254/fr/gkr/gkr_test.go | 19 ++++--
ecc/bw6-633/fr/gkr/gkr.go | 58 +++++++++++++++----
ecc/bw6-633/fr/gkr/gkr_test.go | 15 ++---
ecc/bw6-756/fr/gkr/gkr.go | 58 +++++++++++++++----
ecc/bw6-756/fr/gkr/gkr_test.go | 15 ++---
ecc/bw6-761/fr/gkr/gkr.go | 58 +++++++++++++++----
ecc/bw6-761/fr/gkr/gkr_test.go | 15 ++---
internal/generator/gkr/template/gkr.go.tmpl | 58 +++++++++++++++----
.../generator/gkr/template/gkr.test.go.tmpl | 4 +-
.../gkr/template/gkr.test.vectors.gen.go.tmpl | 2 +
.../gkr/template/gkr.test.vectors.go.tmpl | 11 +---
internal/generator/gkr/test_vectors/main.go | 13 ++---
.../small_rational/gkr/gkr.go | 58 +++++++++++++++----
23 files changed, 527 insertions(+), 222 deletions(-)
diff --git a/ecc/bls12-377/fr/gkr/gkr.go b/ecc/bls12-377/fr/gkr/gkr.go
index e7d15d3d1..28b2e27cd 100644
--- a/ecc/bls12-377/fr/gkr/gkr.go
+++ b/ecc/bls12-377/fr/gkr/gkr.go
@@ -705,16 +705,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -872,5 +862,49 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
}
}
-// CustomGates gates defined by name
-var CustomGates = make(map[string]Gate)
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
diff --git a/ecc/bls12-377/fr/gkr/gkr_test.go b/ecc/bls12-377/fr/gkr/gkr_test.go
index 43aaf1ef2..286d668be 100644
--- a/ecc/bls12-377/fr/gkr/gkr_test.go
+++ b/ecc/bls12-377/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
@@ -529,7 +529,7 @@ func getCircuit(path string) (Circuit, error) {
func (c CircuitInfo) toCircuit() (circuit Circuit) {
circuit = make(Circuit, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*Wire, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -539,14 +539,9 @@ func (c CircuitInfo) toCircuit() (circuit Circuit) {
return
}
-var gates map[string]Gate
-
func init() {
- gates = make(map[string]Gate)
- gates["identity"] = IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
diff --git a/ecc/bls12-378/fr/gkr/gkr.go b/ecc/bls12-378/fr/gkr/gkr.go
index b53761cdb..d59617ec4 100644
--- a/ecc/bls12-378/fr/gkr/gkr.go
+++ b/ecc/bls12-378/fr/gkr/gkr.go
@@ -705,16 +705,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -872,5 +862,49 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
}
}
-// CustomGates gates defined by name
-var CustomGates = make(map[string]Gate)
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
diff --git a/ecc/bls12-378/fr/gkr/gkr_test.go b/ecc/bls12-378/fr/gkr/gkr_test.go
index aaf03a0e4..7c2df70f3 100644
--- a/ecc/bls12-378/fr/gkr/gkr_test.go
+++ b/ecc/bls12-378/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
@@ -529,7 +529,7 @@ func getCircuit(path string) (Circuit, error) {
func (c CircuitInfo) toCircuit() (circuit Circuit) {
circuit = make(Circuit, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*Wire, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -539,14 +539,9 @@ func (c CircuitInfo) toCircuit() (circuit Circuit) {
return
}
-var gates map[string]Gate
-
func init() {
- gates = make(map[string]Gate)
- gates["identity"] = IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
diff --git a/ecc/bls12-381/fr/gkr/gkr.go b/ecc/bls12-381/fr/gkr/gkr.go
index 31e9fa454..ba8c4c675 100644
--- a/ecc/bls12-381/fr/gkr/gkr.go
+++ b/ecc/bls12-381/fr/gkr/gkr.go
@@ -705,16 +705,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -872,5 +862,49 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
}
}
-// CustomGates gates defined by name
-var CustomGates = make(map[string]Gate)
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
diff --git a/ecc/bls12-381/fr/gkr/gkr_test.go b/ecc/bls12-381/fr/gkr/gkr_test.go
index 97851daef..1fa35da54 100644
--- a/ecc/bls12-381/fr/gkr/gkr_test.go
+++ b/ecc/bls12-381/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
@@ -529,7 +529,7 @@ func getCircuit(path string) (Circuit, error) {
func (c CircuitInfo) toCircuit() (circuit Circuit) {
circuit = make(Circuit, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*Wire, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -539,14 +539,9 @@ func (c CircuitInfo) toCircuit() (circuit Circuit) {
return
}
-var gates map[string]Gate
-
func init() {
- gates = make(map[string]Gate)
- gates["identity"] = IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
diff --git a/ecc/bls24-315/fr/gkr/gkr.go b/ecc/bls24-315/fr/gkr/gkr.go
index 22cc8ec55..33ac338db 100644
--- a/ecc/bls24-315/fr/gkr/gkr.go
+++ b/ecc/bls24-315/fr/gkr/gkr.go
@@ -705,16 +705,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -872,5 +862,49 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
}
}
-// CustomGates gates defined by name
-var CustomGates = make(map[string]Gate)
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
diff --git a/ecc/bls24-315/fr/gkr/gkr_test.go b/ecc/bls24-315/fr/gkr/gkr_test.go
index 5351e5157..13370f7ab 100644
--- a/ecc/bls24-315/fr/gkr/gkr_test.go
+++ b/ecc/bls24-315/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
@@ -529,7 +529,7 @@ func getCircuit(path string) (Circuit, error) {
func (c CircuitInfo) toCircuit() (circuit Circuit) {
circuit = make(Circuit, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*Wire, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -539,14 +539,9 @@ func (c CircuitInfo) toCircuit() (circuit Circuit) {
return
}
-var gates map[string]Gate
-
func init() {
- gates = make(map[string]Gate)
- gates["identity"] = IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
diff --git a/ecc/bls24-317/fr/gkr/gkr.go b/ecc/bls24-317/fr/gkr/gkr.go
index 9b8160465..b53959510 100644
--- a/ecc/bls24-317/fr/gkr/gkr.go
+++ b/ecc/bls24-317/fr/gkr/gkr.go
@@ -705,16 +705,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -872,5 +862,49 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
}
}
-// CustomGates gates defined by name
-var CustomGates = make(map[string]Gate)
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
diff --git a/ecc/bls24-317/fr/gkr/gkr_test.go b/ecc/bls24-317/fr/gkr/gkr_test.go
index 6e8f7e51d..e81f2f5d5 100644
--- a/ecc/bls24-317/fr/gkr/gkr_test.go
+++ b/ecc/bls24-317/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
@@ -529,7 +529,7 @@ func getCircuit(path string) (Circuit, error) {
func (c CircuitInfo) toCircuit() (circuit Circuit) {
circuit = make(Circuit, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*Wire, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -539,14 +539,9 @@ func (c CircuitInfo) toCircuit() (circuit Circuit) {
return
}
-var gates map[string]Gate
-
func init() {
- gates = make(map[string]Gate)
- gates["identity"] = IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
diff --git a/ecc/bn254/fr/gkr/gkr_test.go b/ecc/bn254/fr/gkr/gkr_test.go
index 525975b87..42d2f56b6 100644
--- a/ecc/bn254/fr/gkr/gkr_test.go
+++ b/ecc/bn254/fr/gkr/gkr_test.go
@@ -541,7 +541,7 @@ func (c CircuitInfo) toCircuit() (circuit Circuit) {
func init() {
Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- Gates["select-input-3"] = selectGate(2)
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
@@ -712,12 +712,23 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type selectGate int
+type mulGate struct{}
-func (g selectGate) Evaluate(in ...fr.Element) fr.Element {
+func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
+ result.Mul(&element[0], &element[1])
+ return
+}
+
+func (g mulGate) Degree() int {
+ return 2
+}
+
+type _select int
+
+func (g _select) Evaluate(in ...fr.Element) fr.Element {
return in[g]
}
-func (g selectGate) Degree() int {
+func (g _select) Degree() int {
return 1
}
diff --git a/ecc/bw6-633/fr/gkr/gkr.go b/ecc/bw6-633/fr/gkr/gkr.go
index 71aa3e1c9..707f55467 100644
--- a/ecc/bw6-633/fr/gkr/gkr.go
+++ b/ecc/bw6-633/fr/gkr/gkr.go
@@ -705,16 +705,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -872,5 +862,49 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
}
}
-// CustomGates gates defined by name
-var CustomGates = make(map[string]Gate)
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
diff --git a/ecc/bw6-633/fr/gkr/gkr_test.go b/ecc/bw6-633/fr/gkr/gkr_test.go
index d16068094..3f40952cf 100644
--- a/ecc/bw6-633/fr/gkr/gkr_test.go
+++ b/ecc/bw6-633/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
@@ -529,7 +529,7 @@ func getCircuit(path string) (Circuit, error) {
func (c CircuitInfo) toCircuit() (circuit Circuit) {
circuit = make(Circuit, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*Wire, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -539,14 +539,9 @@ func (c CircuitInfo) toCircuit() (circuit Circuit) {
return
}
-var gates map[string]Gate
-
func init() {
- gates = make(map[string]Gate)
- gates["identity"] = IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
diff --git a/ecc/bw6-756/fr/gkr/gkr.go b/ecc/bw6-756/fr/gkr/gkr.go
index 4b8735979..b4ef3560c 100644
--- a/ecc/bw6-756/fr/gkr/gkr.go
+++ b/ecc/bw6-756/fr/gkr/gkr.go
@@ -705,16 +705,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -872,5 +862,49 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
}
}
-// CustomGates gates defined by name
-var CustomGates = make(map[string]Gate)
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
diff --git a/ecc/bw6-756/fr/gkr/gkr_test.go b/ecc/bw6-756/fr/gkr/gkr_test.go
index ae342286f..7c99db64e 100644
--- a/ecc/bw6-756/fr/gkr/gkr_test.go
+++ b/ecc/bw6-756/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
@@ -529,7 +529,7 @@ func getCircuit(path string) (Circuit, error) {
func (c CircuitInfo) toCircuit() (circuit Circuit) {
circuit = make(Circuit, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*Wire, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -539,14 +539,9 @@ func (c CircuitInfo) toCircuit() (circuit Circuit) {
return
}
-var gates map[string]Gate
-
func init() {
- gates = make(map[string]Gate)
- gates["identity"] = IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
diff --git a/ecc/bw6-761/fr/gkr/gkr.go b/ecc/bw6-761/fr/gkr/gkr.go
index 3f4b4012a..4d7ee0cb3 100644
--- a/ecc/bw6-761/fr/gkr/gkr.go
+++ b/ecc/bw6-761/fr/gkr/gkr.go
@@ -705,16 +705,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -872,5 +862,49 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
}
}
-// CustomGates gates defined by name
-var CustomGates = make(map[string]Gate)
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
diff --git a/ecc/bw6-761/fr/gkr/gkr_test.go b/ecc/bw6-761/fr/gkr/gkr_test.go
index b35ac78df..67973c6d6 100644
--- a/ecc/bw6-761/fr/gkr/gkr_test.go
+++ b/ecc/bw6-761/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
@@ -529,7 +529,7 @@ func getCircuit(path string) (Circuit, error) {
func (c CircuitInfo) toCircuit() (circuit Circuit) {
circuit = make(Circuit, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*Wire, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -539,14 +539,9 @@ func (c CircuitInfo) toCircuit() (circuit Circuit) {
return
}
-var gates map[string]Gate
-
func init() {
- gates = make(map[string]Gate)
- gates["identity"] = IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
diff --git a/internal/generator/gkr/template/gkr.go.tmpl b/internal/generator/gkr/template/gkr.go.tmpl
index e5e7e92c1..f49ffaa27 100644
--- a/internal/generator/gkr/template/gkr.go.tmpl
+++ b/internal/generator/gkr/template/gkr.go.tmpl
@@ -690,16 +690,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...{{.ElementType}}) {{.ElementType}} {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -857,5 +847,49 @@ func frToBigInts(dst []*big.Int, src []{{.ElementType}}) {
}
}
-// CustomGates gates defined by name
-var CustomGates = make(map[string]Gate)
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...{{.ElementType}}) {{.ElementType}} {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...{{.ElementType}}) (res {{.ElementType}}) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...{{.ElementType}}) (res {{.ElementType}}) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
\ No newline at end of file
diff --git a/internal/generator/gkr/template/gkr.test.go.tmpl b/internal/generator/gkr/template/gkr.test.go.tmpl
index 088a7246c..161304bab 100644
--- a/internal/generator/gkr/template/gkr.test.go.tmpl
+++ b/internal/generator/gkr/template/gkr.test.go.tmpl
@@ -197,7 +197,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]{{.ElementType}}) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -327,7 +327,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]{{.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: mulGate{},
+ Gate: MulGate{},
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
diff --git a/internal/generator/gkr/template/gkr.test.vectors.gen.go.tmpl b/internal/generator/gkr/template/gkr.test.vectors.gen.go.tmpl
index baf031567..47336021c 100644
--- a/internal/generator/gkr/template/gkr.test.vectors.gen.go.tmpl
+++ b/internal/generator/gkr/template/gkr.test.vectors.gen.go.tmpl
@@ -114,4 +114,6 @@ func toPrintableProof(proof gkr.Proof) (PrintableProof, error) {
return res, nil
}
+var Gates = gkr.Gates
+
{{template "gkrTestVectors" .}}
\ No newline at end of file
diff --git a/internal/generator/gkr/template/gkr.test.vectors.go.tmpl b/internal/generator/gkr/template/gkr.test.vectors.go.tmpl
index 60fb16b52..567d82d79 100644
--- a/internal/generator/gkr/template/gkr.test.vectors.go.tmpl
+++ b/internal/generator/gkr/template/gkr.test.vectors.go.tmpl
@@ -45,7 +45,7 @@ func getCircuit(path string) ({{$Circuit}}, error) {
func (c CircuitInfo) toCircuit() (circuit {{$Circuit}}) {
circuit = make({{$Circuit}}, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*{{$Wire}}, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -55,14 +55,9 @@ func (c CircuitInfo) toCircuit() (circuit {{$Circuit}}) {
return
}
-var gates map[string]{{$Gate}}
-
func init() {
- gates = make(map[string]{{$Gate}})
- gates["identity"] = {{$GkrPackagePrefix}}IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
diff --git a/internal/generator/gkr/test_vectors/main.go b/internal/generator/gkr/test_vectors/main.go
index 9e5246472..cac317182 100644
--- a/internal/generator/gkr/test_vectors/main.go
+++ b/internal/generator/gkr/test_vectors/main.go
@@ -132,6 +132,8 @@ func toPrintableProof(proof gkr.Proof) (PrintableProof, error) {
return res, nil
}
+var Gates = gkr.Gates
+
type WireInfo struct {
Gate string `json:"gate"`
Inputs []int `json:"inputs"`
@@ -167,7 +169,7 @@ func getCircuit(path string) (gkr.Circuit, error) {
func (c CircuitInfo) toCircuit() (circuit gkr.Circuit) {
circuit = make(gkr.Circuit, len(c))
for i := range c {
- circuit[i].Gate = gates[c[i].Gate]
+ circuit[i].Gate = Gates[c[i].Gate]
circuit[i].Inputs = make([]*gkr.Wire, len(c[i].Inputs))
for k, inputCoord := range c[i].Inputs {
input := &circuit[inputCoord]
@@ -177,14 +179,9 @@ func (c CircuitInfo) toCircuit() (circuit gkr.Circuit) {
return
}
-var gates map[string]gkr.Gate
-
func init() {
- gates = make(map[string]gkr.Gate)
- gates["identity"] = gkr.IdentityGate{}
- gates["mul"] = mulGate{}
- gates["mimc"] = mimcCipherGate{} //TODO: Add ark
- gates["select-input-3"] = _select(2)
+ Gates["mimc"] = mimcCipherGate{} //TODO: Add ark
+ Gates["select-input-3"] = _select(2)
}
type mimcCipherGate struct {
diff --git a/internal/generator/test_vector_utils/small_rational/gkr/gkr.go b/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
index 8e443843c..6667f2c91 100644
--- a/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
+++ b/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
@@ -705,16 +705,6 @@ func Verify(c Circuit, assignment WireAssignment, proof Proof, transcriptSetting
return nil
}
-type IdentityGate struct{}
-
-func (IdentityGate) Evaluate(input ...small_rational.SmallRational) small_rational.SmallRational {
- return input[0]
-}
-
-func (IdentityGate) Degree() int {
- return 1
-}
-
// outputsList also sets the nbUniqueOutputs fields. It also sets the wire metadata.
func outputsList(c Circuit, indexes map[*Wire]int) [][]int {
res := make([][]int, len(c))
@@ -872,5 +862,49 @@ func frToBigInts(dst []*big.Int, src []small_rational.SmallRational) {
}
}
-// CustomGates gates defined by name
-var CustomGates = make(map[string]Gate)
+// Gates defined by name
+var Gates = map[string]Gate{
+ "identity": IdentityGate{},
+ "mul": MulGate{},
+}
+
+type IdentityGate struct{}
+
+func (IdentityGate) Evaluate(input ...small_rational.SmallRational) small_rational.SmallRational {
+ return input[0]
+}
+
+func (IdentityGate) Degree() int {
+ return 1
+}
+
+type MulGate struct{}
+
+func (g MulGate) Evaluate(x ...small_rational.SmallRational) (res small_rational.SmallRational) {
+ if len(x) != 2 {
+ panic("mul gate expects 2 elements")
+ }
+ res.Mul(&x[0], &x[1])
+ return
+}
+
+func (g MulGate) Degree() int {
+ return 2
+}
+
+type AddGate struct{}
+
+func (g AddGate) Evaluate(x ...small_rational.SmallRational) (res small_rational.SmallRational) {
+ if len(x) == 0 {
+ return
+ }
+ res = x[0]
+ for i := 1; i < len(x); i++ {
+ res.Add(&res, &x[i])
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
From 9062c9c44919390566a457ddd88679749d0f1814 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Thu, 29 Jun 2023 10:22:44 -0500
Subject: [PATCH 36/51] feat: more gkr gates
---
ecc/bls12-377/fr/gkr/gkr.go | 71 +++++++++++++++----
ecc/bls12-378/fr/gkr/gkr.go | 71 +++++++++++++++----
ecc/bls12-381/fr/gkr/gkr.go | 71 +++++++++++++++----
ecc/bls24-315/fr/gkr/gkr.go | 71 +++++++++++++++----
ecc/bls24-317/fr/gkr/gkr.go | 71 +++++++++++++++----
ecc/bn254/fr/gkr/gkr.go | 71 +++++++++++++++----
ecc/bw6-633/fr/gkr/gkr.go | 71 +++++++++++++++----
ecc/bw6-756/fr/gkr/gkr.go | 71 +++++++++++++++----
ecc/bw6-761/fr/gkr/gkr.go | 71 +++++++++++++++----
internal/generator/gkr/template/gkr.go.tmpl | 71 +++++++++++++++----
.../small_rational/gkr/gkr.go | 71 +++++++++++++++----
11 files changed, 616 insertions(+), 165 deletions(-)
diff --git a/ecc/bls12-377/fr/gkr/gkr.go b/ecc/bls12-377/fr/gkr/gkr.go
index 28b2e27cd..283a47b28 100644
--- a/ecc/bls12-377/fr/gkr/gkr.go
+++ b/ecc/bls12-377/fr/gkr/gkr.go
@@ -865,10 +865,17 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
return input[0]
@@ -878,33 +885,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...fr.Element) (diff fr.Element) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...fr.Element) (neg fr.Element) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
diff --git a/ecc/bls12-378/fr/gkr/gkr.go b/ecc/bls12-378/fr/gkr/gkr.go
index d59617ec4..878ccb579 100644
--- a/ecc/bls12-378/fr/gkr/gkr.go
+++ b/ecc/bls12-378/fr/gkr/gkr.go
@@ -865,10 +865,17 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
return input[0]
@@ -878,33 +885,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...fr.Element) (diff fr.Element) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...fr.Element) (neg fr.Element) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
diff --git a/ecc/bls12-381/fr/gkr/gkr.go b/ecc/bls12-381/fr/gkr/gkr.go
index ba8c4c675..5a042f103 100644
--- a/ecc/bls12-381/fr/gkr/gkr.go
+++ b/ecc/bls12-381/fr/gkr/gkr.go
@@ -865,10 +865,17 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
return input[0]
@@ -878,33 +885,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...fr.Element) (diff fr.Element) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...fr.Element) (neg fr.Element) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
diff --git a/ecc/bls24-315/fr/gkr/gkr.go b/ecc/bls24-315/fr/gkr/gkr.go
index 33ac338db..c51b3c302 100644
--- a/ecc/bls24-315/fr/gkr/gkr.go
+++ b/ecc/bls24-315/fr/gkr/gkr.go
@@ -865,10 +865,17 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
return input[0]
@@ -878,33 +885,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...fr.Element) (diff fr.Element) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...fr.Element) (neg fr.Element) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
diff --git a/ecc/bls24-317/fr/gkr/gkr.go b/ecc/bls24-317/fr/gkr/gkr.go
index b53959510..fc79d93c6 100644
--- a/ecc/bls24-317/fr/gkr/gkr.go
+++ b/ecc/bls24-317/fr/gkr/gkr.go
@@ -865,10 +865,17 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
return input[0]
@@ -878,33 +885,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...fr.Element) (diff fr.Element) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...fr.Element) (neg fr.Element) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
diff --git a/ecc/bn254/fr/gkr/gkr.go b/ecc/bn254/fr/gkr/gkr.go
index bcdc11189..42301d416 100644
--- a/ecc/bn254/fr/gkr/gkr.go
+++ b/ecc/bn254/fr/gkr/gkr.go
@@ -865,10 +865,17 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
return input[0]
@@ -878,33 +885,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...fr.Element) (diff fr.Element) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...fr.Element) (neg fr.Element) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
diff --git a/ecc/bw6-633/fr/gkr/gkr.go b/ecc/bw6-633/fr/gkr/gkr.go
index 707f55467..4e7118cb6 100644
--- a/ecc/bw6-633/fr/gkr/gkr.go
+++ b/ecc/bw6-633/fr/gkr/gkr.go
@@ -865,10 +865,17 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
return input[0]
@@ -878,33 +885,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...fr.Element) (diff fr.Element) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...fr.Element) (neg fr.Element) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
diff --git a/ecc/bw6-756/fr/gkr/gkr.go b/ecc/bw6-756/fr/gkr/gkr.go
index b4ef3560c..cc2204fa7 100644
--- a/ecc/bw6-756/fr/gkr/gkr.go
+++ b/ecc/bw6-756/fr/gkr/gkr.go
@@ -865,10 +865,17 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
return input[0]
@@ -878,33 +885,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...fr.Element) (diff fr.Element) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...fr.Element) (neg fr.Element) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
diff --git a/ecc/bw6-761/fr/gkr/gkr.go b/ecc/bw6-761/fr/gkr/gkr.go
index 4d7ee0cb3..4fd100909 100644
--- a/ecc/bw6-761/fr/gkr/gkr.go
+++ b/ecc/bw6-761/fr/gkr/gkr.go
@@ -865,10 +865,17 @@ func frToBigInts(dst []*big.Int, src []fr.Element) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...fr.Element) fr.Element {
return input[0]
@@ -878,33 +885,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...fr.Element) (res fr.Element) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...fr.Element) (diff fr.Element) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...fr.Element) (neg fr.Element) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
diff --git a/internal/generator/gkr/template/gkr.go.tmpl b/internal/generator/gkr/template/gkr.go.tmpl
index f49ffaa27..86a5f915d 100644
--- a/internal/generator/gkr/template/gkr.go.tmpl
+++ b/internal/generator/gkr/template/gkr.go.tmpl
@@ -850,10 +850,17 @@ func frToBigInts(dst []*big.Int, src []{{.ElementType}}) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...{{.ElementType}}) {{.ElementType}} {
return input[0]
@@ -863,33 +870,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...{{.ElementType}}) (res {{.ElementType}}) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...{{.ElementType}}) (res {{.ElementType}}) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...{{.ElementType}}) (res {{.ElementType}}) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...{{.ElementType}}) (diff {{.ElementType}}) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...{{.ElementType}}) (neg {{.ElementType}}) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
\ No newline at end of file
diff --git a/internal/generator/test_vector_utils/small_rational/gkr/gkr.go b/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
index 6667f2c91..9f0ec4038 100644
--- a/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
+++ b/internal/generator/test_vector_utils/small_rational/gkr/gkr.go
@@ -865,10 +865,17 @@ func frToBigInts(dst []*big.Int, src []small_rational.SmallRational) {
// Gates defined by name
var Gates = map[string]Gate{
"identity": IdentityGate{},
- "mul": MulGate{},
+ "add": AddGate{},
+ "sub": SubGate{},
+ "neg": NegGate{},
+ "mul": MulGate(2),
}
type IdentityGate struct{}
+type AddGate struct{}
+type MulGate int
+type SubGate struct{}
+type NegGate struct{}
func (IdentityGate) Evaluate(input ...small_rational.SmallRational) small_rational.SmallRational {
return input[0]
@@ -878,33 +885,67 @@ func (IdentityGate) Degree() int {
return 1
}
-type MulGate struct{}
+func (g AddGate) Evaluate(x ...small_rational.SmallRational) (res small_rational.SmallRational) {
+ switch len(x) {
+ case 0:
+ // set zero
+ case 1:
+ res.Set(&x[0])
+ case 2:
+ res.Add(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Add(&res, &x[2])
+ }
+ }
+ return
+}
+
+func (g AddGate) Degree() int {
+ return 1
+}
func (g MulGate) Evaluate(x ...small_rational.SmallRational) (res small_rational.SmallRational) {
- if len(x) != 2 {
- panic("mul gate expects 2 elements")
+ if len(x) != int(g) {
+ panic("wrong input count")
+ }
+ switch len(x) {
+ case 0:
+ res.SetOne()
+ case 1:
+ res.Set(&x[0])
+ default:
+ res.Mul(&x[0], &x[1])
+ for i := 2; i < len(x); i++ {
+ res.Mul(&res, &x[2])
+ }
}
- res.Mul(&x[0], &x[1])
return
}
func (g MulGate) Degree() int {
- return 2
+ return int(g)
}
-type AddGate struct{}
-
-func (g AddGate) Evaluate(x ...small_rational.SmallRational) (res small_rational.SmallRational) {
- if len(x) == 0 {
- return
+func (g SubGate) Evaluate(element ...small_rational.SmallRational) (diff small_rational.SmallRational) {
+ if len(element) > 2 {
+ panic("not implemented") //TODO
}
- res = x[0]
- for i := 1; i < len(x); i++ {
- res.Add(&res, &x[i])
+ diff.Sub(&element[0], &element[1])
+ return
+}
+
+func (g SubGate) Degree() int {
+ return 1
+}
+
+func (g NegGate) Evaluate(element ...small_rational.SmallRational) (neg small_rational.SmallRational) {
+ if len(element) != 1 {
+ panic("univariate gate")
}
+ neg.Neg(&element[0])
return
}
-func (g AddGate) Degree() int {
+func (g NegGate) Degree() int {
return 1
}
From f1e16914ddd4daeffbb8df3f4dc93e190ea6d2d9 Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Thu, 29 Jun 2023 10:25:04 -0500
Subject: [PATCH 37/51] fix: remove redundant mulGate
---
ecc/bls12-377/fr/gkr/gkr_test.go | 11 -----------
ecc/bls12-378/fr/gkr/gkr_test.go | 11 -----------
ecc/bls12-381/fr/gkr/gkr_test.go | 11 -----------
ecc/bls24-315/fr/gkr/gkr_test.go | 11 -----------
ecc/bls24-317/fr/gkr/gkr_test.go | 11 -----------
ecc/bn254/fr/gkr/gkr_test.go | 11 -----------
ecc/bw6-633/fr/gkr/gkr_test.go | 11 -----------
ecc/bw6-756/fr/gkr/gkr_test.go | 11 -----------
ecc/bw6-761/fr/gkr/gkr_test.go | 11 -----------
.../generator/gkr/template/gkr.test.vectors.go.tmpl | 11 -----------
internal/generator/gkr/test_vectors/main.go | 11 -----------
11 files changed, 121 deletions(-)
diff --git a/ecc/bls12-377/fr/gkr/gkr_test.go b/ecc/bls12-377/fr/gkr/gkr_test.go
index 286d668be..26acc7f98 100644
--- a/ecc/bls12-377/fr/gkr/gkr_test.go
+++ b/ecc/bls12-377/fr/gkr/gkr_test.go
@@ -712,17 +712,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...fr.Element) fr.Element {
diff --git a/ecc/bls12-378/fr/gkr/gkr_test.go b/ecc/bls12-378/fr/gkr/gkr_test.go
index 7c2df70f3..2dc6001a5 100644
--- a/ecc/bls12-378/fr/gkr/gkr_test.go
+++ b/ecc/bls12-378/fr/gkr/gkr_test.go
@@ -712,17 +712,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...fr.Element) fr.Element {
diff --git a/ecc/bls12-381/fr/gkr/gkr_test.go b/ecc/bls12-381/fr/gkr/gkr_test.go
index 1fa35da54..ab54dec50 100644
--- a/ecc/bls12-381/fr/gkr/gkr_test.go
+++ b/ecc/bls12-381/fr/gkr/gkr_test.go
@@ -712,17 +712,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...fr.Element) fr.Element {
diff --git a/ecc/bls24-315/fr/gkr/gkr_test.go b/ecc/bls24-315/fr/gkr/gkr_test.go
index 13370f7ab..8b69ad378 100644
--- a/ecc/bls24-315/fr/gkr/gkr_test.go
+++ b/ecc/bls24-315/fr/gkr/gkr_test.go
@@ -712,17 +712,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...fr.Element) fr.Element {
diff --git a/ecc/bls24-317/fr/gkr/gkr_test.go b/ecc/bls24-317/fr/gkr/gkr_test.go
index e81f2f5d5..81dd09529 100644
--- a/ecc/bls24-317/fr/gkr/gkr_test.go
+++ b/ecc/bls24-317/fr/gkr/gkr_test.go
@@ -712,17 +712,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...fr.Element) fr.Element {
diff --git a/ecc/bn254/fr/gkr/gkr_test.go b/ecc/bn254/fr/gkr/gkr_test.go
index 42d2f56b6..14168bd4b 100644
--- a/ecc/bn254/fr/gkr/gkr_test.go
+++ b/ecc/bn254/fr/gkr/gkr_test.go
@@ -712,17 +712,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...fr.Element) fr.Element {
diff --git a/ecc/bw6-633/fr/gkr/gkr_test.go b/ecc/bw6-633/fr/gkr/gkr_test.go
index 3f40952cf..3f2dbb9e0 100644
--- a/ecc/bw6-633/fr/gkr/gkr_test.go
+++ b/ecc/bw6-633/fr/gkr/gkr_test.go
@@ -712,17 +712,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...fr.Element) fr.Element {
diff --git a/ecc/bw6-756/fr/gkr/gkr_test.go b/ecc/bw6-756/fr/gkr/gkr_test.go
index 7c99db64e..c817ae16a 100644
--- a/ecc/bw6-756/fr/gkr/gkr_test.go
+++ b/ecc/bw6-756/fr/gkr/gkr_test.go
@@ -712,17 +712,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...fr.Element) fr.Element {
diff --git a/ecc/bw6-761/fr/gkr/gkr_test.go b/ecc/bw6-761/fr/gkr/gkr_test.go
index 67973c6d6..411053a1f 100644
--- a/ecc/bw6-761/fr/gkr/gkr_test.go
+++ b/ecc/bw6-761/fr/gkr/gkr_test.go
@@ -712,17 +712,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...fr.Element) (result fr.Element) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...fr.Element) fr.Element {
diff --git a/internal/generator/gkr/template/gkr.test.vectors.go.tmpl b/internal/generator/gkr/template/gkr.test.vectors.go.tmpl
index 567d82d79..6208b2598 100644
--- a/internal/generator/gkr/template/gkr.test.vectors.go.tmpl
+++ b/internal/generator/gkr/template/gkr.test.vectors.go.tmpl
@@ -236,17 +236,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...{{.ElementType}}) (result {{.ElementType}}) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...{{.ElementType}}) {{.ElementType}} {
diff --git a/internal/generator/gkr/test_vectors/main.go b/internal/generator/gkr/test_vectors/main.go
index cac317182..c1b01aa82 100644
--- a/internal/generator/gkr/test_vectors/main.go
+++ b/internal/generator/gkr/test_vectors/main.go
@@ -354,17 +354,6 @@ func newTestCase(path string) (*TestCase, error) {
return tCase, nil
}
-type mulGate struct{}
-
-func (g mulGate) Evaluate(element ...small_rational.SmallRational) (result small_rational.SmallRational) {
- result.Mul(&element[0], &element[1])
- return
-}
-
-func (g mulGate) Degree() int {
- return 2
-}
-
type _select int
func (g _select) Evaluate(in ...small_rational.SmallRational) small_rational.SmallRational {
From 006af12e9de72a11f66ad86d754725e368ea207b Mon Sep 17 00:00:00 2001
From: Arya Tabaie
Date: Thu, 29 Jun 2023 10:27:42 -0500
Subject: [PATCH 38/51] fix: use of MulGate
---
ecc/bls12-377/fr/gkr/gkr_test.go | 4 ++--
ecc/bls12-378/fr/gkr/gkr_test.go | 4 ++--
ecc/bls12-381/fr/gkr/gkr_test.go | 4 ++--
ecc/bls24-315/fr/gkr/gkr_test.go | 4 ++--
ecc/bls24-317/fr/gkr/gkr_test.go | 4 ++--
ecc/bn254/fr/gkr/gkr_test.go | 4 ++--
ecc/bw6-633/fr/gkr/gkr_test.go | 4 ++--
ecc/bw6-756/fr/gkr/gkr_test.go | 4 ++--
ecc/bw6-761/fr/gkr/gkr_test.go | 4 ++--
internal/generator/gkr/template/gkr.test.go.tmpl | 4 ++--
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ecc/bls12-377/fr/gkr/gkr_test.go b/ecc/bls12-377/fr/gkr/gkr_test.go
index 26acc7f98..15ff485d9 100644
--- a/ecc/bls12-377/fr/gkr/gkr_test.go
+++ b/ecc/bls12-377/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
diff --git a/ecc/bls12-378/fr/gkr/gkr_test.go b/ecc/bls12-378/fr/gkr/gkr_test.go
index 2dc6001a5..462ee5fdd 100644
--- a/ecc/bls12-378/fr/gkr/gkr_test.go
+++ b/ecc/bls12-378/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
diff --git a/ecc/bls12-381/fr/gkr/gkr_test.go b/ecc/bls12-381/fr/gkr/gkr_test.go
index ab54dec50..bf6877cb5 100644
--- a/ecc/bls12-381/fr/gkr/gkr_test.go
+++ b/ecc/bls12-381/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
diff --git a/ecc/bls24-315/fr/gkr/gkr_test.go b/ecc/bls24-315/fr/gkr/gkr_test.go
index 8b69ad378..7fd419d28 100644
--- a/ecc/bls24-315/fr/gkr/gkr_test.go
+++ b/ecc/bls24-315/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
diff --git a/ecc/bls24-317/fr/gkr/gkr_test.go b/ecc/bls24-317/fr/gkr/gkr_test.go
index 81dd09529..35288f1d0 100644
--- a/ecc/bls24-317/fr/gkr/gkr_test.go
+++ b/ecc/bls24-317/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
diff --git a/ecc/bn254/fr/gkr/gkr_test.go b/ecc/bn254/fr/gkr/gkr_test.go
index 14168bd4b..429998b12 100644
--- a/ecc/bn254/fr/gkr/gkr_test.go
+++ b/ecc/bn254/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
diff --git a/ecc/bw6-633/fr/gkr/gkr_test.go b/ecc/bw6-633/fr/gkr/gkr_test.go
index 3f2dbb9e0..5a683825f 100644
--- a/ecc/bw6-633/fr/gkr/gkr_test.go
+++ b/ecc/bw6-633/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
diff --git a/ecc/bw6-756/fr/gkr/gkr_test.go b/ecc/bw6-756/fr/gkr/gkr_test.go
index c817ae16a..2632d06f1 100644
--- a/ecc/bw6-756/fr/gkr/gkr_test.go
+++ b/ecc/bw6-756/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
diff --git a/ecc/bw6-761/fr/gkr/gkr_test.go b/ecc/bw6-761/fr/gkr/gkr_test.go
index 411053a1f..4120b3aff 100644
--- a/ecc/bw6-761/fr/gkr/gkr_test.go
+++ b/ecc/bw6-761/fr/gkr/gkr_test.go
@@ -207,7 +207,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]fr.Element) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -337,7 +337,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]fr.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
diff --git a/internal/generator/gkr/template/gkr.test.go.tmpl b/internal/generator/gkr/template/gkr.test.go.tmpl
index 161304bab..525abd6c9 100644
--- a/internal/generator/gkr/template/gkr.test.go.tmpl
+++ b/internal/generator/gkr/template/gkr.test.go.tmpl
@@ -197,7 +197,7 @@ func testSingleMulGate(t *testing.T, inputAssignments ...[]{{.ElementType}}) {
c := make(Circuit, 3)
c[2] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[0], &c[1]},
}
@@ -327,7 +327,7 @@ func testATimesBSquared(t *testing.T, numRounds int, inputAssignments ...[]{{.El
for i := 2; i < len(c); i++ {
c[i] = Wire{
- Gate: MulGate{},
+ Gate: Gates["mul"],
Inputs: []*Wire{&c[i-1], &c[0]},
}
}
From cf1c8bd614f1db988237cfe65f09afe83af704bd Mon Sep 17 00:00:00 2001
From: Gautam Botrel
Date: Fri, 30 Jun 2023 15:17:33 -0500
Subject: [PATCH 39/51] perf: fast path for SIS with logTwoBound: 8,
logTwoDegree: 6 (#416)
* perf: add unrolled FFT for sis
* perf: fast limb decomposition for known params
* test: push failing test
* fix: fix hardcoded limb decomposition and its test
* fix: make linter happier
* tmp commit
* tmp commit
* cleaning up
* perf: put all twiddle coset in consecutive memory
* fix: re ran go generate
* test: uncomment commented test
---
ecc/bls12-377/fr/fft/fft.go | 3 +-
ecc/bls12-378/fr/fft/fft.go | 3 +-
ecc/bls12-381/fr/fft/fft.go | 3 +-
ecc/bls24-315/fr/fft/fft.go | 3 +-
ecc/bls24-317/fr/fft/fft.go | 3 +-
ecc/bn254/fr/fft/fft.go | 3 +-
ecc/bn254/fr/sis/sis.go | 47 +-
ecc/bn254/fr/sis/sis.sage | 1 +
ecc/bn254/fr/sis/sis_fft.go | 494 +
ecc/bn254/fr/sis/sis_test.go | 144 +-
ecc/bn254/fr/sis/test_cases.json | 131490 ++++++++---------
ecc/bw6-633/fr/fft/fft.go | 3 +-
ecc/bw6-756/fr/fft/fft.go | 3 +-
ecc/bw6-761/fr/fft/fft.go | 3 +-
internal/generator/fft/generate.go | 22 +-
internal/generator/fft/template/fft.go.tmpl | 6 +-
internal/generator/main.go | 5 +
internal/generator/sis/generate.go | 37 +
internal/generator/sis/template/fft.go.tmpl | 78 +
19 files changed, 66495 insertions(+), 65856 deletions(-)
create mode 100644 ecc/bn254/fr/sis/sis_fft.go
create mode 100644 internal/generator/sis/generate.go
create mode 100644 internal/generator/sis/template/fft.go.tmpl
diff --git a/ecc/bls12-377/fr/fft/fft.go b/ecc/bls12-377/fr/fft/fft.go
index c2a6c5e47..91172620a 100644
--- a/ecc/bls12-377/fr/fft/fft.go
+++ b/ecc/bls12-377/fr/fft/fft.go
@@ -17,10 +17,9 @@
package fft
import (
- "math/bits"
-
"github.com/consensys/gnark-crypto/ecc"
"github.com/consensys/gnark-crypto/internal/parallel"
+ "math/bits"
"github.com/consensys/gnark-crypto/ecc/bls12-377/fr"
)
diff --git a/ecc/bls12-378/fr/fft/fft.go b/ecc/bls12-378/fr/fft/fft.go
index 51c3c9274..240828e0d 100644
--- a/ecc/bls12-378/fr/fft/fft.go
+++ b/ecc/bls12-378/fr/fft/fft.go
@@ -17,10 +17,9 @@
package fft
import (
- "math/bits"
-
"github.com/consensys/gnark-crypto/ecc"
"github.com/consensys/gnark-crypto/internal/parallel"
+ "math/bits"
"github.com/consensys/gnark-crypto/ecc/bls12-378/fr"
)
diff --git a/ecc/bls12-381/fr/fft/fft.go b/ecc/bls12-381/fr/fft/fft.go
index 5694deec1..0bc140564 100644
--- a/ecc/bls12-381/fr/fft/fft.go
+++ b/ecc/bls12-381/fr/fft/fft.go
@@ -17,10 +17,9 @@
package fft
import (
- "math/bits"
-
"github.com/consensys/gnark-crypto/ecc"
"github.com/consensys/gnark-crypto/internal/parallel"
+ "math/bits"
"github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
)
diff --git a/ecc/bls24-315/fr/fft/fft.go b/ecc/bls24-315/fr/fft/fft.go
index 60277eeae..b897b1d4d 100644
--- a/ecc/bls24-315/fr/fft/fft.go
+++ b/ecc/bls24-315/fr/fft/fft.go
@@ -17,10 +17,9 @@
package fft
import (
- "math/bits"
-
"github.com/consensys/gnark-crypto/ecc"
"github.com/consensys/gnark-crypto/internal/parallel"
+ "math/bits"
"github.com/consensys/gnark-crypto/ecc/bls24-315/fr"
)
diff --git a/ecc/bls24-317/fr/fft/fft.go b/ecc/bls24-317/fr/fft/fft.go
index 44273967c..344c171ee 100644
--- a/ecc/bls24-317/fr/fft/fft.go
+++ b/ecc/bls24-317/fr/fft/fft.go
@@ -17,10 +17,9 @@
package fft
import (
- "math/bits"
-
"github.com/consensys/gnark-crypto/ecc"
"github.com/consensys/gnark-crypto/internal/parallel"
+ "math/bits"
"github.com/consensys/gnark-crypto/ecc/bls24-317/fr"
)
diff --git a/ecc/bn254/fr/fft/fft.go b/ecc/bn254/fr/fft/fft.go
index 7a1e03604..e38674974 100644
--- a/ecc/bn254/fr/fft/fft.go
+++ b/ecc/bn254/fr/fft/fft.go
@@ -17,10 +17,9 @@
package fft
import (
- "math/bits"
-
"github.com/consensys/gnark-crypto/ecc"
"github.com/consensys/gnark-crypto/internal/parallel"
+ "math/bits"
"github.com/consensys/gnark-crypto/ecc/bn254/fr"
)
diff --git a/ecc/bn254/fr/sis/sis.go b/ecc/bn254/fr/sis/sis.go
index e3af02026..db90af87e 100644
--- a/ecc/bn254/fr/sis/sis.go
+++ b/ecc/bn254/fr/sis/sis.go
@@ -51,7 +51,8 @@ type RSis struct {
LogTwoBound int
// domain for the polynomial multiplication
- Domain *fft.Domain
+ Domain *fft.Domain
+ twiddleCosets []fr.Element // see fft64 and precomputeTwiddlesCoset
// d, the degree of X^{d}+1
Degree int
@@ -126,6 +127,10 @@ func NewRSis(seed int64, logTwoDegree, logTwoBound, maxNbElementsToHash int) (*R
bufMValues: bitset.New(uint(n)),
maxNbElementsToHash: maxNbElementsToHash,
}
+ if r.LogTwoBound == 8 && r.Degree == 64 {
+ // TODO @gbotrel fixme, that's dirty.
+ r.twiddleCosets = precomputeTwiddlesCoset(r.Domain.Twiddles, r.Domain.FrMultiplicativeGen)
+ }
// filling A
a := make([]fr.Element, n*r.Degree)
@@ -146,8 +151,6 @@ func NewRSis(seed int64, logTwoDegree, logTwoBound, maxNbElementsToHash int) (*R
r.Domain.FFT(r.Ag[i], fft.DIF, fft.OnCoset())
}
})
- // TODO @gbotrel add nbtasks here; while in tests it's more convenient to parallelize
- // in tensor-commitment we may not want to do that.
return r, nil
}
@@ -168,12 +171,20 @@ func (r *RSis) Sum(b []byte) []byte {
panic("buffer too large")
}
+ fastPath := r.LogTwoBound == 8 && r.Degree == 64
+
// clear the buffers of the instance.
defer r.cleanupBuffers()
m := r.bufM
mValues := r.bufMValues
- limbDecomposeBytes(buf, m, r.LogTwoBound, r.Degree, mValues)
+
+ if fastPath {
+ // fast path.
+ limbDecomposeBytes8_64(buf, m, mValues)
+ } else {
+ limbDecomposeBytes(buf, m, r.LogTwoBound, r.Degree, mValues)
+ }
// we can hash now.
res := r.bufRes
@@ -186,7 +197,12 @@ func (r *RSis) Sum(b []byte) []byte {
continue
}
k := m[i*r.Degree : (i+1)*r.Degree]
- r.Domain.FFT(k, fft.DIF, fft.OnCoset(), fft.WithNbTasks(1))
+ if fastPath {
+ // fast path.
+ fft64(k, r.twiddleCosets)
+ } else {
+ r.Domain.FFT(k, fft.DIF, fft.OnCoset(), fft.WithNbTasks(1))
+ }
mulModAcc(res, r.Ag[i], k)
}
r.Domain.FFTInverse(res, fft.DIT, fft.OnCoset(), fft.WithNbTasks(1)) // -> reduces mod Xᵈ+1
@@ -357,11 +373,12 @@ func limbDecomposeBytes(buf []byte, m fr.Vector, logTwoBound, degree int, mValue
// r.LogTwoBound < 64; we just use the first word of our element here,
// and set the bits from LSB to MSB.
at := fieldStart + fr.Bytes*8 - bitInField - 1
+
m[mPos][0] |= uint64(bitAt(at) << j)
bitInField++
// Check if mPos is zero and mark as non-zero in the bitset if not
- if m[mPos][0] > 0 && mValues != nil {
+ if m[mPos][0] != 0 && mValues != nil {
mValues.Set(uint(mPos / degree))
}
@@ -372,3 +389,21 @@ func limbDecomposeBytes(buf []byte, m fr.Vector, logTwoBound, degree int, mValue
fieldStart += fr.Bytes * 8
}
}
+
+// see limbDecomposeBytes; this function is optimized for the case where
+// logTwoBound == 8 and degree == 64
+func limbDecomposeBytes8_64(buf []byte, m fr.Vector, mValues *bitset.BitSet) {
+ // with logTwoBound == 8, we can actually advance byte per byte.
+ const degree = 64
+ j := 0
+
+ for startPos := fr.Bytes - 1; startPos < len(buf); startPos += fr.Bytes {
+ for i := startPos; i >= startPos-fr.Bytes+1; i-- {
+ m[j][0] = uint64(buf[i])
+ if m[j][0] != 0 {
+ mValues.Set(uint(j / degree))
+ }
+ j++
+ }
+ }
+}
diff --git a/ecc/bn254/fr/sis/sis.sage b/ecc/bn254/fr/sis/sis.sage
index 29fe873ca..723749f38 100644
--- a/ecc/bn254/fr/sis/sis.sage
+++ b/ecc/bn254/fr/sis/sis.sage
@@ -218,6 +218,7 @@ params = [
SISParams(5, 4, 4, 10),
SISParams(5, 5, 4, 10),
SISParams(5, 6, 5, 10),
+ # SISParams(5, 8, 6, 10),
SISParams(5, 10, 6, 10),
SISParams(5, 11, 7, 10),
SISParams(5, 12, 7, 10),
diff --git a/ecc/bn254/fr/sis/sis_fft.go b/ecc/bn254/fr/sis/sis_fft.go
new file mode 100644
index 000000000..336805ebe
--- /dev/null
+++ b/ecc/bn254/fr/sis/sis_fft.go
@@ -0,0 +1,494 @@
+// Copyright 2020 Consensys Software Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by consensys/gnark-crypto DO NOT EDIT
+
+package sis
+
+import (
+ "github.com/consensys/gnark-crypto/ecc/bn254/fr"
+)
+
+// fft64 is generated by gnark-crypto and contains the unrolled code for FFT (DIF) on 64 elements
+// equivalent code: r.Domain.FFT(k, fft.DIF, fft.OnCoset(), fft.WithNbTasks(1))
+// twiddlesCoset must be pre-computed from twiddles and coset table, see precomputeTwiddlesCoset
+func fft64(a []fr.Element, twiddlesCoset []fr.Element) {
+
+ a[32].Mul(&a[32], &twiddlesCoset[0])
+ a[33].Mul(&a[33], &twiddlesCoset[0])
+ a[34].Mul(&a[34], &twiddlesCoset[0])
+ a[35].Mul(&a[35], &twiddlesCoset[0])
+ a[36].Mul(&a[36], &twiddlesCoset[0])
+ a[37].Mul(&a[37], &twiddlesCoset[0])
+ a[38].Mul(&a[38], &twiddlesCoset[0])
+ a[39].Mul(&a[39], &twiddlesCoset[0])
+ a[40].Mul(&a[40], &twiddlesCoset[0])
+ a[41].Mul(&a[41], &twiddlesCoset[0])
+ a[42].Mul(&a[42], &twiddlesCoset[0])
+ a[43].Mul(&a[43], &twiddlesCoset[0])
+ a[44].Mul(&a[44], &twiddlesCoset[0])
+ a[45].Mul(&a[45], &twiddlesCoset[0])
+ a[46].Mul(&a[46], &twiddlesCoset[0])
+ a[47].Mul(&a[47], &twiddlesCoset[0])
+ a[48].Mul(&a[48], &twiddlesCoset[0])
+ a[49].Mul(&a[49], &twiddlesCoset[0])
+ a[50].Mul(&a[50], &twiddlesCoset[0])
+ a[51].Mul(&a[51], &twiddlesCoset[0])
+ a[52].Mul(&a[52], &twiddlesCoset[0])
+ a[53].Mul(&a[53], &twiddlesCoset[0])
+ a[54].Mul(&a[54], &twiddlesCoset[0])
+ a[55].Mul(&a[55], &twiddlesCoset[0])
+ a[56].Mul(&a[56], &twiddlesCoset[0])
+ a[57].Mul(&a[57], &twiddlesCoset[0])
+ a[58].Mul(&a[58], &twiddlesCoset[0])
+ a[59].Mul(&a[59], &twiddlesCoset[0])
+ a[60].Mul(&a[60], &twiddlesCoset[0])
+ a[61].Mul(&a[61], &twiddlesCoset[0])
+ a[62].Mul(&a[62], &twiddlesCoset[0])
+ a[63].Mul(&a[63], &twiddlesCoset[0])
+ fr.Butterfly(&a[0], &a[32])
+ fr.Butterfly(&a[1], &a[33])
+ fr.Butterfly(&a[2], &a[34])
+ fr.Butterfly(&a[3], &a[35])
+ fr.Butterfly(&a[4], &a[36])
+ fr.Butterfly(&a[5], &a[37])
+ fr.Butterfly(&a[6], &a[38])
+ fr.Butterfly(&a[7], &a[39])
+ fr.Butterfly(&a[8], &a[40])
+ fr.Butterfly(&a[9], &a[41])
+ fr.Butterfly(&a[10], &a[42])
+ fr.Butterfly(&a[11], &a[43])
+ fr.Butterfly(&a[12], &a[44])
+ fr.Butterfly(&a[13], &a[45])
+ fr.Butterfly(&a[14], &a[46])
+ fr.Butterfly(&a[15], &a[47])
+ fr.Butterfly(&a[16], &a[48])
+ fr.Butterfly(&a[17], &a[49])
+ fr.Butterfly(&a[18], &a[50])
+ fr.Butterfly(&a[19], &a[51])
+ fr.Butterfly(&a[20], &a[52])
+ fr.Butterfly(&a[21], &a[53])
+ fr.Butterfly(&a[22], &a[54])
+ fr.Butterfly(&a[23], &a[55])
+ fr.Butterfly(&a[24], &a[56])
+ fr.Butterfly(&a[25], &a[57])
+ fr.Butterfly(&a[26], &a[58])
+ fr.Butterfly(&a[27], &a[59])
+ fr.Butterfly(&a[28], &a[60])
+ fr.Butterfly(&a[29], &a[61])
+ fr.Butterfly(&a[30], &a[62])
+ fr.Butterfly(&a[31], &a[63])
+ a[16].Mul(&a[16], &twiddlesCoset[1])
+ a[17].Mul(&a[17], &twiddlesCoset[1])
+ a[18].Mul(&a[18], &twiddlesCoset[1])
+ a[19].Mul(&a[19], &twiddlesCoset[1])
+ a[20].Mul(&a[20], &twiddlesCoset[1])
+ a[21].Mul(&a[21], &twiddlesCoset[1])
+ a[22].Mul(&a[22], &twiddlesCoset[1])
+ a[23].Mul(&a[23], &twiddlesCoset[1])
+ a[24].Mul(&a[24], &twiddlesCoset[1])
+ a[25].Mul(&a[25], &twiddlesCoset[1])
+ a[26].Mul(&a[26], &twiddlesCoset[1])
+ a[27].Mul(&a[27], &twiddlesCoset[1])
+ a[28].Mul(&a[28], &twiddlesCoset[1])
+ a[29].Mul(&a[29], &twiddlesCoset[1])
+ a[30].Mul(&a[30], &twiddlesCoset[1])
+ a[31].Mul(&a[31], &twiddlesCoset[1])
+ a[48].Mul(&a[48], &twiddlesCoset[2])
+ a[49].Mul(&a[49], &twiddlesCoset[2])
+ a[50].Mul(&a[50], &twiddlesCoset[2])
+ a[51].Mul(&a[51], &twiddlesCoset[2])
+ a[52].Mul(&a[52], &twiddlesCoset[2])
+ a[53].Mul(&a[53], &twiddlesCoset[2])
+ a[54].Mul(&a[54], &twiddlesCoset[2])
+ a[55].Mul(&a[55], &twiddlesCoset[2])
+ a[56].Mul(&a[56], &twiddlesCoset[2])
+ a[57].Mul(&a[57], &twiddlesCoset[2])
+ a[58].Mul(&a[58], &twiddlesCoset[2])
+ a[59].Mul(&a[59], &twiddlesCoset[2])
+ a[60].Mul(&a[60], &twiddlesCoset[2])
+ a[61].Mul(&a[61], &twiddlesCoset[2])
+ a[62].Mul(&a[62], &twiddlesCoset[2])
+ a[63].Mul(&a[63], &twiddlesCoset[2])
+ fr.Butterfly(&a[0], &a[16])
+ fr.Butterfly(&a[1], &a[17])
+ fr.Butterfly(&a[2], &a[18])
+ fr.Butterfly(&a[3], &a[19])
+ fr.Butterfly(&a[4], &a[20])
+ fr.Butterfly(&a[5], &a[21])
+ fr.Butterfly(&a[6], &a[22])
+ fr.Butterfly(&a[7], &a[23])
+ fr.Butterfly(&a[8], &a[24])
+ fr.Butterfly(&a[9], &a[25])
+ fr.Butterfly(&a[10], &a[26])
+ fr.Butterfly(&a[11], &a[27])
+ fr.Butterfly(&a[12], &a[28])
+ fr.Butterfly(&a[13], &a[29])
+ fr.Butterfly(&a[14], &a[30])
+ fr.Butterfly(&a[15], &a[31])
+ fr.Butterfly(&a[32], &a[48])
+ fr.Butterfly(&a[33], &a[49])
+ fr.Butterfly(&a[34], &a[50])
+ fr.Butterfly(&a[35], &a[51])
+ fr.Butterfly(&a[36], &a[52])
+ fr.Butterfly(&a[37], &a[53])
+ fr.Butterfly(&a[38], &a[54])
+ fr.Butterfly(&a[39], &a[55])
+ fr.Butterfly(&a[40], &a[56])
+ fr.Butterfly(&a[41], &a[57])
+ fr.Butterfly(&a[42], &a[58])
+ fr.Butterfly(&a[43], &a[59])
+ fr.Butterfly(&a[44], &a[60])
+ fr.Butterfly(&a[45], &a[61])
+ fr.Butterfly(&a[46], &a[62])
+ fr.Butterfly(&a[47], &a[63])
+ a[8].Mul(&a[8], &twiddlesCoset[3])
+ a[9].Mul(&a[9], &twiddlesCoset[3])
+ a[10].Mul(&a[10], &twiddlesCoset[3])
+ a[11].Mul(&a[11], &twiddlesCoset[3])
+ a[12].Mul(&a[12], &twiddlesCoset[3])
+ a[13].Mul(&a[13], &twiddlesCoset[3])
+ a[14].Mul(&a[14], &twiddlesCoset[3])
+ a[15].Mul(&a[15], &twiddlesCoset[3])
+ a[24].Mul(&a[24], &twiddlesCoset[4])
+ a[25].Mul(&a[25], &twiddlesCoset[4])
+ a[26].Mul(&a[26], &twiddlesCoset[4])
+ a[27].Mul(&a[27], &twiddlesCoset[4])
+ a[28].Mul(&a[28], &twiddlesCoset[4])
+ a[29].Mul(&a[29], &twiddlesCoset[4])
+ a[30].Mul(&a[30], &twiddlesCoset[4])
+ a[31].Mul(&a[31], &twiddlesCoset[4])
+ a[40].Mul(&a[40], &twiddlesCoset[5])
+ a[41].Mul(&a[41], &twiddlesCoset[5])
+ a[42].Mul(&a[42], &twiddlesCoset[5])
+ a[43].Mul(&a[43], &twiddlesCoset[5])
+ a[44].Mul(&a[44], &twiddlesCoset[5])
+ a[45].Mul(&a[45], &twiddlesCoset[5])
+ a[46].Mul(&a[46], &twiddlesCoset[5])
+ a[47].Mul(&a[47], &twiddlesCoset[5])
+ a[56].Mul(&a[56], &twiddlesCoset[6])
+ a[57].Mul(&a[57], &twiddlesCoset[6])
+ a[58].Mul(&a[58], &twiddlesCoset[6])
+ a[59].Mul(&a[59], &twiddlesCoset[6])
+ a[60].Mul(&a[60], &twiddlesCoset[6])
+ a[61].Mul(&a[61], &twiddlesCoset[6])
+ a[62].Mul(&a[62], &twiddlesCoset[6])
+ a[63].Mul(&a[63], &twiddlesCoset[6])
+ fr.Butterfly(&a[0], &a[8])
+ fr.Butterfly(&a[1], &a[9])
+ fr.Butterfly(&a[2], &a[10])
+ fr.Butterfly(&a[3], &a[11])
+ fr.Butterfly(&a[4], &a[12])
+ fr.Butterfly(&a[5], &a[13])
+ fr.Butterfly(&a[6], &a[14])
+ fr.Butterfly(&a[7], &a[15])
+ fr.Butterfly(&a[16], &a[24])
+ fr.Butterfly(&a[17], &a[25])
+ fr.Butterfly(&a[18], &a[26])
+ fr.Butterfly(&a[19], &a[27])
+ fr.Butterfly(&a[20], &a[28])
+ fr.Butterfly(&a[21], &a[29])
+ fr.Butterfly(&a[22], &a[30])
+ fr.Butterfly(&a[23], &a[31])
+ fr.Butterfly(&a[32], &a[40])
+ fr.Butterfly(&a[33], &a[41])
+ fr.Butterfly(&a[34], &a[42])
+ fr.Butterfly(&a[35], &a[43])
+ fr.Butterfly(&a[36], &a[44])
+ fr.Butterfly(&a[37], &a[45])
+ fr.Butterfly(&a[38], &a[46])
+ fr.Butterfly(&a[39], &a[47])
+ fr.Butterfly(&a[48], &a[56])
+ fr.Butterfly(&a[49], &a[57])
+ fr.Butterfly(&a[50], &a[58])
+ fr.Butterfly(&a[51], &a[59])
+ fr.Butterfly(&a[52], &a[60])
+ fr.Butterfly(&a[53], &a[61])
+ fr.Butterfly(&a[54], &a[62])
+ fr.Butterfly(&a[55], &a[63])
+ a[4].Mul(&a[4], &twiddlesCoset[7])
+ a[5].Mul(&a[5], &twiddlesCoset[7])
+ a[6].Mul(&a[6], &twiddlesCoset[7])
+ a[7].Mul(&a[7], &twiddlesCoset[7])
+ a[12].Mul(&a[12], &twiddlesCoset[8])
+ a[13].Mul(&a[13], &twiddlesCoset[8])
+ a[14].Mul(&a[14], &twiddlesCoset[8])
+ a[15].Mul(&a[15], &twiddlesCoset[8])
+ a[20].Mul(&a[20], &twiddlesCoset[9])
+ a[21].Mul(&a[21], &twiddlesCoset[9])
+ a[22].Mul(&a[22], &twiddlesCoset[9])
+ a[23].Mul(&a[23], &twiddlesCoset[9])
+ a[28].Mul(&a[28], &twiddlesCoset[10])
+ a[29].Mul(&a[29], &twiddlesCoset[10])
+ a[30].Mul(&a[30], &twiddlesCoset[10])
+ a[31].Mul(&a[31], &twiddlesCoset[10])
+ a[36].Mul(&a[36], &twiddlesCoset[11])
+ a[37].Mul(&a[37], &twiddlesCoset[11])
+ a[38].Mul(&a[38], &twiddlesCoset[11])
+ a[39].Mul(&a[39], &twiddlesCoset[11])
+ a[44].Mul(&a[44], &twiddlesCoset[12])
+ a[45].Mul(&a[45], &twiddlesCoset[12])
+ a[46].Mul(&a[46], &twiddlesCoset[12])
+ a[47].Mul(&a[47], &twiddlesCoset[12])
+ a[52].Mul(&a[52], &twiddlesCoset[13])
+ a[53].Mul(&a[53], &twiddlesCoset[13])
+ a[54].Mul(&a[54], &twiddlesCoset[13])
+ a[55].Mul(&a[55], &twiddlesCoset[13])
+ a[60].Mul(&a[60], &twiddlesCoset[14])
+ a[61].Mul(&a[61], &twiddlesCoset[14])
+ a[62].Mul(&a[62], &twiddlesCoset[14])
+ a[63].Mul(&a[63], &twiddlesCoset[14])
+ fr.Butterfly(&a[0], &a[4])
+ fr.Butterfly(&a[1], &a[5])
+ fr.Butterfly(&a[2], &a[6])
+ fr.Butterfly(&a[3], &a[7])
+ fr.Butterfly(&a[8], &a[12])
+ fr.Butterfly(&a[9], &a[13])
+ fr.Butterfly(&a[10], &a[14])
+ fr.Butterfly(&a[11], &a[15])
+ fr.Butterfly(&a[16], &a[20])
+ fr.Butterfly(&a[17], &a[21])
+ fr.Butterfly(&a[18], &a[22])
+ fr.Butterfly(&a[19], &a[23])
+ fr.Butterfly(&a[24], &a[28])
+ fr.Butterfly(&a[25], &a[29])
+ fr.Butterfly(&a[26], &a[30])
+ fr.Butterfly(&a[27], &a[31])
+ fr.Butterfly(&a[32], &a[36])
+ fr.Butterfly(&a[33], &a[37])
+ fr.Butterfly(&a[34], &a[38])
+ fr.Butterfly(&a[35], &a[39])
+ fr.Butterfly(&a[40], &a[44])
+ fr.Butterfly(&a[41], &a[45])
+ fr.Butterfly(&a[42], &a[46])
+ fr.Butterfly(&a[43], &a[47])
+ fr.Butterfly(&a[48], &a[52])
+ fr.Butterfly(&a[49], &a[53])
+ fr.Butterfly(&a[50], &a[54])
+ fr.Butterfly(&a[51], &a[55])
+ fr.Butterfly(&a[56], &a[60])
+ fr.Butterfly(&a[57], &a[61])
+ fr.Butterfly(&a[58], &a[62])
+ fr.Butterfly(&a[59], &a[63])
+ a[2].Mul(&a[2], &twiddlesCoset[15])
+ a[3].Mul(&a[3], &twiddlesCoset[15])
+ a[6].Mul(&a[6], &twiddlesCoset[16])
+ a[7].Mul(&a[7], &twiddlesCoset[16])
+ a[10].Mul(&a[10], &twiddlesCoset[17])
+ a[11].Mul(&a[11], &twiddlesCoset[17])
+ a[14].Mul(&a[14], &twiddlesCoset[18])
+ a[15].Mul(&a[15], &twiddlesCoset[18])
+ a[18].Mul(&a[18], &twiddlesCoset[19])
+ a[19].Mul(&a[19], &twiddlesCoset[19])
+ a[22].Mul(&a[22], &twiddlesCoset[20])
+ a[23].Mul(&a[23], &twiddlesCoset[20])
+ a[26].Mul(&a[26], &twiddlesCoset[21])
+ a[27].Mul(&a[27], &twiddlesCoset[21])
+ a[30].Mul(&a[30], &twiddlesCoset[22])
+ a[31].Mul(&a[31], &twiddlesCoset[22])
+ a[34].Mul(&a[34], &twiddlesCoset[23])
+ a[35].Mul(&a[35], &twiddlesCoset[23])
+ a[38].Mul(&a[38], &twiddlesCoset[24])
+ a[39].Mul(&a[39], &twiddlesCoset[24])
+ a[42].Mul(&a[42], &twiddlesCoset[25])
+ a[43].Mul(&a[43], &twiddlesCoset[25])
+ a[46].Mul(&a[46], &twiddlesCoset[26])
+ a[47].Mul(&a[47], &twiddlesCoset[26])
+ a[50].Mul(&a[50], &twiddlesCoset[27])
+ a[51].Mul(&a[51], &twiddlesCoset[27])
+ a[54].Mul(&a[54], &twiddlesCoset[28])
+ a[55].Mul(&a[55], &twiddlesCoset[28])
+ a[58].Mul(&a[58], &twiddlesCoset[29])
+ a[59].Mul(&a[59], &twiddlesCoset[29])
+ a[62].Mul(&a[62], &twiddlesCoset[30])
+ a[63].Mul(&a[63], &twiddlesCoset[30])
+ fr.Butterfly(&a[0], &a[2])
+ fr.Butterfly(&a[1], &a[3])
+ fr.Butterfly(&a[4], &a[6])
+ fr.Butterfly(&a[5], &a[7])
+ fr.Butterfly(&a[8], &a[10])
+ fr.Butterfly(&a[9], &a[11])
+ fr.Butterfly(&a[12], &a[14])
+ fr.Butterfly(&a[13], &a[15])
+ fr.Butterfly(&a[16], &a[18])
+ fr.Butterfly(&a[17], &a[19])
+ fr.Butterfly(&a[20], &a[22])
+ fr.Butterfly(&a[21], &a[23])
+ fr.Butterfly(&a[24], &a[26])
+ fr.Butterfly(&a[25], &a[27])
+ fr.Butterfly(&a[28], &a[30])
+ fr.Butterfly(&a[29], &a[31])
+ fr.Butterfly(&a[32], &a[34])
+ fr.Butterfly(&a[33], &a[35])
+ fr.Butterfly(&a[36], &a[38])
+ fr.Butterfly(&a[37], &a[39])
+ fr.Butterfly(&a[40], &a[42])
+ fr.Butterfly(&a[41], &a[43])
+ fr.Butterfly(&a[44], &a[46])
+ fr.Butterfly(&a[45], &a[47])
+ fr.Butterfly(&a[48], &a[50])
+ fr.Butterfly(&a[49], &a[51])
+ fr.Butterfly(&a[52], &a[54])
+ fr.Butterfly(&a[53], &a[55])
+ fr.Butterfly(&a[56], &a[58])
+ fr.Butterfly(&a[57], &a[59])
+ fr.Butterfly(&a[60], &a[62])
+ fr.Butterfly(&a[61], &a[63])
+ a[1].Mul(&a[1], &twiddlesCoset[31])
+ a[3].Mul(&a[3], &twiddlesCoset[32])
+ a[5].Mul(&a[5], &twiddlesCoset[33])
+ a[7].Mul(&a[7], &twiddlesCoset[34])
+ a[9].Mul(&a[9], &twiddlesCoset[35])
+ a[11].Mul(&a[11], &twiddlesCoset[36])
+ a[13].Mul(&a[13], &twiddlesCoset[37])
+ a[15].Mul(&a[15], &twiddlesCoset[38])
+ a[17].Mul(&a[17], &twiddlesCoset[39])
+ a[19].Mul(&a[19], &twiddlesCoset[40])
+ a[21].Mul(&a[21], &twiddlesCoset[41])
+ a[23].Mul(&a[23], &twiddlesCoset[42])
+ a[25].Mul(&a[25], &twiddlesCoset[43])
+ a[27].Mul(&a[27], &twiddlesCoset[44])
+ a[29].Mul(&a[29], &twiddlesCoset[45])
+ a[31].Mul(&a[31], &twiddlesCoset[46])
+ a[33].Mul(&a[33], &twiddlesCoset[47])
+ a[35].Mul(&a[35], &twiddlesCoset[48])
+ a[37].Mul(&a[37], &twiddlesCoset[49])
+ a[39].Mul(&a[39], &twiddlesCoset[50])
+ a[41].Mul(&a[41], &twiddlesCoset[51])
+ a[43].Mul(&a[43], &twiddlesCoset[52])
+ a[45].Mul(&a[45], &twiddlesCoset[53])
+ a[47].Mul(&a[47], &twiddlesCoset[54])
+ a[49].Mul(&a[49], &twiddlesCoset[55])
+ a[51].Mul(&a[51], &twiddlesCoset[56])
+ a[53].Mul(&a[53], &twiddlesCoset[57])
+ a[55].Mul(&a[55], &twiddlesCoset[58])
+ a[57].Mul(&a[57], &twiddlesCoset[59])
+ a[59].Mul(&a[59], &twiddlesCoset[60])
+ a[61].Mul(&a[61], &twiddlesCoset[61])
+ a[63].Mul(&a[63], &twiddlesCoset[62])
+ fr.Butterfly(&a[0], &a[1])
+ fr.Butterfly(&a[2], &a[3])
+ fr.Butterfly(&a[4], &a[5])
+ fr.Butterfly(&a[6], &a[7])
+ fr.Butterfly(&a[8], &a[9])
+ fr.Butterfly(&a[10], &a[11])
+ fr.Butterfly(&a[12], &a[13])
+ fr.Butterfly(&a[14], &a[15])
+ fr.Butterfly(&a[16], &a[17])
+ fr.Butterfly(&a[18], &a[19])
+ fr.Butterfly(&a[20], &a[21])
+ fr.Butterfly(&a[22], &a[23])
+ fr.Butterfly(&a[24], &a[25])
+ fr.Butterfly(&a[26], &a[27])
+ fr.Butterfly(&a[28], &a[29])
+ fr.Butterfly(&a[30], &a[31])
+ fr.Butterfly(&a[32], &a[33])
+ fr.Butterfly(&a[34], &a[35])
+ fr.Butterfly(&a[36], &a[37])
+ fr.Butterfly(&a[38], &a[39])
+ fr.Butterfly(&a[40], &a[41])
+ fr.Butterfly(&a[42], &a[43])
+ fr.Butterfly(&a[44], &a[45])
+ fr.Butterfly(&a[46], &a[47])
+ fr.Butterfly(&a[48], &a[49])
+ fr.Butterfly(&a[50], &a[51])
+ fr.Butterfly(&a[52], &a[53])
+ fr.Butterfly(&a[54], &a[55])
+ fr.Butterfly(&a[56], &a[57])
+ fr.Butterfly(&a[58], &a[59])
+ fr.Butterfly(&a[60], &a[61])
+ fr.Butterfly(&a[62], &a[63])
+}
+
+// precomputeTwiddlesCoset precomputes twiddlesCoset from twiddles and coset table
+// it then return all elements in the correct order for the unrolled FFT.
+func precomputeTwiddlesCoset(twiddles [][]fr.Element, shifter fr.Element) []fr.Element {
+ r := make([][]fr.Element, len(twiddles))
+ for i := 0; i < len(twiddles); i++ {
+ r[i] = make([]fr.Element, len(twiddles[i]))
+ s := shifter
+ for k := 0; k < i; k++ {
+ s.Mul(&s, &s)
+ }
+ for j := 0; j < len(twiddles[i]); j++ {
+ r[i][j].Mul(&twiddles[i][j], &s)
+ }
+ }
+ toReturn := make([]fr.Element, 0, 63)
+
+ toReturn = append(toReturn, r[5][0])
+ toReturn = append(toReturn, r[4][0])
+ toReturn = append(toReturn, r[4][1])
+ toReturn = append(toReturn, r[3][0])
+ toReturn = append(toReturn, r[3][2])
+ toReturn = append(toReturn, r[3][1])
+ toReturn = append(toReturn, r[3][3])
+ toReturn = append(toReturn, r[2][0])
+ toReturn = append(toReturn, r[2][4])
+ toReturn = append(toReturn, r[2][2])
+ toReturn = append(toReturn, r[2][6])
+ toReturn = append(toReturn, r[2][1])
+ toReturn = append(toReturn, r[2][5])
+ toReturn = append(toReturn, r[2][3])
+ toReturn = append(toReturn, r[2][7])
+ toReturn = append(toReturn, r[1][0])
+ toReturn = append(toReturn, r[1][8])
+ toReturn = append(toReturn, r[1][4])
+ toReturn = append(toReturn, r[1][12])
+ toReturn = append(toReturn, r[1][2])
+ toReturn = append(toReturn, r[1][10])
+ toReturn = append(toReturn, r[1][6])
+ toReturn = append(toReturn, r[1][14])
+ toReturn = append(toReturn, r[1][1])
+ toReturn = append(toReturn, r[1][9])
+ toReturn = append(toReturn, r[1][5])
+ toReturn = append(toReturn, r[1][13])
+ toReturn = append(toReturn, r[1][3])
+ toReturn = append(toReturn, r[1][11])
+ toReturn = append(toReturn, r[1][7])
+ toReturn = append(toReturn, r[1][15])
+ toReturn = append(toReturn, r[0][0])
+ toReturn = append(toReturn, r[0][16])
+ toReturn = append(toReturn, r[0][8])
+ toReturn = append(toReturn, r[0][24])
+ toReturn = append(toReturn, r[0][4])
+ toReturn = append(toReturn, r[0][20])
+ toReturn = append(toReturn, r[0][12])
+ toReturn = append(toReturn, r[0][28])
+ toReturn = append(toReturn, r[0][2])
+ toReturn = append(toReturn, r[0][18])
+ toReturn = append(toReturn, r[0][10])
+ toReturn = append(toReturn, r[0][26])
+ toReturn = append(toReturn, r[0][6])
+ toReturn = append(toReturn, r[0][22])
+ toReturn = append(toReturn, r[0][14])
+ toReturn = append(toReturn, r[0][30])
+ toReturn = append(toReturn, r[0][1])
+ toReturn = append(toReturn, r[0][17])
+ toReturn = append(toReturn, r[0][9])
+ toReturn = append(toReturn, r[0][25])
+ toReturn = append(toReturn, r[0][5])
+ toReturn = append(toReturn, r[0][21])
+ toReturn = append(toReturn, r[0][13])
+ toReturn = append(toReturn, r[0][29])
+ toReturn = append(toReturn, r[0][3])
+ toReturn = append(toReturn, r[0][19])
+ toReturn = append(toReturn, r[0][11])
+ toReturn = append(toReturn, r[0][27])
+ toReturn = append(toReturn, r[0][7])
+ toReturn = append(toReturn, r[0][23])
+ toReturn = append(toReturn, r[0][15])
+ toReturn = append(toReturn, r[0][31])
+ return toReturn
+}
diff --git a/ecc/bn254/fr/sis/sis_test.go b/ecc/bn254/fr/sis/sis_test.go
index 6925c7c9e..ec5f234e7 100644
--- a/ecc/bn254/fr/sis/sis_test.go
+++ b/ecc/bn254/fr/sis/sis_test.go
@@ -21,10 +21,13 @@ import (
"fmt"
"io"
"io/ioutil"
+ "math/big"
"math/bits"
+ "math/rand"
"testing"
"time"
+ "github.com/bits-and-blooms/bitset"
"github.com/consensys/gnark-crypto/ecc/bn254/fr"
"github.com/consensys/gnark-crypto/ecc/bn254/fr/fft"
"github.com/stretchr/testify/require"
@@ -38,6 +41,7 @@ var params128Bits []sisParams = []sisParams{
{logTwoBound: 2, logTwoDegree: 3},
{logTwoBound: 4, logTwoDegree: 4},
{logTwoBound: 6, logTwoDegree: 5},
+ {logTwoBound: 8, logTwoDegree: 6},
{logTwoBound: 10, logTwoDegree: 6},
{logTwoBound: 16, logTwoDegree: 7},
{logTwoBound: 32, logTwoDegree: 8},
@@ -374,85 +378,61 @@ func (r *RSis) Hash(v []fr.Element) ([]fr.Element, error) {
return result, nil
}
-// Hash version without mem copy
-// // Hash interprets the input vector as a sequence of coefficients of size r.LogTwoBound bits long,
-// // and return the hash of the polynomial corresponding to the sum sum_i A[i]*m Mod X^{d}+1
-// //
-// // It is equivalent to calling r.Write(element.Marshal()); outBytes = r.Sum(nil);
-// func (r *RSis) Hash(v []fr.Element) ([]fr.Element, error) {
-// if len(v) > r.maxNbElementsToHash {
-// return nil, fmt.Errorf("can't hash more than %d elements with params provided in constructor", r.maxNbElementsToHash)
-// }
-
-// // clear the buffers of the instance.
-// defer func() {
-// r.bufMValues.ClearAll()
-// for i := 0; i < len(r.bufM); i++ {
-// r.bufM[i].SetZero()
-// }
-// }()
-
-// // bitwise decomposition of the buffer, in order to build m (the vector to hash)
-// // as a list of polynomials, whose coefficients are less than r.B bits long.
-
-// bitAt := func(v []fr.Element, i int) uint8 {
-// // v --> slice of bits
-// // return bit at position i
-// const n = fr.Bytes * 8 // nb bits per element
-// nbBits := len(v) * n
-
-// if i >= nbBits {
-// return 0
-// }
-
-// eIndex := i / n
-// i %= n
-
-// // we want bit i of v[eIndex]
-// j := i / 64
-// return uint8(v[eIndex][j] >> (i % 64) & 1)
-
-// }
-
-// // now we can construct m. The input to hash consists of the polynomials
-// // m[k*r.Degree:(k+1)*r.Degree]
-// m := r.bufM
-
-// // mark blocks m[i*r.Degree : (i+1)*r.Degree] != [0...0]
-// mValues := r.bufMValues
-
-// // we process the input buffer by blocks of r.LogTwoBound bits
-// // each of these block (<< 64bits) are interpreted as a coefficient
-// mPos := 0
-// nbBits := len(v) * fr.Bytes * 8
-// for i := 0; i < nbBits; mPos++ {
-// for j := 0; j < r.LogTwoBound; j++ {
-// // r.LogTwoBound < 64; we just use the first word of our element here,
-// // and set the bits from LSB to MSB.
-// m[mPos][0] |= uint64(bitAt(v, i) << j)
-// i++
-// }
-// if m[mPos][0] == 0 {
-// continue
-// }
-// mValues.Set(uint(mPos / r.Degree))
-// }
-
-// // we can hash now.
-// res := make(fr.Vector, r.Degree)
-
-// // method 1: fft
-// for i := 0; i < len(r.Ag); i++ {
-// if !mValues.Test(uint(i)) {
-// // means m[i*r.Degree : (i+1)*r.Degree] == [0...0]
-// // we can skip this, FFT(0) = 0
-// continue
-// }
-// k := m[i*r.Degree : (i+1)*r.Degree]
-// r.Domain.FFT(k, fft.DIF, fft.OnCoset(), fft.WithNbTasks(1))
-// mulModAcc(res, r.Ag[i], k)
-// }
-// r.Domain.FFTInverse(res, fft.DIT, fft.OnCoset(), fft.WithNbTasks(1)) // -> reduces mod Xᵈ+1
-
-// return res, nil
-// }
+func TestLimbDecompositionFastPath(t *testing.T) {
+ assert := require.New(t)
+
+ for size := fr.Bytes; size < 5*fr.Bytes; size += fr.Bytes {
+ // Test the fast path of limbDecomposeBytes8_64
+ buf := make([]byte, size)
+ m := make([]fr.Element, size)
+ mValues := bitset.New(uint(size))
+ n := make([]fr.Element, size)
+ nValues := bitset.New(uint(size))
+
+ // Generate a random buffer
+ rand.Seed(time.Now().UnixNano()) //#nosec G404 weak rng is fine here
+ _, err := rand.Read(buf) //#nosec G404 weak rng is fine here
+ assert.NoError(err)
+
+ limbDecomposeBytes8_64(buf, m, mValues)
+ limbDecomposeBytes(buf, n, 8, 64, nValues)
+
+ for i := 0; i < size; i++ {
+ assert.Equal(mValues.Test(uint(i)), nValues.Test(uint(i)))
+ assert.True(m[i].Equal(&n[i]))
+ }
+ }
+
+}
+
+func TestUnrolledFFT(t *testing.T) {
+
+ var shift fr.Element
+ shift.SetString("19103219067921713944291392827692070036145651957329286315305642004821462161904") // -> 2²⁸-th root of unity of bn254
+ e := int64(1 << (28 - (6 + 1)))
+ shift.Exp(shift, big.NewInt(e))
+
+ const size = 64
+ assert := require.New(t)
+ domain := fft.NewDomain(size, shift)
+
+ k1 := make([]fr.Element, size)
+ for i := 0; i < size; i++ {
+ k1[i].SetRandom()
+ }
+ k2 := make([]fr.Element, size)
+ copy(k2, k1)
+
+ // default FFT
+ domain.FFT(k1, fft.DIF, fft.OnCoset(), fft.WithNbTasks(1))
+
+ // unrolled FFT
+ twiddlesCoset := precomputeTwiddlesCoset(domain.Twiddles, domain.FrMultiplicativeGen)
+ fft64(k2, twiddlesCoset)
+
+ // compare results
+ for i := 0; i <