gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/0.6.7' into develop

Browse Source
This commit is contained in:
obscuren
2014-09-26 13:47:47 +02:00
parent cf999c4622 2b8eae9810
commit 41ae6f298e
5 changed files with 8 additions and 7 deletions
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.6. Current state: Proof of Concept 0.6.7.
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.6" Version = "0.6.7"
) )
var logger = ethlog.NewLogger("CLI") var logger = ethlog.NewLogger("CLI")

5
mist/assets/qml/wallet.qml → mist/assets/qml/main.qml
View File

@@ -739,7 +739,7 @@ ApplicationWindow {
function addPeer(peer) { function addPeer(peer) {
// We could just append the whole peer object but it cries if you try to alter them // We could just append the whole peer object but it cries if you try to alter them
peerModel.append({ip: peer.ip, port: peer.port, lastResponse:timeAgo(peer.lastSend), latency: peer.latency, version: peer.version}) peerModel.append({ip: peer.ip, port: peer.port, lastResponse:timeAgo(peer.lastSend), latency: peer.latency, version: peer.version, caps: peer.caps})
} }
function resetPeers(){ function resetPeers(){
@@ -782,10 +782,11 @@ ApplicationWindow {
id: peerTable id: peerTable
model: peerModel model: peerModel
TableViewColumn{width: 100; role: "ip" ; title: "IP" } TableViewColumn{width: 100; role: "ip" ; title: "IP" }
TableViewColumn{width: 60; role: "port" ; title: "Port" } TableViewColumn{width: 60; role: "port" ; title: "Port" }
TableViewColumn{width: 140; role: "lastResponse"; title: "Last event" } TableViewColumn{width: 140; role: "lastResponse"; title: "Last event" }
TableViewColumn{width: 100; role: "latency"; title: "Latency" } TableViewColumn{width: 100; role: "latency"; title: "Latency" }
TableViewColumn{width: 260; role: "version" ; title: "Version" } TableViewColumn{width: 260; role: "version" ; title: "Version" }
TableViewColumn{width: 80; role: "caps" ; title: "Capabilities" }
} }
} }
} }

4
mist/gui.go
View File

@@ -172,7 +172,7 @@ func (gui *Gui) Stop() {
} }
func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) { func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) {
component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/wallet.qml")) component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/main.qml"))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -500,7 +500,7 @@ func (gui *Gui) setStatsPane() {
runtime.ReadMemStats(&memStats) runtime.ReadMemStats(&memStats)
statsPane := gui.getObjectByName("statsPane") statsPane := gui.getObjectByName("statsPane")
statsPane.Set("text", fmt.Sprintf(`###### Mist 0.6.5 (%s) ####### statsPane.Set("text", fmt.Sprintf(`###### Mist 0.6.7 (%s) #######
eth %d (p2p = %d) eth %d (p2p = %d)

2
mist/main.go
View File

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