forked from cerc-io/plugeth
Implemented JavaScript console
This commit is contained in:
parent
cbce882f5e
commit
0a03484188
@ -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,9 +150,7 @@ save these words so you can restore your account later: %s
|
||||
|
||||
console := NewConsole(ethereum)
|
||||
go console.Start()
|
||||
}
|
||||
|
||||
if StartExp {
|
||||
} else if StartJsConsole {
|
||||
c := NewJSConsole(ethereum)
|
||||
|
||||
go c.Start()
|
||||
|
@ -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,17 +50,54 @@ 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 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)
|
||||
|
||||
@ -66,11 +105,4 @@ func (self *JSWrapper) GetKey() otto.Value {
|
||||
}
|
||||
|
||||
return result
|
||||
|
||||
}
|
||||
|
||||
func (self *JSConsole) initBindings() {
|
||||
t := &JSWrapper{self.lib, self.vm}
|
||||
|
||||
self.vm.Set("eth", t)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user