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

* feat: remove instead of pop insufficient-funds tx * bump version * update * update
scroll-tech · Dec 25, 2023 · 640b391 · 640b391
1 parent 833f904
commit 640b391
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
 )