diff options
| author | obscuren <geffobscura@gmail.com> | 2014-09-25 02:41:22 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-09-25 02:41:22 +0800 |
| commit | 29f5dd38e34b394d947e91597b322d50852effa4 (patch) | |
| tree | 1331dac4c445733c05c7061fcee173e62da53e97 | |
| parent | 6ecbbe4006b8d1c5b40e3b268cd78a6b57605018 (diff) | |
| parent | 1cb12296f6a0107acd0ed18b28c1d5e414c10bcf (diff) | |
| download | dexon-29f5dd38e34b394d947e91597b322d50852effa4.tar dexon-29f5dd38e34b394d947e91597b322d50852effa4.tar.gz dexon-29f5dd38e34b394d947e91597b322d50852effa4.tar.bz2 dexon-29f5dd38e34b394d947e91597b322d50852effa4.tar.lz dexon-29f5dd38e34b394d947e91597b322d50852effa4.tar.xz dexon-29f5dd38e34b394d947e91597b322d50852effa4.tar.zst dexon-29f5dd38e34b394d947e91597b322d50852effa4.zip | |
Merge branch 'release/0.6.6' into develop
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | ethereum/main.go | 2 | ||||
| -rw-r--r-- | mist/assets/qml/views/jeffcoin/jeffcoin.qml | 6 | ||||
| -rw-r--r-- | mist/assets/qml/views/wallet.qml | 2 | ||||
| -rw-r--r-- | mist/main.go | 2 | ||||
| -rw-r--r-- | mist/ui_lib.go | 4 |
6 files changed, 9 insertions, 9 deletions
@@ -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). diff --git a/ethereum/main.go b/ethereum/main.go index df9737c1f..8cc043a4f 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -13,7 +13,7 @@ import ( const ( ClientIdentifier = "Ethereum(G)" - Version = "0.6.5" + Version = "0.6.6" ) var logger = ethlog.NewLogger("CLI") diff --git a/mist/assets/qml/views/jeffcoin/jeffcoin.qml b/mist/assets/qml/views/jeffcoin/jeffcoin.qml index dc8678d1c..6506b53b8 100644 --- a/mist/assets/qml/views/jeffcoin/jeffcoin.qml +++ b/mist/assets/qml/views/jeffcoin/jeffcoin.qml @@ -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) } diff --git a/mist/assets/qml/views/wallet.qml b/mist/assets/qml/views/wallet.qml index fbe1dfd0e..a3a4a6e7c 100644 --- a/mist/assets/qml/views/wallet.qml +++ b/mist/assets/qml/views/wallet.qml @@ -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()) diff --git a/mist/main.go b/mist/main.go index 747616f8f..094246c1a 100644 --- a/mist/main.go +++ b/mist/main.go @@ -12,7 +12,7 @@ import ( const ( ClientIdentifier = "Mist" - Version = "0.6.5" + Version = "0.6.6" ) var ethereum *eth.Ethereum diff --git a/mist/ui_lib.go b/mist/ui_lib.go index e5ddd38c8..e1963aa86 100644 --- a/mist/ui_lib.go +++ b/mist/ui_lib.go @@ -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() |