2026-03-06 13:28:40 +01:00
16 changed files with 1271 additions and 1508 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@ Ethereum

 Ethereum Go Client © 2014 Jeffrey Wilcke.

-Current state: Proof of Concept 5.0 RC12.
+Current state: Proof of Concept 5.0 RC10.

 For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).

@ -27,22 +27,20 @@ General command line options

 ```
 Shared between ethereum and ethereal
-id      Set the custom identifier of the client (shows up on other clients)
-port    Port on which the server will accept incomming connections
+-m       Start mining blocks
+-genaddr Generates a new address and private key (destructive action)
+-p       Port on which the server will accept incomming connections
 -upnp    Enable UPnP
-maxpeer Desired amount of peers
-rpc     Start JSON RPC
-
+-x       Desired amount of peers
+-r       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
--- a/ethereal/assets/debugger/debugger.qml
+++ b/ethereal/assets/debugger/debugger.qml
@ -7,15 +7,12 @@ import QtQuick.Controls.Styles 1.1
 import Ethereum 1.0

 ApplicationWindow {
-	visible: false
-	title: "IceCREAM"
-	minimumWidth: 1280
-	minimumHeight: 900
-	width: 1290
-	height: 900
-
-	property alias codeText: codeEditor.text
-	property alias dataText: rawDataField.text
+    visible: false
+    title: "IceCream"
+    minimumWidth: 1280
+    minimumHeight: 900
+    width: 1290
+    height: 900

 	MenuBar {
 		Menu {
@ -32,233 +29,208 @@ 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: 150
+                    SplitView {
+                        orientation: Qt.Horizontal
+                        height: 250

-						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: "Stack" ; 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
+                        }
+                    }

-					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
-						}
-					}
+                    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: 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: debugStart
+                onClicked: {
+                    debugCurrent()
+                }
+                text: "Debug"
+            }

-	toolBar: ToolBar {
-		RowLayout {
-			spacing: 5
+            Button {
+                property var enabled: true
+                id: debugNextButton
+                onClicked: {
+                    dbg.next()
+                }
+                text: "Next"
+            }
+        }
+    }

-			Button {
-				property var enabled: true
-				id: debugStart
-				onClicked: {
-					debugCurrent()
-				}
-				text: "Debug"
-			}
+    function debugCurrent() {
+        dbg.debug(txValue.text, txGas.text, txGasPrice.text, codeEditor.text, rawDataField.text)
+    }

-			Button {
-				property var enabled: true
-				id: debugNextButton
-				onClicked: {
-					dbg.next()
-				}
-				text: "Next"
-			}
-		}
-	}
+    function setAsm(asm) {
+        asmModel.append({asm: asm})
+    }

-	function debugCurrent() {
-		dbg.debug(txValue.text, txGas.text, txGasPrice.text, codeEditor.text, rawDataField.text)
-	}
+    function clearAsm() {
+        asmModel.clear()
+    }

-	function setAsm(asm) {
-		asmModel.append({asm: asm})
-	}
+    function setInstruction(num) {
+        asmTableView.selection.clear()
+        asmTableView.selection.select(num-1)
+    }

-	function clearAsm() {
-		asmModel.clear()
-	}
+    function setMem(mem) {
+        memModel.append({num: mem.num, value: mem.value})
+    }
+    function clearMem(){
+        memModel.clear()
+    }

-	function setInstruction(num) {
-		//asmTableView.selection.clear()
-		//asmTableView.selection.select(num)
-	}
+    function setStack(stack) {
+        stackModel.append({value: stack})
+    }
+    function addDebugMessage(message){
+        debuggerLog.append({value: message})
+    }

-	function setMem(mem) {
-		memModel.append({num: mem.num, value: mem.value})
-	}
-	function clearMem(){
-		memModel.clear()
-	}
+    function clearStack() {
+        stackModel.clear()
+    }

-	function setStack(stack) {
-		stackModel.append({value: stack})
-	}
-	function addDebugMessage(message){
-		debuggerLog.append({value: message})
-	}
+    function clearStorage() {
+        storageModel.clear()
+    }

-	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()
-	}
+    function setStorage(storage) {
+        storageModel.append({key: storage.key, value: storage.value})
+    }
 }
--- a/ethereal/assets/ext/ethereum.js
+++ b/ethereal/assets/ext/ethereum.js
@ -32,10 +32,6 @@ 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);
 	},
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
--- a/ethereal/assets/qml/webapp.qml
+++ b/ethereal/assets/qml/webapp.qml
@ -34,6 +34,7 @@ ApplicationWindow {
 				 top: parent.top
 			 }
 			 */
+
 			onTitleChanged: { window.title = title }
 			experimental.preferences.javascriptEnabled: true
 			experimental.preferences.navigatorQtObjectEnabled: true
@ -96,12 +97,6 @@ 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);
@ -193,7 +188,7 @@ ApplicationWindow {

 		WebView {
 			id: inspector
-			visible: true
+			visible: false
 			url: webview.experimental.remoteInspectorUrl
 			anchors {
 				left: root.left
--- a/ethereal/assets/samplecoin/samplecoin.html
+++ b/ethereal/assets/samplecoin/samplecoin.html
@ -9,7 +9,7 @@

 <script type="text/javascript">

-var jefcoinAddr = "de0bd4ea1947deabf1749d7ed633f289358c9f6c"
+var jefcoinAddr = "518546ffa883dcc838a64bc2dabada0fd64af459"
 var mAddr = ""

 function createTransaction() {
--- a/ethereal/config.go
+++ b/ethereal/config.go
@ -5,8 +5,8 @@ import (
 )

 var Identifier string
-
-//var StartMining bool
+var StartConsole bool
+var StartMining bool
 var StartRpc bool
 var RpcPort int
 var UseUPnP bool
@ -18,22 +18,25 @@ var GenAddr bool
 var UseSeed bool
 var ImportKey string
 var ExportKey bool
+var DataDir string
 var AssetPath string

 func Init() {
-	flag.StringVar(&Identifier, "id", "", "Custom client identifier")
-	flag.StringVar(&OutboundPort, "port", "30303", "listening port")
+	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.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.Parse()
 }
--- a/ethereal/ethereum.go
+++ b/ethereal/ethereum.go
@ -8,11 +8,9 @@ import (
 	"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"
 )

@ -41,16 +39,7 @@ func main() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

 	ethchain.InitFees()
-
-	g, err := globalconf.NewWithOptions(&globalconf.Options{
-		Filename: path.Join(ethutil.ApplicationFolder(".ethereal"), "conf.ini"),
-	})
-	if err != nil {
-		fmt.Println(err)
-	} else {
-		g.ParseAll()
-	}
-	ethutil.ReadConfig(".ethereal", ethutil.LogFile|ethutil.LogStd, g, Identifier)
+	ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd, Identifier)

 	// Instantiated a eth stack
 	ethereum, err := eth.New(eth.CapDefault, UseUPnP)
@ -119,11 +108,9 @@ 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)
--- 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}

 	return &DebuggerWindow{engine: engine, win: win, lib: lib, Db: db}
 }
@ -41,18 +41,21 @@ func (self *DebuggerWindow) Show() {
 	}()
 }

-func (self *DebuggerWindow) SetCode(code string) {
-	self.win.Set("codeText", code)
-}
-
-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 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) {
@ -60,53 +63,42 @@ 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 {
-			self.Logf("compile FAULT: %v", r)
+			fmt.Println(r)
 		}
 	}()

-	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
-	})
-
+	script, err := ethutil.Compile(scriptStr)
 	if err != nil {
-		self.Logln(err)
+		ethutil.Config.Log.Debugln(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), gas, gasPrice, script)
+	callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), 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, gas, gasPrice)
+	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{
@ -116,53 +108,27 @@ 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() {
-		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")
-			}
-		}
+		callerClosure.Call(vm, data, self.Db.halting)

 		state.Reset()

-		if !self.Db.interrupt {
-			self.Db.done = true
-		} else {
-			self.Db.interrupt = false
-		}
+		self.Db.done = true
 	}()
 }

-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, interrupt bool
+	win  *qml.Window
+	N    chan bool
+	Q    chan bool
+	done bool
 }

 type storeVal struct {
@ -195,8 +161,7 @@ out:
 		case <-d.N:
 			break out
 		case <-d.Q:
-			d.interrupt = true
-			d.clearBuffers()
+			d.done = true

 			return false
 		}
@ -205,19 +170,6 @@ 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
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@ -8,11 +8,9 @@ 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 {
@ -56,7 +54,7 @@ func New(ethereum *eth.Ethereum) *Gui {
 }

 func (gui *Gui) Start(assetPath string) {
-	const version = "0.5.0 RC12"
+	const version = "0.5.0 RC10"

 	defer gui.txDb.Close()

@ -65,12 +63,10 @@ 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")
 	// Create a new QML engine
 	gui.engine = qml.NewEngine()
 	context := gui.engine.Context()
@ -90,36 +86,19 @@ 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'", err)
+		ethutil.Config.Log.Infoln("FATAL: asset not found: you can set an alternative asset path on on the command line using option 'asset_path'")

 		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 {
@ -128,11 +107,8 @@ func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) {

 	win := gui.createWindow(component)

-	gui.setInitialBlockChain()
-	gui.loadAddressBook()
-	gui.readPreviousTransactions()
-	gui.setPeerInfo()
-
+	go gui.setInitialBlockChain()
+	go gui.readPreviousTransactions()
 	go gui.update()

 	return win, nil
@ -154,7 +130,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, false}
+	db := &Debugger{gui.win, make(chan bool), make(chan bool), true}
 	gui.lib.Db = db
 	gui.uiLib.Db = db

@ -165,37 +141,10 @@ 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() {
@ -240,16 +189,10 @@ 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()

@ -296,25 +239,10 @@ 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")
@ -331,11 +259,6 @@ 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)
@ -346,13 +269,5 @@ 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.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
+	return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, data)
 }
--- a/ethereal/ui/ui_lib.go
+++ b/ethereal/ui/ui_lib.go
@ -24,9 +24,8 @@ type UiLib struct {
 	connected bool
 	assetPath string
 	// The main application window
-	win      *qml.Window
-	Db       *Debugger
-	DbWindow *DebuggerWindow
+	win *qml.Window
+	Db  *Debugger
 }

 func NewUiLib(engine *qml.Engine, eth *eth.Ethereum, assetPath string) *UiLib {
@ -89,26 +88,9 @@ 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()
 }
--- a/ethereum/config.go
+++ b/ethereum/config.go
@ -20,6 +20,7 @@ var UseSeed bool
 var ImportKey string
 var ExportKey bool
 var LogFile string
+var DataDir string
 var NonInteractive bool
 var StartJsConsole bool
 var InputFile string
@ -30,21 +31,22 @@ func Init() {
 		flag.PrintDefaults()
 	}

-	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.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(&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(&UseUPnP, "upnp", false, "enable UPnP support")
 	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.Parse()

--- a/ethereum/ethereum.go
+++ b/ethereum/ethereum.go
@ -6,12 +6,10 @@ import (
 	"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"
 )
@ -61,15 +59,7 @@ func main() {
 		lt = ethutil.LogFile | ethutil.LogStd
 	}

-	g, err := globalconf.NewWithOptions(&globalconf.Options{
-		Filename: path.Join(ethutil.ApplicationFolder(".ethereum"), "conf.ini"),
-	})
-	if err != nil {
-		fmt.Println(err)
-	} else {
-		g.ParseAll()
-	}
-	ethutil.ReadConfig(".ethereum", lt, g, Identifier)
+	ethutil.ReadConfig(DataDir, lt, Identifier)

 	logger := ethutil.Config.Log

--- a/ethereum/javascript_runtime.go
+++ b/ethereum/javascript_runtime.go
@ -10,7 +10,6 @@ import (
 	"github.com/obscuren/otto"
 	"io/ioutil"
 	"os"
-	"path"
 	"path/filepath"
 )

@ -26,20 +25,6 @@ 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,
@ -54,10 +39,6 @@ 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()

--- a/ethereum/repl.go
+++ b/ethereum/repl.go
@ -66,10 +66,6 @@ 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())
 }
@ -78,10 +74,6 @@ 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 {
@ -109,7 +101,7 @@ func (self *JSEthereum) toVal(v interface{}) otto.Value {
 	result, err := self.vm.ToValue(v)

 	if err != nil {
-		fmt.Println("Value unknown:", err)
+		fmt.Println(err)

 		return otto.UndefinedValue()
 	}
--- a/utils/cmd.go
+++ b/utils/cmd.go
@ -33,6 +33,8 @@ 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