Merge branch 'release/poc5-rc6'

@obscuren please check if this was commented out for a reason

README.md

@@ -5,7 +5,7 @@ Ethereum
 
 Ethereum Go Client © 2014 Jeffrey Wilcke.
 
-Current state: Proof of Concept 5.0 RC1.
+Current state: Proof of Concept 5.0 RC6.
 
 For the development package please see the [eth-go package](https://github.com/ethereum/eth-go).
 

ethereal/assets/ext/ethereum.js

@@ -36,6 +36,21 @@ window.eth = {
 		postData({call: "getKey"}, cb);
 	},
 
+	getTxCountAt: function(address, cb) {
+		postData({call: "getTxCountAt", args: [address]}, cb);
+	},
+	getIsMining: function(cb){
+		postData({call: "getIsMining"}, cb)
+	},
+	getIsListening: function(cb){
+		postData({call: "getIsListening"}, cb)
+	},
+	getCoinBase: function(cb){
+		postData({call: "getCoinBase"}, cb);
+	},
+	getPeerCount: function(cb){
+		postData({call: "getPeerCount"}, cb);
+	},
 	getBalanceAt: function(address, cb) {
 		postData({call: "getBalance", args: [address]}, cb);
 	},
@@ -115,6 +130,8 @@ window.eth = {
 			}
 		}
 	},
+
+
 }
 window.eth._callbacks = {}
 window.eth._onCallbacks = {}

ethereal/assets/muted/index.html

@@ -46,6 +46,7 @@
 
     .CodeMirror {
         height: 70%;
+	font-size: 14pt;
     }
 </style>
 </head>

ethereal/assets/qml/first_run.qml

