Merge branch 'feature/otto' into develop

3 files changed, 121 insertions, 1 deletions

diff --git a/ethereum/config.go b/ethereum/config.go
index 7ca1a9801..5ddc8e635 100644
--- a/ethereum/config.go
+++ b/ethereum/config.go
@@ -20,6 +20,7 @@ var ExportKey bool
 var LogFile string
 var DataDir string
 var NonInteractive bool
+var StartJsConsole bool
 
 func Init() {
 	flag.BoolVar(&StartConsole, "c", false, "debug and testing console")
@@ -38,6 +39,7 @@ func Init() {
 	flag.StringVar(&DataDir, "dir", ".ethereum", "ethereum data directory")
 	flag.StringVar(&ImportKey, "import", "", "imports the given private key (hex)")
 	flag.IntVar(&MaxPeer, "x", 5, "maximum desired peers")
+	flag.BoolVar(&StartJsConsole, "js", false, "exp")
 
 	flag.Parse()
 }
diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go
index 2abf6da42..128e11139 100644
--- a/ethereum/ethereum.go
+++ b/ethereum/ethereum.go
@@ -52,7 +52,12 @@ func main() {
 	var logSys *log.Logger
 	flags := log.LstdFlags
 
-	ethutil.ReadConfig(DataDir)
+	if StartJsConsole {
+		ethutil.ReadConfig(DataDir, ethutil.LogFile)
+	} else {
+		ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd)
+	}
+
 	logger := ethutil.Config.Log
 
 	if LogFile != "" {
@@ -145,7 +150,12 @@ save these words so you can restore your account later: %s
 
 		console := NewConsole(ethereum)
 		go console.Start()
+	} else if StartJsConsole {
+		c := NewJSConsole(ethereum)
+
+		go c.Start()
 	}
+
 	if StartRpc {
 		utils.DoRpc(ethereum, RpcPort)
 	}
diff --git a/ethereum/javascript_console.go b/ethereum/javascript_console.go
new file mode 100644
index 000000000..9adf51bcc
--- /dev/null
+++ b/ethereum/javascript_console.go
@@ -0,0 +1,108 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"github.com/ethereum/eth-go"
+	"github.com/ethereum/eth-go/ethpub"
+	"github.com/robertkrimen/otto"
+	"os"
+)
+
+type JSConsole struct {
+	vm  *otto.Otto
+	lib *ethpub.PEthereum
+}
+
+func NewJSConsole(ethereum *eth.Ethereum) *JSConsole {
+	return &JSConsole{vm: otto.New(), lib: ethpub.NewPEthereum(ethereum)}
+}
+
+func (self *JSConsole) Start() {
+	self.initBindings()
+
+	fmt.Println("Eth JavaScript console")
+	reader := bufio.NewReader(os.Stdin)
+	for {
+		fmt.Printf("eth >>> ")
+		str, _, err := reader.ReadLine()
+		if err != nil {
+			fmt.Println("Error reading input", err)
+		} else {
+			self.ParseInput(string(str))
+		}
+	}
+}
+
+func (self *JSConsole) ParseInput(code string) {
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Println("[native] error", r)
+		}
+	}()
+
+	value, err := self.vm.Run(code)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	fmt.Println(value)
+}
+
+func (self *JSConsole) initBindings() {
+	t := &JSWrapper{self.lib, self.vm}
+
+	self.vm.Set("eth", t)
+}
+
+// The JS wrapper attempts to wrap the PEthereum object and returns
+// proper javascript objects
+type JSWrapper struct {
+	*ethpub.PEthereum
+	vm *otto.Otto
+}
+
+func (self *JSWrapper) GetKey() otto.Value {
+	return self.toVal(self.PEthereum.GetKey())
+}
+
+func (self *JSWrapper) GetStateObject(addr string) otto.Value {
+	return self.toVal(self.PEthereum.GetStateObject(addr))
+}
+
+func (self *JSWrapper) Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr string) otto.Value {
+	r, err := self.PEthereum.Transact(key, recipient, valueStr, gasStr, gasPriceStr, dataStr)
+	if err != nil {
+		fmt.Println(err)
+
+		return otto.UndefinedValue()
+	}
+
+	return self.toVal(r)
+}
+
+func (self *JSWrapper) Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr string) otto.Value {
+	r, err := self.PEthereum.Create(key, valueStr, gasStr, gasPriceStr, initStr, bodyStr)
+
+	if err != nil {
+		fmt.Println(err)
+
+		return otto.UndefinedValue()
+	}
+
+	return self.toVal(r)
+}
+
+// Wrapper function
+func (self *JSWrapper) toVal(v interface{}) otto.Value {
+	result, err := self.vm.ToValue(v)
+
+	if err != nil {
+		fmt.Println(err)
+
+		return otto.UndefinedValue()
+	}
+
+	return result
+}