core/types: don't check chainid before determining if protected

core/types/transaction_signing.go

@@ -114,9 +114,6 @@ func NewEIP2718Signer(chainId *big.Int) EIP2718Signer {
 
 // Sender returns the recovered addressed from a transaction's signature.
 func (s EIP2718Signer) Sender(tx *Transaction) (common.Address, error) {
-	if tx.ChainId().Cmp(s.chainId) != 0 {
-		return common.Address{}, ErrInvalidChainId
-	}
 	V, R, S := tx.RawSignatureValues()
 	if tx.Type() == LegacyTxId {
 		if !tx.Protected() {
@@ -130,6 +127,9 @@ func (s EIP2718Signer) Sender(tx *Transaction) (common.Address, error) {
 		// 27 to become equivalent to unprotected Homestead signatures.
 		V = new(big.Int).Add(V, big.NewInt(27))
 	}
+	if tx.ChainId().Cmp(s.chainId) != 0 {
+		return common.Address{}, ErrInvalidChainId
+	}
 	return recoverPlain(s.Hash(tx), R, S, V, true)
 }