From ffaf58f0a98bd987bbe76e8669bb22c405dcd62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Fri, 6 May 2016 12:40:23 +0300
Subject: [PATCH] cmd, console: split off the console into a reusable package
---
cmd/geth/accountcmd.go | 5 +-
cmd/geth/chaincmd.go | 3 +-
cmd/geth/consolecmd.go | 167 +++++++
cmd/geth/consolecmd_test.go | 152 +++++++
cmd/geth/js.go | 424 -----------------
cmd/geth/js_test.go | 500 ---------------------
cmd/geth/main.go | 140 +-----
cmd/geth/run_test.go | 9 +-
cmd/geth/usage.go | 2 +-
cmd/utils/flags.go | 19 +-
cmd/utils/input.go | 98 ----
cmd/utils/jeth.go | 301 -------------
console/bridge.go | 317 +++++++++++++
console/console.go | 369 +++++++++++++++
console/console_test.go | 283 ++++++++++++
console/prompter.go | 156 +++++++
console/testdata/exec.js | 1 +
console/testdata/preload.js | 1 +
{jsre => internal/jsre}/bignumber_js.go | 0
{jsre => internal/jsre}/completion.go | 0
{jsre => internal/jsre}/completion_test.go | 3 +-
{jsre => internal/jsre}/ethereum_js.go | 0
{jsre => internal/jsre}/jsre.go | 25 +-
{jsre => internal/jsre}/jsre_test.go | 4 +-
{jsre => internal/jsre}/pretty.go | 74 +--
rpc/json.go | 14 +-
26 files changed, 1548 insertions(+), 1519 deletions(-)
create mode 100644 cmd/geth/consolecmd.go
create mode 100644 cmd/geth/consolecmd_test.go
delete mode 100644 cmd/geth/js.go
delete mode 100644 cmd/geth/js_test.go
delete mode 100644 cmd/utils/input.go
delete mode 100644 cmd/utils/jeth.go
create mode 100644 console/bridge.go
create mode 100644 console/console.go
create mode 100644 console/console_test.go
create mode 100644 console/prompter.go
create mode 100644 console/testdata/exec.js
create mode 100644 console/testdata/preload.js
rename {jsre => internal/jsre}/bignumber_js.go (100%)
rename {jsre => internal/jsre}/completion.go (100%)
rename {jsre => internal/jsre}/completion_test.go (98%)
rename {jsre => internal/jsre}/ethereum_js.go (100%)
rename {jsre => internal/jsre}/jsre.go (95%)
rename {jsre => internal/jsre}/jsre_test.go (98%)
rename {jsre => internal/jsre}/pretty.go (77%)
diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go
index bf754c72f..a9cee20ee 100644
--- a/cmd/geth/accountcmd.go
+++ b/cmd/geth/accountcmd.go
@@ -23,6 +23,7 @@ import (
"github.com/codegangsta/cli"
"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/console"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger/glog"
@@ -215,12 +216,12 @@ func getPassPhrase(prompt string, confirmation bool, i int, passwords []string)
if prompt != "" {
fmt.Println(prompt)
}
- password, err := utils.Stdin.PasswordPrompt("Passphrase: ")
+ password, err := console.TerminalPrompter.PromptPassword("Passphrase: ")
if err != nil {
utils.Fatalf("Failed to read passphrase: %v", err)
}
if confirmation {
- confirm, err := utils.Stdin.PasswordPrompt("Repeat passphrase: ")
+ confirm, err := console.TerminalPrompter.PromptPassword("Repeat passphrase: ")
if err != nil {
utils.Fatalf("Failed to read passphrase confirmation: %v", err)
}
diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go
index 32eacc99e..457dbcfff 100644
--- a/cmd/geth/chaincmd.go
+++ b/cmd/geth/chaincmd.go
@@ -26,6 +26,7 @@ import (
"github.com/codegangsta/cli"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/console"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types"
@@ -116,7 +117,7 @@ func exportChain(ctx *cli.Context) {
}
func removeDB(ctx *cli.Context) {
- confirm, err := utils.Stdin.ConfirmPrompt("Remove local database?")
+ confirm, err := console.TerminalPrompter.PromptConfirm("Remove local database?")
if err != nil {
utils.Fatalf("%v", err)
}
diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go
new file mode 100644
index 000000000..8bfe27fef
--- /dev/null
+++ b/cmd/geth/consolecmd.go
@@ -0,0 +1,167 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of go-ethereum.
+//
+// go-ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// go-ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+
+package main
+
+import (
+ "os"
+ "os/signal"
+
+ "github.com/codegangsta/cli"
+ "github.com/ethereum/go-ethereum/cmd/utils"
+ "github.com/ethereum/go-ethereum/console"
+)
+
+var (
+ consoleCommand = cli.Command{
+ Action: localConsole,
+ Name: "console",
+ 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 Ðapp JavaScript API.
+See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console
+`,
+ }
+ attachCommand = cli.Command{
+ Action: remoteConsole,
+ Name: "attach",
+ Usage: `Geth Console: interactive JavaScript environment (connect to node)`,
+ Description: `
+The Geth console is an interactive shell for the JavaScript runtime environment
+which exposes a node admin interface as well as the Ðapp JavaScript API.
+See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console.
+This command allows to open a console on a running geth node.
+ `,
+ }
+ javascriptCommand = cli.Command{
+ Action: ephemeralConsole,
+ 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 Ðapp
+JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console
+`,
+ }
+)
+
+// localConsole starts a new geth node, attaching a JavaScript console to it at the
+// same time.
+func localConsole(ctx *cli.Context) {
+ // Create and start the node based on the CLI flags
+ node := utils.MakeSystemNode(clientIdentifier, verString, relConfig, makeDefaultExtra(), ctx)
+ startNode(ctx, node)
+ defer node.Stop()
+
+ // Attach to the newly started node and start the JavaScript console
+ client, err := node.Attach()
+ if err != nil {
+ utils.Fatalf("Failed to attach to the inproc geth: %v", err)
+ }
+ config := console.Config{
+ DataDir: node.DataDir(),
+ DocRoot: ctx.GlobalString(utils.JSpathFlag.Name),
+ Client: client,
+ Preload: utils.MakeConsolePreloads(ctx),
+ }
+ console, err := console.New(config)
+ if err != nil {
+ utils.Fatalf("Failed to start the JavaScript console: %v", err)
+ }
+ defer console.Stop(false)
+
+ // If only a short execution was requested, evaluate and return
+ if script := ctx.GlobalString(utils.ExecFlag.Name); script != "" {
+ console.Evaluate(script)
+ return
+ }
+ // Otherwise print the welcome screen and enter interactive mode
+ console.Welcome()
+ console.Interactive()
+}
+
+// remoteConsole will connect to a remote geth instance, attaching a JavaScript
+// console to it.
+func remoteConsole(ctx *cli.Context) {
+ // Attach to a remotely running geth instance and start the JavaScript console
+ client, err := utils.NewRemoteRPCClient(ctx)
+ if err != nil {
+ utils.Fatalf("Unable to attach to remote geth: %v", err)
+ }
+ config := console.Config{
+ DataDir: utils.MustMakeDataDir(ctx),
+ DocRoot: ctx.GlobalString(utils.JSpathFlag.Name),
+ Client: client,
+ Preload: utils.MakeConsolePreloads(ctx),
+ }
+ console, err := console.New(config)
+ if err != nil {
+ utils.Fatalf("Failed to start the JavaScript console: %v", err)
+ }
+ defer console.Stop(false)
+
+ // If only a short execution was requested, evaluate and return
+ if script := ctx.GlobalString(utils.ExecFlag.Name); script != "" {
+ console.Evaluate(script)
+ return
+ }
+ // Otherwise print the welcome screen and enter interactive mode
+ console.Welcome()
+ console.Interactive()
+}
+
+// ephemeralConsole starts a new geth node, attaches an ephemeral JavaScript
+// console to it, and each of the files specified as arguments and tears the
+// everything down.
+func ephemeralConsole(ctx *cli.Context) {
+ // Create and start the node based on the CLI flags
+ node := utils.MakeSystemNode(clientIdentifier, verString, relConfig, makeDefaultExtra(), ctx)
+ startNode(ctx, node)
+ defer node.Stop()
+
+ // Attach to the newly started node and start the JavaScript console
+ client, err := node.Attach()
+ if err != nil {
+ utils.Fatalf("Failed to attach to the inproc geth: %v", err)
+ }
+ config := console.Config{
+ DataDir: node.DataDir(),
+ DocRoot: ctx.GlobalString(utils.JSpathFlag.Name),
+ Client: client,
+ Preload: utils.MakeConsolePreloads(ctx),
+ }
+ console, err := console.New(config)
+ if err != nil {
+ utils.Fatalf("Failed to start the JavaScript console: %v", err)
+ }
+ defer console.Stop(false)
+
+ // Evaluate each of the specified JavaScript files
+ for _, file := range ctx.Args() {
+ if err = console.Execute(file); err != nil {
+ utils.Fatalf("Failed to execute %s: %v", file, err)
+ }
+ }
+ // Wait for pending callbacks, but stop for Ctrl-C.
+ abort := make(chan os.Signal, 1)
+ signal.Notify(abort, os.Interrupt)
+
+ go func() {
+ <-abort
+ os.Exit(0)
+ }()
+ console.Stop(true)
+}
diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go
new file mode 100644
index 000000000..9cfb3e4e3
--- /dev/null
+++ b/cmd/geth/consolecmd_test.go
@@ -0,0 +1,152 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of go-ethereum.
+//
+// go-ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// go-ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
+
+package main
+
+import (
+ "math/rand"
+ "os"
+ "path/filepath"
+ "runtime"
+ "sort"
+ "strconv"
+ "strings"
+ "testing"
+ "time"
+
+ "github.com/ethereum/go-ethereum/console"
+ "github.com/ethereum/go-ethereum/rpc"
+)
+
+// Tests that a node embedded within a console can be started up properly and
+// then terminated by closing the input stream.
+func TestConsoleWelcome(t *testing.T) {
+ coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182"
+
+ // Start a geth console, make sure it's cleaned up and terminate the console
+ geth := runGeth(t, "--nat", "none", "--nodiscover", "--etherbase", coinbase, "-shh", "console")
+ defer geth.expectExit()
+ geth.stdin.Close()
+
+ // Gather all the infos the welcome message needs to contain
+ geth.setTemplateFunc("goos", func() string { return runtime.GOOS })
+ geth.setTemplateFunc("gover", runtime.Version)
+ geth.setTemplateFunc("gethver", func() string { return verString })
+ geth.setTemplateFunc("niltime", func() string { return time.Unix(0, 0).Format(time.RFC1123) })
+ geth.setTemplateFunc("apis", func() []string {
+ apis := append(strings.Split(rpc.DefaultIPCApis, ","), rpc.MetadataApi)
+ sort.Strings(apis)
+ return apis
+ })
+ geth.setTemplateFunc("prompt", func() string { return console.DefaultPrompt })
+
+ // Verify the actual welcome message to the required template
+ geth.expect(`
+Welcome to the Geth JavaScript console!
+
+instance: Geth/v{{gethver}}/{{goos}}/{{gover}}
+coinbase: {{.Etherbase}}
+at block: 0 ({{niltime}})
+ datadir: {{.Datadir}}
+ modules:{{range apis}} {{.}}:1.0{{end}}
+
+{{prompt}}
+`)
+}
+
+// Tests that a console can be attached to a running node via various means.
+func TestIPCAttachWelcome(t *testing.T) {
+ // Configure the instance for IPC attachement
+ coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182"
+
+ var ipc string
+ if runtime.GOOS == "windows" {
+ ipc = `\\.\pipe\geth` + strconv.Itoa(rand.Int())
+ } else {
+ ws := tmpdir(t)
+ defer os.RemoveAll(ws)
+
+ ipc = filepath.Join(ws, "geth.ipc")
+ }
+ // Run the parent geth and attach with a child console
+ geth := runGeth(t, "--nat", "none", "--nodiscover", "--etherbase", coinbase, "-shh", "--ipcpath", ipc)
+ defer geth.interrupt()
+
+ time.Sleep(2 * time.Second) // Simple way to wait for the RPC endpoint to open
+ testAttachWelcome(t, geth, "ipc:"+ipc)
+}
+
+func TestHTTPAttachWelcome(t *testing.T) {
+ coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182"
+ port := strconv.Itoa(rand.Intn(65535-1024) + 1024) // Yeah, sometimes this will fail, sorry :P
+
+ geth := runGeth(t, "--nat", "none", "--nodiscover", "--etherbase", coinbase, "--rpc", "--rpcport", port)
+ defer geth.interrupt()
+
+ time.Sleep(2 * time.Second) // Simple way to wait for the RPC endpoint to open
+ testAttachWelcome(t, geth, "http://localhost:"+port)
+}
+
+func TestWSAttachWelcome(t *testing.T) {
+ coinbase := "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182"
+ port := strconv.Itoa(rand.Intn(65535-1024) + 1024) // Yeah, sometimes this will fail, sorry :P
+
+ geth := runGeth(t, "--nat", "none", "--nodiscover", "--etherbase", coinbase, "--ws", "--wsport", port)
+ defer geth.interrupt()
+
+ time.Sleep(2 * time.Second) // Simple way to wait for the RPC endpoint to open
+ testAttachWelcome(t, geth, "ws://localhost:"+port)
+}
+
+func testAttachWelcome(t *testing.T, geth *testgeth, endpoint string) {
+ // Attach to a running geth note and terminate immediately
+ attach := runGeth(t, "attach", endpoint)
+ defer attach.expectExit()
+ attach.stdin.Close()
+
+ // Gather all the infos the welcome message needs to contain
+ attach.setTemplateFunc("goos", func() string { return runtime.GOOS })
+ attach.setTemplateFunc("gover", runtime.Version)
+ attach.setTemplateFunc("gethver", func() string { return verString })
+ attach.setTemplateFunc("etherbase", func() string { return geth.Etherbase })
+ attach.setTemplateFunc("niltime", func() string { return time.Unix(0, 0).Format(time.RFC1123) })
+ attach.setTemplateFunc("ipc", func() bool { return strings.HasPrefix(endpoint, "ipc") })
+ attach.setTemplateFunc("datadir", func() string { return geth.Datadir })
+ attach.setTemplateFunc("apis", func() []string {
+ var apis []string
+ if strings.HasPrefix(endpoint, "ipc") {
+ apis = append(strings.Split(rpc.DefaultIPCApis, ","), rpc.MetadataApi)
+ } else {
+ apis = append(strings.Split(rpc.DefaultHTTPApis, ","), rpc.MetadataApi)
+ }
+ sort.Strings(apis)
+ return apis
+ })
+ attach.setTemplateFunc("prompt", func() string { return console.DefaultPrompt })
+
+ // Verify the actual welcome message to the required template
+ attach.expect(`
+Welcome to the Geth JavaScript console!
+
+instance: Geth/v{{gethver}}/{{goos}}/{{gover}}
+coinbase: {{etherbase}}
+at block: 0 ({{niltime}}){{if ipc}}
+ datadir: {{datadir}}{{end}}
+ modules:{{range apis}} {{.}}:1.0{{end}}
+
+{{prompt}}
+`)
+}
diff --git a/cmd/geth/js.go b/cmd/geth/js.go
deleted file mode 100644
index 5f455d7a3..000000000
--- a/cmd/geth/js.go
+++ /dev/null
@@ -1,424 +0,0 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
-
-package main
-
-import (
- "fmt"
- "math/big"
- "os"
- "os/signal"
- "path/filepath"
- "regexp"
- "sort"
- "strings"
-
- "github.com/codegangsta/cli"
- "github.com/ethereum/go-ethereum/accounts"
- "github.com/ethereum/go-ethereum/cmd/utils"
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/registrar"
- "github.com/ethereum/go-ethereum/eth"
- "github.com/ethereum/go-ethereum/internal/web3ext"
- re "github.com/ethereum/go-ethereum/jsre"
- "github.com/ethereum/go-ethereum/node"
- "github.com/ethereum/go-ethereum/rpc"
- "github.com/peterh/liner"
- "github.com/robertkrimen/otto"
-)
-
-var (
- passwordRegexp = regexp.MustCompile("personal.[nus]")
- onlyws = regexp.MustCompile("^\\s*$")
- exit = regexp.MustCompile("^\\s*exit\\s*;*\\s*$")
-)
-
-type jsre struct {
- re *re.JSRE
- stack *node.Node
- wait chan *big.Int
- ps1 string
- atexit func()
- corsDomain string
- client rpc.Client
-}
-
-func makeCompleter(re *jsre) liner.WordCompleter {
- return func(line string, pos int) (head string, completions []string, tail string) {
- if len(line) == 0 || pos == 0 {
- return "", nil, ""
- }
- // chuck data to relevant part for autocompletion, e.g. in case of nested lines eth.getBalance(eth.coinb<tab><tab>
- i := 0
- for i = pos - 1; i > 0; i-- {
- if line[i] == '.' || (line[i] >= 'a' && line[i] <= 'z') || (line[i] >= 'A' && line[i] <= 'Z') {
- continue
- }
- if i >= 3 && line[i] == '3' && line[i-3] == 'w' && line[i-2] == 'e' && line[i-1] == 'b' {
- continue
- }
- i += 1
- break
- }
- return line[:i], re.re.CompleteKeywords(line[i:pos]), line[pos:]
- }
-}
-
-func newLightweightJSRE(docRoot string, client rpc.Client, datadir string, interactive bool) *jsre {
- js := &jsre{ps1: "> "}
- js.wait = make(chan *big.Int)
- js.client = client
- js.re = re.New(docRoot)
- if err := js.apiBindings(); err != nil {
- utils.Fatalf("Unable to initialize console - %v", err)
- }
- js.setupInput(datadir)
- return js
-}
-
-func newJSRE(stack *node.Node, docRoot, corsDomain string, client rpc.Client, interactive bool) *jsre {
- js := &jsre{stack: stack, ps1: "> "}
- // set default cors domain used by startRpc from CLI flag
- js.corsDomain = corsDomain
- js.wait = make(chan *big.Int)
- js.client = client
- js.re = re.New(docRoot)
- if err := js.apiBindings(); err != nil {
- utils.Fatalf("Unable to connect - %v", err)
- }
- js.setupInput(stack.DataDir())
- return js
-}
-
-func (self *jsre) setupInput(datadir string) {
- self.withHistory(datadir, func(hist *os.File) { utils.Stdin.ReadHistory(hist) })
- utils.Stdin.SetCtrlCAborts(true)
- utils.Stdin.SetWordCompleter(makeCompleter(self))
- utils.Stdin.SetTabCompletionStyle(liner.TabPrints)
- self.atexit = func() {
- self.withHistory(datadir, func(hist *os.File) {
- hist.Truncate(0)
- utils.Stdin.WriteHistory(hist)
- })
- utils.Stdin.Close()
- close(self.wait)
- }
-}
-
-func (self *jsre) batch(statement string) {
- err := self.re.EvalAndPrettyPrint(statement)
-
- if err != nil {
- fmt.Printf("%v", jsErrorString(err))
- }
-
- if self.atexit != nil {
- self.atexit()
- }
-
- self.re.Stop(false)
-}
-
-// show summary of current geth instance
-func (self *jsre) welcome() {
- self.re.Run(`
- (function () {
- console.log('instance: ' + web3.version.node);
- console.log("coinbase: " + eth.coinbase);
- var ts = 1000 * eth.getBlock(eth.blockNumber).timestamp;
- console.log("at block: " + eth.blockNumber + " (" + new Date(ts) + ")");
- console.log(' datadir: ' + admin.datadir);
- })();
- `)
- if modules, err := self.supportedApis(); err == nil {
- loadedModules := make([]string, 0)
- for api, version := range modules {
- loadedModules = append(loadedModules, fmt.Sprintf("%s:%s", api, version))
- }
- sort.Strings(loadedModules)
- }
-}
-
-func (self *jsre) supportedApis() (map[string]string, error) {
- return self.client.SupportedModules()
-}
-
-func (js *jsre) apiBindings() error {
- apis, err := js.supportedApis()
- if err != nil {
- return err
- }
-
- apiNames := make([]string, 0, len(apis))
- for a, _ := range apis {
- apiNames = append(apiNames, a)
- }
-
- jeth := utils.NewJeth(js.re, js.client)
- js.re.Set("jeth", struct{}{})
- t, _ := js.re.Get("jeth")
- jethObj := t.Object()
-
- jethObj.Set("send", jeth.Send)
- jethObj.Set("sendAsync", jeth.Send)
-
- err = js.re.Compile("bignumber.js", re.BigNumber_JS)
- if err != nil {
- utils.Fatalf("Error loading bignumber.js: %v", err)
- }
-
- err = js.re.Compile("web3.js", re.Web3_JS)
- if err != nil {
- utils.Fatalf("Error loading web3.js: %v", err)
- }
-
- _, err = js.re.Run("var Web3 = require('web3');")
- if err != nil {
- utils.Fatalf("Error requiring web3: %v", err)
- }
-
- _, err = js.re.Run("var web3 = new Web3(jeth);")
- if err != nil {
- utils.Fatalf("Error setting web3 provider: %v", err)
- }
-
- // load only supported API's in javascript runtime
- shortcuts := "var eth = web3.eth; var personal = web3.personal; "
- for _, apiName := range apiNames {
- if apiName == "web3" {
- continue // manually mapped or ignore
- }
-
- if jsFile, ok := web3ext.Modules[apiName]; ok {
- if err = js.re.Compile(fmt.Sprintf("%s.js", apiName), jsFile); err == nil {
- shortcuts += fmt.Sprintf("var %s = web3.%s; ", apiName, apiName)
- } else {
- utils.Fatalf("Error loading %s.js: %v", apiName, err)
- }
- }
- }
-
- _, err = js.re.Run(shortcuts)
- if err != nil {
- utils.Fatalf("Error setting namespaces: %v", err)
- }
-
- js.re.Run(`var GlobalRegistrar = eth.contract(` + registrar.GlobalRegistrarAbi + `); registrar = GlobalRegistrar.at("` + registrar.GlobalRegistrarAddr + `");`)
-
- // overrule some of the methods that require password as input and ask for it interactively
- p, err := js.re.Get("personal")
- if err != nil {
- fmt.Println("Unable to overrule sensitive methods in personal module")
- return nil
- }
-
- // Override the unlockAccount and newAccount methods on the personal object since these require user interaction.
- // Assign the jeth.unlockAccount and jeth.newAccount in the jsre the original web3 callbacks. These will be called
- // by the jeth.* methods after they got the password from the user and send the original web3 request to the backend.
- if persObj := p.Object(); persObj != nil { // make sure the personal api is enabled over the interface
- js.re.Run(`jeth.unlockAccount = personal.unlockAccount;`)
- persObj.Set("unlockAccount", jeth.UnlockAccount)
- js.re.Run(`jeth.newAccount = personal.newAccount;`)
- persObj.Set("newAccount", jeth.NewAccount)
- }
-
- // The admin.sleep and admin.sleepBlocks are offered by the console and not by the RPC layer.
- // Bind these if the admin module is available.
- if a, err := js.re.Get("admin"); err == nil {
- if adminObj := a.Object(); adminObj != nil {
- adminObj.Set("sleepBlocks", jeth.SleepBlocks)
- adminObj.Set("sleep", jeth.Sleep)
- }
- }
-
- return nil
-}
-
-func (self *jsre) AskPassword() (string, bool) {
- pass, err := utils.Stdin.PasswordPrompt("Passphrase: ")
- if err != nil {
- return "", false
- }
- return pass, true
-}
-
-func (self *jsre) ConfirmTransaction(tx string) bool {
- // Retrieve the Ethereum instance from the node
- var ethereum *eth.Ethereum
- if err := self.stack.Service(ðereum); err != nil {
- return false
- }
- // If natspec is enabled, ask for permission
- if ethereum.NatSpec && false /* disabled for now */ {
- // notice := natspec.GetNotice(self.xeth, tx, ethereum.HTTPClient())
- // fmt.Println(notice)
- // answer, _ := self.Prompt("Confirm Transaction [y/n]")
- // return strings.HasPrefix(strings.Trim(answer, " "), "y")
- }
- return true
-}
-
-func (self *jsre) UnlockAccount(addr []byte) bool {
- fmt.Printf("Please unlock account %x.\n", addr)
- pass, err := utils.Stdin.PasswordPrompt("Passphrase: ")
- if err != nil {
- return false
- }
- // TODO: allow retry
- var ethereum *eth.Ethereum
- if err := self.stack.Service(ðereum); err != nil {
- return false
- }
- a := accounts.Account{Address: common.BytesToAddress(addr)}
- if err := ethereum.AccountManager().Unlock(a, pass); err != nil {
- return false
- } else {
- fmt.Println("Account is now unlocked for this session.")
- return true
- }
-}
-
-// preloadJSFiles loads JS files that the user has specified with ctx.PreLoadJSFlag into
-// the JSRE. If not all files could be loaded it will return an error describing the error.
-func (self *jsre) preloadJSFiles(ctx *cli.Context) error {
- if ctx.GlobalString(utils.PreLoadJSFlag.Name) != "" {
- assetPath := ctx.GlobalString(utils.JSpathFlag.Name)
- jsFiles := strings.Split(ctx.GlobalString(utils.PreLoadJSFlag.Name), ",")
- for _, file := range jsFiles {
- filename := common.AbsolutePath(assetPath, strings.TrimSpace(file))
- if err := self.re.Exec(filename); err != nil {
- return fmt.Errorf("%s: %v", file, jsErrorString(err))
- }
- }
- }
- return nil
-}
-
-// jsErrorString adds a backtrace to errors generated by otto.
-func jsErrorString(err error) string {
- if ottoErr, ok := err.(*otto.Error); ok {
- return ottoErr.String()
- }
- return err.Error()
-}
-
-func (self *jsre) interactive() {
- // Read input lines.
- prompt := make(chan string)
- inputln := make(chan string)
- go func() {
- defer close(inputln)
- for {
- line, err := utils.Stdin.Prompt(<-prompt)
- if err != nil {
- if err == liner.ErrPromptAborted { // ctrl-C
- self.resetPrompt()
- inputln <- ""
- continue
- }
- return
- }
- inputln <- line
- }
- }()
- // Wait for Ctrl-C, too.
- sig := make(chan os.Signal, 1)
- signal.Notify(sig, os.Interrupt)
-
- defer func() {
- if self.atexit != nil {
- self.atexit()
- }
- self.re.Stop(false)
- }()
- for {
- prompt <- self.ps1
- select {
- case <-sig:
- fmt.Println("caught interrupt, exiting")
- return
- case input, ok := <-inputln:
- if !ok || indentCount <= 0 && exit.MatchString(input) {
- return
- }
- if onlyws.MatchString(input) {
- continue
- }
- str += input + "\n"
- self.setIndent()
- if indentCount <= 0 {
- if !excludeFromHistory(str) {
- utils.Stdin.AppendHistory(str[:len(str)-1])
- }
- self.parseInput(str)
- str = ""
- }
- }
- }
-}
-
-func excludeFromHistory(input string) bool {
- return len(input) == 0 || input[0] == ' ' || passwordRegexp.MatchString(input)
-}
-
-func (self *jsre) withHistory(datadir string, op func(*os.File)) {
- hist, err := os.OpenFile(filepath.Join(datadir, "history"), os.O_RDWR|os.O_CREATE, os.ModePerm)
- if err != nil {
- fmt.Printf("unable to open history file: %v\n", err)
- return
- }
- op(hist)
- hist.Close()
-}
-
-func (self *jsre) parseInput(code string) {
- defer func() {
- if r := recover(); r != nil {
- fmt.Println("[native] error", r)
- }
- }()
- if err := self.re.EvalAndPrettyPrint(code); err != nil {
- if ottoErr, ok := err.(*otto.Error); ok {
- fmt.Println(ottoErr.String())
- } else {
- fmt.Println(err)
- }
- return
- }
-}
-
-var indentCount = 0
-var str = ""
-
-func (self *jsre) resetPrompt() {
- indentCount = 0
- str = ""
- self.ps1 = "> "
-}
-
-func (self *jsre) setIndent() {
- open := strings.Count(str, "{")
- open += strings.Count(str, "(")
- closed := strings.Count(str, "}")
- closed += strings.Count(str, ")")
- indentCount = open - closed
- if indentCount <= 0 {
- self.ps1 = "> "
- } else {
- self.ps1 = strings.Join(make([]string, indentCount*2), "..")
- self.ps1 += " "
- }
-}
diff --git a/cmd/geth/js_test.go b/cmd/geth/js_test.go
deleted file mode 100644
index ddfe0d400..000000000
--- a/cmd/geth/js_test.go
+++ /dev/null
@@ -1,500 +0,0 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
-
-package main
-
-import (
- "fmt"
- "io/ioutil"
- "math/big"
- "os"
- "path/filepath"
- "regexp"
- "runtime"
- "strconv"
- "testing"
- "time"
-
- "github.com/ethereum/go-ethereum/accounts"
- "github.com/ethereum/go-ethereum/common"
- "github.com/ethereum/go-ethereum/common/compiler"
- "github.com/ethereum/go-ethereum/common/httpclient"
- "github.com/ethereum/go-ethereum/core"
- "github.com/ethereum/go-ethereum/crypto"
- "github.com/ethereum/go-ethereum/eth"
- "github.com/ethereum/go-ethereum/ethdb"
- "github.com/ethereum/go-ethereum/node"
-)
-
-const (
- testSolcPath = ""
- solcVersion = "0.9.23"
- testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182"
- testBalance = "10000000000000000000"
- // of empty string
- testHash = "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-)
-
-var (
- versionRE = regexp.MustCompile(strconv.Quote(`"compilerVersion":"` + solcVersion + `"`))
- testNodeKey, _ = crypto.HexToECDSA("4b50fa71f5c3eeb8fdc452224b2395af2fcc3d125e06c32c82e048c0559db03f")
- testAccount, _ = crypto.HexToECDSA("e6fab74a43941f82d89cb7faa408e227cdad3153c4720e540e855c19b15e6674")
- testGenesis = `{"` + testAddress[2:] + `": {"balance": "` + testBalance + `"}}`
-)
-
-type testjethre struct {
- *jsre
- lastConfirm string
- client *httpclient.HTTPClient
-}
-
-// Temporary disabled while natspec hasn't been migrated
-//func (self *testjethre) ConfirmTransaction(tx string) bool {
-// var ethereum *eth.Ethereum
-// self.stack.Service(ðereum)
-//
-// if ethereum.NatSpec {
-// self.lastConfirm = natspec.GetNotice(self.xeth, tx, self.client)
-// }
-// return true
-//}
-
-func testJEthRE(t *testing.T) (string, *testjethre, *node.Node) {
- return testREPL(t, nil)
-}
-
-func testREPL(t *testing.T, config func(*eth.Config)) (string, *testjethre, *node.Node) {
- tmp, err := ioutil.TempDir("", "geth-test")
- if err != nil {
- t.Fatal(err)
- }
- // Create a networkless protocol stack
- stack, err := node.New(&node.Config{DataDir: tmp, PrivateKey: testNodeKey, Name: "test", NoDiscovery: true})
- if err != nil {
- t.Fatalf("failed to create node: %v", err)
- }
- // Initialize and register the Ethereum protocol
- accman := accounts.NewPlaintextManager(filepath.Join(tmp, "keystore"))
- db, _ := ethdb.NewMemDatabase()
- core.WriteGenesisBlockForTesting(db, core.GenesisAccount{
- Address: common.HexToAddress(testAddress),
- Balance: common.String2Big(testBalance),
- })
- ethConf := ð.Config{
- ChainConfig: &core.ChainConfig{HomesteadBlock: new(big.Int)},
- TestGenesisState: db,
- AccountManager: accman,
- DocRoot: "/",
- SolcPath: testSolcPath,
- PowTest: true,
- }
- if config != nil {
- config(ethConf)
- }
- if err := stack.Register(func(ctx *node.ServiceContext) (node.Service, error) {
- return eth.New(ctx, ethConf)
- }); err != nil {
- t.Fatalf("failed to register ethereum protocol: %v", err)
- }
- // Initialize all the keys for testing
- a, err := accman.ImportECDSA(testAccount, "")
- if err != nil {
- t.Fatal(err)
- }
- if err := accman.Unlock(a, ""); err != nil {
- t.Fatal(err)
- }
- // Start the node and assemble the REPL tester
- if err := stack.Start(); err != nil {
- t.Fatalf("failed to start test stack: %v", err)
- }
- var ethereum *eth.Ethereum
- stack.Service(ðereum)
-
- assetPath := filepath.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist", "assets", "ext")
- client, err := stack.Attach()
- if err != nil {
- t.Fatalf("failed to attach to node: %v", err)
- }
- tf := &testjethre{client: ethereum.HTTPClient()}
- repl := newJSRE(stack, assetPath, "", client, false)
- tf.jsre = repl
- return tmp, tf, stack
-}
-
-func TestNodeInfo(t *testing.T) {
- t.Skip("broken after p2p update")
- tmp, repl, ethereum := testJEthRE(t)
- defer ethereum.Stop()
- defer os.RemoveAll(tmp)
-
- want := `{"DiscPort":0,"IP":"0.0.0.0","ListenAddr":"","Name":"test","NodeID":"4cb2fc32924e94277bf94b5e4c983beedb2eabd5a0bc941db32202735c6625d020ca14a5963d1738af43b6ac0a711d61b1a06de931a499fe2aa0b1a132a902b5","NodeUrl":"enode://4cb2fc32924e94277bf94b5e4c983beedb2eabd5a0bc941db32202735c6625d020ca14a5963d1738af43b6ac0a711d61b1a06de931a499fe2aa0b1a132a902b5@0.0.0.0:0","TCPPort":0,"Td":"131072"}`
- checkEvalJSON(t, repl, `admin.nodeInfo`, want)
-}
-
-func TestAccounts(t *testing.T) {
- tmp, repl, node := testJEthRE(t)
- defer node.Stop()
- defer os.RemoveAll(tmp)
-
- checkEvalJSON(t, repl, `eth.accounts`, `["`+testAddress+`"]`)
- checkEvalJSON(t, repl, `eth.coinbase`, `"`+testAddress+`"`)
- val, err := repl.re.Run(`jeth.newAccount("password")`)
- if err != nil {
- t.Errorf("expected no error, got %v", err)
- }
- addr := val.String()
- if !regexp.MustCompile(`0x[0-9a-f]{40}`).MatchString(addr) {
- t.Errorf("address not hex: %q", addr)
- }
-
- checkEvalJSON(t, repl, `eth.accounts`, `["`+testAddress+`","`+addr+`"]`)
-
-}
-
-func TestBlockChain(t *testing.T) {
- tmp, repl, node := testJEthRE(t)
- defer node.Stop()
- defer os.RemoveAll(tmp)
- // get current block dump before export/import.
- val, err := repl.re.Run("JSON.stringify(debug.dumpBlock(eth.blockNumber))")
- if err != nil {
- t.Errorf("expected no error, got %v", err)
- }
- beforeExport := val.String()
-
- // do the export
- extmp, err := ioutil.TempDir("", "geth-test-export")
- if err != nil {
- t.Fatal(err)
- }
- defer os.RemoveAll(extmp)
- tmpfile := filepath.Join(extmp, "export.chain")
- tmpfileq := strconv.Quote(tmpfile)
-
- var ethereum *eth.Ethereum
- node.Service(ðereum)
- ethereum.BlockChain().Reset()
-
- checkEvalJSON(t, repl, `admin.exportChain(`+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.importChain(`+tmpfileq+`)`, `true`)
- checkEvalJSON(t, repl, `debug.dumpBlock(eth.blockNumber)`, beforeExport)
-}
-
-func TestMining(t *testing.T) {
- tmp, repl, node := testJEthRE(t)
- defer node.Stop()
- defer os.RemoveAll(tmp)
- checkEvalJSON(t, repl, `eth.mining`, `false`)
-}
-
-func TestRPC(t *testing.T) {
- tmp, repl, node := testJEthRE(t)
- defer node.Stop()
- defer os.RemoveAll(tmp)
-
- checkEvalJSON(t, repl, `admin.startRPC("127.0.0.1", 5004, "*", "web3,eth,net")`, `true`)
-}
-
-func TestCheckTestAccountBalance(t *testing.T) {
- t.Skip() // i don't think it tests the correct behaviour here. it's actually testing
- // internals which shouldn't be tested. This now fails because of a change in the core
- // and i have no means to fix this, sorry - @obscuren
- tmp, repl, node := testJEthRE(t)
- defer node.Stop()
- defer os.RemoveAll(tmp)
-
- repl.re.Run(`primary = "` + testAddress + `"`)
- checkEvalJSON(t, repl, `eth.getBalance(primary)`, `"`+testBalance+`"`)
-}
-
-func TestSignature(t *testing.T) {
- tmp, repl, node := testJEthRE(t)
- defer node.Stop()
- defer os.RemoveAll(tmp)
-
- val, err := repl.re.Run(`eth.sign("` + testAddress + `", "` + testHash + `")`)
-
- // This is a very preliminary test, lacking actual signature verification
- if err != nil {
- t.Errorf("Error running js: %v", err)
- return
- }
- output := val.String()
- t.Logf("Output: %v", output)
-
- regex := regexp.MustCompile(`^0x[0-9a-f]{130}$`)
- if !regex.MatchString(output) {
- t.Errorf("Signature is not 65 bytes represented in hexadecimal.")
- return
- }
-}
-
-func TestContract(t *testing.T) {
- t.Skip("contract testing is implemented with mining in ethash test mode. This takes about 7seconds to run. Unskip and run on demand")
- coinbase := common.HexToAddress(testAddress)
- tmp, repl, ethereum := testREPL(t, func(conf *eth.Config) {
- conf.Etherbase = coinbase
- conf.PowTest = true
- })
- if err := ethereum.Start(); err != nil {
- t.Errorf("error starting ethereum: %v", err)
- return
- }
- defer ethereum.Stop()
- defer os.RemoveAll(tmp)
-
- // Temporary disabled while registrar isn't migrated
- //reg := registrar.New(repl.xeth)
- //_, err := reg.SetGlobalRegistrar("", coinbase)
- //if err != nil {
- // t.Errorf("error setting HashReg: %v", err)
- //}
- //_, err = reg.SetHashReg("", coinbase)
- //if err != nil {
- // t.Errorf("error setting HashReg: %v", err)
- //}
- //_, err = reg.SetUrlHint("", coinbase)
- //if err != nil {
- // t.Errorf("error setting HashReg: %v", err)
- //}
- /* TODO:
- * lookup receipt and contract addresses by tx hash
- * name registration for HashReg and UrlHint addresses
- * mine those transactions
- * then set once more SetHashReg SetUrlHint
- */
-
- source := `contract test {\n` +
- " /// @notice Will multiply `a` by 7." + `\n` +
- ` function multiply(uint a) returns(uint d) {\n` +
- ` return a * 7;\n` +
- ` }\n` +
- `}\n`
-
- if checkEvalJSON(t, repl, `admin.stopNatSpec()`, `true`) != nil {
- return
- }
-
- contractInfo, err := ioutil.ReadFile("info_test.json")
- if err != nil {
- t.Fatalf("%v", err)
- }
- if checkEvalJSON(t, repl, `primary = eth.accounts[0]`, `"`+testAddress+`"`) != nil {
- return
- }
- if checkEvalJSON(t, repl, `source = "`+source+`"`, `"`+source+`"`) != nil {
- return
- }
-
- // if solc is found with right version, test it, otherwise read from file
- sol, err := compiler.New("")
- if err != nil {
- t.Logf("solc not found: mocking contract compilation step")
- } else if sol.Version() != solcVersion {
- t.Logf("WARNING: solc different version found (%v, test written for %v, may need to update)", sol.Version(), solcVersion)
- }
-
- if err != nil {
- info, err := ioutil.ReadFile("info_test.json")
- if err != nil {
- t.Fatalf("%v", err)
- }
- _, err = repl.re.Run(`contract = JSON.parse(` + strconv.Quote(string(info)) + `)`)
- if err != nil {
- t.Errorf("%v", err)
- }
- } else {
- if checkEvalJSON(t, repl, `contract = eth.compile.solidity(source).test`, string(contractInfo)) != nil {
- return
- }
- }
-
- if checkEvalJSON(t, repl, `contract.code`, `"0x605880600c6000396000f3006000357c010000000000000000000000000000000000000000000000000000000090048063c6888fa114602e57005b603d6004803590602001506047565b8060005260206000f35b60006007820290506053565b91905056"`) != nil {
- return
- }
-
- if checkEvalJSON(
- t, repl,
- `contractaddress = eth.sendTransaction({from: primary, data: contract.code})`,
- `"0x46d69d55c3c4b86a924a92c9fc4720bb7bce1d74"`,
- ) != nil {
- return
- }
-
- if !processTxs(repl, t, 8) {
- return
- }
-
- callSetup := `abiDef = JSON.parse('[{"constant":false,"inputs":[{"name":"a","type":"uint256"}],"name":"multiply","outputs":[{"name":"d","type":"uint256"}],"type":"function"}]');
-Multiply7 = eth.contract(abiDef);
-multiply7 = Multiply7.at(contractaddress);
-`
- _, err = repl.re.Run(callSetup)
- if err != nil {
- t.Errorf("unexpected error setting up contract, got %v", err)
- return
- }
-
- expNotice := ""
- if repl.lastConfirm != expNotice {
- t.Errorf("incorrect confirmation message: expected %v, got %v", expNotice, repl.lastConfirm)
- return
- }
-
- if checkEvalJSON(t, repl, `admin.startNatSpec()`, `true`) != nil {
- return
- }
- if checkEvalJSON(t, repl, `multiply7.multiply.sendTransaction(6, { from: primary })`, `"0x4ef9088431a8033e4580d00e4eb2487275e031ff4163c7529df0ef45af17857b"`) != nil {
- return
- }
-
- if !processTxs(repl, t, 1) {
- return
- }
-
- expNotice = `About to submit transaction (no NatSpec info found for contract: content hash not found for '0x87e2802265838c7f14bb69eecd2112911af6767907a702eeaa445239fb20711b'): {"params":[{"to":"0x46d69d55c3c4b86a924a92c9fc4720bb7bce1d74","data": "0xc6888fa10000000000000000000000000000000000000000000000000000000000000006"}]}`
- if repl.lastConfirm != expNotice {
- t.Errorf("incorrect confirmation message: expected\n%v, got\n%v", expNotice, repl.lastConfirm)
- return
- }
-
- var contentHash = `"0x86d2b7cf1e72e9a7a3f8d96601f0151742a2f780f1526414304fbe413dc7f9bd"`
- if sol != nil && solcVersion != sol.Version() {
- modContractInfo := versionRE.ReplaceAll(contractInfo, []byte(`"compilerVersion":"`+sol.Version()+`"`))
- fmt.Printf("modified contractinfo:\n%s\n", modContractInfo)
- contentHash = `"` + common.ToHex(crypto.Keccak256([]byte(modContractInfo))) + `"`
- }
- if checkEvalJSON(t, repl, `filename = "/tmp/info.json"`, `"/tmp/info.json"`) != nil {
- return
- }
- if checkEvalJSON(t, repl, `contentHash = admin.saveInfo(contract.info, filename)`, contentHash) != nil {
- return
- }
- if checkEvalJSON(t, repl, `admin.register(primary, contractaddress, contentHash)`, `true`) != nil {
- return
- }
- if checkEvalJSON(t, repl, `admin.registerUrl(primary, contentHash, "file://"+filename)`, `true`) != nil {
- return
- }
-
- if checkEvalJSON(t, repl, `admin.startNatSpec()`, `true`) != nil {
- return
- }
-
- if !processTxs(repl, t, 3) {
- return
- }
-
- if checkEvalJSON(t, repl, `multiply7.multiply.sendTransaction(6, { from: primary })`, `"0x66d7635c12ad0b231e66da2f987ca3dfdca58ffe49c6442aa55960858103fd0c"`) != nil {
- return
- }
-
- if !processTxs(repl, t, 1) {
- return
- }
-
- expNotice = "Will multiply 6 by 7."
- if repl.lastConfirm != expNotice {
- t.Errorf("incorrect confirmation message: expected\n%v, got\n%v", expNotice, repl.lastConfirm)
- return
- }
-}
-
-func pendingTransactions(repl *testjethre, t *testing.T) (txc int64, err error) {
- var ethereum *eth.Ethereum
- repl.stack.Service(ðereum)
-
- txs := ethereum.TxPool().GetTransactions()
- return int64(len(txs)), nil
-}
-
-func processTxs(repl *testjethre, t *testing.T, expTxc int) bool {
- var txc int64
- var err error
- for i := 0; i < 50; i++ {
- txc, err = pendingTransactions(repl, t)
- if err != nil {
- t.Errorf("unexpected error checking pending transactions: %v", err)
- return false
- }
- if expTxc < int(txc) {
- t.Errorf("too many pending transactions: expected %v, got %v", expTxc, txc)
- return false
- } else if expTxc == int(txc) {
- break
- }
- time.Sleep(100 * time.Millisecond)
- }
- if int(txc) != expTxc {
- t.Errorf("incorrect number of pending transactions, expected %v, got %v", expTxc, txc)
- return false
- }
- var ethereum *eth.Ethereum
- repl.stack.Service(ðereum)
-
- err = ethereum.StartMining(runtime.NumCPU(), "")
- if err != nil {
- t.Errorf("unexpected error mining: %v", err)
- return false
- }
- defer ethereum.StopMining()
-
- timer := time.NewTimer(100 * time.Second)
- blockNr := ethereum.BlockChain().CurrentBlock().Number()
- height := new(big.Int).Add(blockNr, big.NewInt(1))
- repl.wait <- height
- select {
- case <-timer.C:
- // if times out make sure the xeth loop does not block
- go func() {
- select {
- case repl.wait <- nil:
- case <-repl.wait:
- }
- }()
- case <-repl.wait:
- }
- txc, err = pendingTransactions(repl, t)
- if err != nil {
- t.Errorf("unexpected error checking pending transactions: %v", err)
- return false
- }
- if txc != 0 {
- t.Errorf("%d trasactions were not mined", txc)
- return false
- }
- return true
-}
-
-func checkEvalJSON(t *testing.T, re *testjethre, expr, want string) error {
- 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)
- }
- if err != nil {
- _, file, line, _ := runtime.Caller(1)
- file = filepath.Base(file)
- fmt.Printf("\t%s:%d: %v\n", file, line, err)
- t.Fail()
- }
- return err
-}
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 68aa7d45f..cdbda53e8 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -22,7 +22,6 @@ import (
"fmt"
"io/ioutil"
"os"
- "os/signal"
"path/filepath"
"runtime"
"strconv"
@@ -33,6 +32,7 @@ import (
"github.com/ethereum/ethash"
"github.com/ethereum/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/console"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/eth"
"github.com/ethereum/go-ethereum/ethdb"
@@ -95,6 +95,9 @@ func init() {
monitorCommand,
accountCommand,
walletCommand,
+ consoleCommand,
+ attachCommand,
+ javascriptCommand,
{
Action: makedag,
Name: "makedag",
@@ -138,36 +141,6 @@ The output of this command is supposed to be machine-readable.
The init command initialises a new genesis block and definition for the network.
This is a destructive action and changes the network in which you will be
participating.
-`,
- },
- {
- Action: console,
- Name: "console",
- 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 Ðapp JavaScript API.
-See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console
-`,
- },
- {
- Action: attach,
- Name: "attach",
- Usage: `Geth Console: interactive JavaScript environment (connect to node)`,
- Description: `
- The Geth console is an interactive shell for the JavaScript runtime environment
- which exposes a node admin interface as well as the Ðapp JavaScript API.
- See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console.
- This command allows to open a console on a running geth node.
- `,
- },
- {
- Action: execScripts,
- 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 Ðapp
-JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Console
`,
},
}
@@ -214,7 +187,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
utils.IPCApiFlag,
utils.IPCPathFlag,
utils.ExecFlag,
- utils.PreLoadJSFlag,
+ utils.PreloadJSFlag,
utils.WhisperEnabledFlag,
utils.DevModeFlag,
utils.TestNetFlag,
@@ -263,7 +236,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
app.After = func(ctx *cli.Context) error {
logger.Flush()
debug.Exit()
- utils.Stdin.Close() // Resets terminal mode.
+ console.TerminalPrompter.Close() // Resets terminal mode.
return nil
}
}
@@ -304,36 +277,6 @@ func geth(ctx *cli.Context) {
node.Wait()
}
-// attach will connect to a running geth instance attaching a JavaScript console and to it.
-func attach(ctx *cli.Context) {
- // attach to a running geth instance
- client, err := utils.NewRemoteRPCClient(ctx)
- if err != nil {
- utils.Fatalf("Unable to attach to geth: %v", err)
- }
-
- repl := newLightweightJSRE(
- ctx.GlobalString(utils.JSpathFlag.Name),
- client,
- ctx.GlobalString(utils.DataDirFlag.Name),
- true,
- )
-
- // preload user defined JS files into the console
- err = repl.preloadJSFiles(ctx)
- if err != nil {
- utils.Fatalf("unable to preload JS file %v", err)
- }
-
- // in case the exec flag holds a JS statement execute it and return
- if ctx.GlobalString(utils.ExecFlag.Name) != "" {
- repl.batch(ctx.GlobalString(utils.ExecFlag.Name))
- } else {
- repl.welcome()
- repl.interactive()
- }
-}
-
// initGenesis will initialise the given JSON format genesis file and writes it as
// the zero'd block (i.e. genesis) or will fail hard if it can't succeed.
func initGenesis(ctx *cli.Context) {
@@ -359,77 +302,6 @@ func initGenesis(ctx *cli.Context) {
glog.V(logger.Info).Infof("successfully wrote genesis block and/or chain rule set: %x", block.Hash())
}
-// console starts a new geth node, attaching a JavaScript console to it at the
-// same time.
-func console(ctx *cli.Context) {
- // Create and start the node based on the CLI flags
- node := utils.MakeSystemNode(clientIdentifier, verString, relConfig, makeDefaultExtra(), ctx)
- startNode(ctx, node)
-
- // Attach to the newly started node, and either execute script or become interactive
- client, err := node.Attach()
- if err != nil {
- utils.Fatalf("Failed to attach to the inproc geth: %v", err)
- }
- repl := newJSRE(node,
- ctx.GlobalString(utils.JSpathFlag.Name),
- ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
- client, true)
-
- // preload user defined JS files into the console
- err = repl.preloadJSFiles(ctx)
- if err != nil {
- utils.Fatalf("%v", err)
- }
-
- // in case the exec flag holds a JS statement execute it and return
- if script := ctx.GlobalString(utils.ExecFlag.Name); script != "" {
- repl.batch(script)
- } else {
- repl.welcome()
- repl.interactive()
- }
- node.Stop()
-}
-
-// execScripts starts a new geth node based on the CLI flags, and executes each
-// of the JavaScript files specified as command arguments.
-func execScripts(ctx *cli.Context) {
- // Create and start the node based on the CLI flags
- node := utils.MakeSystemNode(clientIdentifier, verString, relConfig, makeDefaultExtra(), ctx)
- startNode(ctx, node)
- defer node.Stop()
-
- // Attach to the newly started node and execute the given scripts
- client, err := node.Attach()
- if err != nil {
- utils.Fatalf("Failed to attach to the inproc geth: %v", err)
- }
- repl := newJSRE(node,
- ctx.GlobalString(utils.JSpathFlag.Name),
- ctx.GlobalString(utils.RPCCORSDomainFlag.Name),
- client, false)
-
- // Run all given files.
- for _, file := range ctx.Args() {
- if err = repl.re.Exec(file); err != nil {
- break
- }
- }
- if err != nil {
- utils.Fatalf("JavaScript Error: %v", jsErrorString(err))
- }
- // JS files loaded successfully.
- // Wait for pending callbacks, but stop for Ctrl-C.
- abort := make(chan os.Signal, 1)
- signal.Notify(abort, os.Interrupt)
- go func() {
- <-abort
- repl.re.Stop(false)
- }()
- repl.re.Stop(true)
-}
-
// startNode boots up the system node and all registered protocols, after which
// it unlocks any requested accounts, and starts the RPC/IPC interfaces and the
// miner.
diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go
index ba4ce0c60..f6bc3f869 100644
--- a/cmd/geth/run_test.go
+++ b/cmd/geth/run_test.go
@@ -45,6 +45,7 @@ type testgeth struct {
// template variables for expect
Datadir string
Executable string
+ Etherbase string
Func template.FuncMap
removeDatadir bool
@@ -67,11 +68,15 @@ func init() {
func runGeth(t *testing.T, args ...string) *testgeth {
tt := &testgeth{T: t, Executable: os.Args[0]}
for i, arg := range args {
- if arg == "-datadir" || arg == "--datadir" {
+ switch {
+ case arg == "-datadir" || arg == "--datadir":
if i < len(args)-1 {
tt.Datadir = args[i+1]
}
- break
+ case arg == "-etherbase" || arg == "--etherbase":
+ if i < len(args)-1 {
+ tt.Etherbase = args[i+1]
+ }
}
}
if tt.Datadir == "" {
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index 90019d7b9..01a71c1f6 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -101,7 +101,7 @@ var AppHelpFlagGroups = []flagGroup{
utils.RPCCORSDomainFlag,
utils.JSpathFlag,
utils.ExecFlag,
- utils.PreLoadJSFlag,
+ utils.PreloadJSFlag,
},
},
{
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 43dbc37f7..c476e1c77 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -302,7 +302,7 @@ var (
Name: "exec",
Usage: "Execute JavaScript statement (only in combination with console/attach)",
}
- PreLoadJSFlag = cli.StringFlag{
+ PreloadJSFlag = cli.StringFlag{
Name: "preload",
Usage: "Comma separated list of JavaScript files to preload into the console",
}
@@ -864,3 +864,20 @@ func MakeChain(ctx *cli.Context) (chain *core.BlockChain, chainDb ethdb.Database
}
return chain, chainDb
}
+
+// MakeConsolePreloads retrieves the absolute paths for the console JavaScript
+// scripts to preload before starting.
+func MakeConsolePreloads(ctx *cli.Context) []string {
+ // Skip preloading if there's nothing to preload
+ if ctx.GlobalString(PreloadJSFlag.Name) == "" {
+ return nil
+ }
+ // Otherwise resolve absolute paths and return them
+ preloads := []string{}
+
+ assets := ctx.GlobalString(JSpathFlag.Name)
+ for _, file := range strings.Split(ctx.GlobalString(PreloadJSFlag.Name), ",") {
+ preloads = append(preloads, common.AbsolutePath(assets, strings.TrimSpace(file)))
+ }
+ return preloads
+}
diff --git a/cmd/utils/input.go b/cmd/utils/input.go
deleted file mode 100644
index 523d5a587..000000000
--- a/cmd/utils/input.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2016 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
-
-package utils
-
-import (
- "fmt"
- "strings"
-
- "github.com/peterh/liner"
-)
-
-// Holds the stdin line reader.
-// Only this reader may be used for input because it keeps
-// an internal buffer.
-var Stdin = newUserInputReader()
-
-type userInputReader struct {
- *liner.State
- warned bool
- supported bool
- normalMode liner.ModeApplier
- rawMode liner.ModeApplier
-}
-
-func newUserInputReader() *userInputReader {
- r := new(userInputReader)
- // Get the original mode before calling NewLiner.
- // This is usually regular "cooked" mode where characters echo.
- normalMode, _ := liner.TerminalMode()
- // Turn on liner. It switches to raw mode.
- r.State = liner.NewLiner()
- rawMode, err := liner.TerminalMode()
- if err != nil || !liner.TerminalSupported() {
- r.supported = false
- } else {
- r.supported = true
- r.normalMode = normalMode
- r.rawMode = rawMode
- // Switch back to normal mode while we're not prompting.
- normalMode.ApplyMode()
- }
- return r
-}
-
-func (r *userInputReader) Prompt(prompt string) (string, error) {
- if r.supported {
- r.rawMode.ApplyMode()
- defer r.normalMode.ApplyMode()
- } else {
- // liner tries to be smart about printing the prompt
- // and doesn't print anything if input is redirected.
- // Un-smart it by printing the prompt always.
- fmt.Print(prompt)
- prompt = ""
- defer fmt.Println()
- }
- return r.State.Prompt(prompt)
-}
-
-func (r *userInputReader) PasswordPrompt(prompt string) (passwd string, err error) {
- if r.supported {
- r.rawMode.ApplyMode()
- defer r.normalMode.ApplyMode()
- return r.State.PasswordPrompt(prompt)
- }
- if !r.warned {
- fmt.Println("!! Unsupported terminal, password will be echoed.")
- r.warned = true
- }
- // Just as in Prompt, handle printing the prompt here instead of relying on liner.
- fmt.Print(prompt)
- passwd, err = r.State.Prompt("")
- fmt.Println()
- return passwd, err
-}
-
-func (r *userInputReader) ConfirmPrompt(prompt string) (bool, error) {
- prompt = prompt + " [y/N] "
- input, err := r.Prompt(prompt)
- if len(input) > 0 && strings.ToUpper(input[:1]) == "Y" {
- return true, nil
- }
- return false, err
-}
diff --git a/cmd/utils/jeth.go b/cmd/utils/jeth.go
deleted file mode 100644
index 9410180b0..000000000
--- a/cmd/utils/jeth.go
+++ /dev/null
@@ -1,301 +0,0 @@
-// Copyright 2015 The go-ethereum Authors
-// This file is part of go-ethereum.
-//
-// go-ethereum is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// go-ethereum is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with go-ethereum. If not, see <http://www.gnu.org/licenses/>.
-
-package utils
-
-import (
- "encoding/json"
- "fmt"
- "time"
-
- "github.com/ethereum/go-ethereum/jsre"
- "github.com/ethereum/go-ethereum/rpc"
-
- "github.com/robertkrimen/otto"
-)
-
-type Jeth struct {
- re *jsre.JSRE
- client rpc.Client
-}
-
-// NewJeth create a new backend for the JSRE console
-func NewJeth(re *jsre.JSRE, client rpc.Client) *Jeth {
- return &Jeth{re, client}
-}
-
-// err returns an error object for the given error code and message.
-func (self *Jeth) err(call otto.FunctionCall, code int, msg string, id interface{}) (response otto.Value) {
- m := rpc.JSONErrResponse{
- Version: "2.0",
- Id: id,
- Error: rpc.JSONError{
- Code: code,
- Message: msg,
- },
- }
-
- errObj, _ := json.Marshal(m.Error)
- errRes, _ := json.Marshal(m)
-
- call.Otto.Run("ret_error = " + string(errObj))
- res, _ := call.Otto.Run("ret_response = " + string(errRes))
-
- return res
-}
-
-// UnlockAccount asks the user for the password and than executes the jeth.UnlockAccount callback in the jsre.
-// It will need the public address for the account to unlock as first argument.
-// The second argument is an optional string with the password. If not given the user is prompted for the password.
-// The third argument is an optional integer which specifies for how long the account will be unlocked (in seconds).
-func (self *Jeth) UnlockAccount(call otto.FunctionCall) (response otto.Value) {
- var account, passwd otto.Value
- duration := otto.NullValue()
-
- if !call.Argument(0).IsString() {
- fmt.Println("first argument must be the account to unlock")
- return otto.FalseValue()
- }
-
- account = call.Argument(0)
-
- // if password is not given or as null value -> ask user for password
- if call.Argument(1).IsUndefined() || call.Argument(1).IsNull() {
- fmt.Printf("Unlock account %s\n", account)
- if input, err := Stdin.PasswordPrompt("Passphrase: "); err != nil {
- throwJSExeception(err.Error())
- } else {
- passwd, _ = otto.ToValue(input)
- }
- } else {
- if !call.Argument(1).IsString() {
- throwJSExeception("password must be a string")
- }
- passwd = call.Argument(1)
- }
-
- // third argument is the duration how long the account must be unlocked.
- // verify that its a number.
- if call.Argument(2).IsDefined() && !call.Argument(2).IsNull() {
- if !call.Argument(2).IsNumber() {
- throwJSExeception("unlock duration must be a number")
- }
- duration = call.Argument(2)
- }
-
- // jeth.unlockAccount will send the request to the backend.
- if val, err := call.Otto.Call("jeth.unlockAccount", nil, account, passwd, duration); err == nil {
- return val
- } else {
- throwJSExeception(err.Error())
- }
-
- return otto.FalseValue()
-}
-
-// NewAccount asks the user for the password and than executes the jeth.newAccount callback in the jsre
-func (self *Jeth) NewAccount(call otto.FunctionCall) (response otto.Value) {
- var passwd string
- if len(call.ArgumentList) == 0 {
- var err error
- passwd, err = Stdin.PasswordPrompt("Passphrase: ")
- if err != nil {
- return otto.FalseValue()
- }
- passwd2, err := Stdin.PasswordPrompt("Repeat passphrase: ")
- if err != nil {
- return otto.FalseValue()
- }
-
- if passwd != passwd2 {
- fmt.Println("Passphrases don't match")
- return otto.FalseValue()
- }
- } else if len(call.ArgumentList) == 1 && call.Argument(0).IsString() {
- passwd, _ = call.Argument(0).ToString()
- } else {
- fmt.Println("expected 0 or 1 string argument")
- return otto.FalseValue()
- }
-
- ret, err := call.Otto.Call("jeth.newAccount", nil, passwd)
- if err == nil {
- return ret
- }
- fmt.Println(err)
- return otto.FalseValue()
-}
-
-// Send will serialize the first argument, send it to the node and returns the response.
-func (self *Jeth) Send(call otto.FunctionCall) (response otto.Value) {
- // verify we got a batch request (array) or a single request (object)
- ro := call.Argument(0).Object()
- if ro == nil || (ro.Class() != "Array" && ro.Class() != "Object") {
- throwJSExeception("Internal Error: request must be an object or array")
- }
-
- // convert otto vm arguments to go values by JSON serialising and parsing.
- data, err := call.Otto.Call("JSON.stringify", nil, ro)
- if err != nil {
- throwJSExeception(err.Error())
- }
-
- jsonreq, _ := data.ToString()
-
- // parse arguments to JSON rpc requests, either to an array (batch) or to a single request.
- var reqs []rpc.JSONRequest
- batch := true
- if err = json.Unmarshal([]byte(jsonreq), &reqs); err != nil {
- // single request?
- reqs = make([]rpc.JSONRequest, 1)
- if err = json.Unmarshal([]byte(jsonreq), &reqs[0]); err != nil {
- throwJSExeception("invalid request")
- }
- batch = false
- }
-
- call.Otto.Set("response_len", len(reqs))
- call.Otto.Run("var ret_response = new Array(response_len);")
-
- for i, req := range reqs {
- if err := self.client.Send(&req); err != nil {
- return self.err(call, -32603, err.Error(), req.Id)
- }
-
- result := make(map[string]interface{})
- if err = self.client.Recv(&result); err != nil {
- return self.err(call, -32603, err.Error(), req.Id)
- }
-
- id, _ := result["id"]
- jsonver, _ := result["jsonrpc"]
-
- call.Otto.Set("ret_id", id)
- call.Otto.Set("ret_jsonrpc", jsonver)
- call.Otto.Set("response_idx", i)
-
- // call was successful
- if res, ok := result["result"]; ok {
- payload, _ := json.Marshal(res)
- call.Otto.Set("ret_result", string(payload))
- response, err = call.Otto.Run(`
- ret_response[response_idx] = { jsonrpc: ret_jsonrpc, id: ret_id, result: JSON.parse(ret_result) };
- `)
- continue
- }
-
- // request returned an error
- if res, ok := result["error"]; ok {
- payload, _ := json.Marshal(res)
- call.Otto.Set("ret_result", string(payload))
- response, err = call.Otto.Run(`
- ret_response[response_idx] = { jsonrpc: ret_jsonrpc, id: ret_id, error: JSON.parse(ret_result) };
- `)
- continue
- }
-
- return self.err(call, -32603, fmt.Sprintf("Invalid response"), new(int64))
- }
-
- if !batch {
- call.Otto.Run("ret_response = ret_response[0];")
- }
-
- // if a callback was given execute it.
- if call.Argument(1).IsObject() {
- call.Otto.Set("callback", call.Argument(1))
- call.Otto.Run(`
- if (Object.prototype.toString.call(callback) == '[object Function]') {
- callback(null, ret_response);
- }
- `)
- }
-
- return
-}
-
-// throwJSExeception panics on an otto value, the Otto VM will then throw msg as a javascript error.
-func throwJSExeception(msg interface{}) otto.Value {
- p, _ := otto.ToValue(msg)
- panic(p)
-}
-
-// Sleep will halt the console for arg[0] seconds.
-func (self *Jeth) Sleep(call otto.FunctionCall) (response otto.Value) {
- if len(call.ArgumentList) >= 1 {
- if call.Argument(0).IsNumber() {
- sleep, _ := call.Argument(0).ToInteger()
- time.Sleep(time.Duration(sleep) * time.Second)
- return otto.TrueValue()
- }
- }
- return throwJSExeception("usage: sleep(<sleep in seconds>)")
-}
-
-// SleepBlocks will wait for a specified number of new blocks or max for a
-// given of seconds. sleepBlocks(nBlocks[, maxSleep]).
-func (self *Jeth) SleepBlocks(call otto.FunctionCall) (response otto.Value) {
- nBlocks := int64(0)
- maxSleep := int64(9999999999999999) // indefinitely
-
- nArgs := len(call.ArgumentList)
-
- if nArgs == 0 {
- throwJSExeception("usage: sleepBlocks(<n blocks>[, max sleep in seconds])")
- }
-
- if nArgs >= 1 {
- if call.Argument(0).IsNumber() {
- nBlocks, _ = call.Argument(0).ToInteger()
- } else {
- throwJSExeception("expected number as first argument")
- }
- }
-
- if nArgs >= 2 {
- if call.Argument(1).IsNumber() {
- maxSleep, _ = call.Argument(1).ToInteger()
- } else {
- throwJSExeception("expected number as second argument")
- }
- }
-
- // go through the console, this will allow web3 to call the appropriate
- // callbacks if a delayed response or notification is received.
- currentBlockNr := func() int64 {
- result, err := call.Otto.Run("eth.blockNumber")
- if err != nil {
- throwJSExeception(err.Error())
- }
- blockNr, err := result.ToInteger()
- if err != nil {
- throwJSExeception(err.Error())
- }
- return blockNr
- }
-
- targetBlockNr := currentBlockNr() + nBlocks
- deadline := time.Now().Add(time.Duration(maxSleep) * time.Second)
-
- for time.Now().Before(deadline) {
- if currentBlockNr() >= targetBlockNr {
- return otto.TrueValue()
- }
- time.Sleep(time.Second)
- }
-
- return otto.FalseValue()
-}
diff --git a/console/bridge.go b/console/bridge.go
new file mode 100644
index 000000000..b23e06837
--- /dev/null
+++ b/console/bridge.go
@@ -0,0 +1,317 @@
+// Copyright 2015 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package console
+
+import (
+ "encoding/json"
+ "fmt"
+ "io"
+ "time"
+
+ "github.com/ethereum/go-ethereum/logger"
+ "github.com/ethereum/go-ethereum/logger/glog"
+ "github.com/ethereum/go-ethereum/rpc"
+ "github.com/robertkrimen/otto"
+)
+
+// bridge is a collection of JavaScript utility methods to bride the .js runtime
+// environment and the Go RPC connection backing the remote method calls.
+type bridge struct {
+ client rpc.Client // RPC client to execute Ethereum requests through
+ prompter UserPrompter // Input prompter to allow interactive user feedback
+ printer io.Writer // Output writer to serialize any display strings to
+}
+
+// newBridge creates a new JavaScript wrapper around an RPC client.
+func newBridge(client rpc.Client, prompter UserPrompter, printer io.Writer) *bridge {
+ return &bridge{
+ client: client,
+ prompter: prompter,
+ printer: printer,
+ }
+}
+
+// NewAccount is a wrapper around the personal.newAccount RPC method that uses a
+// non-echoing password prompt to aquire the passphrase and executes the original
+// RPC method (saved in jeth.newAccount) with it to actually execute the RPC call.
+func (b *bridge) NewAccount(call otto.FunctionCall) (response otto.Value) {
+ var (
+ password string
+ confirm string
+ err error
+ )
+ switch {
+ // No password was specified, prompt the user for it
+ case len(call.ArgumentList) == 0:
+ if password, err = b.prompter.PromptPassword("Passphrase: "); err != nil {
+ throwJSException(err.Error())
+ }
+ if confirm, err = b.prompter.PromptPassword("Repeat passphrase: "); err != nil {
+ throwJSException(err.Error())
+ }
+ if password != confirm {
+ throwJSException("passphrases don't match!")
+ }
+
+ // A single string password was specified, use that
+ case len(call.ArgumentList) == 1 && call.Argument(0).IsString():
+ password, _ = call.Argument(0).ToString()
+
+ // Otherwise fail with some error
+ default:
+ throwJSException("expected 0 or 1 string argument")
+ }
+ // Password aquired, execute the call and return
+ ret, err := call.Otto.Call("jeth.newAccount", nil, password)
+ if err != nil {
+ throwJSException(err.Error())
+ }
+ return ret
+}
+
+// UnlockAccount is a wrapper around the personal.unlockAccount RPC method that
+// uses a non-echoing password prompt to aquire the passphrase and executes the
+// original RPC method (saved in jeth.unlockAccount) with it to actually execute
+// the RPC call.
+func (b *bridge) UnlockAccount(call otto.FunctionCall) (response otto.Value) {
+ // Make sure we have an account specified to unlock
+ if !call.Argument(0).IsString() {
+ throwJSException("first argument must be the account to unlock")
+ }
+ account := call.Argument(0)
+
+ // If password is not given or is the null value, prompt the user for it
+ var passwd otto.Value
+
+ if call.Argument(1).IsUndefined() || call.Argument(1).IsNull() {
+ fmt.Fprintf(b.printer, "Unlock account %s\n", account)
+ if input, err := b.prompter.PromptPassword("Passphrase: "); err != nil {
+ throwJSException(err.Error())
+ } else {
+ passwd, _ = otto.ToValue(input)
+ }
+ } else {
+ if !call.Argument(1).IsString() {
+ throwJSException("password must be a string")
+ }
+ passwd = call.Argument(1)
+ }
+ // Third argument is the duration how long the account must be unlocked.
+ duration := otto.NullValue()
+ if call.Argument(2).IsDefined() && !call.Argument(2).IsNull() {
+ if !call.Argument(2).IsNumber() {
+ throwJSException("unlock duration must be a number")
+ }
+ duration = call.Argument(2)
+ }
+ // Send the request to the backend and return
+ val, err := call.Otto.Call("jeth.unlockAccount", nil, account, passwd, duration)
+ if err != nil {
+ throwJSException(err.Error())
+ }
+ return val
+}
+
+// Sleep will block the console for the specified number of seconds.
+func (b *bridge) Sleep(call otto.FunctionCall) (response otto.Value) {
+ if call.Argument(0).IsNumber() {
+ sleep, _ := call.Argument(0).ToInteger()
+ time.Sleep(time.Duration(sleep) * time.Second)
+ return otto.TrueValue()
+ }
+ return throwJSException("usage: sleep(<number of seconds>)")
+}
+
+// SleepBlocks will block the console for a specified number of new blocks optionally
+// until the given timeout is reached.
+func (b *bridge) SleepBlocks(call otto.FunctionCall) (response otto.Value) {
+ var (
+ blocks = int64(0)
+ sleep = int64(9999999999999999) // indefinitely
+ )
+ // Parse the input parameters for the sleep
+ nArgs := len(call.ArgumentList)
+ if nArgs == 0 {
+ throwJSException("usage: sleepBlocks(<n blocks>[, max sleep in seconds])")
+ }
+ if nArgs >= 1 {
+ if call.Argument(0).IsNumber() {
+ blocks, _ = call.Argument(0).ToInteger()
+ } else {
+ throwJSException("expected number as first argument")
+ }
+ }
+ if nArgs >= 2 {
+ if call.Argument(1).IsNumber() {
+ sleep, _ = call.Argument(1).ToInteger()
+ } else {
+ throwJSException("expected number as second argument")
+ }
+ }
+ // go through the console, this will allow web3 to call the appropriate
+ // callbacks if a delayed response or notification is received.
+ blockNumber := func() int64 {
+ result, err := call.Otto.Run("eth.blockNumber")
+ if err != nil {
+ throwJSException(err.Error())
+ }
+ block, err := result.ToInteger()
+ if err != nil {
+ throwJSException(err.Error())
+ }
+ return block
+ }
+ // Poll the current block number until either it ot a timeout is reached
+ targetBlockNr := blockNumber() + blocks
+ deadline := time.Now().Add(time.Duration(sleep) * time.Second)
+
+ for time.Now().Before(deadline) {
+ if blockNumber() >= targetBlockNr {
+ return otto.TrueValue()
+ }
+ time.Sleep(time.Second)
+ }
+ return otto.FalseValue()
+}
+
+// Send will serialize the first argument, send it to the node and returns the response.
+func (b *bridge) Send(call otto.FunctionCall) (response otto.Value) {
+ // Ensure that we've got a batch request (array) or a single request (object)
+ arg := call.Argument(0).Object()
+ if arg == nil || (arg.Class() != "Array" && arg.Class() != "Object") {
+ throwJSException("request must be an object or array")
+ }
+ // Convert the otto VM arguments to Go values
+ data, err := call.Otto.Call("JSON.stringify", nil, arg)
+ if err != nil {
+ throwJSException(err.Error())
+ }
+ reqjson, err := data.ToString()
+ if err != nil {
+ throwJSException(err.Error())
+ }
+
+ var (
+ reqs []rpc.JSONRequest
+ batch = true
+ )
+ if err = json.Unmarshal([]byte(reqjson), &reqs); err != nil {
+ // single request?
+ reqs = make([]rpc.JSONRequest, 1)
+ if err = json.Unmarshal([]byte(reqjson), &reqs[0]); err != nil {
+ throwJSException("invalid request")
+ }
+ batch = false
+ }
+ // Iteratively execute the requests
+ call.Otto.Set("response_len", len(reqs))
+ call.Otto.Run("var ret_response = new Array(response_len);")
+
+ for i, req := range reqs {
+ // Execute the RPC request and parse the reply
+ if err = b.client.Send(&req); err != nil {
+ return newErrorResponse(call, -32603, err.Error(), req.Id)
+ }
+ result := make(map[string]interface{})
+ if err = b.client.Recv(&result); err != nil {
+ return newErrorResponse(call, -32603, err.Error(), req.Id)
+ }
+ // Feed the reply back into the JavaScript runtime environment
+ id, _ := result["id"]
+ jsonver, _ := result["jsonrpc"]
+
+ call.Otto.Set("ret_id", id)
+ call.Otto.Set("ret_jsonrpc", jsonver)
+ call.Otto.Set("response_idx", i)
+
+ if res, ok := result["result"]; ok {
+ payload, _ := json.Marshal(res)
+ call.Otto.Set("ret_result", string(payload))
+ response, err = call.Otto.Run(`
+ ret_response[response_idx] = { jsonrpc: ret_jsonrpc, id: ret_id, result: JSON.parse(ret_result) };
+ `)
+ continue
+ }
+ if res, ok := result["error"]; ok {
+ payload, _ := json.Marshal(res)
+ call.Otto.Set("ret_result", string(payload))
+ response, err = call.Otto.Run(`
+ ret_response[response_idx] = { jsonrpc: ret_jsonrpc, id: ret_id, error: JSON.parse(ret_result) };
+ `)
+ continue
+ }
+ return newErrorResponse(call, -32603, fmt.Sprintf("Invalid response"), new(int64))
+ }
+ // Convert single requests back from batch ones
+ if !batch {
+ call.Otto.Run("ret_response = ret_response[0];")
+ }
+ // Execute any registered callbacks
+ if call.Argument(1).IsObject() {
+ call.Otto.Set("callback", call.Argument(1))
+ call.Otto.Run(`
+ if (Object.prototype.toString.call(callback) == '[object Function]') {
+ callback(null, ret_response);
+ }
+ `)
+ }
+ return
+}
+
+// throwJSException panics on an otto.Value. The Otto VM will recover from the
+// Go panic and throw msg as a JavaScript error.
+func throwJSException(msg interface{}) otto.Value {
+ val, err := otto.ToValue(msg)
+ if err != nil {
+ glog.V(logger.Error).Infof("Failed to serialize JavaScript exception %v: %v", msg, err)
+ }
+ panic(val)
+}
+
+// newErrorResponse creates a JSON RPC error response for a specific request id,
+// containing the specified error code and error message. Beside returning the
+// error to the caller, it also sets the ret_error and ret_response JavaScript
+// variables.
+func newErrorResponse(call otto.FunctionCall, code int, msg string, id interface{}) (response otto.Value) {
+ // Bundle the error into a JSON RPC call response
+ res := rpc.JSONErrResponse{
+ Version: rpc.JSONRPCVersion,
+ Id: id,
+ Error: rpc.JSONError{
+ Code: code,
+ Message: msg,
+ },
+ }
+ // Serialize the error response into JavaScript variables
+ errObj, err := json.Marshal(res.Error)
+ if err != nil {
+ glog.V(logger.Error).Infof("Failed to serialize JSON RPC error: %v", err)
+ }
+ resObj, err := json.Marshal(res)
+ if err != nil {
+ glog.V(logger.Error).Infof("Failed to serialize JSON RPC error response: %v", err)
+ }
+
+ if _, err = call.Otto.Run("ret_error = " + string(errObj)); err != nil {
+ glog.V(logger.Error).Infof("Failed to set `ret_error` to the occurred error: %v", err)
+ }
+ resVal, err := call.Otto.Run("ret_response = " + string(resObj))
+ if err != nil {
+ glog.V(logger.Error).Infof("Failed to set `ret_response` to the JSON RPC response: %v", err)
+ }
+ return resVal
+}
diff --git a/console/console.go b/console/console.go
new file mode 100644
index 000000000..37c9f0afa
--- /dev/null
+++ b/console/console.go
@@ -0,0 +1,369 @@
+// Copyright 2015 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package console
+
+import (
+ "fmt"
+ "io"
+ "io/ioutil"
+ "os"
+ "os/signal"
+ "path/filepath"
+ "regexp"
+ "sort"
+ "strings"
+
+ "github.com/ethereum/go-ethereum/internal/jsre"
+ "github.com/ethereum/go-ethereum/internal/web3ext"
+ "github.com/ethereum/go-ethereum/rpc"
+ "github.com/peterh/liner"
+ "github.com/robertkrimen/otto"
+)
+
+var (
+ passwordRegexp = regexp.MustCompile("personal.[nus]")
+ onlyWhitespace = regexp.MustCompile("^\\s*$")
+ exit = regexp.MustCompile("^\\s*exit\\s*;*\\s*$")
+)
+
+// HistoryFile is the file within the data directory to store input scrollback.
+const HistoryFile = "history"
+
+// DefaultPrompt is the default prompt line prefix to use for user input querying.
+const DefaultPrompt = "> "
+
+// Config is te collection of configurations to fine tune the behavior of the
+// JavaScript console.
+type Config struct {
+ DataDir string // Data directory to store the console history at
+ DocRoot string // Filesystem path from where to load JavaScript files from
+ Client rpc.Client // RPC client to execute Ethereum requests through
+ Prompt string // Input prompt prefix string (defaults to DefaultPrompt)
+ Prompter UserPrompter // Input prompter to allow interactive user feedback (defaults to TerminalPrompter)
+ Printer io.Writer // Output writer to serialize any display strings to (defaults to os.Stdout)
+ Preload []string // Absolute paths to JavaScript files to preload
+}
+
+// Console is a JavaScript interpreted runtime environment. It is a fully fleged
+// JavaScript console attached to a running node via an external or in-process RPC
+// client.
+type Console struct {
+ client rpc.Client // RPC client to execute Ethereum requests through
+ jsre *jsre.JSRE // JavaScript runtime environment running the interpreter
+ prompt string // Input prompt prefix string
+ prompter UserPrompter // Input prompter to allow interactive user feedback
+ histPath string // Absolute path to the console scrollback history
+ history []string // Scroll history maintained by the console
+ printer io.Writer // Output writer to serialize any display strings to
+}
+
+func New(config Config) (*Console, error) {
+ // Handle unset config values gracefully
+ if config.Prompter == nil {
+ config.Prompter = TerminalPrompter
+ }
+ if config.Prompt == "" {
+ config.Prompt = DefaultPrompt
+ }
+ if config.Printer == nil {
+ config.Printer = os.Stdout
+ }
+ // Initialize the console and return
+ console := &Console{
+ client: config.Client,
+ jsre: jsre.New(config.DocRoot, config.Printer),
+ prompt: config.Prompt,
+ prompter: config.Prompter,
+ printer: config.Printer,
+ histPath: filepath.Join(config.DataDir, HistoryFile),
+ }
+ if err := console.init(config.Preload); err != nil {
+ return nil, err
+ }
+ return console, nil
+}
+
+// init retrieves the available APIs from the remote RPC provider and initializes
+// the console's JavaScript namespaces based on the exposed modules.
+func (c *Console) init(preload []string) error {
+ // Initialize the JavaScript <-> Go RPC bridge
+ bridge := newBridge(c.client, c.prompter, c.printer)
+ c.jsre.Set("jeth", struct{}{})
+
+ jethObj, _ := c.jsre.Get("jeth")
+ jethObj.Object().Set("send", bridge.Send)
+ jethObj.Object().Set("sendAsync", bridge.Send)
+
+ consoleObj, _ := c.jsre.Get("console")
+ consoleObj.Object().Set("log", c.consoleOutput)
+ consoleObj.Object().Set("error", c.consoleOutput)
+
+ // Load all the internal utility JavaScript libraries
+ if err := c.jsre.Compile("bignumber.js", jsre.BigNumber_JS); err != nil {
+ return fmt.Errorf("bignumber.js: %v", err)
+ }
+ if err := c.jsre.Compile("web3.js", jsre.Web3_JS); err != nil {
+ return fmt.Errorf("web3.js: %v", err)
+ }
+ if _, err := c.jsre.Run("var Web3 = require('web3');"); err != nil {
+ return fmt.Errorf("web3 require: %v", err)
+ }
+ if _, err := c.jsre.Run("var web3 = new Web3(jeth);"); err != nil {
+ return fmt.Errorf("web3 provider: %v", err)
+ }
+ // Load the supported APIs into the JavaScript runtime environment
+ apis, err := c.client.SupportedModules()
+ if err != nil {
+ return fmt.Errorf("api modules: %v", err)
+ }
+ flatten := "var eth = web3.eth; var personal = web3.personal; "
+ for api := range apis {
+ if api == "web3" {
+ continue // manually mapped or ignore
+ }
+ if file, ok := web3ext.Modules[api]; ok {
+ if err = c.jsre.Compile(fmt.Sprintf("%s.js", api), file); err != nil {
+ return fmt.Errorf("%s.js: %v", api, err)
+ }
+ flatten += fmt.Sprintf("var %s = web3.%s; ", api, api)
+ }
+ }
+ if _, err = c.jsre.Run(flatten); err != nil {
+ return fmt.Errorf("namespace flattening: %v", err)
+ }
+ // Initialize the global name register (disabled for now)
+ //c.jsre.Run(`var GlobalRegistrar = eth.contract(` + registrar.GlobalRegistrarAbi + `); registrar = GlobalRegistrar.at("` + registrar.GlobalRegistrarAddr + `");`)
+
+ // If the console is in interactive mode, instrument password related methods to query the user
+ if c.prompter != nil {
+ // Retrieve the account management object to instrument
+ personal, err := c.jsre.Get("personal")
+ if err != nil {
+ return err
+ }
+ // Override the unlockAccount and newAccount methods since these require user interaction.
+ // Assign the jeth.unlockAccount and jeth.newAccount in the Console the original web3 callbacks.
+ // These will be called by the jeth.* methods after they got the password from the user and send
+ // the original web3 request to the backend.
+ if obj := personal.Object(); obj != nil { // make sure the personal api is enabled over the interface
+ if _, err = c.jsre.Run(`jeth.unlockAccount = personal.unlockAccount;`); err != nil {
+ return fmt.Errorf("personal.unlockAccount: %v", err)
+ }
+ if _, err = c.jsre.Run(`jeth.newAccount = personal.newAccount;`); err != nil {
+ return fmt.Errorf("personal.newAccount: %v", err)
+ }
+ obj.Set("unlockAccount", bridge.UnlockAccount)
+ obj.Set("newAccount", bridge.NewAccount)
+ }
+ }
+ // The admin.sleep and admin.sleepBlocks are offered by the console and not by the RPC layer.
+ admin, err := c.jsre.Get("admin")
+ if err != nil {
+ return err
+ }
+ if obj := admin.Object(); obj != nil { // make sure the admin api is enabled over the interface
+ obj.Set("sleepBlocks", bridge.SleepBlocks)
+ obj.Set("sleep", bridge.Sleep)
+ }
+ // Preload any JavaScript files before starting the console
+ for _, path := range preload {
+ if err := c.jsre.Exec(path); err != nil {
+ return fmt.Errorf("%s: %v", path, jsErrorString(err))
+ }
+ }
+ // Configure the console's input prompter for scrollback and tab completion
+ if c.prompter != nil {
+ if content, err := ioutil.ReadFile(c.histPath); err != nil {
+ c.prompter.SetScrollHistory(nil)
+ } else {
+ c.prompter.SetScrollHistory(strings.Split(string(content), "\n"))
+ }
+ c.prompter.SetWordCompleter(c.AutoCompleteInput)
+ }
+ return nil
+}
+
+// consoleOutput is an override for the console.log and console.error methods to
+// stream the output into the configured output stream instead of stdout.
+func (c *Console) consoleOutput(call otto.FunctionCall) otto.Value {
+ output := []string{}
+ for _, argument := range call.ArgumentList {
+ output = append(output, fmt.Sprintf("%v", argument))
+ }
+ fmt.Fprintln(c.printer, strings.Join(output, " "))
+ return otto.Value{}
+}
+
+// AutoCompleteInput is a pre-assembled word completer to be used by the user
+// input prompter to provide hints to the user about the methods available.
+func (c *Console) AutoCompleteInput(line string, pos int) (string, []string, string) {
+ // No completions can be provided for empty inputs
+ if len(line) == 0 || pos == 0 {
+ return "", nil, ""
+ }
+ // Chunck data to relevant part for autocompletion
+ // E.g. in case of nested lines eth.getBalance(eth.coinb<tab><tab>
+ start := 0
+ for start = pos - 1; start > 0; start-- {
+ // Skip all methods and namespaces (i.e. including te dot)
+ if line[start] == '.' || (line[start] >= 'a' && line[start] <= 'z') || (line[start] >= 'A' && line[start] <= 'Z') {
+ continue
+ }
+ // Handle web3 in a special way (i.e. other numbers aren't auto completed)
+ if start >= 3 && line[start-3:start] == "web3" {
+ start -= 3
+ continue
+ }
+ // We've hit an unexpected character, autocomplete form here
+ start++
+ break
+ }
+ return line[:start], c.jsre.CompleteKeywords(line[start:pos]), line[pos:]
+}
+
+// Welcome show summary of current Geth instance and some metadata about the
+// console's available modules.
+func (c *Console) Welcome() {
+ // Print some generic Geth metadata
+ c.jsre.Run(`
+ (function () {
+ console.log("Welcome to the Geth JavaScript console!\n");
+ console.log("instance: " + web3.version.node);
+ console.log("coinbase: " + eth.coinbase);
+ console.log("at block: " + eth.blockNumber + " (" + new Date(1000 * eth.getBlock(eth.blockNumber).timestamp) + ")");
+ console.log(" datadir: " + admin.datadir);
+ })();
+ `)
+ // List all the supported modules for the user to call
+ if apis, err := c.client.SupportedModules(); err == nil {
+ modules := make([]string, 0, len(apis))
+ for api, version := range apis {
+ modules = append(modules, fmt.Sprintf("%s:%s", api, version))
+ }
+ sort.Strings(modules)
+ c.jsre.Run("(function () { console.log(' modules: " + strings.Join(modules, " ") + "'); })();")
+ }
+ c.jsre.Run("(function () { console.log(); })();")
+}
+
+// Evaluate executes code and pretty prints the result to the specified output
+// stream.
+func (c *Console) Evaluate(statement string) error {
+ defer func() {
+ if r := recover(); r != nil {
+ fmt.Fprintf(c.printer, "[native] error: %v\n", r)
+ }
+ }()
+ if err := c.jsre.Evaluate(statement, c.printer); err != nil {
+ fmt.Fprintf(c.printer, "%v\n", jsErrorString(err))
+ return err
+ }
+ return nil
+}
+
+// Interactive starts an interactive user session, where input is propted from
+// the configured user prompter.
+func (c *Console) Interactive() {
+ var (
+ prompt = c.prompt // Current prompt line (used for multi-line inputs)
+ indents = 0 // Current number of input indents (used for multi-line inputs)
+ input = "" // Current user input
+ scheduler = make(chan string) // Channel to send the next prompt on and receive the input
+ )
+ // Start a goroutine to listen for promt requests and send back inputs
+ go func() {
+ for {
+ // Read the next user input
+ line, err := c.prompter.PromptInput(<-scheduler)
+ if err != nil {
+ // In case of an error, either clear the prompt or fail
+ if err == liner.ErrPromptAborted { // ctrl-C
+ prompt, indents, input = c.prompt, 0, ""
+ scheduler <- ""
+ continue
+ }
+ close(scheduler)
+ return
+ }
+ // User input retrieved, send for interpretation and loop
+ scheduler <- line
+ }
+ }()
+ // Monitor Ctrl-C too in case the input is empty and we need to bail
+ abort := make(chan os.Signal, 1)
+ signal.Notify(abort, os.Interrupt)
+
+ // Start sending prompts to the user and reading back inputs
+ for {
+ // Send the next prompt, triggering an input read and process the result
+ scheduler <- prompt
+ select {
+ case <-abort:
+ // User forcefully quite the console
+ fmt.Fprintln(c.printer, "caught interrupt, exiting")
+ return
+
+ case line, ok := <-scheduler:
+ // User input was returned by the prompter, handle special cases
+ if !ok || (indents <= 0 && exit.MatchString(input)) {
+ return
+ }
+ if onlyWhitespace.MatchString(line) {
+ continue
+ }
+ // Append the line to the input and check for multi-line interpretation
+ input += line + "\n"
+
+ indents = strings.Count(input, "{") + strings.Count(input, "(") - strings.Count(input, "}") - strings.Count(input, ")")
+ if indents <= 0 {
+ prompt = c.prompt
+ } else {
+ prompt = strings.Repeat("..", indents*2) + " "
+ }
+ // If all the needed lines are present, save the command and run
+ if indents <= 0 {
+ if len(input) != 0 && input[0] != ' ' && !passwordRegexp.MatchString(input) {
+ c.history = append(c.history, input[:len(input)-1])
+ }
+ c.Evaluate(input)
+ input = ""
+ }
+ }
+ }
+}
+
+// Execute runs the JavaScript file specified as the argument.
+func (c *Console) Execute(path string) error {
+ return c.jsre.Exec(path)
+}
+
+// Stop cleans up the console and terminates the runtime envorinment.
+func (c *Console) Stop(graceful bool) error {
+ if err := ioutil.WriteFile(c.histPath, []byte(strings.Join(c.history, "\n")), os.ModePerm); err != nil {
+ return err
+ }
+ c.jsre.Stop(graceful)
+ return nil
+}
+
+// jsErrorString adds a backtrace to errors generated by otto.
+func jsErrorString(err error) string {
+ if ottoErr, ok := err.(*otto.Error); ok {
+ return ottoErr.String()
+ }
+ return err.Error()
+}
diff --git a/console/console_test.go b/console/console_test.go
new file mode 100644
index 000000000..5d38331e8
--- /dev/null
+++ b/console/console_test.go
@@ -0,0 +1,283 @@
+// Copyright 2015 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package console
+
+import (
+ "bytes"
+ "errors"
+ "fmt"
+ "io/ioutil"
+ "math/big"
+ "os"
+ "path/filepath"
+ "strings"
+ "testing"
+ "time"
+
+ "github.com/ethereum/go-ethereum/accounts"
+ "github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/core"
+ "github.com/ethereum/go-ethereum/eth"
+ "github.com/ethereum/go-ethereum/internal/jsre"
+ "github.com/ethereum/go-ethereum/node"
+)
+
+const (
+ testInstance = "console-tester"
+ testAddress = "0x8605cdbbdb6d264aa742e77020dcbc58fcdce182"
+)
+
+// hookedPrompter implements UserPrompter to simulate use input via channels.
+type hookedPrompter struct {
+ scheduler chan string
+}
+
+func (p *hookedPrompter) PromptInput(prompt string) (string, error) {
+ // Send the prompt to the tester
+ select {
+ case p.scheduler <- prompt:
+ case <-time.After(time.Second):
+ return "", errors.New("prompt timeout")
+ }
+ // Retrieve the response and feed to the console
+ select {
+ case input := <-p.scheduler:
+ return input, nil
+ case <-time.After(time.Second):
+ return "", errors.New("input timeout")
+ }
+}
+
+func (p *hookedPrompter) PromptPassword(prompt string) (string, error) {
+ return "", errors.New("not implemented")
+}
+func (p *hookedPrompter) PromptConfirm(prompt string) (bool, error) {
+ return false, errors.New("not implemented")
+}
+func (p *hookedPrompter) SetScrollHistory(history []string) {}
+func (p *hookedPrompter) SetWordCompleter(completer WordCompleter) {}
+
+// tester is a console test environment for the console tests to operate on.
+type tester struct {
+ workspace string
+ stack *node.Node
+ ethereum *eth.Ethereum
+ console *Console
+ input *hookedPrompter
+ output *bytes.Buffer
+
+ lastConfirm string
+}
+
+// newTester creates a test environment based on which the console can operate.
+// Please ensure you call Close() on the returned tester to avoid leaks.
+func newTester(t *testing.T, confOverride func(*eth.Config)) *tester {
+ // Create a temporary storage for the node keys and initialize it
+ workspace, err := ioutil.TempDir("", "console-tester-")
+ if err != nil {
+ t.Fatalf("failed to create temporary keystore: %v", err)
+ }
+ accman := accounts.NewPlaintextManager(filepath.Join(workspace, "keystore"))
+
+ // Create a networkless protocol stack and start an Ethereum service within
+ stack, err := node.New(&node.Config{DataDir: workspace, Name: testInstance, NoDiscovery: true})
+ if err != nil {
+ t.Fatalf("failed to create node: %v", err)
+ }
+ ethConf := ð.Config{
+ ChainConfig: &core.ChainConfig{HomesteadBlock: new(big.Int)},
+ Etherbase: common.HexToAddress(testAddress),
+ AccountManager: accman,
+ PowTest: true,
+ }
+ if confOverride != nil {
+ confOverride(ethConf)
+ }
+ if err = stack.Register(func(ctx *node.ServiceContext) (node.Service, error) { return eth.New(ctx, ethConf) }); err != nil {
+ t.Fatalf("failed to register Ethereum protocol: %v", err)
+ }
+ // Start the node and assemble the JavaScript console around it
+ if err = stack.Start(); err != nil {
+ t.Fatalf("failed to start test stack: %v", err)
+ }
+ client, err := stack.Attach()
+ if err != nil {
+ t.Fatalf("failed to attach to node: %v", err)
+ }
+ prompter := &hookedPrompter{scheduler: make(chan string)}
+ printer := new(bytes.Buffer)
+
+ console, err := New(Config{
+ DataDir: stack.DataDir(),
+ DocRoot: "testdata",
+ Client: client,
+ Prompter: prompter,
+ Printer: printer,
+ Preload: []string{"preload.js"},
+ })
+ if err != nil {
+ t.Fatalf("failed to create JavaScript console: %v", err)
+ }
+ // Create the final tester and return
+ var ethereum *eth.Ethereum
+ stack.Service(ðereum)
+
+ return &tester{
+ workspace: workspace,
+ stack: stack,
+ ethereum: ethereum,
+ console: console,
+ input: prompter,
+ output: printer,
+ }
+}
+
+// Close cleans up any temporary data folders and held resources.
+func (env *tester) Close(t *testing.T) {
+ if err := env.console.Stop(false); err != nil {
+ t.Errorf("failed to stop embedded console: %v", err)
+ }
+ if err := env.stack.Stop(); err != nil {
+ t.Errorf("failed to stop embedded node: %v", err)
+ }
+ os.RemoveAll(env.workspace)
+}
+
+// Tests that the node lists the correct welcome message, notably that it contains
+// the instance name, coinbase account, block number, data directory and supported
+// console modules.
+func TestWelcome(t *testing.T) {
+ tester := newTester(t, nil)
+ defer tester.Close(t)
+
+ tester.console.Welcome()
+
+ output := string(tester.output.Bytes())
+ if want := "Welcome"; !strings.Contains(output, want) {
+ t.Fatalf("console output missing welcome message: have\n%s\nwant also %s", output, want)
+ }
+ if want := fmt.Sprintf("instance: %s", testInstance); !strings.Contains(output, want) {
+ t.Fatalf("console output missing instance: have\n%s\nwant also %s", output, want)
+ }
+ if want := fmt.Sprintf("coinbase: %s", testAddress); !strings.Contains(output, want) {
+ t.Fatalf("console output missing coinbase: have\n%s\nwant also %s", output, want)
+ }
+ if want := "at block: 0"; !strings.Contains(output, want) {
+ t.Fatalf("console output missing sync status: have\n%s\nwant also %s", output, want)
+ }
+ if want := fmt.Sprintf("datadir: %s", tester.workspace); !strings.Contains(output, want) {
+ t.Fatalf("console output missing coinbase: have\n%s\nwant also %s", output, want)
+ }
+}
+
+// Tests that JavaScript statement evaluation works as intended.
+func TestEvaluate(t *testing.T) {
+ tester := newTester(t, nil)
+ defer tester.Close(t)
+
+ tester.console.Evaluate("2 + 2")
+ if output := string(tester.output.Bytes()); !strings.Contains(output, "4") {
+ t.Fatalf("statement evaluation failed: have %s, want %s", output, "4")
+ }
+}
+
+// Tests that the console can be used in interactive mode.
+func TestInteractive(t *testing.T) {
+ // Create a tester and run an interactive console in the background
+ tester := newTester(t, nil)
+ defer tester.Close(t)
+
+ go tester.console.Interactive()
+
+ // Wait for a promt and send a statement back
+ select {
+ case <-tester.input.scheduler:
+ case <-time.After(time.Second):
+ t.Fatalf("initial prompt timeout")
+ }
+ select {
+ case tester.input.scheduler <- "2+2":
+ case <-time.After(time.Second):
+ t.Fatalf("input feedback timeout")
+ }
+ // Wait for the second promt and ensure first statement was evaluated
+ select {
+ case <-tester.input.scheduler:
+ case <-time.After(time.Second):
+ t.Fatalf("secondary prompt timeout")
+ }
+ if output := string(tester.output.Bytes()); !strings.Contains(output, "4") {
+ t.Fatalf("statement evaluation failed: have %s, want %s", output, "4")
+ }
+}
+
+// Tests that preloaded JavaScript files have been executed before user is given
+// input.
+func TestPreload(t *testing.T) {
+ tester := newTester(t, nil)
+ defer tester.Close(t)
+
+ tester.console.Evaluate("preloaded")
+ if output := string(tester.output.Bytes()); !strings.Contains(output, "some-preloaded-string") {
+ t.Fatalf("preloaded variable missing: have %s, want %s", output, "some-preloaded-string")
+ }
+}
+
+// Tests that JavaScript scripts can be executes from the configured asset path.
+func TestExecute(t *testing.T) {
+ tester := newTester(t, nil)
+ defer tester.Close(t)
+
+ tester.console.Execute("exec.js")
+
+ tester.console.Evaluate("execed")
+ if output := string(tester.output.Bytes()); !strings.Contains(output, "some-executed-string") {
+ t.Fatalf("execed variable missing: have %s, want %s", output, "some-executed-string")
+ }
+}
+
+// Tests that the JavaScript objects returned by statement executions are properly
+// pretty printed instead of just displaing "[object]".
+func TestPrettyPrint(t *testing.T) {
+ tester := newTester(t, nil)
+ defer tester.Close(t)
+
+ tester.console.Evaluate("obj = {int: 1, string: 'two', list: [3, 3, 3], obj: {null: null, func: function(){}}}")
+
+ // Define some specially formatted fields
+ var (
+ one = jsre.NumberColor("1")
+ two = jsre.StringColor("\"two\"")
+ three = jsre.NumberColor("3")
+ null = jsre.SpecialColor("null")
+ fun = jsre.FunctionColor("function()")
+ )
+ // Assemble the actual output we're after and verify
+ want := `{
+ int: ` + one + `,
+ list: [` + three + `, ` + three + `, ` + three + `],
+ obj: {
+ null: ` + null + `,
+ func: ` + fun + `
+ },
+ string: ` + two + `
+}
+`
+ if output := string(tester.output.Bytes()); output != want {
+ t.Fatalf("pretty print mismatch: have %s, want %s", output, want)
+ }
+}
diff --git a/console/prompter.go b/console/prompter.go
new file mode 100644
index 000000000..5039e8b1c
--- /dev/null
+++ b/console/prompter.go
@@ -0,0 +1,156 @@
+// Copyright 2016 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package console
+
+import (
+ "fmt"
+ "strings"
+
+ "github.com/peterh/liner"
+)
+
+// TerminalPrompter holds the stdin line reader (also using stdout for printing
+// prompts). Only this reader may be used for input because it keeps an internal
+// buffer.
+var TerminalPrompter = newTerminalPrompter()
+
+// UserPrompter defines the methods needed by the console to promt the user for
+// various types of inputs.
+type UserPrompter interface {
+ // PromptInput displays the given prompt to the user and requests some textual
+ // data to be entered, returning the input of the user.
+ PromptInput(prompt string) (string, error)
+
+ // PromptPassword displays the given prompt to the user and requests some textual
+ // data to be entered, but one which must not be echoed out into the terminal.
+ // The method returns the input provided by the user.
+ PromptPassword(prompt string) (string, error)
+
+ // PromptConfirm displays the given prompt to the user and requests a boolean
+ // choice to be made, returning that choice.
+ PromptConfirm(prompt string) (bool, error)
+
+ // SetScrollHistory sets the the input scrollback history that the prompter will
+ // allow the user to scoll back to.
+ SetScrollHistory(history []string)
+
+ // SetWordCompleter sets the completion function that the prompter will call to
+ // fetch completion candidates when the user presses tab.
+ SetWordCompleter(completer WordCompleter)
+}
+
+// WordCompleter takes the currently edited line with the cursor position and
+// returns the completion candidates for the partial word to be completed. If
+// the line is "Hello, wo!!!" and the cursor is before the first '!', ("Hello,
+// wo!!!", 9) is passed to the completer which may returns ("Hello, ", {"world",
+// "Word"}, "!!!") to have "Hello, world!!!".
+type WordCompleter func(line string, pos int) (string, []string, string)
+
+// terminalPrompter is a UserPrompter backed by the liner package. It supports
+// prompting the user for various input, among others for non-echoing password
+// input.
+type terminalPrompter struct {
+ *liner.State
+ warned bool
+ supported bool
+ normalMode liner.ModeApplier
+ rawMode liner.ModeApplier
+}
+
+// newTerminalPrompter creates a liner based user input prompter working off the
+// standard input and output streams.
+func newTerminalPrompter() *terminalPrompter {
+ r := new(terminalPrompter)
+ // Get the original mode before calling NewLiner.
+ // This is usually regular "cooked" mode where characters echo.
+ normalMode, _ := liner.TerminalMode()
+ // Turn on liner. It switches to raw mode.
+ r.State = liner.NewLiner()
+ rawMode, err := liner.TerminalMode()
+ if err != nil || !liner.TerminalSupported() {
+ r.supported = false
+ } else {
+ r.supported = true
+ r.normalMode = normalMode
+ r.rawMode = rawMode
+ // Switch back to normal mode while we're not prompting.
+ normalMode.ApplyMode()
+ }
+ r.SetCtrlCAborts(true)
+ r.SetTabCompletionStyle(liner.TabPrints)
+
+ return r
+}
+
+// PromptInput displays the given prompt to the user and requests some textual
+// data to be entered, returning the input of the user.
+func (r *terminalPrompter) PromptInput(prompt string) (string, error) {
+ if r.supported {
+ r.rawMode.ApplyMode()
+ defer r.normalMode.ApplyMode()
+ } else {
+ // liner tries to be smart about printing the prompt
+ // and doesn't print anything if input is redirected.
+ // Un-smart it by printing the prompt always.
+ fmt.Print(prompt)
+ prompt = ""
+ defer fmt.Println()
+ }
+ return r.State.Prompt(prompt)
+}
+
+// PromptPassword displays the given prompt to the user and requests some textual
+// data to be entered, but one which must not be echoed out into the terminal.
+// The method returns the input provided by the user.
+func (r *terminalPrompter) PromptPassword(prompt string) (passwd string, err error) {
+ if r.supported {
+ r.rawMode.ApplyMode()
+ defer r.normalMode.ApplyMode()
+ return r.State.PasswordPrompt(prompt)
+ }
+ if !r.warned {
+ fmt.Println("!! Unsupported terminal, password will be echoed.")
+ r.warned = true
+ }
+ // Just as in Prompt, handle printing the prompt here instead of relying on liner.
+ fmt.Print(prompt)
+ passwd, err = r.State.Prompt("")
+ fmt.Println()
+ return passwd, err
+}
+
+// PromptConfirm displays the given prompt to the user and requests a boolean
+// choice to be made, returning that choice.
+func (r *terminalPrompter) PromptConfirm(prompt string) (bool, error) {
+ input, err := r.Prompt(prompt + " [y/N] ")
+ if len(input) > 0 && strings.ToUpper(input[:1]) == "Y" {
+ return true, nil
+ }
+ return false, err
+}
+
+// SetScrollHistory sets the the input scrollback history that the prompter will
+// allow the user to scoll back to.
+func (r *terminalPrompter) SetScrollHistory(history []string) {
+ r.State.ReadHistory(strings.NewReader(strings.Join(history, "\n")))
+}
+
+// SetWordCompleter sets the completion function that the prompter will call to
+// fetch completion candidates when the user presses tab.
+func (r *terminalPrompter) SetWordCompleter(completer WordCompleter) {
+ r.State.SetWordCompleter(liner.WordCompleter(completer))
+}
diff --git a/console/testdata/exec.js b/console/testdata/exec.js
new file mode 100644
index 000000000..59e34d7c4
--- /dev/null
+++ b/console/testdata/exec.js
@@ -0,0 +1 @@
+var execed = "some-executed-string";
diff --git a/console/testdata/preload.js b/console/testdata/preload.js
new file mode 100644
index 000000000..556793970
--- /dev/null
+++ b/console/testdata/preload.js
@@ -0,0 +1 @@
+var preloaded = "some-preloaded-string";
diff --git a/jsre/bignumber_js.go b/internal/jsre/bignumber_js.go
similarity index 100%
rename from jsre/bignumber_js.go
rename to internal/jsre/bignumber_js.go
diff --git a/jsre/completion.go b/internal/jsre/completion.go
similarity index 100%
rename from jsre/completion.go
rename to internal/jsre/completion.go
diff --git a/jsre/completion_test.go b/internal/jsre/completion_test.go
similarity index 98%
rename from jsre/completion_test.go
rename to internal/jsre/completion_test.go
index 92af5ddb6..ccbd73dcc 100644
--- a/jsre/completion_test.go
+++ b/internal/jsre/completion_test.go
@@ -17,12 +17,13 @@
package jsre
import (
+ "os"
"reflect"
"testing"
)
func TestCompleteKeywords(t *testing.T) {
- re := New("")
+ re := New("", os.Stdout)
re.Run(`
function theClass() {
this.foo = 3;
diff --git a/jsre/ethereum_js.go b/internal/jsre/ethereum_js.go
similarity index 100%
rename from jsre/ethereum_js.go
rename to internal/jsre/ethereum_js.go
diff --git a/jsre/jsre.go b/internal/jsre/jsre.go
similarity index 95%
rename from jsre/jsre.go
rename to internal/jsre/jsre.go
index 59730bc0d..8d8f4fc2a 100644
--- a/jsre/jsre.go
+++ b/internal/jsre/jsre.go
@@ -21,6 +21,7 @@ import (
crand "crypto/rand"
"encoding/binary"
"fmt"
+ "io"
"io/ioutil"
"math/rand"
"sync"
@@ -40,6 +41,7 @@ It provides some helper functions to
*/
type JSRE struct {
assetPath string
+ output io.Writer
evalQueue chan *evalReq
stopEventLoop chan bool
loopWg sync.WaitGroup
@@ -60,9 +62,10 @@ type evalReq struct {
}
// runtime must be stopped with Stop() after use and cannot be used after stopping
-func New(assetPath string) *JSRE {
+func New(assetPath string, output io.Writer) *JSRE {
re := &JSRE{
assetPath: assetPath,
+ output: output,
evalQueue: make(chan *evalReq),
stopEventLoop: make(chan bool),
}
@@ -292,19 +295,21 @@ func (self *JSRE) loadScript(call otto.FunctionCall) otto.Value {
return otto.TrueValue()
}
-// EvalAndPrettyPrint evaluates code and pretty prints the result to
-// standard output.
-func (self *JSRE) EvalAndPrettyPrint(code string) (err error) {
+// Evaluate executes code and pretty prints the result to the specified output
+// stream.
+func (self *JSRE) Evaluate(code string, w io.Writer) error {
+ var fail error
+
self.Do(func(vm *otto.Otto) {
- var val otto.Value
- val, err = vm.Run(code)
+ val, err := vm.Run(code)
if err != nil {
- return
+ fail = err
+ } else {
+ prettyPrint(vm, val, w)
+ fmt.Fprintln(w)
}
- prettyPrint(vm, val)
- fmt.Println()
})
- return err
+ return fail
}
// Compile compiles and then runs a piece of JS code.
diff --git a/jsre/jsre_test.go b/internal/jsre/jsre_test.go
similarity index 98%
rename from jsre/jsre_test.go
rename to internal/jsre/jsre_test.go
index ffb6999db..bcb6e0dd2 100644
--- a/jsre/jsre_test.go
+++ b/internal/jsre/jsre_test.go
@@ -51,7 +51,7 @@ func newWithTestJS(t *testing.T, testjs string) (*JSRE, string) {
t.Fatal("cannot create test.js:", err)
}
}
- return New(dir), dir
+ return New(dir, os.Stdout), dir
}
func TestExec(t *testing.T) {
@@ -102,7 +102,7 @@ func TestNatto(t *testing.T) {
}
func TestBind(t *testing.T) {
- jsre := New("")
+ jsre := New("", os.Stdout)
defer jsre.Stop(false)
jsre.Bind("no", &testNativeObjectBinding{})
diff --git a/jsre/pretty.go b/internal/jsre/pretty.go
similarity index 77%
rename from jsre/pretty.go
rename to internal/jsre/pretty.go
index cd7fa5232..cf4bf2cf8 100644
--- a/jsre/pretty.go
+++ b/internal/jsre/pretty.go
@@ -18,6 +18,7 @@ package jsre
import (
"fmt"
+ "io"
"sort"
"strconv"
"strings"
@@ -32,10 +33,10 @@ const (
)
var (
- functionColor = color.New(color.FgMagenta)
- specialColor = color.New(color.Bold)
- numberColor = color.New(color.FgRed)
- stringColor = color.New(color.FgGreen)
+ FunctionColor = color.New(color.FgMagenta).SprintfFunc()
+ SpecialColor = color.New(color.Bold).SprintfFunc()
+ NumberColor = color.New(color.FgRed).SprintfFunc()
+ StringColor = color.New(color.FgGreen).SprintfFunc()
)
// these fields are hidden when printing objects.
@@ -50,19 +51,22 @@ var boringKeys = map[string]bool{
}
// prettyPrint writes value to standard output.
-func prettyPrint(vm *otto.Otto, value otto.Value) {
- ppctx{vm}.printValue(value, 0, false)
+func prettyPrint(vm *otto.Otto, value otto.Value, w io.Writer) {
+ ppctx{vm: vm, w: w}.printValue(value, 0, false)
}
-func prettyPrintJS(call otto.FunctionCall) otto.Value {
+func prettyPrintJS(call otto.FunctionCall, w io.Writer) otto.Value {
for _, v := range call.ArgumentList {
- prettyPrint(call.Otto, v)
- fmt.Println()
+ prettyPrint(call.Otto, v, w)
+ fmt.Fprintln(w)
}
return otto.UndefinedValue()
}
-type ppctx struct{ vm *otto.Otto }
+type ppctx struct {
+ vm *otto.Otto
+ w io.Writer
+}
func (ctx ppctx) indent(level int) string {
return strings.Repeat(indentString, level)
@@ -73,22 +77,22 @@ func (ctx ppctx) printValue(v otto.Value, level int, inArray bool) {
case v.IsObject():
ctx.printObject(v.Object(), level, inArray)
case v.IsNull():
- specialColor.Print("null")
+ fmt.Fprint(ctx.w, SpecialColor("null"))
case v.IsUndefined():
- specialColor.Print("undefined")
+ fmt.Fprint(ctx.w, SpecialColor("undefined"))
case v.IsString():
s, _ := v.ToString()
- stringColor.Printf("%q", s)
+ fmt.Fprint(ctx.w, StringColor("%q", s))
case v.IsBoolean():
b, _ := v.ToBoolean()
- specialColor.Printf("%t", b)
+ fmt.Fprint(ctx.w, SpecialColor("%t", b))
case v.IsNaN():
- numberColor.Printf("NaN")
+ fmt.Fprint(ctx.w, NumberColor("NaN"))
case v.IsNumber():
s, _ := v.ToString()
- numberColor.Printf("%s", s)
+ fmt.Fprint(ctx.w, NumberColor("%s", s))
default:
- fmt.Printf("<unprintable>")
+ fmt.Fprint(ctx.w, "<unprintable>")
}
}
@@ -98,75 +102,75 @@ func (ctx ppctx) printObject(obj *otto.Object, level int, inArray bool) {
lv, _ := obj.Get("length")
len, _ := lv.ToInteger()
if len == 0 {
- fmt.Printf("[]")
+ fmt.Fprintf(ctx.w, "[]")
return
}
if level > maxPrettyPrintLevel {
- fmt.Print("[...]")
+ fmt.Fprint(ctx.w, "[...]")
return
}
- fmt.Print("[")
+ fmt.Fprint(ctx.w, "[")
for i := int64(0); i < len; i++ {
el, err := obj.Get(strconv.FormatInt(i, 10))
if err == nil {
ctx.printValue(el, level+1, true)
}
if i < len-1 {
- fmt.Printf(", ")
+ fmt.Fprintf(ctx.w, ", ")
}
}
- fmt.Print("]")
+ fmt.Fprint(ctx.w, "]")
case "Object":
// Print values from bignumber.js as regular numbers.
if ctx.isBigNumber(obj) {
- numberColor.Print(toString(obj))
+ fmt.Fprint(ctx.w, NumberColor("%s", toString(obj)))
return
}
// Otherwise, print all fields indented, but stop if we're too deep.
keys := ctx.fields(obj)
if len(keys) == 0 {
- fmt.Print("{}")
+ fmt.Fprint(ctx.w, "{}")
return
}
if level > maxPrettyPrintLevel {
- fmt.Print("{...}")
+ fmt.Fprint(ctx.w, "{...}")
return
}
- fmt.Println("{")
+ fmt.Fprintln(ctx.w, "{")
for i, k := range keys {
v, _ := obj.Get(k)
- fmt.Printf("%s%s: ", ctx.indent(level+1), k)
+ fmt.Fprintf(ctx.w, "%s%s: ", ctx.indent(level+1), k)
ctx.printValue(v, level+1, false)
if i < len(keys)-1 {
- fmt.Printf(",")
+ fmt.Fprintf(ctx.w, ",")
}
- fmt.Println()
+ fmt.Fprintln(ctx.w)
}
if inArray {
level--
}
- fmt.Printf("%s}", ctx.indent(level))
+ fmt.Fprintf(ctx.w, "%s}", ctx.indent(level))
case "Function":
// Use toString() to display the argument list if possible.
if robj, err := obj.Call("toString"); err != nil {
- functionColor.Print("function()")
+ fmt.Fprint(ctx.w, FunctionColor("function()"))
} else {
desc := strings.Trim(strings.Split(robj.String(), "{")[0], " \t\n")
desc = strings.Replace(desc, " (", "(", 1)
- functionColor.Print(desc)
+ fmt.Fprint(ctx.w, FunctionColor("%s", desc))
}
case "RegExp":
- stringColor.Print(toString(obj))
+ fmt.Fprint(ctx.w, StringColor("%s", toString(obj)))
default:
if v, _ := obj.Get("toString"); v.IsFunction() && level <= maxPrettyPrintLevel {
s, _ := obj.Call("toString")
- fmt.Printf("<%s %s>", obj.Class(), s.String())
+ fmt.Fprintf(ctx.w, "<%s %s>", obj.Class(), s.String())
} else {
- fmt.Printf("<%s>", obj.Class())
+ fmt.Fprintf(ctx.w, "<%s>", obj.Class())
}
}
}
diff --git a/rpc/json.go b/rpc/json.go
index 8a3bea2ee..151ed546e 100644
--- a/rpc/json.go
+++ b/rpc/json.go
@@ -30,7 +30,7 @@ import (
)
const (
- jsonRPCVersion = "2.0"
+ JSONRPCVersion = "2.0"
serviceMethodSeparator = "_"
subscribeMethod = "eth_subscribe"
unsubscribeMethod = "eth_unsubscribe"
@@ -302,31 +302,31 @@ func parsePositionalArguments(args json.RawMessage, callbackArgs []reflect.Type)
// CreateResponse will create a JSON-RPC success response with the given id and reply as result.
func (c *jsonCodec) CreateResponse(id interface{}, reply interface{}) interface{} {
if isHexNum(reflect.TypeOf(reply)) {
- return &JSONSuccessResponse{Version: jsonRPCVersion, Id: id, Result: fmt.Sprintf(`%#x`, reply)}
+ return &JSONSuccessResponse{Version: JSONRPCVersion, Id: id, Result: fmt.Sprintf(`%#x`, reply)}
}
- return &JSONSuccessResponse{Version: jsonRPCVersion, Id: id, Result: reply}
+ return &JSONSuccessResponse{Version: JSONRPCVersion, Id: id, Result: reply}
}
// CreateErrorResponse will create a JSON-RPC error response with the given id and error.
func (c *jsonCodec) CreateErrorResponse(id interface{}, err RPCError) interface{} {
- return &JSONErrResponse{Version: jsonRPCVersion, Id: id, Error: JSONError{Code: err.Code(), Message: err.Error()}}
+ return &JSONErrResponse{Version: JSONRPCVersion, Id: id, Error: JSONError{Code: err.Code(), Message: err.Error()}}
}
// CreateErrorResponseWithInfo will create a JSON-RPC error response with the given id and error.
// info is optional and contains additional information about the error. When an empty string is passed it is ignored.
func (c *jsonCodec) CreateErrorResponseWithInfo(id interface{}, err RPCError, info interface{}) interface{} {
- return &JSONErrResponse{Version: jsonRPCVersion, Id: id,
+ return &JSONErrResponse{Version: JSONRPCVersion, Id: id,
Error: JSONError{Code: err.Code(), Message: err.Error(), Data: info}}
}
// CreateNotification will create a JSON-RPC notification with the given subscription id and event as params.
func (c *jsonCodec) CreateNotification(subid string, event interface{}) interface{} {
if isHexNum(reflect.TypeOf(event)) {
- return &jsonNotification{Version: jsonRPCVersion, Method: notificationMethod,
+ return &jsonNotification{Version: JSONRPCVersion, Method: notificationMethod,
Params: jsonSubscription{Subscription: subid, Result: fmt.Sprintf(`%#x`, event)}}
}
- return &jsonNotification{Version: jsonRPCVersion, Method: notificationMethod,
+ return &jsonNotification{Version: JSONRPCVersion, Method: notificationMethod,
Params: jsonSubscription{Subscription: subid, Result: event}}
}
--
GitLab