aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/mist
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-12-19 07:33:05 +0800
committerobscuren <geffobscura@gmail.com>2014-12-19 07:33:05 +0800
commit207b6c50fb6dcc698bac832e98b2d633f79532e4 (patch)
tree8b5e31c3b8c89565b1a6f9f4fce3da991d0f71e3 /cmd/mist
parent6e24b1587de95b45fe0d7623528bb2f5a48e9823 (diff)
parent7c24cd790d39b67ee16ad7f1b1a805fcb131dc8a (diff)
downloadgo-tangerine-207b6c50fb6dcc698bac832e98b2d633f79532e4.tar.gz
go-tangerine-207b6c50fb6dcc698bac832e98b2d633f79532e4.tar.zst
go-tangerine-207b6c50fb6dcc698bac832e98b2d633f79532e4.zip
Merge branch 'badsig' of https://github.com/ebuchman/go-ethereum into ebuchman-badsig
Conflicts: core/transaction_pool.go
Diffstat (limited to 'cmd/mist')
-rw-r--r--cmd/mist/gui.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go
index 3ab307174..e858d7c61 100644
--- a/cmd/mist/gui.go
+++ b/cmd/mist/gui.go
@@ -301,7 +301,7 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) {
addr := gui.address()
var inout string
- if bytes.Compare(tx.Sender(), addr) == 0 {
+ if bytes.Compare(tx.From(), addr) == 0 {
inout = "send"
} else {
inout = "recv"
@@ -321,7 +321,7 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) {
if send.Len() != 0 {
s = strings.Trim(send.Str(), "\x00")
} else {
- s = ethutil.Bytes2Hex(tx.Sender())
+ s = ethutil.Bytes2Hex(tx.From())
}
if rec.Len() != 0 {
r = strings.Trim(rec.Str(), "\x00")
@@ -453,7 +453,7 @@ func (gui *Gui) update() {
tx := ev.Tx
object := state.GetAccount(gui.address())
- if bytes.Compare(tx.Sender(), gui.address()) == 0 {
+ if bytes.Compare(tx.From(), gui.address()) == 0 {
object.SubAmount(tx.Value())
gui.txDb.Put(tx.Hash(), tx.RlpEncode())