Merge branch 'release/v0.7.10'vv0.7.10

16 files changed, 2014 insertions, 0 deletions

diff --git a/vm/.ethtest b/vm/.ethtest
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/vm/.ethtest
diff --git a/vm/address.go b/vm/address.go
new file mode 100644
index 000000000..611979c94
--- /dev/null
+++ b/vm/address.go
@@ -0,0 +1,56 @@
+package vm
+
+import (
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethutil"
+)
+
+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 = map[string]*PrecompiledAccount{
+	string(ethutil.LeftPadBytes([]byte{1}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+		return GasEcrecover
+	}, ecrecoverFunc},
+	string(ethutil.LeftPadBytes([]byte{2}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+		n := big.NewInt(int64(l+31)/32 + 1)
+		n.Mul(n, GasSha256)
+		return n
+	}, sha256Func},
+	string(ethutil.LeftPadBytes([]byte{3}, 20)): &PrecompiledAccount{func(l int) *big.Int {
+		n := big.NewInt(int64(l+31)/32 + 1)
+		n.Mul(n, GasRipemd)
+		return n
+	}, ripemd160Func},
+}
+
+func sha256Func(in []byte) []byte {
+	return crypto.Sha256(in)
+}
+
+func ripemd160Func(in []byte) []byte {
+	return ethutil.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 := ethutil.BigD(in[32:64]).Bytes()[0] - 27
+	sig := append(in[64:], v)
+
+	return ethutil.LeftPadBytes(crypto.Sha3(crypto.Ecrecover(append(hash, sig...))[1:])[12:], 32)
+}
diff --git a/vm/analysis.go b/vm/analysis.go
new file mode 100644
index 000000000..fef448b7b
--- /dev/null
+++ b/vm/analysis.go
@@ -0,0 +1,35 @@
+package vm
+
+import (
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/ethutil"
+)
+
+func analyseJumpDests(code []byte) (dests map[uint64]*big.Int) {
+	dests = make(map[uint64]*big.Int)
+
+	lp := false
+	var lpv *big.Int
+	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
+			if uint64(len(code)) > pc+1+a {
+				lpv = ethutil.BigD(code[pc+1 : pc+1+a])
+			}
+
+			pc += a
+			lp = true
+		case JUMP, JUMPI:
+			if lp {
+				dests[pc] = lpv
+			}
+
+		default:
+			lp = false
+		}
+	}
+	return
+}
diff --git a/vm/asm.go b/vm/asm.go
new file mode 100644
index 000000000..a94f01d3d
--- /dev/null
+++ b/vm/asm.go
@@ -0,0 +1,45 @@
+package vm
+
+import (
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/ethutil"
+)
+
+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, ethutil.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, ethutil.Big1)
+	}
+
+	return
+}
diff --git a/vm/closure.go b/vm/closure.go
new file mode 100644
index 000000000..97b31ada0
--- /dev/null
+++ b/vm/closure.go
@@ -0,0 +1,107 @@
+package vm
+
+import (
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/state"
+)
+
+type ClosureRef interface {
+	ReturnGas(*big.Int, *big.Int)
+	Address() []byte
+	SetCode([]byte)
+}
+
+type Closure struct {
+	caller  ClosureRef
+	object  ClosureRef
+	Code    []byte
+	message *state.Message
+
+	Gas, UsedGas, Price *big.Int
+
+	Args []byte
+}
+
+// Create a new closure for the given data items
+func NewClosure(msg *state.Message, caller ClosureRef, object ClosureRef, code []byte, gas, price *big.Int) *Closure {
+	c := &Closure{message: msg, caller: caller, object: object, Code: code, 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)
+	// 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 *Closure) GetOp(x uint64) OpCode {
+	return OpCode(c.GetByte(x))
+}
+
+func (c *Closure) GetByte(x uint64) byte {
+	if x < uint64(len(c.Code)) {
+		return c.Code[x]
+	}
+
+	return 0
+}
+
+func (c *Closure) GetBytes(x, y int) []byte {
+	if x >= len(c.Code) || y >= len(c.Code) {
+		return nil
+	}
+
+	return c.Code[x : x+y]
+}
+
+func (c *Closure) GetRangeValue(x, y uint64) []byte {
+	if x >= uint64(len(c.Code)) || y >= uint64(len(c.Code)) {
+		return nil
+	}
+
+	return c.Code[x : x+y]
+}
+
+func (c *Closure) Return(ret []byte) []byte {
+	// Return the remaining gas to the caller
+	c.caller.ReturnGas(c.Gas, c.Price)
+
+	return ret
+}
+
+/*
+ * Gas functions
+ */
+func (c *Closure) 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 *Closure) ReturnGas(gas, price *big.Int) {
+	// Return the gas to the closure
+	c.Gas.Add(c.Gas, gas)
+	c.UsedGas.Sub(c.UsedGas, gas)
+}
+
+/*
+ * Set / Get
+ */
+func (c *Closure) Address() []byte {
+	return c.object.Address()
+}
+
+func (self *Closure) SetCode(code []byte) {
+	self.Code = code
+}
diff --git a/vm/common.go b/vm/common.go
new file mode 100644
index 000000000..529bbdeb1
--- /dev/null
+++ b/vm/common.go
@@ -0,0 +1,75 @@
+package vm
+
+import (
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/ethutil"
+	"github.com/ethereum/go-ethereum/logger"
+)
+
+var vmlogger = logger.NewLogger("VM")
+
+type Type int
+
+const (
+	StandardVmTy Type = iota
+	DebugVmTy
+
+	MaxVmTy
+)
+
+var (
+	GasStep         = big.NewInt(1)
+	GasSha          = big.NewInt(10)
+	GasSLoad        = big.NewInt(20)
+	GasSStore       = big.NewInt(100)
+	GasSStoreRefund = big.NewInt(100)
+	GasBalance      = big.NewInt(20)
+	GasCreate       = big.NewInt(100)
+	GasCall         = big.NewInt(20)
+	GasCreateByte   = big.NewInt(5)
+	GasSha3Byte     = big.NewInt(10)
+	GasSha256Byte   = big.NewInt(50)
+	GasRipemdByte   = big.NewInt(50)
+	GasMemory       = big.NewInt(1)
+	GasData         = big.NewInt(5)
+	GasTx           = big.NewInt(500)
+	GasLog          = big.NewInt(32)
+	GasSha256       = big.NewInt(50)
+	GasRipemd       = big.NewInt(50)
+	GasEcrecover    = big.NewInt(500)
+
+	Pow256 = ethutil.BigPow(2, 256)
+
+	LogTyPretty byte = 0x1
+	LogTyDiff   byte = 0x2
+
+	U256 = ethutil.U256
+	S256 = ethutil.S256
+)
+
+const MaxCallDepth = 1024
+
+func calcMemSize(off, l *big.Int) *big.Int {
+	if l.Cmp(ethutil.Big0) == 0 {
+		return ethutil.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
+}
diff --git a/vm/debugger.go b/vm/debugger.go
new file mode 100644
index 000000000..9b08634c6
--- /dev/null
+++ b/vm/debugger.go
@@ -0,0 +1,10 @@
+package vm
+
+import "github.com/ethereum/go-ethereum/state"
+
+type Debugger interface {
+	BreakHook(step int, op OpCode, mem *Memory, stack *Stack, object *state.StateObject) bool
+	StepHook(step int, op OpCode, mem *Memory, stack *Stack, object *state.StateObject) bool
+	BreakPoints() []int64
+	SetCode(byteCode []byte)
+}
diff --git a/vm/environment.go b/vm/environment.go
new file mode 100644
index 000000000..969bc5e43
--- /dev/null
+++ b/vm/environment.go
@@ -0,0 +1,81 @@
+package vm
+
+import (
+	"errors"
+	"fmt"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/ethutil"
+	"github.com/ethereum/go-ethereum/state"
+)
+
+type Environment interface {
+	State() *state.StateDB
+
+	Origin() []byte
+	BlockNumber() *big.Int
+	PrevHash() []byte
+	Coinbase() []byte
+	Time() int64
+	Difficulty() *big.Int
+	BlockHash() []byte
+	GasLimit() *big.Int
+	Transfer(from, to Account, amount *big.Int) error
+	AddLog(state.Log)
+
+	Depth() int
+	SetDepth(i int)
+
+	Call(me ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error)
+	CallCode(me ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error)
+	Create(me ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, ClosureRef)
+}
+
+type Object interface {
+	GetStorage(key *big.Int) *ethutil.Value
+	SetStorage(key *big.Int, value *ethutil.Value)
+}
+
+type Account interface {
+	SubBalance(amount *big.Int)
+	AddBalance(amount *big.Int)
+	Balance() *big.Int
+}
+
+// generic transfer method
+func Transfer(from, to Account, amount *big.Int) error {
+	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 []byte
+	topics  [][]byte
+	data    []byte
+}
+
+func (self *Log) Address() []byte {
+	return self.address
+}
+
+func (self *Log) Topics() [][]byte {
+	return self.topics
+}
+
+func (self *Log) Data() []byte {
+	return self.data
+}
+
+func (self *Log) RlpData() interface{} {
+	return []interface{}{self.address, ethutil.ByteSliceToInterface(self.topics), self.data}
+}
+
+func (self *Log) String() string {
+	return fmt.Sprintf("[A=%x T=%x D=%x]", self.address, self.topics, self.data)
+}
diff --git a/vm/errors.go b/vm/errors.go
new file mode 100644
index 000000000..ab011bd62
--- /dev/null
+++ b/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/vm/main_test.go b/vm/main_test.go
new file mode 100644
index 000000000..0ae03bf6a
--- /dev/null
+++ b/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/vm/stack.go b/vm/stack.go
new file mode 100644
index 000000000..6091479cb
--- /dev/null
+++ b/vm/stack.go
@@ -0,0 +1,179 @@
+package vm
+
+import (
+	"fmt"
+	"math"
+	"math/big"
+)
+
+type OpType int
+
+const (
+	tNorm = iota
+	tData
+	tExtro
+	tCrypto
+)
+
+type TxCallback func(opType OpType) bool
+
+// Simple push/pop stack mechanism
+type Stack struct {
+	data []*big.Int
+}
+
+func NewStack() *Stack {
+	return &Stack{}
+}
+
+func (st *Stack) Data() []*big.Int {
+	return st.data
+}
+
+func (st *Stack) Len() int {
+	return len(st.data)
+}
+
+func (st *Stack) Pop() *big.Int {
+	str := st.data[len(st.data)-1]
+
+	copy(st.data[:len(st.data)-1], st.data[:len(st.data)-1])
+	st.data = st.data[:len(st.data)-1]
+
+	return str
+}
+
+func (st *Stack) Popn() (*big.Int, *big.Int) {
+	ints := st.data[len(st.data)-2:]
+
+	copy(st.data[:len(st.data)-2], st.data[:len(st.data)-2])
+	st.data = st.data[:len(st.data)-2]
+
+	return ints[0], ints[1]
+}
+
+func (st *Stack) Peek() *big.Int {
+	str := st.data[len(st.data)-1]
+
+	return str
+}
+
+func (st *Stack) Peekn() (*big.Int, *big.Int) {
+	ints := st.data[len(st.data)-2:]
+
+	return ints[0], ints[1]
+}
+
+func (st *Stack) Swapn(n int) (*big.Int, *big.Int) {
+	st.data[len(st.data)-n], st.data[len(st.data)-1] = st.data[len(st.data)-1], st.data[len(st.data)-n]
+
+	return st.data[len(st.data)-n], st.data[len(st.data)-1]
+}
+
+func (st *Stack) Dupn(n int) *big.Int {
+	st.Push(st.data[len(st.data)-n])
+
+	return st.Peek()
+}
+
+func (st *Stack) Push(d *big.Int) {
+	st.data = append(st.data, new(big.Int).Set(d))
+}
+
+func (st *Stack) Get(amount *big.Int) []*big.Int {
+	// offset + size <= len(data)
+	length := big.NewInt(int64(len(st.data)))
+	if amount.Cmp(length) <= 0 {
+		start := new(big.Int).Sub(length, amount)
+		return st.data[start.Int64():length.Int64()]
+	}
+
+	return nil
+}
+
+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("#############")
+}
+
+type Memory struct {
+	store []byte
+}
+
+func NewMemory() *Memory {
+	return &Memory{nil}
+}
+
+func (m *Memory) Set(offset, size uint64, value []byte) {
+	if len(value) > 0 {
+		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 (m *Memory) Get(offset, size int64) []byte {
+	if len(m.store) > int(offset) {
+		end := int(math.Min(float64(len(m.store)), float64(offset+size)))
+
+		return m.store[offset:end]
+	}
+
+	return nil
+}
+
+func (self *Memory) Geti(offset, size int64) (cpy []byte) {
+	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/vm/types.go b/vm/types.go
new file mode 100644
index 000000000..ec9c7e74e
--- /dev/null
+++ b/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
+	PREVHASH 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
+	PREVHASH:    "PREVHASH",
+	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/vm/virtual_machine.go b/vm/virtual_machine.go
new file mode 100644
index 000000000..3b6f98ab2
--- /dev/null
+++ b/vm/virtual_machine.go
@@ -0,0 +1,10 @@
+package vm
+
+import "math/big"
+
+type VirtualMachine interface {
+	Env() Environment
+	Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, data []byte) ([]byte, error)
+	Printf(string, ...interface{}) VirtualMachine
+	Endl() VirtualMachine
+}
diff --git a/vm/vm.go b/vm/vm.go
new file mode 100644
index 000000000..22172cb3a
--- /dev/null
+++ b/vm/vm.go
@@ -0,0 +1,36 @@
+package vm
+
+import "math/big"
+
+// BIG FAT WARNING. THIS VM IS NOT YET IS USE!
+// I want to get all VM tests pass first before updating this VM
+
+type Vm struct {
+	env   Environment
+	err   error
+	depth int
+}
+
+func New(env Environment, typ Type) VirtualMachine {
+	switch typ {
+	case DebugVmTy:
+		return NewDebugVm(env)
+	default:
+		return &Vm{env: env}
+	}
+}
+
+func (self *Vm) Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, data []byte) (ret []byte, err error) {
+	panic("not implemented")
+}
+
+func (self *Vm) Env() Environment {
+	return self.env
+}
+
+func (self *Vm) Depth() int {
+	return self.depth
+}
+
+func (self *Vm) Printf(format string, v ...interface{}) VirtualMachine { return self }
+func (self *Vm) Endl() VirtualMachine                                  { return self }
diff --git a/vm/vm_debug.go b/vm/vm_debug.go
new file mode 100644
index 000000000..aa3291e66
--- /dev/null
+++ b/vm/vm_debug.go
@@ -0,0 +1,983 @@
+package vm
+
+import (
+	"fmt"
+	"math"
+	"math/big"
+
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethutil"
+	"github.com/ethereum/go-ethereum/state"
+)
+
+type DebugVm struct {
+	env Environment
+
+	logTy  byte
+	logStr string
+
+	err error
+
+	// Debugging
+	Dbg Debugger
+
+	BreakPoints []int64
+	Stepping    bool
+	Fn          string
+
+	Recoverable bool
+}
+
+func NewDebugVm(env Environment) *DebugVm {
+	lt := LogTyPretty
+	if ethutil.Config.Diff {
+		lt = LogTyDiff
+	}
+
+	return &DebugVm{env: env, logTy: lt, Recoverable: true}
+}
+
+func (self *DebugVm) Run(me, caller ClosureRef, code []byte, value, gas, price *big.Int, callData []byte) (ret []byte, err error) {
+	self.env.SetDepth(self.env.Depth() + 1)
+
+	msg := self.env.State().Manifest().AddMessage(&state.Message{
+		To: me.Address(), From: caller.Address(),
+		Input:  callData,
+		Origin: self.env.Origin(),
+		Block:  self.env.BlockHash(), Timestamp: self.env.Time(), Coinbase: self.env.Coinbase(), Number: self.env.BlockNumber(),
+		Value: value,
+	})
+	closure := NewClosure(msg, caller, me, code, gas, price)
+
+	if p := Precompiled[string(me.Address())]; p != nil {
+		return self.RunPrecompiled(p, callData, closure)
+	}
+
+	if self.Recoverable {
+		// Recover from any require exception
+		defer func() {
+			if r := recover(); r != nil {
+				self.Endl()
+
+				closure.UseGas(closure.Gas)
+
+				ret = closure.Return(nil)
+
+				err = fmt.Errorf("%v", r)
+
+			}
+		}()
+	}
+
+	var (
+		op OpCode
+
+		destinations        = analyseJumpDests(closure.Code)
+		mem                 = NewMemory()
+		stack               = NewStack()
+		pc           uint64 = 0
+		step                = 0
+		prevStep            = 0
+		statedb             = self.env.State()
+		require             = func(m int) {
+			if stack.Len() < m {
+				panic(fmt.Sprintf("%04v (%v) stack err size = %d, required = %d", pc, op, stack.Len(), m))
+			}
+		}
+
+		jump = func(from uint64, to *big.Int) {
+			p := to.Uint64()
+
+			self.Printf(" ~> %v", to)
+			// Return to start
+			if p == 0 {
+				pc = 0
+			} else {
+				nop := OpCode(closure.GetOp(p))
+				if !(nop == JUMPDEST || destinations[from] != nil) {
+					panic(fmt.Sprintf("invalid jump destination (%v) %v", nop, p))
+				} else if nop == JUMP || nop == JUMPI {
+					panic(fmt.Sprintf("not allowed to JUMP(I) in to JUMP"))
+				}
+
+				pc = to.Uint64()
+
+			}
+
+			self.Endl()
+		}
+	)
+
+	vmlogger.Debugf("(%d) (%x) %x (code=%d) gas: %v (d) %x\n", self.env.Depth(), caller.Address()[:4], closure.Address(), len(code), closure.Gas, callData)
+
+	// Don't bother with the execution if there's no code.
+	if len(code) == 0 {
+		return closure.Return(nil), nil
+	}
+
+	for {
+		prevStep = step
+		// The base for all big integer arithmetic
+		base := new(big.Int)
+
+		step++
+		// Get the memory location of pc
+		op = closure.GetOp(pc)
+
+		gas := new(big.Int)
+		addStepGasUsage := func(amount *big.Int) {
+			if amount.Cmp(ethutil.Big0) >= 0 {
+				gas.Add(gas, amount)
+			}
+		}
+
+		addStepGasUsage(GasStep)
+
+		var newMemSize *big.Int = ethutil.Big0
+		var additionalGas *big.Int = new(big.Int)
+		// Stack Check, memory resize & gas phase
+		switch op {
+		// Stack checks only
+		case ISZERO, CALLDATALOAD, POP, JUMP, NOT: // 1
+			require(1)
+		case ADD, SUB, DIV, SDIV, MOD, SMOD, LT, GT, SLT, SGT, EQ, AND, OR, XOR, BYTE: // 2
+			require(2)
+		case ADDMOD, MULMOD: // 3
+			require(3)
+		case SWAP1, SWAP2, SWAP3, SWAP4, SWAP5, SWAP6, SWAP7, SWAP8, SWAP9, SWAP10, SWAP11, SWAP12, SWAP13, SWAP14, SWAP15, SWAP16:
+			n := int(op - SWAP1 + 2)
+			require(n)
+		case DUP1, DUP2, DUP3, DUP4, DUP5, DUP6, DUP7, DUP8, DUP9, DUP10, DUP11, DUP12, DUP13, DUP14, DUP15, DUP16:
+			n := int(op - DUP1 + 1)
+			require(n)
+		case LOG0, LOG1, LOG2, LOG3, LOG4:
+			n := int(op - LOG0)
+			require(n + 2)
+
+			gas.Set(GasLog)
+			addStepGasUsage(new(big.Int).Mul(big.NewInt(int64(n)), GasLog))
+
+			mSize, mStart := stack.Peekn()
+			addStepGasUsage(mSize)
+
+			newMemSize = calcMemSize(mStart, mSize)
+		case EXP:
+			require(2)
+
+			gas.Set(big.NewInt(int64(len(stack.data[stack.Len()-2].Bytes()) + 1)))
+		// Gas only
+		case STOP:
+			gas.Set(ethutil.Big0)
+		case SUICIDE:
+			require(1)
+
+			gas.Set(ethutil.Big0)
+		case SLOAD:
+			require(1)
+
+			gas.Set(GasSLoad)
+		// Memory resize & Gas
+		case SSTORE:
+			require(2)
+
+			var mult *big.Int
+			y, x := stack.Peekn()
+			val := statedb.GetState(closure.Address(), x.Bytes())
+			if len(val) == 0 && len(y.Bytes()) > 0 {
+				// 0 => non 0
+				mult = ethutil.Big3
+			} else if len(val) > 0 && len(y.Bytes()) == 0 {
+				statedb.Refund(caller.Address(), GasSStoreRefund)
+
+				mult = ethutil.Big0
+			} else {
+				// non 0 => non 0 (or 0 => 0)
+				mult = ethutil.Big1
+			}
+			gas.Set(new(big.Int).Mul(mult, GasSStore))
+		case BALANCE:
+			require(1)
+			gas.Set(GasBalance)
+		case MSTORE:
+			require(2)
+			newMemSize = calcMemSize(stack.Peek(), u256(32))
+		case MLOAD:
+			require(1)
+
+			newMemSize = calcMemSize(stack.Peek(), u256(32))
+		case MSTORE8:
+			require(2)
+			newMemSize = calcMemSize(stack.Peek(), u256(1))
+		case RETURN:
+			require(2)
+
+			newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-2])
+		case SHA3:
+			require(2)
+			gas.Set(GasSha)
+			newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-2])
+			additionalGas.Set(stack.data[stack.Len()-2])
+		case CALLDATACOPY:
+			require(2)
+
+			newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3])
+			additionalGas.Set(stack.data[stack.Len()-3])
+		case CODECOPY:
+			require(3)
+
+			newMemSize = calcMemSize(stack.Peek(), stack.data[stack.Len()-3])
+			additionalGas.Set(stack.data[stack.Len()-3])
+		case EXTCODECOPY:
+			require(4)
+
+			newMemSize = calcMemSize(stack.data[stack.Len()-2], stack.data[stack.Len()-4])
+			additionalGas.Set(stack.data[stack.Len()-4])
+		case CALL, CALLCODE:
+			require(7)
+			gas.Set(GasCall)
+			addStepGasUsage(stack.data[stack.Len()-1])
+
+			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 = ethutil.BigMax(x, y)
+		case CREATE:
+			require(3)
+			gas.Set(GasCreate)
+
+			newMemSize = calcMemSize(stack.data[stack.Len()-2], stack.data[stack.Len()-3])
+		}
+
+		switch op {
+		case CALLDATACOPY, CODECOPY, EXTCODECOPY:
+			additionalGas.Add(additionalGas, u256(31))
+			additionalGas.Div(additionalGas, u256(32))
+			addStepGasUsage(additionalGas)
+		case SHA3:
+			additionalGas.Add(additionalGas, u256(31))
+			additionalGas.Div(additionalGas, u256(32))
+			additionalGas.Mul(additionalGas, GasSha3Byte)
+			addStepGasUsage(additionalGas)
+		}
+
+		if newMemSize.Cmp(ethutil.Big0) > 0 {
+			newMemSize.Add(newMemSize, u256(31))
+			newMemSize.Div(newMemSize, u256(32))
+			newMemSize.Mul(newMemSize, u256(32))
+
+			if newMemSize.Cmp(u256(int64(mem.Len()))) > 0 {
+				memGasUsage := new(big.Int).Sub(newMemSize, u256(int64(mem.Len())))
+				memGasUsage.Mul(GasMemory, memGasUsage)
+				memGasUsage.Div(memGasUsage, u256(32))
+
+				addStepGasUsage(memGasUsage)
+
+			}
+
+		}
+
+		self.Printf("(pc) %-3d -o- %-14s", pc, op.String())
+		self.Printf(" (m) %-4d (s) %-4d (g) %-3v (%v)", mem.Len(), stack.Len(), gas, closure.Gas)
+
+		if !closure.UseGas(gas) {
+			self.Endl()
+
+			tmp := new(big.Int).Set(closure.Gas)
+
+			closure.UseGas(closure.Gas)
+
+			return closure.Return(nil), OOG(gas, tmp)
+		}
+
+		mem.Resize(newMemSize.Uint64())
+
+		switch op {
+		// 0x20 range
+		case ADD:
+			x, y := stack.Popn()
+			self.Printf(" %v + %v", y, x)
+
+			base.Add(y, x)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			// Pop result back on the stack
+			stack.Push(base)
+		case SUB:
+			x, y := stack.Popn()
+			self.Printf(" %v - %v", y, x)
+
+			base.Sub(y, x)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+			// Pop result back on the stack
+			stack.Push(base)
+		case MUL:
+			x, y := stack.Popn()
+			self.Printf(" %v * %v", y, x)
+
+			base.Mul(y, x)
+
+			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(ethutil.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(ethutil.Big0) == 0 {
+				base.Set(ethutil.Big0)
+			} else {
+				n := new(big.Int)
+				if new(big.Int).Mul(x, y).Cmp(ethutil.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(ethutil.Big0) == 0 {
+				base.Set(ethutil.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(ethutil.Big0) == 0 {
+				base.Set(ethutil.Big0)
+			} else {
+				n := new(big.Int)
+				if x.Cmp(ethutil.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.Popn()
+
+			self.Printf(" %v ** %v", y, x)
+
+			base.Exp(y, x, Pow256)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+
+			stack.Push(base)
+		case SIGNEXTEND:
+			back := stack.Pop().Uint64()
+			if back < 31 {
+				bit := uint(back*8 + 7)
+				num := stack.Pop()
+				mask := new(big.Int).Lsh(ethutil.Big1, bit)
+				mask.Sub(mask, ethutil.Big1)
+				if ethutil.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:
+			base.Sub(Pow256, stack.Pop()).Sub(base, ethutil.Big1)
+
+			// Not needed
+			//base = U256(base)
+
+			stack.Push(base)
+		case LT:
+			x, y := stack.Popn()
+			self.Printf(" %v < %v", y, x)
+			// x < y
+			if y.Cmp(x) < 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+		case GT:
+			x, y := stack.Popn()
+			self.Printf(" %v > %v", y, x)
+
+			// x > y
+			if y.Cmp(x) > 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+
+		case SLT:
+			y, x := S256(stack.Pop()), S256(stack.Pop())
+			self.Printf(" %v < %v", y, x)
+			// x < y
+			if y.Cmp(S256(x)) < 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+		case SGT:
+			y, x := S256(stack.Pop()), S256(stack.Pop())
+			self.Printf(" %v > %v", y, x)
+
+			// x > y
+			if y.Cmp(x) > 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+
+		case EQ:
+			x, y := stack.Popn()
+			self.Printf(" %v == %v", y, x)
+
+			// x == y
+			if x.Cmp(y) == 0 {
+				stack.Push(ethutil.BigTrue)
+			} else {
+				stack.Push(ethutil.BigFalse)
+			}
+		case ISZERO:
+			x := stack.Pop()
+			if x.Cmp(ethutil.BigFalse) > 0 {
+				stack.Push(ethutil.BigFalse)
+			} else {
+				stack.Push(ethutil.BigTrue)
+			}
+
+			// 0x10 range
+		case AND:
+			x, y := stack.Popn()
+			self.Printf(" %v & %v", y, x)
+
+			stack.Push(base.And(y, x))
+		case OR:
+			x, y := stack.Popn()
+			self.Printf(" %v | %v", y, x)
+
+			stack.Push(base.Or(y, x))
+		case XOR:
+			x, y := stack.Popn()
+			self.Printf(" %v ^ %v", y, x)
+
+			stack.Push(base.Xor(y, x))
+		case BYTE:
+			val, th := stack.Popn()
+
+			if th.Cmp(big.NewInt(32)) < 0 {
+				byt := big.NewInt(int64(ethutil.LeftPadBytes(val.Bytes(), 32)[th.Int64()]))
+
+				base.Set(byt)
+			} else {
+				base.Set(ethutil.BigFalse)
+			}
+
+			self.Printf(" => 0x%x", base.Bytes())
+
+			stack.Push(base)
+		case ADDMOD:
+
+			x := stack.Pop()
+			y := stack.Pop()
+			z := stack.Pop()
+
+			base.Add(x, y)
+			base.Mod(base, z)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+
+			stack.Push(base)
+		case MULMOD:
+
+			x := stack.Pop()
+			y := stack.Pop()
+			z := stack.Pop()
+
+			base.Mul(x, y)
+			base.Mod(base, z)
+
+			U256(base)
+
+			self.Printf(" = %v", base)
+
+			stack.Push(base)
+
+			// 0x20 range
+		case SHA3:
+			size, offset := stack.Popn()
+			data := crypto.Sha3(mem.Get(offset.Int64(), size.Int64()))
+
+			stack.Push(ethutil.BigD(data))
+
+			self.Printf(" => %x", data)
+			// 0x30 range
+		case ADDRESS:
+			stack.Push(ethutil.BigD(closure.Address()))
+
+			self.Printf(" => %x", closure.Address())
+		case BALANCE:
+
+			addr := stack.Pop().Bytes()
+			balance := statedb.GetBalance(addr)
+
+			stack.Push(balance)
+
+			self.Printf(" => %v (%x)", balance, addr)
+		case ORIGIN:
+			origin := self.env.Origin()
+
+			stack.Push(ethutil.BigD(origin))
+
+			self.Printf(" => %x", origin)
+		case CALLER:
+			caller := closure.caller.Address()
+			stack.Push(ethutil.BigD(caller))
+
+			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, ethutil.Big32)
+				length = ethutil.BigMin(length, lenData)
+
+				copy(data, callData[offset.Int64():length.Int64()])
+			}
+
+			self.Printf(" => 0x%x", data)
+
+			stack.Push(ethutil.BigD(data))
+		case CALLDATASIZE:
+			l := int64(len(callData))
+			stack.Push(big.NewInt(l))
+
+			self.Printf(" => %d", l)
+		case CALLDATACOPY:
+			var (
+				size = uint64(len(callData))
+				mOff = stack.Pop().Uint64()
+				cOff = stack.Pop().Uint64()
+				l    = stack.Pop().Uint64()
+			)
+
+			if cOff > size {
+				cOff = 0
+				l = 0
+			} else if cOff+l > size {
+				l = 0
+			}
+
+			code := callData[cOff : cOff+l]
+
+			mem.Set(mOff, l, code)
+
+			self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, callData[cOff:cOff+l])
+		case CODESIZE, EXTCODESIZE:
+			var code []byte
+			if op == EXTCODESIZE {
+				addr := stack.Pop().Bytes()
+
+				code = statedb.GetCode(addr)
+			} else {
+				code = closure.Code
+			}
+
+			l := big.NewInt(int64(len(code)))
+			stack.Push(l)
+
+			self.Printf(" => %d", l)
+		case CODECOPY, EXTCODECOPY:
+			var code []byte
+			if op == EXTCODECOPY {
+				code = statedb.GetCode(stack.Pop().Bytes())
+			} else {
+				code = closure.Code
+			}
+
+			var (
+				size = uint64(len(code))
+				mOff = stack.Pop().Uint64()
+				cOff = stack.Pop().Uint64()
+				l    = stack.Pop().Uint64()
+			)
+
+			if cOff > size {
+				cOff = 0
+				l = 0
+			} else if cOff+l > size {
+				l = uint64(math.Min(float64(cOff+l), float64(size)))
+			}
+			codeCopy := code[cOff : cOff+l]
+
+			mem.Set(mOff, l, codeCopy)
+
+			self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, codeCopy)
+		case GASPRICE:
+			stack.Push(closure.Price)
+
+			self.Printf(" => %v", closure.Price)
+
+			// 0x40 range
+		case PREVHASH:
+			prevHash := self.env.PrevHash()
+
+			stack.Push(ethutil.BigD(prevHash))
+
+			self.Printf(" => 0x%x", prevHash)
+		case COINBASE:
+			coinbase := self.env.Coinbase()
+
+			stack.Push(ethutil.BigD(coinbase))
+
+			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(number)
+
+			self.Printf(" => 0x%x", number.Bytes())
+		case DIFFICULTY:
+			difficulty := self.env.Difficulty()
+
+			stack.Push(difficulty)
+
+			self.Printf(" => 0x%x", difficulty.Bytes())
+		case 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 := big.NewInt(int64(op) - int64(PUSH1) + 1)
+			a := uint64(op - PUSH1 + 1)
+			//pc.Add(pc, ethutil.Big1)
+			val := ethutil.BigD(closure.GetRangeValue(pc+1, a))
+			// Push value to stack
+			stack.Push(val)
+			pc += a
+			//pc.Add(pc, a.Sub(a, big.NewInt(1)))
+
+			step += int(op) - int(PUSH1) + 1
+
+			self.Printf(" => 0x%x", val.Bytes())
+		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.Dupn(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)
+			x, y := stack.Swapn(n)
+
+			self.Printf(" => [%d] %x [0] %x", n, x.Bytes(), y.Bytes())
+		case LOG0, LOG1, LOG2, LOG3, LOG4:
+			n := int(op - LOG0)
+			topics := make([][]byte, n)
+			mSize, mStart := stack.Popn()
+			for i := 0; i < n; i++ {
+				topics[i] = ethutil.LeftPadBytes(stack.Pop().Bytes(), 32)
+			}
+
+			data := mem.Geti(mStart.Int64(), mSize.Int64())
+			log := &Log{closure.Address(), topics, data}
+			self.env.AddLog(log)
+
+			self.Printf(" => %v", log)
+		case MLOAD:
+			offset := stack.Pop()
+			val := ethutil.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
+			val, mStart := stack.Popn()
+			mem.Set(mStart.Uint64(), 32, ethutil.BigToBytes(val, 256))
+
+			self.Printf(" => 0x%x", val)
+		case MSTORE8:
+			off := stack.Pop()
+			val := stack.Pop()
+
+			mem.store[off.Int64()] = byte(val.Int64() & 0xff)
+
+			self.Printf(" => [%v] 0x%x", off, val)
+		case SLOAD:
+			loc := stack.Pop()
+			val := ethutil.BigD(statedb.GetState(closure.Address(), loc.Bytes()))
+			stack.Push(val)
+
+			self.Printf(" {0x%x : 0x%x}", loc.Bytes(), val.Bytes())
+		case SSTORE:
+			val, loc := stack.Popn()
+			statedb.SetState(closure.Address(), loc.Bytes(), val)
+
+			closure.message.AddStorageChange(loc.Bytes())
+
+			self.Printf(" {0x%x : 0x%x}", loc.Bytes(), val.Bytes())
+		case JUMP:
+			jump(pc, stack.Pop())
+
+			continue
+		case JUMPI:
+			cond, pos := stack.Popn()
+
+			if cond.Cmp(ethutil.BigTrue) >= 0 {
+				jump(pc, pos)
+
+				continue
+			}
+
+		case JUMPDEST:
+		case PC:
+			stack.Push(big.NewInt(int64(pc)))
+		case MSIZE:
+			stack.Push(big.NewInt(int64(mem.Len())))
+		case GAS:
+			stack.Push(closure.Gas)
+			// 0x60 range
+		case CREATE:
+
+			var (
+				err          error
+				value        = stack.Pop()
+				size, offset = stack.Popn()
+				input        = mem.Get(offset.Int64(), size.Int64())
+				gas          = new(big.Int).Set(closure.Gas)
+
+				// Snapshot the current stack so we are able to
+				// revert back to it later.
+				//snapshot = self.env.State().Copy()
+			)
+
+			// Generate a new address
+			n := statedb.GetNonce(closure.Address())
+			addr := crypto.CreateAddress(closure.Address(), n)
+			statedb.SetNonce(closure.Address(), n+1)
+
+			self.Printf(" (*) %x", addr).Endl()
+
+			closure.UseGas(closure.Gas)
+
+			ret, err, ref := self.env.Create(closure, addr, input, gas, price, value)
+			if err != nil {
+				stack.Push(ethutil.BigFalse)
+
+				self.Printf("CREATE err %v", err)
+			} else {
+				// gas < len(ret) * CreateDataGas == NO_CODE
+				dataGas := big.NewInt(int64(len(ret)))
+				dataGas.Mul(dataGas, GasCreateByte)
+				if closure.UseGas(dataGas) {
+					ref.SetCode(ret)
+					msg.Output = ret
+				}
+
+				stack.Push(ethutil.BigD(addr))
+			}
+
+			self.Endl()
+
+			// Debug hook
+			if self.Dbg != nil {
+				self.Dbg.SetCode(closure.Code)
+			}
+		case CALL, CALLCODE:
+			self.Endl()
+
+			gas := stack.Pop()
+			// Pop gas and value of the stack.
+			value, addr := stack.Popn()
+			// Pop input size and offset
+			inSize, inOffset := stack.Popn()
+			// Pop return size and offset
+			retSize, retOffset := stack.Popn()
+
+			// Get the arguments from the memory
+			args := mem.Get(inOffset.Int64(), inSize.Int64())
+
+			var (
+				ret []byte
+				err error
+			)
+			if op == CALLCODE {
+				ret, err = self.env.CallCode(closure, addr.Bytes(), args, gas, price, value)
+			} else {
+				ret, err = self.env.Call(closure, addr.Bytes(), args, gas, price, value)
+			}
+
+			if err != nil {
+				stack.Push(ethutil.BigFalse)
+
+				vmlogger.Debugln(err)
+			} else {
+				stack.Push(ethutil.BigTrue)
+				msg.Output = ret
+
+				mem.Set(retOffset.Uint64(), retSize.Uint64(), ret)
+			}
+			self.Printf("resume %x (%v)", closure.Address(), closure.Gas)
+
+			// Debug hook
+			if self.Dbg != nil {
+				self.Dbg.SetCode(closure.Code)
+			}
+
+		case RETURN:
+			size, offset := stack.Popn()
+			ret := mem.Get(offset.Int64(), size.Int64())
+
+			self.Printf(" => [%v, %v] (%d) 0x%x", offset, size, len(ret), ret).Endl()
+
+			return closure.Return(ret), nil
+		case SUICIDE:
+			receiver := statedb.GetOrNewStateObject(stack.Pop().Bytes())
+			balance := statedb.GetBalance(closure.Address())
+
+			self.Printf(" => (%x) %v", receiver.Address()[:4], balance)
+
+			receiver.AddAmount(balance)
+			statedb.Delete(closure.Address())
+
+			fallthrough
+		case STOP: // Stop the closure
+			self.Endl()
+
+			return closure.Return(nil), nil
+		default:
+			vmlogger.Debugf("(pc) %-3v Invalid opcode %x\n", pc, op)
+
+			closure.ReturnGas(big.NewInt(1), nil)
+
+			return closure.Return(nil), fmt.Errorf("Invalid opcode %x", op)
+		}
+
+		pc++
+
+		self.Endl()
+
+		if self.Dbg != nil {
+			for _, instrNo := range self.Dbg.BreakPoints() {
+				if pc == uint64(instrNo) {
+					self.Stepping = true
+
+					if !self.Dbg.BreakHook(prevStep, op, mem, stack, statedb.GetStateObject(closure.Address())) {
+						return nil, nil
+					}
+				} else if self.Stepping {
+					if !self.Dbg.StepHook(prevStep, op, mem, stack, statedb.GetStateObject(closure.Address())) {
+						return nil, nil
+					}
+				}
+			}
+		}
+
+	}
+}
+
+func (self *DebugVm) RunPrecompiled(p *PrecompiledAccount, callData []byte, closure *Closure) (ret []byte, err error) {
+	gas := p.Gas(len(callData))
+	if closure.UseGas(gas) {
+		ret = p.Call(callData)
+		self.Printf("NATIVE_FUNC => %x", ret)
+		self.Endl()
+
+		return closure.Return(ret), nil
+	} else {
+		self.Endl()
+
+		tmp := new(big.Int).Set(closure.Gas)
+
+		closure.UseGas(closure.Gas)
+
+		return closure.Return(nil), OOG(gas, tmp)
+	}
+}
+
+func (self *DebugVm) Printf(format string, v ...interface{}) VirtualMachine {
+	if self.logTy == LogTyPretty {
+		self.logStr += fmt.Sprintf(format, v...)
+	}
+
+	return self
+}
+
+func (self *DebugVm) Endl() VirtualMachine {
+	if self.logTy == LogTyPretty {
+		vmlogger.Debugln(self.logStr)
+		self.logStr = ""
+	}
+
+	return self
+}
+
+func (self *DebugVm) Env() Environment {
+	return self.env
+}
diff --git a/vm/vm_test.go b/vm/vm_test.go
new file mode 100644
index 000000000..9bd147a72
--- /dev/null
+++ b/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