Removed some VMEnv & Added VmType() to vm.Environment

2 files changed, 14 insertions, 82 deletions

diff --git a/xeth/vm_env.go b/xeth/vm_env.go
deleted file mode 100644
index 1470b9eaa..000000000
--- a/xeth/vm_env.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package xeth
-
-import (
-	"math/big"
-
-	"github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
-)
-
-type VMEnv struct {
-	chain  *core.ChainManager
-	state  *state.StateDB
-	block  *types.Block
-	value  *big.Int
-	sender []byte
-
-	depth int
-}
-
-func NewEnv(chain *core.ChainManager, state *state.StateDB, block *types.Block, value *big.Int, sender []byte) *VMEnv {
-	return &VMEnv{
-		state:  state,
-		block:  block,
-		value:  value,
-		sender: sender,
-	}
-}
-
-func (self *VMEnv) Origin() []byte        { return self.sender }
-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) 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) Depth() int            { return self.depth }
-func (self *VMEnv) SetDepth(i int)        { self.depth = i }
-func (self *VMEnv) GetHash(n uint64) []byte {
-	if block := self.chain.GetBlockByNumber(n); block != nil {
-		return block.Hash()
-	}
-
-	return nil
-}
-func (self *VMEnv) AddLog(log state.Log) {
-	self.state.AddLog(log)
-}
-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) *core.Execution {
-	return core.NewExecution(self, addr, data, gas, price, value)
-}
-
-func (self *VMEnv) Call(me vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
-	exe := self.vm(addr, data, gas, price, value)
-	return exe.Call(addr, me)
-}
-func (self *VMEnv) CallCode(me vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
-	exe := self.vm(me.Address(), data, gas, price, value)
-	return exe.Call(addr, me)
-}
-
-func (self *VMEnv) Create(me vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) {
-	exe := self.vm(addr, data, gas, price, value)
-	return exe.Create(me)
-}
diff --git a/xeth/xeth.go b/xeth/xeth.go
index a65fa1331..0e71a0ed9 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -224,18 +224,22 @@ func (self *XEth) Call(toStr, valueStr, gasStr, gasPriceStr, dataStr string) (st
 	}
 
 	var (
-		statedb   = self.chainManager.TransState()
-		initiator = state.NewStateObject(self.eth.KeyManager().KeyPair().Address(), self.eth.Db())
-		block     = self.chainManager.CurrentBlock()
-		to        = statedb.GetOrNewStateObject(fromHex(toStr))
-		data      = fromHex(dataStr)
-		gas       = ethutil.Big(gasStr)
-		price     = ethutil.Big(gasPriceStr)
-		value     = ethutil.Big(valueStr)
+		statedb = self.chainManager.TransState()
+		key     = self.eth.KeyManager().KeyPair()
+		from    = state.NewStateObject(key.Address(), self.eth.Db())
+		block   = self.chainManager.CurrentBlock()
+		to      = statedb.GetOrNewStateObject(fromHex(toStr))
+		data    = fromHex(dataStr)
+		gas     = ethutil.Big(gasStr)
+		price   = ethutil.Big(gasPriceStr)
+		value   = ethutil.Big(valueStr)
 	)
 
-	vmenv := NewEnv(self.chainManager, statedb, block, value, initiator.Address())
-	res, err := vmenv.Call(initiator, to.Address(), data, gas, price, value)
+	msg := types.NewTransactionMessage(fromHex(toStr), value, gas, price, data)
+	msg.Sign(key.PrivateKey)
+	vmenv := core.NewEnv(statedb, self.chainManager, msg, block)
+
+	res, err := vmenv.Call(from, to.Address(), data, gas, price, value)
 	if err != nil {
 		return "", err
 	}