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/qml_container.go | |
| parent | 0be6d3404898a8e68f2f78cfa6b64d6b1f314fb0 (diff) | |
| parent | dbb2af6016c952b0f49d552a10fc59af0a9f7ce7 (diff) | |
| download | dexon-6657d544db4eefec24ebd280940048f25ed85186.tar dexon-6657d544db4eefec24ebd280940048f25ed85186.tar.gz dexon-6657d544db4eefec24ebd280940048f25ed85186.tar.bz2 dexon-6657d544db4eefec24ebd280940048f25ed85186.tar.lz dexon-6657d544db4eefec24ebd280940048f25ed85186.tar.xz dexon-6657d544db4eefec24ebd280940048f25ed85186.tar.zst dexon-6657d544db4eefec24ebd280940048f25ed85186.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd/mist/qml_container.go')
| -rw-r--r-- | cmd/mist/qml_container.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/mist/qml_container.go b/cmd/mist/qml_container.go index 778ef0e40..f2cabb474 100644 --- a/cmd/mist/qml_container.go +++ b/cmd/mist/qml_container.go @@ -25,7 +25,6 @@ import ( "runtime" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/xeth" "github.com/obscuren/qml" ) @@ -68,7 +67,7 @@ func (app *QmlApplication) NewWatcher(quitChan chan bool) { // Events func (app *QmlApplication) NewBlock(block *types.Block) { - pblock := &xeth.Block{Number: int(block.NumberU64()), Hash: common.Bytes2Hex(block.Hash())} + pblock := &xeth.Block{Number: int(block.NumberU64()), Hash: block.Hash().Hex()} app.win.Call("onNewBlockCb", pblock) } |