converted vm

1 files changed, 19 insertions, 18 deletions

diff --git a/core/vm_env.go b/core/vm_env.go
index 7a921d7e3..fb4253f5b 100644
--- a/core/vm_env.go
+++ b/core/vm_env.go
@@ -28,24 +28,24 @@ func NewEnv(state *state.StateDB, chain *ChainManager, msg Message, block *types
 	}
 }
 
-func (self *VMEnv) Origin() common.Address { return self.msg.From() }
-func (self *VMEnv) BlockNumber() *big.Int  { return self.block.Number() }
-func (self *VMEnv) Coinbase() []byte       { return self.block.Coinbase() }
-func (self *VMEnv) Time() int64            { return self.block.Time() }
-func (self *VMEnv) Difficulty() *big.Int   { return self.block.Difficulty() }
-func (self *VMEnv) GasLimit() *big.Int     { return self.block.GasLimit() }
-func (self *VMEnv) Value() *big.Int        { return self.msg.Value() }
-func (self *VMEnv) State() *state.StateDB  { return self.state }
-func (self *VMEnv) Depth() int             { return self.depth }
-func (self *VMEnv) SetDepth(i int)         { self.depth = i }
-func (self *VMEnv) VmType() vm.Type        { return self.typ }
-func (self *VMEnv) SetVmType(t vm.Type)    { self.typ = t }
-func (self *VMEnv) GetHash(n uint64) []byte {
+func (self *VMEnv) Origin() common.Address   { return self.msg.From() }
+func (self *VMEnv) BlockNumber() *big.Int    { return self.block.Number() }
+func (self *VMEnv) Coinbase() common.Address { return self.block.Coinbase() }
+func (self *VMEnv) Time() int64              { return self.block.Time() }
+func (self *VMEnv) Difficulty() *big.Int     { return self.block.Difficulty() }
+func (self *VMEnv) GasLimit() *big.Int       { return self.block.GasLimit() }
+func (self *VMEnv) Value() *big.Int          { return self.msg.Value() }
+func (self *VMEnv) State() *state.StateDB    { return self.state }
+func (self *VMEnv) Depth() int               { return self.depth }
+func (self *VMEnv) SetDepth(i int)           { self.depth = i }
+func (self *VMEnv) VmType() vm.Type          { return self.typ }
+func (self *VMEnv) SetVmType(t vm.Type)      { self.typ = t }
+func (self *VMEnv) GetHash(n uint64) common.Hash {
 	if block := self.chain.GetBlockByNumber(n); block != nil {
 		return block.Hash()
 	}
 
-	return nil
+	return common.Hash{}
 }
 func (self *VMEnv) AddLog(log state.Log) {
 	self.state.AddLog(log)
@@ -54,20 +54,21 @@ func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
 	return vm.Transfer(from, to, amount)
 }
 
-func (self *VMEnv) vm(addr, data []byte, gas, price, value *big.Int) *Execution {
+func (self *VMEnv) vm(addr *common.Address, data []byte, gas, price, value *big.Int) *Execution {
 	return NewExecution(self, addr, data, gas, price, value)
 }
 
 func (self *VMEnv) Call(me vm.ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
-	exe := self.vm(addr, data, gas, price, value)
+	exe := self.vm(&addr, data, gas, price, value)
 	return exe.Call(addr, me)
 }
 func (self *VMEnv) CallCode(me vm.ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error) {
-	exe := self.vm(me.Address(), data, gas, price, value)
+	maddr := me.Address()
+	exe := self.vm(&maddr, data, gas, price, value)
 	return exe.Call(addr, me)
 }
 
 func (self *VMEnv) Create(me vm.ContextRef, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) {
-	exe := self.vm(common.Address{}, data, gas, price, value)
+	exe := self.vm(nil, data, gas, price, value)
 	return exe.Create(me)
 }