add option to reannounce local transactions (bnb-chain#33)

Co-authored-by: andyzhang2023 <andyzhang2023@gmail.com> Co-authored-by: Owen <103096885+owen-reorg@users.noreply.github.com>
galaio · Nov 24, 2023 · feb5339 · feb5339
1 parent c36a3ce
commit feb5339
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
@@ -89,6 +89,7 @@ var (
  utils.TxPoolGlobalQueueFlag,
  utils.TxPoolLifetimeFlag,
  utils.TxPoolReannounceTimeFlag,
+ utils.TxPoolReannounceRemotesFlag,
  utils.SyncModeFlag,
  utils.SyncTargetFlag,
  utils.ExitWhenSyncedFlag,

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -465,6 +465,12 @@ var (
  Value: ethconfig.Defaults.TxPool.ReannounceTime,
  Category: flags.TxPoolCategory,
  }
+ TxPoolReannounceRemotesFlag = &cli.BoolFlag{
+ Name: "txpool.reannounceremotes",
+ Usage: "Wether reannnounce remote transactions or not(default = false)",
+ Value: ethconfig.Defaults.TxPool.ReannounceRemotes,
+ Category: flags.TxPoolCategory,
+ }
 
  // Performance tuning settings
  CacheFlag = &cli.IntFlag{
@@ -1669,6 +1675,9 @@ func setTxPool(ctx *cli.Context, cfg *txpool.Config) {
  if ctx.IsSet(TxPoolReannounceTimeFlag.Name) {
  cfg.ReannounceTime = ctx.Duration(TxPoolReannounceTimeFlag.Name)
  }
+ if ctx.IsSet(TxPoolReannounceRemotesFlag.Name) {
+ cfg.ReannounceRemotes = ctx.Bool(TxPoolReannounceRemotesFlag.Name)
+ }
 }
 
 func setEthash(ctx *cli.Context, cfg *ethconfig.Config) {

diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go
@@ -183,8 +183,9 @@ type Config struct {
  AccountQueue uint64 // Maximum number of non-executable transaction slots permitted per account
  GlobalQueue uint64 // Maximum number of non-executable transaction slots for all accounts
 
- Lifetime time.Duration // Maximum amount of time non-executable transaction are queued
- ReannounceTime time.Duration // Duration for announcing local pending transactions again
+ Lifetime time.Duration // Maximum amount of time non-executable transaction are queued
+ ReannounceTime time.Duration // Duration for announcing local pending transactions again
+ ReannounceRemotes bool // Wether reannounce remote transactions or not
 }
 
 // DefaultConfig contains the default configurations for the transaction
@@ -433,7 +434,7 @@ func (pool *TxPool) loop() {
  reannoTxs := func() []*types.Transaction {
  txs := make([]*types.Transaction, 0)
  for addr, list := range pool.pending {
- if !pool.locals.contains(addr) {
+ if !pool.config.ReannounceRemotes && !pool.locals.contains(addr) {
  continue
  }