From 2820903f591365b17a4c3bdb36bd49ee2d84054c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ula=C5=9F=20Erdo=C4=9Fan?= <uerdogan2001@hotmail.com>
Date: Fri, 23 Jun 2023 01:13:27 +0300
Subject: [PATCH] core, crypto/secp256r1: fix error reverts tx error

---
 core/vm/contracts.go         |  8 +++++++-
 crypto/secp256r1/verifier.go | 20 +++++++++++---------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/core/vm/contracts.go b/core/vm/contracts.go
index c62b43cf22..0d63721425 100644
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@@ -1166,5 +1166,11 @@ func (c *p256Verify) Run(input []byte) ([]byte, error) {
 	x, y := new(big.Int).SetBytes(input[96:128]), new(big.Int).SetBytes(input[128:160])
 
 	// Verify the secp256r1 signature
-	return secp256r1.Verify(hash, r, s, x, y)
+	if secp256r1.Verify(hash, r, s, x, y) {
+		// Signature is valid
+		return common.LeftPadBytes(common.Big1.Bytes(), 32), nil
+	} else {
+		// Signature is invalid
+		return nil, nil
+	}
 }
diff --git a/crypto/secp256r1/verifier.go b/crypto/secp256r1/verifier.go
index 9db2d5b930..e45d49e352 100644
--- a/crypto/secp256r1/verifier.go
+++ b/crypto/secp256r1/verifier.go
@@ -3,34 +3,36 @@ package secp256r1
 import (
 	"crypto/ecdsa"
 	"crypto/elliptic"
-	"errors"
 	"math/big"
-
-	"github.com/ethereum/go-ethereum/common"
 )
 
 var (
+	// Half of the order of the subgroup in the elliptic curve
 	secp256k1halfN = new(big.Int).Div(elliptic.P256().Params().N, big.NewInt(2))
 )
 
 // Verifies the given signature (r, s) for the given hash and public key (x, y).
-func Verify(hash []byte, r, s, x, y *big.Int) ([]byte, error) {
+func Verify(hash []byte, r, s, x, y *big.Int) bool {
 	// Create the public key format
 	publicKey := newPublicKey(x, y)
+
+	// Check if they are invalid public key coordinates
 	if publicKey == nil {
-		return nil, errors.New("invalid public key coordinates")
+		return false
 	}
 
+	// Check the malleability issue
 	if checkMalleability(s) {
-		return nil, errors.New("malleability issue")
+		return false
 	}
 
-	// Verify the signature with the public key and return 1 if it's valid, 0 otherwise
+	// Verify the signature with the public key,
+	// then return true if it's valid, false otherwise
 	if ok := ecdsa.Verify(publicKey, hash, r, s); ok {
-		return common.LeftPadBytes(common.Big1.Bytes(), 32), nil
+		return true
 	}
 
-	return common.LeftPadBytes(common.Big0.Bytes(), 32), nil
+	return false
 }
 
 // Check the malleability issue