mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-19 11:20:45 +00:00
return err on underpriced
This commit is contained in:
parent
777265620d
commit
9ede6b9622
1 changed files with 7 additions and 2 deletions
|
|
@ -1517,8 +1517,6 @@ func (p *BlobPool) addLocked(tx *types.Transaction, checkGapped bool) (err error
|
||||||
if err := p.validateTx(tx); err != nil {
|
if err := p.validateTx(tx); err != nil {
|
||||||
log.Trace("Transaction validation failed", "hash", tx.Hash(), "err", err)
|
log.Trace("Transaction validation failed", "hash", tx.Hash(), "err", err)
|
||||||
switch {
|
switch {
|
||||||
case errors.Is(err, txpool.ErrUnderpriced):
|
|
||||||
addUnderpricedMeter.Mark(1)
|
|
||||||
case errors.Is(err, txpool.ErrTxGasPriceTooLow):
|
case errors.Is(err, txpool.ErrTxGasPriceTooLow):
|
||||||
addUnderpricedMeter.Mark(1)
|
addUnderpricedMeter.Mark(1)
|
||||||
case errors.Is(err, core.ErrNonceTooLow):
|
case errors.Is(err, core.ErrNonceTooLow):
|
||||||
|
|
@ -1674,6 +1672,13 @@ func (p *BlobPool) addLocked(tx *types.Transaction, checkGapped bool) (err error
|
||||||
for p.stored > p.config.Datacap {
|
for p.stored > p.config.Datacap {
|
||||||
p.drop()
|
p.drop()
|
||||||
}
|
}
|
||||||
|
// If the transaction being added is dropped from above, return underpriced error
|
||||||
|
if p.lookup.exists(tx.Hash()) {
|
||||||
|
log.Trace("Dropping underpriced transaction", "hash", tx.Hash(), "err", err)
|
||||||
|
addUnderpricedMeter.Mark(1)
|
||||||
|
return txpool.ErrUnderpriced
|
||||||
|
}
|
||||||
|
|
||||||
p.updateStorageMetrics()
|
p.updateStorageMetrics()
|
||||||
|
|
||||||
addValidMeter.Mark(1)
|
addValidMeter.Mark(1)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue