forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Addressing PR feedback. Now setting local = false when NoLocals is set"

Browse source 
This reverts commit 75d4098bf2cff119ce424840e7786a1592170c52.

The local flag doesn't propagate to validation logic, only opts.MinTip
This commit is contained in:
Juan Palacios 2023-11-01 13:12:44 +11:00
parent 827f7e693f
commit bad6717720
No known key found for this signature in database
GPG key ID: 9CEE762FFEF26E1C
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/txpool/legacypool/legacypool.go
View file

@ -152,6 +152,10 @@ 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 {
@ -596,8 +600,8 @@ func (pool *LegacyPool) validateTxBasics(tx *types.Transaction, local bool) erro
MaxSize: txMaxSize,
MinTip: pool.gasTip.Load(),
}
if local && pool.config.NoLocals {
local = false
if local && pool.config.PrioritizeLocals() {
opts.MinTip = new(big.Int)
}
if err := txpool.ValidateTransaction(tx, pool.currentHead.Load(), pool.signer, opts); err != nil {
return err

8
core/txpool/legacypool/legacypool_test.go
View file

@ -1515,20 +1515,12 @@ 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