forked from cerc-io/plugeth
Minor fixes and improvements to the ui
This commit is contained in:
parent
2be9823010
commit
a0f73c2703
@ -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
BIN
ethereal/assets/heart.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
@ -123,7 +123,7 @@ ApplicationWindow {
|
||||
}
|
||||
|
||||
Image {
|
||||
source: ui.assetPath("net.png")
|
||||
source: ui.assetPath("heart.png")
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
MouseArea {
|
||||
anchors.fill: parent
|
||||
@ -286,25 +286,12 @@ ApplicationWindow {
|
||||
//ui.open(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
|
||||
|
@ -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()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user