mirror of https://github.com/poanetwork/quorum.git
Changed to new "created address"
This commit is contained in:
parent
5053ec2190
commit
e100aa3c6c
File diff suppressed because it is too large
Load Diff
20
mist/gui.go
20
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()
|
||||
|
|
Loading…
Reference in New Issue