aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth
diff options
context:
space:
mode:
authorBas van Kervel <basvankervel@gmail.com>2017-05-23 23:45:26 +0800
committerBas van Kervel <basvankervel@gmail.com>2017-05-23 23:45:26 +0800
commit437ceaa9be139b670c9c9046d5b81799fce1e8fd (patch)
tree5b4ad53080e705b1e78f227c4e9568d6e9507192 /cmd/geth
parent3556962053267def82f1a9f9e97a26f7b7c1450e (diff)
downloaddexon-437ceaa9be139b670c9c9046d5b81799fce1e8fd.tar
dexon-437ceaa9be139b670c9c9046d5b81799fce1e8fd.tar.gz
dexon-437ceaa9be139b670c9c9046d5b81799fce1e8fd.tar.bz2
dexon-437ceaa9be139b670c9c9046d5b81799fce1e8fd.tar.lz
dexon-437ceaa9be139b670c9c9046d5b81799fce1e8fd.tar.xz
dexon-437ceaa9be139b670c9c9046d5b81799fce1e8fd.tar.zst
dexon-437ceaa9be139b670c9c9046d5b81799fce1e8fd.zip
cmd/geth: reintroduce wallet import subcommand
Diffstat (limited to 'cmd/geth')
-rw-r--r--cmd/geth/accountcmd.go45
1 files changed, 30 insertions, 15 deletions
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",