diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-23 19:12:53 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-23 19:12:53 +0800 |
| commit | 6657d544db4eefec24ebd280940048f25ed85186 (patch) | |
| tree | a65998614ecb147e0e67107aa34ac306d027ccc1 /cmd/mist/gui.go | |
| parent | 0be6d3404898a8e68f2f78cfa6b64d6b1f314fb0 (diff) | |
| parent | dbb2af6016c952b0f49d552a10fc59af0a9f7ce7 (diff) | |
| download | dexon-6657d544db4eefec24ebd280940048f25ed85186.tar dexon-6657d544db4eefec24ebd280940048f25ed85186.tar.gz dexon-6657d544db4eefec24ebd280940048f25ed85186.tar.bz2 dexon-6657d544db4eefec24ebd280940048f25ed85186.tar.lz dexon-6657d544db4eefec24ebd280940048f25ed85186.tar.xz dexon-6657d544db4eefec24ebd280940048f25ed85186.tar.zst dexon-6657d544db4eefec24ebd280940048f25ed85186.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'cmd/mist/gui.go')
| -rw-r--r-- | cmd/mist/gui.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index 19ad09454..08f02f833 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -31,11 +31,11 @@ import ( "sort" "time" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/ui/qt/qwhisper" "github.com/ethereum/go-ethereum/xeth" @@ -230,7 +230,8 @@ func (self *Gui) loadMergedMiningOptions() { func (gui *Gui) insertTransaction(window string, tx *types.Transaction) { var inout string - if gui.eth.AccountManager().HasAccount(tx.From()) { + from, _ := tx.From() + if gui.eth.AccountManager().HasAccount(common.Hex2Bytes(from.Hex())) { inout = "send" } else { inout = "recv" @@ -238,8 +239,8 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) { var ( ptx = xeth.NewTx(tx) - send = common.Bytes2Hex(tx.From()) - rec = common.Bytes2Hex(tx.To()) + send = from.Hex() + rec = tx.To().Hex() ) ptx.Sender = send ptx.Address = rec @@ -263,7 +264,7 @@ func (gui *Gui) readPreviousTransactions() { } func (gui *Gui) processBlock(block *types.Block, initial bool) { - name := common.Bytes2Hex(block.Coinbase()) + name := block.Coinbase().Hex() b := xeth.NewBlock(block) b.Name = name |