Merge pull request #14504 from bas-vk/wallet-import

cmd/geth: reintroduce wallet import subcommand
This commit is contained in:
Péter Szilágyi 2017-05-24 13:00:22 +03:00 committed by GitHub
commit 3b8915e387

View File

@ -32,7 +32,21 @@ import (
var ( var (
walletCommand = cli.Command{ walletCommand = cli.Command{
Name: "wallet", Name: "wallet",
Usage: "Import Ethereum presale wallets", Usage: "Manage Ethereum presale wallets",
ArgsUsage: "",
Category: "ACCOUNT COMMANDS",
Description: `
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{
{
Name: "import",
Usage: "Import Ethereum presale wallet",
ArgsUsage: "<keyFile>",
Action: utils.MigrateFlags(importWallet), Action: utils.MigrateFlags(importWallet),
Category: "ACCOUNT COMMANDS", Category: "ACCOUNT COMMANDS",
Flags: []cli.Flag{ Flags: []cli.Flag{
@ -46,10 +60,11 @@ var (
will prompt for your password and imports your ether presale account. will prompt for your password and imports your ether presale account.
It can be used non-interactively with the --password option taking a It can be used non-interactively with the --password option taking a
passwordfile as argument containing the wallet password in plaintext. passwordfile as argument containing the wallet password in plaintext.`,
},
`, },
} }
accountCommand = cli.Command{ accountCommand = cli.Command{
Name: "account", Name: "account",
Usage: "Manage accounts", Usage: "Manage accounts",