diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/faucet/faucet.go | 2 | ||||
| -rw-r--r-- | cmd/geth/accountcmd.go | 45 | ||||
| -rw-r--r-- | cmd/swarm/main.go | 8 |
3 files changed, 39 insertions, 16 deletions
diff --git a/cmd/faucet/faucet.go b/cmd/faucet/faucet.go index f672433ee..c06c4365b 100644 --- a/cmd/faucet/faucet.go +++ b/cmd/faucet/faucet.go @@ -102,7 +102,7 @@ func main() { if amount == 1 { amounts[i] = strings.TrimSuffix(amounts[i], "s") } - // Calcualte the period for th enext tier and format it + // Calculate the period for the next tier and format it period := *minutesFlag * int(math.Pow(3, float64(i))) periods[i] = fmt.Sprintf("%d mins", period) if period%60 == 0 { diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index 1a3c63da9..5c756e66d 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -31,25 +31,40 @@ import ( var ( walletCommand = cli.Command{ - Name: "wallet", - Usage: "Import Ethereum presale wallets", - Action: utils.MigrateFlags(importWallet), - Category: "ACCOUNT COMMANDS", - Flags: []cli.Flag{ - utils.DataDirFlag, - utils.KeyStoreDirFlag, - utils.PasswordFileFlag, - utils.LightKDFFlag, - }, + Name: "wallet", + Usage: "Manage Ethereum presale wallets", + ArgsUsage: "", + Category: "ACCOUNT COMMANDS", Description: ` - geth wallet [options] /path/to/my/presale.wallet + geth wallet import /path/to/my/presale.wallet + +will prompt for your password and imports your ether presale account. +It can be used non-interactively with the --password option taking a +passwordfile as argument containing the wallet password in plaintext.`, + Subcommands: []cli.Command{ + { - will prompt for your password and imports your ether presale account. - It can be used non-interactively with the --password option taking a - passwordfile as argument containing the wallet password in plaintext. + Name: "import", + Usage: "Import Ethereum presale wallet", + ArgsUsage: "<keyFile>", + Action: utils.MigrateFlags(importWallet), + Category: "ACCOUNT COMMANDS", + Flags: []cli.Flag{ + utils.DataDirFlag, + utils.KeyStoreDirFlag, + utils.PasswordFileFlag, + utils.LightKDFFlag, + }, + Description: ` + geth wallet [options] /path/to/my/presale.wallet - `, +will prompt for your password and imports your ether presale account. +It can be used non-interactively with the --password option taking a +passwordfile as argument containing the wallet password in plaintext.`, + }, + }, } + accountCommand = cli.Command{ Name: "account", Usage: "Manage accounts", diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go index 26aa3e50f..71149c310 100644 --- a/cmd/swarm/main.go +++ b/cmd/swarm/main.go @@ -67,6 +67,10 @@ var ( Name: "bzzaccount", Usage: "Swarm account key file", } + SwarmListenAddrFlag = cli.StringFlag{ + Name: "httpaddr", + Usage: "Swarm HTTP API listening interface", + } SwarmPortFlag = cli.StringFlag{ Name: "bzzport", Usage: "Swarm local http api port", @@ -249,6 +253,7 @@ Cleans database of corrupted entries. SwarmConfigPathFlag, SwarmSwapEnabledFlag, SwarmSyncEnabledFlag, + SwarmListenAddrFlag, SwarmPortFlag, SwarmAccountFlag, SwarmNetworkIdFlag, @@ -345,6 +350,9 @@ func registerBzzService(ctx *cli.Context, stack *node.Node) { if len(bzzport) > 0 { bzzconfig.Port = bzzport } + if bzzaddr := ctx.GlobalString(SwarmListenAddrFlag.Name); bzzaddr != "" { + bzzconfig.ListenAddr = bzzaddr + } swapEnabled := ctx.GlobalBool(SwarmSwapEnabledFlag.Name) syncEnabled := ctx.GlobalBoolT(SwarmSyncEnabledFlag.Name) |