Merge pull request #14737 from holiman/txpool_localaccounts

Txpool localaccounts
2017-07-10 12:43:23 +03:00
parent 65f0e905dd 34ec9913f6
commit 4f7a38001f
13 changed files with 392 additions and 287 deletions
--- 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,
--- 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,