diff options
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 35 | ||||
| -rw-r--r-- | cmd/geth/usage.go | 1 |
2 files changed, 6 insertions, 30 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index f70a0bb67..9ac067209 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -48,10 +48,10 @@ import ( const ( ClientIdentifier = "Geth" - Version = "1.3.1" + Version = "1.3.2" VersionMajor = 1 VersionMinor = 3 - VersionPatch = 1 + VersionPatch = 2 ) var ( @@ -305,6 +305,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.OlympicFlag, utils.FastSyncFlag, utils.CacheFlag, + utils.LightKDFFlag, utils.JSpathFlag, utils.ListenPortFlag, utils.MaxPeersFlag, @@ -404,8 +405,6 @@ func makeDefaultExtra() []byte { } func run(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx) cfg.ExtraData = makeExtra(ctx) @@ -420,8 +419,6 @@ func run(ctx *cli.Context) { } func attach(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - var client comms.EthereumClient var err error if ctx.Args().Present() { @@ -453,8 +450,6 @@ func attach(ctx *cli.Context) { } func console(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx) cfg.ExtraData = makeExtra(ctx) @@ -487,8 +482,6 @@ func console(ctx *cli.Context) { } func execJSFiles(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx) ethereum, err := eth.New(cfg) if err != nil { @@ -514,8 +507,6 @@ func execJSFiles(ctx *cli.Context) { } func unlockAccount(ctx *cli.Context, am *accounts.Manager, addr string, i int, inputpassphrases []string) (addrHex, auth string, passphrases []string) { - utils.CheckLegalese(ctx.GlobalString(utils.DataDirFlag.Name)) - var err error passphrases = inputpassphrases addrHex, err = utils.ParamToAddress(addr, am) @@ -540,16 +531,12 @@ func unlockAccount(ctx *cli.Context, am *accounts.Manager, addr string, i int, i } func blockRecovery(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - - arg := ctx.Args().First() - if len(ctx.Args()) < 1 && len(arg) > 0 { + if len(ctx.Args()) < 1 { glog.Fatal("recover requires block number or hash") } + arg := ctx.Args().First() cfg := utils.MakeEthConfig(ClientIdentifier, nodeNameVersion, ctx) - utils.CheckLegalese(cfg.DataDir) - blockDb, err := ethdb.NewLDBDatabase(filepath.Join(cfg.DataDir, "blockchain"), cfg.DatabaseCache) if err != nil { glog.Fatalln("could not open db:", err) @@ -610,8 +597,6 @@ func startEth(ctx *cli.Context, eth *eth.Ethereum) { } func accountList(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - am := utils.MakeAccountManager(ctx) accts, err := am.Accounts() if err != nil { @@ -663,8 +648,6 @@ func getPassPhrase(ctx *cli.Context, desc string, confirmation bool, i int, inpu } func accountCreate(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - am := utils.MakeAccountManager(ctx) passphrase, _ := getPassPhrase(ctx, "Your new account is locked with a password. Please give a password. Do not forget this password.", true, 0, nil) acct, err := am.NewAccount(passphrase) @@ -675,8 +658,6 @@ func accountCreate(ctx *cli.Context) { } func accountUpdate(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - am := utils.MakeAccountManager(ctx) arg := ctx.Args().First() if len(arg) == 0 { @@ -692,8 +673,6 @@ func accountUpdate(ctx *cli.Context) { } func importWallet(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - keyfile := ctx.Args().First() if len(keyfile) == 0 { utils.Fatalf("keyfile must be given as argument") @@ -714,8 +693,6 @@ func importWallet(ctx *cli.Context) { } func accountImport(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - keyfile := ctx.Args().First() if len(keyfile) == 0 { utils.Fatalf("keyfile must be given as argument") @@ -730,8 +707,6 @@ func accountImport(ctx *cli.Context) { } func makedag(ctx *cli.Context) { - utils.CheckLegalese(utils.MustDataDir(ctx)) - args := ctx.Args() wrongArgs := func() { utils.Fatalf(`Usage: geth makedag <block number> <outputdir>`) diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 9223b7cd6..5c09e29ce 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -69,6 +69,7 @@ var AppHelpFlagGroups = []flagGroup{ utils.GenesisFileFlag, utils.IdentityFlag, utils.FastSyncFlag, + utils.LightKDFFlag, utils.CacheFlag, utils.BlockchainVersionFlag, }, |