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

---
 ethereal/assets/samplecoin/samplecoin.html |   2 +-
 ethereum/javascript_console.go             | 188 -----------------------------
 ethereum/javascript_runtime.go             | 114 +++++++++++++++++
 ethereum/repl.go                           |  97 +++++++++++++++
 4 files changed, 212 insertions(+), 189 deletions(-)
 delete mode 100644 ethereum/javascript_console.go
 create mode 100644 ethereum/javascript_runtime.go
 create mode 100644 ethereum/repl.go

diff --git a/ethereal/assets/samplecoin/samplecoin.html b/ethereal/assets/samplecoin/samplecoin.html
index 3f8eacc00..d47c6323c 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_console.go
deleted file mode 100644
index 07d69dafc..000000000
--- a/ethereum/javascript_console.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/ethereum/eth-go"
-	"github.com/ethereum/eth-go/ethchain"
-	"github.com/ethereum/eth-go/ethpub"
-	"github.com/ethereum/eth-go/ethutil"
-	"github.com/robertkrimen/otto"
-)
-
-type Repl interface {
-	Start()
-	Stop()
-}
-
-type JSRE struct {
-	ethereum *eth.Ethereum
-	vm       *otto.Otto
-	lib      *ethpub.PEthereum
-
-	blockChan  chan ethutil.React
-	changeChan chan ethutil.React
-	quitChan   chan bool
-
-	objectCb map[string][]otto.Value
-}
-
-func NewJSRE(ethereum *eth.Ethereum) *JSRE {
-	re := &JSRE{
-		ethereum,
-		otto.New(),
-		ethpub.NewPEthereum(ethereum),
-		make(chan ethutil.React, 1),
-		make(chan ethutil.React, 1),
-		make(chan bool),
-		make(map[string][]otto.Value),
-	}
-
-	// Init the JS lib
-	re.vm.Run(jsLib)
-
-	// We have to make sure that, whoever calls this, calls "Stop"
-	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)
-
-		event := "object:" + string(ethutil.FromHex(addr))
-		ethereum.Reactor().Subscribe(event, re.changeChan)
-
-		return otto.UndefinedValue()
-	})
-
-	return re
-}
-
-func (self *JSRE) Stop() {
-	// Kill the main loop
-	self.quitChan <- true
-
-	close(self.blockChan)
-	close(self.quitChan)
-	close(self.changeChan)
-}
-
-func (self *JSRE) mainLoop() {
-	// Subscribe to events
-	reactor := self.ethereum.Reactor()
-	reactor.Subscribe("newBlock", self.blockChan)
-
-out:
-	for {
-		select {
-		case <-self.quitChan:
-			break out
-		case block := <-self.blockChan:
-			if _, ok := block.Resource.(*ethchain.Block); ok {
-			}
-		case object := <-self.changeChan:
-			if stateObject, ok := object.Resource.(*ethchain.StateObject); ok {
-				for _, cb := range self.objectCb[ethutil.Hex(stateObject.Address())] {
-					val, _ := self.vm.ToValue(ethpub.NewPStateObject(stateObject))
-					cb.Call(cb, val)
-				}
-			} else if storageObject, ok := object.Resource.(*ethchain.StorageState); ok {
-				fmt.Println(storageObject)
-			}
-		}
-	}
-}
-
-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 *JSEthereum) toVal(v interface{}) otto.Value {
-	result, err := self.vm.ToValue(v)
-
-	if err != nil {
-		fmt.Println(err)
-
-		return otto.UndefinedValue()
-	}
-
-	return result
-}
diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go
new file mode 100644
index 000000000..b06fb9460
--- /dev/null
+++ b/ethereum/javascript_runtime.go
@@ -0,0 +1,114 @@
+package main
+
+import (
+	"fmt"
+	"github.com/ethereum/eth-go"
+	"github.com/ethereum/eth-go/ethchain"
+	"github.com/ethereum/eth-go/ethpub"
+	"github.com/ethereum/eth-go/ethutil"
+	"github.com/robertkrimen/otto"
+)
+
+type JSRE struct {
+	ethereum *eth.Ethereum
+	vm       *otto.Otto
+	lib      *ethpub.PEthereum
+
+	blockChan  chan ethutil.React
+	changeChan chan ethutil.React
+	quitChan   chan bool
+
+	objectCb map[string][]otto.Value
+}
+
+func NewJSRE(ethereum *eth.Ethereum) *JSRE {
+	re := &JSRE{
+		ethereum,
+		otto.New(),
+		ethpub.NewPEthereum(ethereum),
+		make(chan ethutil.React, 1),
+		make(chan ethutil.React, 1),
+		make(chan bool),
+		make(map[string][]otto.Value),
+	}
+
+	// Init the JS lib
+	re.vm.Run(jsLib)
+
+	// We have to make sure that, whoever calls this, calls "Stop"
+	go re.mainLoop()
+
+	re.Bind("eth", &JSEthereum{re.lib, re.vm})
+
+	re.initStdFuncs()
+
+	return re
+}
+
+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)
+}
+
+func (self *JSRE) Stop() {
+	// Kill the main loop
+	self.quitChan <- true
+
+	close(self.blockChan)
+	close(self.quitChan)
+	close(self.changeChan)
+}
+
+func (self *JSRE) mainLoop() {
+	// Subscribe to events
+	reactor := self.ethereum.Reactor()
+	reactor.Subscribe("newBlock", self.blockChan)
+
+out:
+	for {
+		select {
+		case <-self.quitChan:
+			break out
+		case block := <-self.blockChan:
+			if _, ok := block.Resource.(*ethchain.Block); ok {
+			}
+		case object := <-self.changeChan:
+			if stateObject, ok := object.Resource.(*ethchain.StateObject); ok {
+				for _, cb := range self.objectCb[ethutil.Hex(stateObject.Address())] {
+					val, _ := self.vm.ToValue(ethpub.NewPStateObject(stateObject))
+					cb.Call(cb, val)
+				}
+			} else if storageObject, ok := object.Resource.(*ethchain.StorageState); ok {
+				fmt.Println(storageObject)
+			}
+		}
+	}
+}
+
+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)
+
+		self.objectCb[addr] = append(self.objectCb[addr], cb)
+
+		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 otto.TrueValue()
+	})
+}
diff --git a/ethereum/repl.go b/ethereum/repl.go
new file mode 100644
index 000000000..c0b63c0a5
--- /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
+}
-- 
cgit v1.2.3