Avoid a race in the SimulatedBeacon Stop call

eljobe · eljobe · commit 8d2920bbc4cd · 2025-03-06T11:54:50.000+01:00
Fixes: ethereum#31327
diff --git a/eth/catalyst/simulated_beacon_api.go b/eth/catalyst/simulated_beacon_api.go
@@ -71,6 +71,10 @@ func (a *simulatedBeaconAPI) loop() {
 					break
 				}
 				a.sim.Commit()
+				// Avoid a race condition where tx pool is terminated during Commit.
+				if err := a.sim.eth.TxPool().Sync(); err != nil {
+					break
+				}
 			}
 		}
 	}()

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@ func (a *simulatedBeaconAPI) loop() {`
`71`	`71`	`break`
`72`	`72`	`}`
`73`	`73`	`a.sim.Commit()`
	`74`	`+ // Avoid a race condition where tx pool is terminated during Commit.`
	`75`	`+ if err := a.sim.eth.TxPool().Sync(); err != nil {`
	`76`	`+ break`
	`77`	`+ }`
`74`	`78`	`}`
`75`	`79`	`}`
`76`	`80`	`}()`