aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal
diff options
context:
space:
mode:
authorMaran <maran.hidskes@gmail.com>2014-05-13 18:08:54 +0800
committerMaran <maran.hidskes@gmail.com>2014-05-13 18:08:54 +0800
commit5208b04821a1522c6535835539943d8c874f9fdb (patch)
treeee56fcd0333485f5b3a6ccd1ff75ca5f3a921629 /ethereal
parent9a03df7bd831f1b66bc02510a4abed878f4ffa17 (diff)
parent67820506cbb34f5fe66b7b08454019fb30a8ec5a (diff)
downloaddexon-5208b04821a1522c6535835539943d8c874f9fdb.tar
dexon-5208b04821a1522c6535835539943d8c874f9fdb.tar.gz
dexon-5208b04821a1522c6535835539943d8c874f9fdb.tar.bz2
dexon-5208b04821a1522c6535835539943d8c874f9fdb.tar.lz
dexon-5208b04821a1522c6535835539943d8c874f9fdb.tar.xz
dexon-5208b04821a1522c6535835539943d8c874f9fdb.tar.zst
dexon-5208b04821a1522c6535835539943d8c874f9fdb.zip
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereal')
-rw-r--r--ethereal/ui/gui.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index 65c87c4c2..c1fda47f4 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -207,7 +207,7 @@ func (gui *Gui) update() {
state := gui.eth.StateManager().TransState()
unconfirmedFunds := new(big.Int)
- gui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(state.GetStateObject(gui.addr).Amount)))
+ gui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(state.GetAccount(gui.addr).Amount)))
for {
select {
@@ -215,7 +215,7 @@ func (gui *Gui) update() {
tx := txMsg.Tx
if txMsg.Type == ethchain.TxPre {
- object := state.GetStateObject(gui.addr)
+ object := state.GetAccount(gui.addr)
if bytes.Compare(tx.Sender(), gui.addr) == 0 && object.Nonce <= tx.Nonce {
gui.win.Root().Call("addTx", ethpub.NewPTx(tx))
@@ -241,7 +241,7 @@ func (gui *Gui) update() {
gui.win.Root().Call("setWalletValue", str)
} else {
- object := state.GetStateObject(gui.addr)
+ object := state.GetAccount(gui.addr)
if bytes.Compare(tx.Sender(), gui.addr) == 0 {
object.SubAmount(tx.Value)
} else if bytes.Compare(tx.Recipient, gui.addr) == 0 {