diff options
author | Péter Szilágyi <peterke@gmail.com> | 2016-06-29 16:44:29 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2016-06-29 16:44:29 +0800 |
commit | 67e9d3348679d87cca127de4da8eb4223c43aae2 (patch) | |
tree | c20eb3ea801347e6d4c67ab4aca16f0d4a5b25a7 /core/vm/runtime | |
parent | 219859f8bbfa3a1549d02f6bcbaa41db55b4b8fe (diff) | |
download | dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar.gz dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar.bz2 dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar.lz dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar.xz dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.tar.zst dexon-67e9d3348679d87cca127de4da8eb4223c43aae2.zip |
Revert "core: update DAO soft-fork number, clean up the code"
This reverts commit ba784bdf36f2daf7827ec1ec864f3393ba8d86a0.
Diffstat (limited to 'core/vm/runtime')
-rw-r--r-- | core/vm/runtime/env.go | 24 | ||||
-rw-r--r-- | core/vm/runtime/runtime.go | 23 |
2 files changed, 25 insertions, 22 deletions
diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 94adb0287..c510be759 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -27,9 +27,10 @@ import ( // Env is a basic runtime environment required for running the EVM. type Env struct { - ruleSet vm.RuleSet - depth int - state *state.StateDB + ruleSet vm.RuleSet + depth int + state *state.StateDB + illegalHashes []common.Hash origin common.Address coinbase common.Address @@ -49,14 +50,15 @@ type Env struct { // NewEnv returns a new vm.Environment func NewEnv(cfg *Config, state *state.StateDB) vm.Environment { env := &Env{ - ruleSet: cfg.RuleSet, - state: state, - origin: cfg.Origin, - coinbase: cfg.Coinbase, - number: cfg.BlockNumber, - time: cfg.Time, - difficulty: cfg.Difficulty, - gasLimit: cfg.GasLimit, + ruleSet: cfg.RuleSet, + illegalHashes: cfg.illegalHashes, + state: state, + origin: cfg.Origin, + coinbase: cfg.Coinbase, + number: cfg.BlockNumber, + time: cfg.Time, + difficulty: cfg.Difficulty, + gasLimit: cfg.GasLimit, } env.evm = vm.New(env, vm.Config{ Debug: cfg.Debug, diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 309d508c3..9b75fcaad 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -35,17 +35,18 @@ func (ruleSet) IsHomestead(*big.Int) bool { return true } // Config is a basic type specifying certain configuration flags for running // the EVM. type Config struct { - RuleSet vm.RuleSet - Difficulty *big.Int - Origin common.Address - Coinbase common.Address - BlockNumber *big.Int - Time *big.Int - GasLimit *big.Int - GasPrice *big.Int - Value *big.Int - DisableJit bool // "disable" so it's enabled by default - Debug bool + RuleSet vm.RuleSet + Difficulty *big.Int + Origin common.Address + Coinbase common.Address + BlockNumber *big.Int + Time *big.Int + GasLimit *big.Int + GasPrice *big.Int + Value *big.Int + DisableJit bool // "disable" so it's enabled by default + Debug bool + illegalHashes []common.Hash State *state.StateDB GetHashFn func(n uint64) common.Hash |