roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

added shh back in

Browse Source
This commit is contained in:
obscuren 2015-01-05 17:12:52 +01:00
parent 66b05433b6
commit f16810c48e
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/mist/assets/qml/main.qml
View File

@ -866,6 +866,7 @@ ApplicationWindow {
model: ListModel { id: pastPeers } model: ListModel { id: pastPeers }
Component.onCompleted: { Component.onCompleted: {
pastPeers.insert(0, {text: "poc-8.ethdev.com:30303"})
/* /*
var ips = eth.pastPeers() var ips = eth.pastPeers()
for(var i = 0; i < ips.length; i++) { for(var i = 0; i < ips.length; i++) {

2
cmd/mist/gui.go
View File

@ -112,7 +112,7 @@ func (gui *Gui) Start(assetPath string) {
// Expose the eth library and the ui library to QML // Expose the eth library and the ui library to QML
context.SetVar("gui", gui) context.SetVar("gui", gui)
context.SetVar("eth", gui.uiLib) context.SetVar("eth", gui.uiLib)
//context.SetVar("shh", gui.whisper) context.SetVar("shh", gui.whisper)
// Load the main QML interface // Load the main QML interface
data, _ := ethutil.Config.Db.Get([]byte("KeyRing")) data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))

4
cmd/mist/ui_lib.go
View File

@ -195,7 +195,9 @@ func (ui *UiLib) Connect(button qml.Object) {
} }
func (ui *UiLib) ConnectToPeer(addr string) { func (ui *UiLib) ConnectToPeer(addr string) {
ui.eth.SuggestPeer(addr) if err := ui.eth.SuggestPeer(addr); err != nil {
guilogger.Infoln(err)
}
} }
func (ui *UiLib) AssetPath(p string) string { func (ui *UiLib) AssetPath(p string) string {

6
cmd/utils/cmd.go
View File

@ -100,7 +100,11 @@ func exit(err error) {
func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) { func StartEthereum(ethereum *eth.Ethereum, UseSeed bool) {
clilogger.Infof("Starting %s", ethereum.ClientIdentity()) clilogger.Infof("Starting %s", ethereum.ClientIdentity())
ethereum.Start(UseSeed) err := ethereum.Start(UseSeed)
if err != nil {
exit(err)
}
RegisterInterrupt(func(sig os.Signal) { RegisterInterrupt(func(sig os.Signal) {
ethereum.Stop() ethereum.Stop()
logger.Flush() logger.Flush()