From 640b39161c02a8eae964c60be68320c558de7409 Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Date: Tue, 26 Dec 2023 00:47:39 +0800
Subject: [PATCH] feat: remove instead of pop insufficient-funds tx (#608)

* feat: remove instead of pop insufficient-funds tx

* bump version

* update

* update
---
 miner/worker.go   | 3 ++-
 params/version.go | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/miner/worker.go b/miner/worker.go
index 6e625a11ee09..d9596f7b7dab 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -1234,8 +1234,9 @@ loop:
 			break loop
 
 		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()
+			w.eth.TxPool().RemoveTx(tx.Hash(), true)
 
 		default:
 			// Strange error, discard the transaction and get the next in line (note, the
diff --git a/params/version.go b/params/version.go
index f11cad7830d6..fa86e3bcd142 100644
--- a/params/version.go
+++ b/params/version.go
@@ -24,7 +24,7 @@ import (
 const (
 	VersionMajor = 5         // Major 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
 )