aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ethereal/ui')
-rw-r--r--ethereal/ui/debugger.go40
-rw-r--r--ethereal/ui/gui.go91
-rw-r--r--ethereal/ui/html_container.go4
-rw-r--r--ethereal/ui/qml_app.go59
-rw-r--r--ethereal/ui/ui_lib.go51
5 files changed, 150 insertions, 95 deletions
diff --git a/ethereal/ui/debugger.go b/ethereal/ui/debugger.go
index 9d60c7587..85dd45563 100644
--- a/ethereal/ui/debugger.go
+++ b/ethereal/ui/debugger.go
@@ -26,7 +26,7 @@ func NewDebuggerWindow(lib *UiLib) *DebuggerWindow {
}
win := component.CreateWindow(nil)
- db := &Debugger{win, make(chan bool), make(chan bool), true, false}
+ db := &Debugger{win, make(chan bool), make(chan bool), true, false, true}
return &DebuggerWindow{engine: engine, win: win, lib: lib, Db: db}
}
@@ -59,6 +59,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
if !self.Db.done {
self.Db.Q <- true
}
+ self.Db.breakOnInstr = self.win.Root().ObjectByName("breakEachLine").Bool("checked")
defer func() {
if r := recover(); r != nil {
@@ -95,16 +96,20 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
self.win.Root().Call("setAsm", str)
}
- gas := ethutil.Big(gasStr)
- gasPrice := ethutil.Big(gasPriceStr)
- // Contract addr as test address
- keyPair := ethutil.GetKeyRing().Get(0)
- callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), gas, gasPrice, script)
+ var (
+ gas = ethutil.Big(gasStr)
+ gasPrice = ethutil.Big(gasPriceStr)
+ value = ethutil.Big(valueStr)
+ // Contract addr as test address
+ keyPair = ethutil.GetKeyRing().Get(0)
+ callerTx = ethchain.NewContractCreationTx(ethutil.Big(valueStr), gas, gasPrice, script)
+ )
callerTx.Sign(keyPair.PrivateKey)
state := self.lib.eth.BlockChain().CurrentBlock.State()
account := self.lib.eth.StateManager().TransState().GetAccount(keyPair.Address())
contract := ethchain.MakeContract(callerTx, state)
+ contract.Amount = value
callerClosure := ethchain.NewClosure(account, contract, script, state, gas, gasPrice)
block := self.lib.eth.BlockChain().CurrentBlock
@@ -164,6 +169,7 @@ type Debugger struct {
N chan bool
Q chan bool
done, interrupt bool
+ breakOnInstr bool
}
type storeVal struct {
@@ -190,16 +196,18 @@ func (d *Debugger) halting(pc int, op ethchain.OpCode, mem *ethchain.Memory, sta
d.win.Root().Call("setStorage", storeVal{fmt.Sprintf("% x", key), fmt.Sprintf("% x", node.Str())})
})
-out:
- for {
- select {
- case <-d.N:
- break out
- case <-d.Q:
- d.interrupt = true
- d.clearBuffers()
-
- return false
+ if d.breakOnInstr {
+ out:
+ for {
+ select {
+ case <-d.N:
+ break out
+ case <-d.Q:
+ d.interrupt = true
+ d.clearBuffers()
+
+ return false
+ }
}
}
diff --git a/ethereal/ui/gui.go b/ethereal/ui/gui.go
index 1037ba5ac..f861236aa 100644
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -6,6 +6,7 @@ import (
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethchain"
"github.com/ethereum/eth-go/ethdb"
+ "github.com/ethereum/eth-go/ethlog"
"github.com/ethereum/eth-go/ethpub"
"github.com/ethereum/eth-go/ethutil"
"github.com/ethereum/go-ethereum/utils"
@@ -15,6 +16,8 @@ import (
"time"
)
+var logger = ethlog.NewLogger("GUI")
+
type Gui struct {
// The main application window
win *qml.Window
@@ -32,11 +35,13 @@ type Gui struct {
addr []byte
- pub *ethpub.PEthereum
+ pub *ethpub.PEthereum
+ logLevel ethlog.LogLevel
+ open bool
}
// Create GUI, but doesn't start it
-func New(ethereum *eth.Ethereum) *Gui {
+func New(ethereum *eth.Ethereum, logLevel int) *Gui {
lib := &EthLib{stateManager: ethereum.StateManager(), blockChain: ethereum.BlockChain(), txPool: ethereum.TxPool()}
db, err := ethdb.NewLDBDatabase("tx_database")
if err != nil {
@@ -52,11 +57,11 @@ func New(ethereum *eth.Ethereum) *Gui {
pub := ethpub.NewPEthereum(ethereum)
- return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub}
+ return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub, logLevel: ethlog.LogLevel(logLevel), open: false}
}
func (gui *Gui) Start(assetPath string) {
- const version = "0.5.0 RC14"
+ const version = "0.5.0 RC15"
defer gui.txDb.Close()
@@ -86,25 +91,39 @@ func (gui *Gui) Start(assetPath string) {
var win *qml.Window
var err error
+ var addlog = false
if len(data) == 0 {
win, err = gui.showKeyImport(context)
} else {
win, err = gui.showWallet(context)
-
- ethutil.Config.Log.AddLogSystem(gui)
+ addlog = true
}
if err != nil {
- ethutil.Config.Log.Infoln("FATAL: asset not found: you can set an alternative asset path on on the command line using option 'asset_path'", err)
+ logger.Errorln("asset not found: you can set an alternative asset path on the command line using option 'asset_path'", err)
panic(err)
}
- ethutil.Config.Log.Infoln("[GUI] Starting GUI")
-
+ logger.Infoln("Starting GUI")
+ gui.open = true
win.Show()
+ // only add the gui logger after window is shown otherwise slider wont be shown
+ if addlog {
+ ethlog.AddLogSystem(gui)
+ }
win.Wait()
+ // need to silence gui logger after window closed otherwise logsystem hangs
+ gui.SetLogLevel(ethlog.Silence)
+ gui.open = false
+}
- gui.eth.Stop()
+func (gui *Gui) Stop() {
+ if gui.open {
+ gui.SetLogLevel(ethlog.Silence)
+ gui.open = false
+ gui.win.Hide()
+ }
+ logger.Infoln("Stopped")
}
func (gui *Gui) ToggleMining() {
@@ -154,10 +173,6 @@ func (gui *Gui) createWindow(comp qml.Object) *qml.Window {
gui.win = win
gui.uiLib.win = win
- db := &Debugger{gui.win, make(chan bool), make(chan bool), true, false}
- gui.lib.Db = db
- gui.uiLib.Db = db
-
return gui.win
}
func (gui *Gui) setInitialBlockChain() {
@@ -315,22 +330,6 @@ func (gui *Gui) setPeerInfo() {
}
}
-// Logging functions that log directly to the GUI interface
-func (gui *Gui) Println(v ...interface{}) {
- str := strings.TrimRight(fmt.Sprintln(v...), "\n")
- lines := strings.Split(str, "\n")
- for _, line := range lines {
- gui.win.Root().Call("addLog", line)
- }
-}
-
-func (gui *Gui) Printf(format string, v ...interface{}) {
- str := strings.TrimRight(fmt.Sprintf(format, v...), "\n")
- lines := strings.Split(str, "\n")
- for _, line := range lines {
- gui.win.Root().Call("addLog", line)
- }
-}
func (gui *Gui) RegisterName(name string) {
keyPair := ethutil.GetKeyRing().Get(0)
name = fmt.Sprintf("\"%s\"\n1", name)
@@ -357,6 +356,34 @@ func (gui *Gui) ClientId() string {
return ethutil.Config.Identifier
}
-func (gui *Gui) SetLogLevel(level int) {
- ethutil.Config.Log.SetLevel(level)
+// functions that allow Gui to implement interface ethlog.LogSystem
+func (gui *Gui) SetLogLevel(level ethlog.LogLevel) {
+ gui.logLevel = level
+}
+
+func (gui *Gui) GetLogLevel() ethlog.LogLevel {
+ return gui.logLevel
+}
+
+// this extra function needed to give int typecast value to gui widget
+// that sets initial loglevel to default
+func (gui *Gui) GetLogLevelInt() int {
+ return int(gui.logLevel)
+}
+
+func (gui *Gui) Println(v ...interface{}) {
+ gui.printLog(fmt.Sprintln(v...))
+}
+
+func (gui *Gui) Printf(format string, v ...interface{}) {
+ gui.printLog(fmt.Sprintf(format, v...))
+}
+
+// Print function that logs directly to the GUI
+func (gui *Gui) printLog(s string) {
+ str := strings.TrimRight(s, "\n")
+ lines := strings.Split(str, "\n")
+ for _, line := range lines {
+ gui.win.Root().Call("addLog", line)
+ }
}
diff --git a/ethereal/ui/html_container.go b/ethereal/ui/html_container.go
index 3867c0353..d7dc80af7 100644
--- a/ethereal/ui/html_container.go
+++ b/ethereal/ui/html_container.go
@@ -96,11 +96,11 @@ func (app *HtmlApplication) NewWatcher(quitChan chan bool) {
app.watcher.Close()
break out
case <-app.watcher.Event:
- //ethutil.Config.Log.Debugln("Got event:", ev)
+ //logger.Debugln("Got event:", ev)
app.webView.Call("reload")
case err := <-app.watcher.Error:
// TODO: Do something here
- ethutil.Config.Log.Infoln("Watcher error:", err)
+ logger.Infoln("Watcher error:", err)
}
}
}()
diff --git a/ethereal/ui/qml_app.go b/ethereal/ui/qml_app.go
new file mode 100644
index 000000000..39ab7f922
--- /dev/null
+++ b/ethereal/ui/qml_app.go
@@ -0,0 +1,59 @@
+package ethui
+
+import (
+ "github.com/ethereum/eth-go/ethchain"
+ "github.com/ethereum/eth-go/ethpub"
+ "github.com/ethereum/eth-go/ethutil"
+ "github.com/go-qml/qml"
+)
+
+type QmlApplication struct {
+ win *qml.Window
+ engine *qml.Engine
+ lib *UiLib
+ path string
+}
+
+func NewQmlApplication(path string, lib *UiLib) *QmlApplication {
+ engine := qml.NewEngine()
+ return &QmlApplication{engine: engine, path: path, lib: lib}
+}
+
+func (app *QmlApplication) Create() error {
+ component, err := app.engine.LoadFile(app.path)
+ if err != nil {
+ logger.Warnln(err)
+ }
+ app.win = component.CreateWindow(nil)
+
+ return nil
+}
+
+func (app *QmlApplication) Destroy() {
+ app.engine.Destroy()
+}
+
+func (app *QmlApplication) NewWatcher(quitChan chan bool) {
+}
+
+// Events
+func (app *QmlApplication) NewBlock(block *ethchain.Block) {
+ pblock := &ethpub.PBlock{Number: int(block.BlockInfo().Number), Hash: ethutil.Hex(block.Hash())}
+ app.win.Call("onNewBlockCb", pblock)
+}
+
+func (app *QmlApplication) ObjectChanged(stateObject *ethchain.StateObject) {
+ app.win.Call("onObjectChangeCb", ethpub.NewPStateObject(stateObject))
+}
+
+func (app *QmlApplication) StorageChanged(storageObject *ethchain.StorageState) {
+ app.win.Call("onStorageChangeCb", ethpub.NewPStorageState(storageObject))
+}
+
+// Getters
+func (app *QmlApplication) Engine() *qml.Engine {
+ return app.engine
+}
+func (app *QmlApplication) Window() *qml.Window {
+ return app.win
+}
diff --git a/ethereal/ui/ui_lib.go b/ethereal/ui/ui_lib.go
index 791d4fe09..ddc955176 100644
--- a/ethereal/ui/ui_lib.go
+++ b/ethereal/ui/ui_lib.go
@@ -1,14 +1,10 @@
package ethui
import (
- "bitbucket.org/kardianos/osext"
"github.com/ethereum/eth-go"
"github.com/ethereum/eth-go/ethutil"
"github.com/go-qml/qml"
- "os"
"path"
- "path/filepath"
- "runtime"
)
type memAddr struct {
@@ -29,24 +25,14 @@ type UiLib struct {
}
func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib {
- if assetPath == "" {
- assetPath = DefaultAssetPath()
- }
return &UiLib{engine: engine, eth: eth, assetPath: assetPath}
}
-// Opens a QML file (external application)
-func (ui *UiLib) Open(path string) {
- component, err := ui.engine.LoadFile(path[7:])
- if err != nil {
- ethutil.Config.Log.Debugln(err)
- }
- win := component.CreateWindow(nil)
+func (ui *UiLib) OpenQml(path string) {
+ container := NewQmlApplication(path[7:], ui)
+ app := NewExtApplication(container, ui)
- go func() {
- win.Show()
- win.Wait()
- }()
+ go app.run()
}
func (ui *UiLib) OpenHtml(path string) {
@@ -59,7 +45,7 @@ func (ui *UiLib) OpenHtml(path string) {
func (ui *UiLib) Muted(content string) {
component, err := ui.engine.LoadFile(ui.AssetPath("qml/muted.qml"))
if err != nil {
- ethutil.Config.Log.Debugln(err)
+ logger.Debugln(err)
return
}
@@ -88,6 +74,7 @@ func (ui *UiLib) ConnectToPeer(addr string) {
func (ui *UiLib) AssetPath(p string) string {
return path.Join(ui.assetPath, p)
}
+
func (self *UiLib) StartDbWithContractAndData(contractHash, data string) {
dbWindow := NewDebuggerWindow(self)
object := self.eth.StateManager().CurrentState().GetStateObject(ethutil.FromHex(contractHash))
@@ -111,29 +98,3 @@ func (self *UiLib) StartDebugger() {
dbWindow.Show()
}
-
-func DefaultAssetPath() string {
- var base string
- // If the current working directory is the go-ethereum dir
- // assume a debug build and use the source directory as
- // asset directory.
- pwd, _ := os.Getwd()
- if pwd == path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal") {
- base = path.Join(pwd, "assets")
- } else {
- switch runtime.GOOS {
- case "darwin":
- // Get Binary Directory
- exedir, _ := osext.ExecutableFolder()
- base = filepath.Join(exedir, "../Resources")
- case "linux":
- base = "/usr/share/ethereal"
- case "window":
- fallthrough
- default:
- base = "."
- }
- }
-
- return base
-}
generated by cgit (git 2.34.1) at 2024-11-13 01:37:54 +0800