moved state and vm to core

41 files changed, 3561 insertions, 18 deletions

diff --git a/core/asm.go b/core/asm.go
index fc3493fe1..f40c07904 100644
--- a/core/asm.go
+++ b/core/asm.go
@@ -5,7 +5,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 func Disassemble(script []byte) (asm []string) {
diff --git a/core/block_processor.go b/core/block_processor.go
index ae8d5fe7b..4bcede85e 100644
--- a/core/block_processor.go
+++ b/core/block_processor.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/pow"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 	"gopkg.in/fatih/set.v0"
 )
 
diff --git a/core/chain_makers.go b/core/chain_makers.go
index e3001331c..d559b2a3a 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -8,7 +8,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/pow"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 // So we can generate blocks easily
diff --git a/core/chain_manager.go b/core/chain_manager.go
index a3be3878f..3e030838a 100644
--- a/core/chain_manager.go
+++ b/core/chain_manager.go
@@ -12,7 +12,7 @@ import (
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 var (
diff --git a/core/events.go b/core/events.go
index b93f27c51..3da668af5 100644
--- a/core/events.go
+++ b/core/events.go
@@ -2,7 +2,7 @@ package core
 
 import (
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 // TxPreEvent is posted when a transaction enters the transaction pool.
diff --git a/core/execution.go b/core/execution.go
index 4f15fb42a..92d932a9f 100644
--- a/core/execution.go
+++ b/core/execution.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 type Execution struct {
diff --git a/core/filter.go b/core/filter.go
index b5d9deb7a..901931d99 100644
--- a/core/filter.go
+++ b/core/filter.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type AccountChange struct {
diff --git a/core/genesis.go b/core/genesis.go
index 3e00533ae..e0d3e51b8 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 /*
diff --git a/core/state/dump.go b/core/state/dump.go
new file mode 100644
index 000000000..712f8da1f
--- /dev/null
+++ b/core/state/dump.go
@@ -0,0 +1,62 @@
+package state
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type Account struct {
+	Balance  string            `json:"balance"`
+	Nonce    uint64            `json:"nonce"`
+	Root     string            `json:"root"`
+	CodeHash string            `json:"codeHash"`
+	Storage  map[string]string `json:"storage"`
+}
+
+type World struct {
+	Root     string             `json:"root"`
+	Accounts map[string]Account `json:"accounts"`
+}
+
+func (self *StateDB) RawDump() World {
+	world := World{
+		Root:     common.Bytes2Hex(self.trie.Root()),
+		Accounts: make(map[string]Account),
+	}
+
+	it := self.trie.Iterator()
+	for it.Next() {
+		stateObject := NewStateObjectFromBytes(common.BytesToAddress(it.Key), it.Value, self.db)
+
+		account := Account{Balance: stateObject.balance.String(), Nonce: stateObject.nonce, Root: common.Bytes2Hex(stateObject.Root()), CodeHash: common.Bytes2Hex(stateObject.codeHash)}
+		account.Storage = make(map[string]string)
+
+		storageIt := stateObject.State.trie.Iterator()
+		for storageIt.Next() {
+			fmt.Println("value", storageIt.Value)
+			account.Storage[common.Bytes2Hex(storageIt.Key)] = common.Bytes2Hex(storageIt.Value)
+		}
+		world.Accounts[common.Bytes2Hex(it.Key)] = account
+	}
+	return world
+}
+
+func (self *StateDB) Dump() []byte {
+	json, err := json.MarshalIndent(self.RawDump(), "", "    ")
+	if err != nil {
+		fmt.Println("dump err", err)
+	}
+
+	return json
+}
+
+// Debug stuff
+func (self *StateObject) CreateOutputForDiff() {
+	fmt.Printf("%x %x %x %x\n", self.Address(), self.State.Root(), self.balance.Bytes(), self.nonce)
+	it := self.State.trie.Iterator()
+	for it.Next() {
+		fmt.Printf("%x %x\n", it.Key, it.Value)
+	}
+}
diff --git a/core/state/errors.go b/core/state/errors.go
new file mode 100644
index 000000000..5a847d38b
--- /dev/null
+++ b/core/state/errors.go
@@ -0,0 +1,23 @@
+package state
+
+import (
+	"fmt"
+	"math/big"
+)
+
+type GasLimitErr struct {
+	Message string
+	Is, Max *big.Int
+}
+
+func IsGasLimitErr(err error) bool {
+	_, ok := err.(*GasLimitErr)
+
+	return ok
+}
+func (err *GasLimitErr) Error() string {
+	return err.Message
+}
+func GasLimitError(is, max *big.Int) *GasLimitErr {
+	return &GasLimitErr{Message: fmt.Sprintf("GasLimit error. Max %s, transaction would take it to %s", max, is), Is: is, Max: max}
+}
diff --git a/core/state/log.go b/core/state/log.go
new file mode 100644
index 000000000..f8aa4c08c
--- /dev/null
+++ b/core/state/log.go
@@ -0,0 +1,99 @@
+package state
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/rlp"
+)
+
+type Log interface {
+	Address() common.Address
+	Topics() []common.Hash
+	Data() []byte
+
+	Number() uint64
+}
+
+type StateLog struct {
+	address common.Address
+	topics  []common.Hash
+	data    []byte
+	number  uint64
+}
+
+func NewLog(address common.Address, topics []common.Hash, data []byte, number uint64) *StateLog {
+	return &StateLog{address, topics, data, number}
+}
+
+func (self *StateLog) Address() common.Address {
+	return self.address
+}
+
+func (self *StateLog) Topics() []common.Hash {
+	return self.topics
+}
+
+func (self *StateLog) Data() []byte {
+	return self.data
+}
+
+func (self *StateLog) Number() uint64 {
+	return self.number
+}
+
+/*
+func NewLogFromValue(decoder *common.Value) *StateLog {
+	var extlog struct {
+
+	}
+
+	log := &StateLog{
+		address: decoder.Get(0).Bytes(),
+		data:    decoder.Get(2).Bytes(),
+	}
+
+	it := decoder.Get(1).NewIterator()
+	for it.Next() {
+		log.topics = append(log.topics, it.Value().Bytes())
+	}
+
+	return log
+}
+*/
+
+func (self *StateLog) EncodeRLP(w io.Writer) error {
+	return rlp.Encode(w, []interface{}{self.address, self.topics, self.data})
+}
+
+/*
+func (self *StateLog) RlpData() interface{} {
+	return []interface{}{self.address, common.ByteSliceToInterface(self.topics), self.data}
+}
+*/
+
+func (self *StateLog) String() string {
+	return fmt.Sprintf(`log: %x %x %x`, self.address, self.topics, self.data)
+}
+
+type Logs []Log
+
+/*
+func (self Logs) RlpData() interface{} {
+	data := make([]interface{}, len(self))
+	for i, log := range self {
+		data[i] = log.RlpData()
+	}
+
+	return data
+}
+*/
+
+func (self Logs) String() (ret string) {
+	for _, log := range self {
+		ret += fmt.Sprintf("%v", log)
+	}
+
+	return "[" + ret + "]"
+}
diff --git a/core/state/main_test.go b/core/state/main_test.go
new file mode 100644
index 000000000..f3d3f7e23
--- /dev/null
+++ b/core/state/main_test.go
@@ -0,0 +1,9 @@
+package state
+
+import (
+	"testing"
+
+	checker "gopkg.in/check.v1"
+)
+
+func Test(t *testing.T) { checker.TestingT(t) }
diff --git a/core/state/managed_state.go b/core/state/managed_state.go
new file mode 100644
index 000000000..0fcc1be67
--- /dev/null
+++ b/core/state/managed_state.go
@@ -0,0 +1,89 @@
+package state
+
+import (
+	"sync"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type account struct {
+	stateObject *StateObject
+	nstart      uint64
+	nonces      []bool
+}
+
+type ManagedState struct {
+	*StateDB
+
+	mu sync.RWMutex
+
+	accounts map[string]*account
+}
+
+func ManageState(statedb *StateDB) *ManagedState {
+	return &ManagedState{
+		StateDB:  statedb,
+		accounts: make(map[string]*account),
+	}
+}
+
+func (ms *ManagedState) SetState(statedb *StateDB) {
+	ms.mu.Lock()
+	defer ms.mu.Unlock()
+	ms.StateDB = statedb
+}
+
+func (ms *ManagedState) RemoveNonce(addr common.Address, n uint64) {
+	if ms.hasAccount(addr) {
+		ms.mu.Lock()
+		defer ms.mu.Unlock()
+
+		account := ms.getAccount(addr)
+		if n-account.nstart <= uint64(len(account.nonces)) {
+			reslice := make([]bool, n-account.nstart)
+			copy(reslice, account.nonces[:n-account.nstart])
+			account.nonces = reslice
+		}
+	}
+}
+
+func (ms *ManagedState) NewNonce(addr common.Address) uint64 {
+	ms.mu.RLock()
+	defer ms.mu.RUnlock()
+
+	account := ms.getAccount(addr)
+	for i, nonce := range account.nonces {
+		if !nonce {
+			return account.nstart + uint64(i)
+		}
+	}
+	account.nonces = append(account.nonces, true)
+	return uint64(len(account.nonces)) + account.nstart
+}
+
+func (ms *ManagedState) hasAccount(addr common.Address) bool {
+	_, ok := ms.accounts[addr.Str()]
+	return ok
+}
+
+func (ms *ManagedState) getAccount(addr common.Address) *account {
+	straddr := addr.Str()
+	if account, ok := ms.accounts[straddr]; !ok {
+		so := ms.GetOrNewStateObject(addr)
+		ms.accounts[straddr] = newAccount(so)
+	} else {
+		// Always make sure the state account nonce isn't actually higher
+		// than the tracked one.
+		so := ms.StateDB.GetStateObject(addr)
+		if so != nil && uint64(len(account.nonces))+account.nstart < so.nonce {
+			ms.accounts[straddr] = newAccount(so)
+		}
+
+	}
+
+	return ms.accounts[straddr]
+}
+
+func newAccount(so *StateObject) *account {
+	return &account{so, so.nonce - 1, nil}
+}
diff --git a/core/state/managed_state_test.go b/core/state/managed_state_test.go
new file mode 100644
index 000000000..b61f59e6d
--- /dev/null
+++ b/core/state/managed_state_test.go
@@ -0,0 +1,89 @@
+package state
+
+import (
+	"testing"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+var addr = common.BytesToAddress([]byte("test"))
+
+func create() (*ManagedState, *account) {
+	ms := ManageState(&StateDB{stateObjects: make(map[string]*StateObject)})
+	so := &StateObject{address: addr, nonce: 100}
+	ms.StateDB.stateObjects[addr.Str()] = so
+	ms.accounts[addr.Str()] = newAccount(so)
+
+	return ms, ms.accounts[addr.Str()]
+}
+
+func TestNewNonce(t *testing.T) {
+	ms, _ := create()
+
+	nonce := ms.NewNonce(addr)
+	if nonce != 100 {
+		t.Error("expected nonce 100. got", nonce)
+	}
+
+	nonce = ms.NewNonce(addr)
+	if nonce != 101 {
+		t.Error("expected nonce 101. got", nonce)
+	}
+}
+
+func TestRemove(t *testing.T) {
+	ms, account := create()
+
+	nn := make([]bool, 10)
+	for i, _ := range nn {
+		nn[i] = true
+	}
+	account.nonces = append(account.nonces, nn...)
+
+	i := uint64(5)
+	ms.RemoveNonce(addr, account.nstart+i)
+	if len(account.nonces) != 5 {
+		t.Error("expected", i, "'th index to be false")
+	}
+}
+
+func TestReuse(t *testing.T) {
+	ms, account := create()
+
+	nn := make([]bool, 10)
+	for i, _ := range nn {
+		nn[i] = true
+	}
+	account.nonces = append(account.nonces, nn...)
+
+	i := uint64(5)
+	ms.RemoveNonce(addr, account.nstart+i)
+	nonce := ms.NewNonce(addr)
+	if nonce != 105 {
+		t.Error("expected nonce to be 105. got", nonce)
+	}
+}
+
+func TestRemoteNonceChange(t *testing.T) {
+	ms, account := create()
+	nn := make([]bool, 10)
+	for i, _ := range nn {
+		nn[i] = true
+	}
+	account.nonces = append(account.nonces, nn...)
+	nonce := ms.NewNonce(addr)
+
+	ms.StateDB.stateObjects[addr.Str()].nonce = 200
+	nonce = ms.NewNonce(addr)
+	if nonce != 200 {
+		t.Error("expected nonce after remote update to be", 201, "got", nonce)
+	}
+	ms.NewNonce(addr)
+	ms.NewNonce(addr)
+	ms.NewNonce(addr)
+	ms.StateDB.stateObjects[addr.Str()].nonce = 200
+	nonce = ms.NewNonce(addr)
+	if nonce != 204 {
+		t.Error("expected nonce after remote update to be", 201, "got", nonce)
+	}
+}
diff --git a/core/state/state_object.go b/core/state/state_object.go
new file mode 100644
index 000000000..a7c20722c
--- /dev/null
+++ b/core/state/state_object.go
@@ -0,0 +1,357 @@
+package state
+
+import (
+	"bytes"
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/ethereum/go-ethereum/trie"
+)
+
+type Code []byte
+
+func (self Code) String() string {
+	return string(self) //strings.Join(Disassemble(self), " ")
+}
+
+type Storage map[string]*common.Value
+
+func (self Storage) String() (str string) {
+	for key, value := range self {
+		str += fmt.Sprintf("%X : %X\n", key, value.Bytes())
+	}
+
+	return
+}
+
+func (self Storage) Copy() Storage {
+	cpy := make(Storage)
+	for key, value := range self {
+		// XXX Do we need a 'value' copy or is this sufficient?
+		cpy[key] = value
+	}
+
+	return cpy
+}
+
+type StateObject struct {
+	// State database for storing state changes
+	db common.Database
+	// The state object
+	State *StateDB
+
+	// Address belonging to this account
+	address common.Address
+	// The balance of the account
+	balance *big.Int
+	// The nonce of the account
+	nonce uint64
+	// The code hash if code is present (i.e. a contract)
+	codeHash []byte
+	// The code for this account
+	code Code
+	// Temporarily initialisation code
+	initCode Code
+	// Cached storage (flushed when updated)
+	storage Storage
+	// Temporary prepaid gas, reward after transition
+	prepaid *big.Int
+
+	// Total gas pool is the total amount of gas currently
+	// left if this object is the coinbase. Gas is directly
+	// purchased of the coinbase.
+	gasPool *big.Int
+
+	// Mark for deletion
+	// When an object is marked for deletion it will be delete from the trie
+	// during the "update" phase of the state transition
+	remove bool
+	dirty  bool
+}
+
+func (self *StateObject) Reset() {
+	self.storage = make(Storage)
+	self.State.Reset()
+}
+
+func NewStateObject(address common.Address, db common.Database) *StateObject {
+	// This to ensure that it has 20 bytes (and not 0 bytes), thus left or right pad doesn't matter.
+	//address := common.ToAddress(addr)
+
+	object := &StateObject{db: db, address: address, balance: new(big.Int), gasPool: new(big.Int), dirty: true}
+	object.State = New(common.Hash{}, db) //New(trie.New(common.Config.Db, ""))
+	object.storage = make(Storage)
+	object.gasPool = new(big.Int)
+	object.prepaid = new(big.Int)
+
+	return object
+}
+
+func NewStateObjectFromBytes(address common.Address, data []byte, db common.Database) *StateObject {
+	// TODO clean me up
+	var extobject struct {
+		Nonce    uint64
+		Balance  *big.Int
+		Root     common.Hash
+		CodeHash []byte
+	}
+	err := rlp.Decode(bytes.NewReader(data), &extobject)
+	if err != nil {
+		fmt.Println(err)
+		return nil
+	}
+
+	object := &StateObject{address: address, db: db}
+	//object.RlpDecode(data)
+	object.nonce = extobject.Nonce
+	object.balance = extobject.Balance
+	object.codeHash = extobject.CodeHash
+	object.State = New(extobject.Root, db)
+	object.storage = make(map[string]*common.Value)
+	object.gasPool = new(big.Int)
+	object.prepaid = new(big.Int)
+	object.code, _ = db.Get(extobject.CodeHash)
+
+	return object
+}
+
+func (self *StateObject) MarkForDeletion() {
+	self.remove = true
+	self.dirty = true
+	statelogger.Debugf("%x: #%d %v X\n", self.Address(), self.nonce, self.balance)
+}
+
+func (c *StateObject) getAddr(addr common.Hash) *common.Value {
+	return common.NewValueFromBytes([]byte(c.State.trie.Get(addr[:])))
+}
+
+func (c *StateObject) setAddr(addr []byte, value interface{}) {
+	c.State.trie.Update(addr, common.Encode(value))
+}
+
+func (self *StateObject) GetStorage(key *big.Int) *common.Value {
+	return self.GetState(common.BytesToHash(key.Bytes()))
+}
+func (self *StateObject) SetStorage(key *big.Int, value *common.Value) {
+	self.SetState(common.BytesToHash(key.Bytes()), value)
+}
+
+func (self *StateObject) Storage() Storage {
+	return self.storage
+}
+
+func (self *StateObject) GetState(key common.Hash) *common.Value {
+	strkey := key.Str()
+	value := self.storage[strkey]
+	if value == nil {
+		value = self.getAddr(key)
+
+		if !value.IsNil() {
+			self.storage[strkey] = value
+		}
+	}
+
+	return value
+}
+
+func (self *StateObject) SetState(k common.Hash, value *common.Value) {
+	self.storage[k.Str()] = value.Copy()
+	self.dirty = true
+}
+
+func (self *StateObject) Sync() {
+	for key, value := range self.storage {
+		if value.Len() == 0 {
+			self.State.trie.Delete([]byte(key))
+			continue
+		}
+
+		self.setAddr([]byte(key), value)
+	}
+	self.storage = make(Storage)
+}
+
+func (c *StateObject) GetInstr(pc *big.Int) *common.Value {
+	if int64(len(c.code)-1) < pc.Int64() {
+		return common.NewValue(0)
+	}
+
+	return common.NewValueFromBytes([]byte{c.code[pc.Int64()]})
+}
+
+func (c *StateObject) AddBalance(amount *big.Int) {
+	c.SetBalance(new(big.Int).Add(c.balance, amount))
+
+	statelogger.Debugf("%x: #%d %v (+ %v)\n", c.Address(), c.nonce, c.balance, amount)
+}
+
+func (c *StateObject) SubBalance(amount *big.Int) {
+	c.SetBalance(new(big.Int).Sub(c.balance, amount))
+
+	statelogger.Debugf("%x: #%d %v (- %v)\n", c.Address(), c.nonce, c.balance, amount)
+}
+
+func (c *StateObject) SetBalance(amount *big.Int) {
+	c.balance = amount
+	c.dirty = true
+}
+
+func (c *StateObject) St() Storage {
+	return c.storage
+}
+
+//
+// Gas setters and getters
+//
+
+// Return the gas back to the origin. Used by the Virtual machine or Closures
+func (c *StateObject) ReturnGas(gas, price *big.Int) {}
+func (c *StateObject) ConvertGas(gas, price *big.Int) error {
+	total := new(big.Int).Mul(gas, price)
+	if total.Cmp(c.balance) > 0 {
+		return fmt.Errorf("insufficient amount: %v, %v", c.balance, total)
+	}
+
+	c.SubBalance(total)
+
+	c.dirty = true
+
+	return nil
+}
+
+func (self *StateObject) SetGasPool(gasLimit *big.Int) {
+	self.gasPool = new(big.Int).Set(gasLimit)
+
+	statelogger.Debugf("%x: gas (+ %v)", self.Address(), self.gasPool)
+}
+
+func (self *StateObject) BuyGas(gas, price *big.Int) error {
+	if self.gasPool.Cmp(gas) < 0 {
+		return GasLimitError(self.gasPool, gas)
+	}
+
+	self.gasPool.Sub(self.gasPool, gas)
+
+	rGas := new(big.Int).Set(gas)
+	rGas.Mul(rGas, price)
+
+	self.dirty = true
+
+	return nil
+}
+
+func (self *StateObject) RefundGas(gas, price *big.Int) {
+	self.gasPool.Add(self.gasPool, gas)
+}
+
+func (self *StateObject) Copy() *StateObject {
+	stateObject := NewStateObject(self.Address(), self.db)
+	stateObject.balance.Set(self.balance)
+	stateObject.codeHash = common.CopyBytes(self.codeHash)
+	stateObject.nonce = self.nonce
+	if self.State != nil {
+		stateObject.State = self.State.Copy()
+	}
+	stateObject.code = common.CopyBytes(self.code)
+	stateObject.initCode = common.CopyBytes(self.initCode)
+	stateObject.storage = self.storage.Copy()
+	stateObject.gasPool.Set(self.gasPool)
+	stateObject.remove = self.remove
+	stateObject.dirty = self.dirty
+
+	return stateObject
+}
+
+func (self *StateObject) Set(stateObject *StateObject) {
+	*self = *stateObject
+}
+
+//
+// Attribute accessors
+//
+
+func (self *StateObject) Balance() *big.Int {
+	return self.balance
+}
+
+func (c *StateObject) N() *big.Int {
+	return big.NewInt(int64(c.nonce))
+}
+
+// Returns the address of the contract/account
+func (c *StateObject) Address() common.Address {
+	return c.address
+}
+
+// Returns the initialization Code
+func (c *StateObject) Init() Code {
+	return c.initCode
+}
+
+func (self *StateObject) Trie() *trie.SecureTrie {
+	return self.State.trie
+}
+
+func (self *StateObject) Root() []byte {
+	return self.Trie().Root()
+}
+
+func (self *StateObject) Code() []byte {
+	return self.code
+}
+
+func (self *StateObject) SetCode(code []byte) {
+	self.code = code
+	self.dirty = true
+}
+
+func (self *StateObject) SetInitCode(code []byte) {
+	self.initCode = code
+	self.dirty = true
+}
+
+func (self *StateObject) SetNonce(nonce uint64) {
+	self.nonce = nonce
+	self.dirty = true
+}
+
+func (self *StateObject) Nonce() uint64 {
+	return self.nonce
+}
+
+//
+// Encoding
+//
+
+// State object encoding methods
+func (c *StateObject) RlpEncode() []byte {
+	return common.Encode([]interface{}{c.nonce, c.balance, c.Root(), c.CodeHash()})
+}
+
+func (c *StateObject) CodeHash() common.Bytes {
+	return crypto.Sha3(c.code)
+}
+
+func (c *StateObject) RlpDecode(data []byte) {
+	decoder := common.NewValueFromBytes(data)
+	c.nonce = decoder.Get(0).Uint()
+	c.balance = decoder.Get(1).BigInt()
+	c.State = New(common.BytesToHash(decoder.Get(2).Bytes()), c.db) //New(trie.New(common.Config.Db, decoder.Get(2).Interface()))
+	c.storage = make(map[string]*common.Value)
+	c.gasPool = new(big.Int)
+
+	c.codeHash = decoder.Get(3).Bytes()
+
+	c.code, _ = c.db.Get(c.codeHash)
+}
+
+// Storage change object. Used by the manifest for notifying changes to
+// the sub channels.
+type StorageState struct {
+	StateAddress []byte
+	Address      []byte
+	Value        *big.Int
+}
diff --git a/core/state/state_test.go b/core/state/state_test.go
new file mode 100644
index 000000000..a3d3973de
--- /dev/null
+++ b/core/state/state_test.go
@@ -0,0 +1,106 @@
+package state
+
+import (
+	"math/big"
+	"testing"
+
+	checker "gopkg.in/check.v1"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/ethdb"
+)
+
+type StateSuite struct {
+	state *StateDB
+}
+
+var _ = checker.Suite(&StateSuite{})
+
+var toAddr = common.BytesToAddress
+
+func (s *StateSuite) TestDump(c *checker.C) {
+	return
+	// generate a few entries
+	obj1 := s.state.GetOrNewStateObject(toAddr([]byte{0x01}))
+	obj1.AddBalance(big.NewInt(22))
+	obj2 := s.state.GetOrNewStateObject(toAddr([]byte{0x01, 0x02}))
+	obj2.SetCode([]byte{3, 3, 3, 3, 3, 3, 3})
+	obj3 := s.state.GetOrNewStateObject(toAddr([]byte{0x02}))
+	obj3.SetBalance(big.NewInt(44))
+
+	// write some of them to the trie
+	s.state.UpdateStateObject(obj1)
+	s.state.UpdateStateObject(obj2)
+
+	// check that dump contains the state objects that are in trie
+	got := string(s.state.Dump())
+	want := `{
+    "root": "6e277ae8357d013e50f74eedb66a991f6922f93ae03714de58b3d0c5e9eee53f",
+    "accounts": {
+        "1468288056310c82aa4c01a7e12a10f8111a0560e72b700555479031b86c357d": {
+            "balance": "22",
+            "nonce": 0,
+            "root": "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "codeHash": "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
+            "storage": {}
+        },
+        "a17eacbc25cda025e81db9c5c62868822c73ce097cee2a63e33a2e41268358a1": {
+            "balance": "0",
+            "nonce": 0,
+            "root": "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "codeHash": "87874902497a5bb968da31a2998d8f22e949d1ef6214bcdedd8bae24cca4b9e3",
+            "storage": {}
+        }
+    }
+}`
+	if got != want {
+		c.Errorf("dump mismatch:\ngot: %s\nwant: %s\n", got, want)
+	}
+}
+
+func (s *StateSuite) SetUpTest(c *checker.C) {
+	db, _ := ethdb.NewMemDatabase()
+	s.state = New(common.Hash{}, db)
+}
+
+func TestNull(t *testing.T) {
+	db, _ := ethdb.NewMemDatabase()
+	state := New(common.Hash{}, db)
+
+	address := common.HexToAddress("0x823140710bf13990e4500136726d8b55")
+	state.NewStateObject(address)
+	//value := common.FromHex("0x823140710bf13990e4500136726d8b55")
+	value := make([]byte, 16)
+	state.SetState(address, common.Hash{}, value)
+	state.Update(nil)
+	state.Sync()
+	value = state.GetState(address, common.Hash{})
+}
+
+func (s *StateSuite) TestSnapshot(c *checker.C) {
+	stateobjaddr := toAddr([]byte("aa"))
+	storageaddr := common.Big("0")
+	data1 := common.NewValue(42)
+	data2 := common.NewValue(43)
+
+	// get state object
+	stateObject := s.state.GetOrNewStateObject(stateobjaddr)
+	// set inital state object value
+	stateObject.SetStorage(storageaddr, data1)
+	// get snapshot of current state
+	snapshot := s.state.Copy()
+
+	// get state object. is this strictly necessary?
+	stateObject = s.state.GetStateObject(stateobjaddr)
+	// set new state object value
+	stateObject.SetStorage(storageaddr, data2)
+	// restore snapshot
+	s.state.Set(snapshot)
+
+	// get state object
+	stateObject = s.state.GetStateObject(stateobjaddr)
+	// get state storage value
+	res := stateObject.GetStorage(storageaddr)
+
+	c.Assert(data1, checker.DeepEquals, res)
+}
diff --git a/core/state/statedb.go b/core/state/statedb.go
new file mode 100644
index 000000000..6fcd39dbc
--- /dev/null
+++ b/core/state/statedb.go
@@ -0,0 +1,325 @@
+package state
+
+import (
+	"bytes"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/logger"
+	"github.com/ethereum/go-ethereum/trie"
+)
+
+var statelogger = logger.NewLogger("STATE")
+
+// StateDBs within the ethereum protocol are used to store anything
+// within the merkle trie. StateDBs take care of caching and storing
+// nested states. It's the general query interface to retrieve:
+// * Contracts
+// * Accounts
+type StateDB struct {
+	db   common.Database
+	trie *trie.SecureTrie
+
+	stateObjects map[string]*StateObject
+
+	refund map[string]*big.Int
+
+	logs Logs
+}
+
+// Create a new state from a given trie
+func New(root common.Hash, db common.Database) *StateDB {
+	trie := trie.NewSecure(root[:], db)
+	return &StateDB{db: db, trie: trie, stateObjects: make(map[string]*StateObject), refund: make(map[string]*big.Int)}
+}
+
+func (self *StateDB) PrintRoot() {
+	self.trie.Trie.PrintRoot()
+}
+
+func (self *StateDB) EmptyLogs() {
+	self.logs = nil
+}
+
+func (self *StateDB) AddLog(log Log) {
+	self.logs = append(self.logs, log)
+}
+
+func (self *StateDB) Logs() Logs {
+	return self.logs
+}
+
+func (self *StateDB) Refund(address common.Address, gas *big.Int) {
+	addr := address.Str()
+	if self.refund[addr] == nil {
+		self.refund[addr] = new(big.Int)
+	}
+	self.refund[addr].Add(self.refund[addr], gas)
+}
+
+// Retrieve the balance from the given address or 0 if object not found
+func (self *StateDB) GetBalance(addr common.Address) *big.Int {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		return stateObject.balance
+	}
+
+	return common.Big0
+}
+
+func (self *StateDB) AddBalance(addr common.Address, amount *big.Int) {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		stateObject.AddBalance(amount)
+	}
+}
+
+func (self *StateDB) GetNonce(addr common.Address) uint64 {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		return stateObject.nonce
+	}
+
+	return 0
+}
+
+func (self *StateDB) GetCode(addr common.Address) []byte {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		return stateObject.code
+	}
+
+	return nil
+}
+
+func (self *StateDB) GetState(a common.Address, b common.Hash) []byte {
+	stateObject := self.GetStateObject(a)
+	if stateObject != nil {
+		return stateObject.GetState(b).Bytes()
+	}
+
+	return nil
+}
+
+func (self *StateDB) SetNonce(addr common.Address, nonce uint64) {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		stateObject.SetNonce(nonce)
+	}
+}
+
+func (self *StateDB) SetCode(addr common.Address, code []byte) {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		stateObject.SetCode(code)
+	}
+}
+
+func (self *StateDB) SetState(addr common.Address, key common.Hash, value interface{}) {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		stateObject.SetState(key, common.NewValue(value))
+	}
+}
+
+func (self *StateDB) Delete(addr common.Address) bool {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		stateObject.MarkForDeletion()
+		stateObject.balance = new(big.Int)
+
+		return true
+	}
+
+	return false
+}
+
+func (self *StateDB) IsDeleted(addr common.Address) bool {
+	stateObject := self.GetStateObject(addr)
+	if stateObject != nil {
+		return stateObject.remove
+	}
+	return false
+}
+
+//
+// Setting, updating & deleting state object methods
+//
+
+// Update the given state object and apply it to state trie
+func (self *StateDB) UpdateStateObject(stateObject *StateObject) {
+	//addr := stateObject.Address()
+
+	if len(stateObject.CodeHash()) > 0 {
+		self.db.Put(stateObject.CodeHash(), stateObject.code)
+	}
+
+	addr := stateObject.Address()
+	self.trie.Update(addr[:], stateObject.RlpEncode())
+}
+
+// Delete the given state object and delete it from the state trie
+func (self *StateDB) DeleteStateObject(stateObject *StateObject) {
+	addr := stateObject.Address()
+	self.trie.Delete(addr[:])
+
+	delete(self.stateObjects, addr.Str())
+}
+
+// Retrieve a state object given my the address. Nil if not found
+func (self *StateDB) GetStateObject(addr common.Address) *StateObject {
+	//addr = common.Address(addr)
+
+	stateObject := self.stateObjects[addr.Str()]
+	if stateObject != nil {
+		return stateObject
+	}
+
+	data := self.trie.Get(addr[:])
+	if len(data) == 0 {
+		return nil
+	}
+
+	stateObject = NewStateObjectFromBytes(addr, []byte(data), self.db)
+	self.SetStateObject(stateObject)
+
+	return stateObject
+}
+
+func (self *StateDB) SetStateObject(object *StateObject) {
+	self.stateObjects[object.Address().Str()] = object
+}
+
+// Retrieve a state object or create a new state object if nil
+func (self *StateDB) GetOrNewStateObject(addr common.Address) *StateObject {
+	stateObject := self.GetStateObject(addr)
+	if stateObject == nil {
+		stateObject = self.NewStateObject(addr)
+	}
+
+	return stateObject
+}
+
+// Create a state object whether it exist in the trie or not
+func (self *StateDB) NewStateObject(addr common.Address) *StateObject {
+	//addr = common.Address(addr)
+
+	statelogger.Debugf("(+) %x\n", addr)
+
+	stateObject := NewStateObject(addr, self.db)
+	self.stateObjects[addr.Str()] = stateObject
+
+	return stateObject
+}
+
+// Deprecated
+func (self *StateDB) GetAccount(addr common.Address) *StateObject {
+	return self.GetOrNewStateObject(addr)
+}
+
+//
+// Setting, copying of the state methods
+//
+
+func (s *StateDB) Cmp(other *StateDB) bool {
+	return bytes.Equal(s.trie.Root(), other.trie.Root())
+}
+
+func (self *StateDB) Copy() *StateDB {
+	state := New(common.Hash{}, self.db)
+	state.trie = self.trie.Copy()
+	for k, stateObject := range self.stateObjects {
+		state.stateObjects[k] = stateObject.Copy()
+	}
+
+	for addr, refund := range self.refund {
+		state.refund[addr] = new(big.Int).Set(refund)
+	}
+
+	logs := make(Logs, len(self.logs))
+	copy(logs, self.logs)
+	state.logs = logs
+
+	return state
+}
+
+func (self *StateDB) Set(state *StateDB) {
+	self.trie = state.trie
+	self.stateObjects = state.stateObjects
+
+	self.refund = state.refund
+	self.logs = state.logs
+}
+
+func (s *StateDB) Root() common.Hash {
+	return common.BytesToHash(s.trie.Root())
+}
+
+func (s *StateDB) Trie() *trie.SecureTrie {
+	return s.trie
+}
+
+// Resets the trie and all siblings
+func (s *StateDB) Reset() {
+	s.trie.Reset()
+
+	// Reset all nested states
+	for _, stateObject := range s.stateObjects {
+		if stateObject.State == nil {
+			continue
+		}
+
+		stateObject.Reset()
+	}
+
+	s.Empty()
+}
+
+// Syncs the trie and all siblings
+func (s *StateDB) Sync() {
+	// Sync all nested states
+	for _, stateObject := range s.stateObjects {
+		if stateObject.State == nil {
+			continue
+		}
+
+		stateObject.State.Sync()
+	}
+
+	s.trie.Commit()
+
+	s.Empty()
+}
+
+func (self *StateDB) Empty() {
+	self.stateObjects = make(map[string]*StateObject)
+	self.refund = make(map[string]*big.Int)
+}
+
+func (self *StateDB) Refunds() map[string]*big.Int {
+	return self.refund
+}
+
+func (self *StateDB) Update(gasUsed *big.Int) {
+	self.refund = make(map[string]*big.Int)
+
+	for _, stateObject := range self.stateObjects {
+		if stateObject.dirty {
+			if stateObject.remove {
+				self.DeleteStateObject(stateObject)
+			} else {
+				stateObject.Sync()
+
+				self.UpdateStateObject(stateObject)
+			}
+			stateObject.dirty = false
+		}
+	}
+}
+
+// Debug stuff
+func (self *StateDB) CreateOutputForDiff() {
+	for _, stateObject := range self.stateObjects {
+		stateObject.CreateOutputForDiff()
+	}
+}
diff --git a/core/state_transition.go b/core/state_transition.go
index d0b2c5d7c..e530567d0 100644
--- a/core/state_transition.go
+++ b/core/state_transition.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 const tryJit = false
diff --git a/core/transaction_pool_test.go b/core/transaction_pool_test.go
index bf9012573..a009a4c9d 100644
--- a/core/transaction_pool_test.go
+++ b/core/transaction_pool_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 // State query interface
diff --git a/core/types/bloom9.go b/core/types/bloom9.go
index 64a8ff49a..af90679ce 100644
--- a/core/types/bloom9.go
+++ b/core/types/bloom9.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 func CreateBloom(receipts Receipts) Bloom {
diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go
index 0841bb859..3c95772ec 100644
--- a/core/types/bloom9_test.go
+++ b/core/types/bloom9_test.go
@@ -4,7 +4,7 @@ package types
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 func TestBloom9(t *testing.T) {
diff --git a/core/types/common.go b/core/types/common.go
index ce1090919..4397d4938 100644
--- a/core/types/common.go
+++ b/core/types/common.go
@@ -4,7 +4,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 
 	"fmt"
 )
diff --git a/core/types/receipt.go b/core/types/receipt.go
index f88d42b29..83c981f93 100644
--- a/core/types/receipt.go
+++ b/core/types/receipt.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/rlp"
-	"github.com/ethereum/go-ethereum/state"
+	"github.com/ethereum/go-ethereum/core/state"
 )
 
 type Receipt struct {
diff --git a/core/vm/address.go b/core/vm/address.go
new file mode 100644
index 000000000..215f4bc8f
--- /dev/null
+++ b/core/vm/address.go
@@ -0,0 +1,77 @@
+package vm
+
+import (
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type Address interface {
+	Call(in []byte) []byte
+}
+
+type PrecompiledAccount struct {
+	Gas func(l int) *big.Int
+	fn  func(in []byte) []byte
+}
+
+func (self PrecompiledAccount) Call(in []byte) []byte {
+	return self.fn(in)
+}
+
+var Precompiled = PrecompiledContracts()
+
+// XXX Could set directly. Testing requires resetting and setting of pre compiled contracts.
+func PrecompiledContracts() map[string]*PrecompiledAccount {
+	return map[string]*PrecompiledAccount{
+		// ECRECOVER
+		string(common.LeftPadBytes([]byte{1}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+			return GasEcrecover
+		}, ecrecoverFunc},
+
+		// SHA256
+		string(common.LeftPadBytes([]byte{2}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+			n := big.NewInt(int64(l+31) / 32)
+			n.Mul(n, GasSha256Word)
+			return n.Add(n, GasSha256Base)
+		}, sha256Func},
+
+		// RIPEMD160
+		string(common.LeftPadBytes([]byte{3}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+			n := big.NewInt(int64(l+31) / 32)
+			n.Mul(n, GasRipemdWord)
+			return n.Add(n, GasRipemdBase)
+		}, ripemd160Func},
+
+		string(common.LeftPadBytes([]byte{4}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+			n := big.NewInt(int64(l+31) / 32)
+			n.Mul(n, GasIdentityWord)
+
+			return n.Add(n, GasIdentityBase)
+		}, memCpy},
+	}
+}
+
+func sha256Func(in []byte) []byte {
+	return crypto.Sha256(in)
+}
+
+func ripemd160Func(in []byte) []byte {
+	return common.LeftPadBytes(crypto.Ripemd160(in), 32)
+}
+
+func ecrecoverFunc(in []byte) []byte {
+	// In case of an invalid sig. Defaults to return nil
+	defer func() { recover() }()
+
+	hash := in[:32]
+	v := common.BigD(in[32:64]).Bytes()[0] - 27
+	sig := append(in[64:], v)
+
+	return common.LeftPadBytes(crypto.Sha3(crypto.Ecrecover(append(hash, sig...))[1:])[12:], 32)
+}
+
+func memCpy(in []byte) []byte {
+	return in
+}
diff --git a/core/vm/analysis.go b/core/vm/analysis.go
new file mode 100644
index 000000000..411df5686
--- /dev/null
+++ b/core/vm/analysis.go
@@ -0,0 +1,20 @@
+package vm
+
+import "gopkg.in/fatih/set.v0"
+
+func analyseJumpDests(code []byte) (dests *set.Set) {
+	dests = set.New()
+
+	for pc := uint64(0); pc < uint64(len(code)); pc++ {
+		var op OpCode = OpCode(code[pc])
+		switch op {
+		case PUSH1, PUSH2, PUSH3, PUSH4, PUSH5, PUSH6, PUSH7, PUSH8, PUSH9, PUSH10, PUSH11, PUSH12, PUSH13, PUSH14, PUSH15, PUSH16, PUSH17, PUSH18, PUSH19, PUSH20, PUSH21, PUSH22, PUSH23, PUSH24, PUSH25, PUSH26, PUSH27, PUSH28, PUSH29, PUSH30, PUSH31, PUSH32:
+			a := uint64(op) - uint64(PUSH1) + 1
+
+			pc += a
+		case JUMPDEST:
+			dests.Add(pc)
+		}
+	}
+	return
+}
diff --git a/core/vm/asm.go b/core/vm/asm.go
new file mode 100644
index 000000000..83fcb0e08
--- /dev/null
+++ b/core/vm/asm.go
@@ -0,0 +1,45 @@
+package vm
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+func Disassemble(script []byte) (asm []string) {
+	pc := new(big.Int)
+	for {
+		if pc.Cmp(big.NewInt(int64(len(script)))) >= 0 {
+			return
+		}
+
+		// Get the memory location of pc
+		val := script[pc.Int64()]
+		// Get the opcode (it must be an opcode!)
+		op := OpCode(val)
+
+		asm = append(asm, fmt.Sprintf("%v", op))
+
+		switch op {
+		case PUSH1, PUSH2, PUSH3, PUSH4, PUSH5, PUSH6, PUSH7, PUSH8, PUSH9, PUSH10, PUSH11, PUSH12, PUSH13, PUSH14, PUSH15, PUSH16, PUSH17, PUSH18, PUSH19, PUSH20, PUSH21, PUSH22, PUSH23, PUSH24, PUSH25, PUSH26, PUSH27, PUSH28, PUSH29, PUSH30, PUSH31, PUSH32:
+			pc.Add(pc, common.Big1)
+			a := int64(op) - int64(PUSH1) + 1
+			if int(pc.Int64()+a) > len(script) {
+				return nil
+			}
+
+			data := script[pc.Int64() : pc.Int64()+a]
+			if len(data) == 0 {
+				data = []byte{0}
+			}
+			asm = append(asm, fmt.Sprintf("0x%x", data))
+
+			pc.Add(pc, big.NewInt(a-1))
+		}
+
+		pc.Add(pc, common.Big1)
+	}
+
+	return
+}
diff --git a/core/vm/common.go b/core/vm/common.go
new file mode 100644
index 000000000..8d8f4253f
--- /dev/null
+++ b/core/vm/common.go
@@ -0,0 +1,82 @@
+package vm
+
+import (
+	"math"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/logger"
+)
+
+var vmlogger = logger.NewLogger("VM")
+
+// Global Debug flag indicating Debug VM (full logging)
+var Debug bool
+
+type Type byte
+
+const (
+	StdVmTy Type = iota
+	JitVmTy
+	MaxVmTy
+
+	MaxCallDepth = 1025
+
+	LogTyPretty byte = 0x1
+	LogTyDiff   byte = 0x2
+)
+
+var (
+	Pow256 = common.BigPow(2, 256)
+
+	U256 = common.U256
+	S256 = common.S256
+
+	Zero = common.Big0
+
+	max = big.NewInt(math.MaxInt64)
+)
+
+func NewVm(env Environment) VirtualMachine {
+	switch env.VmType() {
+	case JitVmTy:
+		return NewJitVm(env)
+	default:
+		vmlogger.Infoln("unsupported vm type %d", env.VmType())
+		fallthrough
+	case StdVmTy:
+		return New(env)
+	}
+}
+
+func calcMemSize(off, l *big.Int) *big.Int {
+	if l.Cmp(common.Big0) == 0 {
+		return common.Big0
+	}
+
+	return new(big.Int).Add(off, l)
+}
+
+// Simple helper
+func u256(n int64) *big.Int {
+	return big.NewInt(n)
+}
+
+// Mainly used for print variables and passing to Print*
+func toValue(val *big.Int) interface{} {
+	// Let's assume a string on right padded zero's
+	b := val.Bytes()
+	if b[0] != 0 && b[len(b)-1] == 0x0 && b[len(b)-2] == 0x0 {
+		return string(b)
+	}
+
+	return val
+}
+
+func getData(data []byte, start, size *big.Int) []byte {
+	dlen := big.NewInt(int64(len(data)))
+
+	s := common.BigMin(start, dlen)
+	e := common.BigMin(new(big.Int).Add(s, size), dlen)
+	return common.RightPadBytes(data[s.Uint64():e.Uint64()], int(size.Uint64()))
+}
diff --git a/core/vm/context.go b/core/vm/context.go
new file mode 100644
index 000000000..e73199b77
--- /dev/null
+++ b/core/vm/context.go
@@ -0,0 +1,110 @@
+package vm
+
+import (
+	"math"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type ContextRef interface {
+	ReturnGas(*big.Int, *big.Int)
+	Address() common.Address
+	SetCode([]byte)
+}
+
+type Context struct {
+	caller ContextRef
+	self   ContextRef
+
+	Code     []byte
+	CodeAddr *common.Address
+
+	value, Gas, UsedGas, Price *big.Int
+
+	Args []byte
+}
+
+// Create a new context for the given data items
+func NewContext(caller ContextRef, object ContextRef, value, gas, price *big.Int) *Context {
+	c := &Context{caller: caller, self: object, Args: nil}
+
+	// Gas should be a pointer so it can safely be reduced through the run
+	// This pointer will be off the state transition
+	c.Gas = gas //new(big.Int).Set(gas)
+	c.value = new(big.Int).Set(value)
+	// In most cases price and value are pointers to transaction objects
+	// and we don't want the transaction's values to change.
+	c.Price = new(big.Int).Set(price)
+	c.UsedGas = new(big.Int)
+
+	return c
+}
+
+func (c *Context) GetOp(n uint64) OpCode {
+	return OpCode(c.GetByte(n))
+}
+
+func (c *Context) GetByte(n uint64) byte {
+	if n < uint64(len(c.Code)) {
+		return c.Code[n]
+	}
+
+	return 0
+}
+
+func (c *Context) GetBytes(x, y int) []byte {
+	return c.GetRangeValue(uint64(x), uint64(y))
+}
+
+func (c *Context) GetRangeValue(x, size uint64) []byte {
+	x = uint64(math.Min(float64(x), float64(len(c.Code))))
+	y := uint64(math.Min(float64(x+size), float64(len(c.Code))))
+
+	return common.RightPadBytes(c.Code[x:y], int(size))
+}
+
+func (c *Context) Return(ret []byte) []byte {
+	// Return the remaining gas to the caller
+	c.caller.ReturnGas(c.Gas, c.Price)
+
+	return ret
+}
+
+/*
+ * Gas functions
+ */
+func (c *Context) UseGas(gas *big.Int) bool {
+	if c.Gas.Cmp(gas) < 0 {
+		return false
+	}
+
+	// Sub the amount of gas from the remaining
+	c.Gas.Sub(c.Gas, gas)
+	c.UsedGas.Add(c.UsedGas, gas)
+
+	return true
+}
+
+// Implement the caller interface
+func (c *Context) ReturnGas(gas, price *big.Int) {
+	// Return the gas to the context
+	c.Gas.Add(c.Gas, gas)
+	c.UsedGas.Sub(c.UsedGas, gas)
+}
+
+/*
+ * Set / Get
+ */
+func (c *Context) Address() common.Address {
+	return c.self.Address()
+}
+
+func (self *Context) SetCode(code []byte) {
+	self.Code = code
+}
+
+func (self *Context) SetCallCode(addr *common.Address, code []byte) {
+	self.Code = code
+	self.CodeAddr = addr
+}
diff --git a/core/vm/environment.go b/core/vm/environment.go
new file mode 100644
index 000000000..a0a18a99b
--- /dev/null
+++ b/core/vm/environment.go
@@ -0,0 +1,92 @@
+package vm
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/ethereum/go-ethereum/core/state"
+)
+
+type Environment interface {
+	State() *state.StateDB
+
+	Origin() common.Address
+	BlockNumber() *big.Int
+	GetHash(n uint64) common.Hash
+	Coinbase() common.Address
+	Time() int64
+	Difficulty() *big.Int
+	GasLimit() *big.Int
+	Transfer(from, to Account, amount *big.Int) error
+	AddLog(state.Log)
+
+	VmType() Type
+
+	Depth() int
+	SetDepth(i int)
+
+	Call(me ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error)
+	CallCode(me ContextRef, addr common.Address, data []byte, gas, price, value *big.Int) ([]byte, error)
+	Create(me ContextRef, addr *common.Address, data []byte, gas, price, value *big.Int) ([]byte, error, ContextRef)
+}
+
+type Account interface {
+	SubBalance(amount *big.Int)
+	AddBalance(amount *big.Int)
+	Balance() *big.Int
+	Address() common.Address
+}
+
+// generic transfer method
+func Transfer(from, to Account, amount *big.Int) error {
+	//fmt.Printf(":::%x::: %v < %v\n", from.Address(), from.Balance(), amount)
+	if from.Balance().Cmp(amount) < 0 {
+		return errors.New("Insufficient balance in account")
+	}
+
+	from.SubBalance(amount)
+	to.AddBalance(amount)
+
+	return nil
+}
+
+type Log struct {
+	address common.Address
+	topics  []common.Hash
+	data    []byte
+	log     uint64
+}
+
+func (self *Log) Address() common.Address {
+	return self.address
+}
+
+func (self *Log) Topics() []common.Hash {
+	return self.topics
+}
+
+func (self *Log) Data() []byte {
+	return self.data
+}
+
+func (self *Log) Number() uint64 {
+	return self.log
+}
+
+func (self *Log) EncodeRLP(w io.Writer) error {
+	return rlp.Encode(w, []interface{}{self.address, self.topics, self.data})
+}
+
+/*
+func (self *Log) RlpData() interface{} {
+	return []interface{}{self.address, common.ByteSliceToInterface(self.topics), self.data}
+}
+*/
+
+func (self *Log) String() string {
+	return fmt.Sprintf("{%x %x %x}", self.address, self.data, self.topics)
+}
diff --git a/core/vm/errors.go b/core/vm/errors.go
new file mode 100644
index 000000000..ab011bd62
--- /dev/null
+++ b/core/vm/errors.go
@@ -0,0 +1,51 @@
+package vm
+
+import (
+	"fmt"
+	"math/big"
+)
+
+type OutOfGasError struct {
+	req, has *big.Int
+}
+
+func OOG(req, has *big.Int) OutOfGasError {
+	return OutOfGasError{req, has}
+}
+
+func (self OutOfGasError) Error() string {
+	return fmt.Sprintf("out of gas! require %v, have %v", self.req, self.has)
+}
+
+func IsOOGErr(err error) bool {
+	_, ok := err.(OutOfGasError)
+	return ok
+}
+
+type StackError struct {
+	req, has int
+}
+
+func StackErr(req, has int) StackError {
+	return StackError{req, has}
+}
+
+func (self StackError) Error() string {
+	return fmt.Sprintf("stack error! require %v, have %v", self.req, self.has)
+}
+
+func IsStack(err error) bool {
+	_, ok := err.(StackError)
+	return ok
+}
+
+type DepthError struct{}
+
+func (self DepthError) Error() string {
+	return fmt.Sprintf("Max call depth exceeded (%d)", MaxCallDepth)
+}
+
+func IsDepthErr(err error) bool {
+	_, ok := err.(DepthError)
+	return ok
+}
diff --git a/core/vm/gas.go b/core/vm/gas.go
new file mode 100644
index 000000000..c4d5e4c4e
--- /dev/null
+++ b/core/vm/gas.go
@@ -0,0 +1,135 @@
+package vm
+
+import "math/big"
+
+type req struct {
+	stack int
+	gas   *big.Int
+}
+
+var (
+	GasQuickStep   = big.NewInt(2)
+	GasFastestStep = big.NewInt(3)
+	GasFastStep    = big.NewInt(5)
+	GasMidStep     = big.NewInt(8)
+	GasSlowStep    = big.NewInt(10)
+	GasExtStep     = big.NewInt(20)
+
+	GasStorageGet        = big.NewInt(50)
+	GasStorageAdd        = big.NewInt(20000)
+	GasStorageMod        = big.NewInt(5000)
+	GasLogBase           = big.NewInt(375)
+	GasLogTopic          = big.NewInt(375)
+	GasLogByte           = big.NewInt(8)
+	GasCreate            = big.NewInt(32000)
+	GasCreateByte        = big.NewInt(200)
+	GasCall              = big.NewInt(40)
+	GasCallValueTransfer = big.NewInt(9000)
+	GasStipend           = big.NewInt(2300)
+	GasCallNewAccount    = big.NewInt(25000)
+	GasReturn            = big.NewInt(0)
+	GasStop              = big.NewInt(0)
+	GasJumpDest          = big.NewInt(1)
+
+	RefundStorage = big.NewInt(15000)
+	RefundSuicide = big.NewInt(24000)
+
+	GasMemWord           = big.NewInt(3)
+	GasQuadCoeffDenom    = big.NewInt(512)
+	GasContractByte      = big.NewInt(200)
+	GasTransaction       = big.NewInt(21000)
+	GasTxDataNonzeroByte = big.NewInt(68)
+	GasTxDataZeroByte    = big.NewInt(4)
+	GasTx                = big.NewInt(21000)
+	GasExp               = big.NewInt(10)
+	GasExpByte           = big.NewInt(10)
+
+	GasSha3Base     = big.NewInt(30)
+	GasSha3Word     = big.NewInt(6)
+	GasSha256Base   = big.NewInt(60)
+	GasSha256Word   = big.NewInt(12)
+	GasRipemdBase   = big.NewInt(600)
+	GasRipemdWord   = big.NewInt(12)
+	GasEcrecover    = big.NewInt(3000)
+	GasIdentityBase = big.NewInt(15)
+	GasIdentityWord = big.NewInt(3)
+	GasCopyWord     = big.NewInt(3)
+)
+
+var _baseCheck = map[OpCode]req{
+	//       Req stack  Gas price
+	ADD:          {2, GasFastestStep},
+	LT:           {2, GasFastestStep},
+	GT:           {2, GasFastestStep},
+	SLT:          {2, GasFastestStep},
+	SGT:          {2, GasFastestStep},
+	EQ:           {2, GasFastestStep},
+	ISZERO:       {1, GasFastestStep},
+	SUB:          {2, GasFastestStep},
+	AND:          {2, GasFastestStep},
+	OR:           {2, GasFastestStep},
+	XOR:          {2, GasFastestStep},
+	NOT:          {1, GasFastestStep},
+	BYTE:         {2, GasFastestStep},
+	CALLDATALOAD: {1, GasFastestStep},
+	CALLDATACOPY: {3, GasFastestStep},
+	MLOAD:        {1, GasFastestStep},
+	MSTORE:       {2, GasFastestStep},
+	MSTORE8:      {2, GasFastestStep},
+	CODECOPY:     {3, GasFastestStep},
+	MUL:          {2, GasFastStep},
+	DIV:          {2, GasFastStep},
+	SDIV:         {2, GasFastStep},
+	MOD:          {2, GasFastStep},
+	SMOD:         {2, GasFastStep},
+	SIGNEXTEND:   {2, GasFastStep},
+	ADDMOD:       {3, GasMidStep},
+	MULMOD:       {3, GasMidStep},
+	JUMP:         {1, GasMidStep},
+	JUMPI:        {2, GasSlowStep},
+	EXP:          {2, GasSlowStep},
+	ADDRESS:      {0, GasQuickStep},
+	ORIGIN:       {0, GasQuickStep},
+	CALLER:       {0, GasQuickStep},
+	CALLVALUE:    {0, GasQuickStep},
+	CODESIZE:     {0, GasQuickStep},
+	GASPRICE:     {0, GasQuickStep},
+	COINBASE:     {0, GasQuickStep},
+	TIMESTAMP:    {0, GasQuickStep},
+	NUMBER:       {0, GasQuickStep},
+	CALLDATASIZE: {0, GasQuickStep},
+	DIFFICULTY:   {0, GasQuickStep},
+	GASLIMIT:     {0, GasQuickStep},
+	POP:          {0, GasQuickStep},
+	PC:           {0, GasQuickStep},
+	MSIZE:        {0, GasQuickStep},
+	GAS:          {0, GasQuickStep},
+	BLOCKHASH:    {1, GasExtStep},
+	BALANCE:      {0, GasExtStep},
+	EXTCODESIZE:  {1, GasExtStep},
+	EXTCODECOPY:  {4, GasExtStep},
+	SLOAD:        {1, GasStorageGet},
+	SSTORE:       {2, Zero},
+	SHA3:         {1, GasSha3Base},
+	CREATE:       {3, GasCreate},
+	CALL:         {7, GasCall},
+	CALLCODE:     {7, GasCall},
+	JUMPDEST:     {0, GasJumpDest},
+	SUICIDE:      {1, Zero},
+	RETURN:       {2, Zero},
+}
+
+func baseCheck(op OpCode, stack *stack, gas *big.Int) {
+	if r, ok := _baseCheck[op]; ok {
+		stack.require(r.stack)
+
+		gas.Add(gas, r.gas)
+	}
+}
+
+func toWordSize(size *big.Int) *big.Int {
+	tmp := new(big.Int)
+	tmp.Add(size, u256(31))
+	tmp.Div(tmp, u256(32))
+	return tmp
+}
diff --git a/core/vm/main_test.go b/core/vm/main_test.go
new file mode 100644
index 000000000..0ae03bf6a
--- /dev/null
+++ b/core/vm/main_test.go
@@ -0,0 +1,9 @@
+package vm
+
+import (
+	"testing"
+
+	checker "gopkg.in/check.v1"
+)
+
+func Test(t *testing.T) { checker.TestingT(t) }
diff --git a/core/vm/memory.go b/core/vm/memory.go
new file mode 100644
index 000000000..dd47fa1b5
--- /dev/null
+++ b/core/vm/memory.go
@@ -0,0 +1,76 @@
+package vm
+
+import (
+	"fmt"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type Memory struct {
+	store []byte
+}
+
+func NewMemory() *Memory {
+	return &Memory{nil}
+}
+
+func (m *Memory) Set(offset, size uint64, value []byte) {
+	value = common.RightPadBytes(value, int(size))
+
+	totSize := offset + size
+	lenSize := uint64(len(m.store) - 1)
+	if totSize > lenSize {
+		// Calculate the diff between the sizes
+		diff := totSize - lenSize
+		if diff > 0 {
+			// Create a new empty slice and append it
+			newSlice := make([]byte, diff-1)
+			// Resize slice
+			m.store = append(m.store, newSlice...)
+		}
+	}
+	copy(m.store[offset:offset+size], value)
+}
+
+func (m *Memory) Resize(size uint64) {
+	if uint64(m.Len()) < size {
+		m.store = append(m.store, make([]byte, size-uint64(m.Len()))...)
+	}
+}
+
+func (self *Memory) Get(offset, size int64) (cpy []byte) {
+	if size == 0 {
+		return nil
+	}
+
+	if len(self.store) > int(offset) {
+		cpy = make([]byte, size)
+		copy(cpy, self.store[offset:offset+size])
+
+		return
+	}
+
+	return
+}
+
+func (m *Memory) Len() int {
+	return len(m.store)
+}
+
+func (m *Memory) Data() []byte {
+	return m.store
+}
+
+func (m *Memory) Print() {
+	fmt.Printf("### mem %d bytes ###\n", len(m.store))
+	if len(m.store) > 0 {
+		addr := 0
+		for i := 0; i+32 <= len(m.store); i += 32 {
+			fmt.Printf("%03d: % x\n", addr, m.store[i:i+32])
+			addr++
+		}
+	} else {
+		fmt.Println("-- empty --")
+	}
+	fmt.Println("####################")
+}
diff --git a/core/vm/stack.go b/core/vm/stack.go
new file mode 100644
index 000000000..c5c2774db
--- /dev/null
+++ b/core/vm/stack.go
@@ -0,0 +1,65 @@
+package vm
+
+import (
+	"fmt"
+	"math/big"
+)
+
+func newStack() *stack {
+	return &stack{}
+}
+
+type stack struct {
+	data []*big.Int
+	ptr  int
+}
+
+func (st *stack) push(d *big.Int) {
+	stackItem := new(big.Int).Set(d)
+	if len(st.data) > st.ptr {
+		st.data[st.ptr] = stackItem
+	} else {
+		st.data = append(st.data, stackItem)
+	}
+	st.ptr++
+}
+
+func (st *stack) pop() (ret *big.Int) {
+	st.ptr--
+	ret = st.data[st.ptr]
+	return
+}
+
+func (st *stack) len() int {
+	return st.ptr
+}
+
+func (st *stack) swap(n int) {
+	st.data[st.len()-n], st.data[st.len()-1] = st.data[st.len()-1], st.data[st.len()-n]
+}
+
+func (st *stack) dup(n int) {
+	st.push(st.data[st.len()-n])
+}
+
+func (st *stack) peek() *big.Int {
+	return st.data[st.len()-1]
+}
+
+func (st *stack) require(n int) {
+	if st.len() < n {
+		panic(fmt.Sprintf("stack underflow (%d <=> %d)", len(st.data), n))
+	}
+}
+
+func (st *stack) Print() {
+	fmt.Println("### stack ###")
+	if len(st.data) > 0 {
+		for i, val := range st.data {
+			fmt.Printf("%-3d  %v\n", i, val)
+		}
+	} else {
+		fmt.Println("-- empty --")
+	}
+	fmt.Println("#############")
+}
diff --git a/core/vm/types.go b/core/vm/types.go
new file mode 100644
index 000000000..1ea80a212
--- /dev/null
+++ b/core/vm/types.go
@@ -0,0 +1,334 @@
+package vm
+
+import (
+	"fmt"
+)
+
+type OpCode byte
+
+// Op codes
+const (
+	// 0x0 range - arithmetic ops
+	STOP OpCode = iota
+	ADD
+	MUL
+	SUB
+	DIV
+	SDIV
+	MOD
+	SMOD
+	ADDMOD
+	MULMOD
+	EXP
+	SIGNEXTEND
+)
+
+const (
+	LT OpCode = iota + 0x10
+	GT
+	SLT
+	SGT
+	EQ
+	ISZERO
+	AND
+	OR
+	XOR
+	NOT
+	BYTE
+
+	SHA3 = 0x20
+)
+
+const (
+	// 0x30 range - closure state
+	ADDRESS OpCode = 0x30 + iota
+	BALANCE
+	ORIGIN
+	CALLER
+	CALLVALUE
+	CALLDATALOAD
+	CALLDATASIZE
+	CALLDATACOPY
+	CODESIZE
+	CODECOPY
+	GASPRICE
+	EXTCODESIZE
+	EXTCODECOPY
+)
+
+const (
+
+	// 0x40 range - block operations
+	BLOCKHASH OpCode = 0x40 + iota
+	COINBASE
+	TIMESTAMP
+	NUMBER
+	DIFFICULTY
+	GASLIMIT
+)
+
+const (
+	// 0x50 range - 'storage' and execution
+	POP OpCode = 0x50 + iota
+	MLOAD
+	MSTORE
+	MSTORE8
+	SLOAD
+	SSTORE
+	JUMP
+	JUMPI
+	PC
+	MSIZE
+	GAS
+	JUMPDEST
+)
+
+const (
+	// 0x60 range
+	PUSH1 OpCode = 0x60 + iota
+	PUSH2
+	PUSH3
+	PUSH4
+	PUSH5
+	PUSH6
+	PUSH7
+	PUSH8
+	PUSH9
+	PUSH10
+	PUSH11
+	PUSH12
+	PUSH13
+	PUSH14
+	PUSH15
+	PUSH16
+	PUSH17
+	PUSH18
+	PUSH19
+	PUSH20
+	PUSH21
+	PUSH22
+	PUSH23
+	PUSH24
+	PUSH25
+	PUSH26
+	PUSH27
+	PUSH28
+	PUSH29
+	PUSH30
+	PUSH31
+	PUSH32
+	DUP1
+	DUP2
+	DUP3
+	DUP4
+	DUP5
+	DUP6
+	DUP7
+	DUP8
+	DUP9
+	DUP10
+	DUP11
+	DUP12
+	DUP13
+	DUP14
+	DUP15
+	DUP16
+	SWAP1
+	SWAP2
+	SWAP3
+	SWAP4
+	SWAP5
+	SWAP6
+	SWAP7
+	SWAP8
+	SWAP9
+	SWAP10
+	SWAP11
+	SWAP12
+	SWAP13
+	SWAP14
+	SWAP15
+	SWAP16
+)
+
+const (
+	LOG0 OpCode = 0xa0 + iota
+	LOG1
+	LOG2
+	LOG3
+	LOG4
+)
+
+const (
+	// 0xf0 range - closures
+	CREATE OpCode = 0xf0 + iota
+	CALL
+	CALLCODE
+	RETURN
+
+	// 0x70 range - other
+	SUICIDE = 0xff
+)
+
+// Since the opcodes aren't all in order we can't use a regular slice
+var opCodeToString = map[OpCode]string{
+	// 0x0 range - arithmetic ops
+	STOP:       "STOP",
+	ADD:        "ADD",
+	MUL:        "MUL",
+	SUB:        "SUB",
+	DIV:        "DIV",
+	SDIV:       "SDIV",
+	MOD:        "MOD",
+	SMOD:       "SMOD",
+	EXP:        "EXP",
+	NOT:        "NOT",
+	LT:         "LT",
+	GT:         "GT",
+	SLT:        "SLT",
+	SGT:        "SGT",
+	EQ:         "EQ",
+	ISZERO:     "ISZERO",
+	SIGNEXTEND: "SIGNEXTEND",
+
+	// 0x10 range - bit ops
+	AND:    "AND",
+	OR:     "OR",
+	XOR:    "XOR",
+	BYTE:   "BYTE",
+	ADDMOD: "ADDMOD",
+	MULMOD: "MULMOD",
+
+	// 0x20 range - crypto
+	SHA3: "SHA3",
+
+	// 0x30 range - closure state
+	ADDRESS:      "ADDRESS",
+	BALANCE:      "BALANCE",
+	ORIGIN:       "ORIGIN",
+	CALLER:       "CALLER",
+	CALLVALUE:    "CALLVALUE",
+	CALLDATALOAD: "CALLDATALOAD",
+	CALLDATASIZE: "CALLDATASIZE",
+	CALLDATACOPY: "CALLDATACOPY",
+	CODESIZE:     "CODESIZE",
+	CODECOPY:     "CODECOPY",
+	GASPRICE:     "TXGASPRICE",
+
+	// 0x40 range - block operations
+	BLOCKHASH:   "BLOCKHASH",
+	COINBASE:    "COINBASE",
+	TIMESTAMP:   "TIMESTAMP",
+	NUMBER:      "NUMBER",
+	DIFFICULTY:  "DIFFICULTY",
+	GASLIMIT:    "GASLIMIT",
+	EXTCODESIZE: "EXTCODESIZE",
+	EXTCODECOPY: "EXTCODECOPY",
+
+	// 0x50 range - 'storage' and execution
+	POP: "POP",
+	//DUP:     "DUP",
+	//SWAP:    "SWAP",
+	MLOAD:    "MLOAD",
+	MSTORE:   "MSTORE",
+	MSTORE8:  "MSTORE8",
+	SLOAD:    "SLOAD",
+	SSTORE:   "SSTORE",
+	JUMP:     "JUMP",
+	JUMPI:    "JUMPI",
+	PC:       "PC",
+	MSIZE:    "MSIZE",
+	GAS:      "GAS",
+	JUMPDEST: "JUMPDEST",
+
+	// 0x60 range - push
+	PUSH1:  "PUSH1",
+	PUSH2:  "PUSH2",
+	PUSH3:  "PUSH3",
+	PUSH4:  "PUSH4",
+	PUSH5:  "PUSH5",
+	PUSH6:  "PUSH6",
+	PUSH7:  "PUSH7",
+	PUSH8:  "PUSH8",
+	PUSH9:  "PUSH9",
+	PUSH10: "PUSH10",
+	PUSH11: "PUSH11",
+	PUSH12: "PUSH12",
+	PUSH13: "PUSH13",
+	PUSH14: "PUSH14",
+	PUSH15: "PUSH15",
+	PUSH16: "PUSH16",
+	PUSH17: "PUSH17",
+	PUSH18: "PUSH18",
+	PUSH19: "PUSH19",
+	PUSH20: "PUSH20",
+	PUSH21: "PUSH21",
+	PUSH22: "PUSH22",
+	PUSH23: "PUSH23",
+	PUSH24: "PUSH24",
+	PUSH25: "PUSH25",
+	PUSH26: "PUSH26",
+	PUSH27: "PUSH27",
+	PUSH28: "PUSH28",
+	PUSH29: "PUSH29",
+	PUSH30: "PUSH30",
+	PUSH31: "PUSH31",
+	PUSH32: "PUSH32",
+
+	DUP1:  "DUP1",
+	DUP2:  "DUP2",
+	DUP3:  "DUP3",
+	DUP4:  "DUP4",
+	DUP5:  "DUP5",
+	DUP6:  "DUP6",
+	DUP7:  "DUP7",
+	DUP8:  "DUP8",
+	DUP9:  "DUP9",
+	DUP10: "DUP10",
+	DUP11: "DUP11",
+	DUP12: "DUP12",
+	DUP13: "DUP13",
+	DUP14: "DUP14",
+	DUP15: "DUP15",
+	DUP16: "DUP16",
+
+	SWAP1:  "SWAP1",
+	SWAP2:  "SWAP2",
+	SWAP3:  "SWAP3",
+	SWAP4:  "SWAP4",
+	SWAP5:  "SWAP5",
+	SWAP6:  "SWAP6",
+	SWAP7:  "SWAP7",
+	SWAP8:  "SWAP8",
+	SWAP9:  "SWAP9",
+	SWAP10: "SWAP10",
+	SWAP11: "SWAP11",
+	SWAP12: "SWAP12",
+	SWAP13: "SWAP13",
+	SWAP14: "SWAP14",
+	SWAP15: "SWAP15",
+	SWAP16: "SWAP16",
+	LOG0:   "LOG0",
+	LOG1:   "LOG1",
+	LOG2:   "LOG2",
+	LOG3:   "LOG3",
+	LOG4:   "LOG4",
+
+	// 0xf0 range
+	CREATE:   "CREATE",
+	CALL:     "CALL",
+	RETURN:   "RETURN",
+	CALLCODE: "CALLCODE",
+
+	// 0x70 range - other
+	SUICIDE: "SUICIDE",
+}
+
+func (o OpCode) String() string {
+	str := opCodeToString[o]
+	if len(str) == 0 {
+		return fmt.Sprintf("Missing opcode 0x%x", int(o))
+	}
+
+	return str
+}
diff --git a/core/vm/virtual_machine.go b/core/vm/virtual_machine.go
new file mode 100644
index 000000000..6db284f42
--- /dev/null
+++ b/core/vm/virtual_machine.go
@@ -0,0 +1,8 @@
+package vm
+
+type VirtualMachine interface {
+	Env() Environment
+	Run(context *Context, data []byte) ([]byte, error)
+	Printf(string, ...interface{}) VirtualMachine
+	Endl() VirtualMachine
+}
diff --git a/core/vm/vm.go b/core/vm/vm.go
new file mode 100644
index 000000000..f4bf1ca72
--- /dev/null
+++ b/core/vm/vm.go
@@ -0,0 +1,897 @@
+package vm
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/core/state"
+)
+
+type Vm struct {
+	env Environment
+
+	logTy  byte
+	logStr string
+
+	err error
+	// For logging
+	debug bool
+
+	BreakPoints []int64
+	Stepping    bool
+	Fn          string
+
+	Recoverable bool
+}
+
+func New(env Environment) *Vm {
+	lt := LogTyPretty
+
+	return &Vm{debug: Debug, env: env, logTy: lt, Recoverable: true}
+}
+
+func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
+	self.env.SetDepth(self.env.Depth() + 1)
+	var (
+		caller = context.caller
+		code   = context.Code
+		value  = context.value
+		price  = context.Price
+	)
+
+	self.Printf("(%d) (%x) %x (code=%d) gas: %v (d) %x", self.env.Depth(), caller.Address().Bytes()[:4], context.Address(), len(code), context.Gas, callData).Endl()
+
+	if self.Recoverable {
+		// Recover from any require exception
+		defer func() {
+			if r := recover(); r != nil {
+				self.Printf(" %v", r).Endl()
+
+				context.UseGas(context.Gas)
+
+				ret = context.Return(nil)
+
+				err = fmt.Errorf("%v", r)
+			}
+		}()
+	}
+
+	if context.CodeAddr != nil {
+		if p := Precompiled[context.CodeAddr.Str()]; p != nil {
+			return self.RunPrecompiled(p, callData, context)
+		}
+	}
+
+	var (
+		op OpCode
+
+		destinations        = analyseJumpDests(context.Code)
+		mem                 = NewMemory()
+		stack               = newStack()
+		pc           uint64 = 0
+		step                = 0
+		statedb             = self.env.State()
+
+		jump = func(from uint64, to *big.Int) {
+			p := to.Uint64()
+
+			nop := context.GetOp(p)
+			if !destinations.Has(p) {
+				panic(fmt.Sprintf("invalid jump destination (%v) %v", nop, p))
+			}
+
+			self.Printf(" ~> %v", to)
+			pc = to.Uint64()
+
+			self.Endl()
+		}
+	)
+
+	// Don't bother with the execution if there's no code.
+	if len(code) == 0 {
+		return context.Return(nil), nil
+	}
+
+	for {
+		// The base for all big integer arithmetic
+		base := new(big.Int)
+
+		step++
+		// Get the memory location of pc
+		op = context.GetOp(pc)
+
+		self.Printf("(pc) %-3d -o- %-14s (m) %-4d (s) %-4d ", pc, op.String(), mem.Len(), stack.len())
+		newMemSize, gas := self.calculateGasAndSize(context, caller, op, statedb, mem, stack)
+
+		self.Printf("(g) %-3v (%v)", gas, context.Gas)
+
+		if !context.UseGas(gas) {
+			self.Endl()
+
+			tmp := new(big.Int).Set(context.Gas)
+
+			context.UseGas(context.Gas)
+
+			return context.Return(nil), OOG(gas, tmp)
+		}
+
+		mem.Resize(newMemSize.Uint64())
+
+		switch op {
+		// 0x20 range
+		case ADD:
+			x, y := stack.pop(), stack.pop()
+			self.Printf(" %v + %v", y, x)
+
+			base.Add(x, y)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			// pop result back on the stack
+			stack.push(base)
+		case SUB:
+			x, y := stack.pop(), stack.pop()
+			self.Printf(" %v - %v", y, x)
+
+			base.Sub(x, y)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			// pop result back on the stack
+			stack.push(base)
+		case MUL:
+			x, y := stack.pop(), stack.pop()
+			self.Printf(" %v * %v", y, x)
+
+			base.Mul(x, y)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			// pop result back on the stack
+			stack.push(base)
+		case DIV:
+			x, y := stack.pop(), stack.pop()
+			self.Printf(" %v / %v", x, y)
+
+			if y.Cmp(common.Big0) != 0 {
+				base.Div(x, y)
+			}
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			// pop result back on the stack
+			stack.push(base)
+		case SDIV:
+			x, y := S256(stack.pop()), S256(stack.pop())
+
+			self.Printf(" %v / %v", x, y)
+
+			if y.Cmp(common.Big0) == 0 {
+				base.Set(common.Big0)
+			} else {
+				n := new(big.Int)
+				if new(big.Int).Mul(x, y).Cmp(common.Big0) < 0 {
+					n.SetInt64(-1)
+				} else {
+					n.SetInt64(1)
+				}
+
+				base.Div(x.Abs(x), y.Abs(y)).Mul(base, n)
+
+				U256(base)
+			}
+
+			self.Printf(" = %v", base)
+			stack.push(base)
+		case MOD:
+			x, y := stack.pop(), stack.pop()
+
+			self.Printf(" %v %% %v", x, y)
+
+			if y.Cmp(common.Big0) == 0 {
+				base.Set(common.Big0)
+			} else {
+				base.Mod(x, y)
+			}
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			stack.push(base)
+		case SMOD:
+			x, y := S256(stack.pop()), S256(stack.pop())
+
+			self.Printf(" %v %% %v", x, y)
+
+			if y.Cmp(common.Big0) == 0 {
+				base.Set(common.Big0)
+			} else {
+				n := new(big.Int)
+				if x.Cmp(common.Big0) < 0 {
+					n.SetInt64(-1)
+				} else {
+					n.SetInt64(1)
+				}
+
+				base.Mod(x.Abs(x), y.Abs(y)).Mul(base, n)
+
+				U256(base)
+			}
+
+			self.Printf(" = %v", base)
+			stack.push(base)
+
+		case EXP:
+			x, y := stack.pop(), stack.pop()
+
+			self.Printf(" %v ** %v", x, y)
+
+			base.Exp(x, y, Pow256)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+
+			stack.push(base)
+		case SIGNEXTEND:
+			back := stack.pop()
+			if back.Cmp(big.NewInt(31)) < 0 {
+				bit := uint(back.Uint64()*8 + 7)
+				num := stack.pop()
+				mask := new(big.Int).Lsh(common.Big1, bit)
+				mask.Sub(mask, common.Big1)
+				if common.BitTest(num, int(bit)) {
+					num.Or(num, mask.Not(mask))
+				} else {
+					num.And(num, mask)
+				}
+
+				num = U256(num)
+
+				self.Printf(" = %v", num)
+
+				stack.push(num)
+			}
+		case NOT:
+			stack.push(U256(new(big.Int).Not(stack.pop())))
+			//base.Sub(Pow256, stack.pop()).Sub(base, common.Big1)
+			//base = U256(base)
+			//stack.push(base)
+		case LT:
+			x, y := stack.pop(), stack.pop()
+			self.Printf(" %v < %v", x, y)
+			// x < y
+			if x.Cmp(y) < 0 {
+				stack.push(common.BigTrue)
+			} else {
+				stack.push(common.BigFalse)
+			}
+		case GT:
+			x, y := stack.pop(), stack.pop()
+			self.Printf(" %v > %v", x, y)
+
+			// x > y
+			if x.Cmp(y) > 0 {
+				stack.push(common.BigTrue)
+			} else {
+				stack.push(common.BigFalse)
+			}
+
+		case SLT:
+			x, y := S256(stack.pop()), S256(stack.pop())
+			self.Printf(" %v < %v", x, y)
+			// x < y
+			if x.Cmp(S256(y)) < 0 {
+				stack.push(common.BigTrue)
+			} else {
+				stack.push(common.BigFalse)
+			}
+		case SGT:
+			x, y := S256(stack.pop()), S256(stack.pop())
+			self.Printf(" %v > %v", x, y)
+
+			// x > y
+			if x.Cmp(y) > 0 {
+				stack.push(common.BigTrue)
+			} else {
+				stack.push(common.BigFalse)
+			}
+
+		case EQ:
+			x, y := stack.pop(), stack.pop()
+			self.Printf(" %v == %v", y, x)
+
+			// x == y
+			if x.Cmp(y) == 0 {
+				stack.push(common.BigTrue)
+			} else {
+				stack.push(common.BigFalse)
+			}
+		case ISZERO:
+			x := stack.pop()
+			if x.Cmp(common.BigFalse) > 0 {
+				stack.push(common.BigFalse)
+			} else {
+				stack.push(common.BigTrue)
+			}
+
+			// 0x10 range
+		case AND:
+			x, y := stack.pop(), stack.pop()
+			self.Printf(" %v & %v", y, x)
+
+			stack.push(base.And(x, y))
+		case OR:
+			x, y := stack.pop(), stack.pop()
+			self.Printf(" %v | %v", x, y)
+
+			stack.push(base.Or(x, y))
+		case XOR:
+			x, y := stack.pop(), stack.pop()
+			self.Printf(" %v ^ %v", x, y)
+
+			stack.push(base.Xor(x, y))
+		case BYTE:
+			th, val := stack.pop(), stack.pop()
+
+			if th.Cmp(big.NewInt(32)) < 0 {
+				byt := big.NewInt(int64(common.LeftPadBytes(val.Bytes(), 32)[th.Int64()]))
+
+				base.Set(byt)
+			} else {
+				base.Set(common.BigFalse)
+			}
+
+			self.Printf(" => 0x%x", base.Bytes())
+
+			stack.push(base)
+		case ADDMOD:
+			x := stack.pop()
+			y := stack.pop()
+			z := stack.pop()
+
+			if z.Cmp(Zero) > 0 {
+				add := new(big.Int).Add(x, y)
+				base.Mod(add, z)
+
+				base = U256(base)
+			}
+
+			self.Printf(" %v + %v %% %v = %v", x, y, z, base)
+
+			stack.push(base)
+		case MULMOD:
+			x := stack.pop()
+			y := stack.pop()
+			z := stack.pop()
+
+			if z.Cmp(Zero) > 0 {
+				mul := new(big.Int).Mul(x, y)
+				base.Mod(mul, z)
+
+				U256(base)
+			}
+
+			self.Printf(" %v + %v %% %v = %v", x, y, z, base)
+
+			stack.push(base)
+
+			// 0x20 range
+		case SHA3:
+			offset, size := stack.pop(), stack.pop()
+			data := crypto.Sha3(mem.Get(offset.Int64(), size.Int64()))
+
+			stack.push(common.BigD(data))
+
+			self.Printf(" => (%v) %x", size, data)
+			// 0x30 range
+		case ADDRESS:
+			stack.push(common.Bytes2Big(context.Address().Bytes()))
+
+			self.Printf(" => %x", context.Address())
+		case BALANCE:
+			addr := common.BigToAddress(stack.pop())
+			balance := statedb.GetBalance(addr)
+
+			stack.push(balance)
+
+			self.Printf(" => %v (%x)", balance, addr)
+		case ORIGIN:
+			origin := self.env.Origin()
+
+			stack.push(origin.Big())
+
+			self.Printf(" => %x", origin)
+		case CALLER:
+			caller := context.caller.Address()
+			stack.push(common.Bytes2Big(caller.Bytes()))
+
+			self.Printf(" => %x", caller)
+		case CALLVALUE:
+			stack.push(value)
+
+			self.Printf(" => %v", value)
+		case CALLDATALOAD:
+			var (
+				offset  = stack.pop()
+				data    = make([]byte, 32)
+				lenData = big.NewInt(int64(len(callData)))
+			)
+
+			if lenData.Cmp(offset) >= 0 {
+				length := new(big.Int).Add(offset, common.Big32)
+				length = common.BigMin(length, lenData)
+
+				copy(data, callData[offset.Int64():length.Int64()])
+			}
+
+			self.Printf(" => 0x%x", data)
+
+			stack.push(common.BigD(data))
+		case CALLDATASIZE:
+			l := int64(len(callData))
+			stack.push(big.NewInt(l))
+
+			self.Printf(" => %d", l)
+		case CALLDATACOPY:
+			var (
+				mOff = stack.pop()
+				cOff = stack.pop()
+				l    = stack.pop()
+			)
+			data := getData(callData, cOff, l)
+
+			mem.Set(mOff.Uint64(), l.Uint64(), data)
+
+			self.Printf(" => [%v, %v, %v]", mOff, cOff, l)
+		case CODESIZE, EXTCODESIZE:
+			var code []byte
+			if op == EXTCODESIZE {
+				addr := common.BigToAddress(stack.pop())
+
+				code = statedb.GetCode(addr)
+			} else {
+				code = context.Code
+			}
+
+			l := big.NewInt(int64(len(code)))
+			stack.push(l)
+
+			self.Printf(" => %d", l)
+		case CODECOPY, EXTCODECOPY:
+			var code []byte
+			if op == EXTCODECOPY {
+				addr := common.BigToAddress(stack.pop())
+				code = statedb.GetCode(addr)
+			} else {
+				code = context.Code
+			}
+
+			var (
+				mOff = stack.pop()
+				cOff = stack.pop()
+				l    = stack.pop()
+			)
+
+			codeCopy := getData(code, cOff, l)
+
+			mem.Set(mOff.Uint64(), l.Uint64(), codeCopy)
+
+			self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, codeCopy)
+		case GASPRICE:
+			stack.push(context.Price)
+
+			self.Printf(" => %x", context.Price)
+
+			// 0x40 range
+		case BLOCKHASH:
+			num := stack.pop()
+
+			n := new(big.Int).Sub(self.env.BlockNumber(), common.Big257)
+			if num.Cmp(n) > 0 && num.Cmp(self.env.BlockNumber()) < 0 {
+				stack.push(self.env.GetHash(num.Uint64()).Big())
+			} else {
+				stack.push(common.Big0)
+			}
+
+			self.Printf(" => 0x%x", stack.peek().Bytes())
+		case COINBASE:
+			coinbase := self.env.Coinbase()
+
+			stack.push(coinbase.Big())
+
+			self.Printf(" => 0x%x", coinbase)
+		case TIMESTAMP:
+			time := self.env.Time()
+
+			stack.push(big.NewInt(time))
+
+			self.Printf(" => 0x%x", time)
+		case NUMBER:
+			number := self.env.BlockNumber()
+
+			stack.push(U256(number))
+
+			self.Printf(" => 0x%x", number.Bytes())
+		case DIFFICULTY:
+			difficulty := self.env.Difficulty()
+
+			stack.push(difficulty)
+
+			self.Printf(" => 0x%x", difficulty.Bytes())
+		case GASLIMIT:
+			self.Printf(" => %v", self.env.GasLimit())
+
+			stack.push(self.env.GasLimit())
+
+			// 0x50 range
+		case PUSH1, PUSH2, PUSH3, PUSH4, PUSH5, PUSH6, PUSH7, PUSH8, PUSH9, PUSH10, PUSH11, PUSH12, PUSH13, PUSH14, PUSH15, PUSH16, PUSH17, PUSH18, PUSH19, PUSH20, PUSH21, PUSH22, PUSH23, PUSH24, PUSH25, PUSH26, PUSH27, PUSH28, PUSH29, PUSH30, PUSH31, PUSH32:
+			a := uint64(op - PUSH1 + 1)
+			byts := context.GetRangeValue(pc+1, a)
+			// push value to stack
+			stack.push(common.BigD(byts))
+			pc += a
+
+			step += int(op) - int(PUSH1) + 1
+
+			self.Printf(" => 0x%x", byts)
+		case POP:
+			stack.pop()
+		case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16:
+			n := int(op - DUP1 + 1)
+			stack.dup(n)
+
+			self.Printf(" => [%d] 0x%x", n, stack.peek().Bytes())
+		case SWAP1, SWAP2, SWAP3, SWAP4, SWAP5, SWAP6, SWAP7, SWAP8, SWAP9, SWAP10, SWAP11, SWAP12, SWAP13, SWAP14, SWAP15, SWAP16:
+			n := int(op - SWAP1 + 2)
+			stack.swap(n)
+
+			self.Printf(" => [%d]", n)
+		case LOG0, LOG1, LOG2, LOG3, LOG4:
+			n := int(op - LOG0)
+			topics := make([]common.Hash, n)
+			mStart, mSize := stack.pop(), stack.pop()
+			for i := 0; i < n; i++ {
+				topics[i] = common.BigToHash(stack.pop()) //common.LeftPadBytes(stack.pop().Bytes(), 32)
+			}
+
+			data := mem.Get(mStart.Int64(), mSize.Int64())
+			log := &Log{context.Address(), topics, data, self.env.BlockNumber().Uint64()}
+			self.env.AddLog(log)
+
+			self.Printf(" => %v", log)
+		case MLOAD:
+			offset := stack.pop()
+			val := common.BigD(mem.Get(offset.Int64(), 32))
+			stack.push(val)
+
+			self.Printf(" => 0x%x", val.Bytes())
+		case MSTORE: // Store the value at stack top-1 in to memory at location stack top
+			// pop value of the stack
+			mStart, val := stack.pop(), stack.pop()
+			mem.Set(mStart.Uint64(), 32, common.BigToBytes(val, 256))
+
+			self.Printf(" => 0x%x", val)
+		case MSTORE8:
+			off, val := stack.pop().Int64(), stack.pop().Int64()
+
+			mem.store[off] = byte(val & 0xff)
+
+			self.Printf(" => [%v] 0x%x", off, mem.store[off])
+		case SLOAD:
+			loc := common.BigToHash(stack.pop())
+			val := common.Bytes2Big(statedb.GetState(context.Address(), loc))
+			stack.push(val)
+
+			self.Printf(" {0x%x : 0x%x}", loc, val.Bytes())
+		case SSTORE:
+			loc := common.BigToHash(stack.pop())
+			val := stack.pop()
+
+			statedb.SetState(context.Address(), loc, val)
+
+			self.Printf(" {0x%x : 0x%x}", loc, val.Bytes())
+		case JUMP:
+			jump(pc, stack.pop())
+
+			continue
+		case JUMPI:
+			pos, cond := stack.pop(), stack.pop()
+
+			if cond.Cmp(common.BigTrue) >= 0 {
+				jump(pc, pos)
+
+				continue
+			}
+
+			self.Printf(" ~> false")
+
+		case JUMPDEST:
+		case PC:
+			stack.push(big.NewInt(int64(pc)))
+		case MSIZE:
+			stack.push(big.NewInt(int64(mem.Len())))
+		case GAS:
+			stack.push(context.Gas)
+
+			self.Printf(" => %x", context.Gas)
+			// 0x60 range
+		case CREATE:
+
+			var (
+				value        = stack.pop()
+				offset, size = stack.pop(), stack.pop()
+				input        = mem.Get(offset.Int64(), size.Int64())
+				gas          = new(big.Int).Set(context.Gas)
+				addr         common.Address
+			)
+			self.Endl()
+
+			context.UseGas(context.Gas)
+			ret, suberr, ref := self.env.Create(context, nil, input, gas, price, value)
+			if suberr != nil {
+				stack.push(common.BigFalse)
+
+				self.Printf(" (*) 0x0 %v", suberr)
+			} else {
+
+				// gas < len(ret) * CreateDataGas == NO_CODE
+				dataGas := big.NewInt(int64(len(ret)))
+				dataGas.Mul(dataGas, GasCreateByte)
+				if context.UseGas(dataGas) {
+					ref.SetCode(ret)
+				}
+				addr = ref.Address()
+
+				stack.push(addr.Big())
+
+			}
+
+		case CALL, CALLCODE:
+			gas := stack.pop()
+			// pop gas and value of the stack.
+			addr, value := stack.pop(), stack.pop()
+			value = U256(value)
+			// pop input size and offset
+			inOffset, inSize := stack.pop(), stack.pop()
+			// pop return size and offset
+			retOffset, retSize := stack.pop(), stack.pop()
+
+			address := common.BigToAddress(addr)
+			self.Printf(" => %x", address).Endl()
+
+			// Get the arguments from the memory
+			args := mem.Get(inOffset.Int64(), inSize.Int64())
+
+			if len(value.Bytes()) > 0 {
+				gas.Add(gas, GasStipend)
+			}
+
+			var (
+				ret []byte
+				err error
+			)
+			if op == CALLCODE {
+				ret, err = self.env.CallCode(context, address, args, gas, price, value)
+			} else {
+				ret, err = self.env.Call(context, address, args, gas, price, value)
+			}
+
+			if err != nil {
+				stack.push(common.BigFalse)
+
+				self.Printf("%v").Endl()
+			} else {
+				stack.push(common.BigTrue)
+
+				mem.Set(retOffset.Uint64(), retSize.Uint64(), ret)
+			}
+			self.Printf("resume %x (%v)", context.Address(), context.Gas)
+		case RETURN:
+			offset, size := stack.pop(), stack.pop()
+			ret := mem.Get(offset.Int64(), size.Int64())
+
+			self.Printf(" => [%v, %v] (%d) 0x%x", offset, size, len(ret), ret).Endl()
+
+			return context.Return(ret), nil
+		case SUICIDE:
+			receiver := statedb.GetOrNewStateObject(common.BigToAddress(stack.pop()))
+			balance := statedb.GetBalance(context.Address())
+
+			self.Printf(" => (%x) %v", receiver.Address().Bytes()[:4], balance)
+
+			receiver.AddBalance(balance)
+
+			statedb.Delete(context.Address())
+
+			fallthrough
+		case STOP: // Stop the context
+			self.Endl()
+
+			return context.Return(nil), nil
+		default:
+			self.Printf("(pc) %-3v Invalid opcode %x\n", pc, op).Endl()
+
+			panic(fmt.Errorf("Invalid opcode %x", op))
+		}
+
+		pc++
+
+		self.Endl()
+	}
+}
+
+func (self *Vm) calculateGasAndSize(context *Context, caller ContextRef, op OpCode, statedb *state.StateDB, mem *Memory, stack *stack) (*big.Int, *big.Int) {
+	var (
+		gas                 = new(big.Int)
+		newMemSize *big.Int = new(big.Int)
+	)
+	baseCheck(op, stack, gas)
+
+	// stack Check, memory resize & gas phase
+	switch op {
+	case PUSH1, PUSH2, PUSH3, PUSH4, PUSH5, PUSH6, PUSH7, PUSH8, PUSH9, PUSH10, PUSH11, PUSH12, PUSH13, PUSH14, PUSH15, PUSH16, PUSH17, PUSH18, PUSH19, PUSH20, PUSH21, PUSH22, PUSH23, PUSH24, PUSH25, PUSH26, PUSH27, PUSH28, PUSH29, PUSH30, PUSH31, PUSH32:
+		gas.Set(GasFastestStep)
+	case SWAP1, SWAP2, SWAP3, SWAP4, SWAP5, SWAP6, SWAP7, SWAP8, SWAP9, SWAP10, SWAP11, SWAP12, SWAP13, SWAP14, SWAP15, SWAP16:
+		n := int(op - SWAP1 + 2)
+		stack.require(n)
+		gas.Set(GasFastestStep)
+	case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16:
+		n := int(op - DUP1 + 1)
+		stack.require(n)
+		gas.Set(GasFastestStep)
+	case LOG0, LOG1, LOG2, LOG3, LOG4:
+		n := int(op - LOG0)
+		stack.require(n + 2)
+
+		mSize, mStart := stack.data[stack.len()-2], stack.data[stack.len()-1]
+
+		gas.Add(gas, GasLogBase)
+		gas.Add(gas, new(big.Int).Mul(big.NewInt(int64(n)), GasLogTopic))
+		gas.Add(gas, new(big.Int).Mul(mSize, GasLogByte))
+
+		newMemSize = calcMemSize(mStart, mSize)
+	case EXP:
+		gas.Add(gas, new(big.Int).Mul(big.NewInt(int64(len(stack.data[stack.len()-2].Bytes()))), GasExpByte))
+	case SSTORE:
+		stack.require(2)
+
+		var g *big.Int
+		y, x := stack.data[stack.len()-2], stack.data[stack.len()-1]
+		val := statedb.GetState(context.Address(), common.BigToHash(x))
+		if len(val) == 0 && len(y.Bytes()) > 0 {
+			// 0 => non 0
+			g = GasStorageAdd
+		} else if len(val) > 0 && len(y.Bytes()) == 0 {
+			statedb.Refund(self.env.Origin(), RefundStorage)
+
+			g = GasStorageMod
+		} else {
+			// non 0 => non 0 (or 0 => 0)
+			g = GasStorageMod
+		}
+		gas.Set(g)
+	case SUICIDE:
+		if !statedb.IsDeleted(context.Address()) {
+			statedb.Refund(self.env.Origin(), RefundSuicide)
+		}
+	case MLOAD:
+		newMemSize = calcMemSize(stack.peek(), u256(32))
+	case MSTORE8:
+		newMemSize = calcMemSize(stack.peek(), u256(1))
+	case MSTORE:
+		newMemSize = calcMemSize(stack.peek(), u256(32))
+	case RETURN:
+		newMemSize = calcMemSize(stack.peek(), stack.data[stack.len()-2])
+	case SHA3:
+		newMemSize = calcMemSize(stack.peek(), stack.data[stack.len()-2])
+
+		words := toWordSize(stack.data[stack.len()-2])
+		gas.Add(gas, words.Mul(words, GasSha3Word))
+	case CALLDATACOPY:
+		newMemSize = calcMemSize(stack.peek(), stack.data[stack.len()-3])
+
+		words := toWordSize(stack.data[stack.len()-3])
+		gas.Add(gas, words.Mul(words, GasCopyWord))
+	case CODECOPY:
+		newMemSize = calcMemSize(stack.peek(), stack.data[stack.len()-3])
+
+		words := toWordSize(stack.data[stack.len()-3])
+		gas.Add(gas, words.Mul(words, GasCopyWord))
+	case EXTCODECOPY:
+		newMemSize = calcMemSize(stack.data[stack.len()-2], stack.data[stack.len()-4])
+
+		words := toWordSize(stack.data[stack.len()-4])
+		gas.Add(gas, words.Mul(words, GasCopyWord))
+
+	case CREATE:
+		newMemSize = calcMemSize(stack.data[stack.len()-2], stack.data[stack.len()-3])
+	case CALL, CALLCODE:
+		gas.Add(gas, stack.data[stack.len()-1])
+
+		if op == CALL {
+			if self.env.State().GetStateObject(common.BigToAddress(stack.data[stack.len()-2])) == nil {
+				gas.Add(gas, GasCallNewAccount)
+			}
+		}
+
+		if len(stack.data[stack.len()-3].Bytes()) > 0 {
+			gas.Add(gas, GasCallValueTransfer)
+		}
+
+		x := calcMemSize(stack.data[stack.len()-6], stack.data[stack.len()-7])
+		y := calcMemSize(stack.data[stack.len()-4], stack.data[stack.len()-5])
+
+		newMemSize = common.BigMax(x, y)
+	}
+
+	if newMemSize.Cmp(common.Big0) > 0 {
+		newMemSizeWords := toWordSize(newMemSize)
+		newMemSize.Mul(newMemSizeWords, u256(32))
+
+		if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 {
+			oldSize := toWordSize(big.NewInt(int64(mem.Len())))
+			pow := new(big.Int).Exp(oldSize, common.Big2, Zero)
+			linCoef := new(big.Int).Mul(oldSize, GasMemWord)
+			quadCoef := new(big.Int).Div(pow, GasQuadCoeffDenom)
+			oldTotalFee := new(big.Int).Add(linCoef, quadCoef)
+
+			pow.Exp(newMemSizeWords, common.Big2, Zero)
+			linCoef = new(big.Int).Mul(newMemSizeWords, GasMemWord)
+			quadCoef = new(big.Int).Div(pow, GasQuadCoeffDenom)
+			newTotalFee := new(big.Int).Add(linCoef, quadCoef)
+
+			gas.Add(gas, new(big.Int).Sub(newTotalFee, oldTotalFee))
+		}
+	}
+
+	return newMemSize, gas
+}
+
+func (self *Vm) RunPrecompiled(p *PrecompiledAccount, callData []byte, context *Context) (ret []byte, err error) {
+	gas := p.Gas(len(callData))
+	if context.UseGas(gas) {
+		ret = p.Call(callData)
+		self.Printf("NATIVE_FUNC => %x", ret)
+		self.Endl()
+
+		return context.Return(ret), nil
+	} else {
+		self.Printf("NATIVE_FUNC => failed").Endl()
+
+		tmp := new(big.Int).Set(context.Gas)
+
+		panic(OOG(gas, tmp).Error())
+	}
+}
+
+func (self *Vm) Printf(format string, v ...interface{}) VirtualMachine {
+	if self.debug {
+		if self.logTy == LogTyPretty {
+			self.logStr += fmt.Sprintf(format, v...)
+		}
+	}
+
+	return self
+}
+
+func (self *Vm) Endl() VirtualMachine {
+	if self.debug {
+		if self.logTy == LogTyPretty {
+			vmlogger.Infoln(self.logStr)
+			self.logStr = ""
+		}
+	}
+
+	return self
+}
+
+func (self *Vm) Env() Environment {
+	return self.env
+}
diff --git a/core/vm/vm_jit.go b/core/vm/vm_jit.go
new file mode 100644
index 000000000..2b88d8620
--- /dev/null
+++ b/core/vm/vm_jit.go
@@ -0,0 +1,370 @@
+// +build evmjit
+
+package vm
+
+/*
+
+void* evmjit_create();
+int   evmjit_run(void* _jit, void* _data, void* _env);
+void  evmjit_destroy(void* _jit);
+
+// Shared library evmjit (e.g. libevmjit.so) is expected to be installed in /usr/local/lib
+// More: https://github.com/ethereum/evmjit
+#cgo LDFLAGS: -levmjit
+*/
+import "C"
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/core/state"
+	"math/big"
+	"unsafe"
+)
+
+type JitVm struct {
+	env        Environment
+	me         ContextRef
+	callerAddr []byte
+	price      *big.Int
+	data       RuntimeData
+}
+
+type i256 [32]byte
+
+type RuntimeData struct {
+	gas          int64
+	gasPrice     int64
+	callData     *byte
+	callDataSize uint64
+	address      i256
+	caller       i256
+	origin       i256
+	callValue    i256
+	coinBase     i256
+	difficulty   i256
+	gasLimit     i256
+	number       uint64
+	timestamp    int64
+	code         *byte
+	codeSize     uint64
+	codeHash     i256
+}
+
+func hash2llvm(h []byte) i256 {
+	var m i256
+	copy(m[len(m)-len(h):], h) // right aligned copy
+	return m
+}
+
+func llvm2hash(m *i256) []byte {
+	return C.GoBytes(unsafe.Pointer(m), C.int(len(m)))
+}
+
+func llvm2hashRef(m *i256) []byte {
+	return (*[1 << 30]byte)(unsafe.Pointer(m))[:len(m):len(m)]
+}
+
+func address2llvm(addr []byte) i256 {
+	n := hash2llvm(addr)
+	bswap(&n)
+	return n
+}
+
+// bswap swap bytes of the 256-bit integer on LLVM side
+// TODO: Do not change memory on LLVM side, that can conflict with memory access optimizations
+func bswap(m *i256) *i256 {
+	for i, l := 0, len(m); i < l/2; i++ {
+		m[i], m[l-i-1] = m[l-i-1], m[i]
+	}
+	return m
+}
+
+func trim(m []byte) []byte {
+	skip := 0
+	for i := 0; i < len(m); i++ {
+		if m[i] == 0 {
+			skip++
+		} else {
+			break
+		}
+	}
+	return m[skip:]
+}
+
+func getDataPtr(m []byte) *byte {
+	var p *byte
+	if len(m) > 0 {
+		p = &m[0]
+	}
+	return p
+}
+
+func big2llvm(n *big.Int) i256 {
+	m := hash2llvm(n.Bytes())
+	bswap(&m)
+	return m
+}
+
+func llvm2big(m *i256) *big.Int {
+	n := big.NewInt(0)
+	for i := 0; i < len(m); i++ {
+		b := big.NewInt(int64(m[i]))
+		b.Lsh(b, uint(i)*8)
+		n.Add(n, b)
+	}
+	return n
+}
+
+// llvm2bytesRef creates a []byte slice that references byte buffer on LLVM side (as of that not controller by GC)
+// User must asure that referenced memory is available to Go until the data is copied or not needed any more
+func llvm2bytesRef(data *byte, length uint64) []byte {
+	if length == 0 {
+		return nil
+	}
+	if data == nil {
+		panic("Unexpected nil data pointer")
+	}
+	return (*[1 << 30]byte)(unsafe.Pointer(data))[:length:length]
+}
+
+func untested(condition bool, message string) {
+	if condition {
+		panic("Condition `" + message + "` tested. Remove assert.")
+	}
+}
+
+func assert(condition bool, message string) {
+	if !condition {
+		panic("Assert `" + message + "` failed!")
+	}
+}
+
+func NewJitVm(env Environment) *JitVm {
+	return &JitVm{env: env}
+}
+
+func (self *JitVm) Run(me, caller ContextRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) {
+	// TODO: depth is increased but never checked by VM. VM should not know about it at all.
+	self.env.SetDepth(self.env.Depth() + 1)
+
+	// TODO: Move it to Env.Call() or sth
+	if Precompiled[string(me.Address())] != nil {
+		// if it's address of precopiled contract
+		// fallback to standard VM
+		stdVm := New(self.env)
+		return stdVm.Run(me, caller, code, value, gas, price, callData)
+	}
+
+	if self.me != nil {
+		panic("JitVm.Run() can be called only once per JitVm instance")
+	}
+
+	self.me = me
+	self.callerAddr = caller.Address()
+	self.price = price
+
+	self.data.gas = gas.Int64()
+	self.data.gasPrice = price.Int64()
+	self.data.callData = getDataPtr(callData)
+	self.data.callDataSize = uint64(len(callData))
+	self.data.address = address2llvm(self.me.Address())
+	self.data.caller = address2llvm(caller.Address())
+	self.data.origin = address2llvm(self.env.Origin())
+	self.data.callValue = big2llvm(value)
+	self.data.coinBase = address2llvm(self.env.Coinbase())
+	self.data.difficulty = big2llvm(self.env.Difficulty())
+	self.data.gasLimit = big2llvm(self.env.GasLimit())
+	self.data.number = self.env.BlockNumber().Uint64()
+	self.data.timestamp = self.env.Time()
+	self.data.code = getDataPtr(code)
+	self.data.codeSize = uint64(len(code))
+	self.data.codeHash = hash2llvm(crypto.Sha3(code)) // TODO: Get already computed hash?
+
+	jit := C.evmjit_create()
+	retCode := C.evmjit_run(jit, unsafe.Pointer(&self.data), unsafe.Pointer(self))
+
+	if retCode < 0 {
+		err = errors.New("OOG from JIT")
+		gas.SetInt64(0) // Set gas to 0, JIT does not bother
+	} else {
+		gas.SetInt64(self.data.gas)
+		if retCode == 1 { // RETURN
+			ret = C.GoBytes(unsafe.Pointer(self.data.callData), C.int(self.data.callDataSize))
+		} else if retCode == 2 { // SUICIDE
+			// TODO: Suicide support logic should be moved to Env to be shared by VM implementations
+			state := self.Env().State()
+			receiverAddr := llvm2hashRef(bswap(&self.data.address))
+			receiver := state.GetOrNewStateObject(receiverAddr)
+			balance := state.GetBalance(me.Address())
+			receiver.AddBalance(balance)
+			state.Delete(me.Address())
+		}
+	}
+
+	C.evmjit_destroy(jit)
+	return
+}
+
+func (self *JitVm) Printf(format string, v ...interface{}) VirtualMachine {
+	return self
+}
+
+func (self *JitVm) Endl() VirtualMachine {
+	return self
+}
+
+func (self *JitVm) Env() Environment {
+	return self.env
+}
+
+//export env_sha3
+func env_sha3(dataPtr *byte, length uint64, resultPtr unsafe.Pointer) {
+	data := llvm2bytesRef(dataPtr, length)
+	hash := crypto.Sha3(data)
+	result := (*i256)(resultPtr)
+	*result = hash2llvm(hash)
+}
+
+//export env_sstore
+func env_sstore(vmPtr unsafe.Pointer, indexPtr unsafe.Pointer, valuePtr unsafe.Pointer) {
+	vm := (*JitVm)(vmPtr)
+	index := llvm2hash(bswap((*i256)(indexPtr)))
+	value := llvm2hash(bswap((*i256)(valuePtr)))
+	value = trim(value)
+	if len(value) == 0 {
+		prevValue := vm.env.State().GetState(vm.me.Address(), index)
+		if len(prevValue) != 0 {
+			vm.Env().State().Refund(vm.callerAddr, GasSStoreRefund)
+		}
+	}
+
+	vm.env.State().SetState(vm.me.Address(), index, value)
+}
+
+//export env_sload
+func env_sload(vmPtr unsafe.Pointer, indexPtr unsafe.Pointer, resultPtr unsafe.Pointer) {
+	vm := (*JitVm)(vmPtr)
+	index := llvm2hash(bswap((*i256)(indexPtr)))
+	value := vm.env.State().GetState(vm.me.Address(), index)
+	result := (*i256)(resultPtr)
+	*result = hash2llvm(value)
+	bswap(result)
+}
+
+//export env_balance
+func env_balance(_vm unsafe.Pointer, _addr unsafe.Pointer, _result unsafe.Pointer) {
+	vm := (*JitVm)(_vm)
+	addr := llvm2hash((*i256)(_addr))
+	balance := vm.Env().State().GetBalance(addr)
+	result := (*i256)(_result)
+	*result = big2llvm(balance)
+}
+
+//export env_blockhash
+func env_blockhash(_vm unsafe.Pointer, _number unsafe.Pointer, _result unsafe.Pointer) {
+	vm := (*JitVm)(_vm)
+	number := llvm2big((*i256)(_number))
+	result := (*i256)(_result)
+
+	currNumber := vm.Env().BlockNumber()
+	limit := big.NewInt(0).Sub(currNumber, big.NewInt(256))
+	if number.Cmp(limit) >= 0 && number.Cmp(currNumber) < 0 {
+		hash := vm.Env().GetHash(uint64(number.Int64()))
+		*result = hash2llvm(hash)
+	} else {
+		*result = i256{}
+	}
+}
+
+//export env_call
+func env_call(_vm unsafe.Pointer, _gas *int64, _receiveAddr unsafe.Pointer, _value unsafe.Pointer, inDataPtr unsafe.Pointer, inDataLen uint64, outDataPtr *byte, outDataLen uint64, _codeAddr unsafe.Pointer) bool {
+	vm := (*JitVm)(_vm)
+
+	//fmt.Printf("env_call (depth %d)\n", vm.Env().Depth())
+
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Printf("Recovered in env_call (depth %d, out %p %d): %s\n", vm.Env().Depth(), outDataPtr, outDataLen, r)
+		}
+	}()
+
+	balance := vm.Env().State().GetBalance(vm.me.Address())
+	value := llvm2big((*i256)(_value))
+
+	if balance.Cmp(value) >= 0 {
+		receiveAddr := llvm2hash((*i256)(_receiveAddr))
+		inData := C.GoBytes(inDataPtr, C.int(inDataLen))
+		outData := llvm2bytesRef(outDataPtr, outDataLen)
+		codeAddr := llvm2hash((*i256)(_codeAddr))
+		gas := big.NewInt(*_gas)
+		var out []byte
+		var err error
+		if bytes.Equal(codeAddr, receiveAddr) {
+			out, err = vm.env.Call(vm.me, codeAddr, inData, gas, vm.price, value)
+		} else {
+			out, err = vm.env.CallCode(vm.me, codeAddr, inData, gas, vm.price, value)
+		}
+		*_gas = gas.Int64()
+		if err == nil {
+			copy(outData, out)
+			return true
+		}
+	}
+
+	return false
+}
+
+//export env_create
+func env_create(_vm unsafe.Pointer, _gas *int64, _value unsafe.Pointer, initDataPtr unsafe.Pointer, initDataLen uint64, _result unsafe.Pointer) {
+	vm := (*JitVm)(_vm)
+
+	value := llvm2big((*i256)(_value))
+	initData := C.GoBytes(initDataPtr, C.int(initDataLen)) // TODO: Unnecessary if low balance
+	result := (*i256)(_result)
+	*result = i256{}
+
+	gas := big.NewInt(*_gas)
+	ret, suberr, ref := vm.env.Create(vm.me, nil, initData, gas, vm.price, value)
+	if suberr == nil {
+		dataGas := big.NewInt(int64(len(ret))) // TODO: Nto the best design. env.Create can do it, it has the reference to gas counter
+		dataGas.Mul(dataGas, GasCreateByte)
+		gas.Sub(gas, dataGas)
+		*result = hash2llvm(ref.Address())
+	}
+	*_gas = gas.Int64()
+}
+
+//export env_log
+func env_log(_vm unsafe.Pointer, dataPtr unsafe.Pointer, dataLen uint64, _topic1 unsafe.Pointer, _topic2 unsafe.Pointer, _topic3 unsafe.Pointer, _topic4 unsafe.Pointer) {
+	vm := (*JitVm)(_vm)
+
+	data := C.GoBytes(dataPtr, C.int(dataLen))
+
+	topics := make([][]byte, 0, 4)
+	if _topic1 != nil {
+		topics = append(topics, llvm2hash((*i256)(_topic1)))
+	}
+	if _topic2 != nil {
+		topics = append(topics, llvm2hash((*i256)(_topic2)))
+	}
+	if _topic3 != nil {
+		topics = append(topics, llvm2hash((*i256)(_topic3)))
+	}
+	if _topic4 != nil {
+		topics = append(topics, llvm2hash((*i256)(_topic4)))
+	}
+
+	vm.Env().AddLog(state.NewLog(vm.me.Address(), topics, data, vm.env.BlockNumber().Uint64()))
+}
+
+//export env_extcode
+func env_extcode(_vm unsafe.Pointer, _addr unsafe.Pointer, o_size *uint64) *byte {
+	vm := (*JitVm)(_vm)
+	addr := llvm2hash((*i256)(_addr))
+	code := vm.Env().State().GetCode(addr)
+	*o_size = uint64(len(code))
+	return getDataPtr(code)
+}
diff --git a/core/vm/vm_jit_fake.go b/core/vm/vm_jit_fake.go
new file mode 100644
index 000000000..d6b5be45b
--- /dev/null
+++ b/core/vm/vm_jit_fake.go
@@ -0,0 +1,10 @@
+// +build !evmjit
+
+package vm
+
+import "fmt"
+
+func NewJitVm(env Environment) VirtualMachine {
+	fmt.Printf("Warning! EVM JIT not enabled.\n")
+	return New(env)
+}
diff --git a/core/vm/vm_test.go b/core/vm/vm_test.go
new file mode 100644
index 000000000..9bd147a72
--- /dev/null
+++ b/core/vm/vm_test.go
@@ -0,0 +1,3 @@
+package vm
+
+// Tests have been removed in favour of general tests. If anything implementation specific needs testing, put it here
diff --git a/core/vm_env.go b/core/vm_env.go
index 7845d1cd9..d786844dc 100644
--- a/core/vm_env.go
+++ b/core/vm_env.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/state"
-	"github.com/ethereum/go-ethereum/vm"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
 )
 
 type VMEnv struct {