Merge branch 'develop'

8 files changed, 18 insertions, 35 deletions

diff --git a/ethereal/Makefile b/ethereal/Makefile
deleted file mode 100644
index 1acf03049..000000000
--- a/ethereal/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-UNAME = $(shell uname)
-FILES=qml *.png
-GOPATH=$(PWD)
-
-
-# Default is building
-all:
-	go get -d
-	cp *.go $(GOPATH)/src/github.com/ethereum/go-ethereum
-	cp -r ui $(GOPATH)/src/github.com/ethereum/go-ethereum
-	go build
-
-install:
-# Linux build
-ifeq ($(UNAME),Linux)
-	cp -r assets/* /usr/share/ethereal
-	cp go-ethereum /usr/local/bin/ethereal
-endif
-# OS X build
-ifeq ($(UNAME),Darwin)
-	# Execute py script
-endif
diff --git a/ethereal/ui/debugger.go b/ethereal/debugger.go
index 5ad1b4a2c..763b26063 100644
--- a/ethereal/ui/debugger.go
+++ b/ethereal/debugger.go
@@ -1,4 +1,4 @@
-package ethui
+package main
 
 import (
 	"fmt"
@@ -124,11 +124,12 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
 		Value:       ethutil.Big(valueStr),
 	})
 	vm.Verbose = true
+	vm.Hook = self.Db.halting
 
 	self.Db.done = false
 	self.Logf("callsize %d", len(script))
 	go func() {
-		ret, g, err := callerClosure.Call(vm, data, self.Db.halting)
+		ret, g, err := callerClosure.Call(vm, data)
 		tot := new(big.Int).Mul(g, gasPrice)
 		self.Logf("gas usage %v total price = %v (%v)", g, tot, ethutil.CurrencyToString(tot))
 		if err != nil {
diff --git a/ethereal/ui/ext_app.go b/ethereal/ext_app.go
index 0230c46ab..17c342a1b 100644
--- a/ethereal/ui/ext_app.go
+++ b/ethereal/ext_app.go
@@ -1,4 +1,4 @@
-package ethui
+package main
 
 import (
 	"fmt"
diff --git a/ethereal/ui/gui.go b/ethereal/gui.go
index 91351aced..1719d41b2 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/gui.go
@@ -1,4 +1,4 @@
-package ethui
+package main
 
 import (
 	"bytes"
@@ -40,8 +40,7 @@ type Gui struct {
 }
 
 // Create GUI, but doesn't start it
-func New(ethereum *eth.Ethereum, session string, logLevel int) *Gui {
-
+func NewWindow(ethereum *eth.Ethereum, session string, logLevel int) *Gui {
 	db, err := ethdb.NewLDBDatabase("tx_database")
 	if err != nil {
 		panic(err)
@@ -217,7 +216,9 @@ func (gui *Gui) loadAddressBook() {
 	nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg()
 	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())})
+			if name[0] != 0 {
+				gui.win.Root().Call("addAddress", struct{ Name, Address string }{name, ethutil.Bytes2Hex(value.Bytes())})
+			}
 		})
 	}
 }
@@ -273,7 +274,11 @@ func (gui *Gui) update() {
 	reactor.Subscribe("newBlock", blockChan)
 	reactor.Subscribe("newTx:pre", txChan)
 	reactor.Subscribe("newTx:post", txChan)
-	//reactor.Subscribe("object:"+string(namereg), objectChan)
+
+	nameReg := ethpub.EthereumConfig(gui.eth.StateManager()).NameReg()
+	if nameReg != nil {
+		reactor.Subscribe("object:"+string(nameReg.Address()), objectChan)
+	}
 	reactor.Subscribe("peerList", peerChan)
 
 	ticker := time.NewTicker(5 * time.Second)
diff --git a/ethereal/ui/html_container.go b/ethereal/html_container.go
index f2ebd840c..1e835eebc 100644
--- a/ethereal/ui/html_container.go
+++ b/ethereal/html_container.go
@@ -1,4 +1,4 @@
-package ethui
+package main
 
 import (
 	"errors"
diff --git a/ethereal/main.go b/ethereal/main.go
index 82427f088..f3f1d3140 100644
--- a/ethereal/main.go
+++ b/ethereal/main.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"github.com/ethereum/eth-go/ethlog"
-	"github.com/ethereum/go-ethereum/ethereal/ui"
 	"github.com/ethereum/go-ethereum/utils"
 	"github.com/go-qml/qml"
 	"os"
@@ -47,7 +46,7 @@ func main() {
 		utils.StartRpc(ethereum, RpcPort)
 	}
 
-	gui := ethui.New(ethereum, KeyRing, LogLevel)
+	gui := NewWindow(ethereum, KeyRing, LogLevel)
 
 	utils.RegisterInterrupt(func(os.Signal) {
 		gui.Stop()
diff --git a/ethereal/ui/qml_app.go b/ethereal/qml_container.go
index d23fdd110..a8ce1cb75 100644
--- a/ethereal/ui/qml_app.go
+++ b/ethereal/qml_container.go
@@ -1,4 +1,4 @@
-package ethui
+package main
 
 import (
 	"github.com/ethereum/eth-go/ethchain"
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui_lib.go
index 892c1f065..997a3391a 100644
--- a/ethereal/ui/ui_lib.go
+++ b/ethereal/ui_lib.go
@@ -1,4 +1,4 @@
-package ethui
+package main
 
 import (
 	"github.com/ethereum/eth-go"