roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Changed to new "created address"

Browse Source
This commit is contained in:
obscuren 2014-10-02 17:35:57 +02:00
parent 5053ec2190
commit e100aa3c6c
2 changed files with 859 additions and 865 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mist/assets/qml/main.qml
View File

@ -297,12 +297,12 @@ ApplicationWindow {
ProgressBar {
id: downloadIndicator
value: 0
visible: true
objectName: "downloadIndicator"
y: 3
x: statusBar.width / 2 - this.width / 2
width: 160
}
Label {
objectName: "downloadLabel"
y: 7

18
mist/gui.go
View File

@ -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)
dlWidget.Set("value", pct)
dlLabel.Set("text", fmt.Sprintf("%d / %d", blockLength, chainLength))
} else {
dlWidget.Set("visible", false)
dlLabel.Set("visible", false)
}
case <-statsUpdateTicker.C:
gui.setStatsPane()