From b520d7caa5f8a3307559db245974f0243b7908fd Mon Sep 17 00:00:00 2001
From: nolash <dev@holbrook.no>
Date: Thu, 22 Dec 2016 00:54:29 +0100
Subject: [PATCH] Command line now overrides saved config, saved config
 overrides system default

---
 cmd/swarm/main.go   |  8 ++++++--
 swarm/api/config.go | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go
index 04930760ee..3551a59da4 100644
--- a/cmd/swarm/main.go
+++ b/cmd/swarm/main.go
@@ -39,7 +39,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/discover"
 	"github.com/ethereum/go-ethereum/swarm"
 	bzzapi "github.com/ethereum/go-ethereum/swarm/api"
-	"github.com/ethereum/go-ethereum/swarm/network"
+	//"github.com/ethereum/go-ethereum/swarm/network"
 	"gopkg.in/urfave/cli.v1"
 )
 
@@ -76,7 +76,8 @@ var (
 	SwarmNetworkIdFlag = cli.IntFlag{
 		Name:  "bzznetworkid",
 		Usage: "Network identifier (integer, default 3=swarm testnet)",
-		Value: network.NetworkId,
+		// defining this here means we can't distinguish if it was passed at cmd line or system default when deciding to use saved values from config
+		//Value: network.NetworkId, 
 	}
 	SwarmConfigPathFlag = cli.StringFlag{
 		Name:  "bzzconfig",
@@ -237,6 +238,7 @@ func bzzd(ctx *cli.Context) error {
 }
 
 func registerBzzService(ctx *cli.Context, stack *node.Node) {
+	
 	prvkey := getAccount(ctx, stack)
 
 	chbookaddr := common.HexToAddress(ctx.GlobalString(ChequebookAddrFlag.Name))
@@ -244,6 +246,7 @@ func registerBzzService(ctx *cli.Context, stack *node.Node) {
 	if bzzdir == "" {
 		bzzdir = stack.InstanceDir()
 	}
+	
 	bzzconfig, err := bzzapi.NewConfig(bzzdir, chbookaddr, prvkey, ctx.GlobalUint64(SwarmNetworkIdFlag.Name))
 	if err != nil {
 		utils.Fatalf("unable to configure swarm: %v", err)
@@ -274,6 +277,7 @@ func registerBzzService(ctx *cli.Context, stack *node.Node) {
 
 func getAccount(ctx *cli.Context, stack *node.Node) *ecdsa.PrivateKey {
 	keyid := ctx.GlobalString(SwarmAccountFlag.Name)
+	
 	if keyid == "" {
 		utils.Fatalf("Option %q is required", SwarmAccountFlag.Name)
 	}
diff --git a/swarm/api/config.go b/swarm/api/config.go
index 14a559c75d..72822f3d98 100644
--- a/swarm/api/config.go
+++ b/swarm/api/config.go
@@ -70,7 +70,7 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
 	pubkey := crypto.FromECDSAPub(&prvKey.PublicKey)
 	pubkeyhex := common.ToHex(pubkey)
 	keyhex := crypto.Sha3Hash(pubkey).Hex()
-
+		
 	self = &Config{
 		SyncParams:    network.NewSyncParams(dirpath),
 		HiveParams:    network.NewHiveParams(dirpath),
@@ -85,10 +85,16 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
 		NetworkId:     networkId,
 	}
 	data, err = ioutil.ReadFile(confpath)
+
+	if networkId == 0 {
+		self.NetworkId = network.NetworkId
+	}
+		
 	if err != nil {
 		if !os.IsNotExist(err) {
 			return
 		}
+		
 		// file does not exist
 		// write out config file
 		err = self.Save()
@@ -97,6 +103,7 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
 		}
 		return
 	}
+	
 	// file exists, deserialise
 	err = json.Unmarshal(data, self)
 	if err != nil {
@@ -109,8 +116,13 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
 	if keyhex != self.BzzKey {
 		return nil, fmt.Errorf("bzz key does not match the one in the config file %v != %v", keyhex, self.BzzKey)
 	}
+	
+	if networkId != 0 {
+		self.NetworkId = networkId
+	}
+	
 	self.Swap.SetKey(prvKey)
-
+	
 	if (self.EnsRoot == common.Address{}) {
 		self.EnsRoot = ensRootAddress
 	}