Merge branch 'release/0.6.6'

This commit is contained in:
obscuren 2014-09-24 20:41:11 +02:00
commit b8b1453392
8 changed files with 32 additions and 22 deletions

View File

@ -7,7 +7,7 @@ Status](http://cpt-obvious.ethercasts.com:8010/buildstatusimage?builder=go-ether
Ethereum Go Client © 2014 Jeffrey Wilcke.
Current state: Proof of Concept 0.6.5.
Current state: Proof of Concept 0.6.6.
For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).

View File

@ -13,7 +13,7 @@ import (
const (
ClientIdentifier = "Ethereum(G)"
Version = "0.6.5"
Version = "0.6.6"
)
var logger = ethlog.NewLogger("CLI")

View File

@ -47,9 +47,9 @@ Rectangle {
});
var blockNumber = eth.block(-1).number;
var messages = filter.messages()
for(var i = messages.length-1; i >= 0; i--) {
var message = messages.get(i)
var msgs = filter.messages()
for(var i = msgs.length-1; i >= 0; i--) {
var message = JSON.parse(msgs.getAsJson(i))
insertTx(message, blockNumber)
}

View File

@ -151,7 +151,7 @@ Rectangle {
model: ListModel {
id: txModel
Component.onCompleted: {
var filter = ethx.watch({latest: -1, from: eth.key().address});
var filter = ethx.watch({latest: -1, from: eth.key().address});
filter.changed(addTxs)
addTxs(filter.messages())

View File

@ -254,6 +254,7 @@ ApplicationWindow {
statusBar: StatusBar {
height: 32
id: statusBar
RowLayout {
Button {
id: miningButton
@ -294,16 +295,16 @@ ApplicationWindow {
}
ProgressBar {
id: syncProgressIndicator
visible: false
objectName: "syncProgressIndicator"
id: downloadIndicator
value: 0
visible: true
objectName: "downloadIndicator"
y: 3
width: 140
indeterminate: true
anchors.right: peerGroup.left
anchors.rightMargin: 5
x: statusBar.width / 2 - this.width / 2
width: 160
}
RowLayout {
id: peerGroup
y: 7

View File

@ -385,14 +385,13 @@ func (gui *Gui) update() {
)
peerUpdateTicker := time.NewTicker(5 * time.Second)
generalUpdateTicker := time.NewTicker(1 * time.Second)
generalUpdateTicker := time.NewTicker(500 * time.Millisecond)
statsUpdateTicker := time.NewTicker(5 * time.Second)
state := gui.eth.StateManager().TransState()
unconfirmedFunds := new(big.Int)
gui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(state.GetAccount(gui.address()).Balance)))
gui.getObjectByName("syncProgressIndicator").Set("visible", !gui.eth.IsUpToDate())
lastBlockLabel := gui.getObjectByName("lastBlockLabel")
miningLabel := gui.getObjectByName("miningLabel")
@ -439,9 +438,6 @@ func (gui *Gui) update() {
state.UpdateStateObject(object)
}
case msg := <-chainSyncChan:
sync := msg.Resource.(bool)
gui.win.Root().ObjectByName("syncProgressIndicator").Set("visible", sync)
case <-objectChan:
gui.loadAddressBook()
@ -464,9 +460,22 @@ func (gui *Gui) update() {
miningLabel.Set("text", "Mining @ "+strconv.FormatInt(pow.GetHashrate(), 10)+"Khash")
}
blockLength := gui.eth.BlockPool().BlocksProcessed
chainLength := gui.eth.BlockPool().ChainLength
var (
pct float64 = 1.0 / float64(chainLength) * float64(blockLength)
dlWidget = gui.win.Root().ObjectByName("downloadIndicator")
)
if pct < 1.0 {
dlWidget.Set("visible", true)
dlWidget.Set("value", pct)
} else {
dlWidget.Set("visible", false)
}
case <-statsUpdateTicker.C:
gui.setStatsPane()
}
}
}()

View File

@ -12,7 +12,7 @@ import (
const (
ClientIdentifier = "Mist"
Version = "0.6.5"
Version = "0.6.6"
)
var ethereum *eth.Ethereum

View File

@ -188,9 +188,9 @@ func (self *UiLib) NewFilterString(typ string) int {
func (self *UiLib) Messages(id int) *ethutil.List {
filter := self.eth.GetFilter(id)
if filter != nil {
messages := filter.Find()
messages := ethpipe.ToJSMessages(filter.Find())
return ethpipe.ToJSMessages(messages)
return messages
}
return ethutil.EmptyList()