From 827f7e693f88eca2ea53a2f0b661845b91fcd468 Mon Sep 17 00:00:00 2001 From: Juan Palacios Date: Wed, 1 Nov 2023 10:29:53 +1100 Subject: [PATCH] Addressing PR feedback. Now setting local = false when NoLocals is set --- core/txpool/legacypool/legacypool.go | 8 ++------ core/txpool/legacypool/legacypool_test.go | 8 ++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/txpool/legacypool/legacypool.go b/core/txpool/legacypool/legacypool.go index 88957d6c14..f97dae2785 100644 --- a/core/txpool/legacypool/legacypool.go +++ b/core/txpool/legacypool/legacypool.go @@ -152,10 +152,6 @@ var DefaultConfig = Config{ Lifetime: 3 * time.Hour, } -func (config *Config) PrioritizeLocals() bool { - return !config.NoLocals -} - // sanitize checks the provided user configurations and changes anything that's // unreasonable or unworkable. func (config *Config) sanitize() Config { @@ -600,8 +596,8 @@ func (pool *LegacyPool) validateTxBasics(tx *types.Transaction, local bool) erro MaxSize: txMaxSize, MinTip: pool.gasTip.Load(), } - if local && pool.config.PrioritizeLocals() { - opts.MinTip = new(big.Int) + if local && pool.config.NoLocals { + local = false } if err := txpool.ValidateTransaction(tx, pool.currentHead.Load(), pool.signer, opts); err != nil { return err diff --git a/core/txpool/legacypool/legacypool_test.go b/core/txpool/legacypool/legacypool_test.go index a3d5cb5ac1..fed3ba0225 100644 --- a/core/txpool/legacypool/legacypool_test.go +++ b/core/txpool/legacypool/legacypool_test.go @@ -1515,12 +1515,20 @@ func TestMinGasPriceEnforced(t *testing.T) { t.Fatalf("Min tip not enforced") } + if err := pool.Add([]*txpool.Transaction{{Tx: tx}}, true, false)[0]; !errors.Is(err, txpool.ErrUnderpriced) { + t.Fatalf("Min tip not enforced") + } + tx = dynamicFeeTx(0, 100000, big.NewInt(3), big.NewInt(2), key) pool.SetGasTip(big.NewInt(tx.GasTipCap().Int64() + 1)) if err := pool.addLocal(tx); !errors.Is(err, txpool.ErrUnderpriced) { t.Fatalf("Min tip not enforced") } + + if err := pool.Add([]*txpool.Transaction{{Tx: tx}}, true, false)[0]; !errors.Is(err, txpool.ErrUnderpriced) { + t.Fatalf("Min tip not enforced") + } } // Tests that setting the transaction pool gas price to a higher value correctly