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
9f7d8ff3
Commit
9f7d8ff3
authored
Jul 21, 2014
by
zelig
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/ethutil-refactor
parents
4d5a890b
15960a5c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
debugger.go
ethereal/debugger.go
+1
-1
gui.go
ethereal/gui.go
+2
-1
No files found.
ethereal/debugger.go
View file @
9f7d8ff3
...
@@ -289,7 +289,7 @@ func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, sta
...
@@ -289,7 +289,7 @@ func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, sta
d
.
win
.
Root
()
.
Call
(
"setStack"
,
val
.
String
())
d
.
win
.
Root
()
.
Call
(
"setStack"
,
val
.
String
())
}
}
stateObject
.
State
()
.
EachStorage
(
func
(
key
string
,
node
*
ethutil
.
Value
)
{
stateObject
.
EachStorage
(
func
(
key
string
,
node
*
ethutil
.
Value
)
{
d
.
win
.
Root
()
.
Call
(
"setStorage"
,
storeVal
{
fmt
.
Sprintf
(
"% x"
,
key
),
fmt
.
Sprintf
(
"% x"
,
node
.
Str
())})
d
.
win
.
Root
()
.
Call
(
"setStorage"
,
storeVal
{
fmt
.
Sprintf
(
"% x"
,
key
),
fmt
.
Sprintf
(
"% x"
,
node
.
Str
())})
})
})
...
...
ethereal/gui.go
View file @
9f7d8ff3
...
@@ -221,8 +221,9 @@ func (gui *Gui) loadAddressBook() {
...
@@ -221,8 +221,9 @@ func (gui *Gui) loadAddressBook() {
nameReg
:=
ethpub
.
EthereumConfig
(
gui
.
eth
.
StateManager
())
.
NameReg
()
nameReg
:=
ethpub
.
EthereumConfig
(
gui
.
eth
.
StateManager
())
.
NameReg
()
if
nameReg
!=
nil
{
if
nameReg
!=
nil
{
nameReg
.
State
()
.
EachStorage
(
func
(
name
string
,
value
*
ethutil
.
Value
)
{
nameReg
.
EachStorage
(
func
(
name
string
,
value
*
ethutil
.
Value
)
{
if
name
[
0
]
!=
0
{
if
name
[
0
]
!=
0
{
value
.
Decode
()
gui
.
win
.
Root
()
.
Call
(
"addAddress"
,
struct
{
Name
,
Address
string
}{
name
,
ethutil
.
Bytes2Hex
(
value
.
Bytes
())})
gui
.
win
.
Root
()
.
Call
(
"addAddress"
,
struct
{
Name
,
Address
string
}{
name
,
ethutil
.
Bytes2Hex
(
value
.
Bytes
())})
}
}
})
})
...
...
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