From 5ff0814b1f4f739cc7d9d244fa5855d28061194a Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Tue, 3 Nov 2015 11:48:04 +0100 Subject: VERSION, cmd/geth: bumped version 1.4.0 --- cmd/geth/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd/geth') diff --git a/cmd/geth/main.go b/cmd/geth/main.go index f752029b7..e74ddd0d0 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -48,9 +48,9 @@ import ( const ( ClientIdentifier = "Geth" - Version = "1.3.0-dev" + Version = "1.4.0-unstable" VersionMajor = 1 - VersionMinor = 3 + VersionMinor = 4 VersionPatch = 0 ) -- cgit v1.2.3 From 90655736ed11859d185849f4f5a374b30095d932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 5 Nov 2015 11:53:50 +0200 Subject: cmd/geth: fix recover command crash if no param is supplied --- cmd/geth/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd/geth') diff --git a/cmd/geth/main.go b/cmd/geth/main.go index e74ddd0d0..0fb654eed 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -542,10 +542,10 @@ 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) -- cgit v1.2.3 From 9aa77a37690397b7450e86c411918b4c524a7065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 10 Nov 2015 15:47:19 +0200 Subject: cmd/geth, cmd/utils: surface the light KDF flag to the CLI --- cmd/geth/main.go | 1 + cmd/geth/usage.go | 1 + 2 files changed, 2 insertions(+) (limited to 'cmd/geth') diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 0fb654eed..d63d20580 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -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, 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, }, -- cgit v1.2.3 From 1c63d08ed1ec52a250fdef98fdb8694cea685bf8 Mon Sep 17 00:00:00 2001 From: Jeffrey Wilcke Date: Thu, 19 Nov 2015 11:55:38 +0100 Subject: cmd/geth, cmd/utils: removed legalese Removed the legalese confirmation dialog. This closes #1992 --- cmd/geth/main.go | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'cmd/geth') diff --git a/cmd/geth/main.go b/cmd/geth/main.go index d63d20580..82bc21ab0 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -405,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) @@ -421,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() { @@ -454,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) @@ -488,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 { @@ -515,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) @@ -541,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)) - 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) @@ -611,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 { @@ -664,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) @@ -676,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 { @@ -693,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") @@ -715,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") @@ -731,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 `) -- cgit v1.2.3