diff --git a/cmd/txpool/main.go b/cmd/txpool/main.go index a50a3c9cdab252b4c23e89d6c87d2a5168d9a80a..114b39f01294c716cffac661f464f6d80e59f656 100644 --- a/cmd/txpool/main.go +++ b/cmd/txpool/main.go @@ -54,7 +54,7 @@ func init() { rootCmd.PersistentFlags().StringVar(&TLSCACert, "tls.cacert", "", "CA certificate for client side TLS handshake") rootCmd.PersistentFlags().IntVar(&pendingPoolLimit, "txpool.globalslots", txpool.DefaultConfig.PendingSubPoolLimit, "Maximum number of executable transaction slots for all accounts") - rootCmd.PersistentFlags().IntVar(&baseFeePoolLimit, "txpool.basefeeeslots", txpool.DefaultConfig.BaseFeeSubPoolLimit, "Maximum number of non-executable transactions where only not enough baseFee") + rootCmd.PersistentFlags().IntVar(&baseFeePoolLimit, "txpool.globalbasefeeeslots", txpool.DefaultConfig.BaseFeeSubPoolLimit, "Maximum number of non-executable transactions where only not enough baseFee") rootCmd.PersistentFlags().IntVar(&queuedPoolLimit, "txpool.globalqueue", txpool.DefaultConfig.QueuedSubPoolLimit, "Maximum number of non-executable transaction slots for all accounts") } diff --git a/cmd/txpool/readme.md b/cmd/txpool/readme.md index d9a0b9ff20cbba3ffad7a9f5460abc678decd13e..8e120bb7bc3b773a088885825951189586db91c8 100644 --- a/cmd/txpool/readme.md +++ b/cmd/txpool/readme.md @@ -44,8 +44,10 @@ Will add this part soon [tbd] [x] DevNet - doesn't send mined block notification on first mined block (because initialCycle = true) [x] DiscardReasons - user must understand clearly why tx were rejected [x] Notify about new pending transactions - we sending more than need -[] Add cli options to manage pool limits: --txpool.pricelimit, --txpool.globalslots, --txpool.globalqueue (now each -sub-pool has limit 200_000, and no pricelimit) +[x] Handle "NewBlock" message with 200K transactions re-calculation - in under 50ms +[x] Add --txpool.globalslots, --txpool.globalqueue,--txpool.globalbasefeeeslots +[] Add --txpool.accountslots +[] Add --txpool.pricelimit [] Add way for simple introspection - where is tx and why [] Hard-forks support (now rules are parsed ones on txPool start) [] Add pool to docker-compose diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 3f160ca41222fa5e914ffc68bb97f62c11ccf157..607fd4e20630c57eec98d120236795d984a32db3 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -198,7 +198,7 @@ var ( Value: ethconfig.Defaults.TxPool.GlobalSlots, } TxPoolGlobalBaseFeeSlotsFlag = cli.Uint64Flag{ - Name: "txpool.basefeeeslots", + Name: "txpool.globalbasefeeeslots", Usage: "Maximum number of non-executable transactions where only not enough baseFee", Value: ethconfig.Defaults.TxPool.GlobalQueue, }