aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/geth/accountcmd.go5
-rw-r--r--cmd/geth/chaincmd.go3
-rw-r--r--cmd/geth/consolecmd.go167
-rw-r--r--cmd/geth/consolecmd_test.go152
-rw-r--r--cmd/geth/js.go424
-rw-r--r--cmd/geth/js_test.go500
-rw-r--r--cmd/geth/main.go140
-rw-r--r--cmd/geth/run_test.go9
-rw-r--r--cmd/geth/usage.go2
-rw-r--r--cmd/utils/flags.go19
-rw-r--r--cmd/utils/input.go98
-rw-r--r--cmd/utils/jeth.go301
12 files changed, 356 insertions, 1464 deletions
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(&ethereum); 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(&ethereum); 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(&ethereum)
-//
-// 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 := &eth.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(&ethereum)
-
- 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(&ethereum)
- 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(&ethereum)
-
- 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(&ethereum)
-
- 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",
@@ -140,36 +143,6 @@ 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
-`,
- },
}
app.Flags = []cli.Flag{
@@ -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()
-}
generated by cgit (git 2.34.1) at 2024-11-12 23:07:32 +0800