aboutsummaryrefslogtreecommitdiffstats
path: root/mist/gui.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-10-02 23:35:57 +0800
committerobscuren <geffobscura@gmail.com>2014-10-02 23:35:57 +0800
commite100aa3c6c6a9e4da858812b7ed8392ec2e3954a (patch)
treeb040669b621f367917bdd97b46869d14fd446958 /mist/gui.go
parent5053ec21902727864d77664556fee144514bfa85 (diff)
downloaddexon-e100aa3c6c6a9e4da858812b7ed8392ec2e3954a.tar
dexon-e100aa3c6c6a9e4da858812b7ed8392ec2e3954a.tar.gz
dexon-e100aa3c6c6a9e4da858812b7ed8392ec2e3954a.tar.bz2
dexon-e100aa3c6c6a9e4da858812b7ed8392ec2e3954a.tar.lz
dexon-e100aa3c6c6a9e4da858812b7ed8392ec2e3954a.tar.xz
dexon-e100aa3c6c6a9e4da858812b7ed8392ec2e3954a.tar.zst
dexon-e100aa3c6c6a9e4da858812b7ed8392ec2e3954a.zip
Changed to new "created address"
Diffstat (limited to 'mist/gui.go')
-rw-r--r--mist/gui.go20
1 files changed, 7 insertions, 13 deletions
diff --git a/mist/gui.go b/mist/gui.go
index 7d851243f..de051737c 100644
--- a/mist/gui.go
+++ b/mist/gui.go
@@ -271,7 +271,8 @@ func (gui *Gui) loadAddressBook() {
}
func (gui *Gui) insertTransaction(window string, tx *ethchain.Transaction) {
- nameReg := ethpipe.New(gui.eth).World().Config().Get("NameReg")
+ pipe := ethpipe.New(gui.eth)
+ nameReg := pipe.World().Config().Get("NameReg")
addr := gui.address()
var inout string
@@ -282,14 +283,14 @@ func (gui *Gui) insertTransaction(window string, tx *ethchain.Transaction) {
}
var (
- ptx = ethpipe.NewJSTx(tx)
+ ptx = ethpipe.NewJSTx(tx, pipe.World().State())
send = nameReg.Storage(tx.Sender())
rec = nameReg.Storage(tx.Recipient)
s, r string
)
if tx.CreatesContract() {
- rec = nameReg.Storage(tx.CreationAddress())
+ rec = nameReg.Storage(tx.CreationAddress(pipe.World().State()))
}
if send.Len() != 0 {
@@ -301,7 +302,7 @@ func (gui *Gui) insertTransaction(window string, tx *ethchain.Transaction) {
r = strings.Trim(rec.Str(), "\x00")
} else {
if tx.CreatesContract() {
- r = ethutil.Bytes2Hex(tx.CreationAddress())
+ r = ethutil.Bytes2Hex(tx.CreationAddress(pipe.World().State()))
} else {
r = ethutil.Bytes2Hex(tx.Recipient)
}
@@ -468,16 +469,9 @@ func (gui *Gui) update() {
dlWidget = gui.win.Root().ObjectByName("downloadIndicator")
dlLabel = gui.win.Root().ObjectByName("downloadLabel")
)
- if pct < 1.0 {
- dlWidget.Set("visible", true)
- dlWidget.Set("value", pct)
- dlLabel.Set("visible", true)
- dlLabel.Set("text", fmt.Sprintf("%d / %d", blockLength, chainLength))
- } else {
- dlWidget.Set("visible", false)
- dlLabel.Set("visible", false)
- }
+ dlWidget.Set("value", pct)
+ dlLabel.Set("text", fmt.Sprintf("%d / %d", blockLength, chainLength))
case <-statsUpdateTicker.C:
gui.setStatsPane()