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

core/types: rename txtype set

Browse source
This commit is contained in:
Felix Lange 2025-10-27 10:12:57 +01:00
parent 0c67e7cb71
commit 8ef378f6c4
2 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/types/transaction.go
View file

@ -52,23 +52,6 @@ const (
SetCodeTxType = 0x04 SetCodeTxType = 0x04
) )
type txTypeBitVec [2]uint64
func (v *txTypeBitVec) Set(txType byte) {
v[txType/64] |= 1 << (txType % 64)
}
func (v *txTypeBitVec) Has(txType byte) bool {
if txType >= byte(len(v)*64) {
return false
}
return v[txType/64]&(1<<(txType%64)) != 0
}
func (v *txTypeBitVec) Equals(o *txTypeBitVec) bool {
return *v == *o
}
// Transaction is an Ethereum transaction. // Transaction is an Ethereum transaction.
type Transaction struct { type Transaction struct {
inner TxData // Consensus contents of a transaction inner TxData // Consensus contents of a transaction

29
core/types/transaction_signing.go
View file

@ -182,11 +182,24 @@ type Signer interface {
// modernSigner is the signer implementation that handles non-legacy transaction types. // modernSigner is the signer implementation that handles non-legacy transaction types.
// For legacy transactions, it defers to one of the legacy signers (frontier, homestead, eip155). // For legacy transactions, it defers to one of the legacy signers (frontier, homestead, eip155).
type modernSigner struct { type modernSigner struct {
txTypeBitVec txTypeBitVec txtypes txtypeSet
chainID *big.Int chainID *big.Int
legacy Signer legacy Signer
} }
type txtypeSet [2]uint64
func (v *txtypeSet) set(txType byte) {
v[txType/64] |= 1 << (txType % 64)
}
func (v *txtypeSet) has(txType byte) bool {
if txType >= byte(len(v)*64) {
return false
}
return v[txType/64]&(1<<(txType%64)) != 0
}
func newModernSigner(chainID *big.Int, fork forks.Fork) Signer { func newModernSigner(chainID *big.Int, fork forks.Fork) Signer {
if chainID == nil || chainID.Sign() <= 0 { if chainID == nil || chainID.Sign() <= 0 {
panic(fmt.Sprintf("invalid chainID %v", chainID)) panic(fmt.Sprintf("invalid chainID %v", chainID))
@ -203,19 +216,19 @@ func newModernSigner(chainID *big.Int, fork forks.Fork) Signer {
default: default:
s.legacy = FrontierSigner{} s.legacy = FrontierSigner{}
} }
s.txTypeBitVec.Set(LegacyTxType) s.txtypes.set(LegacyTxType)
// configure tx types // configure tx types
if fork >= forks.Berlin { if fork >= forks.Berlin {
s.txTypeBitVec.Set(AccessListTxType) s.txtypes.set(AccessListTxType)
} }
if fork >= forks.London { if fork >= forks.London {
s.txTypeBitVec.Set(DynamicFeeTxType) s.txtypes.set(DynamicFeeTxType)
} }
if fork >= forks.Cancun { if fork >= forks.Cancun {
s.txTypeBitVec.Set(BlobTxType) s.txtypes.set(BlobTxType)
} }
if fork >= forks.Prague { if fork >= forks.Prague {
s.txTypeBitVec.Set(SetCodeTxType) s.txtypes.set(SetCodeTxType)
} }
return s return s
} }
@ -226,7 +239,7 @@ func (s *modernSigner) ChainID() *big.Int {
func (s *modernSigner) Equal(s2 Signer) bool { func (s *modernSigner) Equal(s2 Signer) bool {
other, ok := s2.(*modernSigner) other, ok := s2.(*modernSigner)
return ok && s.chainID.Cmp(other.chainID) == 0 && s.txTypeBitVec.Equals(&other.txTypeBitVec) && s.legacy.Equal(other.legacy) return ok && s.chainID.Cmp(other.chainID) == 0 && s.txtypes == other.txtypes && s.legacy.Equal(other.legacy)
} }
func (s *modernSigner) Hash(tx *Transaction) common.Hash { func (s *modernSigner) Hash(tx *Transaction) common.Hash {
@ -234,7 +247,7 @@ func (s *modernSigner) Hash(tx *Transaction) common.Hash {
} }
func (s *modernSigner) supportsType(txtype byte) bool { func (s *modernSigner) supportsType(txtype byte) bool {
return s.txTypeBitVec.Has(txtype) return s.txtypes.has(txtype)
} }
func (s *modernSigner) Sender(tx *Transaction) (common.Address, error) { func (s *modernSigner) Sender(tx *Transaction) (common.Address, error) {