Merge pull request #167 from fjl/feature/split-tx-event

Split TxEvent type for tx pre/post

1 files changed, 25 insertions, 26 deletions

diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go
index 45a99659b..e6da33475 100644
--- a/cmd/mist/gui.go
+++ b/cmd/mist/gui.go
@@ -408,7 +408,8 @@ func (gui *Gui) update() {
 		eth.ChainSyncEvent{},
 		eth.PeerListEvent{},
 		ethchain.NewBlockEvent{},
-		ethchain.TxEvent{},
+		ethchain.TxPreEvent{},
+		ethchain.TxPostEvent{},
 		ethminer.Event{},
 	)
 
@@ -430,40 +431,38 @@ func (gui *Gui) update() {
 						gui.setWalletValue(gui.eth.StateManager().CurrentState().GetAccount(gui.address()).Balance(), nil)
 					}
 
-				case ethchain.TxEvent:
+				case ethchain.TxPreEvent:
 					tx := ev.Tx
-					if ev.Type == ethchain.TxPre {
-						object := state.GetAccount(gui.address())
+					object := state.GetAccount(gui.address())
 
-						if bytes.Compare(tx.Sender(), gui.address()) == 0 {
-							unconfirmedFunds.Sub(unconfirmedFunds, tx.Value)
-						} else if bytes.Compare(tx.Recipient, gui.address()) == 0 {
-							unconfirmedFunds.Add(unconfirmedFunds, tx.Value)
-						}
-
-						gui.setWalletValue(object.Balance(), unconfirmedFunds)
-
-						gui.insertTransaction("pre", tx)
+					if bytes.Compare(tx.Sender(), gui.address()) == 0 {
+						unconfirmedFunds.Sub(unconfirmedFunds, tx.Value)
+					} else if bytes.Compare(tx.Recipient, gui.address()) == 0 {
+						unconfirmedFunds.Add(unconfirmedFunds, tx.Value)
+					}
 
-					} else if ev.Type == ethchain.TxPost {
-						object := state.GetAccount(gui.address())
-						if bytes.Compare(tx.Sender(), gui.address()) == 0 {
-							object.SubAmount(tx.Value)
+					gui.setWalletValue(object.Balance(), unconfirmedFunds)
+					gui.insertTransaction("pre", tx)
 
-							//gui.getObjectByName("transactionView").Call("addTx", ethpipe.NewJSTx(tx), "send")
-							gui.txDb.Put(tx.Hash(), tx.RlpEncode())
-						} else if bytes.Compare(tx.Recipient, gui.address()) == 0 {
-							object.AddAmount(tx.Value)
+				case ethchain.TxPostEvent:
+					tx := ev.Tx
+					object := state.GetAccount(gui.address())
 
-							//gui.getObjectByName("transactionView").Call("addTx", ethpipe.NewJSTx(tx), "recv")
-							gui.txDb.Put(tx.Hash(), tx.RlpEncode())
-						}
+					if bytes.Compare(tx.Sender(), gui.address()) == 0 {
+						object.SubAmount(tx.Value)
 
-						gui.setWalletValue(object.Balance(), nil)
+						//gui.getObjectByName("transactionView").Call("addTx", ethpipe.NewJSTx(tx), "send")
+						gui.txDb.Put(tx.Hash(), tx.RlpEncode())
+					} else if bytes.Compare(tx.Recipient, gui.address()) == 0 {
+						object.AddAmount(tx.Value)
 
-						state.UpdateStateObject(object)
+						//gui.getObjectByName("transactionView").Call("addTx", ethpipe.NewJSTx(tx), "recv")
+						gui.txDb.Put(tx.Hash(), tx.RlpEncode())
 					}
 
+					gui.setWalletValue(object.Balance(), nil)
+					state.UpdateStateObject(object)
+
 				// case object:
 				// 	gui.loadAddressBook()