aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-07-10 17:43:23 +0800
committerGitHub <noreply@github.com>2017-07-10 17:43:23 +0800
commit4f7a38001f7137972303421a11d49b0745450a3a (patch)
tree0a486e90fd8cf7d2ab161610b79a2251483895c0 /cmd
parent65f0e905ddda9be97368839b67be5754b33a0eea (diff)
parent34ec9913f628180d0ace740abfe1362995879c93 (diff)
downloadgo-tangerine-4f7a38001f7137972303421a11d49b0745450a3a.tar
go-tangerine-4f7a38001f7137972303421a11d49b0745450a3a.tar.gz
go-tangerine-4f7a38001f7137972303421a11d49b0745450a3a.tar.bz2
go-tangerine-4f7a38001f7137972303421a11d49b0745450a3a.tar.lz
go-tangerine-4f7a38001f7137972303421a11d49b0745450a3a.tar.xz
go-tangerine-4f7a38001f7137972303421a11d49b0745450a3a.tar.zst
go-tangerine-4f7a38001f7137972303421a11d49b0745450a3a.zip
Merge pull request #14737 from holiman/txpool_localaccounts
Txpool localaccounts
Diffstat (limited to 'cmd')
-rw-r--r--cmd/geth/main.go1
-rw-r--r--cmd/geth/usage.go1
-rw-r--r--cmd/utils/flags.go7
3 files changed, 9 insertions, 0 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 7e0242d8f..607414bbb 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -66,6 +66,7 @@ var (
utils.EthashDatasetDirFlag,
utils.EthashDatasetsInMemoryFlag,
utils.EthashDatasetsOnDiskFlag,
+ utils.TxPoolNoLocalsFlag,
utils.TxPoolPriceLimitFlag,
utils.TxPoolPriceBumpFlag,
utils.TxPoolAccountSlotsFlag,
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index 022c8e899..275aad674 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -95,6 +95,7 @@ var AppHelpFlagGroups = []flagGroup{
{
Name: "TRANSACTION POOL",
Flags: []cli.Flag{
+ utils.TxPoolNoLocalsFlag,
utils.TxPoolPriceLimitFlag,
utils.TxPoolPriceBumpFlag,
utils.TxPoolAccountSlotsFlag,
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index b5a593ab6..0159364af 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -209,6 +209,10 @@ var (
Value: eth.DefaultConfig.EthashDatasetsOnDisk,
}
// Transaction pool settings
+ TxPoolNoLocalsFlag = cli.BoolFlag{
+ Name: "txpool.nolocals",
+ Usage: "Disables price exemptions for locally submitted transactions",
+ }
TxPoolPriceLimitFlag = cli.Uint64Flag{
Name: "txpool.pricelimit",
Usage: "Minimum gas price limit to enforce for acceptance into the pool",
@@ -831,6 +835,9 @@ func setGPO(ctx *cli.Context, cfg *gasprice.Config) {
}
func setTxPool(ctx *cli.Context, cfg *core.TxPoolConfig) {
+ if ctx.GlobalIsSet(TxPoolNoLocalsFlag.Name) {
+ cfg.NoLocals = ctx.GlobalBool(TxPoolNoLocalsFlag.Name)
+ }
if ctx.GlobalIsSet(TxPoolPriceLimitFlag.Name) {
cfg.PriceLimit = ctx.GlobalUint64(TxPoolPriceLimitFlag.Name)
}