Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

Conflicts:
	ethereal/ethereum.go
	ethereum/ethereum.go

5 files changed, 8 insertions, 4 deletions

diff --git a/ethereal/assets/qml/webapp.qml b/ethereal/assets/qml/webapp.qml
index 1f3c3874a..14f3bd6d0 100644
--- a/ethereal/assets/qml/webapp.qml
+++ b/ethereal/assets/qml/webapp.qml
@@ -48,11 +48,11 @@ ApplicationWindow {
 				try {
 					switch(data.call) {
 					case "getBlockByNumber":
-						var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")	
+						var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
 						postData(data._seed, block)
 						break
 					case "getBlockByHash":
-						var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")	
+						var block = eth.getBlock("b9b56cf6f907fbee21db0cd7cbc0e6fea2fe29503a3943e275c5e467d649cb06")
 						postData(data._seed, block)
 						break
 					case "transact":
diff --git a/ethereal/config.go b/ethereal/config.go
index 94f896c5f..e4bdb0a00 100644
--- a/ethereal/config.go
+++ b/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)")
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go
index fd8c56dae..15a454bdf 100644
--- a/ethereal/ethereum.go
+++ b/ethereal/ethereum.go
@@ -100,7 +100,7 @@ func main() {
 	}
 
 	if StartRpc {
-		ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum))
+		ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort)
 		if err != nil {
 			log.Println("Could not start RPC interface:", err)
 		} else {
diff --git a/ethereum/config.go b/ethereum/config.go
index 234e79f12..7ca1a9801 100644
--- a/ethereum/config.go
+++ b/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")
diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go
index b60eb4181..5b578deba 100644
--- a/ethereum/ethereum.go
+++ b/ethereum/ethereum.go
@@ -133,7 +133,7 @@ func main() {
 		go console.Start()
 	}
 	if StartRpc {
-		ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum))
+		ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort)
 		if err != nil {
 			logger.Infoln("Could not start RPC interface:", err)
 		} else {