Merge branch 'develop'

README.md

@@ -27,20 +27,22 @@ General command line options
 
 ```
 Shared between ethereum and ethereal
--m       Start mining blocks
+-id      Set the custom identifier of the client (shows up on other clients)
--genaddr Generates a new address and private key (destructive action)
+-port    Port on which the server will accept incomming connections
--p       Port on which the server will accept incomming connections
 -upnp    Enable UPnP
--x       Desired amount of peers
+-maxpeer Desired amount of peers
--r       Start JSON RPC
+-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

@@ -8,7 +8,7 @@ import Ethereum 1.0
 
 ApplicationWindow {
 	visible: false
-	title: "IceCream"
+	title: "IceCREAM"
 	minimumWidth: 1280
 	minimumHeight: 900
 	width: 1290
@@ -224,8 +224,8 @@ ApplicationWindow {
 	}
 
 	function setInstruction(num) {
-		asmTableView.selection.clear()
+		//asmTableView.selection.clear()
-		asmTableView.selection.select(num)
+		//asmTableView.selection.select(num)
 	}
 
 	function setMem(mem) {
@@ -255,6 +255,10 @@ ApplicationWindow {
 	}
 
 	function setLog(msg) {
-		logModel.append({message: msg})
+		logModel.insert(0, {message: msg})
+	}
+
+	function clearLog() {
+		logModel.clear()
 	}
 }

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,22 @@ var GenAddr bool
 var UseSeed bool
 var ImportKey string
 var ExportKey bool
-var DataDir string
 var AssetPath string
 
 func Init() {
-	flag.StringVar(&Identifier, "i", "", "Custom client identifier")
+	flag.StringVar(&Identifier, "id", "", "Custom client identifier")
-	flag.BoolVar(&StartConsole, "c", false, "debug and testing console")
+	flag.StringVar(&OutboundPort, "port", "30303", "listening port")
-	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()
 }

ethereal/ethereum.go

@@ -8,9 +8,11 @@ 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"
 )
 
@@ -39,7 +41,16 @@ 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(".ethereal"), "conf.ini"),
+	})
+	if err != nil {
+		fmt.Println(err)
+	} else {
+		g.ParseAll()
+	}
+	ethutil.ReadConfig(".ethereal", ethutil.LogFile|ethutil.LogStd, Identifier)
 
 	// Instantiated a eth stack
 	ethereum, err := eth.New(eth.CapDefault, UseUPnP)
@@ -108,9 +119,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

@@ -71,6 +71,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
 	var err error
 	script := ethutil.StringToByteFunc(scriptStr, func(s string) (ret []byte) {
 		ret, err = ethutil.Compile(s)
+		fmt.Printf("%x\n", ret)
 		return
 	})
 
@@ -82,6 +83,7 @@ func (self *DebuggerWindow) Debug(valueStr, gasStr, gasPriceStr, scriptStr, data
 
 	dis := ethchain.Disassemble(script)
 	self.win.Root().Call("clearAsm")
+	self.win.Root().Call("clearLog")
 
 	for _, str := range dis {
 		self.win.Root().Call("setAsm", str)

ethereal/ui/gui.go

@@ -8,6 +8,7 @@ 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"
@@ -66,7 +67,6 @@ func (gui *Gui) Start(assetPath string) {
 	}})
 
 	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()
@@ -93,12 +93,28 @@ func (gui *Gui) Start(assetPath string) {
 		panic(err)
 	}
 
+	ethutil.Config.Log.AddLogSystem(gui)
+	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 +123,11 @@ func (gui *Gui) showWallet(context *qml.Context) (*qml.Window, error) {
 
 	win := gui.createWindow(component)
 
-	go gui.setInitialBlockChain()
+	gui.setInitialBlockChain()
-	go gui.readPreviousTransactions()
+	gui.loadAddressBook()
+	gui.readPreviousTransactions()
+	gui.setPeerInfo()
+
 	go gui.update()
 
 	return win, nil
@@ -145,6 +164,19 @@ func (gui *Gui) setInitialBlockChain() {
 	}
 }
 
+type address struct {
+	Name, Address string
+}
+
+var namereg = ethutil.FromHex("bb5f186604d057c1c5240ca2ae0f6430138ac010")
+
+func (gui *Gui) loadAddressBook() {
+	gui.win.Root().Call("clearAddress")
+	gui.eth.StateManager().CurrentState().GetStateObject(namereg).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 +221,14 @@ 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)
 
 	state := gui.eth.StateManager().TransState()
 
@@ -239,10 +275,18 @@ func (gui *Gui) update() {
 
 				state.UpdateStateObject(object)
 			}
+		case <-objectChan:
+			gui.loadAddressBook()
+		case <-peerChan:
+			gui.setPeerInfo()
 		}
 	}
 }
 
+func (gui *Gui) setPeerInfo() {
+	gui.win.Root().Call("setPeers", fmt.Sprintf("%d / %d", gui.eth.PeerCount(), gui.eth.MaxPeers))
+}
+
 // Logging functions that log directly to the GUI interface
 func (gui *Gui) Println(v ...interface{}) {
 	str := strings.TrimRight(fmt.Sprintln(v...), "\n")

ethereum/config.go

@@ -20,7 +20,6 @@ var UseSeed bool
 var ImportKey string
 var ExportKey bool
 var LogFile string
-var DataDir string
 var NonInteractive bool
 var StartJsConsole bool
 var InputFile string
@@ -31,22 +30,21 @@ func Init() {
 		flag.PrintDefaults()
 	}
 
-	flag.StringVar(&Identifier, "i", "", "custom client identifier")
+	flag.StringVar(&Identifier, "id", "", "Custom client identifier")
-	flag.BoolVar(&StartMining, "m", false, "start dagger mining")
+	flag.StringVar(&OutboundPort, "port", "30303", "listening port")
-	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.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.Parse()
 

ethereum/ethereum.go

@@ -59,7 +59,7 @@ func main() {
 		lt = ethutil.LogFile | ethutil.LogStd
 	}
 
-	ethutil.ReadConfig(DataDir, lt, Identifier)
+	ethutil.ReadConfig(".ethereum", lt, Identifier)
 
 	logger := ethutil.Config.Log
 

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