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

core/types: remove duplication in eip2930 signer (#27860)

Browse source
This commit is contained in:
Daniel Liu 2024-04-24 14:19:06 +08:00
parent 7a95b4f907
commit e82bef5b87
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/types/transaction_signing.go
View file

@ -191,11 +191,7 @@ func (s eip2930Signer) Sender(tx *Transaction) (common.Address, error) {
V, R, S := tx.RawSignatureValues() V, R, S := tx.RawSignatureValues()
switch tx.Type() { switch tx.Type() {
case LegacyTxType: case LegacyTxType:
if !tx.Protected() { return s.EIP155Signer.Sender(tx)
return HomesteadSigner{}.Sender(tx)
}
V = new(big.Int).Sub(V, s.chainIdMul)
V.Sub(V, big8)
case AccessListTxType: case AccessListTxType:
// ACL txs are defined to use 0 and 1 as their recovery id, add // ACL txs are defined to use 0 and 1 as their recovery id, add
// 27 to become equivalent to unprotected Homestead signatures. // 27 to become equivalent to unprotected Homestead signatures.
@ -232,15 +228,7 @@ func (s eip2930Signer) SignatureValues(tx *Transaction, sig []byte) (R, S, V *bi
func (s eip2930Signer) Hash(tx *Transaction) common.Hash { func (s eip2930Signer) Hash(tx *Transaction) common.Hash {
switch tx.Type() { switch tx.Type() {
case LegacyTxType: case LegacyTxType:
return rlpHash([]interface{}{ return s.EIP155Signer.Hash(tx)
tx.Nonce(),
tx.GasPrice(),
tx.Gas(),
tx.To(),
tx.Value(),
tx.Data(),
s.chainId, uint(0), uint(0),
})
case AccessListTxType: case AccessListTxType:
return prefixedRlpHash( return prefixedRlpHash(
tx.Type(), tx.Type(),