forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Command line now overrides saved config, saved config overrides system default

Browse source
This commit is contained in:
nolash 2016-12-22 00:54:29 +01:00
parent 0ee796632a
commit b520d7caa5
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cmd/swarm/main.go
View file

@ -39,7 +39,7 @@ import (
"github.com/ethereum/go-ethereum/p2p/discover" "github.com/ethereum/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/swarm" "github.com/ethereum/go-ethereum/swarm"
bzzapi "github.com/ethereum/go-ethereum/swarm/api" 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" "gopkg.in/urfave/cli.v1"
) )
@ -76,7 +76,8 @@ var (
SwarmNetworkIdFlag = cli.IntFlag{ SwarmNetworkIdFlag = cli.IntFlag{
Name: "bzznetworkid", Name: "bzznetworkid",
Usage: "Network identifier (integer, default 3=swarm testnet)", 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{ SwarmConfigPathFlag = cli.StringFlag{
Name: "bzzconfig", Name: "bzzconfig",
@ -237,6 +238,7 @@ func bzzd(ctx *cli.Context) error {
} }
func registerBzzService(ctx *cli.Context, stack *node.Node) { func registerBzzService(ctx *cli.Context, stack *node.Node) {
prvkey := getAccount(ctx, stack) prvkey := getAccount(ctx, stack)
chbookaddr := common.HexToAddress(ctx.GlobalString(ChequebookAddrFlag.Name)) chbookaddr := common.HexToAddress(ctx.GlobalString(ChequebookAddrFlag.Name))
@ -244,6 +246,7 @@ func registerBzzService(ctx *cli.Context, stack *node.Node) {
if bzzdir == "" { if bzzdir == "" {
bzzdir = stack.InstanceDir() bzzdir = stack.InstanceDir()
} }
bzzconfig, err := bzzapi.NewConfig(bzzdir, chbookaddr, prvkey, ctx.GlobalUint64(SwarmNetworkIdFlag.Name)) bzzconfig, err := bzzapi.NewConfig(bzzdir, chbookaddr, prvkey, ctx.GlobalUint64(SwarmNetworkIdFlag.Name))
if err != nil { if err != nil {
utils.Fatalf("unable to configure swarm: %v", err) 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 { func getAccount(ctx *cli.Context, stack *node.Node) *ecdsa.PrivateKey {
keyid := ctx.GlobalString(SwarmAccountFlag.Name) keyid := ctx.GlobalString(SwarmAccountFlag.Name)
if keyid == "" { if keyid == "" {
utils.Fatalf("Option %q is required", SwarmAccountFlag.Name) utils.Fatalf("Option %q is required", SwarmAccountFlag.Name)
} }

16
swarm/api/config.go
View file

@ -70,7 +70,7 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
pubkey := crypto.FromECDSAPub(&prvKey.PublicKey) pubkey := crypto.FromECDSAPub(&prvKey.PublicKey)
pubkeyhex := common.ToHex(pubkey) pubkeyhex := common.ToHex(pubkey)
keyhex := crypto.Sha3Hash(pubkey).Hex() keyhex := crypto.Sha3Hash(pubkey).Hex()
self = &Config{ self = &Config{
SyncParams: network.NewSyncParams(dirpath), SyncParams: network.NewSyncParams(dirpath),
HiveParams: network.NewHiveParams(dirpath), HiveParams: network.NewHiveParams(dirpath),
@ -85,10 +85,16 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
NetworkId: networkId, NetworkId: networkId,
} }
data, err = ioutil.ReadFile(confpath) data, err = ioutil.ReadFile(confpath)
if networkId == 0 {
self.NetworkId = network.NetworkId
}
if err != nil { if err != nil {
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
return return
} }
// file does not exist // file does not exist
// write out config file // write out config file
err = self.Save() err = self.Save()
@ -97,6 +103,7 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
} }
return return
} }
// file exists, deserialise // file exists, deserialise
err = json.Unmarshal(data, self) err = json.Unmarshal(data, self)
if err != nil { if err != nil {
@ -109,8 +116,13 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
if keyhex != self.BzzKey { if keyhex != self.BzzKey {
return nil, fmt.Errorf("bzz key does not match the one in the config file %v != %v", 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) self.Swap.SetKey(prvKey)
if (self.EnsRoot == common.Address{}) { if (self.EnsRoot == common.Address{}) {
self.EnsRoot = ensRootAddress self.EnsRoot = ensRootAddress
} }