diff --git a/cmd/thor/flags.go b/cmd/thor/flags.go index 34eaa3325..4bdd6c80d 100644 --- a/cmd/thor/flags.go +++ b/cmd/thor/flags.go @@ -150,6 +150,11 @@ var ( Value: "localhost:2112", Usage: "metrics service listening address", } + txPoolLimitPerAccountFlag = cli.Uint64Flag{ + Name: "txpool-limit-per-account", + Value: 16, + Usage: "set tx limit per account in pool", + } // solo mode only flags onDemandFlag = cli.BoolFlag{ @@ -175,11 +180,6 @@ var ( Value: 10000, Usage: "set tx limit in pool", } - txPoolLimitPerAccountFlag = cli.Uint64Flag{ - Name: "txpool-limit-per-account", - Value: 16, - Usage: "set tx limit per account in pool", - } genesisFlag = cli.StringFlag{ Name: "genesis", Usage: "path to genesis file, if not set, the default devnet genesis will be used", diff --git a/cmd/thor/main.go b/cmd/thor/main.go index 8c2f00d19..4015a53a6 100644 --- a/cmd/thor/main.go +++ b/cmd/thor/main.go @@ -93,6 +93,7 @@ func main() { disablePrunerFlag, enableMetricsFlag, metricsAddrFlag, + txPoolLimitPerAccountFlag, }, Action: defaultAction, Commands: []cli.Command{ @@ -212,6 +213,10 @@ func defaultAction(ctx *cli.Context) error { } txpoolOpt := defaultTxPoolOptions + txpoolOpt.LimitPerAccount, err = readIntFromUInt64Flag(ctx.Uint64(txPoolLimitPerAccountFlag.Name)) + if err != nil { + return errors.Wrap(err, "parse txpool-limit-per-account flag") + } txPool := txpool.New(repo, state.NewStater(mainDB), txpoolOpt) defer func() { log.Info("closing tx pool..."); txPool.Close() }() diff --git a/docs/usage.md b/docs/usage.md index 552bc62b9..b34b3feff 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -182,6 +182,7 @@ bin/thor -h | `--disable-pruner` | Disable state pruner to keep all history | | `--enable-metrics` | Enables the metrics server | | `--metrics-addr` | Metrics service listening address | +| `--txpool-limit-per-account`| Transaction pool size limit per account | | `--help, -h` | Show help | | `--version, -v` | Print the version | @@ -195,7 +196,7 @@ bin/thor -h | `--persist` | Save blockchain data to disk(default to memory) | | `--gas-limit` | Gas limit for each block | | `--txpool-limit` | Transaction pool size limit | -| `--txpool-limit-per-account` | Transaction pool size limit per account | + #### Discovery Node Flags