diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/evm/main.go | 1 | ||||
| -rw-r--r-- | cmd/geth/main.go | 1 | ||||
| -rw-r--r-- | cmd/geth/usage.go | 1 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 7 |
4 files changed, 0 insertions, 10 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go index ba7d8d8a8..aa48f6ede 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -220,7 +220,6 @@ type ruleSet struct{} func (ruleSet) IsHomestead(*big.Int) bool { return true } -func (self *VMEnv) MarkCodeHash(common.Hash) {} func (self *VMEnv) RuleSet() vm.RuleSet { return ruleSet{} } func (self *VMEnv) Vm() vm.Vm { return self.evm } func (self *VMEnv) Db() vm.Database { return self.state } diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 95aad3bea..c372430f1 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -169,7 +169,6 @@ participating. utils.MiningGPUFlag, utils.AutoDAGFlag, utils.TargetGasLimitFlag, - utils.DAOSoftForkFlag, utils.NATFlag, utils.NatspecEnabledFlag, utils.NoDiscoverFlag, diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 10bc56b97..e7ef9e2c7 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -128,7 +128,6 @@ var AppHelpFlagGroups = []flagGroup{ utils.TargetGasLimitFlag, utils.GasPriceFlag, utils.ExtraDataFlag, - utils.DAOSoftForkFlag, }, }, { 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 |