diff options
| author | zelig <viktor.tron@gmail.com> | 2014-07-21 20:31:03 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-07-21 20:31:03 +0800 |
| commit | 9f7d8ff302f33b61acae4a8724686e868ba94ccd (patch) | |
| tree | 068c71ff29888c8bd4d2ff89657b5f74897a1df7 | |
| parent | 4d5a890b46a75fb644277bbf2a8c034cf2a13424 (diff) | |
| parent | 15960a5c04c154a07d8813fcc9a6fa465d8d4500 (diff) | |
| download | dexon-9f7d8ff302f33b61acae4a8724686e868ba94ccd.tar.gz dexon-9f7d8ff302f33b61acae4a8724686e868ba94ccd.tar.zst dexon-9f7d8ff302f33b61acae4a8724686e868ba94ccd.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/ethutil-refactor
| -rw-r--r-- | ethereal/debugger.go | 2 | ||||
| -rw-r--r-- | ethereal/gui.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ethereal/debugger.go b/ethereal/debugger.go index 7742b1627..17087f8ce 100644 --- a/ethereal/debugger.go +++ b/ethereal/debugger.go @@ -289,7 +289,7 @@ func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, sta d.win.Root().Call("setStack", val.String()) } - stateObject.State().EachStorage(func(key string, node *ethutil.Value) { + stateObject.EachStorage(func(key string, node *ethutil.Value) { d.win.Root().Call("setStorage", storeVal{fmt.Sprintf("% x", key), fmt.Sprintf("% x", node.Str())}) }) diff --git a/ethereal/gui.go b/ethereal/gui.go index 815bb267c..bfae97050 100644 --- a/ethereal/gui.go +++ b/ethereal/gui.go @@ -221,8 +221,9 @@ func (gui *Gui) loadAddressBook() { nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg() if nameReg != nil { - nameReg.State().EachStorage(func(name string, value *ethutil.Value) { + nameReg.EachStorage(func(name string, value *ethutil.Value) { if name[0] != 0 { + value.Decode() gui.win.Root().Call("addAddress", struct{ Name, Address string }{name, ethutil.Bytes2Hex(value.Bytes())}) } }) |