Merge pull request #2752 from karalabe/revert-soft-fork

Revert faulty DAO soft-fork

3 files changed, 4 insertions, 10 deletions

diff --git a/core/vm/environment.go b/core/vm/environment.go
index 37817be9e..747627565 100644
--- a/core/vm/environment.go
+++ b/core/vm/environment.go
@@ -73,8 +73,6 @@ type Environment interface {
 	DelegateCall(me ContractRef, addr common.Address, data []byte, gas, price *big.Int) ([]byte, error)
 	// Create a new contract
 	Create(me ContractRef, data []byte, gas, price, value *big.Int) ([]byte, common.Address, error)
-	// Mark the code hash that was executed
-	MarkCodeHash(hash common.Hash)
 }
 
 // Vm is the basic interface for an implementation of the EVM.
@@ -98,7 +96,6 @@ type Database interface {
 
 	GetCode(common.Address) []byte
 	SetCode(common.Address, []byte)
-	GetCodeHash(common.Address) common.Hash
 
 	AddRefund(*big.Int)
 	GetRefund() *big.Int
diff --git a/core/vm/jit_test.go b/core/vm/jit_test.go
index a9ddd48a5..403c15a8d 100644
--- a/core/vm/jit_test.go
+++ b/core/vm/jit_test.go
@@ -175,11 +175,10 @@ func NewEnv(noJit, forceJit bool) *Env {
 	return env
 }
 
-func (self *Env) MarkCodeHash(common.Hash) {}
-func (self *Env) RuleSet() RuleSet         { return ruleSet{new(big.Int)} }
-func (self *Env) Vm() Vm                   { return self.evm }
-func (self *Env) Origin() common.Address   { return common.Address{} }
-func (self *Env) BlockNumber() *big.Int    { return big.NewInt(0) }
+func (self *Env) RuleSet() RuleSet       { return ruleSet{new(big.Int)} }
+func (self *Env) Vm() Vm                 { return self.evm }
+func (self *Env) Origin() common.Address { return common.Address{} }
+func (self *Env) BlockNumber() *big.Int  { return big.NewInt(0) }
 func (self *Env) AddStructLog(log StructLog) {
 }
 func (self *Env) StructLogs() []StructLog {
diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go
index 94adb0287..d8c98e545 100644
--- a/core/vm/runtime/env.go
+++ b/core/vm/runtime/env.go
@@ -79,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 }