Fixed splitSignature logic for verifying EIP-2930 and EIP-1559 v (ethers-io#2084).

ricmoo · ricmoo · commit 3de1b815014b · 2021-10-17T22:56:57.000-04:00
diff --git a/packages/bytes/src.ts/index.ts b/packages/bytes/src.ts/index.ts
@@ -406,8 +406,11 @@ export function splitSignature(signature: SignatureLike): Signature {
         } else {
             if (result.v == null) {
                 result.v = 27 + result.recoveryParam;
-            } else if (result.recoveryParam !== (1 - (result.v % 2))) {
-                logger.throwArgumentError("signature recoveryParam mismatch v", "signature", signature);
+            } else {
+                const recId = (result.v === 0 || result.v === 1) ? result.v :(1 - (result.v % 2));
+                if (result.recoveryParam !== recId) {
+                    logger.throwArgumentError("signature recoveryParam mismatch v", "signature", signature);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -406,8 +406,11 @@ export function splitSignature(signature: SignatureLike): Signature {`
`406`	`406`	`} else {`
`407`	`407`	`if (result.v == null) {`
`408`	`408`	`result.v = 27 + result.recoveryParam;`
`409`		`- } else if (result.recoveryParam !== (1 - (result.v % 2))) {`
`410`		`- logger.throwArgumentError("signature recoveryParam mismatch v", "signature", signature);`
	`409`	`+ } else {`
	`410`	`+ const recId = (result.v === 0 \|\| result.v === 1) ? result.v :(1 - (result.v % 2));`
	`411`	`+ if (result.recoveryParam !== recId) {`
	`412`	`+ logger.throwArgumentError("signature recoveryParam mismatch v", "signature", signature);`
	`413`	`+ }`
`411`	`414`	`}`
`412`	`415`	`}`
`413`	`416`