Merge branch 'release/0.6.6' into develop

This commit is contained in:
obscuren 2014-09-24 20:41:22 +02:00
commit 29f5dd38e3
6 changed files with 9 additions and 9 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

@ -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()