interesting
/
go-ethereum
mirror of https://github.com/ethereum/go-ethereum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge conflict

This commit is contained in:
Maran 2014-05-27 10:29:12 +02:00
parent f7eb4e587f d694e00a33
commit 474c85bc9d
4 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,7 +505,7 @@ ApplicationWindow {
} }
Window { ApplicationWindow {
id: debugWindow id: debugWindow
visible: false visible: false
title: "Debugger" title: "Debugger"
@ -543,36 +543,49 @@ ApplicationWindow {
orientation: Qt.Vertical orientation: Qt.Vertical
anchors.fill: parent anchors.fill: parent
TableView { TableView {
property var memModel: ListModel { property var memModel: ListModel {
id: memModel id: memModel
} }
height: parent.height/2 height: parent.height/2
width: parent.width width: parent.width
TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50} TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50}
TableViewColumn{ role: "value" ; title: "Memory" ; width: 750} TableViewColumn{ role: "value" ; title: "Memory" ; width: 750}
model: memModel model: memModel
} }
SplitView { SplitView {
orientation: Qt.Horizontal orientation: Qt.Horizontal
TableView { TableView {
property var debuggerLog: ListModel { property var debuggerLog: ListModel {
id: debuggerLog id: debuggerLog
} }
TableViewColumn{ role: "value"; title: "Debug messages" } TableViewColumn{ role: "value"; title: "Debug messages" }
model: debuggerLog model: debuggerLog
} }
TableView { TableView {
property var stackModel: ListModel { property var stackModel: ListModel {
id: stackModel id: stackModel
} }
height: parent.height/2 height: parent.height/2
width: parent.width width: parent.width
TableViewColumn{ role: "value" ; title: "Stack"} TableViewColumn{ role: "value" ; title: "Stack" ; width: parent.width }
model: stackModel model: stackModel
} }
} }
}
}
}
statusBar: StatusBar {
RowLayout {
anchors.fill: parent
Button {
property var enabled: true
id: debugNextButton
onClicked: {
ui.next()
}
text: "Next"
} }
} }
} }

2
ethereal/assets/samplecoin/samplecoin.html
View File

@ -9,7 +9,7 @@
<script type="text/javascript"> <script type="text/javascript">
var jefcoinAddr = "fc0a9436890478bb9b1c6ed7455c2535366f4a99" var jefcoinAddr = "518546ffa883dcc838a64bc2dabada0fd64af459"
var mAddr = "" var mAddr = ""
function createTransaction() { function createTransaction() {

2
ethereal/ui/gui.go
View File

@ -130,7 +130,7 @@ func (gui *Gui) createWindow(comp qml.Object) *qml.Window {
gui.win = win gui.win = win
gui.uiLib.win = win gui.uiLib.win = win
db := &Debugger{gui.win, make(chan bool)} db := &Debugger{gui.win, make(chan bool), true}
gui.lib.Db = db gui.lib.Db = db
gui.uiLib.Db = db gui.uiLib.Db = db

32
ethereal/ui/ui_lib.go
View File

@ -6,9 +6,7 @@ import (
"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"
"github.com/ethereum/go-ethereum/utils"
"github.com/go-qml/qml" "github.com/go-qml/qml"
"github.com/obscuren/mutan"
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
@ -121,27 +119,28 @@ func DefaultAssetPath() string {
func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) { func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) {
state := ui.eth.BlockChain().CurrentBlock.State() state := ui.eth.BlockChain().CurrentBlock.State()
mainInput, _ := mutan.PreParse(data) script, err := ethutil.Compile(data)
callerScript, err := utils.Compile(mainInput)
if err != nil { if err != nil {
ethutil.Config.Log.Debugln(err) ethutil.Config.Log.Debugln(err)
return return
} }
dis := ethchain.Disassemble(callerScript) dis := ethchain.Disassemble(script)
ui.win.Root().Call("clearAsm") ui.win.Root().Call("clearAsm")
for _, str := range dis { for _, str := range dis {
ui.win.Root().Call("setAsm", str) ui.win.Root().Call("setAsm", str)
} }
callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), nil)
// Contract addr as test address // Contract addr as test address
keyPair := ethutil.GetKeyRing().Get(0) keyPair := ethutil.GetKeyRing().Get(0)
callerTx :=
ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), script)
callerTx.Sign(keyPair.PrivateKey)
account := ui.eth.StateManager().TransState().GetStateObject(keyPair.Address()) account := ui.eth.StateManager().TransState().GetStateObject(keyPair.Address())
c := ethchain.MakeContract(callerTx, state) contract := ethchain.MakeContract(callerTx, state)
callerClosure := ethchain.NewClosure(account, c, c.Script(), state, ethutil.Big(gasStr), ethutil.Big(gasPriceStr)) callerClosure := ethchain.NewClosure(account, contract, contract.Init(), state, ethutil.Big(gasStr), ethutil.Big(gasPriceStr))
block := ui.eth.BlockChain().CurrentBlock block := ui.eth.BlockChain().CurrentBlock
vm := ethchain.NewVm(state, ui.eth.StateManager(), ethchain.RuntimeVars{ vm := ethchain.NewVm(state, ui.eth.StateManager(), ethchain.RuntimeVars{
@ -151,23 +150,28 @@ func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string)
Coinbase: block.Coinbase, Coinbase: block.Coinbase,
Time: block.Time, Time: block.Time,
Diff: block.Difficulty, Diff: block.Difficulty,
TxData: nil,
}) })
ui.Db.done = false
go func() { go func() {
callerClosure.Call(vm, nil, ui.Db.halting) callerClosure.Call(vm, contract.Init(), ui.Db.halting)
state.Reset() state.Reset()
ui.Db.done = true
}() }()
} }
func (ui *UiLib) Next() { func (ui *UiLib) Next() {
ui.Db.Next() if !ui.Db.done {
ui.Db.Next()
}
} }
type Debugger struct { type Debugger struct {
win *qml.Window win *qml.Window
N chan bool N chan bool
done bool
} }
func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, stack *ethchain.Stack) { func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, stack *ethchain.Stack) {