diff options
author | Péter Szilágyi <peterke@gmail.com> | 2016-06-29 16:44:51 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2016-06-29 16:44:51 +0800 |
commit | 6362a9d6102b26e926b3e73563267fc75cb30f9c (patch) | |
tree | 56ce21d1aaf6df3908335601a687f0f3ac4a50be /core/vm/runtime | |
parent | d55fc35df1ca4996048625421d4c475a437d273e (diff) | |
download | go-tangerine-6362a9d6102b26e926b3e73563267fc75cb30f9c.tar.gz go-tangerine-6362a9d6102b26e926b3e73563267fc75cb30f9c.tar.zst go-tangerine-6362a9d6102b26e926b3e73563267fc75cb30f9c.zip |
Revert "test, cmd/evm, core, core/vm: illegal code hash implementation"
This reverts commit 7a5b571c671e70e0e4807cf971c15e2d1e09d33d.
Diffstat (limited to 'core/vm/runtime')
-rw-r--r-- | core/vm/runtime/env.go | 26 | ||||
-rw-r--r-- | core/vm/runtime/runtime.go | 23 |
2 files changed, 22 insertions, 27 deletions
diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index c510be759..d8c98e545 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -27,10 +27,9 @@ import ( // Env is a basic runtime environment required for running the EVM. type Env struct { - ruleSet vm.RuleSet - depth int - state *state.StateDB - illegalHashes []common.Hash + ruleSet vm.RuleSet + depth int + state *state.StateDB origin common.Address coinbase common.Address @@ -50,15 +49,14 @@ type Env struct { // NewEnv returns a new vm.Environment func NewEnv(cfg *Config, state *state.StateDB) vm.Environment { env := &Env{ - 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, + ruleSet: cfg.RuleSet, + 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, @@ -81,8 +79,6 @@ func (self *Env) AddStructLog(log vm.StructLog) { self.logs = append(self.logs, log) } -func (self *Env) MarkCodeHash(hash common.Hash) {} - func (self *Env) RuleSet() vm.RuleSet { return self.ruleSet } func (self *Env) Vm() vm.Vm { return self.evm } func (self *Env) Origin() common.Address { return self.origin } diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 9b75fcaad..309d508c3 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -35,18 +35,17 @@ 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 - illegalHashes []common.Hash + 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 State *state.StateDB GetHashFn func(n uint64) common.Hash |