aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2015-04-22 07:41:34 +0800
committerzelig <viktor.tron@gmail.com>2015-04-24 19:45:11 +0800
commit7b2f25b57886133e3dd09f3ea0b0a7f188755965 (patch)
tree80300d920798b00bb11d20d085db0c1f63729efc /cmd/geth
parent22450c069b181e362710b71a763549cc6bc3e29b (diff)
downloadgo-tangerine-7b2f25b57886133e3dd09f3ea0b0a7f188755965.tar
go-tangerine-7b2f25b57886133e3dd09f3ea0b0a7f188755965.tar.gz
go-tangerine-7b2f25b57886133e3dd09f3ea0b0a7f188755965.tar.bz2
go-tangerine-7b2f25b57886133e3dd09f3ea0b0a7f188755965.tar.lz
go-tangerine-7b2f25b57886133e3dd09f3ea0b0a7f188755965.tar.xz
go-tangerine-7b2f25b57886133e3dd09f3ea0b0a7f188755965.tar.zst
go-tangerine-7b2f25b57886133e3dd09f3ea0b0a7f188755965.zip
cli: clean up flag descriptions, usage docs, account list uses primary and indexes, add help line to account subcnd usage
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/admin.go4
-rw-r--r--cmd/geth/main.go18
2 files changed, 9 insertions, 13 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go
index b9a455a0d..646b45bf9 100644
--- a/cmd/geth/admin.go
+++ b/cmd/geth/admin.go
@@ -283,10 +283,6 @@ func (js *jsre) unlock(call otto.FunctionCall) otto.Value {
}
}
am := js.ethereum.AccountManager()
- // err := am.Unlock(common.FromHex(split[0]), split[1])
- // if err != nil {
- // utils.Fatalf("Unlock account failed '%v'", err)
- // }
err = am.TimedUnlock(common.FromHex(addr), passphrase, time.Duration(seconds)*time.Second)
if err != nil {
fmt.Printf("Unlock account failed '%v'\n", err)
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index e399731e7..a155e0a33 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -97,6 +97,8 @@ The output of this command is supposed to be machine-readable.
Manage accounts lets you create new accounts, list all existing accounts,
import a private key into a new account.
+'account help' shows a list of subcommands or help for one subcommand.
+
It supports interactive mode, when you are prompted for password as well as
non-interactive mode where passwords are supplied via a given password file.
Non-interactive mode is only meant for scripted use on test networks or known
@@ -186,8 +188,8 @@ Use "ethereum dump 0" to dump the genesis block.
Usage: `Geth Console: interactive JavaScript environment`,
Description: `
The Geth console is an interactive shell for the JavaScript runtime environment
-which exposes a node admin interface as well as the DAPP JavaScript API.
-See https://github.com/ethereum/go-ethereum/wiki/Frontier-Console
+which exposes a node admin interface as well as the Ðapp JavaScript API.
+See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console
`,
},
{
@@ -195,7 +197,7 @@ See https://github.com/ethereum/go-ethereum/wiki/Frontier-Console
Name: "js",
Usage: `executes the given JavaScript files in the Geth JavaScript VM`,
Description: `
-The JavaScript VM exposes a node admin interface as well as the DAPP
+The JavaScript VM exposes a node admin interface as well as the Ðapp
JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console
`,
},
@@ -261,10 +263,6 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
// flag.BoolVar(&DiffTool, "difftool", false, "creates output for diff'ing. Sets LogLevel=0")
// flag.StringVar(&DiffType, "diff", "all", "sets the level of diff output [vm, all]. Has no effect if difftool=false")
- // potential subcommands:
- // flag.StringVar(&SecretFile, "import", "", "imports the file given (hex or mnemonic formats)")
- // flag.StringVar(&ExportDir, "export", "", "exports the session keyring to files in the directory given")
- // flag.BoolVar(&GenAddr, "genaddr", false, "create a new priv/pub key")
}
func main() {
@@ -369,8 +367,10 @@ func accountList(ctx *cli.Context) {
if err != nil {
utils.Fatalf("Could not list accounts: %v", err)
}
- for _, acct := range accts {
- fmt.Printf("Address: %x\n", acct)
+ name := "Primary"
+ for i, acct := range accts {
+ fmt.Printf("%s #%d: %x\n", name, i, acct)
+ name = "Account"
}
}