tornado-packages/ethers.js
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More robust support for Signatures with less standard parameter values (#3835, #4228).

Browse Source
This commit is contained in:
Richard Moore 2023-07-16 00:33:50 -04:00
parent 330c318773
commit a7e4048fe3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src.ts/crypto/signature.ts
View File

@ -7,7 +7,7 @@ import {
} from "../utils/index.js"; } from "../utils/index.js";
import type { import type {
BigNumberish, BytesLike BigNumberish, BytesLike, Numeric
} from "../utils/index.js"; } from "../utils/index.js";
@ -325,7 +325,7 @@ export class Signature {
assertError((getBytes(s)[0] & 0x80) == 0, "non-canonical s"); assertError((getBytes(s)[0] & 0x80) == 0, "non-canonical s");
// Get v; by any means necessary (we check consistency below) // Get v; by any means necessary (we check consistency below)
const { networkV, v } = (function(_v?: BigNumberish, yParityAndS?: string, yParity?: number): { networkV?: bigint, v: 27 | 28 } { const { networkV, v } = (function(_v?: BigNumberish, yParityAndS?: string, yParity?: Numeric): { networkV?: bigint, v: 27 | 28 } {
if (_v != null) { if (_v != null) {
const v = getBigInt(_v); const v = getBigInt(_v);
return { return {
@ -340,7 +340,7 @@ export class Signature {
} }
if (yParity != null) { if (yParity != null) {
switch (yParity) { switch (getNumber(yParity, "sig.yParity")) {
case 0: return { v: 27 }; case 0: return { v: 27 };
case 1: return { v: 28 }; case 1: return { v: 28 };
} }
@ -354,8 +354,8 @@ export class Signature {
if (networkV) { result.#networkV = networkV; } if (networkV) { result.#networkV = networkV; }
// If multiple of v, yParity, yParityAndS we given, check they match // If multiple of v, yParity, yParityAndS we given, check they match
assertError(!("yParity" in sig && sig.yParity !== result.yParity), "yParity mismatch"); assertError(sig.yParity == null || getNumber(sig.yParity, "sig.yParity") === result.yParity, "yParity mismatch");
assertError(!("yParityAndS" in sig && sig.yParityAndS !== result.yParityAndS), "yParityAndS mismatch"); assertError(sig.yParityAndS == null || sig.yParityAndS === result.yParityAndS, "yParityAndS mismatch");
return result; return result;
} }