From a3fb41981e49fd90d8c76b371782831f243a919e Mon Sep 17 00:00:00 2001 From: zelig Date: Tue, 21 Apr 2015 10:47:40 +0100 Subject: cmd/admin: rename debug.block to debug.processBlock; move backtrace under debug --- cmd/geth/admin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd') diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index e75ff047a..c23fe9b43 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -35,7 +35,6 @@ func (js *jsre) adminBindings() { admin.Set("import", js.importChain) admin.Set("export", js.exportChain) admin.Set("verbosity", js.verbosity) - admin.Set("backtrace", js.backtrace) admin.Set("progress", js.downloadProgress) admin.Set("miner", struct{}{}) @@ -49,11 +48,12 @@ func (js *jsre) adminBindings() { admin.Set("debug", struct{}{}) t, _ = admin.Get("debug") debug := t.Object() + debug.Set("backtrace", js.backtrace) debug.Set("printBlock", js.printBlock) debug.Set("dumpBlock", js.dumpBlock) debug.Set("getBlockRlp", js.getBlockRlp) debug.Set("setHead", js.setHead) - debug.Set("block", js.debugBlock) + debug.Set("processBlock", js.debugBlock) } func (js *jsre) getBlock(call otto.FunctionCall) (*types.Block, error) { -- cgit v1.2.3 From 22450c069b181e362710b71a763549cc6bc3e29b Mon Sep 17 00:00:00 2001 From: zelig Date: Tue, 21 Apr 2015 18:08:47 +0100 Subject: js console: add cors domain optional argument to startRpc --- cmd/geth/admin.go | 11 ++++++++++- cmd/geth/js_test.go | 14 +++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'cmd') diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index c23fe9b43..b9a455a0d 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -209,10 +209,19 @@ func (js *jsre) startRPC(call otto.FunctionCall) otto.Value { return otto.FalseValue() } + var corsDomain string + if len(call.ArgumentList) > 2 { + corsDomain, err = call.Argument(2).ToString() + if err != nil { + fmt.Println(err) + return otto.FalseValue() + } + } + config := rpc.RpcConfig{ ListenAddress: addr, ListenPort: uint(port), - // CorsDomain: ctx.GlobalString(RPCCORSDomainFlag.Name), + CorsDomain: corsDomain, } xeth := xeth.New(js.ethereum, nil) diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 521039121..662e195e5 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -3,16 +3,16 @@ package main import ( "fmt" "io/ioutil" - "path/filepath" "os" "path" + "path/filepath" "testing" "github.com/ethereum/go-ethereum/accounts" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/eth" - "runtime" "regexp" + "runtime" "strconv" ) @@ -70,8 +70,8 @@ func TestAccounts(t *testing.T) { t.Errorf("address not hex: %q", addr) } - checkEvalJSON(t, repl, `eth.accounts`, `["` + addr + `"]`) - checkEvalJSON(t, repl, `eth.coinbase`, `"` + addr + `"`) + checkEvalJSON(t, repl, `eth.accounts`, `["`+addr+`"]`) + checkEvalJSON(t, repl, `eth.coinbase`, `"`+addr+`"`) } func TestBlockChain(t *testing.T) { @@ -97,13 +97,13 @@ func TestBlockChain(t *testing.T) { tmpfile := filepath.Join(tmp, "export.chain") tmpfileq := strconv.Quote(tmpfile) - checkEvalJSON(t, repl, `admin.export(` + tmpfileq + `)`, `true`) + checkEvalJSON(t, repl, `admin.export(`+tmpfileq+`)`, `true`) if _, err := os.Stat(tmpfile); err != nil { t.Fatal(err) } // check import, verify that dumpBlock gives the same result. - checkEvalJSON(t, repl, `admin.import(` + tmpfileq + `)`, `true`) + checkEvalJSON(t, repl, `admin.import(`+tmpfileq+`)`, `true`) checkEvalJSON(t, repl, `admin.debug.dumpBlock()`, beforeExport) } @@ -129,7 +129,7 @@ func TestRPC(t *testing.T) { } func checkEvalJSON(t *testing.T, re *jsre, expr, want string) error { - val, err := re.re.Run("JSON.stringify("+ expr + ")") + val, err := re.re.Run("JSON.stringify(" + expr + ")") if err == nil && val.String() != want { err = fmt.Errorf("Output mismatch for `%s`:\ngot: %s\nwant: %s", expr, val.String(), want) } -- cgit v1.2.3 From 7b2f25b57886133e3dd09f3ea0b0a7f188755965 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 22 Apr 2015 00:41:34 +0100 Subject: cli: clean up flag descriptions, usage docs, account list uses primary and indexes, add help line to account subcnd usage --- cmd/geth/admin.go | 4 ---- cmd/geth/main.go | 18 +++++++++--------- cmd/utils/flags.go | 32 ++++++++++++++++---------------- 3 files changed, 25 insertions(+), 29 deletions(-) (limited to 'cmd') 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" } } diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index b8f3982e2..78d9c7afd 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -79,22 +79,22 @@ var ( } ProtocolVersionFlag = cli.IntFlag{ Name: "protocolversion", - Usage: "ETH protocol version", + Usage: "ETH protocol version (integer)", Value: eth.ProtocolVersion, } NetworkIdFlag = cli.IntFlag{ Name: "networkid", - Usage: "Network Id", + Usage: "Network Id (integer)", Value: eth.NetworkId, } BlockchainVersionFlag = cli.IntFlag{ Name: "blockchainversion", - Usage: "Blockchain version", + Usage: "Blockchain version (integer)", Value: core.BlockChainVersion, } IdentityFlag = cli.StringFlag{ Name: "identity", - Usage: "node name", + Usage: "Custom node name", } NatspecEnabledFlag = cli.BoolFlag{ Name: "natspec", @@ -113,18 +113,18 @@ var ( } EtherbaseFlag = cli.StringFlag{ Name: "etherbase", - Usage: "public address for block mining rewards. By default the address of your primary account is used", + Usage: "Public address for block mining rewards. By default the address of your primary account is used", Value: "primary", } UnlockedAccountFlag = cli.StringFlag{ Name: "unlock", - Usage: "unlock the account given until this program exits (prompts for password). '--unlock primary' unlocks the primary account", + Usage: "Unlock the account given until this program exits (prompts for password). '--unlock primary' unlocks the primary account", Value: "", } PasswordFileFlag = cli.StringFlag{ Name: "password", - Usage: "Path to password file for (un)locking an existing account.", + Usage: "Path to password file to use with options and subcommands needing a password", Value: "", } @@ -135,7 +135,7 @@ var ( } LogLevelFlag = cli.IntFlag{ Name: "loglevel", - Usage: "0-5 (silent, error, warn, info, debug, debug detail)", + Usage: "Logging verbosity: 0-6 (0=silent, 1=error, 2=warn, 3=info, 4=core, 5=debug, 6=debug detail)", Value: int(logger.InfoLevel), } LogJSONFlag = cli.StringFlag{ @@ -149,7 +149,7 @@ var ( } LogVModuleFlag = cli.GenericFlag{ Name: "vmodule", - Usage: "The syntax of the argument is a comma-separated list of pattern=N, where pattern is a literal file name (minus the \".go\" suffix) or \"glob\" pattern and N is a V level.", + Usage: "The syntax of the argument is a comma-separated list of pattern=N, where pattern is a literal file name (minus the \".go\" suffix) or \"glob\" pattern and N is a log verbosity level.", Value: glog.GetVModule(), } VMDebugFlag = cli.BoolFlag{ @@ -158,12 +158,12 @@ var ( } BacktraceAtFlag = cli.GenericFlag{ Name: "backtrace_at", - Usage: "When set to a file and line number holding a logging statement a stack trace will be written to the Info log", + Usage: "If set to a file and line number (e.g., \"block.go:271\") holding a logging statement, a stack trace will be logged", Value: glog.GetTraceLocation(), } PProfEanbledFlag = cli.BoolFlag{ Name: "pprof", - Usage: "Whether the profiling server should be enabled", + Usage: "Enable the profiling server on localhost", } PProfPortFlag = cli.IntFlag{ Name: "pprofport", @@ -174,7 +174,7 @@ var ( // RPC settings RPCEnabledFlag = cli.BoolFlag{ Name: "rpc", - Usage: "Whether RPC server is enabled", + Usage: "Enable the JSON-RPC server", } RPCListenAddrFlag = cli.StringFlag{ Name: "rpcaddr", @@ -194,7 +194,7 @@ var ( // Network Settings MaxPeersFlag = cli.IntFlag{ Name: "maxpeers", - Usage: "Maximum number of network peers", + Usage: "Maximum number of network peers (network disabled if set to 0)", Value: 16, } ListenPortFlag = cli.IntFlag{ @@ -204,7 +204,7 @@ var ( } BootnodesFlag = cli.StringFlag{ Name: "bootnodes", - Usage: "Space-separated enode URLs for discovery bootstrap", + Usage: "Space-separated enode URLs of initial peers to connect to", Value: "", } NodeKeyFileFlag = cli.StringFlag{ @@ -217,12 +217,12 @@ var ( } NATFlag = cli.StringFlag{ Name: "nat", - Usage: "Port mapping mechanism (any|none|upnp|pmp|extip:)", + Usage: "NAT port mapping mechanism (any|none|upnp|pmp|extip:)", Value: "any", } WhisperEnabledFlag = cli.BoolFlag{ Name: "shh", - Usage: "Whether the whisper sub-protocol is enabled", + Usage: "Enable whisper", } JSpathFlag = cli.StringFlag{ Name: "jspath", -- cgit v1.2.3 From 6512b23b98de070f9b68fed4f1530f66dfea4b66 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 22 Apr 2015 00:47:17 +0100 Subject: cli: fatal error if rpc could not be started --- cmd/geth/main.go | 4 +++- cmd/utils/flags.go | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'cmd') diff --git a/cmd/geth/main.go b/cmd/geth/main.go index a155e0a33..083d1c88a 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -354,7 +354,9 @@ func startEth(ctx *cli.Context, eth *eth.Ethereum) { } // Start auxiliary services if enabled. if ctx.GlobalBool(utils.RPCEnabledFlag.Name) { - utils.StartRPC(eth, ctx) + if err := utils.StartRPC(eth, ctx); err != nil { + utils.Fatalf("Error starting RPC: %v", err) + } } if ctx.GlobalBool(utils.MiningEnabledFlag.Name) { eth.StartMining() diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 78d9c7afd..53e2694c5 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -330,7 +330,7 @@ func GetAccountManager(ctx *cli.Context) *accounts.Manager { return accounts.NewManager(ks) } -func StartRPC(eth *eth.Ethereum, ctx *cli.Context) { +func StartRPC(eth *eth.Ethereum, ctx *cli.Context) error { config := rpc.RpcConfig{ ListenAddress: ctx.GlobalString(RPCListenAddrFlag.Name), ListenPort: uint(ctx.GlobalInt(RPCPortFlag.Name)), @@ -338,7 +338,7 @@ func StartRPC(eth *eth.Ethereum, ctx *cli.Context) { } xeth := xeth.New(eth, nil) - _ = rpc.Start(xeth, config) + return rpc.Start(xeth, config) } func StartPProf(ctx *cli.Context) { -- cgit v1.2.3 From 1b7c017076ae578a89a18b5c7ffc61e9c8d59eee Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 22 Apr 2015 01:36:28 +0100 Subject: cli: fatal error if no etherbase for mining --- cmd/geth/main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 083d1c88a..70be2ed2e 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -359,7 +359,9 @@ func startEth(ctx *cli.Context, eth *eth.Ethereum) { } } if ctx.GlobalBool(utils.MiningEnabledFlag.Name) { - eth.StartMining() + if err := eth.StartMining(); err != nil { + utils.Fatalf("%v", err) + } } } -- cgit v1.2.3 From 6b1b5a4a2a8b315f4d0e7a08ab10563653711a92 Mon Sep 17 00:00:00 2001 From: zelig Date: Wed, 22 Apr 2015 14:55:01 +0100 Subject: cli/js console: if corsDomain is not given to startRpc, we fall back to value set on command line with `-corsDomain` --- cmd/geth/admin.go | 3 ++- cmd/geth/js.go | 16 +++++++++------- cmd/geth/js_test.go | 2 +- cmd/geth/main.go | 4 ++-- 4 files changed, 14 insertions(+), 11 deletions(-) (limited to 'cmd') diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index 646b45bf9..31f8d4400 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -203,13 +203,14 @@ func (js *jsre) startRPC(call otto.FunctionCall) otto.Value { fmt.Println(err) return otto.FalseValue() } + port, err := call.Argument(1).ToInteger() if err != nil { fmt.Println(err) return otto.FalseValue() } - var corsDomain string + corsDomain := js.corsDomain if len(call.ArgumentList) > 2 { corsDomain, err = call.Argument(2).ToString() if err != nil { diff --git a/cmd/geth/js.go b/cmd/geth/js.go index abbd65513..a545de1d0 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -59,17 +59,19 @@ func (r dumbterm) PasswordPrompt(p string) (string, error) { func (r dumbterm) AppendHistory(string) {} type jsre struct { - re *re.JSRE - ethereum *eth.Ethereum - xeth *xeth.XEth - ps1 string - atexit func() - + re *re.JSRE + ethereum *eth.Ethereum + xeth *xeth.XEth + ps1 string + atexit func() + corsDomain string prompter } -func newJSRE(ethereum *eth.Ethereum, libPath string, interactive bool) *jsre { +func newJSRE(ethereum *eth.Ethereum, libPath string, interactive bool, corsDomain string) *jsre { js := &jsre{ethereum: ethereum, ps1: "> "} + // set default cors domain used by startRpc from CLI flag + js.corsDomain = corsDomain js.xeth = xeth.New(ethereum, js) js.re = re.New(libPath) js.apiBindings() diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go index 662e195e5..50528b80a 100644 --- a/cmd/geth/js_test.go +++ b/cmd/geth/js_test.go @@ -36,7 +36,7 @@ func testJEthRE(t *testing.T) (*jsre, *eth.Ethereum) { t.Fatal("%v", err) } assetPath := path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist", "assets", "ext") - repl := newJSRE(ethereum, assetPath, false) + repl := newJSRE(ethereum, assetPath, false, "") return repl, ethereum } diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 70be2ed2e..dd87632b6 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -296,7 +296,7 @@ func console(ctx *cli.Context) { } startEth(ctx, ethereum) - repl := newJSRE(ethereum, ctx.String(utils.JSpathFlag.Name), true) + repl := newJSRE(ethereum, ctx.String(utils.JSpathFlag.Name), true, ctx.GlobalString(utils.RPCCORSDomainFlag.Name)) repl.interactive() ethereum.Stop() @@ -311,7 +311,7 @@ func execJSFiles(ctx *cli.Context) { } startEth(ctx, ethereum) - repl := newJSRE(ethereum, ctx.String(utils.JSpathFlag.Name), false) + repl := newJSRE(ethereum, ctx.String(utils.JSpathFlag.Name), false, ctx.GlobalString(utils.RPCCORSDomainFlag.Name)) for _, file := range ctx.Args() { repl.exec(file) } -- cgit v1.2.3 From c5e9a0a71c21e52789d8707c7268ee979c1faba8 Mon Sep 17 00:00:00 2001 From: zelig Date: Fri, 24 Apr 2015 12:46:53 +0100 Subject: cli: correct bootnodes flag usage help line --- cmd/utils/flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmd') diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 53e2694c5..eb36d1b90 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -204,7 +204,7 @@ var ( } BootnodesFlag = cli.StringFlag{ Name: "bootnodes", - Usage: "Space-separated enode URLs of initial peers to connect to", + Usage: "Space-separated enode URLs for p2p discovery bootstrap", Value: "", } NodeKeyFileFlag = cli.StringFlag{ -- cgit v1.2.3