diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-04-08 21:16:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 21:16:05 +0800 |
| commit | 4e13a09c5033b4cf073db6aeaaa7d159dcf07f30 (patch) | |
| tree | 0f64daac335200ce6fd45d6ee9f62dabc0fb1887 /cmd/geth/main.go | |
| parent | c942700427557e3ff6de3aaf6b916e2f056c1ec2 (diff) | |
| parent | 009d2fe2d650b1a92e28f0decbf5f7fa628779e9 (diff) | |
| download | go-tangerine-1.8.24.tar go-tangerine-1.8.24.tar.gz go-tangerine-1.8.24.tar.bz2 go-tangerine-1.8.24.tar.lz go-tangerine-1.8.24.tar.xz go-tangerine-1.8.24.tar.zst go-tangerine-1.8.24.zip | |
Merge pull request #19370 from karalabe/geth-1.8.24v1.8.24
Backport PR for the v1.8.24 maintenance release
Diffstat (limited to 'cmd/geth/main.go')
| -rw-r--r-- | cmd/geth/main.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index e60a27e43..458608112 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -125,8 +125,6 @@ var ( utils.VMEnableDebugFlag, utils.NetworkIdFlag, utils.ConstantinopleOverrideFlag, - utils.RPCCORSDomainFlag, - utils.RPCVirtualHostsFlag, utils.EthStatsURLFlag, utils.MetricsEnabledFlag, utils.FakePoWFlag, @@ -150,6 +148,7 @@ var ( utils.WSAllowedOriginsFlag, utils.IPCDisabledFlag, utils.IPCPathFlag, + utils.RPCGlobalGasCap, } whisperFlags = []cli.Flag{ |