diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-01-29 02:01:15 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-01-29 02:01:15 +0800 |
| commit | 21fd31dad8bc6e0291ca405314b516670333c707 (patch) | |
| tree | 34aa6f6d0e1f5c7316f0220f6e0569f916307fa3 /cmd/mist/html_container.go | |
| parent | a88f609b8ab1e20eb2564d47605985d6b8f593e8 (diff) | |
| parent | 872b2497114209119becf2e8a4d4a5818e2084ee (diff) | |
| download | go-tangerine-21fd31dad8bc6e0291ca405314b516670333c707.tar go-tangerine-21fd31dad8bc6e0291ca405314b516670333c707.tar.gz go-tangerine-21fd31dad8bc6e0291ca405314b516670333c707.tar.bz2 go-tangerine-21fd31dad8bc6e0291ca405314b516670333c707.tar.lz go-tangerine-21fd31dad8bc6e0291ca405314b516670333c707.tar.xz go-tangerine-21fd31dad8bc6e0291ca405314b516670333c707.tar.zst go-tangerine-21fd31dad8bc6e0291ca405314b516670333c707.zip | |
Merge branch 'jsonrpc' of github.com:ethereum/go-ethereum into jsonrpc
Diffstat (limited to 'cmd/mist/html_container.go')
| -rw-r--r-- | cmd/mist/html_container.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/mist/html_container.go b/cmd/mist/html_container.go index f2ba6fbe2..516dcb6b3 100644 --- a/cmd/mist/html_container.go +++ b/cmd/mist/html_container.go @@ -142,7 +142,7 @@ func (app *HtmlApplication) Window() *qml.Window { } func (app *HtmlApplication) NewBlock(block *types.Block) { - b := &xeth.JSBlock{Number: int(block.NumberU64()), Hash: ethutil.Bytes2Hex(block.Hash())} + b := &xeth.Block{Number: int(block.NumberU64()), Hash: ethutil.Bytes2Hex(block.Hash())} app.webView.Call("onNewBlockCb", b) } |