diff options
author | obscuren <geffobscura@gmail.com> | 2014-12-18 22:18:13 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-12-18 22:18:13 +0800 |
commit | db494170dc819b1eb0d267b6e1ab36c6cfb63569 (patch) | |
tree | 8e2b374519a0ae5e20a9db0c2a4a86bf3375329e /cmd/mist | |
parent | 9e286e1c337319f47b2b04e9e1022ac05470a296 (diff) | |
download | dexon-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.gz dexon-db494170dc819b1eb0d267b6e1ab36c6cfb63569.tar.zst dexon-db494170dc819b1eb0d267b6e1ab36c6cfb63569.zip |
Created generic message (easy for testing)
Diffstat (limited to 'cmd/mist')
-rw-r--r-- | cmd/mist/gui.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cmd/mist/gui.go b/cmd/mist/gui.go index 773688ffc..46f264f35 100644 --- a/cmd/mist/gui.go +++ b/cmd/mist/gui.go @@ -305,13 +305,13 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) { var ( ptx = xeth.NewJSTx(tx, pipe.World().State()) - send = nameReg.Storage(tx.Sender()) - rec = nameReg.Storage(tx.Recipient) + send = nameReg.Storage(tx.From()) + rec = nameReg.Storage(tx.To()) s, r string ) if tx.CreatesContract() { - rec = nameReg.Storage(tx.CreationAddress(pipe.World().State())) + rec = nameReg.Storage(core.AddressFromMessage(tx)) } if send.Len() != 0 { @@ -323,9 +323,9 @@ func (gui *Gui) insertTransaction(window string, tx *types.Transaction) { r = strings.Trim(rec.Str(), "\x00") } else { if tx.CreatesContract() { - r = ethutil.Bytes2Hex(tx.CreationAddress(pipe.World().State())) + r = ethutil.Bytes2Hex(core.AddressFromMessage(tx)) } else { - r = ethutil.Bytes2Hex(tx.Recipient) + r = ethutil.Bytes2Hex(tx.To()) } } ptx.Sender = s @@ -449,11 +449,11 @@ func (gui *Gui) update() { object := state.GetAccount(gui.address()) if bytes.Compare(tx.Sender(), gui.address()) == 0 { - object.SubAmount(tx.Value) + object.SubAmount(tx.Value()) gui.txDb.Put(tx.Hash(), tx.RlpEncode()) - } else if bytes.Compare(tx.Recipient, gui.address()) == 0 { - object.AddAmount(tx.Value) + } else if bytes.Compare(tx.To(), gui.address()) == 0 { + object.AddAmount(tx.Value()) gui.txDb.Put(tx.Hash(), tx.RlpEncode()) } |