Merge pull request ethereum#2 from 0rac1e/symbiosis/master

zksync fix V value in ValidateSignatureValues
nikicat · Apr 7, 2023 · 504602b · 504602b
2 parents 0d8f2ba + 4def81b
commit 504602b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go
@@ -148,11 +148,7 @@ func (t *Transaction) UnmarshalJSON(input []byte) error {
 		itx.S = (*big.Int)(dec.S)
 		withSignature := itx.V.Sign() != 0 || itx.R.Sign() != 0 || itx.S.Sign() != 0
 		if withSignature {
-			mayBeProtected := true
-			if byte(itx.V.Uint64()) < 27 {
-				mayBeProtected = false
-			}
-			if err := sanityCheckSignature(itx.V, itx.R, itx.S, mayBeProtected); err != nil {
+			if err := sanityCheckSignature(itx.V, itx.R, itx.S, true); err != nil {
 				return err
 			}
 		}

diff --git a/crypto/crypto.go b/crypto/crypto.go
@@ -35,7 +35,7 @@ import (
 	"golang.org/x/crypto/sha3"
 )
 
-//SignatureLength indicates the byte length required to carry a signature with recovery id.
+// SignatureLength indicates the byte length required to carry a signature with recovery id.
 const SignatureLength = 64 + 1 // 64 bytes ECDSA signature + 1 byte recovery id
 
 // RecoveryIDOffset points to the byte offset within the signature that contains the recovery id.
@@ -269,6 +269,9 @@ func ValidateSignatureValues(v byte, r, s *big.Int, homestead bool) bool {
 		return false
 	}
 	// Frontier: allow s to be in full N range
+	if v > 1 {
+		v = v + 27
+	}
 	return r.Cmp(secp256k1N) < 0 && s.Cmp(secp256k1N) < 0 && (v == 0 || v == 1)
 }