diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-06-24 18:09:36 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 18:09:36 +0800 |
| commit | 848dec3da2dae77ef50ea229cf430ff0171766ed (patch) | |
| tree | 06f7458835408f94116572d13d1bf0bf48b278f3 /cmd | |
| parent | ae0880997b7427d6f19fb8501b37f0168623f0c8 (diff) | |
| parent | ba784bdf36f2daf7827ec1ec864f3393ba8d86a0 (diff) | |
| download | dexon-848dec3da2dae77ef50ea229cf430ff0171766ed.tar dexon-848dec3da2dae77ef50ea229cf430ff0171766ed.tar.gz dexon-848dec3da2dae77ef50ea229cf430ff0171766ed.tar.bz2 dexon-848dec3da2dae77ef50ea229cf430ff0171766ed.tar.lz dexon-848dec3da2dae77ef50ea229cf430ff0171766ed.tar.xz dexon-848dec3da2dae77ef50ea229cf430ff0171766ed.tar.zst dexon-848dec3da2dae77ef50ea229cf430ff0171766ed.zip | |
Merge pull request #2725 from karalabe/obscuren-softfork-dao-2
DAO soft-fork
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, 10 insertions, 0 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go index aa48f6ede..ba7d8d8a8 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -220,6 +220,7 @@ 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 c372430f1..95aad3bea 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -169,6 +169,7 @@ 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 e7ef9e2c7..10bc56b97 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -128,6 +128,7 @@ var AppHelpFlagGroups = []flagGroup{ utils.TargetGasLimitFlag, utils.GasPriceFlag, utils.ExtraDataFlag, + utils.DAOSoftForkFlag, }, }, { diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 14898b987..d8001e348 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -181,6 +181,10 @@ 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", @@ -677,6 +681,9 @@ 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 |