Avoid assembly in signature V and S decomposition (#3060)

* Avoid assembly in signature V and S decomposition * Update ECDSA.sol

Avoid assembly in signature V and S decomposition (#3060)
* Avoid assembly in signature V and S decomposition * Update ECDSA.sol
da3a9ae1 · Anton Bukov · GitHub · e3391cd6 · da3a9ae1
Unverified Commit da3a9ae1 authored Dec 29, 2021 by Anton Bukov Committed by GitHub Dec 29, 2021
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

ECDSA.sol contracts/utils/cryptography/ECDSA.sol +2 -6

No files found.
--- a/contracts/utils/cryptography/ECDSA.sol
+++ b/contracts/utils/cryptography/ECDSA.sol
@@ -117,12 +117,8 @@ library ECDSA {
        bytes32 r,
        bytes32 vs
    ) internal pure returns (address, RecoverError) {
-        bytes32 s;
+        bytes32 s = vs & bytes32(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff);
-        uint8 v;
+        uint8 v = uint8((uint256(vs) >> 255) + 27);
-        assembly {
-            s := and(vs, 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
-            v := add(shr(255, vs), 27)
-        }
        return tryRecover(hash, v, r, s);
    }