Commit f802e176 authored by obscuren's avatar obscuren

merge

parents 8fab7ce3 44db1a1e
...@@ -5,7 +5,7 @@ Ethereum ...@@ -5,7 +5,7 @@ Ethereum
Ethereum Go Client © 2014 Jeffrey Wilcke. Ethereum Go Client © 2014 Jeffrey Wilcke.
Current state: Proof of Concept 5.0 RC10. Current state: Proof of Concept 5.0 RC11.
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).
......
...@@ -342,8 +342,6 @@ ApplicationWindow { ...@@ -342,8 +342,6 @@ ApplicationWindow {
property var block property var block
width: root.width width: root.width
height: 240 height: 240
x: root.x
y: root.y + root.height
Component{ Component{
id: blockDetailsDelegate id: blockDetailsDelegate
Rectangle { Rectangle {
...@@ -442,6 +440,7 @@ ApplicationWindow { ...@@ -442,6 +440,7 @@ ApplicationWindow {
text: "Contract" text: "Contract"
anchors.top: contractLabel.bottom anchors.top: contractLabel.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: popup.bottom
wrapMode: Text.Wrap wrapMode: Text.Wrap
width: parent.width - 30 width: parent.width - 30
height: 80 height: 80
...@@ -1009,5 +1008,4 @@ ApplicationWindow { ...@@ -1009,5 +1008,4 @@ ApplicationWindow {
} }
} }
} }
} }
...@@ -54,7 +54,7 @@ func New(ethereum *eth.Ethereum) *Gui { ...@@ -54,7 +54,7 @@ func New(ethereum *eth.Ethereum) *Gui {
} }
func (gui *Gui) Start(assetPath string) { func (gui *Gui) Start(assetPath string) {
const version = "0.5.0 RC10" const version = "0.5.0 RC11"
defer gui.txDb.Close() defer gui.txDb.Close()
......
...@@ -2,7 +2,6 @@ package ethui ...@@ -2,7 +2,6 @@ package ethui
import ( import (
"bitbucket.org/kardianos/osext" "bitbucket.org/kardianos/osext"
"encoding/hex"
"github.com/ethereum/eth-go" "github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethutil"
...@@ -94,9 +93,9 @@ func (self *UiLib) StartDbWithContractAndData(contractHash, data string) { ...@@ -94,9 +93,9 @@ func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
dbWindow := NewDebuggerWindow(self) dbWindow := NewDebuggerWindow(self)
object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash)) object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash))
if len(object.Script()) > 0 { if len(object.Script()) > 0 {
dbWindow.SetCode("0x" + hex.EncodeToString(object.Script())) dbWindow.SetCode("0x" + ethutil.Hex(object.Script()))
} }
dbWindow.SetData(data) dbWindow.SetData("0x" + data)
dbWindow.Show() dbWindow.Show()
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment