diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 02:06:24 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2014-12-22 02:06:24 +0800 |
| commit | bab78bbeb691d95bdd0222435af0c11cb3485a79 (patch) | |
| tree | 804c9689546ce362a2862b00bb4e76160052f5d6 /core/vm_env.go | |
| parent | 7a79428278412ab1f73708af51bce063b000b7a7 (diff) | |
| parent | 1360f027d9e365242466ca346b2b56f421729d91 (diff) | |
| download | dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.gz dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.bz2 dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.lz dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.xz dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.tar.zst dexon-bab78bbeb691d95bdd0222435af0c11cb3485a79.zip | |
Merge branch 'tests' of github.com:ethereum/go-ethereum into tests
Diffstat (limited to 'core/vm_env.go')
| -rw-r--r-- | core/vm_env.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/core/vm_env.go b/core/vm_env.go index 9e1815188..ad63ecf9c 100644 --- a/core/vm_env.go +++ b/core/vm_env.go @@ -11,26 +11,26 @@ import ( type VMEnv struct { state *state.StateDB block *types.Block - tx *types.Transaction + msg Message depth int } -func NewEnv(state *state.StateDB, tx *types.Transaction, block *types.Block) *VMEnv { +func NewEnv(state *state.StateDB, msg Message, block *types.Block) *VMEnv { return &VMEnv{ state: state, block: block, - tx: tx, + msg: msg, } } -func (self *VMEnv) Origin() []byte { return self.tx.Sender() } +func (self *VMEnv) Origin() []byte { return self.msg.From() } 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) BlockHash() []byte { return self.block.Hash() } -func (self *VMEnv) Value() *big.Int { return self.tx.Value } +func (self *VMEnv) Value() *big.Int { return self.msg.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 } @@ -43,9 +43,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) *Execution { - evm := vm.New(self, vm.DebugVmTy) - - return NewExecution(evm, addr, data, gas, price, value) + return NewExecution(self, addr, data, gas, price, value) } func (self *VMEnv) Call(me vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) { |