good morning!!!!
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
bor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Harbor Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open
bor
Commits
fc1d1f9a
Commit
fc1d1f9a
authored
10 years ago
by
Jeffrey Wilcke
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
parents
3755cfcc
20fd6090
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cmd/mist/gui.go
+5
-7
5 additions, 7 deletions
cmd/mist/gui.go
cmd/utils/customflags.go
+3
-4
3 additions, 4 deletions
cmd/utils/customflags.go
xeth/types.go
+5
-2
5 additions, 2 deletions
xeth/types.go
with
13 additions
and
13 deletions
cmd/mist/gui.go
+
5
−
7
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)
...
...
This diff is collapsed.
Click to expand it.
cmd/utils/customflags.go
+
3
−
4
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
)
{
...
...
This diff is collapsed.
Click to expand it.
xeth/types.go
+
5
−
2
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
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment