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

core, internal/ethapi: improve function IsSpecialTransaction

Browse source
This commit is contained in:
Daniel Liu 2025-02-20 12:48:17 +08:00
parent 4f8d11e11d
commit b60396a233
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/txpool/list.go
View file

@ -281,7 +281,7 @@ func (l *list) Overlaps(tx *types.Transaction) bool {
func (l *list) Add(tx *types.Transaction, priceBump uint64) (bool, *types.Transaction) { func (l *list) Add(tx *types.Transaction, priceBump uint64) (bool, *types.Transaction) {
// If there's an older better transaction, abort // If there's an older better transaction, abort
old := l.txs.Get(tx.Nonce()) old := l.txs.Get(tx.Nonce())
if old != nil && old.IsSpecialTransaction() { if old.IsSpecialTransaction() {
return false, nil return false, nil
} }
if old != nil { if old != nil {

4
core/txpool/txpool.go
View file

@ -700,7 +700,7 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error {
return core.ErrInsufficientFunds return core.ErrInsufficientFunds
} }
if tx.To() == nil || (tx.To() != nil && !tx.IsSpecialTransaction()) { if !tx.IsSpecialTransaction() {
// Ensure the transaction has more gas than the basic tx fee. // Ensure the transaction has more gas than the basic tx fee.
intrGas, err := core.IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil, true, pool.eip1559) intrGas, err := core.IntrinsicGas(tx.Data(), tx.AccessList(), tx.To() == nil, true, pool.eip1559)
if err != nil { if err != nil {
@ -950,7 +950,7 @@ func (pool *TxPool) promoteSpecialTx(addr common.Address, tx *types.Transaction,
list := pool.pending[addr] list := pool.pending[addr]
old := list.txs.Get(tx.Nonce()) old := list.txs.Get(tx.Nonce())
if old != nil && old.IsSpecialTransaction() { if old.IsSpecialTransaction() {
return false, ErrDuplicateSpecialTransaction return false, ErrDuplicateSpecialTransaction
} }
// Otherwise discard any previous transaction and mark this // Otherwise discard any previous transaction and mark this

2
core/types/transaction.go
View file

@ -487,7 +487,7 @@ func IsSpecialTx(to *common.Address) bool {
} }
func (tx *Transaction) IsSpecialTransaction() bool { func (tx *Transaction) IsSpecialTransaction() bool {
return IsSpecialTx(tx.To()) return tx != nil && IsSpecialTx(tx.To())
} }
func (tx *Transaction) IsTradingTransaction() bool { func (tx *Transaction) IsTradingTransaction() bool {

2
internal/ethapi/api.go
View file

@ -2294,7 +2294,7 @@ func (s *PublicTransactionPoolAPI) sign(addr common.Address, tx *types.Transacti
// SubmitTransaction is a helper function that submits tx to txPool and logs a message. // SubmitTransaction is a helper function that submits tx to txPool and logs a message.
func SubmitTransaction(ctx context.Context, b Backend, tx *types.Transaction) (common.Hash, error) { func SubmitTransaction(ctx context.Context, b Backend, tx *types.Transaction) (common.Hash, error) {
if tx.To() != nil && tx.IsSpecialTransaction() { if tx.IsSpecialTransaction() {
return common.Hash{}, errors.New("don't allow transaction sent to BlockSigners & RandomizeSMC smart contract via API") return common.Hash{}, errors.New("don't allow transaction sent to BlockSigners & RandomizeSMC smart contract via API")
} }