Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
Geth-Modification
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张蕾
Geth-Modification
Commits
6f08e301
Commit
6f08e301
authored
Oct 21, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reflect RPC changes
parent
6ea44c46
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
361 additions
and
370 deletions
+361
-370
webapp.qml
mist/assets/qml/webapp.qml
+359
-368
cmd.go
utils/cmd.go
+2
-2
No files found.
mist/assets/qml/webapp.qml
View file @
6f08e301
...
...
@@ -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
}
]
}
}
}
utils/cmd.go
View file @
6f08e301
...
...
@@ -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
=
eth
rpc
.
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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment