forked from cerc-io/plugeth
Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/ethutil-refactor
This commit is contained in:
commit
9f7d8ff302
@ -289,7 +289,7 @@ func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, sta
|
|||||||
d.win.Root().Call("setStack", val.String())
|
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())})
|
d.win.Root().Call("setStorage", storeVal{fmt.Sprintf("% x", key), fmt.Sprintf("% x", node.Str())})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -221,8 +221,9 @@ func (gui *Gui) loadAddressBook() {
|
|||||||
|
|
||||||
nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg()
|
nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg()
|
||||||
if nameReg != nil {
|
if nameReg != nil {
|
||||||
nameReg.State().EachStorage(func(name string, value *ethutil.Value) {
|
nameReg.EachStorage(func(name string, value *ethutil.Value) {
|
||||||
if name[0] != 0 {
|
if name[0] != 0 {
|
||||||
|
value.Decode()
|
||||||
gui.win.Root().Call("addAddress", struct{ Name, Address string }{name, ethutil.Bytes2Hex(value.Bytes())})
|
gui.win.Root().Call("addAddress", struct{ Name, Address string }{name, ethutil.Bytes2Hex(value.Bytes())})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user