roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Implemented JavaScript console

Browse Source
This commit is contained in:
obscuren 2014-05-15 22:15:14 +02:00
parent cbce882f5e
commit 0a03484188
2 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ethereum/ethereum.go
View File

@ -52,7 +52,12 @@ func main() {
var logSys *log.Logger var logSys *log.Logger
flags := log.LstdFlags 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 logger := ethutil.Config.Log
if LogFile != "" { if LogFile != "" {
@ -145,9 +150,7 @@ save these words so you can restore your account later: %s
console := NewConsole(ethereum) console := NewConsole(ethereum)
go console.Start() go console.Start()
} } else if StartJsConsole {
if StartExp {
c := NewJSConsole(ethereum) c := NewJSConsole(ethereum)
go c.Start() go c.Start()

66
ethereum/javascript_console.go
View File

@ -21,7 +21,7 @@ func NewJSConsole(ethereum *eth.Ethereum) *JSConsole {
func (self *JSConsole) Start() { func (self *JSConsole) Start() {
self.initBindings() self.initBindings()
fmt.Println("Eth JS Console") fmt.Println("Eth JavaScript console")
reader := bufio.NewReader(os.Stdin) reader := bufio.NewReader(os.Stdin)
for { for {
fmt.Printf("eth >>> ") fmt.Printf("eth >>> ")
@ -29,16 +29,18 @@ func (self *JSConsole) Start() {
if err != nil { if err != nil {
fmt.Println("Error reading input", err) fmt.Println("Error reading input", err)
} else { } else {
if string(str) == "quit" {
return
}
self.ParseInput(string(str)) self.ParseInput(string(str))
} }
} }
} }
func (self *JSConsole) ParseInput(code string) { func (self *JSConsole) ParseInput(code string) {
defer func() {
if r := recover(); r != nil {
fmt.Println("[native] error", r)
}
}()
value, err := self.vm.Run(code) value, err := self.vm.Run(code)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
@ -48,17 +50,54 @@ func (self *JSConsole) ParseInput(code string) {
fmt.Println(value) fmt.Println(value)
} }
type OtherStruct struct { func (self *JSConsole) initBindings() {
Test string 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 { type JSWrapper struct {
pub *ethpub.PEthereum *ethpub.PEthereum
vm *otto.Otto vm *otto.Otto
} }
func (self *JSWrapper) GetKey() otto.Value { 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 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 { if err != nil {
fmt.Println(err) fmt.Println(err)
@ -66,11 +105,4 @@ func (self *JSWrapper) GetKey() otto.Value {
} }
return result return result
}
func (self *JSConsole) initBindings() {
t := &JSWrapper{self.lib, self.vm}
self.vm.Set("eth", t)
} }