@@ -10,146 +10,146 @@ import QtQuick.Controls.Styles 1.1
 import QtQuick.Dialogs 1.1
 
 ApplicationWindow {
-  id: wizardRoot
+    id: wizardRoot
-  width: 500
+    width: 500
-  height: 400
+    height: 400
-  title: "Ethereal first run setup"
+    title: "Ethereal first run setup"
-
-  Column {
-    spacing: 5
-    anchors.leftMargin: 10
-    anchors.left: parent.left
-
-    Text {
-      visible: true
-      text: "<h2>Ethereal setup</h2>"
-    }
 
     Column {
-      id: restoreColumn
+        spacing: 5
-      spacing: 5
+        anchors.leftMargin: 10
-      Text {
+        anchors.left: parent.left
-        visible: true
-        font.pointSize: 14
-        text: "Restore your Ethereum account"
-        id: restoreLabel
-      }
 
-      TextField {
-        id: txPrivKey
-        width: 480
-        placeholderText: "Private key or mnemonic words"
-        focus: true
-        onTextChanged: {
-          if(this.text.length == 64){
-            detailLabel.text = "Private (hex) key detected."
-            actionButton.enabled = true
-          }
-          else if(this.text.split(" ").length == 24){
-            detailLabel.text = "Mnemonic key detected."
-            actionButton.enabled = true
-          }else{
-            detailLabel.text = ""
-            actionButton.enabled = false
-          }
-        }
-      }
-      Row {
-        spacing: 10
-        Button {
-          id: actionButton
-          text: "Restore"
-          enabled: false
-          onClicked: {
-           var success = eth.importAndSetPrivKey(txPrivKey.text)
-           if(success){
-             importedDetails.visible = true
-             restoreColumn.visible = false
-             newKey.visible = false
-             wizardRoot.height = 120
-           }
-          }
-        }
         Text {
-          id: detailLabel
+            visible: true
-          font.pointSize: 12
+            text: "<h2>Ethereal setup</h2>"
-          anchors.topMargin: 10
         }
-      }
-    }
-    Column {
-      id: importedDetails
-      visible: false
-      Text {
-        text: "<b>Your account has been imported. Please close the application and restart it again to let the changes take effect.</b>"
-        wrapMode: Text.WordWrap
-        width: 460
-      }
-    }
-    Column {
-      spacing: 5
-      id: newDetailsColumn
-      visible: false
-      Text {
-        font.pointSize: 14
-        text: "Your account details"
-      }
-      Label {
-        text: "Address"
-      }
-      TextField {
-        id: addressInput
-        readOnly:true
-        width: 480
-      }
-      Label {
-        text: "Private key"
-      }
-      TextField {
-        id: privkeyInput
-        readOnly:true
-        width: 480
-      }
-      Label {
-        text: "Mnemonic words"
-      }
-      TextField {
-        id: mnemonicInput
-        readOnly:true
-        width: 480
-      }
-      Label {
-        text: "<b>A new account has been created. Please take the time to write down the <i>24 words</i>. You can use those to restore your account at a later date.</b>"
-        wrapMode: Text.WordWrap
-        width: 480
-      }
-      Label {
-        text: "Please restart the application once you have completed the steps above."
-        wrapMode: Text.WordWrap
-        width: 480
-      }
-    }
 
-  }
+        Column {
-  Button {
+            id: restoreColumn
-    anchors.right: parent.right
+            spacing: 5
-    anchors.bottom: parent.bottom
+            Text {
-    anchors.rightMargin: 10
+                visible: true
-    anchors.bottomMargin: 10
+                font.pointSize: 14
-    id: newKey
+                text: "Restore your Ethereum account"
-    text: "I don't have an account yet"
+                id: restoreLabel
-    onClicked: {
+            }
-      var res = eth.createAndSetPrivKey()
-      mnemonicInput.text = res[0]
-      addressInput.text = res[1]
-      privkeyInput.text = res[2]
 
-      // Hide restore
+            TextField {
-      restoreColumn.visible = false
+                id: txPrivKey
+                width: 480
+                placeholderText: "Private key or mnemonic words"
+                focus: true
+                onTextChanged: {
+                    if(this.text.length == 64){
+                        detailLabel.text = "Private (hex) key detected."
+                        actionButton.enabled = true
+                    }
+                    else if(this.text.split(" ").length == 24){
+                        detailLabel.text = "Mnemonic key detected."
+                        actionButton.enabled = true
+                    }else{
+                        detailLabel.text = ""
+                        actionButton.enabled = false
+                    }
+                }
+            }
+            Row {
+                spacing: 10
+                Button {
+                    id: actionButton
+                    text: "Restore"
+                    enabled: false
+                    onClicked: {
+                        var success = lib.importAndSetPrivKey(txPrivKey.text)
+                        if(success){
+                            importedDetails.visible = true
+                            restoreColumn.visible = false
+                            newKey.visible = false
+                            wizardRoot.height = 120
+                        }
+                    }
+                }
+                Text {
+                    id: detailLabel
+                    font.pointSize: 12
+                    anchors.topMargin: 10
+                }
+            }
+        }
+        Column {
+            id: importedDetails
+            visible: false
+            Text {
+                text: "<b>Your account has been imported. Please close the application and restart it again to let the changes take effect.</b>"
+                wrapMode: Text.WordWrap
+                width: 460
+            }
+        }
+        Column {
+            spacing: 5
+            id: newDetailsColumn
+            visible: false
+            Text {
+                font.pointSize: 14
+                text: "Your account details"
+            }
+            Label {
+                text: "Address"
+            }
+            TextField {
+                id: addressInput
+                readOnly:true
+                width: 480
+            }
+            Label {
+                text: "Private key"
+            }
+            TextField {
+                id: privkeyInput
+                readOnly:true
+                width: 480
+            }
+            Label {
+                text: "Mnemonic words"
+            }
+            TextField {
+                id: mnemonicInput
+                readOnly:true
+                width: 480
+            }
+            Label {
+                text: "<b>A new account has been created. Please take the time to write down the <i>24 words</i>. You can use those to restore your account at a later date.</b>"
+                wrapMode: Text.WordWrap
+                width: 480
+            }
+            Label {
+                text: "Please restart the application once you have completed the steps above."
+                wrapMode: Text.WordWrap
+                width: 480
+            }
+        }
 
-      // Show new details
-      newDetailsColumn.visible = true
-      newKey.visible = false
     }
-  }
+    Button {
+        anchors.right: parent.right
+        anchors.bottom: parent.bottom
+        anchors.rightMargin: 10
+        anchors.bottomMargin: 10
+        id: newKey
+        text: "I don't have an account yet"
+        onClicked: {
+            var res = lib.createAndSetPrivKey()
+            mnemonicInput.text = res[0]
+            addressInput.text = res[1]
+            privkeyInput.text = res[2]
+
+            // Hide restore
+            restoreColumn.visible = false
+
+            // Show new details
+            newDetailsColumn.visible = true
+            newKey.visible = false
+        }
+    }
 }

ethereal/assets/qml/newTransaction/_new_contract.qml

