diff options
| author | Martin Holst Swende <martin@swende.se> | 2019-04-08 19:49:52 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2019-04-08 19:49:52 +0800 |
| commit | e2f3465e83a4c03b48977ed367e68b0d63ca2ed1 (patch) | |
| tree | b8cb683600672789aa7b56ed349fbceaaa2ae4ae /cmd | |
| parent | ed97517ff4db1982251d8bf7dbeca565159e3604 (diff) | |
| download | go-tangerine-e2f3465e83a4c03b48977ed367e68b0d63ca2ed1.tar go-tangerine-e2f3465e83a4c03b48977ed367e68b0d63ca2ed1.tar.gz go-tangerine-e2f3465e83a4c03b48977ed367e68b0d63ca2ed1.tar.bz2 go-tangerine-e2f3465e83a4c03b48977ed367e68b0d63ca2ed1.tar.lz go-tangerine-e2f3465e83a4c03b48977ed367e68b0d63ca2ed1.tar.xz go-tangerine-e2f3465e83a4c03b48977ed367e68b0d63ca2ed1.tar.zst go-tangerine-e2f3465e83a4c03b48977ed367e68b0d63ca2ed1.zip | |
eth, les, geth: implement cli-configurable global gas cap for RPC calls (#19401)
* eth, les, geth: implement cli-configurable global gas cap for RPC calls
* graphql, ethapi: place gas cap in DoCall
* ethapi: reformat log message
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/main.go | 7 | ||||
| -rw-r--r-- | cmd/geth/usage.go | 1 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 0e597f030..4f3849a41 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -57,7 +57,6 @@ var ( utils.IdentityFlag, utils.UnlockedAccountFlag, utils.PasswordFileFlag, - utils.InsecureUnlockAllowedFlag, utils.BootnodesFlag, utils.BootnodesV4Flag, utils.BootnodesV5Flag, @@ -136,8 +135,6 @@ var ( utils.VMEnableDebugFlag, utils.NetworkIdFlag, utils.ConstantinopleOverrideFlag, - utils.RPCCORSDomainFlag, - utils.RPCVirtualHostsFlag, utils.EthStatsURLFlag, utils.FakePoWFlag, utils.NoCompactionFlag, @@ -152,6 +149,8 @@ var ( utils.RPCEnabledFlag, utils.RPCListenAddrFlag, utils.RPCPortFlag, + utils.RPCCORSDomainFlag, + utils.RPCVirtualHostsFlag, utils.GraphQLEnabledFlag, utils.GraphQLListenAddrFlag, utils.GraphQLPortFlag, @@ -165,6 +164,8 @@ var ( utils.WSAllowedOriginsFlag, utils.IPCDisabledFlag, utils.IPCPathFlag, + utils.InsecureUnlockAllowedFlag, + utils.RPCGlobalGasCap, } whisperFlags = []cli.Flag{ diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 6d039ba04..7ec1ab03f 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -158,6 +158,7 @@ var AppHelpFlagGroups = []flagGroup{ utils.RPCListenAddrFlag, utils.RPCPortFlag, utils.RPCApiFlag, + utils.RPCGlobalGasCap, utils.WSEnabledFlag, utils.WSListenAddrFlag, utils.WSPortFlag, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index f6e428869..f5f4cde5b 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -448,6 +448,10 @@ var ( Name: "allow-insecure-unlock", Usage: "Allow insecure account unlocking when account-related RPCs are exposed by http", } + RPCGlobalGasCap = cli.Uint64Flag{ + Name: "rpc.gascap", + Usage: "Sets a cap on gas that can be used in eth_call/estimateGas", + } // Logging and debug settings EthStatsURLFlag = cli.StringFlag{ Name: "ethstats", @@ -1400,6 +1404,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) { if ctx.GlobalIsSet(EVMInterpreterFlag.Name) { cfg.EVMInterpreter = ctx.GlobalString(EVMInterpreterFlag.Name) } + if ctx.GlobalIsSet(RPCGlobalGasCap.Name) { + cfg.RPCGasCap = new(big.Int).SetUint64(ctx.GlobalUint64(RPCGlobalGasCap.Name)) + } // Override any default configs for hard coded networks. switch { |