erge branch 'master' of github.com:ConsenSys/gnark

Consensys · Oct 12, 2023 · 61b5e9c · 61b5e9c
2 parents 80fb122 + 438d154
commit 61b5e9c
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 23 deletions.
diff --git a/backend/groth16/bn254/solidity.go b/backend/groth16/bn254/solidity.go
@@ -422,7 +422,7 @@ contract Verifier {
     /// @notice Reverts with InvalidProof if the proof is invalid or
     /// with PublicInputNotInField the public input is not reduced.
     /// @notice There is no return value. If the function does not revert, the
-    /// proof was succesfully verified.
+    /// proof was successfully verified.
     /// @param compressedProof the points (A, B, C) in compressed format
     /// matching the output of compressProof.
     /// @param input the public input field elements in the scalar field Fr.
@@ -487,7 +487,7 @@ contract Verifier {
     /// @notice Reverts with InvalidProof if the proof is invalid or
     /// with PublicInputNotInField the public input is not reduced.
     /// @notice There is no return value. If the function does not revert, the
-    /// proof was succesfully verified.
+    /// proof was successfully verified.
     /// @param proof the points (A, B, C) in EIP-197 format matching the output
     /// of compressProof.
     /// @param input the public input field elements in the scalar field Fr.

diff --git a/backend/plonk/bls12-377/setup.go b/backend/plonk/bls12-377/setup.go
diff --git a/backend/plonk/bls12-381/setup.go b/backend/plonk/bls12-381/setup.go
diff --git a/backend/plonk/bls24-315/setup.go b/backend/plonk/bls24-315/setup.go
diff --git a/backend/plonk/bls24-317/setup.go b/backend/plonk/bls24-317/setup.go
diff --git a/backend/plonk/bn254/setup.go b/backend/plonk/bn254/setup.go
diff --git a/backend/plonk/bn254/solidity.go b/backend/plonk/bn254/solidity.go
diff --git a/backend/plonk/bw6-633/setup.go b/backend/plonk/bw6-633/setup.go
diff --git a/backend/plonk/bw6-761/setup.go b/backend/plonk/bw6-761/setup.go
diff --git a/backend/plonkfri/bls12-377/setup.go b/backend/plonkfri/bls12-377/setup.go
diff --git a/backend/plonkfri/bls12-381/setup.go b/backend/plonkfri/bls12-381/setup.go
diff --git a/backend/plonkfri/bls24-315/setup.go b/backend/plonkfri/bls24-315/setup.go
diff --git a/backend/plonkfri/bls24-317/setup.go b/backend/plonkfri/bls24-317/setup.go
diff --git a/backend/plonkfri/bn254/setup.go b/backend/plonkfri/bn254/setup.go
diff --git a/backend/plonkfri/bw6-633/setup.go b/backend/plonkfri/bw6-633/setup.go
diff --git a/backend/plonkfri/bw6-761/setup.go b/backend/plonkfri/bw6-761/setup.go
diff --git a/constraint/core.go b/constraint/core.go
@@ -192,7 +192,7 @@ func (system *System) CheckSerializationHeader() error {
 
 	if binaryVersion.Compare(objectVersion) != 0 {
 		log := logger.Logger()
-		log.Warn().Str("binary", binaryVersion.String()).Str("object", objectVersion.String()).Msg("gnark version (binary) mismatch with constraint system. there are no guarantees on compatibilty")
+		log.Warn().Str("binary", binaryVersion.String()).Str("object", objectVersion.String()).Msg("gnark version (binary) mismatch with constraint system. there are no guarantees on compatibility")
 	}
 
 	// TODO @gbotrel maintain version changes and compare versions properly

diff --git a/examples/rollup/error.go b/examples/rollup/error.go
@@ -20,7 +20,7 @@ import "errors"
 
 var (
 	// ErrSizeByteSlice memory checking
-	ErrSizeByteSlice = errors.New("byte slice size is inconsistant with Account size")
+	ErrSizeByteSlice = errors.New("byte slice size is inconsistent with Account size")
 
 	// ErrNonExistingAccount account not in the database
 	ErrNonExistingAccount = errors.New("the account is not in the rollup database")
@@ -31,7 +31,7 @@ var (
 	// ErrAmountTooHigh the amount is bigger than the balance
 	ErrAmountTooHigh = errors.New("amount is bigger than balance")
 
-	// ErrNonce inconsistant nonce between transfer and account
+	// ErrNonce inconsistent nonce between transfer and account
 	ErrNonce = errors.New("incorrect nonce")
 
 	// ErrIndexConsistency the map publicKey(string) -> index(int) gives acces to the account position.

diff --git a/internal/generator/backend/template/zkpschemes/plonk/plonk.setup.go.tmpl b/internal/generator/backend/template/zkpschemes/plonk/plonk.setup.go.tmpl
@@ -168,7 +168,7 @@ func BuildTrace(spr *cs.SparseR1CS, pt *Trace) {
 	qk := make([]fr.Element, size)
 	qcp := make([][]fr.Element, len(commitmentInfo))
 
-	for i := 0; i < len(spr.Public); i++ { // placeholders (-PUB_INPUT_i + qk_i = 0) TODO should return error is size is inconsistent
+	for i := 0; i < len(spr.Public); i++ { // placeholders (-PUB_INPUT_i + qk_i = 0) TODO should return error if size is inconsistent
 		ql[i].SetOne().Neg(&ql[i])
 		qr[i].SetZero()
 		qm[i].SetZero()

diff --git a/internal/generator/backend/template/zkpschemes/plonkfri/plonk.setup.go.tmpl b/internal/generator/backend/template/zkpschemes/plonkfri/plonk.setup.go.tmpl
@@ -131,7 +131,7 @@ func Setup(spr *cs.SparseR1CS) (*ProvingKey, *VerifyingKey, error) {
 	pk.LQkIncompleteDomainSmall = make([]fr.Element, pk.Domain[0].Cardinality)
 	pk.CQkIncomplete = make([]fr.Element, pk.Domain[0].Cardinality)
 
-	for i := 0; i < len(spr.Public); i++ { // placeholders (-PUB_INPUT_i + qk_i = 0) TODO should return error is size is inconsistant
+	for i := 0; i < len(spr.Public); i++ { // placeholders (-PUB_INPUT_i + qk_i = 0) TODO should return error if size is inconsistent
 		pk.EvaluationQlDomainBigBitReversed[i].SetOne().Neg(&pk.EvaluationQlDomainBigBitReversed[i])
 		pk.EvaluationQrDomainBigBitReversed[i].SetZero()
 		pk.EvaluationQmDomainBigBitReversed[i].SetZero()