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

feat: remove instead of pop insufficient-funds tx (#608)

Browse source 
* feat: remove instead of pop insufficient-funds tx

* bump version

* update

* update
This commit is contained in:
HAOYUatHZ 2023-12-26 00:47:39 +08:00 committed by GitHub
parent 833f9041bb
commit 640b39161c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
miner/worker.go
View file

@ -1234,8 +1234,9 @@ loop:
break loop break loop
case (errors.Is(err, core.ErrInsufficientFunds) || errors.Is(errors.Unwrap(err), core.ErrInsufficientFunds)): case (errors.Is(err, core.ErrInsufficientFunds) || errors.Is(errors.Unwrap(err), core.ErrInsufficientFunds)):
log.Trace("Skipping account with insufficient funds", "sender", from) log.Trace("Skipping tx with insufficient funds", "sender", from, "tx", tx.Hash().String())
txs.Pop() txs.Pop()
w.eth.TxPool().RemoveTx(tx.Hash(), true)
default: default:
// Strange error, discard the transaction and get the next in line (note, the // Strange error, discard the transaction and get the next in line (note, the

2
params/version.go
View file

@ -24,7 +24,7 @@ import (
const ( const (
VersionMajor = 5 // Major version component of the current release VersionMajor = 5 // Major version component of the current release
VersionMinor = 1 // Minor version component of the current release VersionMinor = 1 // Minor version component of the current release
VersionPatch = 8 // Patch version component of the current release VersionPatch = 9 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string VersionMeta = "mainnet" // Version metadata to append to the version string
) )