From d4f9daa631fa832d556c16f3a29eaf73bd849f32 Mon Sep 17 00:00:00 2001 From: Maran Date: Wed, 28 May 2014 16:14:24 +0200 Subject: [PATCH 1/3] Refactor hex encode and remove coupling of popup to main window --- ethereal/assets/qml/wallet.qml | 3 +-- ethereal/ui/ui_lib.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml index 82b6809132..0e0e3d78dd 100644 --- a/ethereal/assets/qml/wallet.qml +++ b/ethereal/assets/qml/wallet.qml @@ -342,8 +342,6 @@ ApplicationWindow { property var block width: root.width height: 240 - x: root.x - y: root.y + root.height Component{ id: blockDetailsDelegate Rectangle { @@ -442,6 +440,7 @@ ApplicationWindow { text: "Contract" anchors.top: contractLabel.bottom anchors.left: parent.left + anchors.bottom: popup.bottom wrapMode: Text.Wrap width: parent.width - 30 height: 80 diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 73ec67c869..9c4301ffe4 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -2,7 +2,6 @@ package ethui import ( "bitbucket.org/kardianos/osext" - "encoding/hex" "github.com/ethereum/eth-go" "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethutil" @@ -94,7 +93,7 @@ func (self *UiLib) StartDbWithContractAndData(contractHash, data string) { dbWindow := NewDebuggerWindow(self) object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash)) if len(object.Script()) > 0 { - dbWindow.SetCode("0x" + hex.EncodeToString(object.Script())) + dbWindow.SetCode("0x" + ethutil.Hex(object.Script())) } dbWindow.SetData(data) From 58032d60e748611b0610cf764743c6b8e5681a87 Mon Sep 17 00:00:00 2001 From: Maran Date: Wed, 28 May 2014 16:17:57 +0200 Subject: [PATCH 2/3] Bump to RC11 --- README.md | 2 +- ethereal/ui/gui.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a47ce7e25e..085030ce24 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Ethereum 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). diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go index 63ab028ab8..32ff76b1aa 100644 --- a/ethereal/ui/gui.go +++ b/ethereal/ui/gui.go @@ -54,7 +54,7 @@ func New(ethereum *eth.Ethereum) *Gui { } func (gui *Gui) Start(assetPath string) { - const version = "0.5.0 RC10" + const version = "0.5.0 RC11" defer gui.txDb.Close() From 44db1a1eb20275349985f1f1b5eddd9a28731488 Mon Sep 17 00:00:00 2001 From: Maran Date: Wed, 28 May 2014 18:11:27 +0200 Subject: [PATCH 3/3] Add 0x when feeding data to debugger --- ethereal/ui/ui_lib.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go index 9c4301ffe4..9f2cca1e01 100644 --- a/ethereal/ui/ui_lib.go +++ b/ethereal/ui/ui_lib.go @@ -95,7 +95,7 @@ func (self *UiLib) StartDbWithContractAndData(contractHash, data string) { if len(object.Script()) > 0 { dbWindow.SetCode("0x" + ethutil.Hex(object.Script())) } - dbWindow.SetData(data) + dbWindow.SetData("0x" + data) dbWindow.Show() }