From cbce882f5e35300016055cde81eeccb3ae052671 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 15 May 2014 20:45:19 +0200
Subject: Basic javascript console

---
 ethereum/javascript_console.go | 76 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 ethereum/javascript_console.go

(limited to 'ethereum/javascript_console.go')

diff --git a/ethereum/javascript_console.go b/ethereum/javascript_console.go
new file mode 100644
index 000000000..a6449af8f
--- /dev/null
+++ b/ethereum/javascript_console.go
@@ -0,0 +1,76 @@
+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 JS Console")
+	reader := bufio.NewReader(os.Stdin)
+	for {
+		fmt.Printf("eth >>> ")
+		str, _, err := reader.ReadLine()
+		if err != nil {
+			fmt.Println("Error reading input", err)
+		} else {
+			if string(str) == "quit" {
+				return
+			}
+
+			self.ParseInput(string(str))
+		}
+	}
+}
+
+func (self *JSConsole) ParseInput(code string) {
+	value, err := self.vm.Run(code)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	fmt.Println(value)
+}
+
+type OtherStruct struct {
+	Test string
+}
+
+type JSWrapper struct {
+	pub *ethpub.PEthereum
+	vm  *otto.Otto
+}
+
+func (self *JSWrapper) GetKey() otto.Value {
+	result, err := self.vm.ToValue(self.pub.GetKey())
+	if err != nil {
+		fmt.Println(err)
+
+		return otto.UndefinedValue()
+	}
+
+	return result
+
+}
+
+func (self *JSConsole) initBindings() {
+	t := &JSWrapper{self.lib, self.vm}
+
+	self.vm.Set("eth", t)
+}
-- 
cgit v1.2.3


From 0a03484188dc23707b343bb512ec341afc744a2e Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 15 May 2014 22:15:14 +0200
Subject: Implemented JavaScript console

---
 ethereum/javascript_console.go | 60 ++++++++++++++++++++++++++++++++----------
 1 file changed, 46 insertions(+), 14 deletions(-)

(limited to 'ethereum/javascript_console.go')

diff --git a/ethereum/javascript_console.go b/ethereum/javascript_console.go
index a6449af8f..9adf51bcc 100644
--- a/ethereum/javascript_console.go
+++ b/ethereum/javascript_console.go
@@ -21,7 +21,7 @@ func NewJSConsole(ethereum *eth.Ethereum) *JSConsole {
 func (self *JSConsole) Start() {
 	self.initBindings()
 
-	fmt.Println("Eth JS Console")
+	fmt.Println("Eth JavaScript console")
 	reader := bufio.NewReader(os.Stdin)
 	for {
 		fmt.Printf("eth >>> ")
@@ -29,16 +29,18 @@ func (self *JSConsole) Start() {
 		if err != nil {
 			fmt.Println("Error reading input", err)
 		} else {
-			if string(str) == "quit" {
-				return
-			}
-
 			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)
@@ -48,29 +50,59 @@ func (self *JSConsole) ParseInput(code string) {
 	fmt.Println(value)
 }
 
-type OtherStruct struct {
-	Test string
+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 {
-	pub *ethpub.PEthereum
-	vm  *otto.Otto
+	*ethpub.PEthereum
+	vm *otto.Otto
 }
 
 func (self *JSWrapper) GetKey() otto.Value {
-	result, err := self.vm.ToValue(self.pub.GetKey())
+	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 result
+	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)
 }
 
-func (self *JSConsole) initBindings() {
-	t := &JSWrapper{self.lib, self.vm}
+// Wrapper function
+func (self *JSWrapper) toVal(v interface{}) otto.Value {
+	result, err := self.vm.ToValue(v)
 
-	self.vm.Set("eth", t)
+	if err != nil {
+		fmt.Println(err)
+
+		return otto.UndefinedValue()
+	}
+
+	return result
 }
-- 
cgit v1.2.3