diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-18 06:10:37 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-18 06:10:37 +0800 |
| commit | c1474e1877641cb80ed0c935a3bd5b3d5c2fe3ac (patch) | |
| tree | 8ef60fc899da8a74f69060a2b7aa735feea9a237 /cmd/mist/gui.go | |
| parent | 26d58e0446521f725616b5a5d1b9d1ac04837f00 (diff) | |
| download | dexon-c1474e1877641cb80ed0c935a3bd5b3d5c2fe3ac.tar dexon-c1474e1877641cb80ed0c935a3bd5b3d5c2fe3ac.tar.gz dexon-c1474e1877641cb80ed0c935a3bd5b3d5c2fe3ac.tar.bz2 dexon-c1474e1877641cb80ed0c935a3bd5b3d5c2fe3ac.tar.lz dexon-c1474e1877641cb80ed0c935a3bd5b3d5c2fe3ac.tar.xz dexon-c1474e1877641cb80ed0c935a3bd5b3d5c2fe3ac.tar.zst dexon-c1474e1877641cb80ed0c935a3bd5b3d5c2fe3ac.zip | |
Removed mined transactions from pending view. Closes #321
Diffstat (limited to 'cmd/mist/gui.go')
| -rw-r--r-- | cmd/mist/gui.go | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index c12538f4a..c9419473c 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -407,34 +407,10 @@ func (gui *Gui) update() { } switch ev := ev.(type) { case core.TxPreEvent: - tx := ev.Tx - - tstate := gui.eth.ChainManager().TransState() - cstate := gui.eth.ChainManager().State() - - taccount := tstate.GetAccount(gui.address()) - caccount := cstate.GetAccount(gui.address()) - unconfirmedFunds := new(big.Int).Sub(taccount.Balance(), caccount.Balance()) - - gui.setWalletValue(taccount.Balance(), unconfirmedFunds) - gui.insertTransaction("pre", tx) + gui.insertTransaction("pre", ev.Tx) case core.TxPostEvent: - tx := ev.Tx - object := state.GetAccount(gui.address()) - - if bytes.Compare(tx.From(), gui.address()) == 0 { - object.SubAmount(tx.Value()) - - gui.txDb.Put(tx.Hash(), tx.RlpEncode()) - } else if bytes.Compare(tx.To(), gui.address()) == 0 { - object.AddAmount(tx.Value()) - - gui.txDb.Put(tx.Hash(), tx.RlpEncode()) - } - - gui.setWalletValue(object.Balance(), nil) - state.UpdateStateObject(object) + gui.getObjectByName("pendingTxView").Call("removeTx", xeth.NewTx(ev.Tx)) } case <-peerUpdateTicker.C: |