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
fb49e556
Commit
fb49e556
authored
Aug 20, 2014
by
obscuren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed minor issues with filtering
parent
0eb1db0d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
68 additions
and
2 deletions
+68
-2
filter.js
ethereal/assets/ext/filter.js
+5
-1
gui.go
ethereal/gui.go
+1
-1
ui_lib.go
ethereal/ui_lib.go
+62
-0
No files found.
ethereal/assets/ext/filter.js
View file @
fb49e556
...
@@ -3,7 +3,11 @@ var Filter = function(options) {
...
@@ -3,7 +3,11 @@ var Filter = function(options) {
this
.
seed
=
Math
.
floor
(
Math
.
random
()
*
1000000
);
this
.
seed
=
Math
.
floor
(
Math
.
random
()
*
1000000
);
this
.
options
=
options
;
this
.
options
=
options
;
eth
.
registerFilter
(
options
,
this
.
seed
);
if
(
options
==
"chain"
)
{
eth
.
registerFilterString
(
options
,
this
.
seed
);
}
else
if
(
typeof
options
===
"object"
)
{
eth
.
registerFilter
(
options
,
this
.
seed
);
}
};
};
Filter
.
prototype
.
changed
=
function
(
callback
)
{
Filter
.
prototype
.
changed
=
function
(
callback
)
{
...
...
ethereal/gui.go
View file @
fb49e556
...
@@ -72,7 +72,7 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, clientIden
...
@@ -72,7 +72,7 @@ func NewWindow(ethereum *eth.Ethereum, config *ethutil.ConfigManager, clientIden
if
err
!=
nil
{
if
err
!=
nil
{
fmt
.
Println
(
err
)
fmt
.
Println
(
err
)
}
}
fmt
.
Println
(
string
(
data
))
fmt
.
Println
(
"plugins:"
,
string
(
data
))
json
.
Unmarshal
([]
byte
(
data
),
&
gui
.
plugins
)
json
.
Unmarshal
([]
byte
(
data
),
&
gui
.
plugins
)
...
...
ethereal/ui_lib.go
View file @
fb49e556
...
@@ -169,6 +169,20 @@ func (self *UiLib) RegisterFilter(object map[string]interface{}, seed int) {
...
@@ -169,6 +169,20 @@ func (self *UiLib) RegisterFilter(object map[string]interface{}, seed int) {
self
.
win
.
Root
()
.
Call
(
"invokeFilterCallback"
,
filter
.
MessagesToJson
(
messages
),
seed
,
callbackSeed
)
self
.
win
.
Root
()
.
Call
(
"invokeFilterCallback"
,
filter
.
MessagesToJson
(
messages
),
seed
,
callbackSeed
)
}
}
}
}
}
func
(
self
*
UiLib
)
RegisterFilterString
(
typ
string
,
seed
int
)
{
filter
:=
&
GuiFilter
{
ethpipe
.
NewJSFilterFromMap
(
nil
,
self
.
eth
),
seed
}
self
.
filters
[
seed
]
=
filter
if
typ
==
"chain"
{
filter
.
BlockCallback
=
func
(
block
*
ethchain
.
Block
)
{
for
_
,
callbackSeed
:=
range
self
.
filterCallbacks
[
seed
]
{
self
.
win
.
Root
()
.
Call
(
"invokeFilterCallback"
,
"{}"
,
seed
,
callbackSeed
)
}
}
}
}
}
func
(
self
*
UiLib
)
RegisterFilterCallback
(
seed
,
cbSeed
int
)
{
func
(
self
*
UiLib
)
RegisterFilterCallback
(
seed
,
cbSeed
int
)
{
...
@@ -187,3 +201,51 @@ type GuiFilter struct {
...
@@ -187,3 +201,51 @@ type GuiFilter struct {
*
ethpipe
.
JSFilter
*
ethpipe
.
JSFilter
seed
int
seed
int
}
}
func
(
self
*
UiLib
)
Transact
(
object
map
[
string
]
interface
{})
(
*
ethpipe
.
JSReceipt
,
error
)
{
// Default values
if
object
[
"from"
]
==
nil
{
object
[
"from"
]
=
""
}
if
object
[
"to"
]
==
nil
{
object
[
"to"
]
=
""
}
if
object
[
"value"
]
==
nil
{
object
[
"value"
]
=
""
}
if
object
[
"gas"
]
==
nil
{
object
[
"gas"
]
=
""
}
if
object
[
"gasPrice"
]
==
nil
{
object
[
"gasPrice"
]
=
""
}
var
dataStr
string
var
data
[]
string
if
list
,
ok
:=
object
[
"data"
]
.
(
*
qml
.
List
);
ok
{
list
.
Convert
(
&
data
)
}
for
_
,
str
:=
range
data
{
if
ethutil
.
IsHex
(
str
)
{
str
=
str
[
2
:
]
if
len
(
str
)
!=
64
{
str
=
ethutil
.
LeftPadString
(
str
,
64
)
}
}
else
{
str
=
ethutil
.
Bytes2Hex
(
ethutil
.
LeftPadBytes
(
ethutil
.
Big
(
str
)
.
Bytes
(),
32
))
}
dataStr
+=
str
}
return
self
.
JSPipe
.
Transact
(
object
[
"from"
]
.
(
string
),
object
[
"to"
]
.
(
string
),
object
[
"value"
]
.
(
string
),
object
[
"gas"
]
.
(
string
),
object
[
"gasPrice"
]
.
(
string
),
dataStr
,
)
}
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