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/geth/admin.go') 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 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'cmd/geth/admin.go') 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) -- 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 ---- 1 file changed, 4 deletions(-) (limited to 'cmd/geth/admin.go') 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) -- 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 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd/geth/admin.go') 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 { -- cgit v1.2.3