Merge branch 'develop'

obscuren · obscuren · commit c9517024237d · 2014-07-17T15:32:44.000+02:00
diff --git a/ethereal/assets/debugger/debugger.qml b/ethereal/assets/debugger/debugger.qml
@@ -19,7 +19,7 @@ ApplicationWindow {
 	property alias dataText: rawDataField.text
 
 	onClosing: {
-		compileTimer.stop()
+		//compileTimer.stop()
 	}
 
 	MenuBar {
@@ -86,7 +86,7 @@ ApplicationWindow {
 		TableView {
 			id: asmTableView
 			width: 200
-			TableViewColumn{ role: "value" ; title: "" ; width: 200 }
+			TableViewColumn{ role: "value" ; title: "" ; width: asmTableView.width - 2 }
 			model: asmModel
 		}
 
@@ -112,13 +112,15 @@ ApplicationWindow {
 						anchors.right: settings.left
 						focus: true
 
+						/*
 						Timer {
 							id: compileTimer
 							interval: 500 ; running: true ;  repeat: true
 							onTriggered: {
-								dbg.compile(codeEditor.text)
+								dbg.autoComp(codeEditor.text)
 							}
 						}
+						*/
 					}
 
 					Column {
diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml
@@ -191,6 +191,7 @@ ApplicationWindow {
 						inspector.visible = false
 					}else{
 						inspector.visible = true
+            inspector.url = webview.experimental.remoteInspectorUrl
 					}
 				}
 				onDoubleClicked: {
@@ -224,7 +225,6 @@ ApplicationWindow {
 		WebView {
 			id: inspector
 			visible: false
-			url: webview.experimental.remoteInspectorUrl
 			anchors {
 				left: root.left
 				right: root.right
@@ -238,7 +238,6 @@ ApplicationWindow {
 				name: "inspectorShown"
 				PropertyChanges {
 					target: inspector
-					url: webview.experimental.remoteInspectorUrl
 				}
 			}
 		]
diff --git a/ethereal/debugger.go b/ethereal/debugger.go
@@ -74,6 +74,13 @@ func (self *DebuggerWindow) Compile(code string) {
 	}
 }
 
+// Used by QML
+func (self *DebuggerWindow) AutoComp(code string) {
+	if self.Db.done {
+		self.Compile(code)
+	}
+}
+
 func (self *DebuggerWindow) ClearLog() {
 	self.win.Root().Call("clearLog")
 }
@@ -110,8 +117,6 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
 		return
 	}
 
-	self.SetAsm(script)
-
 	var (
 		gas      = ethutil.Big(gasStr)
 		gasPrice = ethutil.Big(gasPriceStr)
@@ -257,6 +262,10 @@ func (self *Debugger) StepHook(pc int, op ethchain.OpCode, mem *ethchain.Memory,
 	return self.halting(pc, op, mem, stack, stateObject)
 }
 
+func (self *Debugger) SetCode(byteCode []byte) {
+	self.main.SetAsm(byteCode)
+}
+
 func (self *Debugger) BreakPoints() []int64 {
 	return self.breakPoints
 }
diff --git a/ethereal/flags.go b/ethereal/flags.go
@@ -36,6 +36,7 @@ var LogLevel int
 // flags specific to gui client
 var AssetPath string
 
+//TODO: If we re-use the one defined in cmd.go the binary osx image crashes. If somebody finds out why we can dry this up.
 func defaultAssetPath() string {
 	var assetPath string
 	// If the current working directory is the go-ethereum dir
@@ -60,7 +61,6 @@ func defaultAssetPath() string {
 	}
 	return assetPath
 }
-
 func defaultDataDir() string {
 	usr, _ := user.Current()
 	return path.Join(usr.HomeDir, ".ethereal")
diff --git a/ethereal/html_container.go b/ethereal/html_container.go
@@ -8,7 +8,6 @@ import (
 	"github.com/go-qml/qml"
 	"github.com/howeyc/fsnotify"
 	"io/ioutil"
-	"log"
 	"net/url"
 	"os"
 	"path"
@@ -59,7 +58,7 @@ func (app *HtmlApplication) RootFolder() string {
 	if err != nil {
 		return ""
 	}
-	return path.Dir(folder.RequestURI())
+	return path.Dir(ethutil.WindonizePath(folder.RequestURI()))
 }
 func (app *HtmlApplication) RecursiveFolders() []os.FileInfo {
 	files, _ := ioutil.ReadDir(app.RootFolder())
@@ -77,11 +76,13 @@ func (app *HtmlApplication) NewWatcher(quitChan chan bool) {
 
 	app.watcher, err = fsnotify.NewWatcher()
 	if err != nil {
+		logger.Infoln("Could not create new auto-reload watcher:", err)
 		return
 	}
 	err = app.watcher.Watch(app.RootFolder())
 	if err != nil {
-		log.Fatal(err)
+		logger.Infoln("Could not start auto-reload watcher:", err)
+		return
 	}
 	for _, folder := range app.RecursiveFolders() {
 		fullPath := app.RootFolder() + "/" + folder.Name()
diff --git a/ethereum/cmd.go b/ethereum/cmd.go
@@ -2,13 +2,14 @@ package main
 
 import (
 	"github.com/ethereum/eth-go"
+	"github.com/ethereum/go-ethereum/ethereum/repl"
 	"github.com/ethereum/go-ethereum/utils"
 	"io/ioutil"
 	"os"
 )
 
 func InitJsConsole(ethereum *eth.Ethereum) {
-	repl := NewJSRepl(ethereum)
+	repl := ethrepl.NewJSRepl(ethereum)
 	go repl.Start()
 	utils.RegisterInterrupt(func(os.Signal) {
 		repl.Stop()
@@ -24,7 +25,7 @@ func ExecJsFile(ethereum *eth.Ethereum, InputFile string) {
 	if err != nil {
 		logger.Fatalln(err)
 	}
-	re := NewJSRE(ethereum)
+	re := ethrepl.NewJSRE(ethereum)
 	utils.RegisterInterrupt(func(os.Signal) {
 		re.Stop()
 	})
diff --git a/ethereum/flags.go b/ethereum/flags.go
@@ -11,6 +11,8 @@ import (
 
 var Identifier string
 var KeyRing string
+var DiffTool bool
+var DiffType string
 var KeyStore string
 var StartRpc bool
 var RpcPort int
@@ -66,6 +68,8 @@ func Init() {
 	flag.StringVar(&ConfigFile, "conf", defaultConfigFile, "config file")
 	flag.StringVar(&DebugFile, "debug", "", "debug file (no debugging if not set)")
 	flag.IntVar(&LogLevel, "loglevel", int(ethlog.InfoLevel), "loglevel: 0-5: silent,error,warn,info,debug,debug detail)")
+	flag.BoolVar(&DiffTool, "difftool", false, "creates output for diff'ing. Sets LogLevel=0")
+	flag.StringVar(&DiffType, "diff", "all", "sets the level of diff output [vm, all]. Has no effect if difftool=false")
 
 	flag.BoolVar(&StartMining, "mine", false, "start dagger mining")
 	flag.BoolVar(&StartJsConsole, "js", false, "launches javascript console")
diff --git a/ethereum/main.go b/ethereum/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"github.com/ethereum/eth-go/ethlog"
+	"github.com/ethereum/eth-go/ethutil"
 	"github.com/ethereum/go-ethereum/utils"
 	"runtime"
 )
@@ -20,7 +21,15 @@ func main() {
 
 	// precedence: code-internal flag default < config file < environment variables < command line
 	Init() // parsing command line
+
+	// If the difftool option is selected ignore all other log output
+	if DiffTool {
+		LogLevel = 0
+	}
+
 	utils.InitConfig(ConfigFile, Datadir, "ETH")
+	ethutil.Config.Diff = DiffTool
+	ethutil.Config.DiffType = DiffType
 
 	utils.InitDataDir(Datadir)
 
diff --git a/ethereum/repl/javascript_runtime.go b/ethereum/repl/javascript_runtime.go
@@ -1,4 +1,4 @@
-package main
+package ethrepl
 
 import (
 	"fmt"
diff --git a/ethereum/repl/js_lib.go b/ethereum/repl/js_lib.go
@@ -1,4 +1,4 @@
-package main
+package ethrepl
 
 const jsLib = `
 function pp(object) {
diff --git a/ethereum/repl/repl.go b/ethereum/repl/repl.go
@@ -0,0 +1,83 @@
+package ethrepl
+
+import (
+	"bufio"
+	"fmt"
+	"github.com/ethereum/eth-go"
+	"github.com/ethereum/eth-go/ethlog"
+	"github.com/ethereum/eth-go/ethutil"
+	"io"
+	"os"
+	"path"
+)
+
+var logger = ethlog.NewLogger("REPL")
+
+type Repl interface {
+	Start()
+	Stop()
+}
+
+type JSRepl struct {
+	re *JSRE
+
+	prompt string
+
+	history *os.File
+
+	running bool
+}
+
+func NewJSRepl(ethereum *eth.Ethereum) *JSRepl {
+	hist, err := os.OpenFile(path.Join(ethutil.Config.ExecPath, "history"), os.O_RDWR|os.O_CREATE, os.ModePerm)
+	if err != nil {
+		panic(err)
+	}
+
+	return &JSRepl{re: NewJSRE(ethereum), prompt: "> ", history: hist}
+}
+
+func (self *JSRepl) Start() {
+	if !self.running {
+		self.running = true
+		logger.Infoln("init JS Console")
+		reader := bufio.NewReader(self.history)
+		for {
+			line, err := reader.ReadString('\n')
+			if err != nil && err == io.EOF {
+				break
+			} else if err != nil {
+				fmt.Println("error reading history", err)
+				break
+			}
+
+			addHistory(line[:len(line)-1])
+		}
+		self.read()
+	}
+}
+
+func (self *JSRepl) Stop() {
+	if self.running {
+		self.running = false
+		self.re.Stop()
+		logger.Infoln("exit JS Console")
+		self.history.Close()
+	}
+}
+
+func (self *JSRepl) parseInput(code string) {
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Println("[native] error", r)
+		}
+	}()
+
+	value, err := self.re.Run(code)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	self.PrintValue(value)
+}
diff --git a/ethereum/repl/repl_darwin.go b/ethereum/repl/repl_darwin.go
@@ -1,4 +1,4 @@
-package main
+package ethrepl
 
 // #cgo darwin CFLAGS: -I/usr/local/opt/readline/include
 // #cgo darwin LDFLAGS: -L/usr/local/opt/readline/lib
diff --git a/ethereum/repl/repl_linux.go b/ethereum/repl/repl_linux.go
diff --git a/ethereum/repl/repl_windows.go b/ethereum/repl/repl_windows.go
@@ -1,4 +1,4 @@
-package main
+package ethrepl
 
 import (
 	"bufio"
diff --git a/ethereum/repl/types.go b/ethereum/repl/types.go
diff --git a/utils/cmd.go b/utils/cmd.go

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ ApplicationWindow {`
`19`	`19`	`property alias dataText: rawDataField.text`
`20`	`20`
`21`	`21`	`onClosing: {`
`22`		`- compileTimer.stop()`
	`22`	`+ //compileTimer.stop()`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`MenuBar {`
`@@ -86,7 +86,7 @@ ApplicationWindow {`
`86`	`86`	`TableView {`
`87`	`87`	`id: asmTableView`
`88`	`88`	`width: 200`
`89`		`- TableViewColumn{ role: "value" ; title: "" ; width: 200 }`
	`89`	`+ TableViewColumn{ role: "value" ; title: "" ; width: asmTableView.width - 2 }`
`90`	`90`	`model: asmModel`
`91`	`91`	`}`
`92`	`92`
`@@ -112,13 +112,15 @@ ApplicationWindow {`
`112`	`112`	`anchors.right: settings.left`
`113`	`113`	`focus: true`
`114`	`114`
	`115`	`+ /*`
`115`	`116`	`Timer {`
`116`	`117`	`id: compileTimer`
`117`	`118`	`interval: 500 ; running: true ; repeat: true`
`118`	`119`	`onTriggered: {`
`119`		`- dbg.compile(codeEditor.text)`
	`120`	`+ dbg.autoComp(codeEditor.text)`
`120`	`121`	`}`
`121`	`122`	`}`
	`123`	`+ */`
`122`	`124`	`}`
`123`	`125`
`124`	`126`	`Column {`
Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,7 @@ ApplicationWindow {`
`191`	`191`	`inspector.visible = false`
`192`	`192`	`}else{`
`193`	`193`	`inspector.visible = true`
	`194`	`+ inspector.url = webview.experimental.remoteInspectorUrl`
`194`	`195`	`}`
`195`	`196`	`}`
`196`	`197`	`onDoubleClicked: {`
`@@ -224,7 +225,6 @@ ApplicationWindow {`
`224`	`225`	`WebView {`
`225`	`226`	`id: inspector`
`226`	`227`	`visible: false`
`227`		`- url: webview.experimental.remoteInspectorUrl`
`228`	`228`	`anchors {`
`229`	`229`	`left: root.left`
`230`	`230`	`right: root.right`
`@@ -238,7 +238,6 @@ ApplicationWindow {`
`238`	`238`	`name: "inspectorShown"`
`239`	`239`	`PropertyChanges {`
`240`	`240`	`target: inspector`
`241`		`- url: webview.experimental.remoteInspectorUrl`
`242`	`241`	`}`
`243`	`242`	`}`
`244`	`243`	`]`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,13 @@ func (self *DebuggerWindow) Compile(code string) {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
	`77`	`+// Used by QML`
	`78`	`+func (self *DebuggerWindow) AutoComp(code string) {`
	`79`	`+ if self.Db.done {`
	`80`	`+ self.Compile(code)`
	`81`	`+ }`
	`82`	`+}`
	`83`	`+`
`77`	`84`	`func (self *DebuggerWindow) ClearLog() {`
`78`	`85`	`self.win.Root().Call("clearLog")`
`79`	`86`	`}`
`@@ -110,8 +117,6 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data`
`110`	`117`	`return`
`111`	`118`	`}`
`112`	`119`
`113`		`- self.SetAsm(script)`
`114`		`-`
`115`	`120`	`var (`
`116`	`121`	`gas = ethutil.Big(gasStr)`
`117`	`122`	`gasPrice = ethutil.Big(gasPriceStr)`
`@@ -257,6 +262,10 @@ func (self Debugger) StepHook(pc int, op ethchain.OpCode, mem ethchain.Memory,`
`257`	`262`	`return self.halting(pc, op, mem, stack, stateObject)`
`258`	`263`	`}`
`259`	`264`
	`265`	`+func (self *Debugger) SetCode(byteCode []byte) {`
	`266`	`+ self.main.SetAsm(byteCode)`
	`267`	`+}`
	`268`	`+`
`260`	`269`	`func (self *Debugger) BreakPoints() []int64 {`
`261`	`270`	`return self.breakPoints`
`262`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ var LogLevel int`
`36`	`36`	`// flags specific to gui client`
`37`	`37`	`var AssetPath string`
`38`	`38`
	`39`	`+//TODO: If we re-use the one defined in cmd.go the binary osx image crashes. If somebody finds out why we can dry this up.`
`39`	`40`	`func defaultAssetPath() string {`
`40`	`41`	`var assetPath string`
`41`	`42`	`// If the current working directory is the go-ethereum dir`
`@@ -60,7 +61,6 @@ func defaultAssetPath() string {`
`60`	`61`	`}`
`61`	`62`	`return assetPath`
`62`	`63`	`}`
`63`		`-`
`64`	`64`	`func defaultDataDir() string {`
`65`	`65`	`usr, _ := user.Current()`
`66`	`66`	`return path.Join(usr.HomeDir, ".ethereal")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package main`
	`1`	`+package ethrepl`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`