diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-06-29 17:17:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-29 17:17:18 +0800 |
| commit | fd4e161497156a5d12fd8712f41574bc7fb20404 (patch) | |
| tree | 56ce21d1aaf6df3908335601a687f0f3ac4a50be /cmd/utils/flags.go | |
| parent | e0493457d5a9d280554990b5a29c4fcad69e7d0b (diff) | |
| parent | 6362a9d6102b26e926b3e73563267fc75cb30f9c (diff) | |
| download | go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.gz go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.bz2 go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.lz go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.xz go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.tar.zst go-tangerine-fd4e161497156a5d12fd8712f41574bc7fb20404.zip | |
Merge pull request #2752 from karalabe/revert-soft-fork
Revert faulty DAO soft-fork
Diffstat (limited to 'cmd/utils/flags.go')
| -rw-r--r-- | cmd/utils/flags.go | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index d8001e348..14898b987 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -181,10 +181,6 @@ var ( Usage: "Target gas limit sets the artificial target gas floor for the blocks to mine", Value: params.GenesisGasLimit.String(), } - DAOSoftForkFlag = cli.BoolFlag{ - Name: "dao-soft-fork", - Usage: "Vote for the DAO soft-fork, temporarilly decreasing the gas limits", - } AutoDAGFlag = cli.BoolFlag{ Name: "autodag", Usage: "Enable automatic DAG pregeneration", @@ -681,9 +677,6 @@ func MakeSystemNode(name, version string, relconf release.Config, extra []byte, // Configure the Ethereum service accman := MakeAccountManager(ctx) - // Handle some miner strategies arrising from the DAO fiasco - core.DAOSoftFork = ctx.GlobalBool(DAOSoftForkFlag.Name) - // initialise new random number generator rand := rand.New(rand.NewSource(time.Now().UnixNano())) // get enabled jit flag |