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
fc1d1f9a
Commit
fc1d1f9a
authored
Apr 10, 2015
by
obscuren
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
parents
3755cfcc
20fd6090
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
gui.go
cmd/mist/gui.go
+5
-7
customflags.go
cmd/utils/customflags.go
+3
-4
types.go
xeth/types.go
+5
-2
No files found.
cmd/mist/gui.go
View file @
fc1d1f9a
...
...
@@ -238,13 +238,11 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) {
inout
=
"recv"
}
var
(
ptx
=
xeth
.
NewTx
(
tx
)
send
=
from
.
Hex
()
rec
=
tx
.
To
()
.
Hex
()
)
ptx
.
Sender
=
send
ptx
.
Address
=
rec
ptx
:=
xeth
.
NewTx
(
tx
)
ptx
.
Sender
=
from
.
Hex
()
if
to
:=
tx
.
To
();
to
!=
nil
{
ptx
.
Address
=
to
.
Hex
()
}
if
window
==
"post"
{
//gui.getObjectByName("transactionView").Call("addTx", ptx, inout)
...
...
cmd/utils/customflags.go
View file @
fc1d1f9a
...
...
@@ -18,11 +18,11 @@ type DirectoryString struct {
Value
string
}
func
(
self
DirectoryString
)
String
()
string
{
func
(
self
*
DirectoryString
)
String
()
string
{
return
self
.
Value
}
func
(
self
DirectoryString
)
Set
(
value
string
)
error
{
func
(
self
*
DirectoryString
)
Set
(
value
string
)
error
{
self
.
Value
=
expandPath
(
value
)
return
nil
}
...
...
@@ -72,9 +72,8 @@ func (self DirectoryFlag) Apply(set *flag.FlagSet) {
}
eachName
(
self
.
Name
,
func
(
name
string
)
{
set
.
Var
(
self
.
Value
,
self
.
Name
,
"a: "
+
self
.
Usage
)
set
.
Var
(
&
self
.
Value
,
self
.
Name
,
self
.
Usage
)
})
}
func
prefixFor
(
name
string
)
(
prefix
string
)
{
...
...
xeth/types.go
View file @
fc1d1f9a
...
...
@@ -140,8 +140,11 @@ type Transaction struct {
func
NewTx
(
tx
*
types
.
Transaction
)
*
Transaction
{
hash
:=
tx
.
Hash
()
.
Hex
()
receiver
:=
tx
.
To
()
.
Hex
()
if
len
(
receiver
)
==
0
{
var
receiver
string
if
to
:=
tx
.
To
();
to
!=
nil
{
receiver
=
to
.
Hex
()
}
else
{
receiver
=
core
.
AddressFromMessage
(
tx
)
.
Hex
()
}
sender
,
_
:=
tx
.
From
()
...
...
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