From 7cbf934488b510206b8d0c9e1453fe9fad83692a Mon Sep 17 00:00:00 2001
From: Pierre Rousset <pierre@curvegrid.com>
Date: Fri, 21 Feb 2025 11:28:11 +0900
Subject: [PATCH 1/2] Fix flakey behavior in simulated backend Rollback

---
 core/txpool/txpool.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go
index 0ebf4c7e4b..e09c920779 100644
--- a/core/txpool/txpool.go
+++ b/core/txpool/txpool.go
@@ -486,6 +486,7 @@ func (p *TxPool) Sync() error {
 
 // Clear removes all tracked txs from the subpools.
 func (p *TxPool) Clear() {
+	p.Sync()
 	for _, subpool := range p.subpools {
 		subpool.Clear()
 	}

From 18faa251b3cdf9ead91d861c524d7a9e3dec0af7 Mon Sep 17 00:00:00 2001
From: Pierre R <p.rousset@gmail.com>
Date: Tue, 11 Mar 2025 18:26:16 +0900
Subject: [PATCH 2/2] Update core/txpool/txpool.go

Co-authored-by: jwasinger <j-wasinger@hotmail.com>
---
 core/txpool/txpool.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go
index e09c920779..9b1136756b 100644
--- a/core/txpool/txpool.go
+++ b/core/txpool/txpool.go
@@ -486,6 +486,8 @@ func (p *TxPool) Sync() error {
 
 // Clear removes all tracked txs from the subpools.
 func (p *TxPool) Clear() {
+	// Invoke Sync to ensure that txs pending addition don't get added to the pool after
+	// the subpools are subsequently cleared
 	p.Sync()
 	for _, subpool := range p.subpools {
 		subpool.Clear()