A handful of GUI fixes

This commit is contained in:
Maran 2014-06-17 11:40:23 +02:00
parent 6656f99c54
commit 01e6f63e98

View File

@ -104,16 +104,17 @@ type PTx struct {
func NewPTx(tx *ethchain.Transaction) *PTx { func NewPTx(tx *ethchain.Transaction) *PTx {
hash := hex.EncodeToString(tx.Hash()) hash := hex.EncodeToString(tx.Hash())
receiver := hex.EncodeToString(tx.Recipient) receiver := hex.EncodeToString(tx.Recipient)
if receiver == "0000000000000000000000000000000000000000" {
if receiver == "" {
receiver = hex.EncodeToString(tx.CreationAddress()) receiver = hex.EncodeToString(tx.CreationAddress())
} }
sender := hex.EncodeToString(tx.Sender()) sender := hex.EncodeToString(tx.Sender())
createsContract := tx.CreatesContract() createsContract := tx.CreatesContract()
data := string(tx.Data) var data string
if tx.CreatesContract() { if tx.CreatesContract() {
data = strings.Join(ethchain.Disassemble(tx.Data), "\n") data = strings.Join(ethchain.Disassemble(tx.Data), "\n")
} else {
data = hex.EncodeToString(tx.Data)
} }
return &PTx{ref: tx, Hash: hash, Value: ethutil.CurrencyToString(tx.Value), Address: receiver, Contract: tx.CreatesContract(), Gas: tx.Gas.String(), GasPrice: tx.GasPrice.String(), Data: data, Sender: sender, CreatesContract: createsContract, RawData: hex.EncodeToString(tx.Data)} return &PTx{ref: tx, Hash: hash, Value: ethutil.CurrencyToString(tx.Value), Address: receiver, Contract: tx.CreatesContract(), Gas: tx.Gas.String(), GasPrice: tx.GasPrice.String(), Data: data, Sender: sender, CreatesContract: createsContract, RawData: hex.EncodeToString(tx.Data)}