@@ -61,7 +61,7 @@ Component {
 			id: txValue
 			width: 200
 			placeholderText: "Amount"
-			validator: IntValidator { }
+			validator: RegExpValidator { regExp: /\d*/ }
 			onTextChanged: {
 				contractFormReady()
 			}
@@ -69,7 +69,7 @@ Component {
 		TextField {
 			id: txGas
 			width: 200
-			validator: IntValidator { }
+			validator: RegExpValidator { regExp: /\d*/ }
 			placeholderText: "Gas"
 			onTextChanged: {
 				contractFormReady()
@@ -79,7 +79,7 @@ Component {
 			id: txGasPrice
 			width: 200
 			placeholderText: "Gas price"
-			validator: IntValidator { }
+			validator: RegExpValidator { regExp: /\d*/ }
 			onTextChanged: {
 				contractFormReady()
 			}

ethereal/assets/qml/newTransaction/_simple_send.qml

@@ -56,9 +56,10 @@ Component {
 		}
 		TextField {
 			id: txSimpleValue
+			width: 200
 			placeholderText: "Amount"
 			anchors.rightMargin: 5
-			validator: IntValidator { }
+			validator: RegExpValidator { regExp: /\d*/ }
 			onTextChanged: { checkFormState() }
 		}
 		Button {

ethereal/assets/qml/webapp.qml

@@ -47,13 +47,37 @@ ApplicationWindow {
 
 				try {
 					switch(data.call) {
+					case "getCoinBase":
+					      postData(data._seed, eth.getCoinBase())
+
+					      break
+					case "getIsListening":
+					      postData(data._seed, eth.getIsListening())
+
+					      break
+					case "getIsMining":
+					      postData(data._seed, eth.getIsMining())
+
+					      break
+					case "getPeerCount":
+					      postData(data._seed, eth.getPeerCount())
+
+					      break
+
+					case "getTxCountAt":
+					      require(1)
+					      postData(data._seed, eth.getTxCountAt(data.args[0]))
+
+					      break
 					case "getBlockByNumber":
-						var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")	
+						var block = eth.getBlock(data.args[0])
 						postData(data._seed, block)
+
 						break
 					case "getBlockByHash":
-						var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")	
+						var block = eth.getBlock(data.args[0])
 						postData(data._seed, block)
+
 						break
 					case "transact":
 						require(5)
@@ -94,11 +118,14 @@ ApplicationWindow {
 						postData(data._seed, null)
 						break;
 					case "set":
+            console.log("'Set' has been depcrecated")
+          /*
 						for(var key in data.args) {
 							if(webview.hasOwnProperty(key)) {
 								window[key] = data.args[key];
 							}
 						}
+            */
 						break;
 					case "getSecretToAddress":
 						require(1)

ethereal/assets/samplecoin/samplecoin.html

@@ -9,7 +9,7 @@
 
 <script type="text/javascript">
 
-var jefcoinAddr = "b7cb72c47ec4f31751d0d628b5a33fd6671bbba0"
+var jefcoinAddr = "681fd48ffa236549fbcd16bdf9f98bb541a7f742"
 var mAddr = ""
 
 function createTransaction() {
@@ -23,8 +23,6 @@ function createTransaction() {
 }
 
 function init() {
-	eth.set({width: 500});
-
 	eth.getKey(function(sec) {
 		mAddr = sec;
 		eth.getSecretToAddress(sec, function(addr) {

ethereal/assets/util/test.html

@@ -0,0 +1,43 @@
+<html>
+<head>
+<title>Utils</title>
+</head>
+<body onload="init();">
+<label>Nonce for 2ef47100e0787b915105fd5e3f4ff6752079d5cb</label>
+<p id="nonce"></p>
+
+<label>Connected peers</label>
+<p id="peers"></p>
+
+<label>Is mining</label>
+<p id="isMining"></p>
+
+<label>Is listening</label>
+<p id="isListen"></p>
+
+<label>Coinbase</label>
+<p id="coinbase"></p>
+
+<script type="text/javascript">
+
+function init() {
+	eth.getTxCountAt("2ef47100e0787b915105fd5e3f4ff6752079d5cb", function(nonce){
+			document.querySelector("#nonce").innerHTML = nonce;
+	})
+	eth.getPeerCount(function(peerLength){
+			document.querySelector("#peers").innerHTML = peerLength;
+	})
+	eth.getIsMining(function(mining){
+			document.querySelector("#isMining").innerHTML = mining;
+	})
+	eth.getIsListening(function(listen){
+			document.querySelector("#isListen").innerHTML = listen;
+	})
+	eth.getCoinBase(function(address){
+			document.querySelector("#coinbase").innerHTML = address;
+	})
+}
+</script>
+</body>
+</html>
+

ethereal/config.go

@@ -7,6 +7,7 @@ import (
 var StartConsole bool
 var StartMining bool
 var StartRpc bool
+var RpcPort int
 var UseUPnP bool
 var OutboundPort string
 var ShowGenesis bool
@@ -28,6 +29,7 @@ func Init() {
 	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)")

ethereal/ethereum.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"github.com/ethereum/eth-go"
 	"github.com/ethereum/eth-go/ethchain"
-	"github.com/ethereum/eth-go/ethpub"
-	"github.com/ethereum/eth-go/ethrpc"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/ethereum/go-ethereum/ethereal/ui"
 	"github.com/ethereum/go-ethereum/utils"
@@ -89,8 +87,19 @@ func main() {
 	}
 
 	if ExportKey {
-		key := ethutil.Config.Db.GetKeys()[0]
+		keyPair := ethutil.GetKeyRing().Get(0)
-		fmt.Printf("%x\n", key.PrivateKey)
+		fmt.Printf(`
+Generating new address and keypair.
+Please keep your keys somewhere save.
+
+++++++++++++++++ KeyRing +++++++++++++++++++
+addr: %x
+prvk: %x
+pubk: %x
+++++++++++++++++++++++++++++++++++++++++++++
+save these words so you can restore your account later: %s
+`, keyPair.Address(), keyPair.PrivateKey, keyPair.PublicKey)
+
 		os.Exit(0)
 	}
 
@@ -99,9 +108,12 @@ func main() {
 		os.Exit(0)
 	}
 
+	if StartMining {
+		utils.DoMining(ethereum)
+	}
+
 	if StartRpc {
-		ethereum.RpcServer = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum.StateManager(), ethereum.BlockChain(), ethereum.TxPool()))
+		utils.DoRpc(ethereum, RpcPort)
-		go ethereum.RpcServer.Start()
 	}
 
 	log.Printf("Starting Ethereum GUI v%s\n", ethutil.Config.Ver)
@@ -110,5 +122,11 @@ func main() {
 	ethereum.MaxPeers = MaxPeer
 
 	gui := ethui.New(ethereum)
+
+	ethereum.Start(UseSeed)
+
 	gui.Start(AssetPath)
+
+	// Wait for shutdown
+	ethereum.WaitForShutdown()
 }

ethereal/ui/ext_app.go

@@ -34,7 +34,7 @@ type ExtApplication struct {
 
 func NewExtApplication(container AppContainer, lib *UiLib) *ExtApplication {
 	app := &ExtApplication{
-		ethpub.NewPEthereum(lib.eth.StateManager(), lib.eth.BlockChain(), lib.eth.TxPool()),
+		ethpub.NewPEthereum(lib.eth),
 		make(chan ethutil.React, 1),
 		make(chan ethutil.React, 1),
 		make(chan bool),

ethereal/ui/gui.go

@@ -24,7 +24,8 @@ type Gui struct {
 	eth *eth.Ethereum
 
 	// The public Ethereum library
-	lib *EthLib
+	lib   *EthLib
+	uiLib *UiLib
 
 	txDb *ethdb.LDBDatabase
 
@@ -41,23 +42,21 @@ func New(ethereum *eth.Ethereum) *Gui {
 		panic(err)
 	}
 
-	data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
 	// On first run we won't have any keys yet, so this would crash.
 	// Therefor we check if we are ready to actually start this process
 	var addr []byte
-	if len(data) > 0 {
+	if ethutil.GetKeyRing().Len() != 0 {
-		key := ethutil.Config.Db.GetKeys()[0]
+		addr = ethutil.GetKeyRing().Get(0).Address()
-		addr = key.Address()
-
-		//ethereum.StateManager().WatchAddr(addr)
 	}
 
-	pub := ethpub.NewPEthereum(ethereum.StateManager(), ethereum.BlockChain(), ethereum.TxPool())
+	pub := ethpub.NewPEthereum(ethereum)
 
 	return &Gui{eth: ethereum, lib: lib, txDb: db, addr: addr, pub: pub}
 }
 
 func (gui *Gui) Start(assetPath string) {
+	const version = "0.5.0 RC6"
+
 	defer gui.txDb.Close()
 
 	// Register ethereum functions
@@ -67,7 +66,7 @@ func (gui *Gui) Start(assetPath string) {
 		Init: func(p *ethpub.PTx, obj qml.Object) { p.Value = ""; p.Hash = ""; p.Address = "" },
 	}})
 
-	ethutil.Config.SetClientString(fmt.Sprintf("/Ethereal v%s", "0.5.0 RC2"))
+	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()
@@ -75,19 +74,18 @@ func (gui *Gui) Start(assetPath string) {
 
 	// Expose the eth library and the ui library to QML
 	context.SetVar("eth", gui)
-	uiLib := NewUiLib(gui.engine, gui.eth, assetPath)
+	gui.uiLib = NewUiLib(gui.engine, gui.eth, assetPath)
-	context.SetVar("ui", uiLib)
+	context.SetVar("ui", gui.uiLib)
 
 	// Load the main QML interface
 	data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
-	var err error
-	var component qml.Object
-	firstRun := len(data) == 0
 
-	if firstRun {
+	var win *qml.Window
-		component, err = gui.engine.LoadFile(uiLib.AssetPath("qml/first_run.qml"))
+	var err error
+	if len(data) == 0 {
+		win, err = gui.showKeyImport(context)
 	} else {
-		component, err = gui.engine.LoadFile(uiLib.AssetPath("qml/wallet.qml"))
+		win, err = gui.showWallet(context)
 	}
 	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'")
@@ -95,28 +93,50 @@ func (gui *Gui) Start(assetPath string) {
 		panic(err)
 	}
 
-	gui.win = component.CreateWindow(nil)
+	win.Show()
-	uiLib.win = gui.win
+	win.Wait()
-	db := &Debugger{gui.win, make(chan bool)}
-	gui.lib.Db = db
-	uiLib.Db = db
-
-	// Add the ui as a log system so we can log directly to the UGI
-	ethutil.Config.Log.AddLogSystem(gui)
-
-	// Loads previous blocks
-	if firstRun == false {
-		go gui.setInitialBlockChain()
-		go gui.readPreviousTransactions()
-		go gui.update()
-	}
-
-	gui.win.Show()
-	gui.win.Wait()
 
 	gui.eth.Stop()
 }
 
+func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) {
+	component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/wallet.qml"))
+	if err != nil {
+		return nil, err
+	}
+
+	win := gui.createWindow(component)
+
+	go gui.setInitialBlockChain()
+	go gui.readPreviousTransactions()
+	go gui.update()
+
+	return win, nil
+}
+
+func (gui *Gui) showKeyImport(context *qml.Context) (*qml.Window, error) {
+	context.SetVar("lib", gui.lib)
+	component, err := gui.engine.LoadFile(gui.uiLib.AssetPath("qml/first_run.qml"))
+	if err != nil {
+		return nil, err
+	}
+
+	return gui.createWindow(component), nil
+}
+
+func (gui *Gui) createWindow(comp qml.Object) *qml.Window {
+	win := comp.CreateWindow(nil)
+
+	gui.win = win
+	gui.uiLib.win = win
+
+	db := &Debugger{gui.win, make(chan bool)}
+	gui.lib.Db = db
+	gui.uiLib.Db = db
+
+	return gui.win
+}
+
 func (gui *Gui) setInitialBlockChain() {
 	// Load previous 10 blocks
 	chain := gui.eth.BlockChain().GetChain(gui.eth.BlockChain().CurrentBlock.Hash(), 10)
@@ -140,23 +160,50 @@ func (gui *Gui) processBlock(block *ethchain.Block) {
 	gui.win.Root().Call("addBlock", ethpub.NewPBlock(block))
 }
 
+func (gui *Gui) setWalletValue(amount, unconfirmedFunds *big.Int) {
+	var str string
+	if unconfirmedFunds != nil {
+		pos := "+"
+		if unconfirmedFunds.Cmp(big.NewInt(0)) >= 0 {
+			pos = "-"
+		}
+		val := ethutil.CurrencyToString(new(big.Int).Abs(ethutil.BigCopy(unconfirmedFunds)))
+		str = fmt.Sprintf("%v (%s %v)", ethutil.CurrencyToString(amount), pos, val)
+	} else {
+		str = fmt.Sprintf("%v", ethutil.CurrencyToString(amount))
+	}
+
+	gui.win.Root().Call("setWalletValue", str)
+}
+
 // Simple go routine function that updates the list of peers in the GUI
 func (gui *Gui) update() {
+	blockChan := make(chan ethutil.React, 1)
+	reactor := gui.eth.Reactor()
+
+	reactor.Subscribe("newBlock", blockChan)
+
 	txChan := make(chan ethchain.TxMsg, 1)
 	gui.eth.TxPool().Subscribe(txChan)
 
 	state := gui.eth.StateManager().TransState()
 
 	unconfirmedFunds := new(big.Int)
-	gui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(state.GetStateObject(gui.addr).Amount)))
+	gui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(state.GetAccount(gui.addr).Amount)))
 
 	for {
 		select {
+		case b := <-blockChan:
+			block := b.Resource.(*ethchain.Block)
+			if bytes.Compare(block.Coinbase, gui.addr) == 0 {
+				gui.setWalletValue(gui.eth.StateManager().ProcState().GetAccount(gui.addr).Amount, nil)
+			}
+
 		case txMsg := <-txChan:
 			tx := txMsg.Tx
 
 			if txMsg.Type == ethchain.TxPre {
-				object := state.GetStateObject(gui.addr)
+				object := state.GetAccount(gui.addr)
 
 				if bytes.Compare(tx.Sender(), gui.addr) == 0 && object.Nonce <= tx.Nonce {
 					gui.win.Root().Call("addTx", ethpub.NewPTx(tx))
@@ -173,23 +220,16 @@ func (gui *Gui) update() {
 					unconfirmedFunds.Add(unconfirmedFunds, tx.Value)
 				}
 
-				pos := "+"
+				gui.setWalletValue(object.Amount, unconfirmedFunds)
-				if unconfirmedFunds.Cmp(big.NewInt(0)) >= 0 {
-					pos = "-"
-				}
-				val := ethutil.CurrencyToString(new(big.Int).Abs(ethutil.BigCopy(unconfirmedFunds)))
-				str := fmt.Sprintf("%v (%s %v)", ethutil.CurrencyToString(object.Amount), pos, val)
-
-				gui.win.Root().Call("setWalletValue", str)
 			} else {
-				object := state.GetStateObject(gui.addr)
+				object := state.GetAccount(gui.addr)
 				if bytes.Compare(tx.Sender(), gui.addr) == 0 {
 					object.SubAmount(tx.Value)
 				} else if bytes.Compare(tx.Recipient, gui.addr) == 0 {
 					object.AddAmount(tx.Value)
 				}
 
-				gui.win.Root().Call("setWalletValue", fmt.Sprintf("%v", ethutil.CurrencyToString(object.Amount)))
+				gui.setWalletValue(object.Amount, nil)
 
 				state.SetStateObject(object)
 			}
@@ -215,15 +255,15 @@ func (gui *Gui) Printf(format string, v ...interface{}) {
 }
 
 func (gui *Gui) Transact(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {
-	keyPair := ethutil.Config.Db.GetKeys()[0]
+	keyPair := ethutil.GetKeyRing().Get(0)
 
 	return gui.pub.Transact(ethutil.Hex(keyPair.PrivateKey), recipient, value, gas, gasPrice, data)
 }
 
 func (gui *Gui) Create(recipient, value, gas, gasPrice, data string) (*ethpub.PReceipt, error) {
-	keyPair := ethutil.Config.Db.GetKeys()[0]
+	keyPair := ethutil.GetKeyRing().Get(0)
 
-	mainInput, initInput := mutan.PreProcess(data)
+	mainInput, initInput := mutan.PreParse(data)
 
 	return gui.pub.Create(ethutil.Hex(keyPair.PrivateKey), value, gas, gasPrice, initInput, mainInput)
 }

ethereal/ui/library.go

@@ -34,10 +34,13 @@ func (lib *EthLib) ImportAndSetPrivKey(privKey string) bool {
 }
 
 func (lib *EthLib) CreateAndSetPrivKey() (string, string, string, string) {
-	pub, prv := secp256k1.GenerateKeyPair()
+	_, prv := secp256k1.GenerateKeyPair()
-	pair := &ethutil.Key{PrivateKey: prv, PublicKey: pub}
+	keyPair, err := ethutil.GetKeyRing().NewKeyPair(prv)
-	ethutil.Config.Db.Put([]byte("KeyRing"), pair.RlpEncode())
+	if err != nil {
-	mne := ethutil.MnemonicEncode(ethutil.Hex(prv))
+		panic(err)
+	}
+
+	mne := ethutil.MnemonicEncode(ethutil.Hex(keyPair.PrivateKey))
 	mnemonicString := strings.Join(mne, " ")
-	return mnemonicString, fmt.Sprintf("%x", pair.Address()), fmt.Sprintf("%x", prv), fmt.Sprintf("%x", pub)
+	return mnemonicString, fmt.Sprintf("%x", keyPair.Address()), ethutil.Hex(keyPair.PrivateKey), ethutil.Hex(keyPair.PublicKey)
 }

ethereal/ui/ui_lib.go

@@ -121,7 +121,7 @@ func DefaultAssetPath() string {
 func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string) {
 	state := ui.eth.BlockChain().CurrentBlock.State()
 
-	mainInput, _ := mutan.PreProcess(data)
+	mainInput, _ := mutan.PreParse(data)
 	callerScript, err := utils.Compile(mainInput)
 	if err != nil {
 		ethutil.Config.Log.Debugln(err)
@@ -138,7 +138,7 @@ func (ui *UiLib) DebugTx(recipient, valueStr, gasStr, gasPriceStr, data string)
 	callerTx := ethchain.NewContractCreationTx(ethutil.Big(valueStr), ethutil.Big(gasStr), ethutil.Big(gasPriceStr), callerScript, nil)
 
 	// Contract addr as test address
-	keyPair := ethutil.Config.Db.GetKeys()[0]
+	keyPair := ethutil.GetKeyRing().Get(0)
 	account := ui.eth.StateManager().TransState().GetStateObject(keyPair.Address())
 	c := ethchain.MakeContract(callerTx, state)
 	callerClosure := ethchain.NewClosure(account, c, c.Script(), state, ethutil.Big(gasStr), ethutil.Big(gasPriceStr))

ethereum/config.go

@@ -7,6 +7,7 @@ import (
 var StartConsole bool
 var StartMining bool
 var StartRpc bool
+var RpcPort int
 var UseUPnP bool
 var OutboundPort string
 var ShowGenesis bool
@@ -26,6 +27,7 @@ func Init() {
 	flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits")
 	//flag.BoolVar(&UseGui, "gui", true, "use the gui")
 	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.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support")
 	flag.BoolVar(&UseSeed, "seed", true, "seed peers")

ethereum/dev_console.go

@@ -173,8 +173,8 @@ func (i *Console) ParseInput(input string) bool {
 			} else {
 				tx := ethchain.NewTransactionMessage(recipient, ethutil.Big(tokens[2]), ethutil.Big(tokens[3]), ethutil.Big(tokens[4]), nil)
 
-				key := ethutil.Config.Db.GetKeys()[0]
+				keyPair := ethutil.GetKeyRing().Get(0)
-				tx.Sign(key.PrivateKey)
+				tx.Sign(keyPair.PrivateKey)
 				i.ethereum.TxPool().QueueTransaction(tx)
 
 				fmt.Printf("%x\n", tx.Hash())
@@ -191,7 +191,7 @@ func (i *Console) ParseInput(input string) bool {
 		case "contract":
 			fmt.Println("Contract editor (Ctrl-D = done)")
 
-			mainInput, initInput := mutan.PreProcess(i.Editor())
+			mainInput, initInput := mutan.PreParse(i.Editor())
 			mainScript, err := utils.Compile(mainInput)
 			if err != nil {
 				fmt.Println(err)
@@ -207,8 +207,8 @@ func (i *Console) ParseInput(input string) bool {
 
 			contract := ethchain.NewContractCreationTx(ethutil.Big(tokens[0]), ethutil.Big(tokens[1]), ethutil.Big(tokens[1]), mainScript, initScript)
 
-			key := ethutil.Config.Db.GetKeys()[0]
+			keyPair := ethutil.GetKeyRing().Get(0)
-			contract.Sign(key.PrivateKey)
+			contract.Sign(keyPair.PrivateKey)
 
 			i.ethereum.TxPool().QueueTransaction(contract)
 

ethereum/ethereum.go

@@ -4,9 +4,6 @@ import (
 	"fmt"
 	"github.com/ethereum/eth-go"
 	"github.com/ethereum/eth-go/ethchain"
-	"github.com/ethereum/eth-go/ethminer"
-	"github.com/ethereum/eth-go/ethpub"
-	"github.com/ethereum/eth-go/ethrpc"
 	"github.com/ethereum/eth-go/ethutil"
 	"github.com/ethereum/go-ethereum/utils"
 	"log"
@@ -67,10 +64,9 @@ func main() {
 		log.SetOutput(logfile)
 		logSys = log.New(logfile, "", flags)
 		logger.AddLogSystem(logSys)
-	}
+	} else {
-	/*else {
 		logSys = log.New(os.Stdout, "", flags)
-	}*/
+	}
 
 	ethchain.InitFees()
 
@@ -105,8 +101,19 @@ func main() {
 		}
 		os.Exit(0)
 	case ExportKey:
-		key := ethutil.Config.Db.GetKeys()[0]
+		keyPair := ethutil.GetKeyRing().Get(0)
-		logSys.Println(fmt.Sprintf("prvk: %x\n", key.PrivateKey))
+		fmt.Printf(`
+Generating new address and keypair.
+Please keep your keys somewhere save.
+
+++++++++++++++++ KeyRing +++++++++++++++++++
+addr: %x
+prvk: %x
+pubk: %x
+++++++++++++++++++++++++++++++++++++++++++++
+save these words so you can restore your account later: %s
+`, keyPair.Address(), keyPair.PrivateKey, keyPair.PublicKey)
+
 		os.Exit(0)
 	case ShowGenesis:
 		logSys.Println(ethereum.BlockChain().Genesis())
@@ -122,6 +129,13 @@ func main() {
 	// Set the max peers
 	ethereum.MaxPeers = MaxPeer
 
+	// Set Mining status
+	ethereum.Mining = StartMining
+
+	if StartMining {
+		utils.DoMining(ethereum)
+	}
+
 	if StartConsole {
 		err := os.Mkdir(ethutil.Config.ExecPath, os.ModePerm)
 		// Error is OK if the error is ErrExist
@@ -133,37 +147,13 @@ func main() {
 		go console.Start()
 	}
 	if StartRpc {
-		ethereum.RpcServer = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum.StateManager(), ethereum.BlockChain(), ethereum.TxPool()))
+		utils.DoRpc(ethereum, RpcPort)
-		go ethereum.RpcServer.Start()
 	}
 
 	RegisterInterrupts(ethereum)
 
 	ethereum.Start(UseSeed)
 
-	if StartMining {
-		logger.Infoln("Miner started")
-
-		// Fake block mining. It broadcasts a new block every 5 seconds
-		go func() {
-
-			if StartMining {
-				logger.Infoln("Miner started")
-
-				go func() {
-					data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
-					keyRing := ethutil.NewValueFromBytes(data)
-					addr := keyRing.Get(1).Bytes()
-
-					miner := ethminer.NewDefaultMiner(addr, ethereum)
-					miner.Start()
-
-				}()
-			}
-		}()
-
-	}
-
 	// Wait for shutdown
 	ethereum.WaitForShutdown()
 }

utils/cmd.go

@@ -0,0 +1,46 @@
+package utils
+
+import (
+	"github.com/ethereum/eth-go"
+	"github.com/ethereum/eth-go/ethminer"
+	"github.com/ethereum/eth-go/ethpub"
+	"github.com/ethereum/eth-go/ethrpc"
+	"github.com/ethereum/eth-go/ethutil"
+	"log"
+	"time"
+)
+
+func DoRpc(ethereum *eth.Ethereum, RpcPort int) {
+	var err error
+	ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort)
+	if err != nil {
+		log.Println("Could not start RPC interface:", err)
+	} else {
+		go ethereum.RpcServer.Start()
+	}
+}
+
+func DoMining(ethereum *eth.Ethereum) {
+	// Set Mining status
+	ethereum.Mining = true
+
+	if ethutil.GetKeyRing().Len() == 0 {
+		log.Println("No address found, can't start mining")
+		return
+	}
+	keyPair := ethutil.GetKeyRing().Get(0)
+	addr := keyPair.Address()
+
+	go func() {
+		// Give it some time to connect with peers
+		time.Sleep(3 * time.Second)
+
+		for ethereum.IsUpToDate() == false {
+			time.Sleep(5 * time.Second)
+		}
+		log.Println("Miner started")
+
+		miner := ethminer.NewDefaultMiner(addr, ethereum)
+		miner.Start()
+	}()
+}

utils/compile.go

@@ -24,7 +24,7 @@ func Compile(script string) ([]byte, error) {
 
 func CompileScript(script string) ([]byte, []byte, error) {
 	// Preprocess
-	mainInput, initInput := mutan.PreProcess(script)
+	mainInput, initInput := mutan.PreParse(script)
 	// Compile main script
 	mainScript, err := Compile(mainInput)
 	if err != nil {

utils/keys.go

@@ -6,6 +6,60 @@ import (
 	"github.com/obscuren/secp256k1-go"
 )
 
+func CreateKeyPair(force bool) {
+	if force {
+		ethutil.GetKeyRing().Reset()
+		fmt.Println("resetting")
+	}
+
+	if ethutil.GetKeyRing().Get(0) == nil {
+		_, prv := secp256k1.GenerateKeyPair()
+
+		keyPair, err := ethutil.GetKeyRing().NewKeyPair(prv)
+		if err != nil {
+			panic(err)
+		}
+
+		mne := ethutil.MnemonicEncode(ethutil.Hex(keyPair.PrivateKey))
+
+		fmt.Printf(`
+Generating new address and keypair.
+Please keep your keys somewhere save.
+
+++++++++++++++++ KeyRing +++++++++++++++++++
+addr: %x
+prvk: %x
+pubk: %x
+++++++++++++++++++++++++++++++++++++++++++++
+save these words so you can restore your account later: %s
+`, keyPair.Address(), keyPair.PrivateKey, keyPair.PublicKey, mne)
+	}
+}
+
+func ImportPrivateKey(sec string) {
+	ethutil.GetKeyRing().Reset()
+
+	keyPair, err := ethutil.GetKeyRing().NewKeyPair(ethutil.FromHex(sec))
+	if err != nil {
+		panic(err)
+	}
+
+	mne := ethutil.MnemonicEncode(ethutil.Hex(keyPair.PrivateKey))
+
+	fmt.Printf(`
+Generating new address and keypair.
+Please keep your keys somewhere save.
+
+++++++++++++++++ KeyRing +++++++++++++++++++
+addr: %x
+prvk: %x
+pubk: %x
+++++++++++++++++++++++++++++++++++++++++++++
+save these words so you can restore your account later: %s
+`, keyPair.Address(), keyPair.PrivateKey, keyPair.PublicKey, mne)
+}
+
+/*
 func CreateKeyPair(force bool) {
 	data, _ := ethutil.Config.Db.Get([]byte("KeyRing"))
 	if len(data) == 0 || force {
@@ -28,7 +82,9 @@ save these words so you can restore your account later: %s
 
 	}
 }
+*/
 
+/*
 func ImportPrivateKey(prvKey string) {
 	key := ethutil.FromHex(prvKey)
 	msg := []byte("tmp")
@@ -49,3 +105,4 @@ pubk: %x
 
 `, pair.Address(), key, pub)
 }
+*/