diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-03-23 19:12:29 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-03-23 19:12:29 +0800 |
| commit | dbb2af6016c952b0f49d552a10fc59af0a9f7ce7 (patch) | |
| tree | fb80e30709cd6fd0698b161356ef5080b2f3655b /cmd/mist/gui.go | |
| parent | 91a2275ad359b2f72565b926dac7dcd77b14a241 (diff) | |
| parent | d186bf0dfece955feb797dda2b53cae8c89b786c (diff) | |
| download | go-tangerine-dbb2af6016c952b0f49d552a10fc59af0a9f7ce7.tar go-tangerine-dbb2af6016c952b0f49d552a10fc59af0a9f7ce7.tar.gz go-tangerine-dbb2af6016c952b0f49d552a10fc59af0a9f7ce7.tar.bz2 go-tangerine-dbb2af6016c952b0f49d552a10fc59af0a9f7ce7.tar.lz go-tangerine-dbb2af6016c952b0f49d552a10fc59af0a9f7ce7.tar.xz go-tangerine-dbb2af6016c952b0f49d552a10fc59af0a9f7ce7.tar.zst go-tangerine-dbb2af6016c952b0f49d552a10fc59af0a9f7ce7.zip | |
Merge pull request #548 from tgerring/typescleanup
Fix Mist types build errors
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 |