From 349dc1bacdade7dc11add09db38fd087d581c4f2 Mon Sep 17 00:00:00 2001
From: Daniel Liu <liudaniel@qq.com>
Date: Mon, 22 Apr 2024 11:54:05 +0800
Subject: [PATCH] core/types: improve comments in new EIP-2718 code (#22402)

---
 core/types/hashing.go             | 5 +++--
 core/types/receipt.go             | 1 +
 core/types/transaction_signing.go | 6 +-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/core/types/hashing.go b/core/types/hashing.go
index d712254c4e..73a5cfe53e 100644
--- a/core/types/hashing.go
+++ b/core/types/hashing.go
@@ -36,6 +36,7 @@ var encodeBufferPool = sync.Pool{
 	New: func() interface{} { return new(bytes.Buffer) },
 }
 
+// rlpHash encodes x and hashes the encoded bytes.
 func rlpHash(x interface{}) (h common.Hash) {
 	sha := hasherPool.Get().(crypto.KeccakState)
 	defer hasherPool.Put(sha)
@@ -45,8 +46,8 @@ func rlpHash(x interface{}) (h common.Hash) {
 	return h
 }
 
-// prefixedRlpHash writes the prefix into the hasher before rlp-encoding the
-// given interface. It's used for typed transactions.
+// prefixedRlpHash writes the prefix into the hasher before rlp-encoding x.
+// It's used for typed transactions.
 func prefixedRlpHash(prefix byte, x interface{}) (h common.Hash) {
 	sha := hasherPool.Get().(crypto.KeccakState)
 	defer hasherPool.Put(sha)
diff --git a/core/types/receipt.go b/core/types/receipt.go
index 51b685a47d..d1b3cc46bf 100644
--- a/core/types/receipt.go
+++ b/core/types/receipt.go
@@ -36,6 +36,7 @@ var (
 	receiptStatusSuccessfulRLP = []byte{0x01}
 )
 
+// This error is returned when a typed receipt is decoded, but the string is empty.
 var errEmptyTypedReceipt = errors.New("empty typed receipt bytes")
 
 const (
diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
index 26c76c05b7..174aa2cfc9 100644
--- a/core/types/transaction_signing.go
+++ b/core/types/transaction_signing.go
@@ -212,11 +212,7 @@ func (s eip2930Signer) Sender(tx *Transaction) (common.Address, error) {
 func (s eip2930Signer) SignatureValues(tx *Transaction, sig []byte) (R, S, V *big.Int, err error) {
 	switch txdata := tx.inner.(type) {
 	case *LegacyTx:
-		R, S, V = decodeSignature(sig)
-		if s.chainId.Sign() != 0 {
-			V = big.NewInt(int64(sig[64] + 35))
-			V.Add(V, s.chainIdMul)
-		}
+		return s.EIP155Signer.SignatureValues(tx, sig)
 	case *AccessListTx:
 		// Check that chain ID of tx matches the signer. We also accept ID zero here,
 		// because it indicates that the chain ID was not specified in the tx.