added batch support to console and attach actions

cmd/geth/js.go

@@ -220,6 +220,25 @@ func (self *jsre) loadAutoCompletion() {
 	}
 }
 
+func (self *jsre) batch(statement string) {
+	val, err := self.re.Run(statement)
+
+	if err != nil {
+		fmt.Printf("error: %v", err)
+	} else if val.IsDefined() && val.IsObject() {
+		obj, _ := self.re.Get("ret_result")
+		fmt.Printf("%v", obj)
+	} else if val.IsDefined() {
+		fmt.Printf("%v", val)
+	}
+
+	if self.atexit != nil {
+		self.atexit()
+	}
+
+	self.re.Stop(false)
+}
+
 // show summary of current geth instance
 func (self *jsre) welcome() {
 	self.re.Eval(`console.log('instance: ' + web3.version.client);`)

cmd/geth/main.go

@@ -255,6 +255,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
 		utils.IPCDisabledFlag,
 		utils.IPCApiFlag,
 		utils.IPCPathFlag,
+		utils.ExecFlag,
 		utils.WhisperEnabledFlag,
 		utils.VMDebugFlag,
 		utils.ProtocolVersionFlag,
@@ -337,9 +338,13 @@ func attach(ctx *cli.Context) {
 		true,
 		nil)
 
+	if ctx.GlobalString(utils.ExecFlag.Name) != "" {
+		repl.batch(ctx.GlobalString(utils.ExecFlag.Name))
+	} else {
 		repl.welcome()
 		repl.interactive()
 	}
+}
 
 func console(ctx *cli.Context) {
 	// Wrap the standard output with a colorified stream (windows)
@@ -368,8 +373,12 @@ func console(ctx *cli.Context) {
 		nil,
 	)
 
+	if ctx.GlobalString(utils.ExecFlag.Name) != "" {
+		repl.batch(ctx.GlobalString(utils.ExecFlag.Name))
+	} else {
 		repl.welcome()
 		repl.interactive()
+	}
 
 	ethereum.Stop()
 	ethereum.WaitForShutdown()

cmd/utils/flags.go

@@ -227,6 +227,10 @@ var (
 		Usage: "Filename for IPC socket/pipe",
 		Value: DirectoryString{common.DefaultIpcPath()},
 	}
+	ExecFlag = cli.StringFlag{
+		Name:  "exec",
+		Usage: "Execute javascript statement (only in combination with console/attach)",
+	}
 	// Network Settings
 	MaxPeersFlag = cli.IntFlag{
 		Name:  "maxpeers",

rpc/api/api_test.go

@@ -3,12 +3,13 @@ package api
 import (
 	"testing"
 
-	"github.com/ethereum/go-ethereum/rpc/codec"
 	"encoding/json"
 	"strconv"
+
 	"github.com/ethereum/go-ethereum/common/compiler"
-	"github.com/ethereum/go-ethereum/rpc/shared"
 	"github.com/ethereum/go-ethereum/eth"
+	"github.com/ethereum/go-ethereum/rpc/codec"
+	"github.com/ethereum/go-ethereum/rpc/shared"
 	"github.com/ethereum/go-ethereum/xeth"
 )
 

rpc/api/eth.go

@@ -250,7 +250,6 @@ func (self *ethApi) Sign(req *shared.Request) (interface{}, error) {
 	return v, nil
 }
 
-
 func (self *ethApi) PushTx(req *shared.Request) (interface{}, error) {
 	args := new(NewDataArgs)
 	if err := self.codec.Decode(req.Params, &args); err != nil {