Merge branch 'jsonrpc' into qt5.4

2015-01-28 18:36:41 +01:00
parent 45e15f62f5 872b249711
commit 1c51e12c18
17 changed files with 299 additions and 348 deletions
--- a/cmd/mist/qml_container.go
+++ b/cmd/mist/qml_container.go
@ -70,7 +70,7 @@ func (app *QmlApplication) NewWatcher(quitChan chan bool) {

 // Events
 func (app *QmlApplication) NewBlock(block *types.Block) {
-	pblock := &xeth.JSBlock{Number: int(block.NumberU64()), Hash: ethutil.Bytes2Hex(block.Hash())}
+	pblock := &xeth.Block{Number: int(block.NumberU64()), Hash: ethutil.Bytes2Hex(block.Hash())}
 	app.win.Call("onNewBlockCb", pblock)
 }