From a05adb11288a1ea9dc6e38a952ab89fa5eb7f794 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Tue, 20 May 2014 12:48:34 +0200
Subject: [PATCH] Refactored file structure

---
 ethereal/assets/samplecoin/samplecoin.html    |   2 +-
 ...cript_console.go => javascript_runtime.go} | 126 ++++--------------
 ethereum/repl.go                              |  97 ++++++++++++++
 3 files changed, 124 insertions(+), 101 deletions(-)
 rename ethereum/{javascript_console.go => javascript_runtime.go} (51%)
 create mode 100644 ethereum/repl.go

diff --git a/ethereal/assets/samplecoin/samplecoin.html b/ethereal/assets/samplecoin/samplecoin.html
index 3f8eacc00a..d47c6323c5 100644
--- a/ethereal/assets/samplecoin/samplecoin.html
+++ b/ethereal/assets/samplecoin/samplecoin.html
@@ -9,7 +9,7 @@
 
 <script type="text/javascript">
 
-var jefcoinAddr = "681fd48ffa236549fbcd16bdf9f98bb541a7f742"
+var jefcoinAddr = "739105c31705038744d190332e3a07c8fea8a9eb"
 var mAddr = ""
 
 function createTransaction() {
diff --git a/ethereum/javascript_console.go b/ethereum/javascript_runtime.go
similarity index 51%
rename from ethereum/javascript_console.go
rename to ethereum/javascript_runtime.go
index 07d69dafc9..b06fb94603 100644
--- a/ethereum/javascript_console.go
+++ b/ethereum/javascript_runtime.go
@@ -9,11 +9,6 @@ import (
 	"github.com/robertkrimen/otto"
 )
 
-type Repl interface {
-	Start()
-	Stop()
-}
-
 type JSRE struct {
 	ethereum *eth.Ethereum
 	vm       *otto.Otto
@@ -44,20 +39,18 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE {
 	go re.mainLoop()
 
 	re.Bind("eth", &JSEthereum{re.lib, re.vm})
-	t, _ := re.vm.Get("eth")
-	t.Object().Set("watch", func(call otto.FunctionCall) otto.Value {
-		addr, _ := call.Argument(0).ToString()
-		cb := call.Argument(1)
 
-		re.objectCb[addr] = append(re.objectCb[addr], cb)
+	re.initStdFuncs()
 
-		event := "object:" + string(ethutil.FromHex(addr))
-		ethereum.Reactor().Subscribe(event, re.changeChan)
+	return re
+}
 
-		return otto.UndefinedValue()
-	})
+func (self *JSRE) Bind(name string, v interface{}) {
+	self.vm.Set(name, v)
+}
 
-	return re
+func (self *JSRE) Run(code string) (otto.Value, error) {
+	return self.vm.Run(code)
 }
 
 func (self *JSRE) Stop() {
@@ -95,94 +88,27 @@ out:
 	}
 }
 
-func (self *JSRE) Bind(name string, v interface{}) {
-	self.vm.Set(name, v)
-}
-
-func (self *JSRE) Run(code string) (otto.Value, error) {
-	return self.vm.Run(code)
-}
-
-type JSRepl struct {
-	re *JSRE
-
-	prompt string
-}
-
-func NewJSRepl(ethereum *eth.Ethereum) *JSRepl {
-	return &JSRepl{re: NewJSRE(ethereum), prompt: "> "}
-}
-
-func (self *JSRepl) Start() {
-	self.read()
-}
-
-func (self *JSRepl) Stop() {
-	self.re.Stop()
-}
-
-func (self *JSRepl) parseInput(code string) {
-	defer func() {
-		if r := recover(); r != nil {
-			fmt.Println("[native] error", r)
-		}
-	}()
-
-	value, err := self.re.Run(code)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	self.PrintValue(value)
-}
-
-// The JSEthereum object attempts to wrap the PEthereum object and returns
-// meaningful javascript objects
-type JSEthereum struct {
-	*ethpub.PEthereum
-	vm *otto.Otto
-}
-
-func (self *JSEthereum) GetKey() otto.Value {
-	return self.toVal(self.PEthereum.GetKey())
-}
-
-func (self *JSEthereum) GetStateObject(addr string) otto.Value {
-	return self.toVal(self.PEthereum.GetStateObject(addr))
-}
-
-func (self *JSEthereum) 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 *JSEthereum) 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 *JSRE) initStdFuncs() {
+	t, _ := self.vm.Get("eth")
+	eth := t.Object()
+	eth.Set("watch", func(call otto.FunctionCall) otto.Value {
+		addr, _ := call.Argument(0).ToString()
+		cb := call.Argument(1)
 
-func (self *JSEthereum) toVal(v interface{}) otto.Value {
-	result, err := self.vm.ToValue(v)
+		self.objectCb[addr] = append(self.objectCb[addr], cb)
 
-	if err != nil {
-		fmt.Println(err)
+		event := "object:" + string(ethutil.FromHex(addr))
+		self.ethereum.Reactor().Subscribe(event, self.changeChan)
 
 		return otto.UndefinedValue()
-	}
+	})
+	eth.Set("addPeer", func(call otto.FunctionCall) otto.Value {
+		host, err := call.Argument(0).ToString()
+		if err != nil {
+			return otto.FalseValue()
+		}
+		self.ethereum.ConnectToPeer(host)
 
-	return result
+		return otto.TrueValue()
+	})
 }
diff --git a/ethereum/repl.go b/ethereum/repl.go
new file mode 100644
index 0000000000..c0b63c0a51
--- /dev/null
+++ b/ethereum/repl.go
@@ -0,0 +1,97 @@
+package main
+
+import (
+	"fmt"
+	"github.com/ethereum/eth-go"
+	"github.com/ethereum/eth-go/ethpub"
+	"github.com/robertkrimen/otto"
+)
+
+type Repl interface {
+	Start()
+	Stop()
+}
+
+type JSRepl struct {
+	re *JSRE
+
+	prompt string
+}
+
+func NewJSRepl(ethereum *eth.Ethereum) *JSRepl {
+	return &JSRepl{re: NewJSRE(ethereum), prompt: "> "}
+}
+
+func (self *JSRepl) Start() {
+	self.read()
+}
+
+func (self *JSRepl) Stop() {
+	self.re.Stop()
+}
+
+func (self *JSRepl) parseInput(code string) {
+	defer func() {
+		if r := recover(); r != nil {
+			fmt.Println("[native] error", r)
+		}
+	}()
+
+	value, err := self.re.Run(code)
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	self.PrintValue(value)
+}
+
+// The JSEthereum object attempts to wrap the PEthereum object and returns
+// meaningful javascript objects
+type JSEthereum struct {
+	*ethpub.PEthereum
+	vm *otto.Otto
+}
+
+func (self *JSEthereum) GetKey() otto.Value {
+	return self.toVal(self.PEthereum.GetKey())
+}
+
+func (self *JSEthereum) GetStateObject(addr string) otto.Value {
+	return self.toVal(self.PEthereum.GetStateObject(addr))
+}
+
+func (self *JSEthereum) 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 *JSEthereum) 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 *JSEthereum) toVal(v interface{}) otto.Value {
+	result, err := self.vm.ToValue(v)
+
+	if err != nil {
+		fmt.Println(err)
+
+		return otto.UndefinedValue()
+	}
+
+	return result
+}