aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/ui
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-05-29 05:16:15 +0800
committerobscuren <geffobscura@gmail.com>2014-05-29 05:16:15 +0800
commitf802e1762645192d8b1a9d4c014b2d368b0831e3 (patch)
tree7abfd9a15e0327b23e7711d98f3ca27f0133e9ee /ethereal/ui
parent8fab7ce37d6748cbf34ebee96622448ec8a4c9e3 (diff)
parent44db1a1eb20275349985f1f1b5eddd9a28731488 (diff)
downloadgo-tangerine-f802e1762645192d8b1a9d4c014b2d368b0831e3.tar
go-tangerine-f802e1762645192d8b1a9d4c014b2d368b0831e3.tar.gz
go-tangerine-f802e1762645192d8b1a9d4c014b2d368b0831e3.tar.bz2
go-tangerine-f802e1762645192d8b1a9d4c014b2d368b0831e3.tar.lz
go-tangerine-f802e1762645192d8b1a9d4c014b2d368b0831e3.tar.xz
go-tangerine-f802e1762645192d8b1a9d4c014b2d368b0831e3.tar.zst
go-tangerine-f802e1762645192d8b1a9d4c014b2d368b0831e3.zip
merge
Diffstat (limited to 'ethereal/ui')
-rw-r--r--ethereal/ui/gui.go2
-rw-r--r--ethereal/ui/ui_lib.go5
2 files changed, 3 insertions, 4 deletions
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index 6a1c4f110..1698f5de0 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()
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go
index 73ec67c86..9f2cca1e0 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,9 +93,9 @@ 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)
+ dbWindow.SetData("0x" + data)
dbWindow.Show()
}