poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'release/0.6.6' into develop

This commit is contained in:
obscuren 2014-09-24 20:41:22 +02:00
parent 6ecbbe4006 1cb12296f6
commit 29f5dd38e3
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -7,7 +7,7 @@ Status](http://cpt-obvious.ethercasts.com:8010/buildstatusimage?builder=go-ether
Ethereum Go Client © 2014 Jeffrey Wilcke. 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). For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).

2
ethereum/main.go
View File

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

6
mist/assets/qml/views/jeffcoin/jeffcoin.qml
View File

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

2
mist/assets/qml/views/wallet.qml
View File

@ -151,7 +151,7 @@ Rectangle {
model: ListModel { model: ListModel {
id: txModel id: txModel
Component.onCompleted: { 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) filter.changed(addTxs)
addTxs(filter.messages()) addTxs(filter.messages())

2
mist/main.go
View File

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

4
mist/ui_lib.go
View File

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