diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-18 05:20:47 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-18 05:20:47 +0800 |
| commit | 7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048 (patch) | |
| tree | 764d7ebd57cafbae0a12d046aeafd1b823a0f0bb /cmd | |
| parent | 11e12680ebe4f4679083317ee0f2c27b219d44b3 (diff) | |
| download | dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar.gz dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar.bz2 dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar.lz dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar.xz dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.tar.zst dexon-7fc9b5b3f9ca0111cc4bc1b2a6b4bb2eccd3e048.zip | |
Changed to ChainEvent and fixed a nil pointer in transact
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mist/assets/examples/info.html | 4 | ||||
| -rw-r--r-- | cmd/mist/gui.go | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cmd/mist/assets/examples/info.html b/cmd/mist/assets/examples/info.html index d8816b19f..2a405c280 100644 --- a/cmd/mist/assets/examples/info.html +++ b/cmd/mist/assets/examples/info.html @@ -71,6 +71,10 @@ document.querySelector("#gas_price").innerHTML = eth.gasPrice; document.querySelector("#mining").innerHTML = eth.mining; document.querySelector("#listening").innerHTML = eth.listening; + eth.watch('chain').changed(function() { + document.querySelector("#number").innerHTML = eth.number; + }); + </script> </html> diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index 886a5811b..c12538f4a 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -394,7 +394,6 @@ func (gui *Gui) update() { miningLabel := gui.getObjectByName("miningLabel") events := gui.eth.EventMux().Subscribe( - core.NewBlockEvent{}, core.TxPreEvent{}, core.TxPostEvent{}, ) @@ -407,11 +406,6 @@ func (gui *Gui) update() { return } switch ev := ev.(type) { - case core.NewBlockEvent: - gui.processBlock(ev.Block, false) - balance := ethutil.CurrencyToString(gui.eth.ChainManager().State().GetBalance(gui.address())) - gui.getObjectByName("balanceLabel").Set("text", fmt.Sprintf("%v", balance)) - case core.TxPreEvent: tx := ev.Tx |