merge upstream

1 files changed, 18 insertions, 13 deletions

diff --git a/ethereal/gui.go b/ethereal/gui.go
index 9bc11e81e..61f7b1099 100644
--- a/ethereal/gui.go
+++ b/ethereal/gui.go
@@ -3,6 +3,11 @@ package main
 import (
 	"bytes"
 	"fmt"
+	"math/big"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/ethereum/eth-go"
 	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethdb"
@@ -14,10 +19,6 @@ import (
 	"github.com/ethereum/eth-go/ethwire"
 	"github.com/ethereum/go-ethereum/utils"
 	"github.com/go-qml/qml"
-	"math/big"
-	"strconv"
-	"strings"
-	"time"
 )
 
 var logger = ethlog.NewLogger("GUI")
@@ -144,16 +145,21 @@ func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) {
 
 	win := gui.createWindow(component)
 
-	gui.setInitialBlockChain()
-	gui.loadAddressBook()
-	gui.readPreviousTransactions()
-	gui.setPeerInfo()
+	go func() {
+		go gui.setInitialBlockChain()
+		gui.loadAddressBook()
+		gui.setPeerInfo()
+		gui.readPreviousTransactions()
+	}()
 
 	gui.update()
 
 	return win, nil
 }
 
+func (gui *Gui) ImportKey(filePath string) {
+}
+
 func (gui *Gui) showKeyImport(context *qml.Context) (*qml.Window, error) {
 	context.SetVar("lib", gui)
 	component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/first_run.qml"))
@@ -295,7 +301,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.GetAccount(gui.address()).Amount)))
+	gui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(state.GetAccount(gui.address()).Balance)))
 	gui.getObjectByName("syncProgressIndicator").Set("visible", !gui.eth.IsUpToDate())
 
 	lastBlockLabel := gui.getObjectByName("lastBlockLabel")
@@ -307,9 +313,8 @@ func (gui *Gui) update() {
 				block := b.Resource.(*ethchain.Block)
 				gui.processBlock(block, false)
 				if bytes.Compare(block.Coinbase, gui.address()) == 0 {
-					gui.setWalletValue(gui.eth.StateManager().CurrentState().GetAccount(gui.address()).Amount, nil)
+					gui.setWalletValue(gui.eth.StateManager().CurrentState().GetAccount(gui.address()).Balance, nil)
 				}
-
 			case txMsg := <-txChan:
 				tx := txMsg.Resource.(*ethchain.Transaction)
 
@@ -328,7 +333,7 @@ func (gui *Gui) update() {
 						unconfirmedFunds.Add(unconfirmedFunds, tx.Value)
 					}
 
-					gui.setWalletValue(object.Amount, unconfirmedFunds)
+					gui.setWalletValue(object.Balance, unconfirmedFunds)
 				} else {
 					object := state.GetAccount(gui.address())
 					if bytes.Compare(tx.Sender(), gui.address()) == 0 {
@@ -337,7 +342,7 @@ func (gui *Gui) update() {
 						object.AddAmount(tx.Value)
 					}
 
-					gui.setWalletValue(object.Amount, nil)
+					gui.setWalletValue(object.Balance, nil)
 
 					state.UpdateStateObject(object)
 				}