Merge branch 'release/0.5.13'

The config file is actually loaded from the folder that datadir points at

README.md

@@ -5,7 +5,7 @@ Ethereum
 
 Ethereum Go Client © 2014 Jeffrey Wilcke.
 
-Current state: Proof of Concept 5.0 RC10.
+Current state: Proof of Concept 5.0 RC13.
 
 For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).
 
@@ -27,20 +27,22 @@ General command line options
 
 ```
 Shared between ethereum and ethereal
--m       Start mining blocks
--genaddr Generates a new address and private key (destructive action)
--p       Port on which the server will accept incomming connections
+-id      Set the custom identifier of the client (shows up on other clients)
+-port    Port on which the server will accept incomming connections
 -upnp    Enable UPnP
--x       Desired amount of peers
--r       Start JSON RPC
+-maxpeer Desired amount of peers
+-rpc     Start JSON RPC
+
 -dir     Data directory used to store configs and databases
 -import  Import a private key
+-genaddr Generates a new address and private key (destructive action)
 -h       This
 
 Ethereum only
 ethereum [options] [filename]
 -js        Start the JavaScript REPL
 filename   Load the given file and interpret as JavaScript
+-m       Start mining blocks
 
 Etheral only
 -asset_path    absolute path to GUI assets directory

ethereal/assets/debugger/debugger.qml

@@ -7,12 +7,15 @@ import QtQuick.Controls.Styles 1.1
 import Ethereum 1.0
 
 ApplicationWindow {
-    visible: false
-    title: "IceCream"
-    minimumWidth: 1280
-    minimumHeight: 900
-    width: 1290
-    height: 900
+	visible: false
+	title: "IceCREAM"
+	minimumWidth: 1280
+	minimumHeight: 900
+	width: 1290
+	height: 900
+
+	property alias codeText: codeEditor.text
+	property alias dataText: rawDataField.text
 
 	MenuBar {
 		Menu {
@@ -29,208 +32,233 @@ ApplicationWindow {
 				onTriggered: dbg.next()
 			}
 		}
-    }
+	}
 
-    SplitView {
-        anchors.fill: parent
-        property var asmModel: ListModel {
-            id: asmModel
-        }
-        TableView {
-            id: asmTableView
-            width: 200
-            TableViewColumn{ role: "value" ; title: "" ; width: 100 }
-            model: asmModel
-        }
+	SplitView {
+		anchors.fill: parent
+		property var asmModel: ListModel {
+			id: asmModel
+		}
+		TableView {
+			id: asmTableView
+			width: 200
+			TableViewColumn{ role: "value" ; title: "" ; width: 100 }
+			model: asmModel
+		}
 
-        Rectangle {
-            color: "#00000000"
-            anchors.left: asmTableView.right
-            anchors.right: parent.right
-            SplitView {
-                orientation: Qt.Vertical
-                anchors.fill: parent
+		Rectangle {
+			color: "#00000000"
+			anchors.left: asmTableView.right
+			anchors.right: parent.right
+			SplitView {
+				orientation: Qt.Vertical
+				anchors.fill: parent
 
-                Rectangle {
-                    color: "#00000000"
-                    height: 500
-                    anchors.left: parent.left
-                    anchors.right: parent.right
+				Rectangle {
+					color: "#00000000"
+					height: 500
+					anchors.left: parent.left
+					anchors.right: parent.right
 
-                    TextArea {
-                        id: codeEditor
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-                        anchors.left: parent.left
-                        anchors.right: settings.left
-                    }
+					TextArea {
+						id: codeEditor
+						anchors.top: parent.top
+						anchors.bottom: parent.bottom
+						anchors.left: parent.left
+						anchors.right: settings.left
+					}
 
-                    Column {
-                        id: settings
-                        spacing: 5
-                        width: 300
-                        height: parent.height
-                        anchors.right: parent.right
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
+					Column {
+						id: settings
+						spacing: 5
+						width: 300
+						height: parent.height
+						anchors.right: parent.right
+						anchors.top: parent.top
+						anchors.bottom: parent.bottom
 
-                        Label {
-                            text: "Arbitrary data"
-                        }
-                        TextArea {
-                            id: rawDataField
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-                            height: 150
-                        }
+						Label {
+							text: "Arbitrary data"
+						}
+						TextArea {
+							id: rawDataField
+							anchors.left: parent.left
+							anchors.right: parent.right
+							height: 150
+						}
 
-                        Label {
-                            text: "Amount"
-                        }
-                        TextField {
-                            id: txValue
-                            width: 200
-                            placeholderText: "Amount"
-                            validator: RegExpValidator { regExp: /\d*/ }
-                        }
-                        Label {
-                            text: "Amount of gas"
-                        }
-                        TextField {
-                            id: txGas
-                            width: 200
-                            validator: RegExpValidator { regExp: /\d*/ }
-                            text: "10000"
-                            placeholderText: "Gas"
-                        }
-                        Label {
-                            text: "Gas price"
-                        }
-                        TextField {
-                            id: txGasPrice
-                            width: 200
-                            placeholderText: "Gas price"
-                            text: "1000000000000"
-                            validator: RegExpValidator { regExp: /\d*/ }
-                        }
-                    }
-                }
+						Label {
+							text: "Amount"
+						}
+						TextField {
+							id: txValue
+							width: 200
+							placeholderText: "Amount"
+							validator: RegExpValidator { regExp: /\d*/ }
+						}
+						Label {
+							text: "Amount of gas"
+						}
+						TextField {
+							id: txGas
+							width: 200
+							validator: RegExpValidator { regExp: /\d*/ }
+							text: "10000"
+							placeholderText: "Gas"
+						}
+						Label {
+							text: "Gas price"
+						}
+						TextField {
+							id: txGasPrice
+							width: 200
+							placeholderText: "Gas price"
+							text: "1000000000000"
+							validator: RegExpValidator { regExp: /\d*/ }
+						}
+					}
+				}
 
-                SplitView {
-                    orientation: Qt.Vertical
-                    id: inspectorPane
-                    height: 500
+				SplitView {
+					orientation: Qt.Vertical
+					id: inspectorPane
+					height: 500
 
-                    SplitView {
-                        orientation: Qt.Horizontal
-                        height: 250
+					SplitView {
+						orientation: Qt.Horizontal
+						height: 150
 
-                        TableView {
-                            id: stackTableView
-                            property var stackModel: ListModel {
-                                id: stackModel
-                            }
-                            height: parent.height
-                            width: 300
-                            TableViewColumn{ role: "value" ; title: "Stack" ; width: 200 }
-                            model: stackModel
-                        }
+						TableView {
+							id: stackTableView
+							property var stackModel: ListModel {
+								id: stackModel
+							}
+							height: parent.height
+							width: 300
+							TableViewColumn{ role: "value" ; title: "Temp" ; width: 200 }
+							model: stackModel
+						}
 
-                        TableView {
-                            id: memoryTableView
-                            property var memModel: ListModel {
-                                id: memModel
-                            }
-                            height: parent.height
-                            width: parent.width - stackTableView.width
-                            TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50}
-                            TableViewColumn{ role: "value" ; title: "Memory" ; width: 750}
-                            model: memModel
-                        }
-                    }
+						TableView {
+							id: memoryTableView
+							property var memModel: ListModel {
+								id: memModel
+							}
+							height: parent.height
+							width: parent.width - stackTableView.width
+							TableViewColumn{ id:mnumColmn ; role: "num" ; title: "#" ; width: 50}
+							TableViewColumn{ role: "value" ; title: "Memory" ; width: 750}
+							model: memModel
+						}
+					}
 
-                    SplitView {
-                        height: 300
-                        TableView {
-                            id: storageTableView
-                            property var memModel: ListModel {
-                                id: storageModel
-                            }
-                            height: parent.height
-                            width: parent.width - stackTableView.width
-                            TableViewColumn{ id: key ; role: "key" ; title: "#" ; width: storageTableView.width / 2}
-                            TableViewColumn{ role: "value" ; title: "value" ; width:  storageTableView.width / 2}
-                            model: storageModel
-                        }
-                    }
-                }
-            }
-        }
-    }
-    toolBar: ToolBar {
-        RowLayout {
-            spacing: 5
+					Rectangle {
+						height: 100
+						width: parent.width
+						TableView {
+							id: storageTableView
+							property var memModel: ListModel {
+								id: storageModel
+							}
+							height: parent.height
+							width: parent.width
+							TableViewColumn{ id: key ; role: "key" ; title: "#" ; width: storageTableView.width / 2}
+							TableViewColumn{ role: "value" ; title: "Storage" ; width:  storageTableView.width / 2}
+							model: storageModel
+						}
+					}
 
-            Button {
-                property var enabled: true
-                id: debugStart
-                onClicked: {
-                    debugCurrent()
-                }
-                text: "Debug"
-            }
+					Rectangle {
+						height: 200
+						width: parent.width
+						TableView {
+							id: logTableView
+							property var logModel: ListModel {
+								id: logModel
+							}
+							height: parent.height
+							width: parent.width
+							TableViewColumn{ id: message ; role: "message" ; title: "log" ; width: logTableView.width }
+							model: logModel
+						}
+					}
+				}
+			}
+		}
+	}
 
-            Button {
-                property var enabled: true
-                id: debugNextButton
-                onClicked: {
-                    dbg.next()
-                }
-                text: "Next"
-            }
-        }
-    }
+	toolBar: ToolBar {
+		RowLayout {
+			spacing: 5
 
-    function debugCurrent() {
-        dbg.debug(txValue.text, txGas.text, txGasPrice.text, codeEditor.text, rawDataField.text)
-    }
+			Button {
+				property var enabled: true
+				id: debugStart
+				onClicked: {
+					debugCurrent()
+				}
+				text: "Debug"
+			}
 
-    function setAsm(asm) {
-        asmModel.append({asm: asm})
-    }
+			Button {
+				property var enabled: true
+				id: debugNextButton
+				onClicked: {
+					dbg.next()
+				}
+				text: "Next"
+			}
+		}
+	}
 
-    function clearAsm() {
-        asmModel.clear()
-    }
+	function debugCurrent() {
+		dbg.debug(txValue.text, txGas.text, txGasPrice.text, codeEditor.text, rawDataField.text)
+	}
 
-    function setInstruction(num) {
-        asmTableView.selection.clear()
-        asmTableView.selection.select(num-1)
-    }
+	function setAsm(asm) {
+		asmModel.append({asm: asm})
+	}
 
-    function setMem(mem) {
-        memModel.append({num: mem.num, value: mem.value})
-    }
-    function clearMem(){
-        memModel.clear()
-    }
+	function clearAsm() {
+		asmModel.clear()
+	}
 
-    function setStack(stack) {
-        stackModel.append({value: stack})
-    }
-    function addDebugMessage(message){
-        debuggerLog.append({value: message})
-    }
+	function setInstruction(num) {
+		asmTableView.selection.clear()
+		asmTableView.selection.select(num)
+	}
 
-    function clearStack() {
-        stackModel.clear()
-    }
+	function setMem(mem) {
+		memModel.append({num: mem.num, value: mem.value})
+	}
+	function clearMem(){
+		memModel.clear()
+	}
 
-    function clearStorage() {
-        storageModel.clear()
-    }
+	function setStack(stack) {
+		stackModel.append({value: stack})
+	}
+	function addDebugMessage(message){
+		debuggerLog.append({value: message})
+	}
 
-    function setStorage(storage) {
-        storageModel.append({key: storage.key, value: storage.value})
-    }
+	function clearStack() {
+		stackModel.clear()
+	}
+
+	function clearStorage() {
+		storageModel.clear()
+	}
+
+	function setStorage(storage) {
+		storageModel.append({key: storage.key, value: storage.value})
+	}
+
+	function setLog(msg) {
+		logModel.insert(0, {message: msg})
+	}
+
+	function clearLog() {
+		logModel.clear()
+	}
 }

ethereal/assets/ext/ethereum.js

@@ -32,6 +32,10 @@ window.eth = {
 		postData({call: "getStorage", args: [address, storageAddress]}, cb);
 	},
 
+	getStateKeyVals: function(address, cb){
+		postData({call: "getStateKeyVals", args: [address]}, cb);
+	},
+
 	getKey: function(cb) {
 		postData({call: "getKey"}, cb);
 	},

ethereal/assets/qml/webapp.qml

@@ -34,7 +34,6 @@ ApplicationWindow {
 				 top: parent.top
 			 }
 			 */
-
 			onTitleChanged: { window.title = title }
 			experimental.preferences.javascriptEnabled: true
 			experimental.preferences.navigatorQtObjectEnabled: true
@@ -97,6 +96,12 @@ ApplicationWindow {
 						var storage = stateObject.getStorage(data.args[1])
 						postData(data._seed, storage)
 
+						break
+					case "getStateKeyVals":
+					      require(1);
+					      var stateObject = eth.getStateObject(data.args[0]).stateKeyVal(true)
+					      postData(data._seed,stateObject)
+
 						break
 					case "getBalance":
 						require(1);
@@ -165,6 +170,30 @@ ApplicationWindow {
 				postEvent(ev, [storageObject.address, storageObject.value])
 			}
 		}
+		Rectangle {
+			id: toggleInspector
+			color: "#bcbcbc"
+			visible: true
+			height: 12
+			width: 12
+			anchors {
+				right: root.right
+			}
+			MouseArea {
+				onClicked: {
+					if(inspector.visible == true){
+						inspector.visible = false
+					}else{
+						inspector.visible = true
+					}
+				}
+				onDoubleClicked: {
+				  console.log('refreshing')
+				  webView.reload()
+				}
+				anchors.fill: parent
+			}
+		}
 
 		Rectangle {
 			id: sizeGrip

ethereal/assets/samplecoin/samplecoin.html

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

ethereal/config.go

@@ -5,8 +5,8 @@ import (
 )
 
 var Identifier string
-var StartConsole bool
-var StartMining bool
+
+//var StartMining bool
 var StartRpc bool
 var RpcPort int
 var UseUPnP bool
@@ -18,25 +18,26 @@ var GenAddr bool
 var UseSeed bool
 var ImportKey string
 var ExportKey bool
-var DataDir string
 var AssetPath string
 
+var Datadir string
+
 func Init() {
-	flag.StringVar(&Identifier, "i", "", "Custom client identifier")
-	flag.BoolVar(&StartConsole, "c", false, "debug and testing console")
-	flag.BoolVar(&StartMining, "m", false, "start dagger mining")
-	flag.BoolVar(&StartRpc, "r", false, "start rpc server")
-	flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits")
+	flag.StringVar(&Identifier, "id", "", "Custom client identifier")
+	flag.StringVar(&OutboundPort, "port", "30303", "listening port")
 	flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support")
+	flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers")
+	flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
+	flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
+	flag.StringVar(&AssetPath, "asset_path", "", "absolute path to GUI assets directory")
+
+	flag.BoolVar(&ShowGenesis, "genesis", false, "prints genesis header and exits")
 	flag.BoolVar(&UseSeed, "seed", true, "seed peers")
 	flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
 	flag.BoolVar(&ExportKey, "export", false, "export private key")
-	flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
-	flag.StringVar(&OutboundPort, "p", "30303", "listening port")
-	flag.StringVar(&DataDir, "dir", ".ethereal", "ethereum data directory")
 	flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)")
-	flag.IntVar(&MaxPeer, "x", 10, "maximum desired peers")
-	flag.StringVar(&AssetPath, "asset_path", "", "absolute path to GUI assets directory")
+
+	flag.StringVar(&Datadir, "datadir", ".ethereal", "specifies the datadir to use. Takes precedence over config file.")
 
 	flag.Parse()
 }

ethereal/ethereum.go

@@ -3,14 +3,15 @@ package main
 import (
 	"fmt"
 	"github.com/ethereum/eth-go"
-	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/ethereum/go-ethereum/ethereal/ui"
 	"github.com/ethereum/go-ethereum/utils"
 	"github.com/go-qml/qml"
+	"github.com/rakyll/globalconf"
 	"log"
 	"os"
 	"os/signal"
+	"path"
 	"runtime"
 )
 
@@ -38,8 +39,15 @@ func main() {
 
 	runtime.GOMAXPROCS(runtime.NumCPU())
 
-	ethchain.InitFees()
-	ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd, Identifier)
+	g, err := globalconf.NewWithOptions(&globalconf.Options{
+		Filename: path.Join(ethutil.ApplicationFolder(Datadir), "conf.ini"),
+	})
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		g.ParseAll()
+	}
+	ethutil.ReadConfig(Datadir, ethutil.LogFile|ethutil.LogStd, g, Identifier)
 
 	// Instantiated a eth stack
 	ethereum, err := eth.New(eth.CapDefault, UseUPnP)
@@ -108,9 +116,11 @@ save these words so you can restore your account later: %s
 		os.Exit(0)
 	}
 
-	if StartMining {
-		utils.DoMining(ethereum)
-	}
+	/*
+		if StartMining {
+			utils.DoMining(ethereum)
+		}
+	*/
 
 	if StartRpc {
 		utils.DoRpc(ethereum, RpcPort)

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}
+	db := &Debugger{win, make(chan bool), make(chan bool), true, false}
 
 	return &DebuggerWindow{engine: engine, win: win, lib: lib, Db: db}
 }
@@ -41,21 +41,18 @@ func (self *DebuggerWindow) Show() {
 	}()
 }
 
-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)
-	}
+func (self *DebuggerWindow) SetCode(code string) {
+	self.win.Set("codeText", code)
+}
 
-	return ethutil.BigToBytes(d, 256)
+func (self *DebuggerWindow) SetData(data string) {
+	self.win.Set("dataText", data)
+}
+func (self *DebuggerWindow) SetAsm(data string) {
+	dis := ethchain.Disassemble(ethutil.FromHex(data))
+	for _, str := range dis {
+		self.win.Root().Call("setAsm", str)
+	}
 }
 
 func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, dataStr string) {
@@ -63,42 +60,53 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
 		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() {
 		if r := recover(); r != nil {
-			fmt.Println(r)
+			self.Logf("compile FAULT: %v", r)
 		}
 	}()
 
-	script, err := ethutil.Compile(scriptStr)
+	data := ethutil.StringToByteFunc(dataStr, func(s string) (ret []byte) {
+		slice := strings.Split(dataStr, "\n")
+		for _, dataItem := range slice {
+			d := ethutil.FormatData(dataItem)
+			ret = append(ret, d...)
+		}
+		return
+	})
+
+	var err error
+	script := ethutil.StringToByteFunc(scriptStr, func(s string) (ret []byte) {
+		ret, err = ethutil.Compile(s)
+		fmt.Printf("%x\n", ret)
+		return
+	})
+
 	if err != nil {
-		ethutil.Config.Log.Debugln(err)
+		self.Logln(err)
 
 		return
 	}
 
 	dis := ethchain.Disassemble(script)
 	self.win.Root().Call("clearAsm")
+	self.win.Root().Call("clearLog")
 
 	for _, str := range dis {
 		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), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), script)
+	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)
-	callerClosure := ethchain.NewClosure(account, contract, script, state, ethutil.Big(gasStr), ethutil.Big(gasPriceStr))
+	callerClosure := ethchain.NewClosure(account, contract, script, state, gas, gasPrice)
 
 	block := self.lib.eth.BlockChain().CurrentBlock
 	vm := ethchain.NewVm(state, self.lib.eth.StateManager(), ethchain.RuntimeVars{
@@ -108,27 +116,53 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
 		Coinbase:    block.Coinbase,
 		Time:        block.Time,
 		Diff:        block.Difficulty,
+		Value:       ethutil.Big(valueStr),
 	})
 
 	self.Db.done = false
+	self.Logf("callsize %d", len(script))
 	go func() {
-		callerClosure.Call(vm, data, self.Db.halting)
+		ret, g, err := callerClosure.Call(vm, data, self.Db.halting)
+		tot := new(big.Int).Mul(g, gasPrice)
+		self.Logf("gas usage %v total price = %v (%v)", g, tot, ethutil.CurrencyToString(tot))
+		if err != nil {
+			self.Logln("exited with errors:", err)
+		} else {
+			if len(ret) > 0 {
+				self.Logf("exited: % x", ret)
+			} else {
+				self.Logf("exited: nil")
+			}
+		}
 
 		state.Reset()
 
-		self.Db.done = true
+		if !self.Db.interrupt {
+			self.Db.done = true
+		} else {
+			self.Db.interrupt = false
+		}
 	}()
 }
 
+func (self *DebuggerWindow) Logf(format string, v ...interface{}) {
+	self.win.Root().Call("setLog", fmt.Sprintf(format, v...))
+}
+
+func (self *DebuggerWindow) Logln(v ...interface{}) {
+	str := fmt.Sprintln(v...)
+	self.Logf("%s", str[:len(str)-1])
+}
+
 func (self *DebuggerWindow) Next() {
 	self.Db.Next()
 }
 
 type Debugger struct {
-	win  *qml.Window
-	N    chan bool
-	Q    chan bool
-	done bool
+	win             *qml.Window
+	N               chan bool
+	Q               chan bool
+	done, interrupt bool
 }
 
 type storeVal struct {
@@ -161,7 +195,8 @@ out:
 		case <-d.N:
 			break out
 		case <-d.Q:
-			d.done = true
+			d.interrupt = true
+			d.clearBuffers()
 
 			return false
 		}
@@ -170,6 +205,19 @@ out:
 	return true
 }
 
+func (d *Debugger) clearBuffers() {
+out:
+	// drain
+	for {
+		select {
+		case <-d.N:
+		case <-d.Q:
+		default:
+			break out
+		}
+	}
+}
+
 func (d *Debugger) Next() {
 	if !d.done {
 		d.N <- true

ethereal/ui/gui.go

@@ -8,9 +8,11 @@ import (
 	"github.com/ethereum/eth-go/ethdb"
 	"github.com/ethereum/eth-go/ethpub"
 	"github.com/ethereum/eth-go/ethutil"
+	"github.com/ethereum/go-ethereum/utils"
 	"github.com/go-qml/qml"
 	"math/big"
 	"strings"
+	"time"
 )
 
 type Gui struct {
@@ -54,7 +56,7 @@ func New(ethereum *eth.Ethereum) *Gui {
 }
 
 func (gui *Gui) Start(assetPath string) {
-	const version = "0.5.0 RC10"
+	const version = "0.5.0 RC13"
 
 	defer gui.txDb.Close()
 
@@ -63,10 +65,12 @@ func (gui *Gui) Start(assetPath string) {
 		Init: func(p *ethpub.PBlock, obj qml.Object) { p.Number = 0; p.Hash = "" },
 	}, {
 		Init: func(p *ethpub.PTx, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" },
+	}, {
+		Init: func(p *ethpub.KeyVal, obj qml.Object) { p.Key = ""; p.Value = "" },
 	}})
 
-	ethutil.Config.SetClientString(fmt.Sprintf("/Ethereal v%s", version))
-	ethutil.Config.Log.Infoln("[GUI] Starting GUI")
+	ethutil.Config.SetClientString("Ethereal")
+
 	// Create a new QML engine
 	gui.engine = qml.NewEngine()
 	context := gui.engine.Context()
@@ -86,19 +90,36 @@ func (gui *Gui) Start(assetPath string) {
 		win, err = gui.showKeyImport(context)
 	} else {
 		win, err = gui.showWallet(context)
+
+		ethutil.Config.Log.AddLogSystem(gui)
 	}
 	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'")
+		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)
 
 		panic(err)
 	}
 
+	ethutil.Config.Log.Infoln("[GUI] Starting GUI")
+
 	win.Show()
 	win.Wait()
 
 	gui.eth.Stop()
 }
 
+func (gui *Gui) ToggleMining() {
+	var txt string
+	if gui.eth.Mining {
+		utils.StopMining(gui.eth)
+		txt = "Start mining"
+	} else {
+		utils.StartMining(gui.eth)
+		txt = "Stop mining"
+	}
+
+	gui.win.Root().Set("miningButtonText", txt)
+}
+
 func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) {
 	component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/wallet.qml"))
 	if err != nil {
@@ -107,8 +128,11 @@ func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) {
 
 	win := gui.createWindow(component)
 
-	go gui.setInitialBlockChain()
-	go gui.readPreviousTransactions()
+	gui.setInitialBlockChain()
+	gui.loadAddressBook()
+	gui.readPreviousTransactions()
+	gui.setPeerInfo()
+
 	go gui.update()
 
 	return win, nil
@@ -130,7 +154,7 @@ 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}
+	db := &Debugger{gui.win, make(chan bool), make(chan bool), true, false}
 	gui.lib.Db = db
 	gui.uiLib.Db = db
 
@@ -141,10 +165,37 @@ func (gui *Gui) setInitialBlockChain() {
 	blk := gui.eth.BlockChain().GetBlock(sBlk)
 	for ; blk != nil; blk = gui.eth.BlockChain().GetBlock(sBlk) {
 		sBlk = blk.PrevHash
+
+		// Loop through all transactions to see if we missed any while being offline
+		for _, tx := range blk.Transactions() {
+			if bytes.Compare(tx.Sender(), gui.addr) == 0 || bytes.Compare(tx.Recipient, gui.addr) == 0 {
+				if ok, _ := gui.txDb.Get(tx.Hash()); ok == nil {
+					gui.txDb.Put(tx.Hash(), tx.RlpEncode())
+				}
+
+			}
+		}
+
 		gui.processBlock(blk, true)
 	}
 }
 
+type address struct {
+	Name, Address string
+}
+
+var namereg = ethutil.FromHex("bb5f186604d057c1c5240ca2ae0f6430138ac010")
+
+func (gui *Gui) loadAddressBook() {
+	gui.win.Root().Call("clearAddress")
+	stateObject := gui.eth.StateManager().CurrentState().GetStateObject(namereg)
+	if stateObject != nil {
+		stateObject.State().EachStorage(func(name string, value *ethutil.Value) {
+			gui.win.Root().Call("addAddress", struct{ Name, Address string }{name, ethutil.Hex(value.Bytes())})
+		})
+	}
+}
+
 func (gui *Gui) readPreviousTransactions() {
 	it := gui.txDb.Db().NewIterator(nil, nil)
 	for it.Next() {
@@ -189,10 +240,16 @@ func (gui *Gui) update() {
 
 	blockChan := make(chan ethutil.React, 1)
 	txChan := make(chan ethutil.React, 1)
+	objectChan := make(chan ethutil.React, 1)
+	peerChan := make(chan ethutil.React, 1)
 
 	reactor.Subscribe("newBlock", blockChan)
 	reactor.Subscribe("newTx:pre", txChan)
 	reactor.Subscribe("newTx:post", txChan)
+	reactor.Subscribe("object:"+string(namereg), objectChan)
+	reactor.Subscribe("peerList", peerChan)
+
+	ticker := time.NewTicker(5 * time.Second)
 
 	state := gui.eth.StateManager().TransState()
 
@@ -239,10 +296,25 @@ func (gui *Gui) update() {
 
 				state.UpdateStateObject(object)
 			}
+		case <-objectChan:
+			gui.loadAddressBook()
+		case <-peerChan:
+			gui.setPeerInfo()
+		case <-ticker.C:
+			gui.setPeerInfo()
 		}
 	}
 }
 
+func (gui *Gui) setPeerInfo() {
+	gui.win.Root().Call("setPeers", fmt.Sprintf("%d / %d", gui.eth.PeerCount(), gui.eth.MaxPeers))
+
+	gui.win.Root().Call("resetPeers")
+	for _, peer := range gui.pub.GetPeers() {
+		gui.win.Root().Call("addPeer", peer)
+	}
+}
+
 // Logging functions that log directly to the GUI interface
 func (gui *Gui) Println(v ...interface{}) {
 	str := strings.TrimRight(fmt.Sprintln(v...), "\n")
@@ -259,6 +331,11 @@ func (gui *Gui) Printf(format string, v ...interface{}) {
 		gui.win.Root().Call("addLog", line)
 	}
 }
+func (gui *Gui) RegisterName(name string) {
+	keyPair := ethutil.GetKeyRing().Get(0)
+	name = fmt.Sprintf("\"%s\"\n1", name)
+	gui.pub.Transact(ethutil.Hex(keyPair.PrivateKey), "namereg", "1000", "1000000", "150", name)
+}
 
 func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {
 	keyPair := ethutil.GetKeyRing().Get(0)
@@ -269,5 +346,17 @@ func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub.
 func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {
 	keyPair := ethutil.GetKeyRing().Get(0)
 
-	return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, data)
+	return gui.pub.Transact(ethutil.Hex(keyPair.PrivateKey), recipient, value, gas, gasPrice, data)
+}
+
+func (gui *Gui) ChangeClientId(id string) {
+	ethutil.Config.SetIdentifier(id)
+}
+
+func (gui *Gui) ClientId() string {
+	return ethutil.Config.Identifier
+}
+
+func (gui *Gui) SetLogLevel(level int) {
+	ethutil.Config.Log.SetLevel(level)
 }

ethereal/ui/ui_lib.go

@@ -24,8 +24,9 @@ type UiLib struct {
 	connected bool
 	assetPath string
 	// The main application window
-	win *qml.Window
-	Db  *Debugger
+	win      *qml.Window
+	Db       *Debugger
+	DbWindow *DebuggerWindow
 }
 
 func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib {
@@ -88,9 +89,26 @@ 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))
+	if len(object.Script()) > 0 {
+		dbWindow.SetCode("0x" + ethutil.Hex(object.Script()))
+	}
+	dbWindow.SetData("0x" + data)
+
+	dbWindow.Show()
+}
+
+func (self *UiLib) StartDbWithCode(code string) {
+	dbWindow := NewDebuggerWindow(self)
+	dbWindow.SetCode("0x" + code)
+	dbWindow.Show()
+}
 
 func (self *UiLib) StartDebugger() {
 	dbWindow := NewDebuggerWindow(self)
+	//self.DbWindow = dbWindow
 
 	dbWindow.Show()
 }

ethereum/config.go

@@ -20,33 +20,35 @@ var UseSeed bool
 var ImportKey string
 var ExportKey bool
 var LogFile string
-var DataDir string
 var NonInteractive bool
 var StartJsConsole bool
 var InputFile string
 
+var Datadir string
+
 func Init() {
 	flag.Usage = func() {
 		fmt.Fprintf(os.Stderr, "%s [options] [filename]:\n", os.Args[0])
 		flag.PrintDefaults()
 	}
 
-	flag.StringVar(&Identifier, "i", "", "custom client identifier")
-	flag.BoolVar(&StartMining, "m", false, "start dagger mining")
-	flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits")
-	flag.BoolVar(&StartRpc, "r", false, "start rpc server")
-	flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
-	flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
+	flag.StringVar(&Identifier, "id", "", "Custom client identifier")
+	flag.StringVar(&OutboundPort, "port", "30303", "listening port")
 	flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support")
+	flag.IntVar(&MaxPeer, "maxpeer", 10, "maximum desired peers")
+	flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
+	flag.BoolVar(&StartRpc, "rpc", false, "start rpc server")
+	flag.BoolVar(&StartJsConsole, "js", false, "exp")
+
+	flag.BoolVar(&StartMining, "mine", false, "start dagger mining")
+	flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
 	flag.BoolVar(&UseSeed, "seed", true, "seed peers")
 	flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
 	flag.BoolVar(&ExportKey, "export", false, "export private key")
-	flag.StringVar(&OutboundPort, "p", "30303", "listening port")
 	flag.StringVar(&LogFile, "logfile", "", "log file (defaults to standard output)")
-	flag.StringVar(&DataDir, "dir", ".ethereum", "ethereum data directory")
 	flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)")
-	flag.IntVar(&MaxPeer, "x", 10, "maximum desired peers")
-	flag.BoolVar(&StartJsConsole, "js", false, "exp")
+
+	flag.StringVar(&Datadir, "datadir", ".ethereum", "specifies the datadir to use. Takes precedence over config file.")
 
 	flag.Parse()
 

ethereum/ethereum.go

@@ -3,13 +3,14 @@ package main
 import (
 	"fmt"
 	"github.com/ethereum/eth-go"
-	"github.com/ethereum/eth-go/ethchain"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/ethereum/go-ethereum/utils"
+	"github.com/rakyll/globalconf"
 	"io/ioutil"
 	"log"
 	"os"
 	"os/signal"
+	"path"
 	"runtime"
 	"strings"
 )
@@ -59,7 +60,15 @@ func main() {
 		lt = ethutil.LogFile | ethutil.LogStd
 	}
 
-	ethutil.ReadConfig(DataDir, lt, Identifier)
+	g, err := globalconf.NewWithOptions(&globalconf.Options{
+		Filename: path.Join(ethutil.ApplicationFolder(Datadir), "conf.ini"),
+	})
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		g.ParseAll()
+	}
+	ethutil.ReadConfig(Datadir, lt, g, Identifier)
 
 	logger := ethutil.Config.Log
 
@@ -76,8 +85,6 @@ func main() {
 		logSys = log.New(os.Stdout, "", flags)
 	}
 
-	ethchain.InitFees()
-
 	// Instantiated a eth stack
 	ethereum, err := eth.New(eth.CapDefault, UseUPnP)
 	if err != nil {

ethereum/javascript_runtime.go

@@ -10,6 +10,7 @@ import (
 	"github.com/obscuren/otto"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 )
 
@@ -25,6 +26,20 @@ type JSRE struct {
 	objectCb map[string][]otto.Value
 }
 
+func (jsre *JSRE) LoadExtFile(path string) {
+	result, err := ioutil.ReadFile(path)
+	if err == nil {
+		jsre.vm.Run(result)
+	} else {
+		ethutil.Config.Log.Debugln("Could not load file:", path)
+	}
+}
+
+func (jsre *JSRE) LoadIntFile(file string) {
+	assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "ethereal", "assets", "ext")
+	jsre.LoadExtFile(path.Join(assetPath, file))
+}
+
 func NewJSRE(ethereum *eth.Ethereum) *JSRE {
 	re := &JSRE{
 		ethereum,
@@ -39,6 +54,10 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE {
 	// Init the JS lib
 	re.vm.Run(jsLib)
 
+	// Load extra javascript files
+	re.LoadIntFile("string.js")
+	re.LoadIntFile("big.js")
+
 	// We have to make sure that, whoever calls this, calls "Stop"
 	go re.mainLoop()
 

ethereum/repl.go

@@ -66,6 +66,10 @@ func (self *JSEthereum) GetBlock(hash string) otto.Value {
 	return self.toVal(&JSBlock{self.PEthereum.GetBlock(hash), self})
 }
 
+func (self *JSEthereum) GetPeers() otto.Value {
+	return self.toVal(self.PEthereum.GetPeers())
+}
+
 func (self *JSEthereum) GetKey() otto.Value {
 	return self.toVal(self.PEthereum.GetKey())
 }
@@ -74,6 +78,10 @@ func (self *JSEthereum) GetStateObject(addr string) otto.Value {
 	return self.toVal(self.PEthereum.GetStateObject(addr))
 }
 
+func (self *JSEthereum) GetStateKeyVals(addr string) otto.Value {
+	return self.toVal(self.PEthereum.GetStateObject(addr).StateKeyVal(false))
+}
+
 func (self *JSEthereum) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value {
 	r, err := self.PEthereum.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
 	if err != nil {
@@ -101,7 +109,7 @@ func (self *JSEthereum) toVal(v interface{}) otto.Value {
 	result, err := self.vm.ToValue(v)
 
 	if err != nil {
-		fmt.Println(err)
+		fmt.Println("Value unknown:", err)
 
 		return otto.UndefinedValue()
 	}

utils/cmd.go

@@ -33,8 +33,6 @@ func DoMining(ethereum *eth.Ethereum) {
 	addr := keyPair.Address()
 
 	go func() {
-		ethutil.Config.Log.Infoln("Miner started")
-
 		miner = ethminer.NewDefaultMiner(addr, ethereum)
 
 		// Give it some time to connect with peers