poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

This commit is contained in:
obscuren 2015-04-10 11:03:46 +02:00
parent 3755cfccb3 20fd60902b
commit fc1d1f9afd
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/mist/gui.go
View File

@ -238,13 +238,11 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) {
inout = "recv" inout = "recv"
} }
var ( ptx := xeth.NewTx(tx)
ptx = xeth.NewTx(tx) ptx.Sender = from.Hex()
send = from.Hex() if to := tx.To(); to != nil {
rec = tx.To().Hex() ptx.Address = to.Hex()
) }
ptx.Sender = send
ptx.Address = rec
if window == "post" { if window == "post" {
//gui.getObjectByName("transactionView").Call("addTx", ptx, inout) //gui.getObjectByName("transactionView").Call("addTx", ptx, inout)

7
cmd/utils/customflags.go
View File

@ -18,11 +18,11 @@ type DirectoryString struct {
Value string Value string
} }
func (self DirectoryString) String() string { func (self *DirectoryString) String() string {
return self.Value return self.Value
} }
func (self DirectoryString) Set(value string) error { func (self *DirectoryString) Set(value string) error {
self.Value = expandPath(value) self.Value = expandPath(value)
return nil return nil
} }
@ -72,9 +72,8 @@ func (self DirectoryFlag) Apply(set *flag.FlagSet) {
} }
eachName(self.Name, func(name string) { 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) { func prefixFor(name string) (prefix string) {

7
xeth/types.go
View File

@ -140,8 +140,11 @@ type Transaction struct {
func NewTx(tx *types.Transaction) *Transaction { func NewTx(tx *types.Transaction) *Transaction {
hash := tx.Hash().Hex() 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() receiver = core.AddressFromMessage(tx).Hex()
} }
sender, _ := tx.From() sender, _ := tx.From()