Merge branch 'master' into collator-tests

Former-commit-id: 68ed6c0ccf87dd910d7a1bf5cbf87f900b9ea5a4 [formerly 583e51372f30e158a7fc7a42463e90182a152101]
Former-commit-id: c3c3c3c6e2f59ff6e25e897c24e436b14ffd993a

cmd/geth/shardingcmd.go

@@ -14,7 +14,7 @@ var (
 		Aliases:   []string{"shard"},
 		Usage:     "Start a sharding client",
 		ArgsUsage: "[endpoint]",
-		Flags:     []cli.Flag{utils.DataDirFlag, utils.PasswordFileFlag, utils.NetworkIdFlag},
+		Flags:     []cli.Flag{utils.DataDirFlag, utils.PasswordFileFlag, utils.NetworkIdFlag,utils.IPCPathFlag},
 		Category:  "SHARDING COMMANDS",
 		Description: `
 Launches a sharding client that connects to a running geth node and proposes collations to a Validator Manager Contract. This feature is a work in progress.

sharding/client.go

@@ -49,6 +49,9 @@ func MakeShardingClient(ctx *cli.Context) *Client {
 	if endpoint == "" {
 		endpoint = fmt.Sprintf("%s/%s.ipc", path, clientIdentifier)
 	}
+	if ctx.GlobalIsSet(utils.IPCPathFlag.Name) {
+		endpoint = ctx.GlobalString(utils.IPCPathFlag.Name)
+	}
 
 	config := &node.Config{
 		DataDir: path,

sharding/genesis.json

@@ -1,14 +0,0 @@
-{
-    "config": {
-        "chainId": 12345,
-        "homesteadBlock": 0,
-        "eip155Block": 0,
-        "eip158Block": 0
-    },
-    "difficulty": "200",
-    "gasLimit": "210000000000",
-    "alloc": {
-        "826f3F66dB0416ea82033aE917A611bfBF4D98b6": { "balance": "300000" },
-        "Dd0cbc3AE49DD62915877ebFa6050cad362B83Ad": { "balance": "400000" }
-    }
-}