roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Minor fixes and improvements to the ui

Browse Source
This commit is contained in:
obscuren 2014-05-27 16:09:04 +02:00
parent 2be9823010
commit a0f73c2703
4 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ethereal/assets/debugger/debugger.qml
View File

@ -8,7 +8,7 @@ import Ethereum 1.0
ApplicationWindow {
visible: false
title: "Debugger"
title: "IceCream"
minimumWidth: 1280
minimumHeight: 900
width: 1290
@ -58,9 +58,10 @@ ApplicationWindow {
anchors.bottom: parent.bottom
Label {
text: "Data"
text: "Arbitrary data"
}
TextArea {
id: rawDataField
anchors.left: parent.left
anchors.right: parent.right
height: 150
@ -105,7 +106,7 @@ ApplicationWindow {
SplitView {
orientation: Qt.Horizontal
height: 300
height: 250
TableView {
id: stackTableView
@ -149,16 +150,15 @@ ApplicationWindow {
}
}
}
statusBar: StatusBar {
toolBar: ToolBar {
RowLayout {
spacing: 5
anchors.fill: parent
Button {
property var enabled: true
id: debugStart
onClicked: {
dbg.debug(txValue.text, txGas.text, txGasPrice.text, codeEditor.text)
dbg.debug(txValue.text, txGas.text, txGasPrice.text, codeEditor.text, rawDataField.text)
}
text: "Debug"
}

BIN
ethereal/assets/heart.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

21
ethereal/assets/qml/wallet.qml
View File

@ -123,7 +123,7 @@ ApplicationWindow {
}
Image {
source: ui.assetPath("net.png")
source: ui.assetPath("heart.png")
anchors.horizontalCenter: parent.horizontalCenter
MouseArea {
anchors.fill: parent
@ -284,27 +284,14 @@ ApplicationWindow {
title: "Open QML Application"
onAccepted: {
//ui.open(openAppDialog.fileUrl.toString())
//ui.openHtml(Qt.resolvedUrl(ui.assetPath("test.html")))
ui.openHtml(openAppDialog.fileUrl.toString())
//ui.openHtml(Qt.resolvedUrl(ui.assetPath("test.html")))
ui.openHtml(openAppDialog.fileUrl.toString())
}
}
statusBar: StatusBar {
RowLayout {
anchors.fill: parent
/*
Button {
property var enabled: true
id: connectButton
onClicked: {
if(this.enabled) {
ui.connect(this)
}
}
text: "Connect"
}
*/
Button {
property var enabled: true
@ -369,8 +356,8 @@ ApplicationWindow {
Text { text: '<b>Hash:</b> ' + hash; color: "#F2F2F2"}
Text { text: '<b>Block found at:</b> ' + prettyTime; color: "#F2F2F2"}
}
}
}
}
ListView {
model: singleBlock
delegate: blockDetailsDelegate

34
ethereal/ui/debugger.go
View File

@ -5,6 +5,8 @@ import (
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethutil"
"github.com/go-qml/qml"
"math/big"
"strings"
)
type DebuggerWindow struct {
@ -39,11 +41,35 @@ func (self *DebuggerWindow) Show() {
}()
}
func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, data string) {
func formatData(data string) []byte {
if len(data) == 0 {
return nil
}
// Simple stupid
d := new(big.Int)
if data[0:1] == "\"" && data[len(data)-1:] == "\"" {
d.SetBytes([]byte(data[1 : len(data)-1]))
} else if data[:2] == "0x" {
d.SetBytes(ethutil.FromHex(data[2:]))
} else {
d.SetString(data, 0)
}
return ethutil.BigToBytes(d, 256)
}
func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, dataStr string) {
if !self.Db.done {
self.Db.Q <- true
}
dataSlice := strings.Split(dataStr, "\n")
var data []byte
for _, dataItem := range dataSlice {
d := formatData(dataItem)
data = append(data, d...)
}
state := self.lib.eth.BlockChain().CurrentBlock.State()
defer func() {
@ -52,7 +78,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, data string) {
}
}()
script, err := ethutil.Compile(data)
script, err := ethutil.Compile(scriptStr)
if err != nil {
ethutil.Config.Log.Debugln(err)
@ -72,7 +98,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, data string) {
account := self.lib.eth.StateManager().TransState().GetAccount(keyPair.Address())
contract := ethchain.MakeContract(callerTx, state)
callerClosure := ethchain.NewClosure(account, contract, contract.Init(), state, ethutil.Big(gasStr), ethutil.Big(gasPriceStr))
callerClosure := ethchain.NewClosure(account, contract, script, state, ethutil.Big(gasStr), ethutil.Big(gasPriceStr))
block := self.lib.eth.BlockChain().CurrentBlock
vm := ethchain.NewVm(state, self.lib.eth.StateManager(), ethchain.RuntimeVars{
@ -86,7 +112,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, data string) {
self.Db.done = false
go func() {
callerClosure.Call(vm, contract.Init(), self.Db.halting)
callerClosure.Call(vm, data, self.Db.halting)
state.Reset()