|
|
@ -271,7 +271,8 @@ func (gui *Gui) loadAddressBook() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func (gui *Gui) insertTransaction(window string, tx *ethchain.Transaction) { |
|
|
|
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() |
|
|
|
addr := gui.address() |
|
|
|
|
|
|
|
|
|
|
|
var inout string |
|
|
|
var inout string |
|
|
@ -282,14 +283,14 @@ func (gui *Gui) insertTransaction(window string, tx *ethchain.Transaction) { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var ( |
|
|
|
var ( |
|
|
|
ptx = ethpipe.NewJSTx(tx) |
|
|
|
ptx = ethpipe.NewJSTx(tx, pipe.World().State()) |
|
|
|
send = nameReg.Storage(tx.Sender()) |
|
|
|
send = nameReg.Storage(tx.Sender()) |
|
|
|
rec = nameReg.Storage(tx.Recipient) |
|
|
|
rec = nameReg.Storage(tx.Recipient) |
|
|
|
s, r string |
|
|
|
s, r string |
|
|
|
) |
|
|
|
) |
|
|
|
|
|
|
|
|
|
|
|
if tx.CreatesContract() { |
|
|
|
if tx.CreatesContract() { |
|
|
|
rec = nameReg.Storage(tx.CreationAddress()) |
|
|
|
rec = nameReg.Storage(tx.CreationAddress(pipe.World().State())) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if send.Len() != 0 { |
|
|
|
if send.Len() != 0 { |
|
|
@ -301,7 +302,7 @@ func (gui *Gui) insertTransaction(window string, tx *ethchain.Transaction) { |
|
|
|
r = strings.Trim(rec.Str(), "\x00") |
|
|
|
r = strings.Trim(rec.Str(), "\x00") |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if tx.CreatesContract() { |
|
|
|
if tx.CreatesContract() { |
|
|
|
r = ethutil.Bytes2Hex(tx.CreationAddress()) |
|
|
|
r = ethutil.Bytes2Hex(tx.CreationAddress(pipe.World().State())) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
r = ethutil.Bytes2Hex(tx.Recipient) |
|
|
|
r = ethutil.Bytes2Hex(tx.Recipient) |
|
|
|
} |
|
|
|
} |
|
|
@ -468,16 +469,9 @@ func (gui *Gui) update() { |
|
|
|
dlWidget = gui.win.Root().ObjectByName("downloadIndicator") |
|
|
|
dlWidget = gui.win.Root().ObjectByName("downloadIndicator") |
|
|
|
dlLabel = gui.win.Root().ObjectByName("downloadLabel") |
|
|
|
dlLabel = gui.win.Root().ObjectByName("downloadLabel") |
|
|
|
) |
|
|
|
) |
|
|
|
if pct < 1.0 { |
|
|
|
|
|
|
|
dlWidget.Set("visible", true) |
|
|
|
|
|
|
|
dlWidget.Set("value", pct) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dlLabel.Set("visible", true) |
|
|
|
dlWidget.Set("value", pct) |
|
|
|
dlLabel.Set("text", fmt.Sprintf("%d / %d", blockLength, chainLength)) |
|
|
|
dlLabel.Set("text", fmt.Sprintf("%d / %d", blockLength, chainLength)) |
|
|
|
} else { |
|
|
|
|
|
|
|
dlWidget.Set("visible", false) |
|
|
|
|
|
|
|
dlLabel.Set("visible", false) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
case <-statsUpdateTicker.C: |
|
|
|
case <-statsUpdateTicker.C: |
|
|
|
gui.setStatsPane() |
|
|
|
gui.setStatsPane() |
|
|
|