Merge branch 'jsonrpc' into qt5.4

2015-01-28 18:36:41 +01:00
parent 45e15f62f5 872b249711
commit 1c51e12c18
17 changed files with 299 additions and 348 deletions
--- a/cmd/mist/ext_app.go
+++ b/cmd/mist/ext_app.go
@ -44,7 +44,7 @@ type AppContainer interface {
 }

 type ExtApplication struct {
-	*xeth.JSXEth
+	*xeth.XEth
 	eth core.EthManager

 	events          event.Subscription
@ -58,7 +58,7 @@ type ExtApplication struct {

 func NewExtApplication(container AppContainer, lib *UiLib) *ExtApplication {
 	return &ExtApplication{
-		JSXEth:          xeth.NewJSXEth(lib.eth),
+		XEth:            xeth.New(lib.eth),
 		eth:             lib.eth,
 		watcherQuitChan: make(chan bool),
 		filters:         make(map[string]*core.Filter),