diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-02 17:30:27 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-02 17:30:27 +0800 |
| commit | 0fb1bcd32192b8bf05a328b955a08da4cefe0180 (patch) | |
| tree | 67460b927eb41b2876e8e6b7eb9dece494dbd088 /cmd/utils/vm_env.go | |
| parent | 8da07e91e40c1d1bb43763b7e959ae92e5770af2 (diff) | |
| parent | a4dc12f12c7a06f5e28d5b1e760249875ef7a8c5 (diff) | |
| download | go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.gz go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.bz2 go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.lz go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.xz go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.tar.zst go-tangerine-0fb1bcd32192b8bf05a328b955a08da4cefe0180.zip | |
Merge branch 'poc8' into docbranch
Diffstat (limited to 'cmd/utils/vm_env.go')
| -rw-r--r-- | cmd/utils/vm_env.go | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/cmd/utils/vm_env.go b/cmd/utils/vm_env.go index eb52602c4..be6249e82 100644 --- a/cmd/utils/vm_env.go +++ b/cmd/utils/vm_env.go @@ -30,15 +30,15 @@ func NewEnv(state *state.StateDB, block *types.Block, transactor []byte, value * } func (self *VMEnv) Origin() []byte { return self.transactor } -func (self *VMEnv) BlockNumber() *big.Int { return self.block.Number } -func (self *VMEnv) PrevHash() []byte { return self.block.PrevHash } -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) BlockNumber() *big.Int { return self.block.Number() } +func (self *VMEnv) PrevHash() []byte { return self.block.ParentHash() } +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) BlockHash() []byte { return self.block.Hash() } +func (self *VMEnv) GasLimit() *big.Int { return self.block.GasLimit() } func (self *VMEnv) Value() *big.Int { return self.value } func (self *VMEnv) State() *state.StateDB { return self.state } -func (self *VMEnv) GasLimit() *big.Int { return self.block.GasLimit } func (self *VMEnv) Depth() int { return self.depth } func (self *VMEnv) SetDepth(i int) { self.depth = i } func (self *VMEnv) AddLog(log state.Log) { @@ -49,9 +49,7 @@ func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error { } func (self *VMEnv) vm(addr, data []byte, gas, price, value *big.Int) *core.Execution { - evm := vm.New(self, vm.DebugVmTy) - - return core.NewExecution(evm, addr, data, gas, price, value) + return core.NewExecution(self, addr, data, gas, price, value) } func (self *VMEnv) Call(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) { |