Merge branch 'develop'

ethereal/assets/qml/wallet.qml

@@ -633,7 +633,7 @@ ApplicationWindow {
 			anchors.left: aboutIcon.right
 			anchors.leftMargin: 10
 			font.pointSize: 12
-			text: "<h2>Ethereal</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br>"
+			text: "<h2>Ethereal</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br>Viktor Trón<br>"
 		}
 	}
 

ethereal/ui/gui.go

@@ -211,13 +211,12 @@ type address struct {
 	Name, Address string
 }
 
-var namereg = ethutil.Hex2Bytes("bb5f186604d057c1c5240ca2ae0f6430138ac010")
-
 func (gui *Gui) loadAddressBook() {
 	gui.win.Root().Call("clearAddress")
-	stateObject := gui.eth.StateManager().CurrentState().GetStateObject(namereg)
+
-	if stateObject != nil {
+	nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg()
-		stateObject.State().EachStorage(func(name string, value *ethutil.Value) {
+	if nameReg != nil {
+		nameReg.State().EachStorage(func(name string, value *ethutil.Value) {
 			gui.win.Root().Call("addAddress", struct{ Name, Address string }{name, ethutil.Bytes2Hex(value.Bytes())})
 		})
 	}
@@ -274,7 +273,7 @@ func (gui *Gui) update() {
 	reactor.Subscribe("newBlock", blockChan)
 	reactor.Subscribe("newTx:pre", txChan)
 	reactor.Subscribe("newTx:post", txChan)
-	reactor.Subscribe("object:"+string(namereg), objectChan)
+	//reactor.Subscribe("object:"+string(namereg), objectChan)
 	reactor.Subscribe("peerList", peerChan)
 
 	ticker := time.NewTicker(5 * time.Second)
@@ -352,8 +351,9 @@ func (gui *Gui) address() []byte {
 }
 
 func (gui *Gui) RegisterName(name string) {
-	name = fmt.Sprintf("\"%s\"\n1", name)
+	name = fmt.Sprintf("\"%s\"", name)
-	gui.pub.Transact(gui.privateKey(), "namereg", "1000", "1000000", "150", name)
+
+	gui.pub.Transact(gui.privateKey(), "NameReg", "", "10000", "10000000000000", name)
 }
 
 func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {

utils/cmd.go

@@ -106,6 +106,7 @@ func InitConfig(ConfigFile string, Datadir string, Identifier string, EnvPrefix
 func exit(err error) {
 	status := 0
 	if err != nil {
+		fmt.Println(err)
 		logger.Errorln("Fatal: ", err)
 		status = 1
 	}
@@ -167,6 +168,8 @@ func KeyTasks(keyManager *ethcrypto.KeyManager, KeyRing string, GenAddr bool, Se
 		}
 		exit(err)
 	case len(SecretFile) > 0:
+		SecretFile = ethutil.ExpandHomePath(SecretFile)
+
 		if NonInteractive || confirm("This action overwrites your old private key.") {
 			err = keyManager.InitFromSecretsFile(KeyRing, 0, SecretFile)
 		}