diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-08-23 17:38:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 17:38:05 +0800 |
| commit | cc9eb91d30a5d4806154b832b9665aecc617b6d8 (patch) | |
| tree | 02570dbfd7cf6de9849c00a7cb8c19918766d121 /cmd | |
| parent | c8a1c0a1156e23625cdca98b65286084609dca43 (diff) | |
| parent | e39b2a2bde3f2f1a82f7836cf957af94a45acfc2 (diff) | |
| download | go-tangerine-cc9eb91d30a5d4806154b832b9665aecc617b6d8.tar go-tangerine-cc9eb91d30a5d4806154b832b9665aecc617b6d8.tar.gz go-tangerine-cc9eb91d30a5d4806154b832b9665aecc617b6d8.tar.bz2 go-tangerine-cc9eb91d30a5d4806154b832b9665aecc617b6d8.tar.lz go-tangerine-cc9eb91d30a5d4806154b832b9665aecc617b6d8.tar.xz go-tangerine-cc9eb91d30a5d4806154b832b9665aecc617b6d8.tar.zst go-tangerine-cc9eb91d30a5d4806154b832b9665aecc617b6d8.zip | |
Merge pull request #20004 from karalabe/istanbul-override
cmd, core, eth, les: support --override.istanbul
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/config.go | 4 | ||||
| -rw-r--r-- | cmd/geth/main.go | 1 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 0a63a0277..e2c107ffc 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -20,6 +20,7 @@ import ( "bufio" "errors" "fmt" + "math/big" "os" "reflect" "unicode" @@ -150,6 +151,9 @@ func enableWhisper(ctx *cli.Context) bool { func makeFullNode(ctx *cli.Context) *node.Node { stack, cfg := makeConfigNode(ctx) + if ctx.GlobalIsSet(utils.OverrideIstanbulFlag.Name) { + cfg.Eth.OverrideIstanbul = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideIstanbulFlag.Name)) + } utils.RegisterEthService(stack, &cfg.Eth) if ctx.GlobalBool(utils.DashboardEnabledFlag.Name) { diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 4c51f092d..019eee605 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -69,6 +69,7 @@ var ( utils.ExternalSignerFlag, utils.NoUSBFlag, utils.SmartCardDaemonPathFlag, + utils.OverrideIstanbulFlag, utils.DashboardEnabledFlag, utils.DashboardAddrFlag, utils.DashboardPortFlag, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 7e46043ff..d553b662c 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -223,6 +223,10 @@ var ( Name: "whitelist", Usage: "Comma separated block number-to-hash mappings to enforce (<number>=<hash>)", } + OverrideIstanbulFlag = cli.Uint64Flag{ + Name: "override.istanbul", + Usage: "Manually specify Istanbul fork-block, overriding the bundled setting", + } // Light server and client settings LightLegacyServFlag = cli.IntFlag{ // Deprecated in favor of light.serve, remove in 2021 Name: "lightserv", |