5 files changed, 29 insertions, 28 deletions
diff --git a/cmd/ethereum/repl/repl.go b/cmd/ethereum/repl/repl.go
index 822aaa19d..78bb19cec 100644
--- a/cmd/ethereum/repl/repl.go
+++ b/cmd/ethereum/repl/repl.go
@@ -86,6 +86,7 @@ func (self *JSRepl) Stop() {
 }
 
 func (self *JSRepl) parseInput(code string) {
+
 	value, err := self.re.Run(code)
 	if err != nil {
 		fmt.Println(err)
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 66bba7289..31b7da3c8 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -144,19 +144,19 @@ func (self *VMEnv) vm(addr, data []byte, gas, price, value *big.Int) *core.Execu
 	return core.NewExecution(self, addr, data, gas, price, value)
 }
 
-func (self *VMEnv) Call(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
+func (self *VMEnv) Call(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
 	exe := self.vm(addr, data, gas, price, value)
 	ret, err := exe.Call(addr, caller)
 	self.Gas = exe.Gas
 
 	return ret, err
 }
-func (self *VMEnv) CallCode(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
+func (self *VMEnv) CallCode(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
 	exe := self.vm(caller.Address(), data, gas, price, value)
 	return exe.Call(addr, caller)
 }
 
-func (self *VMEnv) Create(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ClosureRef) {
+func (self *VMEnv) Create(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) {
 	exe := self.vm(addr, data, gas, price, value)
 	return exe.Create(caller)
 }
diff --git a/cmd/mist/debugger.go b/cmd/mist/debugger.go
index a7a286e23..0e97a6652 100644
--- a/cmd/mist/debugger.go
+++ b/cmd/mist/debugger.go
@@ -309,9 +309,11 @@ func (d *Debugger) halting(pc int, op vm.OpCode, mem *vm.Memory, stack *vm.Stack
 		d.win.Root().Call("setStack", val.String())
 	}
 
-	stateObject.EachStorage(func(key string, node *ethutil.Value) {
-		d.win.Root().Call("setStorage", storeVal{fmt.Sprintf("% x", key), fmt.Sprintf("% x", node.Str())})
-	})
+	it := stateObject.Trie().Iterator()
+	for it.Next() {
+		d.win.Root().Call("setStorage", storeVal{fmt.Sprintf("% x", it.Key), fmt.Sprintf("% x", it.Value)})
+
+	}
 
 	stackFrameAt := new(big.Int).SetBytes(mem.Get(0, 32))
 	psize := mem.Len() - int(new(big.Int).SetBytes(mem.Get(0, 32)).Uint64())
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go
index e5e18bbaa..98ca70b16 100644
--- a/cmd/mist/gui.go
+++ b/cmd/mist/gui.go
@@ -231,35 +231,33 @@ func (gui *Gui) loadAddressBook() {
 	view := gui.getObjectByName("infoView")
 	nameReg := gui.pipe.World().Config().Get("NameReg")
 	if nameReg != nil {
-		nameReg.EachStorage(func(name string, value *ethutil.Value) {
-			if name[0] != 0 {
-				value.Decode()
-
-				view.Call("addAddress", struct{ Name, Address string }{name, ethutil.Bytes2Hex(value.Bytes())})
+		it := nameReg.Trie().Iterator()
+		for it.Next() {
+			if it.Key[0] != 0 {
+				view.Call("addAddress", struct{ Name, Address string }{string(it.Key), ethutil.Bytes2Hex(it.Value)})
 			}
-		})
+
+		}
 	}
 }
 
 func (self *Gui) loadMergedMiningOptions() {
 	view := self.getObjectByName("mergedMiningModel")
 
-	nameReg := self.pipe.World().Config().Get("MergeMining")
-	if nameReg != nil {
+	mergeMining := self.pipe.World().Config().Get("MergeMining")
+	if mergeMining != nil {
 		i := 0
-		nameReg.EachStorage(func(name string, value *ethutil.Value) {
-			if name[0] != 0 {
-				value.Decode()
+		it := mergeMining.Trie().Iterator()
+		for it.Next() {
+			view.Call("addMergedMiningOption", struct {
+				Checked       bool
+				Name, Address string
+				Id, ItemId    int
+			}{false, string(it.Key), ethutil.Bytes2Hex(it.Value), 0, i})
 
-				view.Call("addMergedMiningOption", struct {
-					Checked       bool
-					Name, Address string
-					Id, ItemId    int
-				}{false, name, ethutil.Bytes2Hex(value.Bytes()), 0, i})
+			i++
 
-				i++
-			}
-		})
+		}
 	}
 }
 
diff --git a/cmd/utils/vm_env.go b/cmd/utils/vm_env.go
index be6249e82..19091bdc5 100644
--- a/cmd/utils/vm_env.go
+++ b/cmd/utils/vm_env.go
@@ -52,19 +52,19 @@ func (self *VMEnv) vm(addr, data []byte, gas, price, value *big.Int) *core.Execu
 	return core.NewExecution(self, addr, data, gas, price, value)
 }
 
-func (self *VMEnv) Call(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
+func (self *VMEnv) Call(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
 	exe := self.vm(addr, data, gas, price, value)
 	ret, err := exe.Call(addr, caller)
 	self.Gas = exe.Gas
 
 	return ret, err
 }
-func (self *VMEnv) CallCode(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
+func (self *VMEnv) CallCode(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {
 	exe := self.vm(caller.Address(), data, gas, price, value)
 	return exe.Call(addr, caller)
 }
 
-func (self *VMEnv) Create(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ClosureRef) {
+func (self *VMEnv) Create(caller vm.ContextRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error, vm.ContextRef) {
 	exe := self.vm(addr, data, gas, price, value)
 	return exe.Create(caller)
 }