diff options
| author | obscuren <geffobscura@gmail.com> | 2015-06-16 01:28:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-06-16 01:28:48 +0800 |
| commit | 5daf8729be88eca87b302ebf7a46fc69cad0f6d0 (patch) | |
| tree | 0053cb5b84978645b3c83895a651c512e081a183 /cmd/geth/admin.go | |
| parent | bac9a94ddf20dc530966cbf6cd384aaf94aedc77 (diff) | |
| parent | 4673b04503742de9b1622557b44135d6a4934ad6 (diff) | |
| download | dexon-5daf8729be88eca87b302ebf7a46fc69cad0f6d0.tar dexon-5daf8729be88eca87b302ebf7a46fc69cad0f6d0.tar.gz dexon-5daf8729be88eca87b302ebf7a46fc69cad0f6d0.tar.bz2 dexon-5daf8729be88eca87b302ebf7a46fc69cad0f6d0.tar.lz dexon-5daf8729be88eca87b302ebf7a46fc69cad0f6d0.tar.xz dexon-5daf8729be88eca87b302ebf7a46fc69cad0f6d0.tar.zst dexon-5daf8729be88eca87b302ebf7a46fc69cad0f6d0.zip | |
Merge branch 'release/0.9.30'
Diffstat (limited to 'cmd/geth/admin.go')
| -rw-r--r-- | cmd/geth/admin.go | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index 13d10de32..33ef69792 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -51,7 +51,7 @@ func (js *jsre) adminBindings() { admin.Set("import", js.importChain) admin.Set("export", js.exportChain) admin.Set("verbosity", js.verbosity) - admin.Set("progress", js.downloadProgress) + admin.Set("progress", js.syncProgress) admin.Set("setSolc", js.setSolc) admin.Set("contractInfo", struct{}{}) @@ -271,9 +271,12 @@ func (js *jsre) debugBlock(call otto.FunctionCall) otto.Value { } tstart := time.Now() - old := vm.Debug - vm.Debug = true + + if len(call.ArgumentList) > 1 { + vm.Debug, _ = call.Argument(1).ToBoolean() + } + _, err = js.ethereum.BlockProcessor().RetryProcess(block) if err != nil { fmt.Println(err) @@ -324,9 +327,14 @@ func (js *jsre) setHead(call otto.FunctionCall) otto.Value { return otto.UndefinedValue() } -func (js *jsre) downloadProgress(call otto.FunctionCall) otto.Value { - pending, cached := js.ethereum.Downloader().Stats() - v, _ := call.Otto.ToValue(map[string]interface{}{"pending": pending, "cached": cached}) +func (js *jsre) syncProgress(call otto.FunctionCall) otto.Value { + pending, cached, importing, eta := js.ethereum.Downloader().Stats() + v, _ := call.Otto.ToValue(map[string]interface{}{ + "pending": pending, + "cached": cached, + "importing": importing, + "estimate": (eta / time.Second * time.Second).String(), + }) return v } |