diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-23 19:12:53 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-23 19:12:53 +0800 |
| commit | 6657d544db4eefec24ebd280940048f25ed85186 (patch) | |
| tree | a65998614ecb147e0e67107aa34ac306d027ccc1 /cmd/mist/html_container.go | |
| parent | 0be6d3404898a8e68f2f78cfa6b64d6b1f314fb0 (diff) | |
| parent | dbb2af6016c952b0f49d552a10fc59af0a9f7ce7 (diff) | |
| download | go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar.gz go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar.bz2 go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar.lz go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar.xz go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.tar.zst go-tangerine-6657d544db4eefec24ebd280940048f25ed85186.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd/mist/html_container.go')
| -rw-r--r-- | cmd/mist/html_container.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/mist/html_container.go b/cmd/mist/html_container.go index 195e81073..7c948885a 100644 --- a/cmd/mist/html_container.go +++ b/cmd/mist/html_container.go @@ -29,8 +29,8 @@ import ( "path" "path/filepath" - "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/xeth" "github.com/howeyc/fsnotify" "github.com/obscuren/qml" @@ -139,7 +139,7 @@ func (app *HtmlApplication) Window() *qml.Window { } func (app *HtmlApplication) NewBlock(block *types.Block) { - b := &xeth.Block{Number: int(block.NumberU64()), Hash: common.Bytes2Hex(block.Hash())} + b := &xeth.Block{Number: int(block.NumberU64()), Hash: block.Hash().Hex()} app.webView.Call("onNewBlockCb", b) } |