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
c3621725
Commit
c3621725
authored
Aug 14, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Got rid of warnings and updated storage getters
parent
aadc5be3
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
20 deletions
+24
-20
ethereum.js
ethereal/assets/ext/ethereum.js
+6
-6
test.html
ethereal/assets/ext/test.html
+3
-0
webapp.qml
ethereal/assets/qml/webapp.qml
+1
-1
ext_app.go
ethereal/ext_app.go
+1
-1
gui.go
ethereal/gui.go
+1
-1
javascript_runtime.go
javascript/javascript_runtime.go
+1
-1
cmd.go
utils/cmd.go
+11
-10
No files found.
ethereal/assets/ext/ethereum.js
View file @
c3621725
// Main Ethereum library
window
.
eth
=
{
prototype
:
Object
(),
_callbacks
:
{},
_onCallbacks
:
{},
mutan
:
function
(
code
)
{
},
...
...
@@ -103,8 +105,8 @@ window.eth = {
postData
({
call
:
"getStorage"
,
args
:
[
address
,
storageAddress
]},
cb
);
},
get
StateKeyVals
:
function
(
address
,
cb
){
postData
({
call
:
"get
StateKeyVals
"
,
args
:
[
address
]},
cb
);
get
EachStorageAt
:
function
(
address
,
cb
){
postData
({
call
:
"get
EachStorage
"
,
args
:
[
address
]},
cb
);
},
getKey
:
function
(
cb
)
{
...
...
@@ -221,17 +223,15 @@ window.eth = {
},
}
window
.
eth
.
_callbacks
=
{}
window
.
eth
.
_onCallbacks
=
{}
var
Filter
=
function
(
options
)
{
this
.
options
=
options
;
};
Filter
.
prototype
.
changed
=
function
(
callback
)
{
// Register the watched:<number>. Qml will call the appropriate event if anything
// interesting happens in the land of Go.
eth
.
on
(
"watched:"
+
this
.
number
,
callback
)
}
Filter
.
prototype
.
getMessages
=
function
(
cb
)
{
return
eth
.
getMessages
(
this
.
options
,
cb
)
}
...
...
ethereal/assets/ext/test.html
View file @
c3621725
...
...
@@ -22,6 +22,9 @@ function test() {
console
.
log
(
"getMessages"
,
messages
)
});
eth
.
getEachStorageAt
(
"9ef0f0d81e040012600b0c1abdef7c48f720f88a"
,
function
(
a
,
b
)
{
console
.
log
(
a
,
b
)
})
}
</script>
...
...
ethereal/assets/qml/webapp.qml
View file @
c3621725
...
...
@@ -193,7 +193,7 @@ ApplicationWindow {
break
case
"get
StateKeyVals
"
:
case
"get
EachStorage
"
:
require
(
1
);
var
stateObject
=
eth
.
getStateObject
(
data
.
args
[
0
]).
stateKeyVal
(
true
)
postData
(
data
.
_seed
,
stateObject
)
...
...
ethereal/ext_app.go
View file @
c3621725
...
...
@@ -44,7 +44,7 @@ type ExtApplication struct {
func
NewExtApplication
(
container
AppContainer
,
lib
*
UiLib
)
*
ExtApplication
{
app
:=
&
ExtApplication
{
ethpub
.
New
PEthereum
(
lib
.
eth
),
ethpub
.
New
(
lib
.
eth
),
lib
.
eth
,
make
(
chan
ethreact
.
Event
,
100
),
make
(
chan
ethreact
.
Event
,
100
),
...
...
ethereal/gui.go
View file @
c3621725
...
...
@@ -57,7 +57,7 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, clientIden
panic
(
err
)
}
pub
:=
ethpub
.
New
PEthereum
(
ethereum
)
pub
:=
ethpub
.
New
(
ethereum
)
return
&
Gui
{
eth
:
ethereum
,
txDb
:
db
,
pub
:
pub
,
logLevel
:
ethlog
.
LogLevel
(
logLevel
),
Session
:
session
,
open
:
false
,
clientIdentity
:
clientIdentity
,
config
:
config
}
}
...
...
javascript/javascript_runtime.go
View file @
c3621725
...
...
@@ -50,7 +50,7 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE {
re
:=
&
JSRE
{
ethereum
,
otto
.
New
(),
ethpub
.
New
PEthereum
(
ethereum
),
ethpub
.
New
(
ethereum
),
make
(
chan
ethreact
.
Event
,
10
),
make
(
chan
ethreact
.
Event
,
10
),
make
(
chan
bool
),
...
...
utils/cmd.go
View file @
c3621725
package
utils
import
(
"bitbucket.org/kardianos/osext"
"fmt"
"io"
"log"
"os"
"os/signal"
"path"
"path/filepath"
"runtime"
"time"
"bitbucket.org/kardianos/osext"
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethcrypto"
"github.com/ethereum/eth-go/ethdb"
...
...
@@ -12,14 +21,6 @@ import (
"github.com/ethereum/eth-go/ethrpc"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/eth-go/ethwire"
"io"
"log"
"os"
"os/signal"
"path"
"path/filepath"
"runtime"
"time"
)
var
logger
=
ethlog
.
NewLogger
(
"CLI"
)
...
...
@@ -227,7 +228,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
(
ethpub
.
New
PEthereum
(
ethereum
),
RpcPort
)
ethereum
.
RpcServer
,
err
=
ethrpc
.
NewJsonRpcServer
(
ethpub
.
New
(
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