Revert ECDSA hash/packing logic to previous iteration #1669
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -212,33 +212,32 @@ function equals(p1: Point, p2: point, Curve: { modulus: bigint }) { | |||||
| return xEquals.and(yEquals); | ||||||
| } | ||||||
|
|
||||||
| function verifyEcdsaGeneric( | ||||||
|
There was a problem hiding this comment. Refactored some of the duplicated logic between both verify functions and specified behaviour with a |
||||||
| Curve: CurveAffine, | ||||||
| signature: Ecdsa.Signature, | ||||||
| msgHash: Field3, | ||||||
| publicKey: Point, | ||||||
| multiScalarMul: ( | ||||||
|
There was a problem hiding this comment. Adds a parameter to specify the version of |
||||||
| scalars: Field3[], | ||||||
| points: Point[], | ||||||
| Curve: CurveAffine, | ||||||
| tableConfigs?: ( | ||||||
| | { | ||||||
| windowSize?: number; | ||||||
| multiples?: Point[]; | ||||||
| } | ||||||
| | undefined | ||||||
| )[], | ||||||
| mode?: 'assert-nonzero' | 'assert-zero', | ||||||
| ia?: point, | ||||||
| hashed?: boolean | ||||||
| ) => Point, | ||||||
| config: { | ||||||
| G?: { windowSize: number; multiples?: Point[] }; | ||||||
| P?: { windowSize: number; multiples?: Point[] }; | ||||||
| ia?: point; | ||||||
| } = { G: { windowSize: 4 }, P: { windowSize: 4 } } | ||||||
| ): Bool { | ||||||
| // constant case | ||||||
| if ( | ||||||
| EcdsaSignature.isConstant(signature) && | ||||||
|
|
@@ -285,6 +284,83 @@ function verifyEcdsa( | |||||
| return Provable.equal(Field3.provable, Rx, r); | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Verify an ECDSA signature. | ||||||
| * | ||||||
| * Details about the `config` parameter: | ||||||
| * - For both the generator point `G` and public key `P`, `config` allows you to specify: | ||||||
| * - the `windowSize` which is used in scalar multiplication for this point. | ||||||
| * this flexibility is good because the optimal window size is different for constant and non-constant points. | ||||||
| * empirically, `windowSize=4` for constants and 3 for variables leads to the fewest constraints. | ||||||
| * our defaults reflect that the generator is always constant and the public key is variable in typical applications. | ||||||
| * - a table of multiples of those points, of length `2^windowSize`, which is used in the scalar multiplication gadget to speed up the computation. | ||||||
| * if these are not provided, they are computed on the fly. | ||||||
| * for the constant G, computing multiples costs no constraints, so passing them in makes no real difference. | ||||||
| * for variable public key, there is a possible use case: if the public key is a public input, then its multiples could also be. | ||||||
| * in that case, passing them in would avoid computing them in-circuit and save a few constraints. | ||||||
| * - The initial aggregator `ia`, see {@link initialAggregator}. By default, `ia` is computed deterministically on the fly. | ||||||
| * @deprecated There is a security vulnerability with this function, allowing a prover to modify witness values than what is expected. Use {@link verifyEcdsaV2} instead. | ||||||
|
There was a problem hiding this comment. could you completely remove any other doccomments here except the deprecation notice? we don't want to encourage people to use it |
||||||
| */ | ||||||
| function verifyEcdsa( | ||||||
| Curve: CurveAffine, | ||||||
| signature: Ecdsa.Signature, | ||||||
| msgHash: Field3, | ||||||
| publicKey: Point, | ||||||
| config: { | ||||||
| G?: { windowSize: number; multiples?: Point[] }; | ||||||
| P?: { windowSize: number; multiples?: Point[] }; | ||||||
| ia?: point; | ||||||
| } = { G: { windowSize: 4 }, P: { windowSize: 4 } } | ||||||
| ) { | ||||||
| return verifyEcdsaGeneric( | ||||||
| Curve, | ||||||
| signature, | ||||||
| msgHash, | ||||||
| publicKey, | ||||||
| (scalars, points, Curve, configs, mode, ia) => | ||||||
| multiScalarMul(scalars, points, Curve, configs, mode, ia, true), | ||||||
| config | ||||||
| ); | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Verify an ECDSA signature. | ||||||
| * | ||||||
| * Details about the `config` parameter: | ||||||
| * - For both the generator point `G` and public key `P`, `config` allows you to specify: | ||||||
| * - the `windowSize` which is used in scalar multiplication for this point. | ||||||
| * this flexibility is good because the optimal window size is different for constant and non-constant points. | ||||||
| * empirically, `windowSize=4` for constants and 3 for variables leads to the fewest constraints. | ||||||
| * our defaults reflect that the generator is always constant and the public key is variable in typical applications. | ||||||
| * - a table of multiples of those points, of length `2^windowSize`, which is used in the scalar multiplication gadget to speed up the computation. | ||||||
| * if these are not provided, they are computed on the fly. | ||||||
| * for the constant G, computing multiples costs no constraints, so passing them in makes no real difference. | ||||||
| * for variable public key, there is a possible use case: if the public key is a public input, then its multiples could also be. | ||||||
| * in that case, passing them in would avoid computing them in-circuit and save a few constraints. | ||||||
| * - The initial aggregator `ia`, see {@link initialAggregator}. By default, `ia` is computed deterministically on the fly. | ||||||
| */ | ||||||
| function verifyEcdsaV2( | ||||||
| Curve: CurveAffine, | ||||||
| signature: Ecdsa.Signature, | ||||||
| msgHash: Field3, | ||||||
| publicKey: Point, | ||||||
| config: { | ||||||
| G?: { windowSize: number; multiples?: Point[] }; | ||||||
| P?: { windowSize: number; multiples?: Point[] }; | ||||||
| ia?: point; | ||||||
| } = { G: { windowSize: 4 }, P: { windowSize: 4 } } | ||||||
|
There was a problem hiding this comment. could you try changing the default back to this?
Suggested change
it should use fewer constraints There was a problem hiding this comment. Fixed here! Here is the lower constraints |
||||||
| ) { | ||||||
| return verifyEcdsaGeneric( | ||||||
| Curve, | ||||||
| signature, | ||||||
| msgHash, | ||||||
| publicKey, | ||||||
| (scalars, points, Curve, configs, mode, ia) => | ||||||
| multiScalarMul(scalars, points, Curve, configs, mode, ia, false), | ||||||
| config | ||||||
| ); | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Bigint implementation of ECDSA verify | ||||||
| */ | ||||||
|
|
@@ -311,6 +387,36 @@ function verifyEcdsaConstant( | |||||
| return Curve.Scalar.equal(R.x, r); | ||||||
| } | ||||||
|
|
||||||
| function multiScalarMulConstant( | ||||||
| scalars: Field3[], | ||||||
| points: Point[], | ||||||
| Curve: CurveAffine, | ||||||
| mode: 'assert-nonzero' | 'assert-zero' = 'assert-nonzero' | ||||||
| ): Point { | ||||||
| let n = points.length; | ||||||
| assert(scalars.length === n, 'Points and scalars lengths must match'); | ||||||
| assertPositiveInteger(n, 'Expected at least 1 point and scalar'); | ||||||
| let useGlv = Curve.hasEndomorphism; | ||||||
|
|
||||||
| // TODO dedicated MSM | ||||||
| let s = scalars.map(Field3.toBigint); | ||||||
| let P = points.map(Point.toBigint); | ||||||
| let sum = Curve.zero; | ||||||
| for (let i = 0; i < n; i++) { | ||||||
| if (useGlv) { | ||||||
| sum = Curve.add(sum, Curve.Endo.scale(P[i], s[i])); | ||||||
| } else { | ||||||
| sum = Curve.add(sum, Curve.scale(P[i], s[i])); | ||||||
| } | ||||||
| } | ||||||
| if (mode === 'assert-zero') { | ||||||
| assert(sum.infinity, 'scalar multiplication: expected zero result'); | ||||||
| return Point.from(Curve.zero); | ||||||
| } | ||||||
| assert(!sum.infinity, 'scalar multiplication: expected non-zero result'); | ||||||
| return Point.from(sum); | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
| * Multi-scalar multiplication: | ||||||
| * | ||||||
|
|
@@ -339,7 +445,8 @@ function multiScalarMul( | |||||
| | undefined | ||||||
| )[] = [], | ||||||
| mode: 'assert-nonzero' | 'assert-zero' = 'assert-nonzero', | ||||||
| ia?: point, | ||||||
| hashed: boolean = true | ||||||
| ): Point { | ||||||
| let n = points.length; | ||||||
| assert(scalars.length === n, 'Points and scalars lengths must match'); | ||||||
|
|
@@ -348,23 +455,7 @@ function multiScalarMul( | |||||
|
|
||||||
| // constant case | ||||||
| if (scalars.every(Field3.isConstant) && points.every(Point.isConstant)) { | ||||||
| return multiScalarMulConstant(scalars, points, Curve, mode); | ||||||
| } | ||||||
|
|
||||||
| // parse or build point tables | ||||||
|
|
@@ -444,14 +535,22 @@ function multiScalarMul( | |||||
| if (i % windowSize === 0) { | ||||||
| // pick point to add based on the scalar chunk | ||||||
| let sj = scalarChunks[j][i / windowSize]; | ||||||
| let sjP; | ||||||
| if (hashed) { | ||||||
| sjP = | ||||||
| windowSize === 1 | ||||||
| ? points[j] | ||||||
| : arrayGetGeneric( | ||||||
| HashedPoint.provable, | ||||||
| hashedTables[j], | ||||||
|
There was a problem hiding this comment. it costs constraints to create the could you also add a check there and make it an empty array when |
||||||
| sj | ||||||
| ).unhash(); | ||||||
| } else { | ||||||
| sjP = | ||||||
| windowSize === 1 | ||||||
| ? points[j] | ||||||
| : arrayGetGeneric(Point.provable, tables[j], sj); | ||||||
| } | ||||||
|
|
||||||
| // ec addition | ||||||
| let added = add(sum, sjP, Curve); | ||||||
|
|
@@ -725,6 +824,7 @@ const EcdsaSignature = { | |||||
| const Ecdsa = { | ||||||
| sign: signEcdsa, | ||||||
| verify: verifyEcdsa, | ||||||
| verifyV2: verifyEcdsaV2, | ||||||
| Signature: EcdsaSignature, | ||||||
| }; | ||||||
|
|
||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
could you completely remove any other doccomments here except the deprecation notice? we don't want to encourage people to use it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed