aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist/gui.go
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-22 21:25:33 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-22 21:25:33 +0800
commitd186bf0dfece955feb797dda2b53cae8c89b786c (patch)
treec913a30268071eb3e831a79b109c5a29728d19d4 /cmd/mist/gui.go
parent9682a3ef3ec72a871708a9bba1133fa59b58ccb5 (diff)
downloadgo-tangerine-d186bf0dfece955feb797dda2b53cae8c89b786c.tar.gz
go-tangerine-d186bf0dfece955feb797dda2b53cae8c89b786c.tar.zst
go-tangerine-d186bf0dfece955feb797dda2b53cae8c89b786c.zip
Fix Mist types build errors
Diffstat (limited to 'cmd/mist/gui.go')
-rw-r--r--cmd/mist/gui.go11
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