cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

Reflect RPC changes

Browse Source
This commit is contained in:
obscuren 2014-10-21 13:25:54 +02:00
parent 6ea44c466a
commit 6f08e30109
2 changed files with 361 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mist/assets/qml/webapp.qml
View File

@ -7,10 +7,7 @@ import QtQuick.Layouts 1.0;
import QtQuick.Window 2.1;
import Ethereum 1.0
import "../ext/qml_messaging.js" as Messaging
//ApplicationWindow {
Rectangle {
Rectangle {
id: window
property var title: "Browser"
property var iconSource: "../browser.png"
@ -154,12 +151,6 @@ import "../ext/qml_messaging.js" as Messaging
webview.experimental.postMessage(JSON.stringify(data))
}
onTitleChanged: {
var data = Messaging.HandleMessage(title);
if(data) {
sendMessage(data)
}
}
experimental.preferences.javascriptEnabled: true
experimental.preferences.navigatorQtObjectEnabled: true
@ -414,4 +405,4 @@ import "../ext/qml_messaging.js" as Messaging
}
]
}
}
}

4
utils/cmd.go
View File

@ -19,9 +19,9 @@ import (
"github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethminer"
"github.com/ethereum/eth-go/ethpipe"
"github.com/ethereum/eth-go/ethrpc"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
"github.com/ethereum/eth-go/rpc"
)
var logger = ethlog.NewLogger("CLI")
@ -244,7 +244,7 @@ func KeyTasks(keyManager *ethcrypto.KeyManager, KeyRing string, GenAddr bool, Se
func StartRpc(ethereum *eth.Ethereum, RpcPort int) {
var err error
ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpipe.NewJSPipe(ethereum), RpcPort)
ethereum.RpcServer, err = rpc.NewJsonRpcServer(ethpipe.NewJSPipe(ethereum), RpcPort)
if err != nil {
logger.Errorf("Could not start RPC interface (port %v): %v", RpcPort, err)
} else {