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

Fixed bug parsing raw non-compressed signatures.

Browse Source
This commit is contained in:
Richard Moore 2022-10-20 04:59:20 -04:00
parent 14af51d4e9
commit 5813b316d7
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ const BN_35 = BigInt(35);
const _guard = { }; const _guard = { };
// @TODO: Allow Uint8Array
export type SignatureLike = Signature | string | { export type SignatureLike = Signature | string | {
r: string; r: string;
s: string; s: string;
@ -79,16 +79,7 @@ export class Signature implements Freezable<Signature> {
} }
get yParity(): 0 | 1 { get yParity(): 0 | 1 {
if (this.v === 27) { return 0; } return (this.v === 27) ? 0: 1;
return 1;
/*
// When v is 0 or 1 it is the recid directly
if (this.v.isZero()) { return 0; }
if (this.v.eq(1)) { return 1; }
// Otherwise, odd (e.g. 27) is 0 and even (e.g. 28) is 1
return this.v.and(1).isZero() ? 1: 0;
*/
} }
get yParityAndS(): string { get yParityAndS(): string {
@ -139,9 +130,9 @@ export class Signature implements Freezable<Signature> {
}; };
} }
static create(): Signature { //static create(): Signature {
return new Signature(_guard, ZeroHash, ZeroHash, 27); // return new Signature(_guard, ZeroHash, ZeroHash, 27);
} //}
// Get the chain ID from an EIP-155 v // Get the chain ID from an EIP-155 v
static getChainId(v: BigNumberish): bigint { static getChainId(v: BigNumberish): bigint {
@ -172,7 +163,11 @@ export class Signature implements Freezable<Signature> {
return (bv & BN_1) ? 27: 28; return (bv & BN_1) ? 27: 28;
} }
static from(sig: SignatureLike): Signature { static from(sig?: SignatureLike): Signature {
if (sig == null) {
return new Signature(_guard, ZeroHash, ZeroHash, 27);
}
const throwError = (message: string) => { const throwError = (message: string) => {
return throwArgumentError(message, "signature", sig); return throwArgumentError(message, "signature", sig);
}; };
@ -187,8 +182,8 @@ export class Signature implements Freezable<Signature> {
return new Signature(_guard, r, hexlify(s), v); return new Signature(_guard, r, hexlify(s), v);
} }
if (dataLength(sig) !== 65) { if (bytes.length === 65) {
const r = hexlify(sig.slice(0, 32)); const r = hexlify(bytes.slice(0, 32));
const s = bytes.slice(32, 64); const s = bytes.slice(32, 64);
if (s[0] & 0x80) { throwError("non-canonical s"); } if (s[0] & 0x80) { throwError("non-canonical s"); }
const v = Signature.getNormalizedV(bytes[64]); const v = Signature.getNormalizedV(bytes[64]);