forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 07:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/types: reorder checks

Browse source
This commit is contained in:
Felix Lange 2025-03-19 11:14:39 +01:00
parent 097b1eec88
commit afcd548f5f
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
core/types/transaction_signing.go
View file

@ -180,6 +180,7 @@ type Signer interface {
Equal(Signer) bool Equal(Signer) bool
} }
// modernSigner is the signer implementation that handles non-legacy transaction types.
type modernSigner struct { type modernSigner struct {
txtypes map[byte]struct{} txtypes map[byte]struct{}
chainID *big.Int chainID *big.Int
@ -196,12 +197,12 @@ func newModernSigner(chainID *big.Int, fork forks.Fork) Signer {
} }
// configure legacy signer // configure legacy signer
switch { switch {
case fork <= forks.FrontierThawing: case fork >= forks.SpuriousDragon:
s.legacy = FrontierSigner{} s.legacy = NewEIP155Signer(chainID)
case fork <= forks.Homestead: case fork >= forks.Homestead:
s.legacy = HomesteadSigner{} s.legacy = HomesteadSigner{}
default: default:
s.legacy = NewEIP155Signer(chainID) s.legacy = FrontierSigner{}
} }
s.txtypes[LegacyTxType] = struct{}{} s.txtypes[LegacyTxType] = struct{}{}
// configure tx types // configure tx types
@ -220,7 +221,7 @@ func newModernSigner(chainID *big.Int, fork forks.Fork) Signer {
return s return s
} }
func (s *modernSigner) supports(txtype byte) bool { func (s *modernSigner) supportsType(txtype byte) bool {
_, ok := s.txtypes[txtype] _, ok := s.txtypes[txtype]
return ok return ok
} }
@ -236,7 +237,7 @@ func (s *modernSigner) Equal(s2 Signer) bool {
func (s *modernSigner) Sender(tx *Transaction) (common.Address, error) { func (s *modernSigner) Sender(tx *Transaction) (common.Address, error) {
tt := tx.Type() tt := tx.Type()
if !s.supports(tt) { if !s.supportsType(tt) {
return common.Address{}, ErrTxTypeNotSupported return common.Address{}, ErrTxTypeNotSupported
} }
if tt == LegacyTxType { if tt == LegacyTxType {
@ -254,7 +255,7 @@ func (s *modernSigner) Sender(tx *Transaction) (common.Address, error) {
func (s *modernSigner) SignatureValues(tx *Transaction, sig []byte) (R, S, V *big.Int, err error) { func (s *modernSigner) SignatureValues(tx *Transaction, sig []byte) (R, S, V *big.Int, err error) {
tt := tx.Type() tt := tx.Type()
if !s.supports(tt) { if !s.supportsType(tt) {
return nil, nil, nil, ErrTxTypeNotSupported return nil, nil, nil, ErrTxTypeNotSupported
} }
if tt == LegacyTxType { if tt == LegacyTxType {